diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 58834f4597e5..62971ba2c726 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -58,11 +58,11 @@
/doc/languages-frameworks/python.section.md @FRidh
# Haskell
-/pkgs/development/compilers/ghc @basvandijk
-/pkgs/development/haskell-modules @basvandijk
-/pkgs/development/haskell-modules/default.nix @basvandijk
-/pkgs/development/haskell-modules/generic-builder.nix @basvandijk
-/pkgs/development/haskell-modules/hoogle.nix @basvandijk
+/pkgs/development/compilers/ghc @basvandijk @cdepillabout
+/pkgs/development/haskell-modules @basvandijk @cdepillabout
+/pkgs/development/haskell-modules/default.nix @basvandijk @cdepillabout
+/pkgs/development/haskell-modules/generic-builder.nix @basvandijk @cdepillabout
+/pkgs/development/haskell-modules/hoogle.nix @basvandijk @cdepillabout
# Perl
/pkgs/development/interpreters/perl @volth
@@ -130,6 +130,12 @@
/nixos/tests/hardened.nix @joachifm
/pkgs/os-specific/linux/kernel/hardened-config.nix @joachifm
+# Network Time Daemons
+/pkgs/tools/networking/chrony @thoughtpolice
+/pkgs/tools/networking/ntp @thoughtpolice
+/pkgs/tools/networking/openntpd @thoughtpolice
+/nixos/modules/services/networking/ntp @thoughtpolice
+
# Dhall
/pkgs/development/dhall-modules @Gabriel439 @Profpatsch
/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch
@@ -150,3 +156,8 @@
/pkgs/applications/editors/emacs-modes @adisbladis
/pkgs/applications/editors/emacs @adisbladis
/pkgs/top-level/emacs-packages.nix @adisbladis
+
+# Prometheus exporter modules and tests
+/nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz
+/nixos/modules/services/monitoring/prometheus/exporters.xml @WilliButz
+/nixos/tests/prometheus-exporters.nix @WilliButz
diff --git a/.version b/.version
index ba19dc3bb41e..88b8320330da 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-19.09
\ No newline at end of file
+20.03
\ No newline at end of file
diff --git a/README.md b/README.md
index d589b953d182..b34438e41a8f 100644
--- a/README.md
+++ b/README.md
@@ -1,48 +1,113 @@
-[
](https://nixos.org/nixos)
+
+
+
-[](https://www.codetriage.com/nixos/nixpkgs)
-[](https://opencollective.com/nixos)
+
+ 
+ 
+
-Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package
-manager. It is periodically built and tested by the [Hydra](https://hydra.nixos.org/)
-build daemon as so-called channels. To get channel information via git, add
-[nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote:
+[Nixpkgs](https://github.com/nixos/nixpkgs) is a collection of over
+40,000 software packages that can be installed with the
+[Nix](https://nixos.org/nix/) package manager. It also implements
+[NixOS](https://nixos.org/nixos/), a purely-functional Linux distribution.
-```
-% git remote add channels https://github.com/NixOS/nixpkgs-channels.git
-```
+# Manuals
-For stability and maximum binary package support, it is recommended to maintain
-custom changes on top of one of the channels, e.g. `nixos-19.03` for the latest
-release and `nixos-unstable` for the latest successful build of master:
+* [NixOS Manual](https://nixos.org/nixos/manual) - how to install, configure, and maintain a purely-functional Linux distribution
+* [Nixpkgs Manual](https://nixos.org/nixpkgs/manual/) - contributing to Nixpkgs and using programming-language-specific Nix expressions
+* [Nix Package Manager Manual](https://nixos.org/nix/manual) - how to write Nix expresssions (programs), and how to use Nix command line tools
-```
-% git remote update channels
-% git rebase channels/nixos-19.03
-```
-
-For pull requests, please rebase onto nixpkgs `master`.
-
-[NixOS](https://nixos.org/nixos/) Linux distribution source code is located inside
-`nixos/` folder.
-
-* [NixOS installation instructions](https://nixos.org/nixos/manual/#ch-installation)
-* [Documentation (Nix Expression Language chapter)](https://nixos.org/nix/manual/#ch-expression-language)
-* [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/)
-* [Manual (NixOS)](https://nixos.org/nixos/manual/)
-* [Community maintained wiki](https://nixos.wiki/)
-* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
-* [Continuous package builds for 19.03 release](https://hydra.nixos.org/jobset/nixos/release-19.03)
-* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
-* [Tests for 19.03 release](https://hydra.nixos.org/job/nixos/release-19.03/tested#tabs-constituents)
-
-Communication:
+# Community
* [Discourse Forum](https://discourse.nixos.org/)
* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)
+* [NixOS Weekly](https://weekly.nixos.org/)
+* [Community-maintained wiki](https://nixos.wiki/)
-Note: MIT license does not apply to the packages built by Nixpkgs, merely to
-the package descriptions (Nix expressions, build scripts, and so on). It also
-might not apply to patches included in Nixpkgs, which may be derivative works
-of the packages to which they apply. The aforementioned artifacts are all
-covered by the licenses of the respective packages.
+# Other Project Repositories
+
+The sources of all offical Nix-related projects are in the [NixOS
+organization on GitHub](https://github.com/NixOS/). Here are some of
+the main ones:
+
+* [Nix](https://github.com/NixOS/nix) - the purely functional package manager
+* [NixOps](https://github.com/NixOS/nixops) - the tool to remotely deploy NixOS machines
+* [Nix RFCs](https://github.com/NixOS/rfcs) - the formal process for making substantial changes to the community
+* [NixOS homepage](https://github.com/NixOS/nixos-homepage) - the [NixOS.org](https://nixos.org) website
+* [hydra](https://github.com/NixOS/hydra) - our continuous integration system
+* [NixOS Artwork](https://github.com/NixOS/nixos-artwork) - NixOS artwork
+
+# Continuous Integration and Distribution
+
+Nixpkgs and NixOS are built and tested by our continuous integration
+system, [Hydra](https://hydra.nixos.org/).
+
+* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
+* [Continuous package builds for the NixOS 19.03 release](https://hydra.nixos.org/jobset/nixos/release-19.03)
+* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
+* [Tests for the NixOS 19.03 release](https://hydra.nixos.org/job/nixos/release-19.03/tested#tabs-constituents)
+
+Artifacts successfully built with Hydra are published to cache at
+https://cache.nixos.org/. When successful build and test criteria are
+met, the Nixpkgs expressions are distributed via [Nix
+channels](https://nixos.org/nix/manual/#sec-channels). The channels
+are provided via a read-only mirror of the Nixpkgs repository called
+[nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels).
+
+# Contributing
+
+Nixpkgs is among the most active projects on GitHub. While thousands
+of open issues and pull requests might seem a lot at first, it helps
+consider it in the context of the scope of the project. Nixpkgs
+describes how to build over 40,000 pieces of software and implements a
+Linux distribution. The [GitHub Insights](https://github.com/NixOS/nixpkgs/pulse)
+page gives a sense of the project activity.
+
+Community contributions are always welcome through GitHub Issues and
+Pull Requests. When pull requests are made, our tooling automation bot,
+[OfBorg](https://github.com/NixOS/ofborg) will perform various checks
+to help ensure expression quality.
+
+The *Nixpkgs maintainers* are people who have assigned themselves to
+maintain specific individual packages. We encourage people who care
+about a package to assign themselves as a maintainer. When a pull
+request is made against a package, OfBorg will notify the appropriate
+maintainer(s). The *Nixpkgs committers* are people who have been given
+permission to merge.
+
+Most contributions are based on and merged into these branches:
+
+* `master` is the main branch where all small contributions go
+* `staging` is branched from master, changes that have a big impact on
+ Hydra builds go to this branch
+* `staging-next` is branched from staging and only fixes to stabilize
+ and security fixes with a big impact on Hydra builds should be
+ contributed to this branch. This branch is merged into master when
+ deemed of sufficiently high quality
+
+For more information about contributing to the project, please visit
+the [contributing page](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
+
+# Donations
+
+The infrastructure for NixOS and related projects is maintained by a
+nonprofit organization, the [NixOS
+Foundation](https://nixos.org/nixos/foundation.html). To ensure the
+continuity and expansion of the NixOS infrastructure, we are looking
+for donations to our organization.
+
+You can donate to the NixOS foundation by using Open Collective:
+
+
+
+# License
+
+Nixpkgs is licensed under the [MIT License](COPYING).
+
+Note: MIT license does not apply to the packages built by Nixpkgs,
+merely to the files in this repository (the Nix expressions, build
+scripts, NixOS modules, etc.). It also might not apply to patches
+included in Nixpkgs, which may be derivative works of the packages to
+which they apply. The aforementioned artifacts are all covered by the
+licenses of the respective packages.
diff --git a/doc/doc-support/lib-function-locations.nix b/doc/doc-support/lib-function-locations.nix
index ae7036e46264..68edd2709854 100644
--- a/doc/doc-support/lib-function-locations.nix
+++ b/doc/doc-support/lib-function-locations.nix
@@ -14,10 +14,10 @@ let
builtins.map
(subsetname: {
subsetname = subsetname;
- functions = libDefPos toplib."${subsetname}";
+ functions = libDefPos toplib.${subsetname};
})
(builtins.filter
- (name: builtins.isAttrs toplib."${name}")
+ (name: builtins.isAttrs toplib.${name})
(builtins.attrNames toplib));
nixpkgsLib = pkgs.lib;
diff --git a/doc/functions.xml b/doc/functions.xml
index 3b60f46d81da..96bd95958eae 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -20,4 +20,5 @@
+
diff --git a/doc/functions/ocitools.xml b/doc/functions/ocitools.xml
new file mode 100644
index 000000000000..163bee2382e6
--- /dev/null
+++ b/doc/functions/ocitools.xml
@@ -0,0 +1,76 @@
+
+ pkgs.ociTools
+
+
+ pkgs.ociTools is a set of functions for creating
+ containers according to the
+ OCI
+ container specification v1.0.0. Beyond that it makes no assumptions
+ about the container runner you choose to use to run the created container.
+
+
+
+ buildContainer
+
+
+ This function creates a simple OCI container that runs a single command
+ inside of it. An OCI container consists of a config.json
+ and a rootfs directory.The nix store of the container will contain all
+ referenced dependencies of the given command.
+
+
+
+ The parameters of buildContainer with an example value
+ are described below:
+
+
+
+ Build Container
+
+buildContainer {
+ args = [ (with pkgs; writeScript "run.sh" ''
+ #!${bash}/bin/bash
+ ${coreutils}/bin/exec ${bash}/bin/bash
+ '').outPath ];
+
+ mounts = {
+ "/data" = {
+ type = "none";
+ source = "/var/lib/mydata";
+ options = [ "bind" ];
+ };
+ };
+
+ readonly = false;
+}
+
+
+
+
+
+ args specifies a set of arguments to run inside the container.
+ This is the only required argument for buildContainer.
+ All referenced packages inside the derivation will be made available
+ inside the container
+
+
+
+
+ mounts specifies additional mount points chosen by the
+ user. By default only a minimal set of necessary filesystems are mounted
+ into the container (e.g procfs, cgroupfs)
+
+
+
+
+ readonly makes the container's rootfs read-only if it is set to true.
+ The default value is false false.
+
+
+
+
+
+
diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml
new file mode 100644
index 000000000000..9e0f21a6c74f
--- /dev/null
+++ b/doc/languages-frameworks/gnome.xml
@@ -0,0 +1,263 @@
+
+ GNOME
+
+
+ Packaging GNOME applications
+
+
+ Programs in the GNOME universe are written in various languages but they all use GObject-based libraries like GLib, GTK or GStreamer. These libraries are often modular, relying on looking into certain directories to find their modules. However, due to Nix’s specific file system organization, this will fail without our intervention. Fortunately, the libraries usually allow overriding the directories through environment variables, either natively or thanks to a patch in nixpkgs. Wrapping the executables to ensure correct paths are available to the application constitutes a significant part of packaging a modern desktop application. In this section, we will describe various modules needed by such applications, environment variables needed to make the modules load, and finally a script that will do the work for us.
+
+
+
+ Settings
+
+
+ GSettings API is often used for storing settings. GSettings schemas are required, to know the type and other metadata of the stored values. GLib looks for glib-2.0/schemas/gschemas.compiled files inside the directories of XDG_DATA_DIRS.
+
+
+
+ On Linux, GSettings API is implemented using dconf backend. You will need to add dconf GIO module to GIO_EXTRA_MODULES variable, otherwise the memory backend will be used and the saved settings will not be persistent.
+
+
+
+ Last you will need the dconf database D-Bus service itself. You can enable it using .
+
+
+
+ Some applications will also require gsettings-desktop-schemas for things like reading proxy configuration or user interface customization. This dependency is often not mentioned by upstream, you should grep for org.gnome.desktop and org.gnome.system to see if the schemas are needed.
+
+
+
+
+ Icons
+
+
+ When an application uses icons, an icon theme should be available in XDG_DATA_DIRS. The package for the default, icon-less hicolor-icon-theme contains a setup hook that will pick up icon themes from buildInputs and pass it to our wrapper. Unfortunately, relying on that would mean every user has to download the theme included in the package expression no matter their preference. For that reason, we leave the installation of icon theme on the user. If you use one of the desktop environments, you probably already have an icon theme installed.
+
+
+
+
+ GTK Themes
+
+
+ Previously, a GTK theme needed to be in XDG_DATA_DIRS. This is no longer necessary for most programs since GTK incorporated Adwaita theme. Some programs (for example, those designed for elementary HIG) might require a special theme like pantheon.elementary-gtk-theme.
+
+
+
+
+ GObject introspection typelibs
+
+
+ GObject introspection allows applications to use C libraries in other languages easily. It does this through typelib files searched in GI_TYPELIB_PATH.
+
+
+
+
+ Various plug-ins
+
+
+ If your application uses GStreamer or Grilo, you should set GST_PLUGIN_SYSTEM_PATH_1_0 and GRL_PLUGIN_PATH, respectively.
+
+
+
+
+
+ Onto <package>wrapGAppsHook</package>
+
+
+ Given the requirements above, the package expression would become messy quickly:
+
+preFixup = ''
+ for f in $(find $out/bin/ $out/libexec/ -type f -executable); do
+ wrapProgram "$f" \
+ --prefix GIO_EXTRA_MODULES : "${getLib gnome3.dconf}/lib/gio/modules" \
+ --prefix XDG_DATA_DIRS : "$out/share" \
+ --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \
+ --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
+ --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \
+ --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" [ pango json-glib ]}"
+ done
+'';
+
+ Fortunately, there is wrapGAppsHook, that does the wrapping for us. In particular, it works in conjunction with other setup hooks that will populate the variable:
+
+
+
+ wrapGAppsHook itself will add the package’s share directory to XDG_DATA_DIRS.
+
+
+
+
+ glib setup hook will populate GSETTINGS_SCHEMAS_PATH and then wrapGAppsHook will prepend it to XDG_DATA_DIRS.
+
+
+
+
+ gnome3.dconf.lib is a dependency of wrapGAppsHook, which then also adds it to the GIO_EXTRA_MODULES variable.
+
+
+
+
+ hicolor-icon-theme’s setup hook will add icon themes to XDG_ICON_DIRS which is prepended to XDG_DATA_DIRS by wrapGAppsHook.
+
+
+
+
+ gobject-introspection setup hook populates GI_TYPELIB_PATH variable with lib/girepository-1.0 directories of dependencies, which is then added to wrapper by wrapGAppsHook. It also adds share directories of dependencies to XDG_DATA_DIRS, which is intended to promote GIR files but it also pollutes the closures of packages using wrapGAppsHook.
+
+
+
+ The setup hook currently does not work in expressions with strictDeps enabled, like Python packages. In those cases, you will need to disable it with strictDeps = false;.
+
+
+
+
+
+ Setup hooks of gst_all_1.gstreamer and gnome3.grilo will populate the GST_PLUGIN_SYSTEM_PATH_1_0 and GRL_PLUGIN_PATH variables, respectively, which will then be added to the wrapper by wrapGAppsHook.
+
+
+
+
+
+
+ You can also pass additional arguments to makeWrapper using gappsWrapperArgs in preFixup hook:
+
+preFixup = ''
+ gappsWrapperArgs+=(
+ # Thumbnailers
+ --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
+ --prefix XDG_DATA_DIRS : "${librsvg}/share"
+ --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+ )
+'';
+
+
+
+
+
+ Updating GNOME packages
+
+
+ Most GNOME package offer updateScript, it is therefore possible to update to latest source tarball by running nix-shell maintainers/scripts/update.nix --argstr package gnome3.nautilus or even en masse with nix-shell maintainers/scripts/update.nix --argstr path gnome3. Read the package’s NEWS file to see what changed.
+
+
+
+
+ Frequently encountered issues
+
+
+
+
+ GLib-GIO-ERROR **: 06:04:50.903: No GSettings schemas are installed on the system
+
+
+
+ There are no schemas avalable in XDG_DATA_DIRS. Temporarily add a random package containing schemas like gsettings-desktop-schemas to buildInputs. glib and wrapGAppsHook setup hooks will take care of making the schemas available to application and you will see the actual missing schemas with the next error. Or you can try looking through the source code for the actual schemas used.
+
+
+
+
+
+ GLib-GIO-ERROR **: 06:04:50.903: Settings schema ‘org.gnome.foo’ is not installed
+
+
+
+ Package is missing some GSettings schemas. You can find out the package containing the schema with nix-locate org.gnome.foo.gschema.xml and let the hooks handle the wrapping as above.
+
+
+
+
+
+ When using wrapGAppsHook with special derivers you can end up with double wrapped binaries.
+
+
+
+ This is because derivers like python.pkgs.buildPythonApplication or qt5.mkDerivation have setup-hooks automatically added that produce wrappers with makeWrapper. The simplest way to workaround that is to disable the wrapGAppsHook automatic wrapping with dontWrapGApps = true; and pass the arguments it intended to pass to makeWrapper to another.
+
+
+ In the case of a Python application it could look like:
+
+python3.pkgs.buildPythonApplication {
+ pname = "gnome-music";
+ version = "3.32.2";
+
+ nativeBuildInputs = [
+ wrapGAppsHook
+ gobject-introspection
+ ...
+ ];
+
+ dontWrapGApps = true;
+
+ # Arguments to be passed to `makeWrapper`, only used by buildPython*
+ makeWrapperArgs = [
+ "\${gappsWrapperArgs[@]}"
+ ];
+}
+
+ And for a QT app like:
+
+mkDerivation {
+ pname = "calibre";
+ version = "3.47.0";
+
+ nativeBuildInputs = [
+ wrapGAppsHook
+ qmake
+ ...
+ ];
+
+ dontWrapGApps = true;
+
+ # Arguments to be passed to `makeWrapper`, only used by qt5’s mkDerivation
+ qtWrapperArgs [
+ "\${gappsWrapperArgs[@]}"
+ ];
+}
+
+
+
+
+
+
+ I am packaging a project that cannot be wrapped, like a library or GNOME Shell extension.
+
+
+
+ You can rely on applications depending on the library set the necessary environment variables but that it often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples:
+
+
+
+ Replacing a GI_TYPELIB_PATH in GNOME Shell extension – we are using substituteAll to include the path to a typelib into a patch.
+
+
+
+
+ The following examples are hardcoding GSettings schema paths. To get the schema paths we use the functions
+
+
+
+ glib.getSchemaPath Takes a nix package attribute as an argument.
+
+
+
+
+ glib.makeSchemaPath Takes a package output like $out and a derivation name. You should use this if the schemas you need to hardcode are in the same derivation.
+
+
+
+
+
+ Hard-coding GSettings schema path in Vala plug-in (dynamically loaded library) – here, substituteAll cannot be used since the schema comes from the same package preventing us from pass its path to the function, probably due to a Nix bug.
+
+
+ Hard-coding GSettings schema path in C library – nothing special other than using Coccinelle patch to generate the patch itself.
+
+
+
+
+
+
+
+
+
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index cd4e95cfae69..5836294b7748 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -14,6 +14,7 @@
+
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 4963c97a6c9a..88dc42ebc6c2 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -540,7 +540,8 @@ and the aliases
#### `buildPythonPackage` function
The `buildPythonPackage` function is implemented in
-`pkgs/development/interpreters/python/build-python-package.nix`
+`pkgs/development/interpreters/python/mk-python-derivation`
+using setup hooks.
The following is an example:
```nix
@@ -797,6 +798,22 @@ such as `ignoreCollisions = true` or `postBuild`. If you need them, you have to
Python 2 namespace packages may provide `__init__.py` that collide. In that case `python.buildEnv`
should be used with `ignoreCollisions = true`.
+#### Setup hooks
+
+The following are setup hooks specifically for Python packages. Most of these are
+used in `buildPythonPackage`.
+
+- `flitBuildHook` to build a wheel using `flit`.
+- `pipBuildHook` to build a wheel using `pip` and PEP 517. Note a build system (e.g. `setuptools` or `flit`) should still be added as `nativeBuildInput`.
+- `pipInstallHook` to install wheels.
+- `pytestCheckHook` to run tests with `pytest`.
+- `pythonCatchConflictsHook` to check whether a Python package is not already existing.
+- `pythonImportsCheckHook` to check whether importing the listed modules works.
+- `pythonRemoveBinBytecode` to remove bytecode from the `/bin` folder.
+- `setuptoolsBuildHook` to build a wheel using `setuptools`.
+- `setuptoolsCheckHook` to run tests with `python setup.py test`.
+- `wheelUnpackHook` to move a wheel to the correct folder so it can be installed with the `pipInstallHook`.
+
### Development mode
Development or editable mode is supported. To develop Python packages
diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md
new file mode 100644
index 000000000000..e4c4ffce0432
--- /dev/null
+++ b/doc/languages-frameworks/ruby.section.md
@@ -0,0 +1,365 @@
+---
+title: Ruby
+author: Michael Fellinger
+date: 2019-05-23
+---
+
+# Ruby
+
+## User Guide
+
+### Using Ruby
+
+#### Overview
+
+Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby.
+The attribute `ruby` refers to the default Ruby interpreter, which is currently
+MRI 2.5. It's also possible to refer to specific versions, e.g. `ruby_2_6`, `jruby`, or `mruby`.
+
+In the nixpkgs tree, Ruby packages can be found throughout, depending on what
+they do, and are called from the main package set. Ruby gems, however are
+separate sets, and there's one default set for each interpreter (currently MRI
+only).
+
+There are two main approaches for using Ruby with gems.
+One is to use a specifically locked `Gemfile` for an application that has very strict dependencies.
+The other is to depend on the common gems, which we'll explain further down, and
+rely on them being updated regularly.
+
+The interpreters have common attributes, namely `gems`, and `withPackages`. So
+you can refer to `ruby.gems.nokogiri`, or `ruby_2_5.gems.nokogiri` to get the
+Nokogiri gem already compiled and ready to use.
+
+Since not all gems have executables like `nokogiri`, it's usually more
+convenient to use the `withPackages` function like this:
+`ruby.withPackages (p: with p; [ nokogiri ])`. This will also make sure that the
+Ruby in your environment will be able to find the gem and it can be used in your
+Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"`
+as usual.
+
+#### Temporary Ruby environment with `nix-shell`
+
+Rather than having a single Ruby environment shared by all Ruby
+development projects on a system, Nix allows you to create separate
+environments per project. `nix-shell` gives you the possibility to
+temporarily load another environment akin to a combined `chruby` or
+`rvm` and `bundle exec`.
+
+There are two methods for loading a shell with Ruby packages. The first and
+recommended method is to create an environment with `ruby.withPackages` and load
+that.
+
+```shell
+nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])"
+```
+
+The other method, which is not recommended, is to create an environment and list
+all the packages directly.
+
+```shell
+nix-shell -p ruby.gems.nokogiri ruby.gems.pry
+```
+
+Again, it's possible to launch the interpreter from the shell. The Ruby
+interpreter has the attribute `gems` which contains all Ruby gems for that
+specific interpreter.
+
+##### Load environment from `.nix` expression
+
+As explained in the Nix manual, `nix-shell` can also load an expression from a
+`.nix` file. Say we want to have Ruby 2.5, `nokogori`, and `pry`. Consider a
+`shell.nix` file with:
+
+```nix
+with import {};
+ruby.withPackages (ps: with ps; [ nokogiri pry ])
+```
+
+What's happening here?
+
+1. We begin with importing the Nix Packages collections. `import `
+ imports the `` function, `{}` calls it and the `with` statement
+ brings all attributes of `nixpkgs` in the local scope. These attributes form
+ the main package set.
+2. Then we create a Ruby environment with the `withPackages` function.
+3. The `withPackages` function expects us to provide a function as an argument
+ that takes the set of all ruby gems and returns a list of packages to include
+ in the environment. Here, we select the packages `nokogiri` and `pry` from
+ the package set.
+
+##### Execute command with `--run`
+
+A convenient flag for `nix-shell` is `--run`. It executes a command in the
+`nix-shell`. We can e.g. directly open a `pry` REPL:
+
+```shell
+nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry"
+```
+
+Or immediately require `nokogiri` in pry:
+
+```shell
+nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry -rnokogiri"
+```
+
+Or run a script using this environment:
+
+```shell
+nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "ruby example.rb"
+```
+
+##### Using `nix-shell` as shebang
+
+In fact, for the last case, there is a more convenient method. You can add a
+[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script
+specifying which dependencies `nix-shell` needs. With the following shebang, you
+can just execute `./example.rb`, and it will run with all dependencies.
+
+```ruby
+#! /usr/bin/env nix-shell
+#! nix-shell -i ruby -p "ruby.withPackages (ps: with ps; [ nokogiri rest-client ])"
+
+require 'nokogiri'
+require 'rest-client'
+
+body = RestClient.get('http://example.com').body
+puts Nokogiri::HTML(body).at('h1').text
+```
+
+### Developing with Ruby
+
+#### Using an existing Gemfile
+
+In most cases, you'll already have a `Gemfile.lock` listing all your dependencies.
+This can be used to generate a `gemset.nix` which is used to fetch the gems and
+combine them into a single environment.
+The reason why you need to have a separate file for this, is that Nix requires
+you to have a checksum for each input to your build.
+Since the `Gemfile.lock` that `bundler` generates doesn't provide us with
+checksums, we have to first download each gem, calculate its SHA256, and store
+it in this separate file.
+
+So the steps from having just a `Gemfile` to a `gemset.nix` are:
+
+```shell
+bundle lock
+bundix
+```
+
+If you already have a `Gemfile.lock`, you can simply run `bundix` and it will
+work the same.
+
+To update the gems in your `Gemfile.lock`, you may use the `bundix -l` flag,
+which will create a new `Gemfile.lock` in case the `Gemfile` has a more recent
+time of modification.
+
+Once the `gemset.nix` is generated, it can be used in a
+`bundlerEnv` derivation. Here is an example you could use for your `shell.nix`:
+
+```nix
+# ...
+let
+ gems = bundlerEnv {
+ name = "gems-for-some-project";
+ gemdir = ./.;
+ };
+in mkShell { buildInputs = [ gems gems.wrappedRuby ]; }
+```
+
+With this file in your directory, you can run `nix-shell` to build and use the gems.
+The important parts here are `bundlerEnv` and `wrappedRuby`.
+
+The `bundlerEnv` is a wrapper over all the gems in your gemset. This means that
+all the `/lib` and `/bin` directories will be available, and the executables of
+all gems (even of indirect dependencies) will end up in your `$PATH`.
+The `wrappedRuby` provides you with all executables that come with Ruby itself,
+but wrapped so they can easily find the gems in your gemset.
+
+One common issue that you might have is that you have Ruby 2.6, but also
+`bundler` in your gemset. That leads to a conflict for `/bin/bundle` and
+`/bin/bundler`. You can resolve this by wrapping either your Ruby or your gems
+in a `lowPrio` call. So in order to give the `bundler` from your gemset
+priority, it would be used like this:
+
+```nix
+# ...
+mkShell { buildInputs = [ gems (lowPrio gems.wrappedRuby) ]; }
+```
+
+
+#### Gem-specific configurations and workarounds
+
+In some cases, especially if the gem has native extensions, you might need to
+modify the way the gem is built.
+
+This is done via a common configuration file that includes all of the
+workarounds for each gem.
+
+This file lives at `/pkgs/development/ruby-modules/gem-config/default.nix`,
+since it already contains a lot of entries, it should be pretty easy to add the
+modifications you need for your needs.
+
+In the meanwhile, or if the modification is for a private gem, you can also add
+the configuration to only your own environment.
+
+Two places that allow this modification are the `ruby` derivation, or `bundlerEnv`.
+
+Here's the `ruby` one:
+
+```nix
+{ pg_version ? "10", pkgs ? import { } }:
+let
+ myRuby = pkgs.ruby.override {
+ defaultGemConfig = pkgs.defaultGemConfig // {
+ pg = attrs: {
+ buildFlags =
+ [ "--with-pg-config=${pkgs."postgresql_${pg_version}"}/bin/pg_config" ];
+ };
+ };
+ };
+in myRuby.withPackages (ps: with ps; [ pg ])
+```
+
+And an example with `bundlerEnv`:
+
+```nix
+{ pg_version ? "10", pkgs ? import { } }:
+let
+ gems = pkgs.bundlerEnv {
+ name = "gems-for-some-project";
+ gemdir = ./.;
+ gemConfig = pkgs.defaultGemConfig // {
+ pg = attrs: {
+ buildFlags =
+ [ "--with-pg-config=${pkgs."postgresql_${pg_version}"}/bin/pg_config" ];
+ };
+ };
+ };
+in mkShell { buildInputs = [ gems gems.wrappedRuby ]; }
+```
+
+And finally via overlays:
+
+```nix
+{ pg_version ? "10" }:
+let
+ pkgs = import {
+ overlays = [
+ (self: super: {
+ defaultGemConfig = super.defaultGemConfig // {
+ pg = attrs: {
+ buildFlags = [
+ "--with-pg-config=${
+ pkgs."postgresql_${pg_version}"
+ }/bin/pg_config"
+ ];
+ };
+ };
+ })
+ ];
+ };
+in pkgs.ruby.withPackages (ps: with ps; [ pg ])
+```
+
+Then we can get whichever postgresql version we desire and the `pg` gem will
+always reference it correctly:
+
+```shell
+$ nix-shell --argstr pg_version 9_4 --run 'ruby -rpg -e "puts PG.library_version"'
+90421
+
+$ nix-shell --run 'ruby -rpg -e "puts PG.library_version"'
+100007
+```
+
+Of course for this use-case one could also use overlays since the configuration
+for `pg` depends on the `postgresql` alias, but for demonstration purposes this
+has to suffice.
+
+#### Adding a gem to the default gemset
+
+Now that you know how to get a working Ruby environment with Nix, it's time to
+go forward and start actually developing with Ruby.
+We will first have a look at how Ruby gems are packaged on Nix. Then, we will
+look at how you can use development mode with your code.
+
+All gems in the standard set are automatically generated from a single
+`Gemfile`. The dependency resolution is done with `bundler` and makes it more
+likely that all gems are compatible to each other.
+
+In order to add a new gem to nixpkgs, you can put it into the
+`/pkgs/development/ruby-modules/with-packages/Gemfile` and run
+`./maintainers/scripts/update-ruby-packages`.
+
+To test that it works, you can then try using the gem with:
+
+```shell
+NIX_PATH=nixpkgs=$PWD nix-shell -p "ruby.withPackages (ps: with ps; [ name-of-your-gem ])"
+```
+
+#### Packaging applications
+
+A common task is to add a ruby executable to nixpkgs, popular examples would be
+`chef`, `jekyll`, or `sass`. A good way to do that is to use the `bundlerApp`
+function, that allows you to make a package that only exposes the listed
+executables, otherwise the package may cause conflicts through common paths like
+`bin/rake` or `bin/bundler` that aren't meant to be used.
+
+The absolute easiest way to do that is to write a
+`Gemfile` along these lines:
+
+```ruby
+source 'https://rubygems.org' do
+ gem 'mdl'
+end
+```
+
+If you want to package a specific version, you can use the standard Gemfile
+syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable
+version anyway, it's easier to update by simply running the `bundle lock` and
+`bundix` steps again.
+
+Now you can also also make a `default.nix` that looks like this:
+
+```nix
+{ lib, bundlerApp }:
+
+bundlerApp {
+ pname = "mdl";
+ gemdir = ./.;
+ exes = [ "mdl" ];
+}
+```
+
+All that's left to do is to generate the corresponding `Gemfile.lock` and
+`gemset.nix` as described above in the `Using an existing Gemfile` section.
+
+##### Packaging executables that require wrapping
+
+Sometimes your app will depend on other executables at runtime, and tries to
+find it through the `PATH` environment variable.
+
+In this case, you can provide a `postBuild` hook to `bundlerApp` that wraps the
+gem in another script that prefixes the `PATH`.
+
+Of course you could also make a custom `gemConfig` if you know exactly how to
+patch it, but it's usually much easier to maintain with a simple wrapper so the
+patch doesn't have to be adjusted for each version.
+
+Here's another example:
+
+```nix
+{ lib, bundlerApp, makeWrapper, git, gnutar, gzip }:
+
+bundlerApp {
+ pname = "r10k";
+ gemdir = ./.;
+ exes = [ "r10k" ];
+
+ buildInputs = [ makeWrapper ];
+
+ postBuild = ''
+ wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]}
+ '';
+}
+```
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index fe5929656565..16003fb4acfb 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -699,7 +699,7 @@ passthru = {
-
+
passthru.updateScript
@@ -2629,13 +2629,11 @@ addEnvHooks "$hostOffset" myBashFunction
- GStreamer
+ GNOME platform
- Adds the GStreamer plugins subdirectory of each build input to the
- GST_PLUGIN_SYSTEM_PATH_1_0 or
- GST_PLUGIN_SYSTEM_PATH environment variable.
+ Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in .
@@ -2714,6 +2712,49 @@ nativeBuildInputs = [ breakpointHook ];
+
+
+ installShellFiles
+
+
+
+ This hook helps with installing manpages and shell completion files. It
+ exposes 2 shell functions installManPage and
+ installShellCompletion that can be used from your
+ postInstall hook.
+
+
+ The installManPage function takes one or more paths
+ to manpages to install. The manpages must have a section suffix, and may
+ optionally be compressed (with .gz suffix). This
+ function will place them into the correct directory.
+
+
+ The installShellCompletion function takes one or more
+ paths to shell completion files. By default it will autodetect the shell
+ type from the completion file extension, but you may also specify it by
+ passing one of --bash, --fish, or
+ --zsh. These flags apply to all paths listed after
+ them (up until another shell flag is given). Each path may also have a
+ custom installation name provided by providing a flag --name
+ NAME before the path. If this flag is not provided, zsh
+ completions will be renamed automatically such that
+ foobar.zsh becomes _foobar.
+
+nativeBuildInputs = [ installShellFiles ];
+postInstall = ''
+ installManPage doc/foobar.1 doc/barfoo.3
+ # explicit behavior
+ installShellCompletion --bash --name foobar.bash share/completions.bash
+ installShellCompletion --fish --name foobar.fish share/completions.fish
+ installShellCompletion --zsh --name _foobar share/completions.zsh
+ # implicit behavior
+ installShellCompletion share/completions/foobar.{bash,fish,zsh}
+'';
+
+
+
+
libiconv, libintl
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index d374d229f597..086c3d746fc1 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -354,7 +354,7 @@ rec {
=> { a = ["x" "y"]; b = ["z"] }
*/
zipAttrsWith = f: sets: zipAttrsWithNames (concatMap attrNames sets) f sets;
- /* Like `zipAttrsWith' with `(name: values: value)' as the function.
+ /* Like `zipAttrsWith' with `(name: values: values)' as the function.
Example:
zipAttrs [{a = "x";} {a = "y"; b = "z";}]
diff --git a/lib/customisation.nix b/lib/customisation.nix
index 1f5eb0d11e8b..3be36fcd719b 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -47,7 +47,7 @@ rec {
/* `makeOverridable` takes a function from attribute set to attribute set and
- injects `override` attibute which can be used to override arguments of
+ injects `override` attribute which can be used to override arguments of
the function.
nix-repl> x = {a, b}: { result = a + b; }
diff --git a/lib/deprecated.nix b/lib/deprecated.nix
index 15de50456612..155d6f0c3611 100644
--- a/lib/deprecated.nix
+++ b/lib/deprecated.nix
@@ -24,7 +24,7 @@ rec {
let arg = (merger init (defaultMergeArg init x));
# now add the function with composed args already applied to the final attrs
base = (setAttrMerge "passthru" {} (f arg)
- ( z: z // rec {
+ ( z: z // {
function = foldArgs merger f arg;
args = (lib.attrByPath ["passthru" "args"] {} z) // x;
} ));
diff --git a/lib/kernel.nix b/lib/kernel.nix
index 5923011774b1..36ea30838289 100644
--- a/lib/kernel.nix
+++ b/lib/kernel.nix
@@ -1,7 +1,7 @@
{ lib, version }:
with lib;
-rec {
+{
# Common patterns/legacy
whenAtLeast = ver: mkIf (versionAtLeast version ver);
whenOlder = ver: mkIf (versionOlder version ver);
diff --git a/lib/licenses.nix b/lib/licenses.nix
index c964060d2a5c..83e1ec7748d5 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -7,7 +7,7 @@ let
in
-lib.mapAttrs (n: v: v // { shortName = n; }) rec {
+lib.mapAttrs (n: v: v // { shortName = n; }) {
/* License identifiers from spdx.org where possible.
* If you cannot find your license here, then look for a similar license or
* add it to this list. The URL mentioned above is a good source for inspiration.
diff --git a/lib/lists.nix b/lib/lists.nix
index e4fcf959b60c..f9f30412770a 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -88,7 +88,7 @@ rec {
/* Strict version of `foldl`.
The difference is that evaluation is forced upon access. Usually used
- with small whole results (in contract with lazily-generated list or large
+ with small whole results (in contrast with lazily-generated list or large
lists where only a part is consumed.)
Type: foldl' :: (b -> a -> b) -> b -> [a] -> b
@@ -459,11 +459,11 @@ rec {
if length list < 2
then # finish
{ result = list; }
- else if dfsthis ? "cycle"
+ else if dfsthis ? cycle
then # there's a cycle, starting from the current vertex, return it
{ cycle = reverseList ([ dfsthis.cycle ] ++ dfsthis.visited);
inherit (dfsthis) loops; }
- else if toporest ? "cycle"
+ else if toporest ? cycle
then # there's a cycle somewhere else in the graph, return it
toporest
# Slow, but short. Can be made a bit faster with an explicit stack.
diff --git a/lib/sources.nix b/lib/sources.nix
index c4680087b245..51bcf5559e32 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -36,18 +36,47 @@ rec {
# allowing you to chain multiple calls together without any
# intermediate copies being put in the nix store.
#
- # lib.cleanSourceWith f (lib.cleanSourceWith g ./.) # Succeeds!
- # builtins.filterSource f (builtins.filterSource g ./.) # Fails!
- cleanSourceWith = { filter, src }:
+ # lib.cleanSourceWith {
+ # filter = f;
+ # src = lib.cleanSourceWith {
+ # filter = g;
+ # src = ./.;
+ # };
+ # }
+ # # Succeeds!
+ #
+ # builtins.filterSource f (builtins.filterSource g ./.)
+ # # Fails!
+ #
+ # Parameters:
+ #
+ # src: A path or cleanSourceWith result to filter and/or rename.
+ #
+ # filter: A function (path -> type -> bool)
+ # Optional with default value: constant true (include everything)
+ # The function will be combined with the && operator such
+ # that src.filter is called lazily.
+ # For implementing a filter, see
+ # https://nixos.org/nix/manual/#builtin-filterSource
+ #
+ # name: Optional name to use as part of the store path.
+ # This defaults `src.name` or otherwise `baseNameOf src`.
+ # We recommend setting `name` whenever `src` is syntactically `./.`.
+ # Otherwise, you depend on `./.`'s name in the parent directory,
+ # which can cause inconsistent names, defeating caching.
+ #
+ cleanSourceWith = { filter ? _path: _type: true, src, name ? null }:
let
isFiltered = src ? _isLibCleanSourceWith;
origSrc = if isFiltered then src.origSrc else src;
filter' = if isFiltered then name: type: filter name type && src.filter name type else filter;
+ name' = if name != null then name else if isFiltered then src.name else baseNameOf src;
in {
inherit origSrc;
filter = filter';
- outPath = builtins.filterSource filter' origSrc;
+ outPath = builtins.path { filter = filter'; path = origSrc; name = name'; };
_isLibCleanSourceWith = true;
+ name = name';
};
# Filter sources by a list of regular expressions.
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 8aa413f53817..0c0cdf1f11b1 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -58,13 +58,13 @@ rec {
uname = {
# uname -s
system = {
- "linux" = "Linux";
- "windows" = "Windows";
- "darwin" = "Darwin";
- "netbsd" = "NetBSD";
- "freebsd" = "FreeBSD";
- "openbsd" = "OpenBSD";
- "wasi" = "Wasi";
+ linux = "Linux";
+ windows = "Windows";
+ darwin = "Darwin";
+ netbsd = "NetBSD";
+ freebsd = "FreeBSD";
+ openbsd = "OpenBSD";
+ wasi = "Wasi";
}.${final.parsed.kernel.name} or null;
# uname -p
@@ -86,10 +86,10 @@ rec {
else if final.isx86_64 then "x86_64"
else if final.isx86 then "i386"
else {
- "powerpc" = "ppc";
- "powerpcle" = "ppc";
- "powerpc64" = "ppc64";
- "powerpc64le" = "ppc64le";
+ powerpc = "ppc";
+ powerpcle = "ppc";
+ powerpc64 = "ppc64";
+ powerpc64le = "ppc64le";
}.${final.parsed.cpu.name} or final.parsed.cpu.name;
emulator = pkgs: let
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 823f6a915d6e..8e02fcb5de0c 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -33,7 +33,7 @@ let
filterDoubles = f: map parse.doubleFromSystem (lists.filter f allParsed);
-in rec {
+in {
inherit all;
none = [];
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index aa55438de082..511ae1979485 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -24,27 +24,27 @@ rec {
platform = platforms.powernv;
};
- sheevaplug = rec {
+ sheevaplug = {
config = "armv5tel-unknown-linux-gnueabi";
platform = platforms.sheevaplug;
};
- raspberryPi = rec {
+ raspberryPi = {
config = "armv6l-unknown-linux-gnueabihf";
platform = platforms.raspberrypi;
};
- armv7l-hf-multiplatform = rec {
+ armv7l-hf-multiplatform = {
config = "armv7l-unknown-linux-gnueabihf";
platform = platforms.armv7l-hf-multiplatform;
};
- aarch64-multiplatform = rec {
+ aarch64-multiplatform = {
config = "aarch64-unknown-linux-gnu";
platform = platforms.aarch64-multiplatform;
};
- armv7a-android-prebuilt = rec {
+ armv7a-android-prebuilt = {
config = "armv7a-unknown-linux-androideabi";
sdkVer = "24";
ndkVer = "18b";
@@ -52,7 +52,7 @@ rec {
useAndroidPrebuilt = true;
};
- aarch64-android-prebuilt = rec {
+ aarch64-android-prebuilt = {
config = "aarch64-unknown-linux-android";
sdkVer = "24";
ndkVer = "18b";
@@ -65,17 +65,17 @@ rec {
inherit (platform.gcc) fpu;
};
- pogoplug4 = rec {
+ pogoplug4 = {
config = "armv5tel-unknown-linux-gnueabi";
platform = platforms.pogoplug4;
};
- ben-nanonote = rec {
+ ben-nanonote = {
config = "mipsel-unknown-linux-uclibc";
platform = platforms.ben_nanonote;
};
- fuloongminipc = rec {
+ fuloongminipc = {
config = "mipsel-unknown-linux-gnu";
platform = platforms.fuloong2f_n32;
};
@@ -236,4 +236,9 @@ rec {
useLLVM = true;
};
+ # Ghcjs
+ ghcjs = {
+ config = "js-unknown-ghcjs";
+ platform = {};
+ };
}
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 9a12e3c3926d..8a983b3d3637 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -12,7 +12,7 @@ rec {
isx86_32 = { cpu = { family = "x86"; bits = 32; }; };
isx86_64 = { cpu = { family = "x86"; bits = 64; }; };
isPowerPC = { cpu = cpuTypes.powerpc; };
- isPower = { cpu = { family = "power"; }; };
+ isPower = { cpu = { family = "power"; }; };
isx86 = { cpu = { family = "x86"; }; };
isAarch32 = { cpu = { family = "arm"; bits = 32; }; };
isAarch64 = { cpu = { family = "arm"; bits = 64; }; };
@@ -23,6 +23,7 @@ rec {
isMsp430 = { cpu = { family = "msp430"; }; };
isAvr = { cpu = { family = "avr"; }; };
isAlpha = { cpu = { family = "alpha"; }; };
+ isJavaScript = { cpu = cpuTypes.js; };
is32bit = { cpu = { bits = 32; }; };
is64bit = { cpu = { bits = 64; }; };
@@ -44,6 +45,7 @@ rec {
isCygwin = { kernel = kernels.windows; abi = abis.cygnus; };
isMinGW = { kernel = kernels.windows; abi = abis.gnu; };
isWasi = { kernel = kernels.wasi; };
+ isGhcjs = { kernel = kernels.ghcjs; };
isNone = { kernel = kernels.none; };
isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index b088cd342f12..5e12df32ffdd 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -106,11 +106,13 @@ rec {
wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; };
wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; };
-
+
alpha = { bits = 64; significantByte = littleEndian; family = "alpha"; };
msp430 = { bits = 16; significantByte = littleEndian; family = "msp430"; };
avr = { bits = 8; family = "avr"; };
+
+ js = { bits = 32; significantByte = littleEndian; family = "js"; };
};
# Determine where two CPUs are compatible with each other. That is,
@@ -271,6 +273,7 @@ rec {
solaris = { execFormat = elf; families = { }; };
wasi = { execFormat = wasm; families = { }; };
windows = { execFormat = pe; families = { }; };
+ ghcjs = { execFormat = unknown; families = { }; };
} // { # aliases
# 'darwin' is the kernel for all of them. We choose macOS by default.
darwin = kernels.macos;
@@ -384,6 +387,8 @@ rec {
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 1; abi = elemAt l 2; }
+ else if (elemAt l 2 == "ghcjs")
+ then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 2; }
else throw "Target specification with 3 components is ambiguous";
"4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
}.${toString (length l)}
@@ -403,7 +408,7 @@ rec {
getKernel = name: kernels.${name} or (throw "Unknown kernel: ${name}");
getAbi = name: abis.${name} or (throw "Unknown ABI: ${name}");
- parsed = rec {
+ parsed = {
cpu = getCpu args.cpu;
vendor =
/**/ if args ? vendor then getVendor args.vendor
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index a2b43c970a41..ab3cf1d54301 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -456,16 +456,16 @@ rec {
};
selectBySystem = system: {
- "i486-linux" = pc32;
- "i586-linux" = pc32;
- "i686-linux" = pc32;
- "x86_64-linux" = pc64;
- "armv5tel-linux" = sheevaplug;
- "armv6l-linux" = raspberrypi;
- "armv7a-linux" = armv7l-hf-multiplatform;
- "armv7l-linux" = armv7l-hf-multiplatform;
- "aarch64-linux" = aarch64-multiplatform;
- "mipsel-linux" = fuloong2f_n32;
- "powerpc64le-linux" = powernv;
+ i486-linux = pc32;
+ i586-linux = pc32;
+ i686-linux = pc32;
+ x86_64-linux = pc64;
+ armv5tel-linux = sheevaplug;
+ armv6l-linux = raspberrypi;
+ armv7a-linux = armv7l-hf-multiplatform;
+ armv7l-linux = armv7l-hf-multiplatform;
+ aarch64-linux = aarch64-multiplatform;
+ mipsel-linux = fuloong2f_n32;
+ powerpc64le-linux = powernv;
}.${system} or pcBase;
}
diff --git a/lib/trivial.nix b/lib/trivial.nix
index f2710a6f0338..54c66cfce7b9 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -134,7 +134,7 @@ rec {
On each release the first letter is bumped and a new animal is chosen
starting with that new letter.
*/
- codeName = "Loris";
+ codeName = "Markhor";
/* Returns the current nixpkgs version suffix as string. */
versionSuffix =
diff --git a/lib/types.nix b/lib/types.nix
index 9c00656ab918..5e9a28ac4f0a 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -42,7 +42,7 @@ rec {
# Default type functor
defaultFunctor = name: {
inherit name;
- type = types."${name}" or null;
+ type = types.${name} or null;
wrapped = null;
payload = null;
binOp = a: b: null;
@@ -107,7 +107,7 @@ rec {
merge = mergeEqualOption;
};
- int = mkOptionType rec {
+ int = mkOptionType {
name = "int";
description = "signed integer";
check = isInt;
@@ -136,7 +136,7 @@ rec {
sign = bit: range: ign (0 - (range / 2)) (range / 2 - 1)
"signedInt${toString bit}" "${toString bit} bit signed integer";
- in rec {
+ in {
/* An int with a fixed range.
*
* Example:
@@ -172,7 +172,7 @@ rec {
# Alias of u16 for a port number
port = ints.u16;
- float = mkOptionType rec {
+ float = mkOptionType {
name = "float";
description = "floating point number";
check = isFloat;
@@ -217,7 +217,8 @@ rec {
# Deprecated; should not be used because it quietly concatenates
# strings, which is usually not what you want.
- string = separatedString "";
+ string = warn "types.string is deprecated because it quietly concatenates strings"
+ (separatedString "");
attrs = mkOptionType {
name = "attrs";
diff --git a/lib/versions.nix b/lib/versions.nix
index 8f7f98ff5e1e..2c05445b3dd0 100644
--- a/lib/versions.nix
+++ b/lib/versions.nix
@@ -7,7 +7,7 @@ let
in
-rec {
+{
/* Get the major version string from a string.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 94ef79ee387b..f28161573dd0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1225,11 +1225,15 @@
githubId = 25088352;
name = "Christian Kögler";
};
- ckampka = {
+ kampka = {
email = "christian@kampka.net";
github = "kampka";
githubId = 422412;
name = "Christian Kampka";
+ keys = [{
+ longkeyid = "ed25519/0x1CBE9645DD68E915";
+ fingerprint = "F7FA 0BD0 8775 337C F6AB 4A14 1CBE 9645 DD68 E915";
+ }];
};
ckauhaus = {
email = "kc@flyingcircus.io";
@@ -1633,6 +1637,12 @@
githubId = 10913120;
name = "Dje4321";
};
+ dkabot = {
+ email = "dkabot@dkabot.com";
+ github = "dkabot";
+ githubId = 1316469;
+ name = "Naomi Morse";
+ };
dmalikov = {
email = "malikov.d.y@gmail.com";
github = "dmalikov";
@@ -2091,7 +2101,7 @@
githubId = 2817965;
name = "f--t";
};
- f-breidenstein = {
+ fleaz = {
email = "mail@felixbreidenstein.de";
github = "fleaz";
githubId = 2489598;
@@ -2592,6 +2602,15 @@
email = "t@larkery.com";
name = "Tom Hinton";
};
+ hkjn = {
+ email = "me@hkjn.me";
+ name = "Henrik Jonsson";
+ github = "hkjn";
+ keys = [{
+ longkeyid = "rsa4096/0x03EFBF839A5FDC15";
+ fingerprint = "D618 7A03 A40A 3D56 62F5 4B46 03EF BF83 9A5F DC15";
+ }];
+ };
hlolli = {
email = "hlolli@gmail.com";
github = "hlolli";
@@ -3069,6 +3088,16 @@
githubId = 8735102;
name = "John Ramsden";
};
+ jojosch = {
+ name = "Johannes Schleifenbaum";
+ email = "johannes@js-webcoding.de";
+ github = "jojosch";
+ githubId = 327488;
+ keys = [{
+ longkeyid = "ed25519/059093B1A278BCD0";
+ fingerprint = "7249 70E6 A661 D84E 8B47 678A 0590 93B1 A278 BCD0";
+ }];
+ };
joko = {
email = "ioannis.koutras@gmail.com";
github = "jokogr";
@@ -3229,6 +3258,12 @@
githubId = 1047859;
name = "Kaz Wesley";
};
+ kcalvinalvin = {
+ email = "calvin@kcalvinalvin.info";
+ github = "kcalvinalvin";
+ githubId = 37185887;
+ name = "Calvin Kim";
+ };
kentjames = {
email = "jameschristopherkent@gmail.com";
github = "kentjames";
@@ -4584,6 +4619,12 @@
githubId = 9939720;
name = "Philippe Nguyen";
};
+ nrdxp = {
+ email = "tim.deh@pm.me";
+ github = "nrdxp";
+ githubId = 34083928;
+ name = "Tim DeHerrera";
+ };
nshalman = {
email = "nahamu@gmail.com";
github = "nshalman";
@@ -4756,6 +4797,12 @@
githubId = 11016164;
name = "Fedor Pakhomov";
};
+ pamplemousse = {
+ email = "xav.maso@gmail.com";
+ github = "Pamplemousse";
+ githubId = 2647236;
+ name = "Xavier Maso";
+ };
panaeon = {
email = "vitalii.voloshyn@gmail.com";
github = "panaeon";
@@ -5095,6 +5142,12 @@
githubId = 9568176;
name = "Piotr Halama";
};
+ puckipedia = {
+ email = "puck@puckipedia.com";
+ github = "puckipedia";
+ githubId = 488734;
+ name = "Puck Meerburg";
+ };
puffnfresh = {
email = "brian@brianmckenna.org";
github = "puffnfresh";
@@ -5403,6 +5456,12 @@
githubId = 852967;
name = "Russell O'Connor";
};
+ roelvandijk = {
+ email = "roel@lambdacube.nl";
+ github = "roelvandijk";
+ githubId = 710906;
+ name = "Roel van Dijk";
+ };
romildo = {
email = "malaquias@gmail.com";
github = "romildo";
@@ -5790,6 +5849,10 @@
github = "sikmir";
githubId = 688044;
name = "Nikolay Korotkiy";
+ keys = [{
+ longkeyid = "rsa2048/0xD1DE6D7F693663A5";
+ fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5";
+ }];
};
simonvandel = {
email = "simon.vandel@gmail.com";
diff --git a/maintainers/scripts/luarocks-config.lua b/maintainers/scripts/luarocks-config.lua
new file mode 100644
index 000000000000..89e74c00ea8e
--- /dev/null
+++ b/maintainers/scripts/luarocks-config.lua
@@ -0,0 +1,4 @@
+rocks_servers = {
+ "https://luarocks.org"
+}
+version_check_on_fail = false
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 0ec9ff3d84d9..a6fbcd5a0beb 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -52,7 +52,9 @@ luasocket,,,,,
luasql-sqlite3,,,,,vyp
luassert,,,,,
luasystem,,,,,
+luautf8,,,,,pstn
luazip,,,,,
+lua-yajl,,,,,pstn
luuid,,,,,
luv,,,,,
markdown,,,,,
diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages
index a8d67d208e38..1a31d71086fa 100755
--- a/maintainers/scripts/update-luarocks-packages
+++ b/maintainers/scripts/update-luarocks-packages
@@ -15,6 +15,7 @@ CSV_FILE="maintainers/scripts/luarocks-packages.csv"
TMP_FILE="$(mktemp)"
# Set in the update-luarocks-shell.nix
NIXPKGS_PATH="$LUAROCKS_NIXPKGS_PATH"
+export LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua"
# 10 is a pretty arbitrary number of simultaneous jobs, but it is generally
# impolite to hit a webserver with *too* many simultaneous connections :)
diff --git a/maintainers/scripts/update-ruby-packages b/maintainers/scripts/update-ruby-packages
new file mode 100755
index 000000000000..fef6b75ded08
--- /dev/null
+++ b/maintainers/scripts/update-ruby-packages
@@ -0,0 +1,13 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bundler bundix
+
+set -euf -o pipefail
+
+(
+ cd pkgs/development/ruby-modules/with-packages
+ rm -f gemset.nix Gemfile.lock
+ bundle lock
+ bundix
+ mv gemset.nix ../../../top-level/ruby-packages.nix
+ rm -f Gemfile.lock
+)
diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile
index 9ff599a0090f..b86a76005753 100644
--- a/nixos/doc/manual/Makefile
+++ b/nixos/doc/manual/Makefile
@@ -24,7 +24,7 @@ fix-misc-xml:
clean:
rm -f manual-combined.xml generated
-generated: ./options-to-docbook.xsl
+generated:
nix-build ../../release.nix \
--attr manualGeneratedSources.x86_64-linux \
--out-link ./generated
diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml
index 03b5bb53197b..34e6ab4b24d6 100644
--- a/nixos/doc/manual/configuration/customizing-packages.xml
+++ b/nixos/doc/manual/configuration/customizing-packages.xml
@@ -24,8 +24,8 @@
Apart from high-level options, it’s possible to tweak a package in almost
arbitrary ways, such as changing or disabling dependencies of a package. For
- instance, the Emacs package in Nixpkgs by default has a dependency on GTK+ 2.
- If you want to build it against GTK+ 3, you can specify that as follows:
+ instance, the Emacs package in Nixpkgs by default has a dependency on GTK 2.
+ If you want to build it against GTK 3, you can specify that as follows:
= [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ];
@@ -33,7 +33,7 @@
function that produces Emacs, with the original arguments amended by the set
of arguments specified by you. So here the function argument
gtk gets the value pkgs.gtk3, causing
- Emacs to depend on GTK+ 3. (The parentheses are necessary because in Nix,
+ Emacs to depend on GTK 3. (The parentheses are necessary because in Nix,
function application binds more weakly than list construction, so without
them, would be a list with
two elements.)
diff --git a/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixos/doc/manual/configuration/profiles/clone-config.xml
index 21c4ea75d6dd..04fa1643d0fd 100644
--- a/nixos/doc/manual/configuration/profiles/clone-config.xml
+++ b/nixos/doc/manual/configuration/profiles/clone-config.xml
@@ -16,6 +16,6 @@
On images where the installation media also becomes an installation target,
copying over configuration.nix should be disabled by
setting installer.cloneConfig to false.
- This is already done in sd-image.nix.
+ For example, this is done in sd-image-aarch64.nix.
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index 7cdc5196e0d2..f6f659b02afa 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -279,6 +279,12 @@ xkb_symbols "media"
= "setxkbmap -keycodes media";
+
+ If you are manually starting the X server, you should set the argument
+ -xkbdir /etc/X11/xkb, otherwise X won't find your layout files.
+ For example with xinit run
+ $ xinit -- -xkbdir /etc/X11/xkb
+
To learn how to write layouts take a look at the XKB
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 9cea2db610e0..f1e1568c0349 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -392,7 +392,11 @@
hardware-configuration.nix is included from
configuration.nix and will be overwritten by future
invocations of nixos-generate-config; thus, you
- generally should not modify it.)
+ generally should not modify it.) Additionally, you may want to look at
+ Hardware
+ configuration for known-hardware at this point or after
+ installation.
+
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 02b591477214..444862c5739b 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -8,6 +8,7 @@
This section lists the release notes for each stable version of NixOS and
current unstable revision.
+
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 86f4a1ccfb78..14b31b232e90 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -730,7 +730,7 @@ in
- jre now defaults to GTK+ UI by default. This improves
+ jre now defaults to GTK UI by default. This improves
visual consistency and makes Java follow system font style, improving the
situation on HighDPI displays. This has a cost of increased closure size;
for server and other headless workloads it's recommended to use
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 560b31985176..f9cea242c153 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -57,6 +57,64 @@
and simultaneously or to downgrade from Xfce 4.14 after upgrading.
+
+
+ The GNOME 3 desktop manager module sports an interface to enable/disable core services, applications, and optional GNOME packages
+ like games.
+
+ This can be achieved with the following options which the desktop manager default enables, excluding games.
+
+
+
+
+
+ With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually
+ disable options or use which only excluded the optional applications.
+ is now unguarded, it can exclude any package installed with
+ in the GNOME 3 module.
+
+
+
+
+ Orthogonal to the previous changes to the GNOME 3 desktop manager module, we've updated all default services and applications
+ to match as close as possible to a default reference GNOME 3 experience.
+
+
+ The following changes were enacted in
+
+
+ Applications removed from defaults:
+ accerciser
+ dconf-editor
+ evolution
+ gnome-documents
+ gnome-nettool
+ gnome-power-manager
+ gnome-todo
+ gnome-tweaks
+ gnome-usage
+ gucharmap
+ nautilus-sendto
+ vinagre
+
+
+ Applications added to defaults:
+ cheese
+ geary
+
+
+ The following changes were enacted in
+
+
+ Applications added to defaults:
+ gnome-color-manager
+ orca
+
+
+ Services enabled:
+
+
+
@@ -77,7 +135,43 @@
./programs/dwm-status.nix
+
+
+ The new hardware.printers module allows to declaratively configure CUPS printers
+ via the ensurePrinters and
+ ensureDefaultPrinter options.
+ ensurePrinters will never delete existing printers,
+ but will make sure that the given printers are configured as declared.
+
+
+
+
+ There is a new and module
+ for the program of the same name. If you previously had system-config-printer enabled through some other
+ means you should migrate to using one of these modules.
+
+
+ If you're a user of the following desktopManager modules no action is needed:
+
+
+
+
+
+
+
+
+
+
+
+
+ Note Mate uses programs.system-config-printer as it doesn't
+ use it as a service, but its graphical interface directly.
+
+
+
+
+
+
+
+ PostgreSQL 9.4 is scheduled EOL during the 19.09 life cycle and has been removed.
+
+
The options and
@@ -348,7 +447,37 @@
What used to be called emacsPackagesNg is now simply called emacsPackages.
-
+
+
+ is now disabled by default if stateVersion is 19.09 or higher.
+ Previously the xterm desktopManager was enabled when xserver was enabled, but it isn't useful for all people so it didn't make sense to
+ have any desktopManager enabled default.
+
+
+
+
+ The WeeChat plugin pkgs.weechatScripts.weechat-xmpp has been removed as it doesn't receive
+ any updates from upstream and depends on outdated Python2-based modules.
+
+
+
+
+ Old unsupported versions (logstash5,
+ kibana5,
+ filebeat5,
+ heartbeat5,
+ metricbeat5,
+ packetbeat5) of the ELK-stack and Elastic beats have been removed.
+
+
+
+
+ For NixOS 19.03, both Prometheus 1 and 2 were available to allow for
+ a seamless transition from version 1 to 2 with existing setups.
+ Because Prometheus 1 is no longer developed, it was removed.
+ Prometheus 2 is now configured with services.prometheus.
+
+
@@ -547,8 +676,8 @@
-
- This also configures the kernel to pass coredumps to systemd-coredump.
+ This also configures the kernel to pass coredumps to systemd-coredump,
+ and restricts the SysRq key combinations to the sync command only.
These sysctl snippets can be found in /etc/sysctl.d/50-*.conf,
and overridden via boot.kernel.sysctl
(which will place the parameters in /etc/sysctl.d/60-nixos.conf).
@@ -591,6 +720,67 @@
The defaults from fontconfig are sufficient.
+
+
+ The crashplan package and the
+ crashplan service have been removed from nixpkgs due to
+ crashplan shutting down the service, while the crashplansb
+ package and crashplan-small-business service have been
+ removed from nixpkgs due to lack of maintainer.
+
+
+ The redis module was hardcoded to use the redis user,
+ /run/redis as runtime directory and
+ /var/lib/redis as state directory.
+ Note that the NixOS module for Redis now disables kernel support for Transparent Huge Pages (THP),
+ because this features causes major performance problems for Redis,
+ e.g. (https://redis.io/topics/latency).
+
+
+
+
+ Using adds a default emoji font noto-fonts-emoji.
+
+ Users of the following options will have this enabled by default:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The altcoins categorization of packages has
+ been removed. You now access these packages at the top level,
+ ie. nix-shell -p dogecoin instead of
+ nix-shell -p altcoins.dogecoin, etc.
+
+
+
+
+ Ceph has been upgraded to v14.2.1.
+ See the release notes for details.
+ The mgr dashboard as well as osds backed by loop-devices is no longer explicitly supported by the package and module.
+ Note: There's been some issues with python-cherrypy, which is used by the dashboard
+ and prometheus mgr modules (and possibly others), hence 0000-dont-check-cherrypy-version.patch.
+
+
+
+
+ pkgs.weechat is now compiled against pkgs.python3.
+ Weechat also recommends to use Python3
+ in their docs.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
new file mode 100644
index 000000000000..c84bc8dbb379
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -0,0 +1,80 @@
+
+ Release 20.03 (“Markhor”, 2020.03/??)
+
+
+ Highlights
+
+
+ In addition to numerous new and upgraded packages, this release has the
+ following highlights:
+
+
+
+
+
+ Support is planned until the end of October 2020, handing over to 20.09.
+
+
+
+
+
+
+ New Services
+
+
+ The following new services were added since the last release:
+
+
+
+
+
+
+
+
+
+
+
+ Backward Incompatibilities
+
+
+ When upgrading from a previous release, please be aware of the following
+ incompatible changes:
+
+
+
+
+
+
+
+
+
+
+ Other Notable Changes
+
+
+
+
+
+
+
+
diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix
index 88e052106a28..35c8b543dece 100644
--- a/nixos/lib/make-options-doc/default.nix
+++ b/nixos/lib/make-options-doc/default.nix
@@ -126,7 +126,7 @@ let
}
'';
-in rec {
+in {
inherit optionsNix;
optionsAsciiDoc = lib.concatStringsSep "\n" (lib.mapAttrsToList singleAsciiDoc optionsNix);
diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix
index 779f0377a512..774f66b4804e 100644
--- a/nixos/lib/qemu-flags.nix
+++ b/nixos/lib/qemu-flags.nix
@@ -17,9 +17,9 @@ in
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";
qemuBinary = qemuPkg: {
- "x86_64-linux" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64";
- "armv7l-linux" = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
- "aarch64-linux" = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
- "x86_64-darwin" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64";
+ x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu kvm64";
+ armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
+ aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
+ x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu kvm64";
}.${pkgs.stdenv.hostPlatform.system} or "${qemuPkg}/bin/qemu-kvm";
}
diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix
index b68e55a40b90..a522834e4294 100644
--- a/nixos/lib/utils.nix
+++ b/nixos/lib/utils.nix
@@ -24,4 +24,116 @@ rec {
throw "${shell} is not a shell package"
else
shell;
+
+ /* Recurse into a list or an attrset, searching for attrs named like
+ the value of the "attr" parameter, and return an attrset where the
+ names are the corresponding jq path where the attrs were found and
+ the values are the values of the attrs.
+
+ Example:
+ recursiveGetAttrWithJqPrefix {
+ example = [
+ {
+ irrelevant = "not interesting";
+ }
+ {
+ ignored = "ignored attr";
+ relevant = {
+ secret = {
+ _secret = "/path/to/secret";
+ };
+ };
+ }
+ ];
+ } "_secret" -> { ".example[1].relevant.secret" = "/path/to/secret"; }
+ */
+ recursiveGetAttrWithJqPrefix = item: attr:
+ let
+ recurse = prefix: item:
+ if item ? ${attr} then
+ nameValuePair prefix item.${attr}
+ else if isAttrs item then
+ map (name: recurse (prefix + "." + name) item.${name}) (attrNames item)
+ else if isList item then
+ imap0 (index: item: recurse (prefix + "[${toString index}]") item) item
+ else
+ [];
+ in listToAttrs (flatten (recurse "" item));
+
+ /* Takes an attrset and a file path and generates a bash snippet that
+ outputs a JSON file at the file path with all instances of
+
+ { _secret = "/path/to/secret" }
+
+ in the attrset replaced with the contents of the file
+ "/path/to/secret" in the output JSON.
+
+ When a configuration option accepts an attrset that is finally
+ converted to JSON, this makes it possible to let the user define
+ arbitrary secret values.
+
+ Example:
+ If the file "/path/to/secret" contains the string
+ "topsecretpassword1234",
+
+ genJqSecretsReplacementSnippet {
+ example = [
+ {
+ irrelevant = "not interesting";
+ }
+ {
+ ignored = "ignored attr";
+ relevant = {
+ secret = {
+ _secret = "/path/to/secret";
+ };
+ };
+ }
+ ];
+ } "/path/to/output.json"
+
+ would generate a snippet that, when run, outputs the following
+ JSON file at "/path/to/output.json":
+
+ {
+ "example": [
+ {
+ "irrelevant": "not interesting"
+ },
+ {
+ "ignored": "ignored attr",
+ "relevant": {
+ "secret": "topsecretpassword1234"
+ }
+ }
+ ]
+ }
+ */
+ genJqSecretsReplacementSnippet = genJqSecretsReplacementSnippet' "_secret";
+
+ # Like genJqSecretsReplacementSnippet, but allows the name of the
+ # attr which identifies the secret to be changed.
+ genJqSecretsReplacementSnippet' = attr: set: output:
+ let
+ secrets = recursiveGetAttrWithJqPrefix set attr;
+ in ''
+ if [[ -h '${output}' ]]; then
+ rm '${output}'
+ fi
+ ''
+ + concatStringsSep
+ "\n"
+ (imap1 (index: name: "export secret${toString index}=$(<'${secrets.${name}}')")
+ (attrNames secrets))
+ + "\n"
+ + "${pkgs.jq}/bin/jq >'${output}' '"
+ + concatStringsSep
+ " | "
+ (imap1 (index: name: ''${name} = $ENV.secret${toString index}'')
+ (attrNames secrets))
+ + ''
+ ' <<'EOF'
+ ${builtins.toJSON set}
+ EOF
+ '';
}
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index 88d95e675447..31e15537179a 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -17,7 +17,7 @@ in {
name = mkOption {
type = types.str;
description = "The name of the generated derivation";
- default = "nixos-disk-image";
+ default = "nixos-amazon-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";
};
contents = mkOption {
@@ -42,7 +42,7 @@ in {
format = mkOption {
type = types.enum [ "raw" "qcow2" "vpc" ];
- default = "qcow2";
+ default = "vpc";
description = "The image format to output";
};
};
@@ -51,7 +51,9 @@ in {
inherit lib config;
inherit (cfg) contents format name;
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
- partitionTableType = if config.ec2.hvm then "legacy" else "none";
+ partitionTableType = if config.ec2.efi then "efi"
+ else if config.ec2.hvm then "legacy"
+ else "none";
diskSize = cfg.sizeMB;
fsType = "ext4";
configFile = pkgs.writeText "configuration.nix"
@@ -61,7 +63,27 @@ in {
${optionalString config.ec2.hvm ''
ec2.hvm = true;
''}
+ ${optionalString config.ec2.efi ''
+ ec2.efi = true;
+ ''}
}
'';
+ postVM = ''
+ extension=''${diskImage##*.}
+ friendlyName=$out/${cfg.name}.$extension
+ mv "$diskImage" "$friendlyName"
+ diskImage=$friendlyName
+
+ mkdir -p $out/nix-support
+ echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products
+
+ ${pkgs.jq}/bin/jq -n \
+ --arg label ${lib.escapeShellArg config.system.nixos.label} \
+ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \
+ --arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
+ --arg file "$diskImage" \
+ '$ARGS.named' \
+ > $out/nix-support/image-info.json
+ '';
};
}
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 790cc6cbc531..c4149e3e8ffe 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -1,279 +1,296 @@
#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p qemu ec2_ami_tools jq ec2_api_tools awscli
+#!nix-shell -p awscli -p jq -p qemu -i bash
-# To start with do: nix-shell -p awscli --run "aws configure"
+# Uploads and registers NixOS images built from the
+# amazonImage attribute. Images are uploaded and
+# registered via a home region, and then copied to other regions.
-set -e
-set -o pipefail
+# The home region requires an s3 bucket, and a "vmimport" IAM role
+# with access to the S3 bucket. Configuration of the vmimport role is
+# documented in
+# https://docs.aws.amazon.com/vm-import/latest/userguide/vmimport-image-import.html
-version=$(nix-instantiate --eval --strict '' -A lib.version | sed s/'"'//g)
-major=${version:0:5}
-echo "NixOS version is $version ($major)"
+# set -x
+set -euo pipefail
-stateDir=/home/deploy/amis/ec2-image-$version
-echo "keeping state in $stateDir"
-mkdir -p $stateDir
+# configuration
+state_dir=/home/deploy/amis/ec2-images
+home_region=eu-west-1
+bucket=nixos-amis
-rm -f ec2-amis.nix
+regions=(eu-west-1 eu-west-2 eu-west-3 eu-central-1
+ us-east-1 us-east-2 us-west-1 us-west-2
+ ca-central-1
+ ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2
+ ap-south-1 ap-east-1
+ sa-east-1)
-types="hvm"
-stores="ebs"
-regions="eu-west-1 eu-west-2 eu-west-3 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1"
+log() {
+ echo "$@" >&2
+}
-for type in $types; do
- link=$stateDir/$type
- imageFile=$link/nixos.qcow2
- system=x86_64-linux
- arch=x86_64
+if [ -z "$1" ]; then
+ log "Usage: ./upload-amazon-image.sh IMAGE_OUTPUT"
+ exit 1
+fi
- # Build the image.
- if ! [ -L $link ]; then
- if [ $type = pv ]; then hvmFlag=false; else hvmFlag=true; fi
+# result of the amazon-image from nixos/release.nix
+store_path=$1
- echo "building image type '$type'..."
- nix-build -o $link \
- '' \
- -A config.system.build.amazonImage \
- --arg configuration "{ imports = [ ]; ec2.hvm = $hvmFlag; }"
+if [ ! -e "$store_path" ]; then
+ log "Store path: $store_path does not exist, fetching..."
+ nix-store --realise "$store_path"
+fi
+
+if [ ! -d "$store_path" ]; then
+ log "store_path: $store_path is not a directory. aborting"
+ exit 1
+fi
+
+read_image_info() {
+ if [ ! -e "$store_path/nix-support/image-info.json" ]; then
+ log "Image missing metadata"
+ exit 1
+ fi
+ jq -r "$1" "$store_path/nix-support/image-info.json"
+}
+
+# We handle a single image per invocation, store all attributes in
+# globals for convenience.
+image_label=$(read_image_info .label)
+image_system=$(read_image_info .system)
+image_file=$(read_image_info .file)
+image_logical_bytes=$(read_image_info .logical_bytes)
+
+# Derived attributes
+
+image_logical_gigabytes=$((($image_logical_bytes-1)/1024/1024/1024+1)) # Round to the next GB
+
+case "$image_system" in
+ aarch64-linux)
+ amazon_arch=arm64
+ ;;
+ x86_64-linux)
+ amazon_arch=x86_64
+ ;;
+ *)
+ log "Unknown system: $image_system"
+ exit 1
+esac
+
+image_name="NixOS-${image_label}-${image_system}"
+image_description="NixOS ${image_label} ${image_system}"
+
+log "Image Details:"
+log " Name: $image_name"
+log " Description: $image_description"
+log " Size (gigabytes): $image_logical_gigabytes"
+log " System: $image_system"
+log " Amazon Arch: $amazon_arch"
+
+read_state() {
+ local state_key=$1
+ local type=$2
+
+ cat "$state_dir/$state_key.$type" 2>/dev/null || true
+}
+
+write_state() {
+ local state_key=$1
+ local type=$2
+ local val=$3
+
+ mkdir -p $state_dir
+ echo "$val" > "$state_dir/$state_key.$type"
+}
+
+wait_for_import() {
+ local region=$1
+ local task_id=$2
+ local state snapshot_id
+ log "Waiting for import task $task_id to be completed"
+ while true; do
+ read state progress snapshot_id < <(
+ aws ec2 describe-import-snapshot-tasks --region $region --import-task-ids "$task_id" | \
+ jq -r '.ImportSnapshotTasks[].SnapshotTaskDetail | "\(.Status) \(.Progress) \(.SnapshotId)"'
+ )
+ log " ... state=$state progress=$progress snapshot_id=$snapshot_id"
+ case "$state" in
+ active)
+ sleep 10
+ ;;
+ completed)
+ echo "$snapshot_id"
+ return
+ ;;
+ *)
+ log "Unexpected snapshot import state: '${state}'"
+ exit 1
+ ;;
+ esac
+ done
+}
+
+wait_for_image() {
+ local region=$1
+ local ami_id=$2
+ local state
+ log "Waiting for image $ami_id to be available"
+
+ while true; do
+ read state < <(
+ aws ec2 describe-images --image-ids "$ami_id" --region $region | \
+ jq -r ".Images[].State"
+ )
+ log " ... state=$state"
+ case "$state" in
+ pending)
+ sleep 10
+ ;;
+ available)
+ return
+ ;;
+ *)
+ log "Unexpected AMI state: '${state}'"
+ exit 1
+ ;;
+ esac
+ done
+}
+
+
+make_image_public() {
+ local region=$1
+ local ami_id=$2
+
+ wait_for_image $region "$ami_id"
+
+ log "Making image $ami_id public"
+
+ aws ec2 modify-image-attribute \
+ --image-id "$ami_id" --region "$region" --launch-permission 'Add={Group=all}' >&2
+}
+
+upload_image() {
+ local region=$1
+
+ local aws_path=${image_file#/}
+
+ local state_key="$region.$image_label.$image_system"
+ local task_id=$(read_state "$state_key" task_id)
+ local snapshot_id=$(read_state "$state_key" snapshot_id)
+ local ami_id=$(read_state "$state_key" ami_id)
+
+ if [ -z "$task_id" ]; then
+ log "Checking for image on S3"
+ if ! aws s3 ls --region "$region" "s3://${bucket}/${aws_path}" >&2; then
+ log "Image missing from aws, uploading"
+ aws s3 cp --region $region "$image_file" "s3://${bucket}/${aws_path}" >&2
+ fi
+
+ log "Importing image from S3 path s3://$bucket/$aws_path"
+
+ task_id=$(aws ec2 import-snapshot --disk-container "{
+ \"Description\": \"nixos-image-${image_label}-${image_system}\",
+ \"Format\": \"vhd\",
+ \"UserBucket\": {
+ \"S3Bucket\": \"$bucket\",
+ \"S3Key\": \"$aws_path\"
+ }
+ }" --region $region | jq -r '.ImportTaskId')
+
+ write_state "$state_key" task_id "$task_id"
fi
- for store in $stores; do
+ if [ -z "$snapshot_id" ]; then
+ snapshot_id=$(wait_for_import "$region" "$task_id")
+ write_state "$state_key" snapshot_id "$snapshot_id"
+ fi
- bucket=nixos-amis
- bucketDir="$version-$type-$store"
+ if [ -z "$ami_id" ]; then
+ log "Registering snapshot $snapshot_id as AMI"
- prevAmi=
- prevRegion=
+ local block_device_mappings=(
+ "DeviceName=/dev/sda1,Ebs={SnapshotId=$snapshot_id,VolumeSize=$image_logical_gigabytes,DeleteOnTermination=true,VolumeType=gp2}"
+ )
- for region in $regions; do
+ local extra_flags=(
+ --root-device-name /dev/sda1
+ --sriov-net-support simple
+ --ena-support
+ --virtualization-type hvm
+ )
- name=nixos-$version-$arch-$type-$store
- description="NixOS $system $version ($type-$store)"
+ block_device_mappings+=(DeviceName=/dev/sdb,VirtualName=ephemeral0)
+ block_device_mappings+=(DeviceName=/dev/sdc,VirtualName=ephemeral1)
+ block_device_mappings+=(DeviceName=/dev/sdd,VirtualName=ephemeral2)
+ block_device_mappings+=(DeviceName=/dev/sde,VirtualName=ephemeral3)
- amiFile=$stateDir/$region.$type.$store.ami-id
+ ami_id=$(
+ aws ec2 register-image \
+ --name "$image_name" \
+ --description "$image_description" \
+ --region $region \
+ --architecture $amazon_arch \
+ --block-device-mappings "${block_device_mappings[@]}" \
+ "${extra_flags[@]}" \
+ | jq -r '.ImageId'
+ )
- if ! [ -e $amiFile ]; then
+ write_state "$state_key" ami_id "$ami_id"
+ fi
- echo "doing $name in $region..."
+ make_image_public $region "$ami_id"
- if [ -n "$prevAmi" ]; then
- ami=$(aws ec2 copy-image \
- --region "$region" \
- --source-region "$prevRegion" --source-image-id "$prevAmi" \
- --name "$name" --description "$description" | jq -r '.ImageId')
- if [ "$ami" = null ]; then break; fi
- else
+ echo "$ami_id"
+}
- if [ $store = s3 ]; then
+copy_to_region() {
+ local region=$1
+ local from_region=$2
+ local from_ami_id=$3
- # Bundle the image.
- imageDir=$stateDir/$type-bundled
+ state_key="$region.$image_label.$image_system"
+ ami_id=$(read_state "$state_key" ami_id)
- # Convert the image to raw format.
- rawFile=$stateDir/$type.raw
- if ! [ -e $rawFile ]; then
- qemu-img convert -f qcow2 -O raw $imageFile $rawFile.tmp
- mv $rawFile.tmp $rawFile
- fi
+ if [ -z "$ami_id" ]; then
+ log "Copying $from_ami_id to $region"
+ ami_id=$(
+ aws ec2 copy-image \
+ --region "$region" \
+ --source-region "$from_region" \
+ --source-image-id "$from_ami_id" \
+ --name "$image_name" \
+ --description "$image_description" \
+ | jq -r '.ImageId'
+ )
- if ! [ -d $imageDir ]; then
- rm -rf $imageDir.tmp
- mkdir -p $imageDir.tmp
- ec2-bundle-image \
- -d $imageDir.tmp \
- -i $rawFile --arch $arch \
- --user "$AWS_ACCOUNT" -c "$EC2_CERT" -k "$EC2_PRIVATE_KEY"
- mv $imageDir.tmp $imageDir
- fi
+ write_state "$state_key" ami_id "$ami_id"
+ fi
- # Upload the bundle to S3.
- if ! [ -e $imageDir/uploaded ]; then
- echo "uploading bundle to S3..."
- ec2-upload-bundle \
- -m $imageDir/$type.raw.manifest.xml \
- -b "$bucket/$bucketDir" \
- -a "$AWS_ACCESS_KEY_ID" -s "$AWS_SECRET_ACCESS_KEY" \
- --location EU
- touch $imageDir/uploaded
- fi
+ make_image_public $region "$ami_id"
- extraFlags="--image-location $bucket/$bucketDir/$type.raw.manifest.xml"
+ echo "$ami_id"
+}
- else
+upload_all() {
+ home_image_id=$(upload_image "$home_region")
+ jq -n \
+ --arg key "$home_region.$image_system" \
+ --arg value "$home_image_id" \
+ '$ARGS.named'
- # Convert the image to vhd format so we don't have
- # to upload a huge raw image.
- vhdFile=$stateDir/$type.vhd
- if ! [ -e $vhdFile ]; then
- qemu-img convert -f qcow2 -O vpc $imageFile $vhdFile.tmp
- mv $vhdFile.tmp $vhdFile
- fi
-
- vhdFileLogicalBytes="$(qemu-img info "$vhdFile" | grep ^virtual\ size: | cut -f 2 -d \( | cut -f 1 -d \ )"
- vhdFileLogicalGigaBytes=$(((vhdFileLogicalBytes-1)/1024/1024/1024+1)) # Round to the next GB
-
- echo "Disk size is $vhdFileLogicalBytes bytes. Will be registered as $vhdFileLogicalGigaBytes GB."
-
- taskId=$(cat $stateDir/$region.$type.task-id 2> /dev/null || true)
- volId=$(cat $stateDir/$region.$type.vol-id 2> /dev/null || true)
- snapId=$(cat $stateDir/$region.$type.snap-id 2> /dev/null || true)
-
- # Import the VHD file.
- if [ -z "$snapId" -a -z "$volId" -a -z "$taskId" ]; then
- echo "importing $vhdFile..."
- taskId=$(ec2-import-volume $vhdFile --no-upload -f vhd \
- -O "$AWS_ACCESS_KEY_ID" -W "$AWS_SECRET_ACCESS_KEY" \
- -o "$AWS_ACCESS_KEY_ID" -w "$AWS_SECRET_ACCESS_KEY" \
- --region "$region" -z "${region}a" \
- --bucket "$bucket" --prefix "$bucketDir/" \
- | tee /dev/stderr \
- | sed 's/.*\(import-vol-[0-9a-z]\+\).*/\1/ ; t ; d')
- echo -n "$taskId" > $stateDir/$region.$type.task-id
- fi
-
- if [ -z "$snapId" -a -z "$volId" ]; then
- ec2-resume-import $vhdFile -t "$taskId" --region "$region" \
- -O "$AWS_ACCESS_KEY_ID" -W "$AWS_SECRET_ACCESS_KEY" \
- -o "$AWS_ACCESS_KEY_ID" -w "$AWS_SECRET_ACCESS_KEY"
- fi
-
- # Wait for the volume creation to finish.
- if [ -z "$snapId" -a -z "$volId" ]; then
- echo "waiting for import to finish..."
- while true; do
- volId=$(aws ec2 describe-conversion-tasks --conversion-task-ids "$taskId" --region "$region" | jq -r .ConversionTasks[0].ImportVolume.Volume.Id)
- if [ "$volId" != null ]; then break; fi
- sleep 10
- done
-
- echo -n "$volId" > $stateDir/$region.$type.vol-id
- fi
-
- # Delete the import task.
- if [ -n "$volId" -a -n "$taskId" ]; then
- echo "removing import task..."
- ec2-delete-disk-image -t "$taskId" --region "$region" \
- -O "$AWS_ACCESS_KEY_ID" -W "$AWS_SECRET_ACCESS_KEY" \
- -o "$AWS_ACCESS_KEY_ID" -w "$AWS_SECRET_ACCESS_KEY" || true
- rm -f $stateDir/$region.$type.task-id
- fi
-
- # Create a snapshot.
- if [ -z "$snapId" ]; then
- echo "creating snapshot..."
- # FIXME: this can fail with InvalidVolume.NotFound. Eventual consistency yay.
- snapId=$(aws ec2 create-snapshot --volume-id "$volId" --region "$region" --description "$description" | jq -r .SnapshotId)
- if [ "$snapId" = null ]; then exit 1; fi
- echo -n "$snapId" > $stateDir/$region.$type.snap-id
- fi
-
- # Wait for the snapshot to finish.
- echo "waiting for snapshot to finish..."
- while true; do
- status=$(aws ec2 describe-snapshots --snapshot-ids "$snapId" --region "$region" | jq -r .Snapshots[0].State)
- if [ "$status" = completed ]; then break; fi
- sleep 10
- done
-
- # Delete the volume.
- if [ -n "$volId" ]; then
- echo "deleting volume..."
- aws ec2 delete-volume --volume-id "$volId" --region "$region" || true
- rm -f $stateDir/$region.$type.vol-id
- fi
-
- blockDeviceMappings="DeviceName=/dev/sda1,Ebs={SnapshotId=$snapId,VolumeSize=$vhdFileLogicalGigaBytes,DeleteOnTermination=true,VolumeType=gp2}"
- extraFlags=""
-
- if [ $type = pv ]; then
- extraFlags+=" --root-device-name /dev/sda1"
- else
- extraFlags+=" --root-device-name /dev/sda1"
- extraFlags+=" --sriov-net-support simple"
- extraFlags+=" --ena-support"
- fi
-
- blockDeviceMappings+=" DeviceName=/dev/sdb,VirtualName=ephemeral0"
- blockDeviceMappings+=" DeviceName=/dev/sdc,VirtualName=ephemeral1"
- blockDeviceMappings+=" DeviceName=/dev/sdd,VirtualName=ephemeral2"
- blockDeviceMappings+=" DeviceName=/dev/sde,VirtualName=ephemeral3"
- fi
-
- if [ $type = hvm ]; then
- extraFlags+=" --sriov-net-support simple"
- extraFlags+=" --ena-support"
- fi
-
- # Register the AMI.
- if [ $type = pv ]; then
- kernel=$(aws ec2 describe-images --owner amazon --filters "Name=name,Values=pv-grub-hd0_1.05-$arch.gz" | jq -r .Images[0].ImageId)
- if [ "$kernel" = null ]; then break; fi
- echo "using PV-GRUB kernel $kernel"
- extraFlags+=" --virtualization-type paravirtual --kernel $kernel"
- else
- extraFlags+=" --virtualization-type hvm"
- fi
-
- ami=$(aws ec2 register-image \
- --name "$name" \
- --description "$description" \
- --region "$region" \
- --architecture "$arch" \
- --block-device-mappings $blockDeviceMappings \
- $extraFlags | jq -r .ImageId)
- if [ "$ami" = null ]; then break; fi
- fi
-
- echo -n "$ami" > $amiFile
- echo "created AMI $ami of type '$type' in $region..."
-
- else
- ami=$(cat $amiFile)
- fi
-
- echo "region = $region, type = $type, store = $store, ami = $ami"
-
- if [ -z "$prevAmi" ]; then
- prevAmi="$ami"
- prevRegion="$region"
- fi
- done
+ for region in "${regions[@]}"; do
+ if [ "$region" = "$home_region" ]; then
+ continue
+ fi
+ copied_image_id=$(copy_to_region "$region" "$home_region" "$home_image_id")
+ jq -n \
+ --arg key "$region.$image_system" \
+ --arg value "$copied_image_id" \
+ '$ARGS.named'
done
+}
-done
-
-for type in $types; do
- link=$stateDir/$type
- system=x86_64-linux
- arch=x86_64
-
- for store in $stores; do
-
- for region in $regions; do
-
- name=nixos-$version-$arch-$type-$store
- amiFile=$stateDir/$region.$type.$store.ami-id
- ami=$(cat $amiFile)
-
- echo "region = $region, type = $type, store = $store, ami = $ami"
-
- echo -n "waiting for AMI..."
- while true; do
- status=$(aws ec2 describe-images --image-ids "$ami" --region "$region" | jq -r .Images[0].State)
- if [ "$status" = available ]; then break; fi
- sleep 10
- echo -n '.'
- done
- echo
-
- # Make the image public.
- aws ec2 modify-image-attribute \
- --image-id "$ami" --region "$region" --launch-permission 'Add={Group=all}'
-
- echo " \"$major\".$region.$type-$store = \"$ami\";" >> ec2-amis.nix
- done
-
- done
-
-done
+upload_all | jq --slurp from_entries
diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix
index 7100f10dcfc8..7e311a21acf6 100644
--- a/nixos/modules/config/fonts/fontconfig-penultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix
@@ -35,8 +35,8 @@ let
then "fontconfig"
else "fontconfig_${version}";
makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; };
- cache = makeCache pkgs."${fcPackage}";
- cache32 = makeCache pkgs.pkgsi686Linux."${fcPackage}";
+ cache = makeCache pkgs.${fcPackage};
+ cache32 = makeCache pkgs.pkgsi686Linux.${fcPackage};
in
pkgs.writeText "fc-00-nixos-cache.conf" ''
diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix
index 45328f3eaf13..84d90899dfff 100644
--- a/nixos/modules/config/fonts/fontconfig-ultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix
@@ -79,7 +79,7 @@ in
config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {
fonts.fontconfig.confPackages = [ confPkg ];
- environment.variables."INFINALITY_FT" = cfg.preset;
+ environment.variables.INFINALITY_FT = cfg.preset;
};
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index fe0b88cf4c26..8f227c423266 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -51,8 +51,8 @@ let
then "fontconfig"
else "fontconfig_${version}";
makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; };
- cache = makeCache pkgs."${fcPackage}";
- cache32 = makeCache pkgs.pkgsi686Linux."${fcPackage}";
+ cache = makeCache pkgs.${fcPackage};
+ cache32 = makeCache pkgs.pkgsi686Linux.${fcPackage};
in
pkgs.writeText "fc-00-nixos-cache.conf" ''
@@ -116,7 +116,7 @@ let
defaultFontsConf =
let genDefault = fonts: name:
optionalString (fonts != []) ''
-
+
${name}
${concatStringsSep ""
@@ -139,6 +139,8 @@ let
${genDefault cfg.defaultFonts.monospace "monospace"}
+ ${genDefault cfg.defaultFonts.emoji "emoji"}
+
'';
@@ -344,6 +346,21 @@ in
in case multiple languages must be supported.
'';
};
+
+ emoji = mkOption {
+ type = types.listOf types.str;
+ default = ["Noto Color Emoji"];
+ description = ''
+ System-wide default emoji font(s). Multiple fonts may be listed
+ in case a font does not support all emoji.
+
+ Note that fontconfig matches color emoji fonts preferentially,
+ so if you want to use a black and white font while having
+ a color font installed (eg. Noto Color Emoji installed alongside
+ Noto Emoji), fontconfig will still choose the color font even
+ when it is later in the list.
+ '';
+ };
};
hinting = {
diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix
index 0dd01df9da74..abb806b601a7 100644
--- a/nixos/modules/config/fonts/fonts.nix
+++ b/nixos/modules/config/fonts/fonts.nix
@@ -43,6 +43,7 @@ with lib;
pkgs.xorg.fontmiscmisc
pkgs.xorg.fontcursormisc
pkgs.unifont
+ pkgs.noto-fonts-emoji
];
};
diff --git a/nixos/modules/config/gtk/gtk-icon-cache.nix b/nixos/modules/config/gtk/gtk-icon-cache.nix
index 9c5d993b9c59..86a6bfb5af41 100644
--- a/nixos/modules/config/gtk/gtk-icon-cache.nix
+++ b/nixos/modules/config/gtk/gtk-icon-cache.nix
@@ -7,7 +7,7 @@ with lib;
type = types.bool;
default = config.services.xserver.enable;
description = ''
- Whether to build icon theme caches for GTK+ applications.
+ Whether to build icon theme caches for GTK applications.
'';
};
};
diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix
index 87021a27d34f..ff16ffcf9c65 100644
--- a/nixos/modules/config/krb5/default.nix
+++ b/nixos/modules/config/krb5/default.nix
@@ -15,7 +15,7 @@ let
realms = optionalAttrs (lib.all (value: value != null) [
cfg.defaultRealm cfg.kdc cfg.kerberosAdminServer
]) {
- "${cfg.defaultRealm}" = {
+ ${cfg.defaultRealm} = {
kdc = cfg.kdc;
admin_server = cfg.kerberosAdminServer;
};
@@ -25,7 +25,7 @@ let
cfg.domainRealm cfg.defaultRealm
]) {
".${cfg.domainRealm}" = cfg.defaultRealm;
- "${cfg.domainRealm}" = cfg.defaultRealm;
+ ${cfg.domainRealm} = cfg.defaultRealm;
};
};
diff --git a/nixos/modules/config/malloc.nix b/nixos/modules/config/malloc.nix
index 65130454735c..31a659ee83fe 100644
--- a/nixos/modules/config/malloc.nix
+++ b/nixos/modules/config/malloc.nix
@@ -6,7 +6,7 @@ let
# The set of alternative malloc(3) providers.
providers = {
- "graphene-hardened" = rec {
+ graphene-hardened = {
libPath = "${pkgs.graphene-hardened-malloc}/lib/libhardened_malloc.so";
description = ''
An allocator designed to mitigate memory corruption attacks, such as
@@ -14,7 +14,7 @@ let
'';
};
- "jemalloc" = {
+ jemalloc = {
libPath = "${pkgs.jemalloc}/lib/libjemalloc.so";
description = ''
A general purpose allocator that emphasizes fragmentation avoidance
@@ -22,7 +22,7 @@ let
'';
};
- "scudo" = {
+ scudo = {
libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo-x86_64.so";
description = ''
A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator,
@@ -32,7 +32,7 @@ let
};
};
- providerConf = providers."${cfg.provider}";
+ providerConf = providers.${cfg.provider};
# An output that contains only the shared library, to avoid
# needlessly bloating the system closure
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 4b9086022ed5..a89667ea221c 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -171,13 +171,13 @@ in
environment.etc =
{ # /etc/services: TCP/UDP port assignments.
- "services".source = pkgs.iana-etc + "/etc/services";
+ services.source = pkgs.iana-etc + "/etc/services";
# /etc/protocols: IP protocol numbers.
- "protocols".source = pkgs.iana-etc + "/etc/protocols";
+ protocols.source = pkgs.iana-etc + "/etc/protocols";
# /etc/hosts: Hostname-to-IP mappings.
- "hosts".text = let
+ hosts.text = let
oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip};
allToString = set: concatMapStringsSep "\n" (oneToString set) (attrNames set);
in ''
@@ -190,7 +190,7 @@ in
} // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") {
# /etc/rpc: RPC program numbers.
- "rpc".source = pkgs.glibc.out + "/etc/rpc";
+ rpc.source = pkgs.glibc.out + "/etc/rpc";
};
networking.proxy.envVars =
diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix
index 0277f1ad11e9..64cdf50f1413 100644
--- a/nixos/modules/config/power-management.nix
+++ b/nixos/modules/config/power-management.nix
@@ -78,7 +78,7 @@ in
};
# Service executed before suspending/hibernating.
- systemd.services."pre-sleep" =
+ systemd.services.pre-sleep =
{ description = "Pre-Sleep Actions";
wantedBy = [ "sleep.target" ];
before = [ "sleep.target" ];
@@ -89,7 +89,7 @@ in
serviceConfig.Type = "oneshot";
};
- systemd.services."post-resume" =
+ systemd.services.post-resume =
{ description = "Post-Resume Actions";
after = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" ];
script =
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 6379b52870ea..9dfc1add8299 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -163,7 +163,7 @@ in
l = "ls -alh";
};
- environment.etc."shells".text =
+ environment.etc.shells.text =
''
${concatStringsSep "\n" (map utils.toShellPath cfg.shells)}
/bin/sh
@@ -171,7 +171,7 @@ in
# For resetting environment with `. /etc/set-environment` when needed
# and discoverability (see motivation of #30418).
- environment.etc."set-environment".source = config.system.build.setEnvironment;
+ environment.etc.set-environment.source = config.system.build.setEnvironment;
system.build.setEnvironment = pkgs.writeText "set-environment"
''
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index fae2fc740082..aba9bc0945b1 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -135,6 +135,9 @@ in
# outputs TODO: note that the tools will often not be linked by default
postBuild =
''
+ # Remove wrapped binaries, they shouldn't be accessible via PATH.
+ find $out/bin -maxdepth 1 -name ".*-wrapped" -type l -delete
+
if [ -x $out/bin/glib-compile-schemas -a -w $out/share/glib-2.0/schemas ]; then
$out/bin/glib-compile-schemas $out/share/glib-2.0/schemas
fi
diff --git a/nixos/modules/config/terminfo.nix b/nixos/modules/config/terminfo.nix
index 4fd6ba5ea605..b86ce2dbf057 100644
--- a/nixos/modules/config/terminfo.nix
+++ b/nixos/modules/config/terminfo.nix
@@ -8,7 +8,7 @@
"/share/terminfo"
];
- environment.etc."terminfo" = {
+ environment.etc.terminfo = {
source = "${config.system.path}/share/terminfo";
};
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 25f1c67ce830..ba79bd3d6ecc 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -181,7 +181,7 @@ let
};
hashedPassword = mkOption {
- type = with types; uniq (nullOr str);
+ type = with types; nullOr str;
default = null;
description = ''
Specifies the hashed password for the user.
@@ -191,7 +191,7 @@ let
};
password = mkOption {
- type = with types; uniq (nullOr str);
+ type = with types; nullOr str;
default = null;
description = ''
Specifies the (clear text) password for the user.
@@ -203,7 +203,7 @@ let
};
passwordFile = mkOption {
- type = with types; uniq (nullOr string);
+ type = with types; nullOr str;
default = null;
description = ''
The full path to a file that contains the user's password. The password
@@ -215,7 +215,7 @@ let
};
initialHashedPassword = mkOption {
- type = with types; uniq (nullOr str);
+ type = with types; nullOr str;
default = null;
description = ''
Specifies the initial hashed password for the user, i.e. the
@@ -230,7 +230,7 @@ let
};
initialPassword = mkOption {
- type = with types; uniq (nullOr str);
+ type = with types; nullOr str;
default = null;
description = ''
Specifies the initial password for the user, i.e. the
@@ -304,7 +304,7 @@ let
};
members = mkOption {
- type = with types; listOf string;
+ type = with types; listOf str;
default = [];
description = ''
The user names of the group members, added to the
@@ -546,11 +546,11 @@ in {
environment.systemPackages = systemShells;
environment.etc = {
- "subuid" = {
+ subuid = {
text = subuidFile;
mode = "0644";
};
- "subgid" = {
+ subgid = {
text = subgidFile;
mode = "0644";
};
diff --git a/nixos/modules/hardware/nitrokey.nix b/nixos/modules/hardware/nitrokey.nix
index 60fc95a75828..02e4c3f46f8d 100644
--- a/nixos/modules/hardware/nitrokey.nix
+++ b/nixos/modules/hardware/nitrokey.nix
@@ -36,6 +36,6 @@ in
{ inherit (cfg) group; }
))
];
- users.groups."${cfg.group}" = {};
+ users.groups.${cfg.group} = {};
};
}
diff --git a/nixos/modules/hardware/openrazer.nix b/nixos/modules/hardware/openrazer.nix
new file mode 100644
index 000000000000..883db7f2f4f1
--- /dev/null
+++ b/nixos/modules/hardware/openrazer.nix
@@ -0,0 +1,133 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.hardware.openrazer;
+ kernelPackages = config.boot.kernelPackages;
+
+ toPyBoolStr = b: if b then "True" else "False";
+
+ daemonExe = "${pkgs.openrazer-daemon}/bin/openrazer-daemon --config ${daemonConfFile}";
+
+ daemonConfFile = pkgs.writeTextFile {
+ name = "razer.conf";
+ text = ''
+ [General]
+ verbose_logging = ${toPyBoolStr cfg.verboseLogging}
+
+ [Startup]
+ sync_effects_enabled = ${toPyBoolStr cfg.syncEffectsEnabled}
+ devices_off_on_screensaver = ${toPyBoolStr cfg.devicesOffOnScreensaver}
+ mouse_battery_notifier = ${toPyBoolStr cfg.mouseBatteryNotifier}
+
+ [Statistics]
+ key_statistics = ${toPyBoolStr cfg.keyStatistics}
+ '';
+ };
+
+ dbusServiceFile = pkgs.writeTextFile rec {
+ name = "org.razer.service";
+ destination = "/share/dbus-1/services/${name}";
+ text = ''
+ [D-BUS Service]
+ Name=org.razer
+ Exec=${daemonExe}
+ SystemdService=openrazer-daemon.service
+ '';
+ };
+
+ drivers = [
+ "razerkbd"
+ "razermouse"
+ "razerfirefly"
+ "razerkraken"
+ "razermug"
+ "razercore"
+ ];
+in
+{
+ options = {
+ hardware.openrazer = {
+ enable = mkEnableOption "OpenRazer drivers and userspace daemon.";
+
+ verboseLogging = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable verbose logging. Logs debug messages.
+ '';
+ };
+
+ syncEffectsEnabled = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Set the sync effects flag to true so any assignment of
+ effects will work across devices.
+ '';
+ };
+
+ devicesOffOnScreensaver = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Turn off the devices when the systems screensaver kicks in.
+ '';
+ };
+
+ mouseBatteryNotifier = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Mouse battery notifier.
+ '';
+ };
+
+ keyStatistics = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Collects number of keypresses per hour per key used to
+ generate a heatmap.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ boot.extraModulePackages = [ kernelPackages.openrazer ];
+ boot.kernelModules = drivers;
+
+ # Makes the man pages available so you can succesfully run
+ # > systemctl --user help openrazer-daemon
+ environment.systemPackages = [ pkgs.python3Packages.openrazer-daemon.man ];
+
+ services.udev.packages = [ kernelPackages.openrazer ];
+ services.dbus.packages = [ dbusServiceFile ];
+
+ # A user must be a member of the plugdev group in order to start
+ # the openrazer-daemon. Therefore we make sure that the plugdev
+ # group exists.
+ users.groups.plugdev = {};
+
+ systemd.user.services.openrazer-daemon = {
+ description = "Daemon to manage razer devices in userspace";
+ unitConfig.Documentation = "man:openrazer-daemon(8)";
+ # Requires a graphical session so the daemon knows when the screensaver
+ # starts. See the 'devicesOffOnScreensaver' option.
+ wantedBy = [ "graphical-session.target" ];
+ partOf = [ "graphical-session.target" ];
+ serviceConfig = {
+ Type = "dbus";
+ BusName = "org.razer";
+ ExecStart = "${daemonExe} --foreground";
+ Restart = "always";
+ };
+ };
+ };
+
+ meta = {
+ maintainers = with lib.maintainers; [ roelvandijk ];
+ };
+}
diff --git a/nixos/modules/hardware/printers.nix b/nixos/modules/hardware/printers.nix
new file mode 100644
index 000000000000..56b91933477d
--- /dev/null
+++ b/nixos/modules/hardware/printers.nix
@@ -0,0 +1,135 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let
+ cfg = config.hardware.printers;
+ ppdOptionsString = options: optionalString (options != {})
+ (concatStringsSep " "
+ (mapAttrsToList (name: value: "-o '${name}'='${value}'") options)
+ );
+ ensurePrinter = p: ''
+ ${pkgs.cups}/bin/lpadmin -p '${p.name}' -E \
+ ${optionalString (p.location != null) "-L '${p.location}'"} \
+ ${optionalString (p.description != null) "-D '${p.description}'"} \
+ -v '${p.deviceUri}' \
+ -m '${p.model}' \
+ ${ppdOptionsString p.ppdOptions}
+ '';
+ ensureDefaultPrinter = name: ''
+ ${pkgs.cups}/bin/lpoptions -d '${name}'
+ '';
+
+ # "graph but not # or /" can't be implemented as regex alone due to missing lookahead support
+ noInvalidChars = str: all (c: c != "#" && c != "/") (stringToCharacters str);
+ printerName = (types.addCheck (types.strMatching "[[:graph:]]+") noInvalidChars)
+ // { description = "printable string without spaces, # and /"; };
+
+
+in {
+ options = {
+ hardware.printers = {
+ ensureDefaultPrinter = mkOption {
+ type = types.nullOr printerName;
+ default = null;
+ description = ''
+ Ensures the named printer is the default CUPS printer / printer queue.
+ '';
+ };
+ ensurePrinters = mkOption {
+ description = ''
+ Will regularly ensure that the given CUPS printers are configured as declared here.
+ If a printer's options are manually changed afterwards, they will be overwritten eventually.
+ This option will never delete any printer, even if removed from this list.
+ You can check existing printers with lpstat -s
+ and remove printers with lpadmin -x <printer-name>.
+ Printers not listed here can still be manually configured.
+ '';
+ default = [];
+ type = types.listOf (types.submodule {
+ options = {
+ name = mkOption {
+ type = printerName;
+ example = "BrotherHL_Workroom";
+ description = ''
+ Name of the printer / printer queue.
+ May contain any printable characters except "/", "#", and space.
+ '';
+ };
+ location = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "Workroom";
+ description = ''
+ Optional human-readable location.
+ '';
+ };
+ description = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "Brother HL-5140";
+ description = ''
+ Optional human-readable description.
+ '';
+ };
+ deviceUri = mkOption {
+ type = types.str;
+ example = [
+ "ipp://printserver.local/printers/BrotherHL_Workroom"
+ "usb://HP/DESKJET%20940C?serial=CN16E6C364BH"
+ ];
+ description = ''
+ How to reach the printer.
+ lpinfo -v shows a list of supported device URIs and schemes.
+ '';
+ };
+ model = mkOption {
+ type = types.str;
+ example = literalExample ''
+ gutenprint.''${lib.version.majorMinor (lib.getVersion pkgs.cups)}://brother-hl-5140/expert
+ '';
+ description = ''
+ Location of the ppd driver file for the printer.
+ lpinfo -m shows a list of supported models.
+ '';
+ };
+ ppdOptions = mkOption {
+ type = types.attrsOf types.str;
+ example = {
+ PageSize = "A4";
+ Duplex = "DuplexNoTumble";
+ };
+ default = {};
+ description = ''
+ Sets PPD options for the printer.
+ lpoptions [-p printername] -l shows suported PPD options for the given printer.
+ '';
+ };
+ };
+ });
+ };
+ };
+ };
+
+ config = mkIf (cfg.ensurePrinters != [] && config.services.printing.enable) {
+ systemd.services.ensure-printers = let
+ cupsUnit = if config.services.printing.startWhenNeeded then "cups.socket" else "cups.service";
+ in {
+ description = "Ensure NixOS-configured CUPS printers";
+ wantedBy = [ "multi-user.target" ];
+ requires = [ cupsUnit ];
+ # in contrast to cups.socket, for cups.service, this is actually not enough,
+ # as the cups service reports its activation before clients can actually interact with it.
+ # Because of this, commands like `lpinfo -v` will report a bad file descriptor
+ # due to the missing UNIX socket without sufficient sleep time.
+ after = [ cupsUnit ];
+
+ serviceConfig = {
+ Type = "oneshot";
+ };
+
+ # sleep 10 is required to wait until cups.service is actually initialized and has created its UNIX socket file
+ script = (optionalString (!config.services.printing.startWhenNeeded) "sleep 10\n")
+ + (concatMapStringsSep "\n" ensurePrinter cfg.ensurePrinters)
+ + optionalString (cfg.ensureDefaultPrinter != null) (ensureDefaultPrinter cfg.ensureDefaultPrinter);
+ };
+ };
+}
diff --git a/nixos/modules/hardware/raid/hpsa.nix b/nixos/modules/hardware/raid/hpsa.nix
index 3a65cb800a98..4d7af138292c 100644
--- a/nixos/modules/hardware/raid/hpsa.nix
+++ b/nixos/modules/hardware/raid/hpsa.nix
@@ -4,11 +4,11 @@ with lib;
let
hpssacli = pkgs.stdenv.mkDerivation rec {
- name = "hpssacli-${version}";
+ pname = "hpssacli";
version = "2.40-13.0";
src = pkgs.fetchurl {
- url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${name}_amd64.deb";
+ url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${pname}-${version}_amd64.deb";
sha256 = "11w7fwk93lmfw0yya4jpjwdmgjimqxx6412sqa166g1pz4jil4sw";
};
diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix
index f867bba80630..0aab7bd6b92c 100644
--- a/nixos/modules/hardware/video/ati.nix
+++ b/nixos/modules/hardware/video/ati.nix
@@ -33,7 +33,7 @@ in
boot.blacklistedKernelModules = [ "radeon" ];
- environment.etc."ati".source = "${ati_x11}/etc/ati";
+ environment.etc.ati.source = "${ati_x11}/etc/ati";
};
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index da3c8ee5a9fa..3ab2afc97407 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -88,7 +88,7 @@ in
};
hardware.nvidia.optimus_prime.nvidiaBusId = lib.mkOption {
- type = lib.types.string;
+ type = lib.types.str;
default = "";
example = "PCI:1:0:0";
description = ''
@@ -98,7 +98,7 @@ in
};
hardware.nvidia.optimus_prime.intelBusId = lib.mkOption {
- type = lib.types.string;
+ type = lib.types.str;
default = "";
example = "PCI:0:2:0";
description = ''
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
index 2536ba73a1de..559899b0a3b1 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
@@ -13,9 +13,6 @@ with lib;
enable = true;
enableQt4Support = false;
};
-
- # Enable touchpad support for many laptops.
- synaptics.enable = true;
};
environment.systemPackages = with pkgs; [
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index a9241870fa71..2d34406a0320 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -59,4 +59,8 @@ in
${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot
'';
};
+
+ # the installation media is also the installation target,
+ # so we don't want to provide the installation configuration.nix.
+ installer.cloneConfig = false;
}
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
index dab092415316..651d1a36dc11 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -56,4 +56,8 @@ in
${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot
'';
};
+
+ # the installation media is also the installation target,
+ # so we don't want to provide the installation configuration.nix.
+ installer.cloneConfig = false;
}
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index 8c9090471dcd..2a131d9ce980 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -45,4 +45,8 @@ in
${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot
'';
};
+
+ # the installation media is also the installation target,
+ # so we don't want to provide the installation configuration.nix.
+ installer.cloneConfig = false;
}
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index 07f6f627e6c0..0a0150441554 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -54,7 +54,7 @@ in
};
firmwarePartitionID = mkOption {
- type = types.string;
+ type = types.str;
default = "0x2178694e";
description = ''
Volume ID for the /boot/firmware partition on the SD card. This value
@@ -63,7 +63,7 @@ in
};
rootPartitionUUID = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "14e19a7b-0ae0-484d-9d54-43bd6fdc20c7";
description = ''
@@ -194,9 +194,5 @@ in
rm -f /nix-path-registration
fi
'';
-
- # the installation media is also the installation target,
- # so we don't want to provide the installation configuration.nix.
- installer.cloneConfig = false;
};
}
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
index 5da5df81ede1..bf8b7deb59eb 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -129,7 +129,7 @@ in
];
nixpkgs.config = {
- packageOverrides = p: rec {
+ packageOverrides = p: {
linux_3_4 = p.linux_3_4.override {
extraConfig = ''
# Enable drivers in kernel for most NICs.
diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix
index f9b8d95c684d..5146858cccf5 100644
--- a/nixos/modules/installer/netboot/netboot.nix
+++ b/nixos/modules/installer/netboot/netboot.nix
@@ -18,7 +18,7 @@ with lib;
};
- config = rec {
+ config = {
# Don't build the GRUB menu builder script, since we don't need it
# here and it causes a cyclic dependency.
boot.loader.grub.enable = false;
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index b9ab2053c41f..2673887d2b96 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
{
- x86_64-linux = "/nix/store/hbhdjn5ik3byg642d1m11k3k3s0kn3py-nix-2.2.2";
- i686-linux = "/nix/store/fz5cikwvj3n0a6zl44h6l2z3cin64mda-nix-2.2.2";
- aarch64-linux = "/nix/store/2gba4cyl4wvxzfbhmli90jy4n5aj0kjj-nix-2.2.2";
- x86_64-darwin = "/nix/store/87i4fp46jfw9yl8c7i9gx75m5yph7irl-nix-2.2.2";
+ x86_64-linux = "/nix/store/3ds3cgji9vjxdbgp10av6smyym1126d1-nix-2.3";
+ i686-linux = "/nix/store/ln1ndqvfpc9cdl03vqxi6kvlxm9wfv9g-nix-2.3";
+ aarch64-linux = "/nix/store/n8a1rwzrp20qcr2c4hvyn6c5q9zx8csw-nix-2.3";
+ x86_64-darwin = "/nix/store/jq6npmpld02sz4rgniz0qrsdfnm6j17a-nix-2.3";
}
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 3ae60cb79160..773724ffbd5e 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -85,7 +85,7 @@ in
# Generate /etc/os-release. See
# https://www.freedesktop.org/software/systemd/man/os-release.html for the
# format.
- environment.etc."os-release".text =
+ environment.etc.os-release.text =
''
NAME=NixOS
ID=nixos
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 22fd5d7609df..fb8453f1d537 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -58,7 +58,9 @@
./hardware/network/intel-2200bg.nix
./hardware/nitrokey.nix
./hardware/opengl.nix
+ ./hardware/openrazer.nix
./hardware/pcmcia.nix
+ ./hardware/printers.nix
./hardware/raid/hpsa.nix
./hardware/steam-hardware.nix
./hardware/usb-wwan.nix
@@ -138,6 +140,7 @@
./programs/qt5ct.nix
./programs/screen.nix
./programs/sedutil.nix
+ ./programs/seahorse.nix
./programs/slock.nix
./programs/shadow.nix
./programs/shell.nix
@@ -148,16 +151,19 @@
./programs/sysdig.nix
./programs/systemtap.nix
./programs/sway.nix
+ ./programs/system-config-printer.nix
./programs/thefuck.nix
./programs/tmux.nix
./programs/tsm-client.nix
./programs/udevil.nix
+ ./programs/usbtop.nix
./programs/venus.nix
./programs/vim.nix
./programs/wavemon.nix
./programs/way-cooler.nix
./programs/waybar.nix
./programs/wireshark.nix
+ ./programs/x2goserver.nix
./programs/xfs_quota.nix
./programs/xonsh.nix
./programs/xss-lock.nix
@@ -214,8 +220,6 @@
./services/backup/bacula.nix
./services/backup/borgbackup.nix
./services/backup/duplicati.nix
- ./services/backup/crashplan.nix
- ./services/backup/crashplan-small-business.nix
./services/backup/duplicity.nix
./services/backup/mysql-backup.nix
./services/backup/postgresql-backup.nix
@@ -280,6 +284,7 @@
./services/databases/virtuoso.nix
./services/desktops/accountsservice.nix
./services/desktops/bamf.nix
+ ./services/desktops/blueman.nix
./services/desktops/deepin/deepin.nix
./services/desktops/dleyna-renderer.nix
./services/desktops/dleyna-server.nix
@@ -301,11 +306,11 @@
./services/desktops/gnome3/gnome-settings-daemon.nix
./services/desktops/gnome3/gnome-user-share.nix
./services/desktops/gnome3/rygel.nix
- ./services/desktops/gnome3/seahorse.nix
./services/desktops/gnome3/sushi.nix
./services/desktops/gnome3/tracker.nix
./services/desktops/gnome3/tracker-miners.nix
./services/desktops/profile-sync-daemon.nix
+ ./services/desktops/system-config-printer.nix
./services/desktops/telepathy.nix
./services/desktops/tumbler.nix
./services/desktops/zeitgeist.nix
@@ -562,7 +567,6 @@
./services/networking/bird.nix
./services/networking/bitlbee.nix
./services/networking/charybdis.nix
- ./services/networking/chrony.nix
./services/networking/cjdns.nix
./services/networking/cntlm.nix
./services/networking/connman.nix
@@ -645,14 +649,15 @@
./services/networking/nntp-proxy.nix
./services/networking/nsd.nix
./services/networking/ntopng.nix
- ./services/networking/ntpd.nix
+ ./services/networking/ntp/chrony.nix
+ ./services/networking/ntp/ntpd.nix
+ ./services/networking/ntp/openntpd.nix
./services/networking/nullidentdmod.nix
./services/networking/nylon.nix
./services/networking/ocserv.nix
./services/networking/ofono.nix
./services/networking/oidentd.nix
./services/networking/openfire.nix
- ./services/networking/openntpd.nix
./services/networking/openvpn.nix
./services/networking/ostinato.nix
./services/networking/owamp.nix
@@ -698,6 +703,7 @@
./services/networking/supybot.nix
./services/networking/syncthing.nix
./services/networking/syncthing-relay.nix
+ ./services/networking/syncplay.nix
./services/networking/tcpcrypt.nix
./services/networking/teamspeak3.nix
./services/networking/tedicross.nix
@@ -847,6 +853,7 @@
./services/x11/hardware/multitouch.nix
./services/x11/hardware/synaptics.nix
./services/x11/hardware/wacom.nix
+ ./services/x11/hardware/cmt.nix
./services/x11/gdk-pixbuf.nix
./services/x11/redshift.nix
./services/x11/urxvtd.nix
@@ -944,6 +951,7 @@
./virtualisation/openvswitch.nix
./virtualisation/parallels-guest.nix
./virtualisation/qemu-guest-agent.nix
+ ./virtualisation/railcar.nix
./virtualisation/rkt.nix
./virtualisation/virtualbox-guest.nix
./virtualisation/virtualbox-host.nix
diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix
index 4651cdb76e0b..7ef8d687ca17 100644
--- a/nixos/modules/programs/atop.nix
+++ b/nixos/modules/programs/atop.nix
@@ -30,7 +30,7 @@ in
};
config = mkIf (cfg.settings != {}) {
- environment.etc."atoprc".text =
+ environment.etc.atoprc.text =
concatStrings (mapAttrsToList (n: v: "${n} ${toString v}\n") cfg.settings);
};
}
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 99daec5ff5b7..548babac38ca 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -159,7 +159,7 @@ in
};
- environment.etc."profile".text =
+ environment.etc.profile.text =
''
# /etc/profile: DO NOT EDIT -- this file has been generated automatically.
# This file is read for login shells.
@@ -184,7 +184,7 @@ in
fi
'';
- environment.etc."bashrc".text =
+ environment.etc.bashrc.text =
''
# /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.
@@ -212,7 +212,7 @@ in
# Configuration for readline in bash. We use "option default"
# priority to allow user override using both .text and .source.
- environment.etc."inputrc".source = mkOptionDefault ./inputrc;
+ environment.etc.inputrc.source = mkOptionDefault ./inputrc;
users.defaultUserShell = mkDefault pkgs.bashInteractive;
diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix
index 46ee4bc0f7a0..74c3e4425a7c 100644
--- a/nixos/modules/programs/firejail.nix
+++ b/nixos/modules/programs/firejail.nix
@@ -5,7 +5,7 @@ with lib;
let
cfg = config.programs.firejail;
- wrappedBins = pkgs.stdenv.mkDerivation rec {
+ wrappedBins = pkgs.stdenv.mkDerivation {
name = "firejail-wrapped-binaries";
nativeBuildInputs = with pkgs; [ makeWrapper ];
buildCommand = ''
diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix
index 9fdf99e9c694..e19935b77caf 100644
--- a/nixos/modules/programs/less.nix
+++ b/nixos/modules/programs/less.nix
@@ -54,8 +54,8 @@ in
type = types.attrsOf types.str;
default = {};
example = {
- "h" = "noaction 5\e(";
- "l" = "noaction 5\e)";
+ h = "noaction 5\e(";
+ l = "noaction 5\e)";
};
description = "Defines new command keys.";
};
@@ -74,7 +74,7 @@ in
type = types.attrsOf types.str;
default = {};
example = {
- "\e" = "abort";
+ e = "abort";
};
description = "Defines new line-editing keys.";
};
@@ -111,11 +111,11 @@ in
environment.systemPackages = [ pkgs.less ];
environment.variables = {
- "LESSKEY_SYSTEM" = toString lessKey;
+ LESSKEY_SYSTEM = toString lessKey;
} // optionalAttrs (cfg.lessopen != null) {
- "LESSOPEN" = cfg.lessopen;
+ LESSOPEN = cfg.lessopen;
} // optionalAttrs (cfg.lessclose != null) {
- "LESSCLOSE" = cfg.lessclose;
+ LESSCLOSE = cfg.lessclose;
};
warnings = optional (
diff --git a/nixos/modules/programs/mtr.nix b/nixos/modules/programs/mtr.nix
index 1fdec4c04f68..75b710c1584f 100644
--- a/nixos/modules/programs/mtr.nix
+++ b/nixos/modules/programs/mtr.nix
@@ -4,6 +4,7 @@ with lib;
let
cfg = config.programs.mtr;
+
in {
options = {
programs.mtr = {
@@ -15,13 +16,22 @@ in {
setcap wrapper for it.
'';
};
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.mtr;
+ description = ''
+ The package to use.
+ '';
+ };
};
};
config = mkIf cfg.enable {
- environment.systemPackages = with pkgs; [ mtr ];
+ environment.systemPackages = with pkgs; [ cfg.package ];
+
security.wrappers.mtr-packet = {
- source = "${pkgs.mtr}/bin/mtr-packet";
+ source = "${cfg.package}/bin/mtr-packet";
capabilities = "cap_net_raw+p";
};
};
diff --git a/nixos/modules/programs/nano.nix b/nixos/modules/programs/nano.nix
index 6a4d46338e19..5837dd46d7cd 100644
--- a/nixos/modules/programs/nano.nix
+++ b/nixos/modules/programs/nano.nix
@@ -35,7 +35,7 @@ in
###### implementation
config = lib.mkIf (cfg.nanorc != "" || cfg.syntaxHighlight) {
- environment.etc."nanorc".text = lib.concatStrings [ cfg.nanorc
+ environment.etc.nanorc.text = lib.concatStrings [ cfg.nanorc
(lib.optionalString cfg.syntaxHighlight ''${LF}include "${pkgs.nano}/share/nano/*.nanorc"'') ];
};
diff --git a/nixos/modules/programs/npm.nix b/nixos/modules/programs/npm.nix
index 5fdd4fa841a1..b351d80c7acf 100644
--- a/nixos/modules/programs/npm.nix
+++ b/nixos/modules/programs/npm.nix
@@ -36,7 +36,7 @@ in
###### implementation
config = lib.mkIf cfg.enable {
- environment.etc."npmrc".text = cfg.npmrc;
+ environment.etc.npmrc.text = cfg.npmrc;
environment.variables.NPM_CONFIG_GLOBALCONFIG = "/etc/npmrc";
diff --git a/nixos/modules/programs/plotinus.nix b/nixos/modules/programs/plotinus.nix
index 065e72d6c374..e3549c79588b 100644
--- a/nixos/modules/programs/plotinus.nix
+++ b/nixos/modules/programs/plotinus.nix
@@ -18,7 +18,7 @@ in
enable = mkOption {
default = false;
description = ''
- Whether to enable the Plotinus GTK+3 plugin. Plotinus provides a
+ Whether to enable the Plotinus GTK 3 plugin. Plotinus provides a
popup (triggered by Ctrl-Shift-P) to search the menus of a
compatible application.
'';
diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml
index 902cd89e0c49..8fc8c22c6d76 100644
--- a/nixos/modules/programs/plotinus.xml
+++ b/nixos/modules/programs/plotinus.xml
@@ -13,10 +13,10 @@
- Plotinus is a searchable command palette in every modern GTK+ application.
+ Plotinus is a searchable command palette in every modern GTK application.
- When in a GTK+3 application and Plotinus is enabled, you can press
+ When in a GTK 3 application and Plotinus is enabled, you can press
Ctrl+Shift+P to open the command palette. The command
palette provides a searchable list of of all menu items in the application.
diff --git a/nixos/modules/programs/screen.nix b/nixos/modules/programs/screen.nix
index c1daaa58f16f..4fd800dbae79 100644
--- a/nixos/modules/programs/screen.nix
+++ b/nixos/modules/programs/screen.nix
@@ -24,7 +24,7 @@ in
###### implementation
config = mkIf (cfg.screenrc != "") {
- environment.etc."screenrc".text = cfg.screenrc;
+ environment.etc.screenrc.text = cfg.screenrc;
environment.systemPackages = [ pkgs.screen ];
};
diff --git a/nixos/modules/programs/seahorse.nix b/nixos/modules/programs/seahorse.nix
new file mode 100644
index 000000000000..c08b0a85374c
--- /dev/null
+++ b/nixos/modules/programs/seahorse.nix
@@ -0,0 +1,44 @@
+# Seahorse.
+
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+{
+
+ # Added 2019-08-27
+ imports = [
+ (mkRenamedOptionModule
+ [ "services" "gnome3" "seahorse" "enable" ]
+ [ "programs" "seahorse" "enable" ])
+ ];
+
+
+ ###### interface
+
+ options = {
+
+ programs.seahorse = {
+
+ enable = mkEnableOption "Seahorse, a GNOME application for managing encryption keys and passwords in the GNOME Keyring";
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf config.programs.seahorse.enable {
+
+ environment.systemPackages = [
+ pkgs.gnome3.seahorse
+ ];
+
+ services.dbus.packages = [
+ pkgs.gnome3.seahorse
+ ];
+
+ };
+
+}
diff --git a/nixos/modules/programs/system-config-printer.nix b/nixos/modules/programs/system-config-printer.nix
new file mode 100644
index 000000000000..34592dd7064b
--- /dev/null
+++ b/nixos/modules/programs/system-config-printer.nix
@@ -0,0 +1,32 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+{
+
+ ###### interface
+
+ options = {
+
+ programs.system-config-printer = {
+
+ enable = mkEnableOption "system-config-printer, a Graphical user interface for CUPS administration";
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf config.programs.system-config-printer.enable {
+
+ environment.systemPackages = [
+ pkgs.system-config-printer
+ ];
+
+ services.system-config-printer.enable = true;
+
+ };
+
+}
diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix
index 21ed6603c1bd..b909916158d3 100644
--- a/nixos/modules/programs/thefuck.nix
+++ b/nixos/modules/programs/thefuck.nix
@@ -17,7 +17,7 @@ in
alias = mkOption {
default = "fuck";
- type = types.string;
+ type = types.str;
description = ''
`thefuck` needs an alias to be configured.
diff --git a/nixos/modules/programs/usbtop.nix b/nixos/modules/programs/usbtop.nix
new file mode 100644
index 000000000000..c1b6ee38caa1
--- /dev/null
+++ b/nixos/modules/programs/usbtop.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.usbtop;
+in {
+ options = {
+ programs.usbtop.enable = mkEnableOption "usbtop and required kernel module";
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = with pkgs; [
+ usbtop
+ ];
+
+ boot.kernelModules = [
+ "usbmon"
+ ];
+ };
+}
diff --git a/nixos/modules/programs/x2goserver.nix b/nixos/modules/programs/x2goserver.nix
new file mode 100644
index 000000000000..77a1a0da7993
--- /dev/null
+++ b/nixos/modules/programs/x2goserver.nix
@@ -0,0 +1,148 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.x2goserver;
+
+ defaults = {
+ superenicer = { enable = cfg.superenicer.enable; };
+ };
+ confText = generators.toINI {} (recursiveUpdate defaults cfg.settings);
+ x2goServerConf = pkgs.writeText "x2goserver.conf" confText;
+
+ x2goAgentOptions = pkgs.writeText "x2goagent.options" ''
+ X2GO_NXOPTIONS=""
+ X2GO_NXAGENT_DEFAULT_OPTIONS="${concatStringsSep " " cfg.nxagentDefaultOptions}"
+ '';
+
+in {
+ options.programs.x2goserver = {
+ enable = mkEnableOption "x2goserver" // {
+ description = ''
+ Enables the x2goserver module.
+ NOTE: This will create a good amount of symlinks in `/usr/local/bin`
+ '';
+ };
+
+ superenicer = {
+ enable = mkEnableOption "superenicer" // {
+ description = ''
+ Enables the SupeReNicer code in x2gocleansessions, this will renice
+ suspended sessions to nice level 19 and renice them to level 0 if the
+ session becomes marked as running again
+ '';
+ };
+ };
+
+ nxagentDefaultOptions = mkOption {
+ type = types.listOf types.str;
+ default = [ "-extension GLX" "-nolisten tcp" ];
+ example = [ "-extension GLX" "-nolisten tcp" ];
+ description = ''
+ List of default nx agent options.
+ '';
+ };
+
+ settings = mkOption {
+ type = types.attrsOf types.attrs;
+ default = {};
+ description = ''
+ x2goserver.conf ini configuration as nix attributes. See
+ `x2goserver.conf(5)` for details
+ '';
+ example = literalExample ''
+ superenicer = {
+ "enable" = "yes";
+ "idle-nice-level" = 19;
+ };
+ telekinesis = { "enable" = "no"; };
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+
+ environment.systemPackages = [ pkgs.x2goserver ];
+
+ users.groups.x2go = {};
+ users.users.x2go = {
+ home = "/var/lib/x2go/db";
+ group = "x2go";
+ };
+
+ security.wrappers.x2gosqliteWrapper = {
+ source = "${pkgs.x2goserver}/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl";
+ owner = "x2go";
+ group = "x2go";
+ setgid = true;
+ };
+ security.wrappers.x2goprintWrapper = {
+ source = "${pkgs.x2goserver}/bin/x2goprint";
+ owner = "x2go";
+ group = "x2go";
+ setgid = true;
+ };
+
+ systemd.tmpfiles.rules = with pkgs; [
+ "d /var/lib/x2go/ - x2go x2go - -"
+ "d /var/lib/x2go/db - x2go x2go - -"
+ "d /var/lib/x2go/conf - x2go x2go - -"
+ "d /run/x2go 0755 x2go x2go - -"
+ ] ++
+ # x2goclient sends SSH commands with preset PATH set to
+ # "/usr/local/bin;/usr/bin;/bin". Since we cannot filter arbitrary ssh
+ # commands, we have to make the following executables available.
+ map (f: "L+ /usr/local/bin/${f} - - - - ${x2goserver}/bin/${f}") [
+ "x2goagent" "x2gobasepath" "x2gocleansessions" "x2gocmdexitmessage"
+ "x2godbadmin" "x2gofeature" "x2gofeaturelist" "x2gofm" "x2gogetapps"
+ "x2gogetservers" "x2golistdesktops" "x2golistmounts" "x2golistsessions"
+ "x2golistsessions_root" "x2golistshadowsessions" "x2gomountdirs"
+ "x2gopath" "x2goprint" "x2goresume-desktopsharing" "x2goresume-session"
+ "x2goruncommand" "x2goserver-run-extensions" "x2gosessionlimit"
+ "x2gosetkeyboard" "x2goshowblocks" "x2gostartagent"
+ "x2gosuspend-desktopsharing" "x2gosuspend-session"
+ "x2goterminate-desktopsharing" "x2goterminate-session"
+ "x2goumount-session" "x2goversion"
+ ] ++ [
+ "L+ /usr/local/bin/awk - - - - ${gawk}/bin/awk"
+ "L+ /usr/local/bin/chmod - - - - ${coreutils}/bin/chmod"
+ "L+ /usr/local/bin/cp - - - - ${coreutils}/bin/cp"
+ "L+ /usr/local/bin/sed - - - - ${gnused}/bin/sed"
+ "L+ /usr/local/bin/setsid - - - - ${utillinux}/bin/setsid"
+ "L+ /usr/local/bin/xrandr - - - - ${xorg.xrandr}/bin/xrandr"
+ "L+ /usr/local/bin/xmodmap - - - - ${xorg.xmodmap}/bin/xmodmap"
+ ];
+
+ systemd.services.x2goserver = {
+ description = "X2Go Server Daemon";
+ wantedBy = [ "multi-user.target" ];
+ unitConfig.Documentation = "man:x2goserver.conf(5)";
+ serviceConfig = {
+ Type = "forking";
+ ExecStart = "${pkgs.x2goserver}/bin/x2gocleansessions";
+ PIDFile = "/run/x2go/x2goserver.pid";
+ User = "x2go";
+ Group = "x2go";
+ RuntimeDirectory = "x2go";
+ StateDirectory = "x2go";
+ };
+ preStart = ''
+ if [ ! -e /var/lib/x2go/setup_ran ]
+ then
+ mkdir -p /var/lib/x2go/conf
+ cp -r ${pkgs.x2goserver}/etc/x2go/* /var/lib/x2go/conf/
+ ln -sf ${x2goServerConf} /var/lib/x2go/conf/x2goserver.conf
+ ln -sf ${x2goAgentOptions} /var/lib/x2go/conf/x2goagent.options
+ ${pkgs.x2goserver}/bin/x2godbadmin --createdb
+ touch /var/lib/x2go/setup_ran
+ fi
+ '';
+ };
+
+ # https://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=276
+ security.sudo.extraConfig = ''
+ Defaults env_keep+=QT_GRAPHICSSYSTEM
+ '';
+ };
+}
diff --git a/nixos/modules/programs/xfs_quota.nix b/nixos/modules/programs/xfs_quota.nix
index 648fd9a8a94f..c03e59a5b4ab 100644
--- a/nixos/modules/programs/xfs_quota.nix
+++ b/nixos/modules/programs/xfs_quota.nix
@@ -61,7 +61,7 @@ in
description = "Setup of xfs_quota projects. Make sure the filesystem is mounted with the pquota option.";
example = {
- "projname" = {
+ projname = {
id = 50;
path = "/xfsprojects/projname";
sizeHardLimit = "50g";
diff --git a/nixos/modules/programs/xonsh.nix b/nixos/modules/programs/xonsh.nix
index 5cd2a49f8073..1590020f7b64 100644
--- a/nixos/modules/programs/xonsh.nix
+++ b/nixos/modules/programs/xonsh.nix
@@ -45,7 +45,7 @@ in
config = mkIf cfg.enable {
- environment.etc."xonshrc".text = cfg.config;
+ environment.etc.xonshrc.text = cfg.config;
environment.systemPackages = [ cfg.package ];
diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix
index 070463311db5..a7ad9b89db4d 100644
--- a/nixos/modules/programs/xss-lock.nix
+++ b/nixos/modules/programs/xss-lock.nix
@@ -12,7 +12,7 @@ in
lockerCommand = mkOption {
default = "${pkgs.i3lock}/bin/i3lock";
example = literalExample ''''${pkgs.i3lock-fancy}/bin/i3lock-fancy'';
- type = types.string;
+ type = types.separatedString " ";
description = "Locker to be used with xsslock";
};
diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix
index db085211366e..5de9331ac520 100644
--- a/nixos/modules/programs/yabar.nix
+++ b/nixos/modules/programs/yabar.nix
@@ -76,7 +76,7 @@ in
font = mkOption {
default = "sans bold 9";
example = "Droid Sans, FontAwesome Bold 9";
- type = types.string;
+ type = types.str;
description = ''
The font that will be used to draw the status bar.
@@ -95,7 +95,7 @@ in
extra = mkOption {
default = {};
- type = types.attrsOf types.string;
+ type = types.attrsOf types.str;
description = ''
An attribute set which contains further attributes of a bar.
@@ -107,7 +107,7 @@ in
type = types.attrsOf(types.submodule {
options.exec = mkOption {
example = "YABAR_DATE";
- type = types.string;
+ type = types.str;
description = ''
The type of the indicator to be executed.
'';
@@ -125,7 +125,7 @@ in
options.extra = mkOption {
default = {};
- type = types.attrsOf (types.either types.string types.int);
+ type = types.attrsOf (types.either types.str types.int);
description = ''
An attribute set which contains further attributes of a indicator.
diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
index 89087a229eb7..7184e5d9b9a8 100644
--- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
+++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
@@ -33,7 +33,7 @@ in
patterns = mkOption {
default = {};
- type = types.attrsOf types.string;
+ type = types.attrsOf types.str;
example = literalExample ''
{
@@ -50,7 +50,7 @@ in
};
styles = mkOption {
default = {};
- type = types.attrsOf types.string;
+ type = types.attrsOf types.str;
example = literalExample ''
{
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 6e9eefd74d18..c66c29ed45fb 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -133,7 +133,7 @@ in
programs.zsh.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases;
- environment.etc."zshenv".text =
+ environment.etc.zshenv.text =
''
# /etc/zshenv: DO NOT EDIT -- this file has been generated automatically.
# This file is read for all shells.
@@ -157,7 +157,7 @@ in
fi
'';
- environment.etc."zprofile".text =
+ environment.etc.zprofile.text =
''
# /etc/zprofile: DO NOT EDIT -- this file has been generated automatically.
# This file is read for login shells.
@@ -176,7 +176,7 @@ in
fi
'';
- environment.etc."zshrc".text =
+ environment.etc.zshrc.text =
''
# /etc/zshrc: DO NOT EDIT -- this file has been generated automatically.
# This file is read for interactive shells.
@@ -225,7 +225,7 @@ in
fi
'';
- environment.etc."zinputrc".source = ./zinputrc;
+ environment.etc.zinputrc.source = ./zinputrc;
environment.systemPackages = [ pkgs.zsh ]
++ optional cfg.enableCompletion pkgs.nix-zsh-completions;
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 1048c2af2ea8..d1303f90ad8d 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -34,6 +34,7 @@ with lib;
(mkRenamedOptionModule [ "services" "kubernetes" "etcd" "caFile" ] [ "services" "kubernetes" "apiserver" "etcd" "caFile" ])
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "applyManifests" ] "")
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "")
+ (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "")
(mkRenamedOptionModule [ "services" "kubernetes" "proxy" "address" ] ["services" "kubernetes" "proxy" "bindAddress"])
(mkRemovedOptionModule [ "services" "kubernetes" "verbose" ] "")
(mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
@@ -51,10 +52,11 @@ with lib;
(mkRemovedOptionModule [ "services" "misc" "nzbget" "openFirewall" ] "The port used by nzbget is managed through the web interface so you should adjust your firewall rules accordingly.")
(mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "user" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a user setting.")
(mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "group" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a group setting.")
- (mkRemovedOptionModule [ "services" "prometheus2" "alertmanagerURL" ] ''
+ (mkRemovedOptionModule [ "services" "prometheus" "alertmanagerURL" ] ''
Due to incompatibility, the alertmanagerURL option has been removed,
please use 'services.prometheus2.alertmanagers' instead.
'')
+ (mkRenamedOptionModule [ "services" "prometheus2" ] [ "services" "prometheus" ])
(mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ])
(mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ])
(mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])
@@ -256,7 +258,7 @@ with lib;
# binfmt
(mkRenamedOptionModule [ "boot" "binfmtMiscRegistrations" ] [ "boot" "binfmt" "registrations" ])
-
+
# ACME
(mkRemovedOptionModule [ "security" "acme" "directory"] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.")
(mkRemovedOptionModule [ "security" "acme" "preDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
@@ -285,6 +287,13 @@ with lib;
throw "services.redshift.longitude is set to null, you can remove this"
else builtins.fromJSON value))
+ # Redis
+ (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.")
+ (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")
+ (mkRemovedOptionModule [ "services" "redis" "dbFilename" ] "The redis module now uses /var/lib/redis/dump.rdb as database dump location.")
+ (mkRemovedOptionModule [ "services" "redis" "appendOnlyFilename" ] "This option was never used.")
+ (mkRemovedOptionModule [ "services" "redis" "pidFile" ] "This option was removed.")
+
] ++ (forEach [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
"jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
"snmpExporter" "unifiExporter" "varnishExporter" ]
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index feb54affbf83..b321c04e574c 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -213,7 +213,7 @@ in
StateDirectoryMode = rights;
WorkingDirectory = "/var/lib/${lpath}";
ExecStart = "${pkgs.simp_le}/bin/simp_le ${escapeShellArgs cmdline}";
- ExecStopPost =
+ ExecStopPost =
let
script = pkgs.writeScript "acme-post-stop" ''
#!${pkgs.runtimeShell} -e
@@ -298,6 +298,9 @@ in
};
})
);
+
+ systemd.targets.acme-selfsigned-certificates = mkIf cfg.preliminarySelfsigned {};
+ systemd.targets.acme-certificates = {};
})
];
diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix
index 6abac244dac2..9d26cfbcfb10 100644
--- a/nixos/modules/security/auditd.nix
+++ b/nixos/modules/security/auditd.nix
@@ -6,6 +6,10 @@ with lib;
options.security.auditd.enable = mkEnableOption "the Linux Audit daemon";
config = mkIf config.security.auditd.enable {
+ boot.kernelParams = [ "audit=1" ];
+
+ environment.systemPackages = [ pkgs.audit ];
+
systemd.services.auditd = {
description = "Linux Audit daemon";
wantedBy = [ "basic.target" ];
diff --git a/nixos/modules/security/chromium-suid-sandbox.nix b/nixos/modules/security/chromium-suid-sandbox.nix
index be6acb3f1f53..2255477f26e4 100644
--- a/nixos/modules/security/chromium-suid-sandbox.nix
+++ b/nixos/modules/security/chromium-suid-sandbox.nix
@@ -24,6 +24,6 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [ sandbox ];
- security.wrappers."${sandbox.passthru.sandboxExecutableName}".source = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}";
+ security.wrappers.${sandbox.passthru.sandboxExecutableName}.source = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}";
};
}
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 89e71c5136e4..9c7ddc2f4eea 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -685,7 +685,7 @@ in
};
id = mkOption {
example = "42";
- type = types.string;
+ type = types.str;
description = "client id";
};
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 7f1de81d5b70..f2b2df4004cb 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -85,7 +85,7 @@ in
security.wrappers = {
pkexec.source = "${pkgs.polkit.bin}/bin/pkexec";
- "polkit-agent-helper-1".source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";
+ polkit-agent-helper-1.source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";
};
systemd.tmpfiles.rules = [
diff --git a/nixos/modules/security/prey.nix b/nixos/modules/security/prey.nix
index 1c643f2e1a57..b899ccb6c3e2 100644
--- a/nixos/modules/security/prey.nix
+++ b/nixos/modules/security/prey.nix
@@ -4,7 +4,7 @@ with lib;
let
cfg = config.services.prey;
- myPrey = pkgs."prey-bash-client".override {
+ myPrey = pkgs.prey-bash-client.override {
apiKey = cfg.apiKey;
deviceKey = cfg.deviceKey;
};
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index 573588aaeecc..10ee036be84e 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -91,7 +91,7 @@ in
type = with types; listOf (submodule {
options = {
users = mkOption {
- type = with types; listOf (either string int);
+ type = with types; listOf (either str int);
description = ''
The usernames / UIDs this rule should apply for.
'';
@@ -99,7 +99,7 @@ in
};
groups = mkOption {
- type = with types; listOf (either string int);
+ type = with types; listOf (either str int);
description = ''
The groups / GIDs this rule should apply for.
'';
@@ -107,7 +107,7 @@ in
};
host = mkOption {
- type = types.string;
+ type = types.str;
default = "ALL";
description = ''
For what host this rule should apply.
@@ -115,7 +115,7 @@ in
};
runAs = mkOption {
- type = with types; string;
+ type = with types; str;
default = "ALL:ALL";
description = ''
Under which user/group the specified command is allowed to run.
@@ -130,11 +130,11 @@ in
description = ''
The commands for which the rule should apply.
'';
- type = with types; listOf (either string (submodule {
+ type = with types; listOf (either str (submodule {
options = {
command = mkOption {
- type = with types; string;
+ type = with types; str;
description = ''
A command being either just a path to a binary to allow any arguments,
the full command with arguments pre-set or with "" used as the argument,
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index dcb9c8d4ed5f..47738e7962ea 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -7,7 +7,7 @@ let
programs =
(lib.mapAttrsToList
- (n: v: (if v ? "program" then v else v // {program=n;}))
+ (n: v: (if v ? program then v else v // {program=n;}))
wrappers);
securityWrapper = pkgs.stdenv.mkDerivation {
@@ -74,15 +74,15 @@ let
mkWrappedPrograms =
builtins.map
- (s: if (s ? "capabilities")
+ (s: if (s ? capabilities)
then mkSetcapProgram
({ owner = "root";
group = "root";
} // s)
else if
- (s ? "setuid" && s.setuid) ||
- (s ? "setgid" && s.setgid) ||
- (s ? "permissions")
+ (s ? setuid && s.setuid) ||
+ (s ? setgid && s.setgid) ||
+ (s ? permissions)
then mkSetuidProgram s
else mkSetuidProgram
({ owner = "root";
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix
index 27bfd91cd2d5..7729da27304b 100644
--- a/nixos/modules/services/amqp/activemq/default.nix
+++ b/nixos/modules/services/amqp/activemq/default.nix
@@ -40,7 +40,7 @@ in {
'';
};
configurationURI = mkOption {
- type = types.string;
+ type = types.str;
default = "xbean:activemq.xml";
description = ''
The URI that is passed along to the BrokerFactory to
@@ -51,7 +51,7 @@ in {
'';
};
baseDir = mkOption {
- type = types.string;
+ type = types.str;
default = "/var/activemq";
description = ''
The base directory where ActiveMQ stores its persistent data and logs.
@@ -81,7 +81,7 @@ in {
'';
};
extraJavaOptions = mkOption {
- type = types.string;
+ type = types.separatedString " ";
default = "";
example = "-Xmx2G -Xms2G -XX:MaxPermSize=512M";
description = ''
diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index 376aad66e236..f632644af09e 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -64,7 +64,7 @@ in
};
volumeStep = mkOption {
- type = types.string;
+ type = types.str;
default = "1";
example = "1%";
description = ''
@@ -99,7 +99,7 @@ in
boot.kernelModules = optional config.sound.enableOSSEmulation "snd_pcm_oss";
- systemd.services."alsa-store" =
+ systemd.services.alsa-store =
{ description = "Store Sound Card State";
wantedBy = [ "multi-user.target" ];
unitConfig.RequiresMountsFor = "/var/lib/alsa";
diff --git a/nixos/modules/services/audio/roon-server.nix b/nixos/modules/services/audio/roon-server.nix
index d4b0b098b78e..4eda3c5708da 100644
--- a/nixos/modules/services/audio/roon-server.nix
+++ b/nixos/modules/services/audio/roon-server.nix
@@ -61,8 +61,8 @@ in {
};
- users.groups."${cfg.group}" = {};
- users.users."${cfg.user}" =
+ users.groups.${cfg.group} = {};
+ users.users.${cfg.user} =
if cfg.user == "roon-server" then {
isSystemUser = true;
description = "Roon Server user";
diff --git a/nixos/modules/services/audio/ympd.nix b/nixos/modules/services/audio/ympd.nix
index 919b76622510..551bd941fe68 100644
--- a/nixos/modules/services/audio/ympd.nix
+++ b/nixos/modules/services/audio/ympd.nix
@@ -23,7 +23,7 @@ in {
mpd = {
host = mkOption {
- type = types.string;
+ type = types.str;
default = "localhost";
description = "The host where MPD is listening.";
example = "localhost";
diff --git a/nixos/modules/services/backup/crashplan-small-business.nix b/nixos/modules/services/backup/crashplan-small-business.nix
deleted file mode 100644
index 790dafefe66f..000000000000
--- a/nixos/modules/services/backup/crashplan-small-business.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
- cfg = config.services.crashplansb;
- crashplansb = pkgs.crashplansb.override { maxRam = cfg.maxRam; };
-in
-
-with lib;
-
-{
- options = {
- services.crashplansb = {
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Starts crashplan for small business background service.
- '';
- };
- maxRam = mkOption {
- default = "1024m";
- example = "2G";
- type = types.str;
- description = ''
- Maximum amount of ram that the crashplan engine should use.
- '';
- };
- openPorts = mkOption {
- description = "Open ports in the firewall for crashplan.";
- default = true;
- type = types.bool;
- };
- ports = mkOption {
- # https://support.code42.com/Administrator/6/Planning_and_installing/TCP_and_UDP_ports_used_by_the_Code42_platform
- # used ports can also be checked in the desktop app console using the command connection.info
- description = "which ports to open.";
- default = [ 4242 4243 4244 4247 ];
- type = types.listOf types.int;
- };
- };
- };
-
- config = mkIf cfg.enable {
- environment.systemPackages = [ crashplansb ];
- networking.firewall.allowedTCPPorts = mkIf cfg.openPorts cfg.ports;
-
- systemd.services.crashplansb = {
- description = "CrashPlan Backup Engine";
-
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "local-fs.target" ];
-
- preStart = ''
- install -d -m 755 ${crashplansb.vardir}
- install -d -m 700 ${crashplansb.vardir}/conf
- install -d -m 700 ${crashplansb.manifestdir}
- install -d -m 700 ${crashplansb.vardir}/cache
- install -d -m 700 ${crashplansb.vardir}/backupArchives
- install -d -m 777 ${crashplansb.vardir}/log
- cp -avn ${crashplansb}/conf.template/* ${crashplansb.vardir}/conf
- '';
-
- serviceConfig = {
- Type = "forking";
- EnvironmentFile = "${crashplansb}/bin/run.conf";
- ExecStart = "${crashplansb}/bin/CrashPlanEngine start";
- ExecStop = "${crashplansb}/bin/CrashPlanEngine stop";
- PIDFile = "${crashplansb.vardir}/CrashPlanEngine.pid";
- WorkingDirectory = crashplansb;
- };
- };
- };
-}
diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix
deleted file mode 100644
index c540cc6e2aee..000000000000
--- a/nixos/modules/services/backup/crashplan.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
- cfg = config.services.crashplan;
- crashplan = pkgs.crashplan;
-in
-
-with lib;
-
-{
- options = {
- services.crashplan = {
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Starts crashplan background service.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
- environment.systemPackages = [ crashplan ];
-
- systemd.services.crashplan = {
- description = "CrashPlan Backup Engine";
-
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "local-fs.target" ];
-
- preStart = ''
- ensureDir() {
- dir=$1
- mode=$2
-
- if ! test -e $dir; then
- ${pkgs.coreutils}/bin/mkdir -m $mode -p $dir
- elif [ "$(${pkgs.coreutils}/bin/stat -c %a $dir)" != "$mode" ]; then
- ${pkgs.coreutils}/bin/chmod $mode $dir
- fi
- }
-
- ensureDir ${crashplan.vardir} 755
- ensureDir ${crashplan.vardir}/conf 700
- ensureDir ${crashplan.manifestdir} 700
- ensureDir ${crashplan.vardir}/cache 700
- ensureDir ${crashplan.vardir}/backupArchives 700
- ensureDir ${crashplan.vardir}/log 777
- cp -avn ${crashplan}/conf.template/* ${crashplan.vardir}/conf
- for x in app.asar bin install.vars lang lib libc42archive64.so libc52archive.so libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libleveldb64.so libleveldb.so libmd564.so libmd5.so share skin upgrade; do
- rm -f ${crashplan.vardir}/$x;
- ln -sf ${crashplan}/$x ${crashplan.vardir}/$x;
- done
- '';
-
- serviceConfig = {
- Type = "forking";
- EnvironmentFile = "${crashplan}/bin/run.conf";
- ExecStart = "${crashplan}/bin/CrashPlanEngine start";
- ExecStop = "${crashplan}/bin/CrashPlanEngine stop";
- PIDFile = "${crashplan.vardir}/CrashPlanEngine.pid";
- WorkingDirectory = crashplan;
- };
- };
- };
-}
diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix
index ba6e154f6b3d..dbd5605143f6 100644
--- a/nixos/modules/services/backup/mysql-backup.nix
+++ b/nixos/modules/services/backup/mysql-backup.nix
@@ -103,7 +103,7 @@ in
}];
systemd = {
- timers."mysql-backup" = {
+ timers.mysql-backup = {
description = "Mysql backup timer";
wantedBy = [ "timers.target" ];
timerConfig = {
@@ -112,7 +112,7 @@ in
Unit = "mysql-backup.service";
};
};
- services."mysql-backup" = {
+ services.mysql-backup = {
description = "Mysql backup service";
enable = true;
serviceConfig = {
diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index 17b410a97f3e..13a36ae32ac0 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -81,7 +81,7 @@ in {
};
pgdumpOptions = mkOption {
- type = types.string;
+ type = types.separatedString " ";
default = "-Cbo";
description = ''
Command line options for pg_dump. This options is not used
diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix
index bb5dcab1dcf2..6635a51ec2c6 100644
--- a/nixos/modules/services/backup/rsnapshot.nix
+++ b/nixos/modules/services/backup/rsnapshot.nix
@@ -2,7 +2,7 @@
with lib;
-let
+let
cfg = config.services.rsnapshot;
cfgfile = pkgs.writeText "rsnapshot.conf" ''
config_version 1.2
@@ -52,7 +52,7 @@ in
cronIntervals = mkOption {
default = {};
example = { hourly = "0 * * * *"; daily = "50 21 * * *"; };
- type = types.attrsOf types.string;
+ type = types.attrsOf types.str;
description = ''
Periodicity at which intervals should be run by cron.
Note that the intervals also have to exist in configuration
diff --git a/nixos/modules/services/backup/tsm.nix b/nixos/modules/services/backup/tsm.nix
index 3b2bb37491b5..6c238745797e 100644
--- a/nixos/modules/services/backup/tsm.nix
+++ b/nixos/modules/services/backup/tsm.nix
@@ -78,7 +78,7 @@ in
config = mkIf cfg.enable {
inherit assertions;
programs.tsmClient.enable = true;
- programs.tsmClient.servers."${cfg.servername}".passwdDir =
+ programs.tsmClient.servers.${cfg.servername}.passwdDir =
mkDefault "/var/lib/tsm-backup/password";
systemd.services.tsm-backup = {
description = "IBM Spectrum Protect (Tivoli Storage Manager) Backup";
diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixos/modules/services/backup/zfs-replication.nix
index 785cedb98694..5a64304275d5 100644
--- a/nixos/modules/services/backup/zfs-replication.nix
+++ b/nixos/modules/services/backup/zfs-replication.nix
@@ -60,7 +60,7 @@ in {
pkgs.lz4
];
- systemd.services."zfs-replication" = {
+ systemd.services.zfs-replication = {
after = [
"zfs-snapshot-daily.service"
"zfs-snapshot-frequent.service"
diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix
index 9c7f84655727..f317078ddda2 100644
--- a/nixos/modules/services/backup/znapzend.nix
+++ b/nixos/modules/services/backup/znapzend.nix
@@ -361,7 +361,7 @@ in
environment.systemPackages = [ pkgs.znapzend ];
systemd.services = {
- "znapzend" = {
+ znapzend = {
description = "ZnapZend - ZFS Backup System";
wantedBy = [ "zfs.target" ];
after = [ "zfs.target" ];
diff --git a/nixos/modules/services/cluster/hadoop/hdfs.nix b/nixos/modules/services/cluster/hadoop/hdfs.nix
index a38b6a78d3a5..4f4b0a92108f 100644
--- a/nixos/modules/services/cluster/hadoop/hdfs.nix
+++ b/nixos/modules/services/cluster/hadoop/hdfs.nix
@@ -24,7 +24,7 @@ with lib;
config = mkMerge [
(mkIf cfg.hdfs.namenode.enabled {
- systemd.services."hdfs-namenode" = {
+ systemd.services.hdfs-namenode = {
description = "Hadoop HDFS NameNode";
wantedBy = [ "multi-user.target" ];
@@ -44,7 +44,7 @@ with lib;
};
})
(mkIf cfg.hdfs.datanode.enabled {
- systemd.services."hdfs-datanode" = {
+ systemd.services.hdfs-datanode = {
description = "Hadoop HDFS DataNode";
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/cluster/hadoop/yarn.nix b/nixos/modules/services/cluster/hadoop/yarn.nix
index 5345a2732d7e..c92020637e47 100644
--- a/nixos/modules/services/cluster/hadoop/yarn.nix
+++ b/nixos/modules/services/cluster/hadoop/yarn.nix
@@ -35,7 +35,7 @@ with lib;
})
(mkIf cfg.yarn.resourcemanager.enabled {
- systemd.services."yarn-resourcemanager" = {
+ systemd.services.yarn-resourcemanager = {
description = "Hadoop YARN ResourceManager";
wantedBy = [ "multi-user.target" ];
@@ -53,7 +53,7 @@ with lib;
})
(mkIf cfg.yarn.nodemanager.enabled {
- systemd.services."yarn-nodemanager" = {
+ systemd.services.yarn-nodemanager = {
description = "Hadoop YARN NodeManager";
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/nixos/modules/services/cluster/kubernetes/addon-manager.nix
index ad7d17c9c283..17f2dde31a71 100644
--- a/nixos/modules/services/cluster/kubernetes/addon-manager.nix
+++ b/nixos/modules/services/cluster/kubernetes/addon-manager.nix
@@ -62,50 +62,19 @@ in
'';
};
- enable = mkEnableOption "Kubernetes addon manager";
-
- kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes addon manager";
- bootstrapAddonsKubeconfig = top.lib.mkKubeConfigOptions "Kubernetes addon manager bootstrap";
+ enable = mkEnableOption "Whether to enable Kubernetes addon manager.";
};
###### implementation
- config = let
-
- addonManagerPaths = filter (a: a != null) [
- cfg.kubeconfig.caFile
- cfg.kubeconfig.certFile
- cfg.kubeconfig.keyFile
- ];
- bootstrapAddonsPaths = filter (a: a != null) [
- cfg.bootstrapAddonsKubeconfig.caFile
- cfg.bootstrapAddonsKubeconfig.certFile
- cfg.bootstrapAddonsKubeconfig.keyFile
- ];
-
- in mkIf cfg.enable {
+ config = mkIf cfg.enable {
environment.etc."kubernetes/addons".source = "${addons}/";
- #TODO: Get rid of kube-addon-manager in the future for the following reasons
- # - it is basically just a shell script wrapped around kubectl
- # - it assumes that it is clusterAdmin or can gain clusterAdmin rights through serviceAccount
- # - it is designed to be used with k8s system components only
- # - it would be better with a more Nix-oriented way of managing addons
systemd.services.kube-addon-manager = {
description = "Kubernetes addon manager";
wantedBy = [ "kubernetes.target" ];
- after = [ "kube-node-online.target" ];
- before = [ "kubernetes.target" ];
- environment = {
- ADDON_PATH = "/etc/kubernetes/addons/";
- KUBECONFIG = top.lib.mkKubeConfig "kube-addon-manager" cfg.kubeconfig;
- };
- path = with pkgs; [ gawk kubectl ];
- preStart = ''
- until kubectl -n kube-system get serviceaccounts/default 2>/dev/null; do
- echo kubectl -n kube-system get serviceaccounts/default: exit status $?
- sleep 2
- done
- '';
+ after = [ "kube-apiserver.service" ];
+ environment.ADDON_PATH = "/etc/kubernetes/addons/";
+ path = [ pkgs.gawk ];
serviceConfig = {
Slice = "kubernetes.slice";
ExecStart = "${top.package}/bin/kube-addons";
@@ -115,52 +84,8 @@ in
Restart = "on-failure";
RestartSec = 10;
};
- unitConfig.ConditionPathExists = addonManagerPaths;
};
- systemd.paths.kube-addon-manager = {
- wantedBy = [ "kube-addon-manager.service" ];
- pathConfig = {
- PathExists = addonManagerPaths;
- PathChanged = addonManagerPaths;
- };
- };
-
- services.kubernetes.addonManager.kubeconfig.server = mkDefault top.apiserverAddress;
-
- systemd.services.kube-addon-manager-bootstrap = mkIf (top.apiserver.enable && top.addonManager.bootstrapAddons != {}) {
- wantedBy = [ "kube-control-plane-online.target" ];
- after = [ "kube-apiserver.service" ];
- before = [ "kube-control-plane-online.target" ];
- path = [ pkgs.kubectl ];
- environment = {
- KUBECONFIG = top.lib.mkKubeConfig "kube-addon-manager-bootstrap" cfg.bootstrapAddonsKubeconfig;
- };
- preStart = with pkgs; let
- files = mapAttrsToList (n: v: writeText "${n}.json" (builtins.toJSON v))
- cfg.bootstrapAddons;
- in ''
- until kubectl auth can-i '*' '*' -q 2>/dev/null; do
- echo kubectl auth can-i '*' '*': exit status $?
- sleep 2
- done
-
- kubectl apply -f ${concatStringsSep " \\\n -f " files}
- '';
- script = "echo Ok";
- unitConfig.ConditionPathExists = bootstrapAddonsPaths;
- };
-
- systemd.paths.kube-addon-manager-bootstrap = {
- wantedBy = [ "kube-addon-manager-bootstrap.service" ];
- pathConfig = {
- PathExists = bootstrapAddonsPaths;
- PathChanged = bootstrapAddonsPaths;
- };
- };
-
- services.kubernetes.addonManager.bootstrapAddonsKubeconfig.server = mkDefault top.apiserverAddress;
-
services.kubernetes.addonManager.bootstrapAddons = mkIf isRBACEnabled
(let
name = system:kube-addon-manager;
diff --git a/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix b/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix
index 2295694ffc74..70f96d75a461 100644
--- a/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix
+++ b/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix
@@ -74,7 +74,7 @@ in {
spec = {
replicas = 1;
revisionHistoryLimit = 10;
- selector.matchLabels."k8s-app" = "kubernetes-dashboard";
+ selector.matchLabels.k8s-app = "kubernetes-dashboard";
template = {
metadata = {
labels = {
@@ -169,23 +169,6 @@ in {
};
};
- kubernetes-dashboard-cm = {
- apiVersion = "v1";
- kind = "ConfigMap";
- metadata = {
- labels = {
- k8s-app = "kubernetes-dashboard";
- # Allows editing resource and makes sure it is created first.
- "addonmanager.kubernetes.io/mode" = "EnsureExists";
- };
- name = "kubernetes-dashboard-settings";
- namespace = "kube-system";
- };
- };
- };
-
- services.kubernetes.addonManager.bootstrapAddons = mkMerge [{
-
kubernetes-dashboard-sa = {
apiVersion = "v1";
kind = "ServiceAccount";
@@ -227,9 +210,20 @@ in {
};
type = "Opaque";
};
- }
-
- (optionalAttrs cfg.rbac.enable
+ kubernetes-dashboard-cm = {
+ apiVersion = "v1";
+ kind = "ConfigMap";
+ metadata = {
+ labels = {
+ k8s-app = "kubernetes-dashboard";
+ # Allows editing resource and makes sure it is created first.
+ "addonmanager.kubernetes.io/mode" = "EnsureExists";
+ };
+ name = "kubernetes-dashboard-settings";
+ namespace = "kube-system";
+ };
+ };
+ } // (optionalAttrs cfg.rbac.enable
(let
subjects = [{
kind = "ServiceAccount";
@@ -329,6 +323,6 @@ in {
inherit subjects;
};
})
- ))];
+ ));
};
}
diff --git a/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/nixos/modules/services/cluster/kubernetes/addons/dns.nix
index ee0ac632ecf0..47e588de3c93 100644
--- a/nixos/modules/services/cluster/kubernetes/addons/dns.nix
+++ b/nixos/modules/services/cluster/kubernetes/addons/dns.nix
@@ -73,7 +73,7 @@ in {
metadata = {
labels = {
"addonmanager.kubernetes.io/mode" = "Reconcile";
- "k8s-app" = "kube-dns";
+ k8s-app = "kube-dns";
"kubernetes.io/cluster-service" = "true";
"kubernetes.io/bootstrapping" = "rbac-defaults";
};
@@ -102,7 +102,7 @@ in {
};
labels = {
"addonmanager.kubernetes.io/mode" = "Reconcile";
- "k8s-app" = "kube-dns";
+ k8s-app = "kube-dns";
"kubernetes.io/cluster-service" = "true";
"kubernetes.io/bootstrapping" = "rbac-defaults";
};
@@ -130,7 +130,7 @@ in {
metadata = {
labels = {
"addonmanager.kubernetes.io/mode" = "Reconcile";
- "k8s-app" = "kube-dns";
+ k8s-app = "kube-dns";
"kubernetes.io/cluster-service" = "true";
};
name = "coredns";
@@ -144,7 +144,7 @@ in {
metadata = {
labels = {
"addonmanager.kubernetes.io/mode" = cfg.reconcileMode;
- "k8s-app" = "kube-dns";
+ k8s-app = "kube-dns";
"kubernetes.io/cluster-service" = "true";
};
name = "coredns";
@@ -175,7 +175,7 @@ in {
metadata = {
labels = {
"addonmanager.kubernetes.io/mode" = cfg.reconcileMode;
- "k8s-app" = "kube-dns";
+ k8s-app = "kube-dns";
"kubernetes.io/cluster-service" = "true";
"kubernetes.io/name" = "CoreDNS";
};
@@ -301,7 +301,7 @@ in {
};
labels = {
"addonmanager.kubernetes.io/mode" = "Reconcile";
- "k8s-app" = "kube-dns";
+ k8s-app = "kube-dns";
"kubernetes.io/cluster-service" = "true";
"kubernetes.io/name" = "CoreDNS";
};
diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixos/modules/services/cluster/kubernetes/apiserver.nix
index f293dd79f42a..33796bf2e080 100644
--- a/nixos/modules/services/cluster/kubernetes/apiserver.nix
+++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix
@@ -290,32 +290,11 @@ in
###### implementation
config = mkMerge [
- (let
-
- apiserverPaths = filter (a: a != null) [
- cfg.clientCaFile
- cfg.etcd.caFile
- cfg.etcd.certFile
- cfg.etcd.keyFile
- cfg.kubeletClientCaFile
- cfg.kubeletClientCertFile
- cfg.kubeletClientKeyFile
- cfg.serviceAccountKeyFile
- cfg.tlsCertFile
- cfg.tlsKeyFile
- ];
- etcdPaths = filter (a: a != null) [
- config.services.etcd.trustedCaFile
- config.services.etcd.certFile
- config.services.etcd.keyFile
- ];
-
- in mkIf cfg.enable {
+ (mkIf cfg.enable {
systemd.services.kube-apiserver = {
description = "Kubernetes APIServer Service";
- wantedBy = [ "kube-control-plane-online.target" ];
- after = [ "certmgr.service" ];
- before = [ "kube-control-plane-online.target" ];
+ wantedBy = [ "kubernetes.target" ];
+ after = [ "network.target" ];
serviceConfig = {
Slice = "kubernetes.slice";
ExecStart = ''${top.package}/bin/kube-apiserver \
@@ -386,15 +365,6 @@ in
Restart = "on-failure";
RestartSec = 5;
};
- unitConfig.ConditionPathExists = apiserverPaths;
- };
-
- systemd.paths.kube-apiserver = mkIf top.apiserver.enable {
- wantedBy = [ "kube-apiserver.service" ];
- pathConfig = {
- PathExists = apiserverPaths;
- PathChanged = apiserverPaths;
- };
};
services.etcd = {
@@ -408,18 +378,6 @@ in
initialAdvertisePeerUrls = mkDefault ["https://${top.masterAddress}:2380"];
};
- systemd.services.etcd = {
- unitConfig.ConditionPathExists = etcdPaths;
- };
-
- systemd.paths.etcd = {
- wantedBy = [ "etcd.service" ];
- pathConfig = {
- PathExists = etcdPaths;
- PathChanged = etcdPaths;
- };
- };
-
services.kubernetes.addonManager.bootstrapAddons = mkIf isRBACEnabled {
apiserver-kubelet-api-admin-crb = {
diff --git a/nixos/modules/services/cluster/kubernetes/controller-manager.nix b/nixos/modules/services/cluster/kubernetes/controller-manager.nix
index b94e8bd86d4c..0b73d090f241 100644
--- a/nixos/modules/services/cluster/kubernetes/controller-manager.nix
+++ b/nixos/modules/services/cluster/kubernetes/controller-manager.nix
@@ -104,31 +104,11 @@ in
};
###### implementation
- config = let
-
- controllerManagerPaths = filter (a: a != null) [
- cfg.kubeconfig.caFile
- cfg.kubeconfig.certFile
- cfg.kubeconfig.keyFile
- cfg.rootCaFile
- cfg.serviceAccountKeyFile
- cfg.tlsCertFile
- cfg.tlsKeyFile
- ];
-
- in mkIf cfg.enable {
- systemd.services.kube-controller-manager = rec {
+ config = mkIf cfg.enable {
+ systemd.services.kube-controller-manager = {
description = "Kubernetes Controller Manager Service";
- wantedBy = [ "kube-control-plane-online.target" ];
+ wantedBy = [ "kubernetes.target" ];
after = [ "kube-apiserver.service" ];
- before = [ "kube-control-plane-online.target" ];
- environment.KUBECONFIG = top.lib.mkKubeConfig "kube-controller-manager" cfg.kubeconfig;
- preStart = ''
- until kubectl auth can-i get /api -q 2>/dev/null; do
- echo kubectl auth can-i get /api: exit status $?
- sleep 2
- done
- '';
serviceConfig = {
RestartSec = "30s";
Restart = "on-failure";
@@ -140,7 +120,7 @@ in
"--cluster-cidr=${cfg.clusterCidr}"} \
${optionalString (cfg.featureGates != [])
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
- --kubeconfig=${environment.KUBECONFIG} \
+ --kubeconfig=${top.lib.mkKubeConfig "kube-controller-manager" cfg.kubeconfig} \
--leader-elect=${boolToString cfg.leaderElect} \
${optionalString (cfg.rootCaFile!=null)
"--root-ca-file=${cfg.rootCaFile}"} \
@@ -161,16 +141,7 @@ in
User = "kubernetes";
Group = "kubernetes";
};
- path = top.path ++ [ pkgs.kubectl ];
- unitConfig.ConditionPathExists = controllerManagerPaths;
- };
-
- systemd.paths.kube-controller-manager = {
- wantedBy = [ "kube-controller-manager.service" ];
- pathConfig = {
- PathExists = controllerManagerPaths;
- PathChanged = controllerManagerPaths;
- };
+ path = top.path;
};
services.kubernetes.pki.certs = with top.lib; {
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index 143b41f57f6a..3790ac9b6918 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -256,29 +256,6 @@ in {
wantedBy = [ "multi-user.target" ];
};
- systemd.targets.kube-control-plane-online = {
- wantedBy = [ "kubernetes.target" ];
- before = [ "kubernetes.target" ];
- };
-
- systemd.services.kube-control-plane-online = rec {
- description = "Kubernetes control plane is online";
- wantedBy = [ "kube-control-plane-online.target" ];
- after = [ "kube-scheduler.service" "kube-controller-manager.service" ];
- before = [ "kube-control-plane-online.target" ];
- path = [ pkgs.curl ];
- preStart = ''
- until curl -Ssf ${cfg.apiserverAddress}/healthz do
- echo curl -Ssf ${cfg.apiserverAddress}/healthz: exit status $?
- sleep 3
- done
- '';
- script = "echo Ok";
- serviceConfig = {
- TimeoutSec = "500";
- };
- };
-
systemd.tmpfiles.rules = [
"d /opt/cni/bin 0755 root root -"
"d /run/kubernetes 0755 kubernetes kubernetes -"
@@ -302,8 +279,6 @@ in {
services.kubernetes.apiserverAddress = mkDefault ("https://${if cfg.apiserver.advertiseAddress != null
then cfg.apiserver.advertiseAddress
else "${cfg.masterAddress}:${toString cfg.apiserver.securePort}"}");
-
- services.kubernetes.kubeconfig.server = mkDefault cfg.apiserverAddress;
})
];
}
diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix
index d9437427d6d1..d799e638fc94 100644
--- a/nixos/modules/services/cluster/kubernetes/flannel.nix
+++ b/nixos/modules/services/cluster/kubernetes/flannel.nix
@@ -14,36 +14,25 @@ let
buildInputs = [ pkgs.makeWrapper ];
} ''
mkdir -p $out
- cp ${pkgs.kubernetes.src}/cluster/centos/node/bin/mk-docker-opts.sh $out/mk-docker-opts.sh
# bashInteractive needed for `compgen`
- makeWrapper ${pkgs.bashInteractive}/bin/bash $out/mk-docker-opts --add-flags "$out/mk-docker-opts.sh"
+ makeWrapper ${pkgs.bashInteractive}/bin/bash $out/mk-docker-opts --add-flags "${pkgs.kubernetes}/bin/mk-docker-opts.sh"
'';
in
{
###### interface
options.services.kubernetes.flannel = {
- enable = mkEnableOption "flannel networking";
- kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes flannel";
+ enable = mkEnableOption "enable flannel networking";
};
###### implementation
- config = let
-
- flannelPaths = filter (a: a != null) [
- cfg.kubeconfig.caFile
- cfg.kubeconfig.certFile
- cfg.kubeconfig.keyFile
- ];
- kubeconfig = top.lib.mkKubeConfig "flannel" cfg.kubeconfig;
-
- in mkIf cfg.enable {
+ config = mkIf cfg.enable {
services.flannel = {
enable = mkDefault true;
network = mkDefault top.clusterCidr;
- inherit storageBackend kubeconfig;
- nodeName = top.kubelet.hostname;
+ inherit storageBackend;
+ nodeName = config.services.kubernetes.kubelet.hostname;
};
services.kubernetes.kubelet = {
@@ -60,64 +49,22 @@ in
systemd.services.mk-docker-opts = {
description = "Pre-Docker Actions";
- wantedBy = [ "flannel.target" ];
- before = [ "flannel.target" ];
path = with pkgs; [ gawk gnugrep ];
script = ''
${mkDockerOpts}/mk-docker-opts -d /run/flannel/docker
systemctl restart docker
'';
- unitConfig.ConditionPathExists = [ "/run/flannel/subnet.env" ];
serviceConfig.Type = "oneshot";
};
systemd.paths.flannel-subnet-env = {
- wantedBy = [ "mk-docker-opts.service" ];
+ wantedBy = [ "flannel.service" ];
pathConfig = {
- PathExists = [ "/run/flannel/subnet.env" ];
- PathChanged = [ "/run/flannel/subnet.env" ];
+ PathModified = "/run/flannel/subnet.env";
Unit = "mk-docker-opts.service";
};
};
- systemd.targets.flannel = {
- wantedBy = [ "kube-node-online.target" ];
- before = [ "kube-node-online.target" ];
- };
-
- systemd.services.flannel = {
- wantedBy = [ "flannel.target" ];
- after = [ "kubelet.target" ];
- before = [ "flannel.target" ];
- path = with pkgs; [ iptables kubectl ];
- environment.KUBECONFIG = kubeconfig;
- preStart = let
- args = [
- "--selector=kubernetes.io/hostname=${top.kubelet.hostname}"
- # flannel exits if node is not registered yet, before that there is no podCIDR
- "--output=jsonpath={.items[0].spec.podCIDR}"
- # if jsonpath cannot be resolved exit with status 1
- "--allow-missing-template-keys=false"
- ];
- in ''
- until kubectl get nodes ${concatStringsSep " " args} 2>/dev/null; do
- echo Waiting for ${top.kubelet.hostname} to be RegisteredNode
- sleep 1
- done
- '';
- unitConfig.ConditionPathExists = flannelPaths;
- };
-
- systemd.paths.flannel = {
- wantedBy = [ "flannel.service" ];
- pathConfig = {
- PathExists = flannelPaths;
- PathChanged = flannelPaths;
- };
- };
-
- services.kubernetes.flannel.kubeconfig.server = mkDefault top.apiserverAddress;
-
systemd.services.docker = {
environment.DOCKER_OPTS = "-b none";
serviceConfig.EnvironmentFile = "-/run/flannel/docker";
@@ -144,6 +91,7 @@ in
# give flannel som kubernetes rbac permissions if applicable
services.kubernetes.addonManager.bootstrapAddons = mkIf ((storageBackend == "kubernetes") && (elem "RBAC" top.apiserver.authorizationMode)) {
+
flannel-cr = {
apiVersion = "rbac.authorization.k8s.io/v1beta1";
kind = "ClusterRole";
@@ -179,6 +127,7 @@ in
name = "flannel-client";
}];
};
+
};
};
}
diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix
index 4c5df96bcc6a..250da4c807ec 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -61,12 +61,6 @@ in
type = str;
};
- allowPrivileged = mkOption {
- description = "Whether to allow Kubernetes containers to request privileged mode.";
- default = false;
- type = bool;
- };
-
clusterDns = mkOption {
description = "Use alternative DNS.";
default = "10.1.0.1";
@@ -234,28 +228,21 @@ in
###### implementation
config = mkMerge [
- (let
-
- kubeletPaths = filter (a: a != null) [
- cfg.kubeconfig.caFile
- cfg.kubeconfig.certFile
- cfg.kubeconfig.keyFile
- cfg.clientCaFile
- cfg.tlsCertFile
- cfg.tlsKeyFile
- ];
-
- in mkIf cfg.enable {
+ (mkIf cfg.enable {
services.kubernetes.kubelet.seedDockerImages = [infraContainer];
systemd.services.kubelet = {
description = "Kubernetes Kubelet Service";
- wantedBy = [ "kubelet.target" ];
- after = [ "kube-control-plane-online.target" ];
- before = [ "kubelet.target" ];
+ wantedBy = [ "kubernetes.target" ];
+ after = [ "network.target" "docker.service" "kube-apiserver.service" ];
path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path;
preStart = ''
- rm -f /opt/cni/bin/* || true
+ ${concatMapStrings (img: ''
+ echo "Seeding docker image: ${img}"
+ docker load <${img}
+ '') cfg.seedDockerImages}
+
+ rm /opt/cni/bin/* || true
${concatMapStrings (package: ''
echo "Linking cni package: ${package}"
ln -fs ${package}/bin/* /opt/cni/bin
@@ -269,7 +256,6 @@ in
RestartSec = "1000ms";
ExecStart = ''${top.package}/bin/kubelet \
--address=${cfg.address} \
- --allow-privileged=${boolToString cfg.allowPrivileged} \
--authentication-token-webhook \
--authentication-token-webhook-cache-ttl="10s" \
--authorization-mode=Webhook \
@@ -308,56 +294,6 @@ in
'';
WorkingDirectory = top.dataDir;
};
- unitConfig.ConditionPathExists = kubeletPaths;
- };
-
- systemd.paths.kubelet = {
- wantedBy = [ "kubelet.service" ];
- pathConfig = {
- PathExists = kubeletPaths;
- PathChanged = kubeletPaths;
- };
- };
-
- systemd.services.docker.before = [ "kubelet.service" ];
-
- systemd.services.docker-seed-images = {
- wantedBy = [ "docker.service" ];
- after = [ "docker.service" ];
- before = [ "kubelet.service" ];
- path = with pkgs; [ docker ];
- preStart = ''
- ${concatMapStrings (img: ''
- echo "Seeding docker image: ${img}"
- docker load <${img}
- '') cfg.seedDockerImages}
- '';
- script = "echo Ok";
- serviceConfig.Type = "oneshot";
- serviceConfig.RemainAfterExit = true;
- serviceConfig.Slice = "kubernetes.slice";
- };
-
- systemd.services.kubelet-online = {
- wantedBy = [ "kube-node-online.target" ];
- after = [ "flannel.target" "kubelet.target" ];
- before = [ "kube-node-online.target" ];
- # it is complicated. flannel needs kubelet to run the pause container before
- # it discusses the node CIDR with apiserver and afterwards configures and restarts
- # dockerd. Until then prevent creating any pods because they have to be recreated anyway
- # because the network of docker0 has been changed by flannel.
- script = let
- docker-env = "/run/flannel/docker";
- flannel-date = "stat --print=%Y ${docker-env}";
- docker-date = "systemctl show --property=ActiveEnterTimestamp --value docker";
- in ''
- until test -f ${docker-env} ; do sleep 1 ; done
- while test `${flannel-date}` -gt `date +%s --date="$(${docker-date})"` ; do
- sleep 1
- done
- '';
- serviceConfig.Type = "oneshot";
- serviceConfig.Slice = "kubernetes.slice";
};
# Allways include cni plugins
@@ -404,16 +340,5 @@ in
};
})
- {
- systemd.targets.kubelet = {
- wantedBy = [ "kube-node-online.target" ];
- before = [ "kube-node-online.target" ];
- };
-
- systemd.targets.kube-node-online = {
- wantedBy = [ "kubernetes.target" ];
- before = [ "kubernetes.target" ];
- };
- }
];
}
diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix
index 47384ae50a07..733479e24c97 100644
--- a/nixos/modules/services/cluster/kubernetes/pki.nix
+++ b/nixos/modules/services/cluster/kubernetes/pki.nix
@@ -27,11 +27,12 @@ let
certmgrAPITokenPath = "${top.secretsPath}/${cfsslAPITokenBaseName}";
cfsslAPITokenLength = 32;
- clusterAdminKubeconfig = with cfg.certs.clusterAdmin; {
- server = top.apiserverAddress;
- certFile = cert;
- keyFile = key;
- };
+ clusterAdminKubeconfig = with cfg.certs.clusterAdmin;
+ top.lib.mkKubeConfig "cluster-admin" {
+ server = top.apiserverAddress;
+ certFile = cert;
+ keyFile = key;
+ };
remote = with config.services; "https://${kubernetes.masterAddress}:${toString cfssl.port}";
in
@@ -118,11 +119,6 @@ in
cfsslCertPathPrefix = "${config.services.cfssl.dataDir}/cfssl";
cfsslCert = "${cfsslCertPathPrefix}.pem";
cfsslKey = "${cfsslCertPathPrefix}-key.pem";
-
- certmgrPaths = [
- top.caFile
- certmgrAPITokenPath
- ];
in
{
@@ -172,40 +168,13 @@ in
chown cfssl "${cfsslAPITokenPath}" && chmod 400 "${cfsslAPITokenPath}"
'')]);
- systemd.targets.cfssl-online = {
- wantedBy = [ "network-online.target" ];
- after = [ "cfssl.service" "network-online.target" "cfssl-online.service" ];
- };
-
- systemd.services.cfssl-online = {
- description = "Wait for ${remote} to be reachable.";
- wantedBy = [ "cfssl-online.target" ];
- before = [ "cfssl-online.target" ];
- path = [ pkgs.curl ];
- preStart = ''
- until curl --fail-early -fskd '{}' ${remote}/api/v1/cfssl/info -o /dev/null; do
- echo curl ${remote}/api/v1/cfssl/info: exit status $?
- sleep 2
- done
- '';
- script = "echo Ok";
- serviceConfig = {
- TimeoutSec = "300";
- };
- };
-
systemd.services.kube-certmgr-bootstrap = {
description = "Kubernetes certmgr bootstrapper";
- wantedBy = [ "cfssl-online.target" ];
- after = [ "cfssl-online.target" ];
- before = [ "certmgr.service" ];
- path = with pkgs; [ curl cfssl ];
+ wantedBy = [ "certmgr.service" ];
+ after = [ "cfssl.target" ];
script = concatStringsSep "\n" [''
set -e
- mkdir -p $(dirname ${certmgrAPITokenPath})
- mkdir -p $(dirname ${top.caFile})
-
# If there's a cfssl (cert issuer) running locally, then don't rely on user to
# manually paste it in place. Just symlink.
# otherwise, create the target file, ready for users to insert the token
@@ -217,18 +186,15 @@ in
fi
''
(optionalString (cfg.pkiTrustOnBootstrap) ''
- if [ ! -s "${top.caFile}" ]; then
- until test -s ${top.caFile}.json; do
- sleep 2
- curl --fail-early -fskd '{}' ${remote}/api/v1/cfssl/info -o ${top.caFile}.json
- done
- cfssljson -f ${top.caFile}.json -stdout >${top.caFile}
- rm ${top.caFile}.json
+ if [ ! -f "${top.caFile}" ] || [ $(cat "${top.caFile}" | wc -c) -lt 1 ]; then
+ ${pkgs.curl}/bin/curl --fail-early -f -kd '{}' ${remote}/api/v1/cfssl/info | \
+ ${pkgs.cfssl}/bin/cfssljson -stdout >${top.caFile}
fi
'')
];
serviceConfig = {
- TimeoutSec = "500";
+ RestartSec = "10s";
+ Restart = "on-failure";
};
};
@@ -264,28 +230,35 @@ in
mapAttrs mkSpec cfg.certs;
};
- systemd.services.certmgr = {
- wantedBy = [ "cfssl-online.target" ];
- after = [ "cfssl-online.target" "kube-certmgr-bootstrap.service" ];
- preStart = ''
- while ! test -s ${certmgrAPITokenPath} ; do
- sleep 1
- echo Waiting for ${certmgrAPITokenPath}
- done
- '';
- unitConfig.ConditionPathExists = certmgrPaths;
- };
+ #TODO: Get rid of kube-addon-manager in the future for the following reasons
+ # - it is basically just a shell script wrapped around kubectl
+ # - it assumes that it is clusterAdmin or can gain clusterAdmin rights through serviceAccount
+ # - it is designed to be used with k8s system components only
+ # - it would be better with a more Nix-oriented way of managing addons
+ systemd.services.kube-addon-manager = mkIf top.addonManager.enable (mkMerge [{
+ environment.KUBECONFIG = with cfg.certs.addonManager;
+ top.lib.mkKubeConfig "addon-manager" {
+ server = top.apiserverAddress;
+ certFile = cert;
+ keyFile = key;
+ };
+ }
- systemd.paths.certmgr = {
- wantedBy = [ "certmgr.service" ];
- pathConfig = {
- PathExists = certmgrPaths;
- PathChanged = certmgrPaths;
- };
- };
+ (optionalAttrs (top.addonManager.bootstrapAddons != {}) {
+ serviceConfig.PermissionsStartOnly = true;
+ preStart = with pkgs;
+ let
+ files = mapAttrsToList (n: v: writeText "${n}.json" (builtins.toJSON v))
+ top.addonManager.bootstrapAddons;
+ in
+ ''
+ export KUBECONFIG=${clusterAdminKubeconfig}
+ ${kubectl}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files}
+ '';
+ })]);
- environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (cfg.etcClusterAdminKubeconfig != null)
- (top.lib.mkKubeConfig "cluster-admin" clusterAdminKubeconfig);
+ environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (!isNull cfg.etcClusterAdminKubeconfig)
+ clusterAdminKubeconfig;
environment.systemPackages = mkIf (top.kubelet.enable || top.proxy.enable) [
(pkgs.writeScriptBin "nixos-kubernetes-node-join" ''
@@ -311,22 +284,38 @@ in
exit 1
fi
- do_restart=$(test -s ${certmgrAPITokenPath} && echo -n y || echo -n n)
-
echo $token > ${certmgrAPITokenPath}
chmod 600 ${certmgrAPITokenPath}
- if [ y = $do_restart ]; then
- echo "Restarting certmgr..." >&1
- systemctl restart certmgr
- fi
+ echo "Restarting certmgr..." >&1
+ systemctl restart certmgr
- echo "Node joined succesfully" >&1
+ echo "Waiting for certs to appear..." >&1
+
+ ${optionalString top.kubelet.enable ''
+ while [ ! -f ${cfg.certs.kubelet.cert} ]; do sleep 1; done
+ echo "Restarting kubelet..." >&1
+ systemctl restart kubelet
+ ''}
+
+ ${optionalString top.proxy.enable ''
+ while [ ! -f ${cfg.certs.kubeProxyClient.cert} ]; do sleep 1; done
+ echo "Restarting kube-proxy..." >&1
+ systemctl restart kube-proxy
+ ''}
+
+ ${optionalString top.flannel.enable ''
+ while [ ! -f ${cfg.certs.flannelClient.cert} ]; do sleep 1; done
+ echo "Restarting flannel..." >&1
+ systemctl restart flannel
+ ''}
+
+ echo "Node joined succesfully"
'')];
# isolate etcd on loopback at the master node
# easyCerts doesn't support multimaster clusters anyway atm.
- services.etcd = mkIf top.apiserver.enable (with cfg.certs.etcd; {
+ services.etcd = with cfg.certs.etcd; {
listenClientUrls = ["https://127.0.0.1:2379"];
listenPeerUrls = ["https://127.0.0.1:2380"];
advertiseClientUrls = ["https://etcd.local:2379"];
@@ -335,11 +324,19 @@ in
certFile = mkDefault cert;
keyFile = mkDefault key;
trustedCaFile = mkDefault caCert;
- });
+ };
networking.extraHosts = mkIf (config.services.etcd.enable) ''
127.0.0.1 etcd.${top.addons.dns.clusterDomain} etcd.local
'';
+ services.flannel = with cfg.certs.flannelClient; {
+ kubeconfig = top.lib.mkKubeConfig "flannel" {
+ server = top.apiserverAddress;
+ certFile = cert;
+ keyFile = key;
+ };
+ };
+
services.kubernetes = {
apiserver = mkIf top.apiserver.enable (with cfg.certs.apiServer; {
@@ -359,13 +356,6 @@ in
proxyClientCertFile = mkDefault cfg.certs.apiserverProxyClient.cert;
proxyClientKeyFile = mkDefault cfg.certs.apiserverProxyClient.key;
});
- addonManager = mkIf top.addonManager.enable {
- kubeconfig = with cfg.certs.addonManager; {
- certFile = mkDefault cert;
- keyFile = mkDefault key;
- };
- bootstrapAddonsKubeconfig = clusterAdminKubeconfig;
- };
controllerManager = mkIf top.controllerManager.enable {
serviceAccountKeyFile = mkDefault cfg.certs.serviceAccount.key;
rootCaFile = cfg.certs.controllerManagerClient.caCert;
@@ -374,12 +364,6 @@ in
keyFile = mkDefault key;
};
};
- flannel = mkIf top.flannel.enable {
- kubeconfig = with cfg.certs.flannelClient; {
- certFile = cert;
- keyFile = key;
- };
- };
scheduler = mkIf top.scheduler.enable {
kubeconfig = with cfg.certs.schedulerClient; {
certFile = mkDefault cert;
diff --git a/nixos/modules/services/cluster/kubernetes/proxy.nix b/nixos/modules/services/cluster/kubernetes/proxy.nix
index 23f4d97b7030..bd4bf04ea833 100644
--- a/nixos/modules/services/cluster/kubernetes/proxy.nix
+++ b/nixos/modules/services/cluster/kubernetes/proxy.nix
@@ -45,28 +45,12 @@ in
};
###### implementation
- config = let
-
- proxyPaths = filter (a: a != null) [
- cfg.kubeconfig.caFile
- cfg.kubeconfig.certFile
- cfg.kubeconfig.keyFile
- ];
-
- in mkIf cfg.enable {
- systemd.services.kube-proxy = rec {
+ config = mkIf cfg.enable {
+ systemd.services.kube-proxy = {
description = "Kubernetes Proxy Service";
- wantedBy = [ "kube-node-online.target" ];
- after = [ "kubelet-online.service" ];
- before = [ "kube-node-online.target" ];
- environment.KUBECONFIG = top.lib.mkKubeConfig "kube-proxy" cfg.kubeconfig;
- path = with pkgs; [ iptables conntrack_tools kubectl ];
- preStart = ''
- until kubectl auth can-i get nodes/${top.kubelet.hostname} -q 2>/dev/null; do
- echo kubectl auth can-i get nodes/${top.kubelet.hostname}: exit status $?
- sleep 2
- done
- '';
+ wantedBy = [ "kubernetes.target" ];
+ after = [ "kube-apiserver.service" ];
+ path = with pkgs; [ iptables conntrack_tools ];
serviceConfig = {
Slice = "kubernetes.slice";
ExecStart = ''${top.package}/bin/kube-proxy \
@@ -75,7 +59,7 @@ in
"--cluster-cidr=${top.clusterCidr}"} \
${optionalString (cfg.featureGates != [])
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
- --kubeconfig=${environment.KUBECONFIG} \
+ --kubeconfig=${top.lib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \
${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
${cfg.extraOpts}
'';
@@ -83,15 +67,6 @@ in
Restart = "on-failure";
RestartSec = 5;
};
- unitConfig.ConditionPathExists = proxyPaths;
- };
-
- systemd.paths.kube-proxy = {
- wantedBy = [ "kube-proxy.service" ];
- pathConfig = {
- PathExists = proxyPaths;
- PathChanged = proxyPaths;
- };
};
services.kubernetes.pki.certs = {
diff --git a/nixos/modules/services/cluster/kubernetes/scheduler.nix b/nixos/modules/services/cluster/kubernetes/scheduler.nix
index a0e484542951..5f6113227d9d 100644
--- a/nixos/modules/services/cluster/kubernetes/scheduler.nix
+++ b/nixos/modules/services/cluster/kubernetes/scheduler.nix
@@ -56,35 +56,18 @@ in
};
###### implementation
- config = let
-
- schedulerPaths = filter (a: a != null) [
- cfg.kubeconfig.caFile
- cfg.kubeconfig.certFile
- cfg.kubeconfig.keyFile
- ];
-
- in mkIf cfg.enable {
- systemd.services.kube-scheduler = rec {
+ config = mkIf cfg.enable {
+ systemd.services.kube-scheduler = {
description = "Kubernetes Scheduler Service";
- wantedBy = [ "kube-control-plane-online.target" ];
+ wantedBy = [ "kubernetes.target" ];
after = [ "kube-apiserver.service" ];
- before = [ "kube-control-plane-online.target" ];
- environment.KUBECONFIG = top.lib.mkKubeConfig "kube-scheduler" cfg.kubeconfig;
- path = [ pkgs.kubectl ];
- preStart = ''
- until kubectl auth can-i get /api -q 2>/dev/null; do
- echo kubectl auth can-i get /api: exit status $?
- sleep 2
- done
- '';
serviceConfig = {
Slice = "kubernetes.slice";
ExecStart = ''${top.package}/bin/kube-scheduler \
--address=${cfg.address} \
${optionalString (cfg.featureGates != [])
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
- --kubeconfig=${environment.KUBECONFIG} \
+ --kubeconfig=${top.lib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \
--leader-elect=${boolToString cfg.leaderElect} \
--port=${toString cfg.port} \
${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
@@ -96,15 +79,6 @@ in
Restart = "on-failure";
RestartSec = 5;
};
- unitConfig.ConditionPathExists = schedulerPaths;
- };
-
- systemd.paths.kube-scheduler = {
- wantedBy = [ "kube-scheduler.service" ];
- pathConfig = {
- PathExists = schedulerPaths;
- PathChanged = schedulerPaths;
- };
};
services.kubernetes.pki.certs = {
diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix
index 7022751b3f01..a7edac025384 100644
--- a/nixos/modules/services/computing/boinc/client.nix
+++ b/nixos/modules/services/computing/boinc/client.nix
@@ -111,7 +111,7 @@ in
systemd.services.boinc = {
description = "BOINC Client";
- after = ["network.target" "local-fs.target"];
+ after = ["network.target"];
wantedBy = ["multi-user.target"];
script = ''
${fhsEnvExecutable} --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag}
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index c7fe4eeeab99..500acb485620 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -43,7 +43,7 @@ in
###### interface
options = {
- services.hydra = rec {
+ services.hydra = {
enable = mkOption {
type = types.bool;
diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix
index a9da3a3c5620..90c094f68b61 100644
--- a/nixos/modules/services/databases/cassandra.nix
+++ b/nixos/modules/services/databases/cassandra.nix
@@ -259,7 +259,7 @@ in {
'';
};
incrementalRepairOptions = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
example = [ "--partitioner-range" ];
description = ''
@@ -267,7 +267,7 @@ in {
'';
};
maxHeapSize = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "4G";
description = ''
@@ -287,7 +287,7 @@ in {
'';
};
heapNewSize = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "800M";
description = ''
@@ -352,11 +352,11 @@ in {
type = types.listOf (types.submodule {
options = {
username = mkOption {
- type = types.string;
+ type = types.str;
description = "Username for JMX";
};
password = mkOption {
- type = types.string;
+ type = types.str;
description = "Password for JMX";
};
};
@@ -397,14 +397,14 @@ in {
}
];
users = mkIf (cfg.user == defaultUser) {
- extraUsers."${defaultUser}" =
+ extraUsers.${defaultUser} =
{ group = cfg.group;
home = cfg.homeDir;
createHome = true;
uid = config.ids.uids.cassandra;
description = "Cassandra service user";
};
- extraGroups."${defaultUser}".gid = config.ids.gids.cassandra;
+ extraGroups.${defaultUser}.gid = config.ids.gids.cassandra;
};
systemd.services.cassandra =
diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index 77e404116c8a..53224db1d896 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -56,7 +56,7 @@ in {
user = mkOption {
- type = types.string;
+ type = types.str;
default = "couchdb";
description = ''
User account under which couchdb runs.
@@ -64,7 +64,7 @@ in {
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "couchdb";
description = ''
Group account under which couchdb runs.
@@ -106,7 +106,7 @@ in {
};
bindAddress = mkOption {
- type = types.string;
+ type = types.str;
default = "127.0.0.1";
description = ''
Defines the IP address by which CouchDB will be accessible.
@@ -138,7 +138,7 @@ in {
};
configFile = mkOption {
- type = types.string;
+ type = types.path;
description = ''
Configuration file for persisting runtime changes. File
needs to be readable and writable from couchdb user/group.
diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix
index 3746b875c7f2..8f8d0da7c8d3 100644
--- a/nixos/modules/services/databases/foundationdb.nix
+++ b/nixos/modules/services/databases/foundationdb.nix
@@ -140,7 +140,7 @@ in
};
logSize = mkOption {
- type = types.string;
+ type = types.str;
default = "10MiB";
description = ''
Roll over to a new log file after the current log file
@@ -149,7 +149,7 @@ in
};
maxLogSize = mkOption {
- type = types.string;
+ type = types.str;
default = "100MiB";
description = ''
Delete the oldest log file when the total size of all log
@@ -171,7 +171,7 @@ in
};
memory = mkOption {
- type = types.string;
+ type = types.str;
default = "8GiB";
description = ''
Maximum memory used by the process. The default value is
@@ -193,7 +193,7 @@ in
};
storageMemory = mkOption {
- type = types.string;
+ type = types.str;
default = "1GiB";
description = ''
Maximum memory used for data storage. The default value is
diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix
index 589c8cf5ec80..2d1a47bbaa31 100644
--- a/nixos/modules/services/databases/hbase.nix
+++ b/nixos/modules/services/databases/hbase.nix
@@ -53,7 +53,7 @@ in {
user = mkOption {
- type = types.string;
+ type = types.str;
default = "hbase";
description = ''
User account under which HBase runs.
@@ -61,7 +61,7 @@ in {
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "hbase";
description = ''
Group account under which HBase runs.
diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
index 6868050c8446..2f176a038729 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -129,13 +129,13 @@ in
user = mkOption {
default = "influxdb";
description = "User account under which influxdb runs";
- type = types.string;
+ type = types.str;
};
group = mkOption {
default = "influxdb";
description = "Group under which influxdb runs";
- type = types.string;
+ type = types.str;
};
dataDir = mkOption {
diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index c458a1d648a0..12879afed477 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
@@ -65,9 +65,9 @@ in
default = false;
description = "Enable client authentication. Creates a default superuser with username root!";
};
-
+
initialRootPassword = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description = "Password for the root user if auth is enabled.";
};
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index d8e2c715afb9..5bf57a1bf9cb 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -47,26 +47,26 @@ in
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "openldap";
description = "User account under which slapd runs.";
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "openldap";
description = "Group account under which slapd runs.";
};
urlList = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [ "ldap:///" ];
description = "URL list slapd should listen on.";
example = [ "ldaps:///" ];
};
dataDir = mkOption {
- type = types.string;
+ type = types.path;
default = "/var/db/openldap";
description = "The database directory.";
};
diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix
index b26fa9093ef4..c4bd71f3d60e 100644
--- a/nixos/modules/services/databases/opentsdb.nix
+++ b/nixos/modules/services/databases/opentsdb.nix
@@ -34,7 +34,7 @@ in {
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "opentsdb";
description = ''
User account under which OpenTSDB runs.
@@ -42,7 +42,7 @@ in {
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "opentsdb";
description = ''
Group account under which OpenTSDB runs.
diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix
index 1050c2dd481a..0f8634dab319 100644
--- a/nixos/modules/services/databases/pgmanage.nix
+++ b/nixos/modules/services/databases/pgmanage.nix
@@ -59,8 +59,8 @@ in {
type = types.attrsOf types.str;
default = {};
example = {
- "nuc-server" = "hostaddr=192.168.0.100 port=5432 dbname=postgres";
- "mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require";
+ nuc-server = "hostaddr=192.168.0.100 port=5432 dbname=postgres";
+ mini-server = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require";
};
description = ''
pgmanage requires at least one PostgreSQL server be defined.
@@ -192,13 +192,13 @@ in {
};
};
users = {
- users."${pgmanage}" = {
+ users.${pgmanage} = {
name = pgmanage;
group = pgmanage;
home = cfg.sqlRoot;
createHome = true;
};
- groups."${pgmanage}" = {
+ groups.${pgmanage} = {
name = pgmanage;
};
};
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 10250bb5193a..7bba4dacddcc 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -81,6 +81,10 @@ in
default = "";
description = ''
Defines the mapping from system users to database users.
+
+ The general form is:
+
+ map-name system-username database-username
'';
};
@@ -224,7 +228,7 @@ in
# systems!
mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5
- else pkgs.postgresql_9_4);
+ else throw "postgresql_9_4 was removed, please upgrade your postgresql version.");
services.postgresql.dataDir =
mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index 3f2857100f52..9c389d80a6df 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -8,17 +8,19 @@ let
condOption = name: value: if value != null then "${name} ${toString value}" else "";
redisConfig = pkgs.writeText "redis.conf" ''
- pidfile ${cfg.pidFile}
port ${toString cfg.port}
${condOption "bind" cfg.bind}
${condOption "unixsocket" cfg.unixSocket}
+ daemonize yes
+ supervised systemd
loglevel ${cfg.logLevel}
logfile ${cfg.logfile}
syslog-enabled ${redisBool cfg.syslog}
+ pidfile /run/redis/redis.pid
databases ${toString cfg.databases}
${concatMapStrings (d: "save ${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}\n") cfg.save}
- dbfilename ${cfg.dbFilename}
- dir ${toString cfg.dbpath}
+ dbfilename dump.rdb
+ dir /var/lib/redis
${if cfg.slaveOf != null then "slaveof ${cfg.slaveOf.ip} ${toString cfg.slaveOf.port}" else ""}
${condOption "masterauth" cfg.masterAuth}
${condOption "requirepass" cfg.requirePass}
@@ -40,7 +42,12 @@ in
enable = mkOption {
type = types.bool;
default = false;
- description = "Whether to enable the Redis server.";
+ description = ''
+ Whether to enable the Redis server. Note that the NixOS module for
+ Redis disables kernel support for Transparent Huge Pages (THP),
+ because this features causes major performance problems for Redis,
+ e.g. (https://redis.io/topics/latency).
+ '';
};
package = mkOption {
@@ -50,18 +57,6 @@ in
description = "Which Redis derivation to use.";
};
- user = mkOption {
- type = types.str;
- default = "redis";
- description = "User account under which Redis runs.";
- };
-
- pidFile = mkOption {
- type = types.path;
- default = "/var/lib/redis/redis.pid";
- description = "";
- };
-
port = mkOption {
type = types.int;
default = 6379;
@@ -95,7 +90,7 @@ in
type = with types; nullOr path;
default = null;
description = "The path to the socket to bind to.";
- example = "/run/redis.sock";
+ example = "/run/redis/redis.sock";
};
logLevel = mkOption {
@@ -131,18 +126,6 @@ in
example = [ [900 1] [300 10] [60 10000] ];
};
- dbFilename = mkOption {
- type = types.str;
- default = "dump.rdb";
- description = "The filename where to dump the DB.";
- };
-
- dbpath = mkOption {
- type = types.path;
- default = "/var/lib/redis";
- description = "The DB will be written inside this directory, with the filename specified using the 'dbFilename' configuration.";
- };
-
slaveOf = mkOption {
default = null; # { ip, port }
description = "An attribute set with two attributes: ip and port to which this redis instance acts as a slave.";
@@ -170,12 +153,6 @@ in
description = "By default data is only periodically persisted to disk, enable this option to use an append-only file for improved persistence.";
};
- appendOnlyFilename = mkOption {
- type = types.str;
- default = "appendonly.aof";
- description = "Filename for the append-only file (stored inside of dbpath)";
- };
-
appendFsync = mkOption {
type = types.str;
default = "everysec"; # no, always, everysec
@@ -217,27 +194,30 @@ in
allowedTCPPorts = [ cfg.port ];
};
- users.users.redis =
- { name = cfg.user;
- description = "Redis database user";
- };
+ users.users.redis.description = "Redis database user";
environment.systemPackages = [ cfg.package ];
+ systemd.services.disable-transparent-huge-pages = {
+ description = "Disable Transparent Huge Pages (required by Redis)";
+ before = [ "redis.service" ];
+ wantedBy = [ "redis.service" ];
+ script = "echo never > /sys/kernel/mm/transparent_hugepage/enabled";
+ serviceConfig.Type = "oneshot";
+ };
+
systemd.services.redis =
{ description = "Redis Server";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- preStart = ''
- install -d -m0700 -o ${cfg.user} ${cfg.dbpath}
- chown -R ${cfg.user} ${cfg.dbpath}
- '';
-
serviceConfig = {
ExecStart = "${cfg.package}/bin/redis-server ${redisConfig}";
- User = cfg.user;
+ RuntimeDirectory = "redis";
+ StateDirectory = "redis";
+ Type = "notify";
+ User = "redis";
};
};
diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix
index ac086cf55996..885215209bdf 100644
--- a/nixos/modules/services/databases/riak.nix
+++ b/nixos/modules/services/databases/riak.nix
@@ -29,7 +29,7 @@ in
};
nodeName = mkOption {
- type = types.string;
+ type = types.str;
default = "riak@127.0.0.1";
description = ''
Name of the Erlang node.
@@ -37,7 +37,7 @@ in
};
distributedCookie = mkOption {
- type = types.string;
+ type = types.str;
default = "riak";
description = ''
Cookie for distributed node communication. All nodes in the
diff --git a/nixos/modules/services/desktops/blueman.nix b/nixos/modules/services/desktops/blueman.nix
new file mode 100644
index 000000000000..18ad610247ed
--- /dev/null
+++ b/nixos/modules/services/desktops/blueman.nix
@@ -0,0 +1,25 @@
+# blueman service
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.blueman;
+in {
+ ###### interface
+ options = {
+ services.blueman = {
+ enable = mkEnableOption "blueman";
+ };
+ };
+
+ ###### implementation
+ config = mkIf cfg.enable {
+
+ environment.systemPackages = [ pkgs.blueman ];
+
+ services.dbus.packages = [ pkgs.blueman ];
+
+ systemd.packages = [ pkgs.blueman ];
+ };
+}
diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
index 040fe157d52d..6007dddf50c0 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -202,14 +202,14 @@ in
];
# restart geoclue service when the configuration changes
- systemd.services."geoclue".restartTriggers = [
+ systemd.services.geoclue.restartTriggers = [
config.environment.etc."geoclue/geoclue.conf".source
];
# this needs to run as a user service, since it's associated with the
# user who is making the requests
systemd.user.services = mkIf cfg.enableDemoAgent {
- "geoclue-agent" = {
+ geoclue-agent = {
description = "Geoclue agent";
script = "${package}/libexec/geoclue-2.0/demos/agent";
# this should really be `partOf = [ "geoclue.service" ]`, but
@@ -219,12 +219,12 @@ in
};
};
- services.geoclue2.appConfig."epiphany" = {
+ services.geoclue2.appConfig.epiphany = {
isAllowed = true;
isSystem = false;
};
- services.geoclue2.appConfig."firefox" = {
+ services.geoclue2.appConfig.firefox = {
isAllowed = true;
isSystem = false;
};
diff --git a/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix b/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix
index 2740a22c7ca0..3d2b3ed85e3a 100644
--- a/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix
+++ b/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix
@@ -23,5 +23,7 @@ with lib;
environment.systemPackages = [ pkgs.chrome-gnome-shell ];
services.dbus.packages = [ pkgs.chrome-gnome-shell ];
+
+ nixpkgs.config.firefox.enableGnomeExtensions = true;
};
}
diff --git a/nixos/modules/services/desktops/gnome3/glib-networking.nix b/nixos/modules/services/desktops/gnome3/glib-networking.nix
index 186668d7d385..fcd58509d6fc 100644
--- a/nixos/modules/services/desktops/gnome3/glib-networking.nix
+++ b/nixos/modules/services/desktops/gnome3/glib-networking.nix
@@ -22,11 +22,11 @@ with lib;
config = mkIf config.services.gnome3.glib-networking.enable {
- services.dbus.packages = [ pkgs.gnome3.glib-networking ];
+ services.dbus.packages = [ pkgs.glib-networking ];
- systemd.packages = [ pkgs.gnome3.glib-networking ];
+ systemd.packages = [ pkgs.glib-networking ];
- environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" ];
+ environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ];
};
diff --git a/nixos/modules/services/desktops/gnome3/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix
deleted file mode 100644
index 9631157934f9..000000000000
--- a/nixos/modules/services/desktops/gnome3/seahorse.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-# Seahorse daemon.
-
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-{
-
- ###### interface
-
- options = {
-
- services.gnome3.seahorse = {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Whether to enable Seahorse search provider for the GNOME Shell activity search.
- '';
- };
-
- };
-
- };
-
-
- ###### implementation
-
- config = mkIf config.services.gnome3.seahorse.enable {
-
- environment.systemPackages = [ pkgs.gnome3.seahorse pkgs.gnome3.dconf ];
-
- services.dbus.packages = [ pkgs.gnome3.seahorse ];
-
- };
-
-}
diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix
index e4e47cfbd438..a8ac22ac1276 100644
--- a/nixos/modules/services/desktops/profile-sync-daemon.nix
+++ b/nixos/modules/services/desktops/profile-sync-daemon.nix
@@ -34,7 +34,7 @@ in {
psd = {
enable = true;
description = "Profile Sync daemon";
- wants = [ "psd-resync.service" "local-fs.target" ];
+ wants = [ "psd-resync.service" ];
wantedBy = [ "default.target" ];
path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
unitConfig = {
diff --git a/nixos/modules/services/desktops/system-config-printer.nix b/nixos/modules/services/desktops/system-config-printer.nix
new file mode 100644
index 000000000000..8a80be266b20
--- /dev/null
+++ b/nixos/modules/services/desktops/system-config-printer.nix
@@ -0,0 +1,38 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.system-config-printer = {
+
+ enable = mkEnableOption "system-config-printer, a service for CUPS administration used by printing interfaces";
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf config.services.system-config-printer.enable {
+
+ services.dbus.packages = [
+ pkgs.system-config-printer
+ ];
+
+ systemd.packages = [
+ pkgs.system-config-printer
+ ];
+
+ services.udev.packages = [
+ pkgs.system-config-printer
+ ];
+
+ };
+
+}
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index 8ced302bad1e..03483f69fa2f 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -59,7 +59,7 @@
The latest stable version of Emacs 25 using the
GTK+ 2
+ xlink:href="http://www.gtk.org">GTK 2
widget toolkit.
@@ -321,7 +321,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
If you want, you can tweak the Emacs package itself from your
emacs.nix. For example, if you want to have a
- GTK+3-based Emacs instead of the default GTK+2-based binary and remove the
+ GTK 3-based Emacs instead of the default GTK 2-based binary and remove the
automatically generated emacs.desktop (useful is you
only use emacsclient), you can change your file
emacs.nix in this way:
@@ -349,7 +349,7 @@ in [...]
After building this file as shown in , you
- will get an GTK3-based Emacs binary pre-loaded with your favorite packages.
+ will get an GTK 3-based Emacs binary pre-loaded with your favorite packages.
diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix
index d04673a6c8b8..f3831156f453 100644
--- a/nixos/modules/services/games/factorio.nix
+++ b/nixos/modules/services/games/factorio.nix
@@ -55,7 +55,7 @@ in
'';
};
saveName = mkOption {
- type = types.string;
+ type = types.str;
default = "default";
description = ''
The name of the savegame that will be used by the server.
@@ -81,7 +81,7 @@ in
'';
};
stateDirName = mkOption {
- type = types.string;
+ type = types.str;
default = "factorio";
description = ''
Name of the directory under /var/lib holding the server's data.
@@ -102,14 +102,14 @@ in
'';
};
game-name = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = "Factorio Game";
description = ''
Name of the game as it will appear in the game listing.
'';
};
description = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = "";
description = ''
Description of the game that will appear in the listing.
@@ -130,28 +130,28 @@ in
'';
};
username = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description = ''
Your factorio.com login credentials. Required for games with visibility public.
'';
};
password = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description = ''
Your factorio.com login credentials. Required for games with visibility public.
'';
};
token = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description = ''
Authentication token. May be used instead of 'password' above.
'';
};
game-password = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description = ''
Game password.
diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix
index 31f8edca20ce..a59b74c0b4c4 100644
--- a/nixos/modules/services/games/terraria.nix
+++ b/nixos/modules/services/games/terraria.nix
@@ -4,7 +4,7 @@ with lib;
let
cfg = config.services.terraria;
- worldSizeMap = { "small" = 1; "medium" = 2; "large" = 3; };
+ worldSizeMap = { small = 1; medium = 2; large = 3; };
valFlag = name: val: optionalString (val != null) "-${name} \"${escape ["\\" "\""] (toString val)}\"";
boolFlag = name: val: optionalString val "-${name}";
flags = [
diff --git a/nixos/modules/services/hardware/freefall.nix b/nixos/modules/services/hardware/freefall.nix
index 066ccaa4d7cf..83f1e8c84f28 100644
--- a/nixos/modules/services/hardware/freefall.nix
+++ b/nixos/modules/services/hardware/freefall.nix
@@ -28,7 +28,7 @@ in {
};
devices = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [ "/dev/sda" ];
description = ''
Device paths to all internal spinning hard drives.
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix
index 223adfee96e8..6c341bcbf240 100644
--- a/nixos/modules/services/hardware/fwupd.nix
+++ b/nixos/modules/services/hardware/fwupd.nix
@@ -43,7 +43,7 @@ in {
};
blacklistDevices = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
example = [ "2082b5e0-7a64-478a-b1b2-e3404fab6dad" ];
description = ''
@@ -52,7 +52,7 @@ in {
};
blacklistPlugins = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [ "test" ];
example = [ "udev" ];
description = ''
diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index fe05c5a5c06f..b344dfc20610 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -76,7 +76,7 @@ in
};
hardware.sane.configDir = mkOption {
- type = types.string;
+ type = types.str;
internal = true;
description = "The value of SANE_CONFIG_DIR.";
};
@@ -124,7 +124,7 @@ in
environment.sessionVariables = env;
services.udev.packages = backends;
- users.groups."scanner".gid = config.ids.gids.scanner;
+ users.groups.scanner.gid = config.ids.gids.scanner;
})
(mkIf config.services.saned.enable {
@@ -152,7 +152,7 @@ in
};
};
- users.users."scanner" = {
+ users.users.scanner = {
uid = config.ids.uids.scanner;
group = "scanner";
};
diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
index fd19d8020fb8..6bf31982b71a 100644
--- a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
+++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
@@ -33,7 +33,7 @@ let
addAllNetDev = xs: concatStringsSep "\n" (map addNetDev xs);
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "brscan4-etc-files-0.4.3-3";
src = "${brscan4}/opt/brother/scanner/brscan4";
diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix
index d4b0a9495d75..3876280ee6bc 100644
--- a/nixos/modules/services/hardware/tcsd.nix
+++ b/nixos/modules/services/hardware/tcsd.nix
@@ -49,13 +49,13 @@ in
user = mkOption {
default = "tss";
- type = types.string;
+ type = types.str;
description = "User account under which tcsd runs.";
};
group = mkOption {
default = "tss";
- type = types.string;
+ type = types.str;
description = "Group account under which tcsd runs.";
};
@@ -65,19 +65,19 @@ in
description = ''
The location of the system persistent storage file.
The system persistent storage file holds keys and data across
- restarts of the TCSD and system reboots.
+ restarts of the TCSD and system reboots.
'';
};
firmwarePCRs = mkOption {
default = "0,1,2,3,4,5,6,7";
- type = types.string;
+ type = types.str;
description = "PCR indices used in the TPM for firmware measurements.";
};
kernelPCRs = mkOption {
default = "8,9,10,11,12";
- type = types.string;
+ type = types.str;
description = "PCR indices used in the TPM for kernel measurements.";
};
diff --git a/nixos/modules/services/hardware/throttled.nix b/nixos/modules/services/hardware/throttled.nix
index 13fc5e4792e6..7617c4492d7c 100644
--- a/nixos/modules/services/hardware/throttled.nix
+++ b/nixos/modules/services/hardware/throttled.nix
@@ -20,7 +20,7 @@ in {
config = mkIf cfg.enable {
systemd.packages = [ pkgs.throttled ];
# The upstream package has this in Install, but that's not enough, see the NixOS manual
- systemd.services."lenovo_fix".wantedBy = [ "multi-user.target" ];
+ systemd.services.lenovo_fix.wantedBy = [ "multi-user.target" ];
environment.etc."lenovo_fix.conf".source =
if cfg.extraConfig != ""
diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index 092ff051a042..4f8af7978286 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -60,11 +60,11 @@ in
powerManagement.cpufreq.max = null;
powerManagement.cpufreq.min = null;
- systemd.sockets."systemd-rfkill".enable = false;
+ systemd.sockets.systemd-rfkill.enable = false;
systemd.services = {
"systemd-rfkill@".enable = false;
- "systemd-rfkill".enable = false;
+ systemd-rfkill.enable = false;
tlp = {
description = "TLP system startup/shutdown";
diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixos/modules/services/hardware/triggerhappy.nix
index a500cb4fc367..f9f5234bdc3f 100644
--- a/nixos/modules/services/hardware/triggerhappy.nix
+++ b/nixos/modules/services/hardware/triggerhappy.nix
@@ -102,7 +102,6 @@ in
systemd.services.triggerhappy = {
wantedBy = [ "multi-user.target" ];
- after = [ "local-fs.target" ];
description = "Global hotkey daemon";
serviceConfig = {
ExecStart = "${pkgs.triggerhappy}/bin/thd ${optionalString (cfg.user != "root") "--user ${cfg.user}"} --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*";
diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix
index 1da47349c077..5e7ac7a6e659 100644
--- a/nixos/modules/services/hardware/upower.nix
+++ b/nixos/modules/services/hardware/upower.nix
@@ -5,8 +5,11 @@
with lib;
let
+
cfg = config.services.upower;
+
in
+
{
###### interface
@@ -49,55 +52,7 @@ in
services.udev.packages = [ cfg.package ];
- systemd.services.upower =
- { description = "Power Management Daemon";
- path = [ pkgs.glib.out ]; # needed for gdbus
- serviceConfig =
- { Type = "dbus";
- BusName = "org.freedesktop.UPower";
- ExecStart = "@${cfg.package}/libexec/upowerd upowerd";
- Restart = "on-failure";
- # Upstream lockdown:
- # Filesystem lockdown
- ProtectSystem = "strict";
- # Needed by keyboard backlight support
- ProtectKernelTunables = false;
- ProtectControlGroups = true;
- ReadWritePaths = "/var/lib/upower";
- ProtectHome = true;
- PrivateTmp = true;
-
- # Network
- # PrivateNetwork=true would block udev's netlink socket
- RestrictAddressFamilies = "AF_UNIX AF_NETLINK";
-
- # Execute Mappings
- MemoryDenyWriteExecute = true;
-
- # Modules
- ProtectKernelModules = true;
-
- # Real-time
- RestrictRealtime = true;
-
- # Privilege escalation
- NoNewPrivileges = true;
- };
- };
-
- system.activationScripts.upower =
- ''
- mkdir -m 0755 -p /var/lib/upower
- '';
-
- # The upower daemon seems to get stuck after doing a suspend
- # (i.e. subsequent suspend requests will say "Sleep has already
- # been requested and is pending"). So as a workaround, restart
- # the daemon.
- powerManagement.resumeCommands =
- ''
- ${config.systemd.package}/bin/systemctl try-restart upower
- '';
+ systemd.packages = [ cfg.package ];
};
diff --git a/nixos/modules/services/logging/SystemdJournal2Gelf.nix b/nixos/modules/services/logging/SystemdJournal2Gelf.nix
index e90d9e7a12b6..f26aef7262ba 100644
--- a/nixos/modules/services/logging/SystemdJournal2Gelf.nix
+++ b/nixos/modules/services/logging/SystemdJournal2Gelf.nix
@@ -16,7 +16,7 @@ in
};
graylogServer = mkOption {
- type = types.string;
+ type = types.str;
example = "graylog2.example.com:11201";
description = ''
Host and port of your graylog2 input. This should be a GELF
@@ -25,7 +25,7 @@ in
};
extraOptions = mkOption {
- type = types.string;
+ type = types.separatedString " ";
default = "";
description = ''
Any extra flags to pass to SystemdJournal2Gelf. Note that
@@ -56,4 +56,4 @@ in
};
};
};
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/logging/awstats.nix b/nixos/modules/services/logging/awstats.nix
index 54799d699a74..a92ff3bee490 100644
--- a/nixos/modules/services/logging/awstats.nix
+++ b/nixos/modules/services/logging/awstats.nix
@@ -32,7 +32,7 @@ in
};
updateAt = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "hourly";
description = ''
@@ -50,7 +50,7 @@ in
description = ''Enable the awstats web service. This switches on httpd.'';
};
urlPrefix = mkOption {
- type = types.string;
+ type = types.str;
default = "/awstats";
description = "The URL prefix under which the awstats service appears.";
};
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index f139190a1709..6d8be5b926d5 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -23,9 +23,9 @@ let
flags = "-r ${rulesDir} -c ${configFile} -L ${logFiles} -${levelFlag} -m ${cfg.mailTo}";
levelFlag = getAttrFromPath [cfg.level]
- { "paranoid" = "p";
- "server" = "s";
- "workstation" = "w";
+ { paranoid = "p";
+ server = "s";
+ workstation = "w";
};
cronJob = ''
@@ -155,7 +155,7 @@ in
config = mkOption {
default = "FQDN=1";
- type = types.string;
+ type = types.lines;
description = ''
Config options that you would like in logcheck.conf.
'';
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index 9b707e9deb58..4943e8d7db3a 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -53,7 +53,7 @@ in
type = types.package;
default = pkgs.logstash;
defaultText = "pkgs.logstash";
- example = literalExample "pkgs.logstash5";
+ example = literalExample "pkgs.logstash";
description = "Logstash package to use.";
};
diff --git a/nixos/modules/services/logging/rsyslogd.nix b/nixos/modules/services/logging/rsyslogd.nix
index 1ea96b8f1325..b924d94e0b0d 100644
--- a/nixos/modules/services/logging/rsyslogd.nix
+++ b/nixos/modules/services/logging/rsyslogd.nix
@@ -46,7 +46,7 @@ in
};
defaultConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = defaultConf;
description = ''
The default syslog.conf file configures a
@@ -56,7 +56,7 @@ in
};
extraConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = "";
example = "news.* -/var/log/news";
description = ''
diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix
index c05811291359..47812dd1e40e 100644
--- a/nixos/modules/services/mail/exim.nix
+++ b/nixos/modules/services/mail/exim.nix
@@ -21,7 +21,7 @@ in
};
config = mkOption {
- type = types.string;
+ type = types.lines;
default = "";
description = ''
Verbatim Exim configuration. This should not contain exim_user,
@@ -30,7 +30,7 @@ in
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "exim";
description = ''
User to use when no root privileges are required.
@@ -42,7 +42,7 @@ in
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "exim";
description = ''
Group to use when no root privileges are required.
@@ -50,7 +50,7 @@ in
};
spoolDir = mkOption {
- type = types.string;
+ type = types.path;
default = "/var/spool/exim";
description = ''
Location of the spool directory of exim.
diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix
index 11dd5cb48db0..e917209f3d1f 100644
--- a/nixos/modules/services/mail/mailman.nix
+++ b/nixos/modules/services/mail/mailman.nix
@@ -6,16 +6,35 @@ let
cfg = config.services.mailman;
- pythonEnv = pkgs.python3.withPackages (ps: [ps.mailman]);
+ mailmanPyEnv = pkgs.python3.withPackages (ps: with ps; [mailman mailman-hyperkitty]);
mailmanExe = with pkgs; stdenv.mkDerivation {
name = "mailman-" + python3Packages.mailman.version;
+ buildInputs = [makeWrapper];
unpackPhase = ":";
installPhase = ''
mkdir -p $out/bin
- sed >"$out/bin/mailman" <"${pythonEnv}/bin/mailman" \
- -e "2 iexport MAILMAN_CONFIG_FILE=/etc/mailman.cfg"
- chmod +x $out/bin/mailman
+ makeWrapper ${mailmanPyEnv}/bin/mailman $out/bin/mailman \
+ --set MAILMAN_CONFIG_FILE /etc/mailman.cfg
+ '';
+ };
+
+ mailmanWeb = pkgs.python3Packages.mailman-web.override {
+ serverEMail = cfg.siteOwner;
+ archiverKey = cfg.hyperkittyApiKey;
+ allowedHosts = cfg.webHosts;
+ };
+
+ mailmanWebPyEnv = pkgs.python3.withPackages (x: with x; [mailman-web]);
+
+ mailmanWebExe = with pkgs; stdenv.mkDerivation {
+ inherit (mailmanWeb) name;
+ buildInputs = [makeWrapper];
+ unpackPhase = ":";
+ installPhase = ''
+ mkdir -p $out/bin
+ makeWrapper ${mailmanWebPyEnv}/bin/django-admin $out/bin/mailman-web \
+ --set DJANGO_SETTINGS_MODULE settings
'';
};
@@ -28,11 +47,30 @@ let
bin_dir: ${pkgs.python3Packages.mailman}/bin
var_dir: /var/lib/mailman
queue_dir: $var_dir/queue
+ template_dir: $var_dir/templates
log_dir: $var_dir/log
lock_dir: $var_dir/lock
etc_dir: /etc
ext_dir: $etc_dir/mailman.d
pid_file: /run/mailman/master.pid
+ '' + optionalString (cfg.hyperkittyApiKey != null) ''
+ [archiver.hyperkitty]
+ class: mailman_hyperkitty.Archiver
+ enable: yes
+ configuration: ${pkgs.writeText "mailman-hyperkitty.cfg" mailmanHyperkittyCfg}
+ '';
+
+ mailmanHyperkittyCfg = ''
+ [general]
+ # This is your HyperKitty installation, preferably on the localhost. This
+ # address will be used by Mailman to forward incoming emails to HyperKitty
+ # for archiving. It does not need to be publicly available, in fact it's
+ # better if it is not.
+ base_url: ${cfg.hyperkittyBaseUrl}
+
+ # Shared API key, must be the identical to the value in HyperKitty's
+ # settings.
+ api_key: ${cfg.hyperkittyApiKey}
'';
in {
@@ -51,7 +89,7 @@ in {
siteOwner = mkOption {
type = types.str;
- default = "postmaster";
+ default = "postmaster@example.org";
description = ''
Certain messages that must be delivered to a human, but which can't
be delivered to a list owner (e.g. a bounce from a list owner), will
@@ -59,6 +97,48 @@ in {
'';
};
+ webRoot = mkOption {
+ type = types.path;
+ default = "${mailmanWeb}/${pkgs.python3.sitePackages}";
+ defaultText = "pkgs.python3Packages.mailman-web";
+ description = ''
+ The web root for the Hyperkity + Postorius apps provided by Mailman.
+ This variable can be set, of course, but it mainly exists so that site
+ admins can refer to it in their own hand-written httpd configuration files.
+ '';
+ };
+
+ webHosts = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ The list of hostnames and/or IP addresses from which the Mailman Web
+ UI will accept requests. By default, "localhost" and "127.0.0.1" are
+ enabled. All additional names under which your web server accepts
+ requests for the UI must be listed here or incoming requests will be
+ rejected.
+ '';
+ };
+
+ hyperkittyBaseUrl = mkOption {
+ type = types.str;
+ default = "http://localhost/hyperkitty/";
+ description = ''
+ Where can Mailman connect to Hyperkitty's internal API, preferably on
+ localhost?
+ '';
+ };
+
+ hyperkittyApiKey = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ The shared secret used to authenticate Mailman's internal
+ communication with Hyperkitty. Must be set to enable support for the
+ Hyperkitty archiver. Note that this secret is going to be visible to
+ all local users in the Nix store.
+ '';
+ };
};
};
@@ -71,25 +151,22 @@ in {
{ assertion = cfg.enable -> config.services.postfix.enable;
message = "Mailman requires Postfix";
}
- { assertion = config.services.postfix.recipientDelimiter == "+";
- message = "Postfix's recipientDelimiter must be set to '+'.";
- }
];
users.users.mailman = { description = "GNU Mailman"; isSystemUser = true; };
environment = {
- systemPackages = [ mailmanExe ];
+ systemPackages = [ mailmanExe mailmanWebExe pkgs.sassc ];
etc."mailman.cfg".text = mailmanCfg;
};
services.postfix = {
relayDomains = [ "hash:/var/lib/mailman/data/postfix_domains" ];
+ recipientDelimiter = "+"; # bake recipient addresses in mail envelopes via VERP
config = {
transport_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ];
local_recipient_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ];
- # Mailman uses recipient delimiters, so we don't need special handling.
- owner_request_special = "no";
+ owner_request_special = "no"; # Mailman handles -owner addresses on its own
};
};
@@ -109,6 +186,112 @@ in {
};
};
+ systemd.services.mailman-web = {
+ description = "Init Postorius DB";
+ before = [ "httpd.service" ];
+ requiredBy = [ "httpd.service" ];
+ script = ''
+ ${mailmanWebExe}/bin/mailman-web migrate
+ rm -rf static
+ ${mailmanWebExe}/bin/mailman-web collectstatic
+ ${mailmanWebExe}/bin/mailman-web compress
+ '';
+ serviceConfig = {
+ User = config.services.httpd.user;
+ Type = "oneshot";
+ StateDirectory = "mailman-web";
+ StateDirectoryMode = "0700";
+ WorkingDirectory = "/var/lib/mailman-web";
+ };
+ };
+
+ systemd.services.mailman-daily = {
+ description = "Trigger daily Mailman events";
+ startAt = "daily";
+ serviceConfig = {
+ ExecStart = "${mailmanExe}/bin/mailman digests --send";
+ User = "mailman";
+ };
+ };
+
+ systemd.services.hyperkitty = {
+ enable = cfg.hyperkittyApiKey != null;
+ description = "GNU Hyperkitty QCluster Process";
+ after = [ "network.target" ];
+ wantedBy = [ "mailman.service" "multi-user.target" ];
+ serviceConfig = {
+ ExecStart = "${mailmanWebExe}/bin/mailman-web qcluster";
+ User = config.services.httpd.user;
+ WorkingDirectory = "/var/lib/mailman-web";
+ };
+ };
+
+ systemd.services.hyperkitty-minutely = {
+ enable = cfg.hyperkittyApiKey != null;
+ description = "Trigger minutely Hyperkitty events";
+ startAt = "minutely";
+ serviceConfig = {
+ ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs minutely";
+ User = config.services.httpd.user;
+ WorkingDirectory = "/var/lib/mailman-web";
+ };
+ };
+
+ systemd.services.hyperkitty-quarter-hourly = {
+ enable = cfg.hyperkittyApiKey != null;
+ description = "Trigger quarter-hourly Hyperkitty events";
+ startAt = "*:00/15";
+ serviceConfig = {
+ ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs quarter_hourly";
+ User = config.services.httpd.user;
+ WorkingDirectory = "/var/lib/mailman-web";
+ };
+ };
+
+ systemd.services.hyperkitty-hourly = {
+ enable = cfg.hyperkittyApiKey != null;
+ description = "Trigger hourly Hyperkitty events";
+ startAt = "hourly";
+ serviceConfig = {
+ ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs hourly";
+ User = config.services.httpd.user;
+ WorkingDirectory = "/var/lib/mailman-web";
+ };
+ };
+
+ systemd.services.hyperkitty-daily = {
+ enable = cfg.hyperkittyApiKey != null;
+ description = "Trigger daily Hyperkitty events";
+ startAt = "daily";
+ serviceConfig = {
+ ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs daily";
+ User = config.services.httpd.user;
+ WorkingDirectory = "/var/lib/mailman-web";
+ };
+ };
+
+ systemd.services.hyperkitty-weekly = {
+ enable = cfg.hyperkittyApiKey != null;
+ description = "Trigger weekly Hyperkitty events";
+ startAt = "weekly";
+ serviceConfig = {
+ ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs weekly";
+ User = config.services.httpd.user;
+ WorkingDirectory = "/var/lib/mailman-web";
+ };
+ };
+
+ systemd.services.hyperkitty-yearly = {
+ enable = cfg.hyperkittyApiKey != null;
+ description = "Trigger yearly Hyperkitty events";
+ startAt = "yearly";
+ serviceConfig = {
+ ExecStart = "${mailmanWebExe}/bin/mailman-web runjobs yearly";
+ User = config.services.httpd.user;
+ WorkingDirectory = "/var/lib/mailman-web";
+ };
+ };
+
};
}
diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix
index 11565bc02f89..7ae00f3e501e 100644
--- a/nixos/modules/services/mail/mlmmj.nix
+++ b/nixos/modules/services/mail/mlmmj.nix
@@ -137,7 +137,7 @@ in
${pkgs.postfix}/bin/postmap ${stateDir}/transports
'';
- systemd.services."mlmmj-maintd" = {
+ systemd.services.mlmmj-maintd = {
description = "mlmmj maintenance daemon";
serviceConfig = {
User = cfg.user;
@@ -146,7 +146,7 @@ in
};
};
- systemd.timers."mlmmj-maintd" = {
+ systemd.timers.mlmmj-maintd = {
description = "mlmmj maintenance timer";
timerConfig.OnUnitActiveSec = cfg.maintInterval;
wantedBy = [ "timers.target" ];
diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix
index 9997d287013e..2c2910e0aa9b 100644
--- a/nixos/modules/services/mail/nullmailer.nix
+++ b/nixos/modules/services/mail/nullmailer.nix
@@ -14,7 +14,7 @@ with lib;
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "nullmailer";
description = ''
User to use to run nullmailer-send.
@@ -22,7 +22,7 @@ with lib;
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "nullmailer";
description = ''
Group to use to run nullmailer-send.
diff --git a/nixos/modules/services/mail/pfix-srsd.nix b/nixos/modules/services/mail/pfix-srsd.nix
index 9599854352c9..38984f896d6a 100644
--- a/nixos/modules/services/mail/pfix-srsd.nix
+++ b/nixos/modules/services/mail/pfix-srsd.nix
@@ -40,7 +40,7 @@ with lib;
systemPackages = [ pkgs.pfixtools ];
};
- systemd.services."pfix-srsd" = {
+ systemd.services.pfix-srsd = {
description = "Postfix sender rewriting scheme daemon";
before = [ "postfix.service" ];
#note that we use requires rather than wants because postfix
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 2b08ab1e6aa6..d5fd76da970b 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -509,7 +509,7 @@ in
};
localRecipients = mkOption {
- type = with types; nullOr (listOf string);
+ type = with types; nullOr (listOf str);
default = null;
description = ''
List of accepted local users. Specify a bare username, an
@@ -530,7 +530,7 @@ in
dnsBlacklists = mkOption {
default = [];
- type = with types; listOf string;
+ type = with types; listOf str;
description = "dns blacklist servers to use with smtpd_client_restrictions";
};
@@ -877,22 +877,22 @@ in
}
(mkIf haveAliases {
- services.postfix.aliasFiles."aliases" = aliasesFile;
+ services.postfix.aliasFiles.aliases = aliasesFile;
})
(mkIf haveTransport {
- services.postfix.mapFiles."transport" = transportFile;
+ services.postfix.mapFiles.transport = transportFile;
})
(mkIf haveVirtual {
- services.postfix.mapFiles."virtual" = virtualFile;
+ services.postfix.mapFiles.virtual = virtualFile;
})
(mkIf haveLocalRecipients {
- services.postfix.mapFiles."local_recipients" = localRecipientMapFile;
+ services.postfix.mapFiles.local_recipients = localRecipientMapFile;
})
(mkIf cfg.enableHeaderChecks {
- services.postfix.mapFiles."header_checks" = headerChecksFile;
+ services.postfix.mapFiles.header_checks = headerChecksFile;
})
(mkIf (cfg.dnsBlacklists != []) {
- services.postfix.mapFiles."client_access" = checkClientAccessFile;
+ services.postfix.mapFiles.client_access = checkClientAccessFile;
})
]);
}
diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 8e2b9c5dbc56..88fb7f0b4ad1 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -7,12 +7,12 @@ with lib; let
natural = with types; addCheck int (x: x >= 0);
natural' = with types; addCheck int (x: x > 0);
- socket = with types; addCheck (either (submodule unixSocket) (submodule inetSocket)) (x: x ? "path" || x ? "port");
+ socket = with types; addCheck (either (submodule unixSocket) (submodule inetSocket)) (x: x ? path || x ? port);
inetSocket = with types; {
options = {
addr = mkOption {
- type = nullOr string;
+ type = nullOr str;
default = null;
example = "127.0.0.1";
description = "The address to bind to. Localhost if null";
@@ -34,7 +34,7 @@ with lib; let
};
mode = mkOption {
- type = string;
+ type = str;
default = "0777";
description = "Mode of the unix socket";
};
@@ -63,17 +63,17 @@ in {
description = "Socket to bind to";
};
greylistText = mkOption {
- type = string;
+ type = str;
default = "Greylisted for %%s seconds";
description = "Response status text for greylisted messages; use %%s for seconds left until greylisting is over and %%r for mail domain of recipient";
};
greylistAction = mkOption {
- type = string;
+ type = str;
default = "DEFER_IF_PERMIT";
description = "Response status for greylisted messages (see access(5))";
};
greylistHeader = mkOption {
- type = string;
+ type = str;
default = "X-Greylist: delayed %%t seconds by postgrey-%%v at %%h; %%d";
description = "Prepend header to greylisted mails; use %%t for seconds delayed due to greylisting, %%v for the version of postgrey, %%d for the date, and %%h for the host";
};
@@ -88,7 +88,7 @@ in {
description = "Delete entries from whitelist if they haven't been seen for N days";
};
retryWindow = mkOption {
- type = either string natural;
+ type = either str natural;
default = 2;
example = "12h";
description = "Allow N days for the first retry. Use string with appended 'h' to specify time in hours";
@@ -151,7 +151,7 @@ in {
};
systemd.services.postgrey = let
- bind-flag = if cfg.socket ? "path" then
+ bind-flag = if cfg.socket ? path then
''--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}''
else
''--inet=${optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":")}${toString cfg.socket.port}'';
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index e59d5715de05..89aa9d17ff7f 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -308,7 +308,7 @@ in
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "rspamd";
description = ''
User to use when no root privileges are required.
@@ -316,7 +316,7 @@ in
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "rspamd";
description = ''
Group to use when no root privileges are required.
@@ -387,7 +387,7 @@ in
gid = config.ids.gids.rspamd;
};
- environment.etc."rspamd".source = rspamdDir;
+ environment.etc.rspamd.source = rspamdDir;
systemd.services.rspamd = {
description = "Rspamd Service";
diff --git a/nixos/modules/services/mail/rss2email.nix b/nixos/modules/services/mail/rss2email.nix
index df454abc8267..c1e5964c4536 100644
--- a/nixos/modules/services/mail/rss2email.nix
+++ b/nixos/modules/services/mail/rss2email.nix
@@ -43,9 +43,8 @@ in {
[DEFAULT] block along with the
to parameter.
- See
- https://github.com/rss2email/rss2email/blob/master/r2e.1
- for more information on which parameters are accepted.
+ See man r2e for more information on which
+ parameters are accepted.
'';
};
diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix
index 8b2ec82c7705..919d3b2f6e64 100644
--- a/nixos/modules/services/misc/airsonic.nix
+++ b/nixos/modules/services/misc/airsonic.nix
@@ -34,7 +34,7 @@ in {
};
listenAddress = mkOption {
- type = types.string;
+ type = types.str;
default = "127.0.0.1";
description = ''
The host name or IP address on which to bind Airsonic.
@@ -105,7 +105,7 @@ in {
config = mkIf cfg.enable {
systemd.services.airsonic = {
description = "Airsonic Media Server";
- after = [ "local-fs.target" "network.target" ];
+ after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
@@ -138,8 +138,8 @@ in {
services.nginx = mkIf (cfg.virtualHost != null) {
enable = true;
- virtualHosts."${cfg.virtualHost}" = {
- locations."${cfg.contextPath}".proxyPass = "http://${cfg.listenAddress}:${toString cfg.port}";
+ virtualHosts.${cfg.virtualHost} = {
+ locations.${cfg.contextPath}.proxyPass = "http://${cfg.listenAddress}:${toString cfg.port}";
};
};
diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index 9eeae9556992..798e902ccae4 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -46,7 +46,7 @@ in {
hostname = mkOption {
description = "Hostname the broker should bind to.";
default = "localhost";
- type = types.string;
+ type = types.str;
};
logDirs = mkOption {
@@ -54,13 +54,13 @@ in {
default = [ "/tmp/kafka-logs" ];
type = types.listOf types.path;
};
-
+
zookeeper = mkOption {
description = "Zookeeper connection string";
default = "localhost:2181";
- type = types.string;
+ type = types.str;
};
-
+
extraProperties = mkOption {
description = "Extra properties for server.properties.";
type = types.nullOr types.lines;
@@ -79,8 +79,8 @@ in {
log4jProperties = mkOption {
description = "Kafka log4j property configuration.";
default = ''
- log4j.rootLogger=INFO, stdout
-
+ log4j.rootLogger=INFO, stdout
+
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c)%n
diff --git a/nixos/modules/services/misc/cpuminer-cryptonight.nix b/nixos/modules/services/misc/cpuminer-cryptonight.nix
index f31526f8d107..907b9d90da29 100644
--- a/nixos/modules/services/misc/cpuminer-cryptonight.nix
+++ b/nixos/modules/services/misc/cpuminer-cryptonight.nix
@@ -28,15 +28,15 @@ in
'';
};
url = mkOption {
- type = types.string;
+ type = types.str;
description = "URL of mining server";
};
user = mkOption {
- type = types.string;
+ type = types.str;
description = "Username for mining server";
};
pass = mkOption {
- type = types.string;
+ type = types.str;
default = "x";
description = "Password for mining server";
};
@@ -63,4 +63,4 @@ in
};
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix
index 61ea822890ed..33a6fb152641 100644
--- a/nixos/modules/services/misc/dysnomia.nix
+++ b/nixos/modules/services/misc/dysnomia.nix
@@ -8,9 +8,9 @@ let
printProperties = properties:
concatMapStrings (propertyName:
let
- property = properties."${propertyName}";
+ property = properties.${propertyName};
in
- if isList property then "${propertyName}=(${lib.concatMapStrings (elem: "\"${toString elem}\" ") (properties."${propertyName}")})\n"
+ if isList property then "${propertyName}=(${lib.concatMapStrings (elem: "\"${toString elem}\" ") (properties.${propertyName})})\n"
else "${propertyName}=\"${toString property}\"\n"
) (builtins.attrNames properties);
@@ -31,7 +31,7 @@ let
${concatMapStrings (containerName:
let
- containerProperties = cfg.containers."${containerName}";
+ containerProperties = cfg.containers.${containerName};
in
''
cat > ${containerName} <use
+ local unix socket connection.
+ '';
};
- databasePassword = mkOption {
- type = types.str;
- description = "Gitlab database user password.";
+ databasePasswordFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ description = ''
+ File containing the Gitlab database user password.
+
+ This should be a string, not a nix path, since nix paths are
+ copied into the world-readable nix store.
+ '';
+ };
+
+ databaseCreateLocally = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether a database should be automatically created on the
+ local host. Set this to false if you plan
+ on provisioning a local database yourself or use an external
+ one.
+ '';
};
databaseName = mkOption {
@@ -338,10 +350,15 @@ in {
'';
};
- initialRootPassword = mkOption {
- type = types.str;
+ initialRootPasswordFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
description = ''
- Initial password of the root account if this is a new install.
+ File containing the initial password of the root account if
+ this is a new install.
+
+ This should be a string, not a nix path, since nix paths are
+ copied into the world-readable nix store.
'';
};
@@ -365,15 +382,20 @@ in {
};
username = mkOption {
- type = types.nullOr types.str;
+ type = with types; nullOr str;
default = null;
description = "Username of the SMTP server for Gitlab.";
};
- password = mkOption {
- type = types.nullOr types.str;
+ passwordFile = mkOption {
+ type = types.nullOr types.path;
default = null;
- description = "Password of the SMTP server for Gitlab.";
+ description = ''
+ File containing the password of the SMTP server for Gitlab.
+
+ This should be a string, not a nix path, since nix paths
+ are copied into the world-readable nix store.
+ '';
};
domain = mkOption {
@@ -383,7 +405,7 @@ in {
};
authentication = mkOption {
- type = types.nullOr types.str;
+ type = with types; nullOr str;
default = null;
description = "Authentitcation type to use, see http://api.rubyonrails.org/classes/ActionMailer/Base.html";
};
@@ -401,68 +423,125 @@ in {
};
};
- secrets.secret = mkOption {
- type = types.str;
+ secrets.secretFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
description = ''
- The secret is used to encrypt variables in the DB. If
- you change or lose this key you will be unable to access variables
- stored in database.
+ A file containing the secret used to encrypt variables in
+ the DB. If you change or lose this key you will be unable to
+ access variables stored in database.
Make sure the secret is at least 30 characters and all random,
no regular words or you'll be exposed to dictionary attacks.
+
+ This should be a string, not a nix path, since nix paths are
+ copied into the world-readable nix store.
'';
};
- secrets.db = mkOption {
- type = types.str;
+ secrets.dbFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
description = ''
- The secret is used to encrypt variables in the DB. If
- you change or lose this key you will be unable to access variables
- stored in database.
+ A file containing the secret used to encrypt variables in
+ the DB. If you change or lose this key you will be unable to
+ access variables stored in database.
Make sure the secret is at least 30 characters and all random,
no regular words or you'll be exposed to dictionary attacks.
+
+ This should be a string, not a nix path, since nix paths are
+ copied into the world-readable nix store.
'';
};
- secrets.otp = mkOption {
- type = types.str;
+ secrets.otpFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
description = ''
- The secret is used to encrypt secrets for OTP tokens. If
- you change or lose this key, users which have 2FA enabled for login
- won't be able to login anymore.
+ A file containing the secret used to encrypt secrets for OTP
+ tokens. If you change or lose this key, users which have 2FA
+ enabled for login won't be able to login anymore.
Make sure the secret is at least 30 characters and all random,
no regular words or you'll be exposed to dictionary attacks.
+
+ This should be a string, not a nix path, since nix paths are
+ copied into the world-readable nix store.
'';
};
- secrets.jws = mkOption {
- type = types.str;
+ secrets.jwsFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
description = ''
- The secret is used to encrypt session keys. If you change or lose
- this key, users will be disconnected.
+ A file containing the secret used to encrypt session
+ keys. If you change or lose this key, users will be
+ disconnected.
Make sure the secret is an RSA private key in PEM format. You can
generate one with
openssl genrsa 2048
+
+ This should be a string, not a nix path, since nix paths are
+ copied into the world-readable nix store.
'';
};
extraConfig = mkOption {
type = types.attrs;
default = {};
- example = {
- gitlab = {
- default_projects_features = {
- builds = false;
+ example = literalExample ''
+ {
+ gitlab = {
+ default_projects_features = {
+ builds = false;
+ };
+ };
+ omniauth = {
+ enabled = true;
+ auto_sign_in_with_provider = "openid_connect";
+ allow_single_sign_on = ["openid_connect"];
+ block_auto_created_users = false;
+ providers = [
+ {
+ name = "openid_connect";
+ label = "OpenID Connect";
+ args = {
+ name = "openid_connect";
+ scope = ["openid" "profile"];
+ response_type = "code";
+ issuer = "https://keycloak.example.com/auth/realms/My%20Realm";
+ discovery = true;
+ client_auth_method = "query";
+ uid_field = "preferred_username";
+ client_options = {
+ identifier = "gitlab";
+ secret = { _secret = "/var/keys/gitlab_oidc_secret"; };
+ redirect_uri = "https://git.example.com/users/auth/openid_connect/callback";
+ };
+ };
+ }
+ ];
};
};
- };
+ '';
description = ''
- Extra options to be merged into config/gitlab.yml as nix
- attribute set.
+ Extra options to be added under
+ production in
+ config/gitlab.yml, as a nix attribute
+ set.
+
+ Options containing secret data should be set to an attribute
+ set containing the attribute _secret - a
+ string pointing to a file containing the value the option
+ should be set to. See the example to get a better picture of
+ this: in the resulting
+ config/gitlab.yml file, the
+ production.omniauth.providers[0].args.client_options.secret
+ key will be set to the contents of the
+ /var/keys/gitlab_oidc_secret file.
'';
};
};
@@ -470,12 +549,66 @@ in {
config = mkIf cfg.enable {
+ assertions = [
+ {
+ assertion = cfg.databaseCreateLocally -> (cfg.user == cfg.databaseUsername);
+ message = "For local automatic database provisioning services.gitlab.user and services.gitlab.databaseUsername should be identical.";
+ }
+ {
+ assertion = (cfg.databaseHost != "") -> (cfg.databasePasswordFile != null);
+ message = "When services.gitlab.databaseHost is customized, services.gitlab.databasePasswordFile must be set!";
+ }
+ {
+ assertion = cfg.initialRootPasswordFile != null;
+ message = "services.gitlab.initialRootPasswordFile must be set!";
+ }
+ {
+ assertion = cfg.secrets.secretFile != null;
+ message = "services.gitlab.secrets.secretFile must be set!";
+ }
+ {
+ assertion = cfg.secrets.dbFile != null;
+ message = "services.gitlab.secrets.dbFile must be set!";
+ }
+ {
+ assertion = cfg.secrets.otpFile != null;
+ message = "services.gitlab.secrets.otpFile must be set!";
+ }
+ {
+ assertion = cfg.secrets.jwsFile != null;
+ message = "services.gitlab.secrets.jwsFile must be set!";
+ }
+ ];
+
environment.systemPackages = [ pkgs.git gitlab-rake gitlab-rails cfg.packages.gitlab-shell ];
# Redis is required for the sidekiq queue runner.
services.redis.enable = mkDefault true;
+
# We use postgres as the main data store.
- services.postgresql.enable = mkDefault true;
+ services.postgresql = optionalAttrs cfg.databaseCreateLocally {
+ enable = true;
+ ensureUsers = singleton { name = cfg.databaseUsername; };
+ };
+ # The postgresql module doesn't currently support concepts like
+ # objects owners and extensions; for now we tack on what's needed
+ # here.
+ systemd.services.postgresql.postStart = mkAfter (optionalString cfg.databaseCreateLocally ''
+ $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"'
+ current_owner=$($PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.databaseName}'")
+ if [[ "$current_owner" != "${cfg.databaseUsername}" ]]; then
+ $PSQL -tAc 'ALTER DATABASE "${cfg.databaseName}" OWNER TO "${cfg.databaseUsername}"'
+ if [[ -e "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" ]]; then
+ echo "Reassigning ownership of database ${cfg.databaseName} to user ${cfg.databaseUsername} failed on last boot. Failing..."
+ exit 1
+ fi
+ touch "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}"
+ $PSQL "${cfg.databaseName}" -tAc "REASSIGN OWNED BY \"$current_owner\" TO \"${cfg.databaseUsername}\""
+ rm "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}"
+ fi
+ $PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm"
+ '');
+
# Use postfix to send out mails.
services.postfix.enable = mkDefault true;
@@ -527,14 +660,9 @@ in {
"L+ /run/gitlab/shell-config.yml - - - - ${pkgs.writeText "config.yml" (builtins.toJSON gitlabShellConfig)}"
- "L+ ${cfg.statePath}/config/gitlab.yml - - - - ${pkgs.writeText "gitlab.yml" (builtins.toJSON gitlabConfig)}"
- "L+ ${cfg.statePath}/config/database.yml - - - - ${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)}"
- "L+ ${cfg.statePath}/config/secrets.yml - - - - ${pkgs.writeText "secrets.yml" (builtins.toJSON secretsConfig)}"
"L+ ${cfg.statePath}/config/unicorn.rb - - - - ${./defaultUnicornConfig.rb}"
-
"L+ ${cfg.statePath}/config/initializers/extra-gitlab.rb - - - - ${extraGitlabRb}"
- ] ++ optional cfg.smtp.enable
- "L+ ${cfg.statePath}/config/initializers/smtp_settings.rb - - - - ${smtpSettings}" ;
+ ];
systemd.services.gitlab-sidekiq = {
after = [ "network.target" "redis.service" "gitlab.service" ];
@@ -626,46 +754,75 @@ in {
gnupg
];
preStart = ''
- ${pkgs.sudo}/bin/sudo -u ${cfg.user} cp -f ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
- ${pkgs.sudo}/bin/sudo -u ${cfg.user} rm -rf ${cfg.statePath}/db/*
- ${pkgs.sudo}/bin/sudo -u ${cfg.user} cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
- ${pkgs.sudo}/bin/sudo -u ${cfg.user} cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
+ cp -f ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
+ rm -rf ${cfg.statePath}/db/*
+ cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
+ cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
- ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/gitlab_shell_secret
+ ${cfg.packages.gitlab-shell}/bin/install
- ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${cfg.packages.gitlab-shell}/bin/install
+ ${optionalString cfg.smtp.enable ''
+ install -m u=rw ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
+ ${optionalString (cfg.smtp.passwordFile != null) ''
+ smtp_password=$(<'${cfg.smtp.passwordFile}')
+ ${pkgs.replace}/bin/replace-literal -e '@smtpPassword@' "$smtp_password" '${cfg.statePath}/config/initializers/smtp_settings.rb'
+ ''}
+ ''}
- if ! test -e "${cfg.statePath}/db-created"; then
- if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
- ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.databasePassword}'"
- ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName}
+ (
+ umask u=rwx,g=,o=
- # enable required pg_trgm extension for gitlab
- ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
+ ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/gitlab_shell_secret
+
+ ${if cfg.databasePasswordFile != null then ''
+ export db_password="$(<'${cfg.databasePasswordFile}')"
+
+ if [[ -z "$db_password" ]]; then
+ >&2 echo "Database password was an empty string!"
+ exit 1
+ fi
+
+ ${pkgs.jq}/bin/jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \
+ '.production.password = $ENV.db_password' \
+ >'${cfg.statePath}/config/database.yml'
+ ''
+ else ''
+ ${pkgs.jq}/bin/jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \
+ >'${cfg.statePath}/config/database.yml'
+ ''
+ }
+
+ ${utils.genJqSecretsReplacementSnippet
+ gitlabConfig
+ "${cfg.statePath}/config/gitlab.yml"
+ }
+
+ if [[ -h '${cfg.statePath}/config/secrets.yml' ]]; then
+ rm '${cfg.statePath}/config/secrets.yml'
fi
- ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${gitlab-rake}/bin/gitlab-rake db:schema:load
+ export secret="$(<'${cfg.secrets.secretFile}')"
+ export db="$(<'${cfg.secrets.dbFile}')"
+ export otp="$(<'${cfg.secrets.otpFile}')"
+ export jws="$(<'${cfg.secrets.jwsFile}')"
+ ${pkgs.jq}/bin/jq -n '{production: {secret_key_base: $ENV.secret,
+ otp_key_base: $ENV.otp,
+ db_key_base: $ENV.db,
+ openid_connect_signing_key: $ENV.jws}}' \
+ > '${cfg.statePath}/config/secrets.yml'
+ )
- ${pkgs.sudo}/bin/sudo -u ${cfg.user} touch "${cfg.statePath}/db-created"
- fi
-
- # Always do the db migrations just to be sure the database is up-to-date
- ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${gitlab-rake}/bin/gitlab-rake db:migrate
-
- if ! test -e "${cfg.statePath}/db-seeded"; then
- ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${gitlab-rake}/bin/gitlab-rake db:seed_fu \
- GITLAB_ROOT_PASSWORD='${cfg.initialRootPassword}' GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}'
- ${pkgs.sudo}/bin/sudo -u ${cfg.user} touch "${cfg.statePath}/db-seeded"
- fi
+ initial_root_password="$(<'${cfg.initialRootPasswordFile}')"
+ ${gitlab-rake}/bin/gitlab-rake gitlab:db:configure GITLAB_ROOT_PASSWORD="$initial_root_password" \
+ GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}'
# We remove potentially broken links to old gitlab-shell versions
rm -Rf ${cfg.statePath}/repositories/**/*.git/hooks
- ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${pkgs.git}/bin/git config --global core.autocrlf "input"
+ ${pkgs.git}/bin/git config --global core.autocrlf "input"
'';
serviceConfig = {
- PermissionsStartOnly = true; # preStart must be run as root
Type = "simple";
User = cfg.user;
Group = cfg.group;
diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml
index 5ff570a442f6..b6171a9a194c 100644
--- a/nixos/modules/services/misc/gitlab.xml
+++ b/nixos/modules/services/misc/gitlab.xml
@@ -54,8 +54,8 @@
services.gitlab = {
enable = true;
- databasePassword = "eXaMpl3";
- initialRootPassword = "UseNixOS!";
+ databasePasswordFile = "/var/keys/gitlab/db_password";
+ initialRootPasswordFile = "/var/keys/gitlab/root_password";
https = true;
host = "git.example.com";
port = 443;
@@ -67,38 +67,10 @@ services.gitlab = {
port = 25;
};
secrets = {
- db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6";
- secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3";
- otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI";
- jws = ''
- -----BEGIN RSA PRIVATE KEY-----
- MIIEpAIBAAKCAQEArrtx4oHKwXoqUbMNqnHgAklnnuDon3XG5LJB35yPsXKv/8GK
- ke92wkI+s1Xkvsp8tg9BIY/7c6YK4SR07EWL+dB5qwctsWR2Q8z+/BKmTx9D99pm
- hnsjuNIXTF7BXrx3RX6BxZpH5Vzzh9nCwWKT/JCFqtwH7afNGGL7aMf+hdaiUg/Q
- SD05yRObioiO4iXDolsJOhrnbZvlzVHl1ZYxFJv0H6/Snc0BBA9Fl/3uj6ANpbjP
- eXF1SnJCqT87bj46r5NdVauzaRxAsIfqHroHK4UZ98X5LjGQFGvSqTvyjPBS4I1i
- s7VJU28ObuutHxIxSlH0ibn4HZqWmKWlTS652wIDAQABAoIBAGtPcUTTw2sJlR3x
- 4k2wfAvLexkHNbZhBdKEa5JiO5mWPuLKwUiZEY2CU7Gd6csG3oqNWcm7/IjtC7dz
- xV8p4yp8T4yq7vQIJ93B80NqTLtBD2QTvG2RCMJEPMzJUObWxkVmyVpLQyZo7KOd
- KE/OM+aj94OUeEYLjRkSCScz1Gvq/qFG/nAy7KPCmN9JDHuhX26WHo2Rr1OnPNT/
- 7diph0bB9F3b8gjjNTqXDrpdAqVOgR/PsjEBz6DMY+bdyMIn87q2yfmMexxRofN6
- LulpzSaa6Yup8N8H6PzVO6KAkQuf1aQRj0sMwGk1IZEnj6I0KbuHIZkw21Nc6sf2
- ESFySDECgYEA1PnCNn5tmLnwe62Ttmrzl20zIS3Me1gUVJ1NTfr6+ai0I9iMYU21
- 5czuAjJPm9JKQF2vY8UAaCj2ZoObtHa/anb3xsCd8NXoM3iJq5JDoXI1ldz3Y+ad
- U/bZUg1DLRvAniTuXmw9iOTwTwPxlDIGq5k+wG2Xmi1lk7zH8ezr9BMCgYEA0gfk
- EhgcmPH8Z5cU3YYwOdt6HSJOM0OyN4k/5gnkv+HYVoJTj02gkrJmLr+mi1ugKj46
- 7huYO9TVnrKP21tmbaSv1dp5hS3letVRIxSloEtVGXmmdvJvBRzDWos+G+KcvADi
- fFCz6w8v9NmO40CB7y/3SxTmSiSxDQeoi9LhDBkCgYEAsPgMWm25sfOnkY2NNUIv
- wT8bAlHlHQT2d8zx5H9NttBpR3P0ShJhuF8N0sNthSQ7ULrIN5YGHYcUH+DyLAWU
- TuomP3/kfa+xL7vUYb269tdJEYs4AkoppxBySoz8qenqpz422D0G8M6TpIS5Y5Qi
- GMrQ6uLl21YnlpiCaFOfSQMCgYEAmZxj1kgEQmhZrnn1LL/D7czz1vMMNrpAUhXz
- wg9iWmSXkU3oR1sDIceQrIhHCo2M6thwyU0tXjUft93pEQocM/zLDaGoVxtmRxxV
- J08mg8IVD3jFoyFUyWxsBIDqgAKRl38eJsXvkO+ep3mm49Z+Ma3nM+apN3j2dQ0w
- 3HLzXaECgYBFLMEAboVFwi5+MZjGvqtpg2PVTisfuJy2eYnPwHs+AXUgi/xRNFjI
- YHEa7UBPb5TEPSzWImQpETi2P5ywcUYL1EbN/nqPWmjFnat8wVmJtV4sUpJhubF4
- Vqm9LxIWc1uQ1q1HDCejRIxIN3aSH+wgRS3Kcj8kCTIoXd1aERb04g==
- -----END RSA PRIVATE KEY-----
- '';
+ dbFile = "/var/keys/gitlab/db";
+ secretFile = "/var/keys/gitlab/secret";
+ otpFile = "/var/keys/gitlab/otp";
+ jwsFile = "/var/keys/gitlab/jws";
};
extraConfig = {
gitlab = {
@@ -113,12 +85,16 @@ services.gitlab = {
- If you're setting up a new Gitlab instance, generate new secrets. You for
- instance use tr -dc A-Za-z0-9 < /dev/urandom | head -c
- 128 to generate a new secret. Gitlab encrypts sensitive data
- stored in the database. If you're restoring an existing Gitlab instance, you
- must specify the secrets secret from config/secrets.yml
- located in your Gitlab state folder.
+ If you're setting up a new Gitlab instance, generate new
+ secrets. You for instance use tr -dc A-Za-z0-9 <
+ /dev/urandom | head -c 128 > /var/keys/gitlab/db to
+ generate a new db secret. Make sure the files can be read by, and
+ only by, the user specified by services.gitlab.user. Gitlab
+ encrypts sensitive data stored in the database. If you're restoring
+ an existing Gitlab instance, you must specify the secrets secret
+ from config/secrets.yml located in your Gitlab
+ state folder.
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index cbe2c06ab651..cc69f81bbcc4 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -147,7 +147,7 @@ in
group = cfg.group;
useDefaultShell = true;
};
- users.groups."${cfg.group}".gid = config.ids.gids.gitolite;
+ users.groups.${cfg.group}.gid = config.ids.gids.gitolite;
systemd.tmpfiles.rules = [
"d '${cfg.dataDir}' 0750 ${cfg.user} ${cfg.group} - -"
@@ -157,7 +157,7 @@ in
"Z ${cfg.dataDir} 0750 ${cfg.user} ${cfg.group} - -"
];
- systemd.services."gitolite-init" = {
+ systemd.services.gitolite-init = {
description = "Gitolite initialization";
wantedBy = [ "multi-user.target" ];
unitConfig.RequiresMountsFor = cfg.dataDir;
diff --git a/nixos/modules/services/misc/logkeys.nix b/nixos/modules/services/misc/logkeys.nix
index ad13d9eaa674..0082db63a06a 100644
--- a/nixos/modules/services/misc/logkeys.nix
+++ b/nixos/modules/services/misc/logkeys.nix
@@ -11,7 +11,7 @@ in {
device = mkOption {
description = "Use the given device as keyboard input event device instead of /dev/input/eventX default.";
default = null;
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
example = "/dev/input/event15";
};
};
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 3eb649b08a2f..018fac386163 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -374,7 +374,7 @@ in {
user = cfg.database_user;
database = cfg.database_name;
};
- }."${cfg.database_type}";
+ }.${cfg.database_type};
description = ''
Arguments to pass to the engine.
'';
diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix
index e8e9c0946d7f..107fb57fe1c4 100644
--- a/nixos/modules/services/misc/mediatomb.nix
+++ b/nixos/modules/services/misc/mediatomb.nix
@@ -163,7 +163,7 @@ in {
};
serverName = mkOption {
- type = types.string;
+ type = types.str;
default = "mediatomb";
description = ''
How to identify the server on the network.
@@ -259,7 +259,7 @@ in {
config = mkIf cfg.enable {
systemd.services.mediatomb = {
description = "MediaTomb media Server";
- after = [ "local-fs.target" "network.target" ];
+ after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
path = [ pkgs.mediatomb ];
serviceConfig.ExecStart = "${pkgs.mediatomb}/bin/mediatomb -p ${toString cfg.port} ${if cfg.interface!="" then "-e ${cfg.interface}" else ""} ${if cfg.customCfg then "" else "-c ${mtConf}"} -m ${cfg.dataDir}";
diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix
index a8edecff2a1e..6b41b552a86d 100644
--- a/nixos/modules/services/misc/mwlib.nix
+++ b/nixos/modules/services/misc/mwlib.nix
@@ -165,7 +165,7 @@ in
}; # options.services
- config = {
+ config = {
systemd.services.mwlib-nserve = mkIf cfg.nserve.enable
{
@@ -191,7 +191,6 @@ in
description = "mwlib job queue server";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "local-fs.target" ];
preStart = ''
mkdir -pv '${cfg.qserve.datadir}'
@@ -218,7 +217,7 @@ in
description = "mwlib worker";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "local-fs.target" ];
+ after = [ "network.target" ];
preStart = ''
mkdir -pv '${cfg.nslave.cachedir}'
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 088dfd71860b..3826f728afd0 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -500,12 +500,12 @@ in
optionals (pkgs.stdenv.isx86_64 && pkgs.hostPlatform.platform ? gcc.arch) (
# a x86_64 builder can run code for `platform.gcc.arch` and minor architectures:
[ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ {
- "sandybridge" = [ "gccarch-westmere" ];
- "ivybridge" = [ "gccarch-westmere" "gccarch-sandybridge" ];
- "haswell" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" ];
- "broadwell" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" ];
- "skylake" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" ];
- "skylake-avx512" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" "gccarch-skylake" ];
+ sandybridge = [ "gccarch-westmere" ];
+ ivybridge = [ "gccarch-westmere" "gccarch-sandybridge" ];
+ haswell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" ];
+ broadwell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" ];
+ skylake = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" ];
+ skylake-avx512 = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" "gccarch-skylake" ];
}.${pkgs.hostPlatform.platform.gcc.arch} or []
)
);
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index df3e71c80dea..20ba3d8ef0bc 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -54,7 +54,7 @@ in
(mkIf (cfg.showManual && cfgd.enable && cfgd.nixos.enable) {
boot.extraTTYs = [ "tty${toString cfg.ttyNumber}" ];
- systemd.services."nixos-manual" = {
+ systemd.services.nixos-manual = {
description = "NixOS Manual";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix
index 4e6cd80e2425..3985dc0b303c 100644
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@@ -50,7 +50,7 @@ in
};
ocrLanguages = mkOption {
- type = with types; nullOr (listOf string);
+ type = with types; nullOr (listOf str);
default = null;
description = ''
Languages available for OCR via Tesseract, specified as
diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix
index ef90d124a284..ab00086e591e 100644
--- a/nixos/modules/services/misc/pykms.nix
+++ b/nixos/modules/services/misc/pykms.nix
@@ -9,7 +9,7 @@ in {
meta.maintainers = with lib.maintainers; [ peterhoeg ];
options = {
- services.pykms = rec {
+ services.pykms = {
enable = mkOption {
type = types.bool;
default = false;
diff --git a/nixos/modules/services/misc/serviio.nix b/nixos/modules/services/misc/serviio.nix
index 8808f2d21931..9868192724b5 100644
--- a/nixos/modules/services/misc/serviio.nix
+++ b/nixos/modules/services/misc/serviio.nix
@@ -10,7 +10,7 @@ let
#!${pkgs.bash}/bin/sh
SERVIIO_HOME=${pkgs.serviio}
-
+
# Setup the classpath
SERVIIO_CLASS_PATH="$SERVIIO_HOME/lib/*:$SERVIIO_HOME/config"
@@ -21,13 +21,13 @@ let
# Execute the JVM in the foreground
exec ${pkgs.jre}/bin/java -Xmx512M -Xms20M -XX:+UseG1GC -XX:GCTimeRatio=1 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 $JAVA_OPTS -classpath "$SERVIIO_CLASS_PATH" org.serviio.MediaServer "$@"
'';
-
+
in {
###### interface
options = {
services.serviio = {
-
+
enable = mkOption {
type = types.bool;
default = false;
@@ -52,7 +52,7 @@ in {
config = mkIf cfg.enable {
systemd.services.serviio = {
description = "Serviio Media Server";
- after = [ "local-fs.target" "network.target" ];
+ after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
path = [ pkgs.serviio ];
serviceConfig = {
@@ -64,7 +64,7 @@ in {
};
users.users = [
- {
+ {
name = "serviio";
group = "serviio";
home = cfg.dataDir;
@@ -75,16 +75,16 @@ in {
];
users.groups = [
- { name = "serviio";}
+ { name = "serviio";}
];
networking.firewall = {
- allowedTCPPorts = [
+ allowedTCPPorts = [
8895 # serve UPnP responses
23423 # console
23424 # mediabrowser
];
- allowedUDPPorts = [
+ allowedUDPPorts = [
1900 # UPnP service discovey
];
};
diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix
index 62b344d11b06..6f3aaa973a04 100644
--- a/nixos/modules/services/misc/snapper.nix
+++ b/nixos/modules/services/misc/snapper.nix
@@ -44,7 +44,7 @@ in
configs = mkOption {
default = { };
example = literalExample {
- "home" = {
+ home = {
subvolume = "/home";
extraConfig = ''
ALLOW_USERS="alice"
diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix
index 1612b197f35f..152917d345cc 100644
--- a/nixos/modules/services/misc/subsonic.nix
+++ b/nixos/modules/services/misc/subsonic.nix
@@ -17,7 +17,7 @@ let cfg = config.services.subsonic; in {
};
listenAddress = mkOption {
- type = types.string;
+ type = types.str;
default = "0.0.0.0";
description = ''
The host name or IP address on which to bind Subsonic.
@@ -105,7 +105,7 @@ let cfg = config.services.subsonic; in {
config = mkIf cfg.enable {
systemd.services.subsonic = {
description = "Personal media streamer";
- after = [ "local-fs.target" "network.target" ];
+ after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
script = ''
${pkgs.jre}/bin/java -Xmx${toString cfg.maxMemory}m \
diff --git a/nixos/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix
index b89cb41ac3ad..bfab8c534d8c 100644
--- a/nixos/modules/services/misc/synergy.nix
+++ b/nixos/modules/services/misc/synergy.nix
@@ -83,7 +83,7 @@ in
config = mkMerge [
(mkIf cfgC.enable {
- systemd.user.services."synergy-client" = {
+ systemd.user.services.synergy-client = {
after = [ "network.target" "graphical-session.target" ];
description = "Synergy client";
wantedBy = optional cfgC.autoStart "graphical-session.target";
@@ -93,7 +93,7 @@ in
};
})
(mkIf cfgS.enable {
- systemd.user.services."synergy-server" = {
+ systemd.user.services.synergy-server = {
after = [ "network.target" "graphical-session.target" ];
description = "Synergy server";
wantedBy = optional cfgS.autoStart "graphical-session.target";
diff --git a/nixos/modules/services/misc/uhub.nix b/nixos/modules/services/misc/uhub.nix
index 005951b9231e..753580c3e404 100644
--- a/nixos/modules/services/misc/uhub.nix
+++ b/nixos/modules/services/misc/uhub.nix
@@ -51,7 +51,7 @@ in
};
address = mkOption {
- type = types.string;
+ type = types.str;
default = "any";
description = "Address to bind the hub to.";
};
@@ -83,7 +83,7 @@ in
description = "Whether to enable the Sqlite authentication database plugin";
};
file = mkOption {
- type = types.string;
+ type = types.path;
example = "/var/db/uhub-users";
description = "Path to user database. Use the uhub-passwd utility to create the database and add/remove users.";
};
@@ -96,7 +96,7 @@ in
description = "Whether to enable the logging plugin.";
};
file = mkOption {
- type = types.string;
+ type = types.str;
default = "";
description = "Path of log file.";
};
@@ -117,7 +117,7 @@ in
default = "";
type = types.lines;
description = ''
- Welcome message displayed to clients after connecting
+ Welcome message displayed to clients after connecting
and with the !motd command.
'';
};
@@ -183,4 +183,4 @@ in
};
};
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix
index bf38b9ad7a2d..3bff04e7127d 100644
--- a/nixos/modules/services/misc/zoneminder.nix
+++ b/nixos/modules/services/misc/zoneminder.nix
@@ -11,7 +11,7 @@ let
group = {
nginx = config.services.nginx.group;
none = user;
- }."${cfg.webserver}";
+ }.${cfg.webserver};
useNginx = cfg.webserver == "nginx";
@@ -225,7 +225,7 @@ in {
nginx = lib.mkIf useNginx {
enable = true;
virtualHosts = {
- "${cfg.hostname}" = {
+ ${cfg.hostname} = {
default = true;
root = "${pkg}/share/zoneminder/www";
listen = [ { addr = "0.0.0.0"; inherit (cfg) port; } ];
@@ -312,7 +312,7 @@ in {
};
systemd.services = {
- zoneminder = with pkgs; rec {
+ zoneminder = with pkgs; {
inherit (zoneminder.meta) description;
documentation = [ "https://zoneminder.readthedocs.org/en/latest/" ];
path = [
@@ -356,11 +356,11 @@ in {
};
};
- users.groups."${user}" = {
+ users.groups.${user} = {
gid = config.ids.gids.zoneminder;
};
- users.users."${user}" = {
+ users.users.${user} = {
uid = config.ids.uids.zoneminder;
group = user;
inherit home;
diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix
index 50c84e3c6b80..5d91e44a199d 100644
--- a/nixos/modules/services/misc/zookeeper.nix
+++ b/nixos/modules/services/misc/zookeeper.nix
@@ -121,6 +121,7 @@ in {
systemd.tmpfiles.rules = [
"d '${cfg.dataDir}' 0700 zookeeper - - -"
+ "Z '${cfg.dataDir}' 0700 zookeeper - - -"
];
systemd.services.zookeeper = {
diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix
index 49957e652900..75218aa1d46b 100644
--- a/nixos/modules/services/monitoring/apcupsd.nix
+++ b/nixos/modules/services/monitoring/apcupsd.nix
@@ -91,7 +91,7 @@ in
BATTERYLEVEL 50
MINUTES 5
'';
- type = types.string;
+ type = types.lines;
description = ''
Contents of the runtime configuration file, apcupsd.conf. The default
settings makes apcupsd autodetect USB UPSes, limit network access to
@@ -106,7 +106,7 @@ in
example = {
doshutdown = ''# shell commands to notify that the computer is shutting down'';
};
- type = types.attrsOf types.string;
+ type = types.attrsOf types.lines;
description = ''
Each attribute in this option names an apcupsd event and the string
value it contains will be executed in a shell, in response to that
diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index 8bf741adb6e3..b1c12cce1f80 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -41,7 +41,7 @@ in {
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "bosun";
description = ''
User account under which bosun runs.
@@ -49,7 +49,7 @@ in {
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "bosun";
description = ''
Group account under which bosun runs.
@@ -57,7 +57,7 @@ in {
};
opentsdbHost = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = "localhost:4242";
description = ''
Host and port of the OpenTSDB database that stores bosun data.
@@ -66,7 +66,7 @@ in {
};
influxHost = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "localhost:8086";
description = ''
@@ -75,7 +75,7 @@ in {
};
listenAddress = mkOption {
- type = types.string;
+ type = types.str;
default = ":8070";
description = ''
The host address and port that bosun's web interface will listen on.
diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix
index 7f78db74677c..02a9f316fc32 100644
--- a/nixos/modules/services/monitoring/datadog-agent.nix
+++ b/nixos/modules/services/monitoring/datadog-agent.nix
@@ -87,7 +87,7 @@ in {
description = "The hostname to show in the Datadog dashboard (optional)";
default = null;
example = "mymachine.mydomain";
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
};
logLevel = mkOption {
diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
index abc8d65d58f2..5ee6b092a6a4 100644
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
@@ -145,47 +145,46 @@ in {
description = "The hostname to show in the Datadog dashboard (optional)";
default = null;
example = "mymachine.mydomain";
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
};
postgresqlConfig = mkOption {
description = "Datadog PostgreSQL integration configuration";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.lines;
};
nginxConfig = mkOption {
description = "Datadog nginx integration configuration";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.lines;
};
mongoConfig = mkOption {
description = "MongoDB integration configuration";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.lines;
};
jmxConfig = mkOption {
description = "JMX integration configuration";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.lines;
};
processConfig = mkOption {
description = ''
Process integration configuration
-
- See http://docs.datadoghq.com/integrations/process/
+ See
'';
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.lines;
};
};
config = mkIf cfg.enable {
- environment.systemPackages = [ pkgs."dd-agent" pkgs.sysstat pkgs.procps ];
+ environment.systemPackages = [ pkgs.dd-agent pkgs.sysstat pkgs.procps ];
users.users.datadog = {
description = "Datadog Agent User";
diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixos/modules/services/monitoring/fusion-inventory.nix
index 9c976c65ea49..b90579bb70c7 100644
--- a/nixos/modules/services/monitoring/fusion-inventory.nix
+++ b/nixos/modules/services/monitoring/fusion-inventory.nix
@@ -51,7 +51,7 @@ in {
description = "FusionInventory user";
};
- systemd.services."fusion-inventory" = {
+ systemd.services.fusion-inventory = {
description = "Fusion Inventory Agent";
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index d6473220c140..64cb6c3da1e5 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -11,7 +11,7 @@ let
graphiteLocalSettingsDir = pkgs.runCommand "graphite_local_settings" {
inherit graphiteLocalSettings;
- preferLocalBuild = true;
+ preferLocalBuild = true;
} ''
mkdir -p $out
ln -s $graphiteLocalSettings $out/graphite_local_settings.py
@@ -215,7 +215,7 @@ in {
storageAggregation = mkOption {
description = "Defines how to aggregate data to lower-precision retentions.";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
example = ''
[all_min]
pattern = \.min$
@@ -227,7 +227,7 @@ in {
storageSchemas = mkOption {
description = "Defines retention rates for storing metrics.";
default = "";
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
example = ''
[apache_busyWorkers]
pattern = ^servers\.www.*\.workers\.busyWorkers$
@@ -238,14 +238,14 @@ in {
blacklist = mkOption {
description = "Any metrics received which match one of the experssions will be dropped.";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
example = "^some\.noisy\.metric\.prefix\..*";
};
whitelist = mkOption {
description = "Only metrics received which match one of the experssions will be persisted.";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
example = ".*";
};
@@ -255,7 +255,7 @@ in {
in a search and replace fashion.
'';
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
example = ''
[post]
_sum$ =
@@ -272,7 +272,7 @@ in {
relayRules = mkOption {
description = "Relay rules are used to send certain metrics to a certain backend.";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
example = ''
[example]
pattern = ^mydata\.foo\..+
@@ -289,7 +289,7 @@ in {
aggregationRules = mkOption {
description = "Defines if and how received metrics will be aggregated.";
default = null;
- type = types.uniq (types.nullOr types.string);
+ type = types.nullOr types.str;
example = ''
.applications..all.requests (60) = sum .applications..*.requests
.applications..all.latency (60) = avg .applications..*.latency
diff --git a/nixos/modules/services/monitoring/heapster.nix b/nixos/modules/services/monitoring/heapster.nix
index fbdff2eb5dbe..6da0831b4c5f 100644
--- a/nixos/modules/services/monitoring/heapster.nix
+++ b/nixos/modules/services/monitoring/heapster.nix
@@ -15,19 +15,19 @@ in {
source = mkOption {
description = "Heapster metric source";
example = "kubernetes:https://kubernetes.default";
- type = types.string;
+ type = types.str;
};
sink = mkOption {
description = "Heapster metic sink";
example = "influxdb:http://localhost:8086";
- type = types.string;
+ type = types.str;
};
extraOpts = mkOption {
description = "Heapster extra options";
default = "";
- type = types.string;
+ type = types.separatedString " ";
};
package = mkOption {
diff --git a/nixos/modules/services/monitoring/kapacitor.nix b/nixos/modules/services/monitoring/kapacitor.nix
index 0f236d25c9ed..9b4ff3c56124 100644
--- a/nixos/modules/services/monitoring/kapacitor.nix
+++ b/nixos/modules/services/monitoring/kapacitor.nix
@@ -116,17 +116,17 @@ in
url = mkOption {
description = "The URL to an InfluxDB server that serves as the default database";
example = "http://localhost:8086";
- type = types.string;
+ type = types.str;
};
username = mkOption {
description = "The username to connect to the remote InfluxDB server";
- type = types.string;
+ type = types.str;
};
password = mkOption {
description = "The password to connect to the remote InfluxDB server";
- type = types.string;
+ type = types.str;
};
};
@@ -137,7 +137,7 @@ in
description = "The URL to the Alerta REST API";
default = "http://localhost:5000";
example = "http://localhost:5000";
- type = types.string;
+ type = types.str;
};
token = mkOption {
diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix
index 32e14ab21ffc..ca9352272174 100644
--- a/nixos/modules/services/monitoring/monit.nix
+++ b/nixos/modules/services/monitoring/monit.nix
@@ -23,7 +23,7 @@ in
environment.systemPackages = [ pkgs.monit ];
- environment.etc."monitrc" = {
+ environment.etc.monitrc = {
text = cfg.config;
mode = "0400";
};
@@ -39,7 +39,7 @@ in
KillMode = "process";
Restart = "always";
};
- restartTriggers = [ config.environment.etc."monitrc".source ];
+ restartTriggers = [ config.environment.etc.monitrc.source ];
};
};
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index ffe223fedbe1..8af0650c7380 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -233,7 +233,7 @@ in
# In the meantime this at least suppresses a useless graph full of
# NaNs in the output.
default = [ "munin_stats" ];
- type = with types; listOf string;
+ type = with types; listOf str;
description = ''
Munin plugins to disable, even if
munin-node-configure --suggest tries to enable
diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index 647d67533b89..191c0bff9c84 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -4,37 +4,14 @@ with lib;
let
cfg = config.services.prometheus;
- cfg2 = config.services.prometheus2;
- promUser = "prometheus";
- promGroup = "prometheus";
- stateDir =
- if cfg.stateDir != null
- then cfg.stateDir
- else
- if cfg.dataDir != null
- then
- # This assumes /var/lib/ is a prefix of cfg.dataDir.
- # This is checked as an assertion below.
- removePrefix stateDirBase cfg.dataDir
- else "prometheus";
- stateDirBase = "/var/lib/";
- workingDir = stateDirBase + stateDir;
- workingDir2 = stateDirBase + cfg2.stateDir;
+ workingDir = "/var/lib/" + cfg.stateDir;
# a wrapper that verifies that the configuration is valid
- promtoolCheck = what: name: file: pkgs.runCommand "${name}-${what}-checked"
- { buildInputs = [ cfg.package ]; } ''
- ln -s ${file} $out
- promtool ${what} $out
- '';
-
- # a wrapper that verifies that the configuration is valid for
- # prometheus 2
- prom2toolCheck = what: name: file:
+ promtoolCheck = what: name: file:
pkgs.runCommand
"${name}-${replaceStrings [" "] [""] what}-checked"
- { buildInputs = [ cfg2.package ]; } ''
+ { buildInputs = [ cfg.package ]; } ''
ln -s ${file} $out
promtool ${what} $out
'';
@@ -45,61 +22,34 @@ let
echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out
'';
- # This becomes the main config file for Prometheus 1
+ generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig;
+
+ # This becomes the main config file for Prometheus
promConfig = {
global = filterValidPrometheus cfg.globalConfig;
- rule_files = map (promtoolCheck "check-rules" "rules") (cfg.ruleFiles ++ [
+ rule_files = map (promtoolCheck "check rules" "rules") (cfg.ruleFiles ++ [
(pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules))
]);
scrape_configs = filterValidPrometheus cfg.scrapeConfigs;
+ alerting = {
+ inherit (cfg) alertmanagers;
+ };
};
- generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig;
-
prometheusYml = let
yml = if cfg.configText != null then
pkgs.writeText "prometheus.yml" cfg.configText
else generatedPrometheusYml;
- in promtoolCheck "check-config" "prometheus.yml" yml;
+ in promtoolCheck "check config" "prometheus.yml" yml;
cmdlineArgs = cfg.extraFlags ++ [
- "-storage.local.path=${workingDir}/metrics"
- "-config.file=${prometheusYml}"
- "-web.listen-address=${cfg.listenAddress}"
- "-alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}"
- "-alertmanager.timeout=${toString cfg.alertmanagerTimeout}s"
+ "--storage.tsdb.path=${workingDir}/data/"
+ "--config.file=${prometheusYml}"
+ "--web.listen-address=${cfg.listenAddress}"
+ "--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}"
+ "--alertmanager.timeout=${toString cfg.alertmanagerTimeout}s"
] ++
- optional (cfg.alertmanagerURL != []) "-alertmanager.url=${concatStringsSep "," cfg.alertmanagerURL}" ++
- optional (cfg.webExternalUrl != null) "-web.external-url=${cfg.webExternalUrl}";
-
- # This becomes the main config file for Prometheus 2
- promConfig2 = {
- global = filterValidPrometheus cfg2.globalConfig;
- rule_files = map (prom2toolCheck "check rules" "rules") (cfg2.ruleFiles ++ [
- (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg2.rules))
- ]);
- scrape_configs = filterValidPrometheus cfg2.scrapeConfigs;
- alerting = {
- inherit (cfg2) alertmanagers;
- };
- };
-
- generatedPrometheus2Yml = writePrettyJSON "prometheus.yml" promConfig2;
-
- prometheus2Yml = let
- yml = if cfg2.configText != null then
- pkgs.writeText "prometheus.yml" cfg2.configText
- else generatedPrometheus2Yml;
- in prom2toolCheck "check config" "prometheus.yml" yml;
-
- cmdlineArgs2 = cfg2.extraFlags ++ [
- "--storage.tsdb.path=${workingDir2}/data/"
- "--config.file=${prometheus2Yml}"
- "--web.listen-address=${cfg2.listenAddress}"
- "--alertmanager.notification-queue-capacity=${toString cfg2.alertmanagerNotificationQueueCapacity}"
- "--alertmanager.timeout=${toString cfg2.alertmanagerTimeout}s"
- ] ++
- optional (cfg2.webExternalUrl != null) "--web.external-url=${cfg2.webExternalUrl}";
+ optional (cfg.webExternalUrl != null) "--web.external-url=${cfg.webExternalUrl}";
filterValidPrometheus = filterAttrsListRecursive (n: v: !(n == "_module" || v == null));
filterAttrsListRecursive = pred: x:
@@ -514,343 +464,159 @@ let
};
in {
- options = {
- services.prometheus = {
+ options.services.prometheus = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enable the Prometheus monitoring daemon.
- '';
- };
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable the Prometheus monitoring daemon.
+ '';
+ };
- package = mkOption {
- type = types.package;
- default = pkgs.prometheus;
- defaultText = "pkgs.prometheus";
- description = ''
- The prometheus package that should be used.
- '';
- };
+ package = mkOption {
+ type = types.package;
+ default = pkgs.prometheus;
+ defaultText = "pkgs.prometheus";
+ description = ''
+ The prometheus package that should be used.
+ '';
+ };
- listenAddress = mkOption {
- type = types.str;
- default = "0.0.0.0:9090";
- description = ''
- Address to listen on for the web interface, API, and telemetry.
- '';
- };
+ listenAddress = mkOption {
+ type = types.str;
+ default = "0.0.0.0:9090";
+ description = ''
+ Address to listen on for the web interface, API, and telemetry.
+ '';
+ };
- dataDir = mkOption {
- type = types.nullOr types.path;
- default = null;
- description = ''
- Directory to store Prometheus metrics data.
- This option is deprecated, please use .
- '';
- };
+ stateDir = mkOption {
+ type = types.str;
+ default = "prometheus2";
+ description = ''
+ Directory below /var/lib to store Prometheus metrics data.
+ This directory will be created automatically using systemd's StateDirectory mechanism.
+ '';
+ };
- stateDir = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = ''
- Directory below ${stateDirBase} to store Prometheus metrics data.
- This directory will be created automatically using systemd's StateDirectory mechanism.
- Defaults to prometheus.
- '';
- };
+ extraFlags = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ Extra commandline options when launching Prometheus.
+ '';
+ };
- extraFlags = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Extra commandline options when launching Prometheus.
- '';
- };
+ configText = mkOption {
+ type = types.nullOr types.lines;
+ default = null;
+ description = ''
+ If non-null, this option defines the text that is written to
+ prometheus.yml. If null, the contents of prometheus.yml is generated
+ from the structured config options.
+ '';
+ };
- configText = mkOption {
- type = types.nullOr types.lines;
- default = null;
- description = ''
- If non-null, this option defines the text that is written to
- prometheus.yml. If null, the contents of prometheus.yml is generated
- from the structured config options.
- '';
- };
+ globalConfig = mkOption {
+ type = promTypes.globalConfig;
+ default = {};
+ description = ''
+ Parameters that are valid in all configuration contexts. They
+ also serve as defaults for other configuration sections
+ '';
+ };
- globalConfig = mkOption {
- type = promTypes.globalConfig;
- default = {};
- description = ''
- Parameters that are valid in all configuration contexts. They
- also serve as defaults for other configuration sections
- '';
- };
+ rules = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ Alerting and/or Recording rules to evaluate at runtime.
+ '';
+ };
- rules = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Alerting and/or Recording rules to evaluate at runtime.
- '';
- };
+ ruleFiles = mkOption {
+ type = types.listOf types.path;
+ default = [];
+ description = ''
+ Any additional rules files to include in this configuration.
+ '';
+ };
- ruleFiles = mkOption {
- type = types.listOf types.path;
- default = [];
- description = ''
- Any additional rules files to include in this configuration.
- '';
- };
+ scrapeConfigs = mkOption {
+ type = types.listOf promTypes.scrape_config;
+ default = [];
+ description = ''
+ A list of scrape configurations.
+ '';
+ };
- scrapeConfigs = mkOption {
- type = types.listOf promTypes.scrape_config;
- default = [];
- description = ''
- A list of scrape configurations.
- '';
- };
+ alertmanagers = mkOption {
+ type = types.listOf types.attrs;
+ example = literalExample ''
+ [ {
+ scheme = "https";
+ path_prefix = "/alertmanager";
+ static_configs = [ {
+ targets = [
+ "prometheus.domain.tld"
+ ];
+ } ];
+ } ]
+ '';
+ default = [];
+ description = ''
+ A list of alertmanagers to send alerts to.
+ See the official documentation for more information.
+ '';
+ };
- alertmanagerURL = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- List of Alertmanager URLs to send notifications to.
- '';
- };
+ alertmanagerNotificationQueueCapacity = mkOption {
+ type = types.int;
+ default = 10000;
+ description = ''
+ The capacity of the queue for pending alert manager notifications.
+ '';
+ };
- alertmanagerNotificationQueueCapacity = mkOption {
- type = types.int;
- default = 10000;
- description = ''
- The capacity of the queue for pending alert manager notifications.
- '';
- };
+ alertmanagerTimeout = mkOption {
+ type = types.int;
+ default = 10;
+ description = ''
+ Alert manager HTTP API timeout (in seconds).
+ '';
+ };
- alertmanagerTimeout = mkOption {
- type = types.int;
- default = 10;
- description = ''
- Alert manager HTTP API timeout (in seconds).
- '';
- };
+ webExternalUrl = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "https://example.com/";
+ description = ''
+ The URL under which Prometheus is externally reachable (for example,
+ if Prometheus is served via a reverse proxy).
+ '';
+ };
+ };
- webExternalUrl = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "https://example.com/";
- description = ''
- The URL under which Prometheus is externally reachable (for example,
- if Prometheus is served via a reverse proxy).
- '';
+ config = mkIf cfg.enable {
+ users.groups.prometheus.gid = config.ids.gids.prometheus;
+ users.users.prometheus = {
+ description = "Prometheus daemon user";
+ uid = config.ids.uids.prometheus;
+ group = "prometheus";
+ };
+ systemd.services.prometheus = {
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+ serviceConfig = {
+ ExecStart = "${cfg.package}/bin/prometheus" +
+ optionalString (length cmdlineArgs != 0) (" \\\n " +
+ concatStringsSep " \\\n " cmdlineArgs);
+ User = "prometheus";
+ Restart = "always";
+ WorkingDirectory = workingDir;
+ StateDirectory = cfg.stateDir;
};
};
- services.prometheus2 = {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enable the Prometheus 2 monitoring daemon.
- '';
- };
-
- package = mkOption {
- type = types.package;
- default = pkgs.prometheus_2;
- defaultText = "pkgs.prometheus_2";
- description = ''
- The prometheus2 package that should be used.
- '';
- };
-
- listenAddress = mkOption {
- type = types.str;
- default = "0.0.0.0:9090";
- description = ''
- Address to listen on for the web interface, API, and telemetry.
- '';
- };
-
- stateDir = mkOption {
- type = types.str;
- default = "prometheus2";
- description = ''
- Directory below ${stateDirBase} to store Prometheus metrics data.
- This directory will be created automatically using systemd's StateDirectory mechanism.
- Defaults to prometheus2.
- '';
- };
-
- extraFlags = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Extra commandline options when launching Prometheus 2.
- '';
- };
-
- configText = mkOption {
- type = types.nullOr types.lines;
- default = null;
- description = ''
- If non-null, this option defines the text that is written to
- prometheus.yml. If null, the contents of prometheus.yml is generated
- from the structured config options.
- '';
- };
-
- globalConfig = mkOption {
- type = promTypes.globalConfig;
- default = {};
- description = ''
- Parameters that are valid in all configuration contexts. They
- also serve as defaults for other configuration sections
- '';
- };
-
- rules = mkOption {
- type = types.listOf types.str;
- default = [];
- description = ''
- Alerting and/or Recording rules to evaluate at runtime.
- '';
- };
-
- ruleFiles = mkOption {
- type = types.listOf types.path;
- default = [];
- description = ''
- Any additional rules files to include in this configuration.
- '';
- };
-
- scrapeConfigs = mkOption {
- type = types.listOf promTypes.scrape_config;
- default = [];
- description = ''
- A list of scrape configurations.
- '';
- };
-
- alertmanagers = mkOption {
- type = types.listOf types.attrs;
- example = literalExample ''
- [ {
- scheme = "https";
- path_prefix = "/alertmanager";
- static_configs = [ {
- targets = [
- "prometheus.domain.tld"
- ];
- } ];
- } ]
- '';
- default = [];
- description = ''
- A list of alertmanagers to send alerts to.
- See the official documentation for more information.
- '';
- };
-
- alertmanagerNotificationQueueCapacity = mkOption {
- type = types.int;
- default = 10000;
- description = ''
- The capacity of the queue for pending alert manager notifications.
- '';
- };
-
- alertmanagerTimeout = mkOption {
- type = types.int;
- default = 10;
- description = ''
- Alert manager HTTP API timeout (in seconds).
- '';
- };
-
- webExternalUrl = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "https://example.com/";
- description = ''
- The URL under which Prometheus is externally reachable (for example,
- if Prometheus is served via a reverse proxy).
- '';
- };
- };
- };
-
- config = mkMerge [
- (mkIf (cfg.enable || cfg2.enable) {
- users.groups.${promGroup}.gid = config.ids.gids.prometheus;
- users.users.${promUser} = {
- description = "Prometheus daemon user";
- uid = config.ids.uids.prometheus;
- group = promGroup;
- };
- })
- (mkIf cfg.enable {
- warnings =
- optional (cfg.dataDir != null) ''
- The option services.prometheus.dataDir is deprecated, please use
- services.prometheus.stateDir.
- '';
- assertions = [
- {
- assertion = !(cfg.dataDir != null && cfg.stateDir != null);
- message =
- "The options services.prometheus.dataDir and services.prometheus.stateDir" +
- " can't both be set at the same time! It's recommended to only set the latter" +
- " since the former is deprecated.";
- }
- {
- assertion = cfg.dataDir != null -> hasPrefix stateDirBase cfg.dataDir;
- message =
- "The option services.prometheus.dataDir should have ${stateDirBase} as a prefix!";
- }
- {
- assertion = cfg.stateDir != null -> !hasPrefix "/" cfg.stateDir;
- message =
- "The option services.prometheus.stateDir shouldn't be an absolute directory." +
- " It should be a directory relative to ${stateDirBase}.";
- }
- {
- assertion = cfg2.stateDir != null -> !hasPrefix "/" cfg2.stateDir;
- message =
- "The option services.prometheus2.stateDir shouldn't be an absolute directory." +
- " It should be a directory relative to ${stateDirBase}.";
- }
- ];
- systemd.services.prometheus = {
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
- serviceConfig = {
- ExecStart = "${cfg.package}/bin/prometheus" +
- optionalString (length cmdlineArgs != 0) (" \\\n " +
- concatStringsSep " \\\n " cmdlineArgs);
- User = promUser;
- Restart = "always";
- WorkingDirectory = workingDir;
- StateDirectory = stateDir;
- };
- };
- })
- (mkIf cfg2.enable {
- systemd.services.prometheus2 = {
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
- serviceConfig = {
- ExecStart = "${cfg2.package}/bin/prometheus" +
- optionalString (length cmdlineArgs2 != 0) (" \\\n " +
- concatStringsSep " \\\n " cmdlineArgs2);
- User = promUser;
- Restart = "always";
- WorkingDirectory = workingDir2;
- StateDirectory = cfg2.stateDir;
- };
- };
- })
- ];
+ };
}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 2ab8910ff9db..84486aa98a40 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -34,6 +34,7 @@ let
"node"
"postfix"
"postgres"
+ "rspamd"
"snmp"
"surfboard"
"tor"
@@ -132,14 +133,10 @@ let
in
mkIf conf.enable {
warnings = conf.warnings or [];
- users.users = (mkIf (conf.user == "${name}-exporter" && !enableDynamicUser) {
- "${name}-exporter" = {
- description = ''
- Prometheus ${name} exporter service user
- '';
- isSystemUser = true;
- inherit (conf) group;
- };
+ users.users."${name}-exporter" = (mkIf (conf.user == "${name}-exporter" && !enableDynamicUser) {
+ description = "Prometheus ${name} exporter service user";
+ isSystemUser = true;
+ inherit (conf) group;
});
users.groups = (mkIf (conf.group == "${name}-exporter" && !enableDynamicUser) {
"${name}-exporter" = {};
@@ -197,6 +194,8 @@ in
services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000";
services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey;
services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey;
+ })] ++ [(mkIf config.services.rspamd.enable {
+ services.prometheus.exporters.rspamd.url = mkDefault "http://localhost:11334/stat";
})] ++ (mapAttrsToList (name: conf:
mkExporterConf {
inherit name;
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
index 7e394e8463e0..adc2abe0b91c 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
@@ -9,7 +9,7 @@ in
port = 9100;
extraOpts = {
enabledCollectors = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
example = ''[ "systemd" ]'';
description = ''
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix b/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix
new file mode 100644
index 000000000000..1f02ae207249
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix
@@ -0,0 +1,92 @@
+{ config, lib, pkgs, options }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.exporters.rspamd;
+
+ prettyJSON = conf:
+ pkgs.runCommand "rspamd-exporter-config.yml" { } ''
+ echo '${builtins.toJSON conf}' | ${pkgs.buildPackages.jq}/bin/jq '.' > $out
+ '';
+
+ generateConfig = extraLabels: (map (path: {
+ name = "rspamd_${replaceStrings [ "." " " ] [ "_" "_" ] path}";
+ path = "$.${path}";
+ labels = extraLabels;
+ }) [
+ "actions.'add header'"
+ "actions.'no action'"
+ "actions.'rewrite subject'"
+ "actions.'soft reject'"
+ "actions.greylist"
+ "actions.reject"
+ "bytes_allocated"
+ "chunks_allocated"
+ "chunks_freed"
+ "chunks_oversized"
+ "connections"
+ "control_connections"
+ "ham_count"
+ "learned"
+ "pools_allocated"
+ "pools_freed"
+ "read_only"
+ "scanned"
+ "shared_chunks_allocated"
+ "spam_count"
+ "total_learns"
+ ]) ++ [{
+ name = "rspamd_statfiles";
+ type = "object";
+ path = "$.statfiles[*]";
+ labels = recursiveUpdate {
+ symbol = "$.symbol";
+ type = "$.type";
+ } extraLabels;
+ values = {
+ revision = "$.revision";
+ size = "$.size";
+ total = "$.total";
+ used = "$.used";
+ languages = "$.languages";
+ users = "$.users";
+ };
+ }];
+in
+{
+ port = 7980;
+ extraOpts = {
+ listenAddress = {}; # not used
+
+ url = mkOption {
+ type = types.str;
+ description = ''
+ URL to the rspamd metrics endpoint.
+ Defaults to http://localhost:11334/stat when
+ is true.
+ '';
+ };
+
+ extraLabels = mkOption {
+ type = types.attrsOf types.str;
+ default = {
+ host = config.networking.hostName;
+ };
+ defaultText = "{ host = config.networking.hostName; }";
+ example = literalExample ''
+ {
+ host = config.networking.hostName;
+ custom_label = "some_value";
+ }
+ '';
+ description = "Set of labels added to each metric.";
+ };
+ };
+ serviceOpts.serviceConfig.ExecStart = ''
+ ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \
+ --port ${toString cfg.port} \
+ ${cfg.url} ${prettyJSON (generateConfig cfg.extraLabels)} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+}
diff --git a/nixos/modules/services/monitoring/riemann-tools.nix b/nixos/modules/services/monitoring/riemann-tools.nix
index 2b647b6b1ade..86a11694e7b4 100644
--- a/nixos/modules/services/monitoring/riemann-tools.nix
+++ b/nixos/modules/services/monitoring/riemann-tools.nix
@@ -35,7 +35,7 @@ in {
'';
};
extraArgs = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
description = ''
A list of commandline-switches forwarded to a riemann-tool.
diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index dc0899c7e684..38cd2213de76 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -51,7 +51,7 @@ in {
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "scollector";
description = ''
User account under which scollector runs.
@@ -59,7 +59,7 @@ in {
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "scollector";
description = ''
Group account under which scollector runs.
@@ -67,7 +67,7 @@ in {
};
bosunHost = mkOption {
- type = types.string;
+ type = types.str;
default = "localhost:8070";
description = ''
Host and port of the bosun server that will store the collected
diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix
index b41e99b76477..215cd43fd864 100644
--- a/nixos/modules/services/monitoring/thanos.nix
+++ b/nixos/modules/services/monitoring/thanos.nix
@@ -70,14 +70,14 @@ let
} ''json2yaml -i $json -o $out'';
thanos = cmd: "${cfg.package}/bin/thanos ${cmd}" +
- (let args = cfg."${cmd}".arguments;
+ (let args = cfg.${cmd}.arguments;
in optionalString (length args != 0) (" \\\n " +
concatStringsSep " \\\n " args));
argumentsOf = cmd: concatLists (collect isList
- (flip mapParamsRecursive params."${cmd}" (path: param:
+ (flip mapParamsRecursive params.${cmd} (path: param:
let opt = concatStringsSep "." path;
- v = getAttrFromPath path cfg."${cmd}";
+ v = getAttrFromPath path cfg.${cmd};
in param.toArgs opt v)));
mkArgumentsOption = cmd: mkOption {
@@ -95,7 +95,7 @@ let
};
mapParamsRecursive =
- let noParam = attr: !(attr ? "toArgs" && attr ? "option");
+ let noParam = attr: !(attr ? toArgs && attr ? option);
in mapAttrsRecursiveCond noParam;
paramsToOptions = mapParamsRecursive (_path: param: param.option);
@@ -218,8 +218,8 @@ let
toArgs = optionToArgs;
option = mkOption {
type = types.str;
- default = "/var/lib/${config.services.prometheus2.stateDir}/data";
- defaultText = "/var/lib/\${config.services.prometheus2.stateDir}/data";
+ default = "/var/lib/${config.services.prometheus.stateDir}/data";
+ defaultText = "/var/lib/\${config.services.prometheus.stateDir}/data";
description = ''
Data directory of TSDB.
'';
@@ -607,7 +607,7 @@ let
assertRelativeStateDir = cmd: {
assertions = [
{
- assertion = !hasPrefix "/" cfg."${cmd}".stateDir;
+ assertion = !hasPrefix "/" cfg.${cmd}.stateDir;
message =
"The option services.thanos.${cmd}.stateDir should not be an absolute directory." +
" It should be a directory relative to /var/lib.";
@@ -679,22 +679,22 @@ in {
(mkIf cfg.sidecar.enable {
assertions = [
{
- assertion = config.services.prometheus2.enable;
+ assertion = config.services.prometheus.enable;
message =
- "Please enable services.prometheus2 when enabling services.thanos.sidecar.";
+ "Please enable services.prometheus when enabling services.thanos.sidecar.";
}
{
- assertion = !(config.services.prometheus2.globalConfig.external_labels == null ||
- config.services.prometheus2.globalConfig.external_labels == {});
+ assertion = !(config.services.prometheus.globalConfig.external_labels == null ||
+ config.services.prometheus.globalConfig.external_labels == {});
message =
"services.thanos.sidecar requires uniquely identifying external labels " +
"to be configured in the Prometheus server. " +
- "Please set services.prometheus2.globalConfig.external_labels.";
+ "Please set services.prometheus.globalConfig.external_labels.";
}
];
systemd.services.thanos-sidecar = {
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "prometheus2.service" ];
+ after = [ "network.target" "prometheus.service" ];
serviceConfig = {
User = "prometheus";
Restart = "always";
diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix
index 429b40227d47..1bdc4e4410f1 100644
--- a/nixos/modules/services/monitoring/ups.nix
+++ b/nixos/modules/services/monitoring/ups.nix
@@ -55,7 +55,7 @@ let
description = mkOption {
default = "";
- type = types.string;
+ type = types.str;
description = ''
Description of the UPS.
'';
@@ -71,7 +71,7 @@ let
summary = mkOption {
default = "";
- type = types.string;
+ type = types.lines;
description = ''
Lines which would be added inside ups.conf for handling this UPS.
'';
diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix
index c0993f3bc2e7..245badc3e44f 100644
--- a/nixos/modules/services/monitoring/uptime.nix
+++ b/nixos/modules/services/monitoring/uptime.nix
@@ -57,7 +57,7 @@ in {
nodeEnv = mkOption {
description = "The node environment to run in (development, production, etc.)";
- type = types.string;
+ type = types.str;
default = "production";
};
diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix
index b1645f861101..856b9432892b 100644
--- a/nixos/modules/services/monitoring/zabbix-agent.nix
+++ b/nixos/modules/services/monitoring/zabbix-agent.nix
@@ -135,7 +135,7 @@ in
users.groups.${group} = { };
- systemd.services."zabbix-agent" = {
+ systemd.services.zabbix-agent = {
description = "Zabbix Agent";
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix
index 90abed30db5d..9d214469c3b3 100644
--- a/nixos/modules/services/monitoring/zabbix-proxy.nix
+++ b/nixos/modules/services/monitoring/zabbix-proxy.nix
@@ -252,7 +252,7 @@ in
fping.source = "${pkgs.fping}/bin/fping";
};
- systemd.services."zabbix-proxy" = {
+ systemd.services.zabbix-proxy = {
description = "Zabbix Proxy";
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix
index 11311b466c3f..4b4049ed360e 100644
--- a/nixos/modules/services/monitoring/zabbix-server.nix
+++ b/nixos/modules/services/monitoring/zabbix-server.nix
@@ -237,7 +237,7 @@ in
fping.source = "${pkgs.fping}/bin/fping";
};
- systemd.services."zabbix-server" = {
+ systemd.services.zabbix-server = {
description = "Zabbix Server";
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix
index 86b1bb9160f1..2e03a422665a 100644
--- a/nixos/modules/services/network-filesystems/beegfs.nix
+++ b/nixos/modules/services/network-filesystems/beegfs.nix
@@ -69,7 +69,7 @@ let
# functions to generate systemd.service entries
systemdEntry = service: cfgFile: (mapAttrs' ( name: cfg:
- (nameValuePair "beegfs-${service}-${name}" (mkIf cfg."${service}".enable {
+ (nameValuePair "beegfs-${service}-${name}" (mkIf cfg.${service}.enable {
wantedBy = [ "multi-user.target" ];
requires = [ "network-online.target" ];
after = [ "network-online.target" ];
diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix
index 4e3bc839d400..656a2d21b868 100644
--- a/nixos/modules/services/network-filesystems/ceph.nix
+++ b/nixos/modules/services/network-filesystems/ceph.nix
@@ -3,22 +3,22 @@
with lib;
let
- ceph = pkgs.ceph;
cfg = config.services.ceph;
+
# function that translates "camelCaseOptions" to "camel case options", credits to tilpner in #nixos@freenode
- translateOption = replaceStrings upperChars (map (s: " ${s}") lowerChars);
- generateDaemonList = (daemonType: daemons: extraServiceConfig:
- mkMerge (
- map (daemon:
- { "ceph-${daemonType}-${daemon}" = generateServiceFile daemonType daemon cfg.global.clusterName ceph extraServiceConfig; }
- ) daemons
- )
- );
- generateServiceFile = (daemonType: daemonId: clusterName: ceph: extraServiceConfig: {
+ expandCamelCase = replaceStrings upperChars (map (s: " ${s}") lowerChars);
+ expandCamelCaseAttrs = mapAttrs' (name: value: nameValuePair (expandCamelCase name) value);
+
+ makeServices = (daemonType: daemonIds: extraServiceConfig:
+ mkMerge (map (daemonId:
+ { "ceph-${daemonType}-${daemonId}" = makeService daemonType daemonId cfg.global.clusterName pkgs.ceph extraServiceConfig; })
+ daemonIds));
+
+ makeService = (daemonType: daemonId: clusterName: ceph: extraServiceConfig: {
enable = true;
description = "Ceph ${builtins.replaceStrings lowerChars upperChars daemonType} daemon ${daemonId}";
- after = [ "network-online.target" "local-fs.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target";
- wants = [ "network-online.target" "local-fs.target" "time-sync.target" ];
+ after = [ "network-online.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target";
+ wants = [ "network-online.target" "time-sync.target" ];
partOf = [ "ceph-${daemonType}.target" ];
wantedBy = [ "ceph-${daemonType}.target" ];
@@ -34,28 +34,34 @@ let
Restart = "on-failure";
StartLimitBurst = "5";
StartLimitInterval = "30min";
- ExecStart = "${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} -f --cluster ${clusterName} --id ${if daemonType == "rgw" then "client.${daemonId}" else daemonId} --setuser ceph --setgroup ceph";
+ ExecStart = ''${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} \
+ -f --cluster ${clusterName} --id ${daemonId} --setuser ceph \
+ --setgroup ${if daemonType == "osd" then "disk" else "ceph"}'';
} // extraServiceConfig
- // optionalAttrs (daemonType == "osd") { ExecStartPre = "${ceph.out}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}"; };
- } // optionalAttrs (builtins.elem daemonType [ "mds" "mon" "rgw" "mgr" ]) { preStart = ''
+ // optionalAttrs (daemonType == "osd") { ExecStartPre = ''${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh \
+ --id ${daemonId} --cluster ${clusterName}''; };
+ } // optionalAttrs (builtins.elem daemonType [ "mds" "mon" "rgw" "mgr" ]) {
+ preStart = ''
daemonPath="/var/lib/ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}"
- if [ ! -d ''$daemonPath ]; then
- mkdir -m 755 -p ''$daemonPath
- chown -R ceph:ceph ''$daemonPath
+ if [ ! -d $daemonPath ]; then
+ mkdir -m 755 -p $daemonPath
+ chown -R ceph:ceph $daemonPath
fi
'';
} // optionalAttrs (daemonType == "osd") { path = [ pkgs.getopt ]; }
);
- generateTargetFile = (daemonType:
+
+ makeTarget = (daemonType:
{
"ceph-${daemonType}" = {
description = "Ceph target allowing to start/stop all ceph-${daemonType} services at once";
partOf = [ "ceph.target" ];
+ wantedBy = [ "ceph.target" ];
before = [ "ceph.target" ];
};
}
);
-in
+in
{
options.services.ceph = {
# Ceph has a monolithic configuration file but different sections for
@@ -82,11 +88,19 @@ in
'';
};
+ mgrModulePath = mkOption {
+ type = types.path;
+ default = "${pkgs.ceph.lib}/lib/ceph/mgr";
+ description = ''
+ Path at which to find ceph-mgr modules.
+ '';
+ };
+
monInitialMembers = mkOption {
type = with types; nullOr commas;
default = null;
example = ''
- node0, node1, node2
+ node0, node1, node2
'';
description = ''
List of hosts that will be used as monitors at startup.
@@ -157,6 +171,27 @@ in
A comma-separated list of subnets that will be used as cluster networks in the cluster.
'';
};
+
+ rgwMimeTypesFile = mkOption {
+ type = with types; nullOr path;
+ default = "${pkgs.mime-types}/etc/mime.types";
+ description = ''
+ Path to mime types used by radosgw.
+ '';
+ };
+ };
+
+ extraConfig = mkOption {
+ type = with types; attrsOf str;
+ default = {};
+ example = ''
+ {
+ "ms bind ipv6" = "true";
+ };
+ '';
+ description = ''
+ Extra configuration to add to the global section. Use for setting values that are common for all daemons in the cluster.
+ '';
};
mgr = {
@@ -216,6 +251,7 @@ in
to the id part in ceph i.e. [ "name1" ] would result in osd.name1
'';
};
+
extraConfig = mkOption {
type = with types; attrsOf str;
default = {
@@ -296,9 +332,6 @@ in
{ assertion = cfg.global.fsid != "";
message = "fsid has to be set to a valid uuid for the cluster to function";
}
- { assertion = cfg.mgr.enable == true;
- message = "ceph 12.x requires atleast 1 MGR daemon enabled for the cluster to function";
- }
{ assertion = cfg.mon.enable == true -> cfg.mon.daemons != [];
message = "have to set id of atleast one MON if you're going to enable Monitor";
}
@@ -313,21 +346,19 @@ in
}
];
- warnings = optional (cfg.global.monInitialMembers == null)
+ warnings = optional (cfg.global.monInitialMembers == null)
''Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function'';
-
+
environment.etc."ceph/ceph.conf".text = let
- # Translate camelCaseOptions to the expected camel case option for ceph.conf
- translatedGlobalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) cfg.global;
# Merge the extraConfig set for mgr daemons, as mgr don't have their own section
- globalAndMgrConfig = translatedGlobalConfig // optionalAttrs cfg.mgr.enable cfg.mgr.extraConfig;
+ globalSection = expandCamelCaseAttrs (cfg.global // cfg.extraConfig // optionalAttrs cfg.mgr.enable cfg.mgr.extraConfig);
# Remove all name-value pairs with null values from the attribute set to avoid making empty sections in the ceph.conf
- globalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) (filterAttrs (name: value: value != null) globalAndMgrConfig);
+ globalSection' = filterAttrs (name: value: value != null) globalSection;
totalConfig = {
- "global" = globalConfig;
- } // optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { "mon" = cfg.mon.extraConfig; }
- // optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { "mds" = cfg.mds.extraConfig; }
- // optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { "osd" = cfg.osd.extraConfig; }
+ global = globalSection';
+ } // optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { mon = cfg.mon.extraConfig; }
+ // optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { mds = cfg.mds.extraConfig; }
+ // optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { osd = cfg.osd.extraConfig; }
// optionalAttrs (cfg.client.enable && cfg.client.extraConfig != {}) cfg.client.extraConfig;
in
generators.toINI {} totalConfig;
@@ -336,31 +367,36 @@ in
name = "ceph";
uid = config.ids.uids.ceph;
description = "Ceph daemon user";
+ group = "ceph";
+ extraGroups = [ "disk" ];
};
-
users.groups = singleton {
name = "ceph";
gid = config.ids.gids.ceph;
};
systemd.services = let
- services = []
- ++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; })
- ++ optional cfg.mds.enable (generateDaemonList "mds" cfg.mds.daemons { StartLimitBurst = "3"; })
- ++ optional cfg.osd.enable (generateDaemonList "osd" cfg.osd.daemons { StartLimitBurst = "30"; RestartSec = "20s"; })
- ++ optional cfg.rgw.enable (generateDaemonList "rgw" cfg.rgw.daemons { })
- ++ optional cfg.mgr.enable (generateDaemonList "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; });
- in
+ services = []
+ ++ optional cfg.mon.enable (makeServices "mon" cfg.mon.daemons { RestartSec = "10"; })
+ ++ optional cfg.mds.enable (makeServices "mds" cfg.mds.daemons { StartLimitBurst = "3"; })
+ ++ optional cfg.osd.enable (makeServices "osd" cfg.osd.daemons { StartLimitBurst = "30";
+ RestartSec = "20s";
+ PrivateDevices = "no"; # osd needs disk access
+ })
+ ++ optional cfg.rgw.enable (makeServices "rgw" cfg.rgw.daemons { })
+ ++ optional cfg.mgr.enable (makeServices "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; });
+ in
mkMerge services;
systemd.targets = let
targets = [
- { "ceph" = { description = "Ceph target allowing to start/stop all ceph service instances at once"; }; }
- ] ++ optional cfg.mon.enable (generateTargetFile "mon")
- ++ optional cfg.mds.enable (generateTargetFile "mds")
- ++ optional cfg.osd.enable (generateTargetFile "osd")
- ++ optional cfg.rgw.enable (generateTargetFile "rgw")
- ++ optional cfg.mgr.enable (generateTargetFile "mgr");
+ { ceph = { description = "Ceph target allowing to start/stop all ceph service instances at once";
+ wantedBy = [ "multi-user.target" ]; }; }
+ ] ++ optional cfg.mon.enable (makeTarget "mon")
+ ++ optional cfg.mds.enable (makeTarget "mds")
+ ++ optional cfg.osd.enable (makeTarget "osd")
+ ++ optional cfg.rgw.enable (makeTarget "rgw")
+ ++ optional cfg.mgr.enable (makeTarget "mgr");
in
mkMerge targets;
diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix
index c16e12378d75..100d458d536c 100644
--- a/nixos/modules/services/network-filesystems/davfs2.nix
+++ b/nixos/modules/services/network-filesystems/davfs2.nix
@@ -21,7 +21,7 @@ in
};
davUser = mkOption {
- type = types.string;
+ type = types.str;
default = "davfs2";
description = ''
When invoked by root the mount.davfs daemon will run as this user.
@@ -30,7 +30,7 @@ in
};
davGroup = mkOption {
- type = types.string;
+ type = types.str;
default = "davfs2";
description = ''
The group of the running mount.davfs daemon. Ordinary users must be
diff --git a/nixos/modules/services/network-filesystems/drbd.nix b/nixos/modules/services/network-filesystems/drbd.nix
index 57b1fbb597c7..4ab74ed8e1c0 100644
--- a/nixos/modules/services/network-filesystems/drbd.nix
+++ b/nixos/modules/services/network-filesystems/drbd.nix
@@ -23,7 +23,7 @@ let cfg = config.services.drbd; in
services.drbd.config = mkOption {
default = "";
- type = types.string;
+ type = types.lines;
description = ''
Contents of the drbd.conf configuration file.
'';
diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix
index 00875c6c4a18..d70092999f67 100644
--- a/nixos/modules/services/network-filesystems/glusterfs.nix
+++ b/nixos/modules/services/network-filesystems/glusterfs.nix
@@ -156,7 +156,7 @@ in
wantedBy = [ "multi-user.target" ];
requires = lib.optional cfg.useRpcbind "rpcbind.service";
- after = [ "network.target" "local-fs.target" ] ++ lib.optional cfg.useRpcbind "rpcbind.service";
+ after = [ "network.target" ] ++ lib.optional cfg.useRpcbind "rpcbind.service";
preStart = ''
install -m 0755 -d /var/log/glusterfs
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index bbbfcf6a4738..b6d881afd7bd 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -236,7 +236,6 @@ in {
systemd.services.ipfs-init = recursiveUpdate commonEnv {
description = "IPFS Initializer";
- after = [ "local-fs.target" ];
before = [ "ipfs.service" "ipfs-offline.service" "ipfs-norouting.service" ];
script = ''
@@ -263,21 +262,21 @@ in {
systemd.services.ipfs = recursiveUpdate baseService {
description = "IPFS Daemon";
wantedBy = mkIf (cfg.defaultMode == "online") [ "multi-user.target" ];
- after = [ "network.target" "local-fs.target" "ipfs-init.service" ];
+ after = [ "network.target" "ipfs-init.service" ];
conflicts = [ "ipfs-offline.service" "ipfs-norouting.service"];
};
systemd.services.ipfs-offline = recursiveUpdate baseService {
description = "IPFS Daemon (offline mode)";
wantedBy = mkIf (cfg.defaultMode == "offline") [ "multi-user.target" ];
- after = [ "local-fs.target" "ipfs-init.service" ];
+ after = [ "ipfs-init.service" ];
conflicts = [ "ipfs.service" "ipfs-norouting.service"];
};
systemd.services.ipfs-norouting = recursiveUpdate baseService {
description = "IPFS Daemon (no routing mode)";
wantedBy = mkIf (cfg.defaultMode == "norouting") [ "multi-user.target" ];
- after = [ "local-fs.target" "ipfs-init.service" ];
+ after = [ "ipfs-init.service" ];
conflicts = [ "ipfs.service" "ipfs-offline.service"];
};
diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixos/modules/services/network-filesystems/openafs/lib.nix
index 1cc9bed847ab..e068ee761c2a 100644
--- a/nixos/modules/services/network-filesystems/openafs/lib.nix
+++ b/nixos/modules/services/network-filesystems/openafs/lib.nix
@@ -3,7 +3,7 @@
let
inherit (lib) concatStringsSep mkOption types;
-in rec {
+in {
mkCellServDB = cellName: db: ''
>${cellName}
diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix
index 054057d52ab1..b17ec3aa9300 100644
--- a/nixos/modules/services/network-filesystems/rsyncd.nix
+++ b/nixos/modules/services/network-filesystems/rsyncd.nix
@@ -35,7 +35,7 @@ in
};
motd = mkOption {
- type = types.string;
+ type = types.str;
default = "";
description = ''
Message of the day to display to clients on each connect.
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 69368441c62c..055508a32244 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -234,10 +234,10 @@ in
# Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd
# for correct use with systemd
services = {
- "samba-smbd" = daemonService "smbd" "";
- "samba-nmbd" = mkIf cfg.enableNmbd (daemonService "nmbd" "");
- "samba-winbindd" = mkIf cfg.enableWinbindd (daemonService "winbindd" "");
- "samba-setup" = {
+ samba-smbd = daemonService "smbd" "";
+ samba-nmbd = mkIf cfg.enableNmbd (daemonService "nmbd" "");
+ samba-winbindd = mkIf cfg.enableWinbindd (daemonService "winbindd" "");
+ samba-setup = {
description = "Samba Setup Task";
script = setupScript;
unitConfig.RequiresMountsFor = "/var/lib/samba";
diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix
index e93f45b49867..0aa01ef9e6d9 100644
--- a/nixos/modules/services/network-filesystems/yandex-disk.nix
+++ b/nixos/modules/services/network-filesystems/yandex-disk.nix
@@ -29,7 +29,7 @@ in
username = mkOption {
default = "";
- type = types.string;
+ type = types.str;
description = ''
Your yandex.com login name.
'';
@@ -37,7 +37,7 @@ in
password = mkOption {
default = "";
- type = types.string;
+ type = types.str;
description = ''
Your yandex.com password. Warning: it will be world-readable in /nix/store.
'';
@@ -57,7 +57,7 @@ in
excludes = mkOption {
default = "";
- type = types.string;
+ type = types.commas;
example = "data,backup";
description = ''
Comma-separated list of directories which are excluded from synchronization.
diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix
index 53829bf18863..156fef144791 100644
--- a/nixos/modules/services/networking/aria2.nix
+++ b/nixos/modules/services/networking/aria2.nix
@@ -47,8 +47,8 @@ in
'';
};
downloadDir = mkOption {
- type = types.string;
- default = "${downloadDir}";
+ type = types.path;
+ default = downloadDir;
description = ''
Directory to store downloaded files.
'';
@@ -66,7 +66,7 @@ in
description = "Specify a port number for JSON-RPC/XML-RPC server to listen to. Possible Values: 1024-65535";
};
rpcSecret = mkOption {
- type = types.string;
+ type = types.str;
default = "aria2rpc";
description = ''
Set RPC secret authorization token.
@@ -74,7 +74,7 @@ in
'';
};
extraArguments = mkOption {
- type = types.string;
+ type = types.separatedString " ";
example = "--rpc-listen-all --remote-time=true";
default = "";
description = ''
@@ -109,7 +109,7 @@ in
systemd.services.aria2 = {
description = "aria2 Service";
- after = [ "local-fs.target" "network.target" ];
+ after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
if [[ ! -e "${sessionFile}" ]]
diff --git a/nixos/modules/services/networking/autossh.nix b/nixos/modules/services/networking/autossh.nix
index a098a155e991..a8d9a027e9fa 100644
--- a/nixos/modules/services/networking/autossh.nix
+++ b/nixos/modules/services/networking/autossh.nix
@@ -20,12 +20,12 @@ in
type = types.listOf (types.submodule {
options = {
name = mkOption {
- type = types.string;
+ type = types.str;
example = "socks-peer";
description = "Name of the local AutoSSH session";
};
user = mkOption {
- type = types.string;
+ type = types.str;
example = "bill";
description = "Name of the user the AutoSSH session should run as";
};
@@ -40,7 +40,7 @@ in
'';
};
extraArguments = mkOption {
- type = types.string;
+ type = types.separatedString " ";
example = "-N -D4343 bill@socks.example.net";
description = ''
Arguments to be passed to AutoSSH and retransmitted to SSH
diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix
index 3dfd80f6ff52..de863461eab2 100644
--- a/nixos/modules/services/networking/babeld.nix
+++ b/nixos/modules/services/networking/babeld.nix
@@ -52,7 +52,7 @@ in
example =
{
type = "tunnel";
- "split-horizon" = true;
+ split-horizon = true;
};
};
@@ -66,8 +66,8 @@ in
example =
{ enp0s2 =
{ type = "wired";
- "hello-interval" = 5;
- "split-horizon" = "auto";
+ hello-interval = 5;
+ split-horizon = "auto";
};
};
};
diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix
index e3aba063f87b..da26246e703e 100644
--- a/nixos/modules/services/networking/charybdis.nix
+++ b/nixos/modules/services/networking/charybdis.nix
@@ -21,14 +21,14 @@ in
enable = mkEnableOption "Charybdis IRC daemon";
config = mkOption {
- type = types.string;
+ type = types.str;
description = ''
Charybdis IRC daemon configuration file.
'';
};
statedir = mkOption {
- type = types.string;
+ type = types.path;
default = "/var/lib/charybdis";
description = ''
Location of the state directory of charybdis.
@@ -36,7 +36,7 @@ in
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "ircd";
description = ''
Charybdis IRC daemon user.
@@ -44,7 +44,7 @@ in
};
group = mkOption {
- type = types.string;
+ type = types.str;
default = "ircd";
description = ''
Charybdis IRC daemon group.
@@ -101,7 +101,7 @@ in
};
}
-
+
(mkIf (cfg.motd != null) {
environment.etc."charybdis/ircd.motd".text = cfg.motd;
})
diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index c3ca6fbe725e..31127f790499 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -45,7 +45,7 @@ in {
};
networkInterfaceBlacklist = mkOption {
- type = with types; listOf string;
+ type = with types; listOf str;
default = [ "vmnet" "vboxnet" "virbr" "ifb" "ve" ];
description = ''
Default blacklisted interfaces, this includes NixOS containers interfaces (ve).
@@ -53,7 +53,7 @@ in {
};
extraFlags = mkOption {
- type = with types; listOf string;
+ type = with types; listOf str;
default = [ ];
example = [ "--nodnsproxy" ];
description = ''
@@ -82,7 +82,7 @@ in {
environment.systemPackages = [ connman ];
- systemd.services."connman" = {
+ systemd.services.connman = {
description = "Connection service";
wantedBy = [ "multi-user.target" ];
after = [ "syslog.target" ];
@@ -95,7 +95,7 @@ in {
};
};
- systemd.services."connman-vpn" = mkIf cfg.enableVPN {
+ systemd.services.connman-vpn = mkIf cfg.enableVPN {
description = "ConnMan VPN service";
wantedBy = [ "multi-user.target" ];
after = [ "syslog.target" ];
@@ -108,7 +108,7 @@ in {
};
};
- systemd.services."net-connman-vpn" = mkIf cfg.enableVPN {
+ systemd.services.net-connman-vpn = mkIf cfg.enableVPN {
description = "D-BUS Service";
serviceConfig = {
Name = "net.connman.vpn";
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index f080f12eaccd..689cbc8a986d 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -156,7 +156,7 @@ in
config = mkIf cfg.enable (
mkMerge [{
- users.users."consul" = {
+ users.users.consul = {
description = "Consul agent daemon user";
uid = config.ids.uids.consul;
# The shell is needed for health checks
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 4ea891262e56..5b3aa19af3bb 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -58,7 +58,7 @@ let
${text}
''; in "${dir}/bin/${name}";
- defaultInterface = { default = mapAttrs (name: value: cfg."${name}") commonOptions; };
+ defaultInterface = { default = mapAttrs (name: value: cfg.${name}) commonOptions; };
allInterfaces = defaultInterface // cfg.interfaces;
startScript = writeShScript "firewall-start" ''
diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix
index c0020349ec74..a638a3083fba 100644
--- a/nixos/modules/services/networking/git-daemon.nix
+++ b/nixos/modules/services/networking/git-daemon.nix
@@ -115,7 +115,7 @@ in
gid = config.ids.gids.git;
};
- systemd.services."git-daemon" = {
+ systemd.services.git-daemon = {
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
script = "${pkgs.git}/bin/git daemon --reuseaddr "
diff --git a/nixos/modules/services/networking/gogoclient.nix b/nixos/modules/services/networking/gogoclient.nix
index 9d16f0efb435..c9b03bca7112 100644
--- a/nixos/modules/services/networking/gogoclient.nix
+++ b/nixos/modules/services/networking/gogoclient.nix
@@ -34,7 +34,7 @@ in
password = mkOption {
default = "";
- type = types.string;
+ type = types.str;
description = ''
Path to a file (as a string), containing your gogoNET password, if any.
'';
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 54a5bed2563f..2915b54f05b4 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -81,7 +81,7 @@ in
driver = mkOption {
default = "nl80211";
example = "hostapd";
- type = types.string;
+ type = types.str;
description = ''
Which driver hostapd will use.
Most applications will probably use the default.
@@ -91,7 +91,7 @@ in
ssid = mkOption {
default = "nixos";
example = "mySpecialSSID";
- type = types.string;
+ type = types.str;
description = "SSID to be used in IEEE 802.11 management frames.";
};
@@ -119,7 +119,7 @@ in
group = mkOption {
default = "wheel";
example = "network";
- type = types.string;
+ type = types.str;
description = ''
Members of this group can control hostapd.
'';
@@ -135,7 +135,7 @@ in
wpaPassphrase = mkOption {
default = "my_sekret";
example = "any_64_char_string";
- type = types.string;
+ type = types.str;
description = ''
WPA-PSK (pre-shared-key) passphrase. Clients will need this
passphrase to associate with this access point.
diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix
index 0c6602e7f8ab..b9b9b9dca4f0 100644
--- a/nixos/modules/services/networking/hylafax/systemd.nix
+++ b/nixos/modules/services/networking/hylafax/systemd.nix
@@ -68,7 +68,7 @@ let
inherit (cfg) spoolAreaPath;
};
- sockets."hylafax-hfaxd" = {
+ sockets.hylafax-hfaxd = {
description = "HylaFAX server socket";
documentation = [ "man:hfaxd(8)" ];
wantedBy = [ "multi-user.target" ];
@@ -77,7 +77,7 @@ let
socketConfig.Accept = true;
};
- paths."hylafax-faxq" = {
+ paths.hylafax-faxq = {
description = "HylaFAX queue manager sendq watch";
documentation = [ "man:faxq(8)" "man:sendq(5)" ];
wantedBy = [ "multi-user.target" ];
@@ -87,11 +87,11 @@ let
timers = mkMerge [
(
mkIf (cfg.faxcron.enable.frequency!=null)
- { "hylafax-faxcron".timerConfig.Persistent = true; }
+ { hylafax-faxcron.timerConfig.Persistent = true; }
)
(
mkIf (cfg.faxqclean.enable.frequency!=null)
- { "hylafax-faxqclean".timerConfig.Persistent = true; }
+ { hylafax-faxqclean.timerConfig.Persistent = true; }
)
];
@@ -121,7 +121,7 @@ let
in
service: service // { serviceConfig = apply service; };
- services."hylafax-spool" = {
+ services.hylafax-spool = {
description = "HylaFAX spool area preparation";
documentation = [ "man:hylafax-server(4)" ];
script = ''
@@ -140,7 +140,7 @@ let
unitConfig.RequiresMountsFor = [ cfg.spoolAreaPath ];
};
- services."hylafax-faxq" = {
+ services.hylafax-faxq = {
description = "HylaFAX queue manager";
documentation = [ "man:faxq(8)" ];
requires = [ "hylafax-spool.service" ];
@@ -178,7 +178,7 @@ let
serviceConfig.PrivateNetwork = null;
};
- services."hylafax-faxcron" = rec {
+ services.hylafax-faxcron = rec {
description = "HylaFAX spool area maintenance";
documentation = [ "man:faxcron(8)" ];
after = [ "hylafax-spool.service" ];
@@ -194,7 +194,7 @@ let
];
};
- services."hylafax-faxqclean" = rec {
+ services.hylafax-faxqclean = rec {
description = "HylaFAX spool area queue cleaner";
documentation = [ "man:faxqclean(8)" ];
after = [ "hylafax-spool.service" ];
diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix
index 2bd898edf897..f5abe61a1baf 100644
--- a/nixos/modules/services/networking/ircd-hybrid/default.nix
+++ b/nixos/modules/services/networking/ircd-hybrid/default.nix
@@ -121,7 +121,7 @@ in
users.groups.ircd.gid = config.ids.gids.ircd;
- systemd.services."ircd-hybrid" = {
+ systemd.services.ircd-hybrid = {
description = "IRCD Hybrid server";
after = [ "started networking" ];
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix
index 18ed20e28886..839fa48d9a42 100644
--- a/nixos/modules/services/networking/iwd.nix
+++ b/nixos/modules/services/networking/iwd.nix
@@ -26,6 +26,7 @@ in {
systemd.tmpfiles.rules = [
"d /var/lib/iwd 0700 root root -"
+ "d /var/lib/ead 0700 root root -"
];
};
diff --git a/nixos/modules/services/networking/jormungandr.nix b/nixos/modules/services/networking/jormungandr.nix
index 0c66b85fe8a5..85e804d6cf25 100644
--- a/nixos/modules/services/networking/jormungandr.nix
+++ b/nixos/modules/services/networking/jormungandr.nix
@@ -54,7 +54,7 @@ in {
};
genesisBlockHash = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "d70495af81ae8600aca3e642b2427327cb6001ec4d7a0037e96a00dabed163f9";
description = ''
@@ -82,6 +82,9 @@ in {
description = "jormungandr server";
wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" ];
+ environment = {
+ RUST_BACKTRACE = "full";
+ };
serviceConfig = {
DynamicUser = true;
StateDirectory = baseNameOf dataDir;
diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix
index 40c38254a57c..bdea6a1d1caa 100644
--- a/nixos/modules/services/networking/kippo.nix
+++ b/nixos/modules/services/networking/kippo.nix
@@ -11,7 +11,7 @@ with lib;
let
cfg = config.services.kippo;
in
-rec {
+{
options = {
services.kippo = {
enable = mkOption {
@@ -26,22 +26,22 @@ rec {
};
hostname = mkOption {
default = "nas3";
- type = types.string;
+ type = types.str;
description = ''Hostname for kippo to present to SSH login'';
};
varPath = mkOption {
default = "/var/lib/kippo";
- type = types.string;
+ type = types.path;
description = ''Path of read/write files needed for operation and configuration.'';
};
logPath = mkOption {
default = "/var/log/kippo";
- type = types.string;
+ type = types.path;
description = ''Path of log files needed for operation and configuration.'';
};
pidPath = mkOption {
default = "/run/kippo";
- type = types.string;
+ type = types.path;
description = ''Path of pid files needed for operation.'';
};
extraConfig = mkOption {
@@ -109,8 +109,8 @@ rec {
serviceConfig.ExecStart = "${pkgs.kippo.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n";
serviceConfig.PermissionsStartOnly = true;
- serviceConfig.User = "kippo";
- serviceConfig.Group = "kippo";
+ serviceConfig.User = "kippo";
+ serviceConfig.Group = "kippo";
};
};
}
diff --git a/nixos/modules/services/networking/logmein-hamachi.nix b/nixos/modules/services/networking/logmein-hamachi.nix
index 406626a8a343..11cbdda2f845 100644
--- a/nixos/modules/services/networking/logmein-hamachi.nix
+++ b/nixos/modules/services/networking/logmein-hamachi.nix
@@ -35,7 +35,7 @@ in
description = "LogMeIn Hamachi Daemon";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "local-fs.target" ];
+ after = [ "network.target" ];
serviceConfig = {
Type = "forking";
diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index ed0c1044a570..0947471adbc9 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@@ -96,7 +96,7 @@ in
{ description = "MiniDLNA Server";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "local-fs.target" ];
+ after = [ "network.target" ];
serviceConfig =
{ User = "minidlna";
diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix
index cc81e27e9399..1b3084fe9abb 100644
--- a/nixos/modules/services/networking/morty.nix
+++ b/nixos/modules/services/networking/morty.nix
@@ -27,7 +27,7 @@ in
};
key = mkOption {
- type = types.string;
+ type = types.str;
default = "";
description = "HMAC url validation key (hexadecimal encoded).
Leave blank to disable. Without validation key, anyone can
@@ -56,7 +56,7 @@ in
};
listenAddress = mkOption {
- type = types.string;
+ type = types.str;
default = "127.0.0.1";
description = "The address on which the service listens";
defaultText = "127.0.0.1 (localhost)";
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index 1d49c137723c..d2feb93e2b72 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -49,7 +49,7 @@ in
host = mkOption {
default = "127.0.0.1";
example = "0.0.0.0";
- type = types.string;
+ type = types.str;
description = ''
Host to listen on without SSL.
'';
@@ -88,7 +88,7 @@ in
host = mkOption {
default = "0.0.0.0";
example = "localhost";
- type = types.string;
+ type = types.str;
description = ''
Host to listen on with SSL.
'';
@@ -135,7 +135,7 @@ in
};
acl = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
example = [ "topic read A/B" "topic A/#" ];
description = ''
Control client access to topics on the broker.
diff --git a/nixos/modules/services/networking/mtprotoproxy.nix b/nixos/modules/services/networking/mtprotoproxy.nix
index 24bf33815da8..d896f227b82c 100644
--- a/nixos/modules/services/networking/mtprotoproxy.nix
+++ b/nixos/modules/services/networking/mtprotoproxy.nix
@@ -50,8 +50,8 @@ in
users = mkOption {
type = types.attrsOf types.str;
example = {
- "tg" = "00000000000000000000000000000000";
- "tg2" = "0123456789abcdef0123456789abcdef";
+ tg = "00000000000000000000000000000000";
+ tg2 = "0123456789abcdef0123456789abcdef";
};
description = ''
Allowed users and their secrets. A secret is a 32 characters long hex string.
@@ -80,7 +80,7 @@ in
type = types.attrs;
default = {};
example = {
- "STATS_PRINT_PERIOD" = 600;
+ STATS_PRINT_PERIOD = 600;
};
description = ''
Extra configuration options for mtprotoproxy.
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index 7ac4d0c6419d..082953d2f6ab 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -234,7 +234,7 @@ in
extraConfig = mkOption {
type = types.lines;
default = "";
- description = "Extra configuration to put into mumur.ini.";
+ description = "Extra configuration to put into murmur.ini.";
};
};
};
diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix
index ba17f1ba825a..92088623517f 100644
--- a/nixos/modules/services/networking/ndppd.nix
+++ b/nixos/modules/services/networking/ndppd.nix
@@ -142,7 +142,7 @@ in {
messages, and respond to them according to a set of rules.
'';
default = {};
- example = { "eth0".rules."1111::/64" = {}; };
+ example = { eth0.rules."1111::/64" = {}; };
};
};
@@ -153,7 +153,7 @@ in {
'' ];
services.ndppd.proxies = mkIf (cfg.interface != null && cfg.network != null) {
- "${cfg.interface}".rules."${cfg.network}" = {};
+ ${cfg.interface}.rules.${cfg.network} = {};
};
systemd.services.ndppd = {
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 551636a33d25..db4d0e328e2d 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -8,6 +8,8 @@ let
dynamicHostsEnabled =
cfg.dynamicHosts.enable && cfg.dynamicHosts.hostsDirs != {};
+ delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != [];
+
# /var/lib/misc is for dnsmasq.leases.
stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc";
@@ -81,9 +83,9 @@ let
'';
dispatcherTypesSubdirMap = {
- "basic" = "";
- "pre-up" = "pre-up.d/";
- "pre-down" = "pre-down.d/";
+ basic = "";
+ pre-up = "pre-up.d/";
+ pre-down = "pre-down.d/";
};
macAddressOpt = mkOption {
@@ -156,7 +158,7 @@ in {
};
unmanaged = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
description = ''
List of interfaces that will not be managed by NetworkManager.
@@ -177,10 +179,11 @@ in {
basePackages = mkOption {
type = types.attrsOf types.package;
default = { inherit (pkgs)
- networkmanager modemmanager wpa_supplicant crda
+ networkmanager modemmanager crda
networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn
- networkmanager-l2tp networkmanager-iodine; };
+ networkmanager-l2tp networkmanager-iodine; }
+ // optionalAttrs (!delegateWireless) { inherit (pkgs) wpa_supplicant; };
internal = true;
};
@@ -377,8 +380,11 @@ in {
config = mkIf cfg.enable {
assertions = [
- { assertion = config.networking.wireless.enable == false;
- message = "You can not use networking.networkmanager with networking.wireless";
+ { assertion = config.networking.wireless.enable == true -> cfg.unmanaged != [];
+ message = ''
+ You can not use networking.networkmanager with networking.wireless.
+ Except if you mark some interfaces as unmanaged by NetworkManager.
+ '';
}
{ assertion = !dynamicHostsEnabled || (dynamicHostsEnabled && cfg.dns == "dnsmasq");
message = ''
@@ -453,7 +459,7 @@ in {
systemd.packages = cfg.packages;
- systemd.services."NetworkManager" = {
+ systemd.services.NetworkManager = {
wantedBy = [ "network.target" ];
restartTriggers = [ configFile ];
@@ -483,7 +489,7 @@ in {
};
};
- systemd.services."NetworkManager-dispatcher" = {
+ systemd.services.NetworkManager-dispatcher = {
wantedBy = [ "network.target" ];
restartTriggers = [ configFile ];
@@ -491,18 +497,17 @@ in {
path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
};
- # Turn off NixOS' network management
- networking = {
+ # Turn off NixOS' network management when networking is managed entirely by NetworkManager
+ networking = (mkIf (!delegateWireless) {
useDHCP = false;
- # use mkDefault to trigger the assertion about the conflict above
+ # Use mkDefault to trigger the assertion about the conflict above
wireless.enable = mkDefault false;
- };
+ }) // (mkIf cfg.enableStrongSwan {
+ networkmanager.packages = [ pkgs.networkmanager_strongswan ];
+ });
security.polkit.extraConfig = polkitConf;
- networking.networkmanager.packages =
- mkIf cfg.enableStrongSwan [ pkgs.networkmanager_strongswan ];
-
services.dbus.packages =
optional cfg.enableStrongSwan pkgs.strongswanNM ++ cfg.packages;
diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix
index ca458d089dcc..347d87b3f385 100644
--- a/nixos/modules/services/networking/nix-serve.nix
+++ b/nixos/modules/services/networking/nix-serve.nix
@@ -19,7 +19,7 @@ in
};
bindAddress = mkOption {
- type = types.string;
+ type = types.str;
default = "0.0.0.0";
description = ''
IP address where nix-serve will bind its listening socket.
@@ -44,7 +44,7 @@ in
};
extraParams = mkOption {
- type = types.string;
+ type = types.separatedString " ";
default = "";
description = ''
Extra command line parameters for nix-serve.
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index c69b77f9deec..bc0966e6b8e6 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -954,7 +954,7 @@ in
'';
};
- systemd.timers."nsd-dnssec" = mkIf dnssec {
+ systemd.timers.nsd-dnssec = mkIf dnssec {
description = "Automatic DNSSEC key rollover";
wantedBy = [ "nsd.service" ];
@@ -965,7 +965,7 @@ in
};
};
- systemd.services."nsd-dnssec" = mkIf dnssec {
+ systemd.services.nsd-dnssec = mkIf dnssec {
description = "DNSSEC key rollover";
wantedBy = [ "nsd.service" ];
diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix
similarity index 91%
rename from nixos/modules/services/networking/chrony.nix
rename to nixos/modules/services/networking/ntp/chrony.nix
index 77f702577000..c74476c7a155 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/ntp/chrony.nix
@@ -9,11 +9,11 @@ let
keyFile = "${stateDir}/chrony.keys";
configFile = pkgs.writeText "chrony.conf" ''
- ${concatMapStringsSep "\n" (server: "server " + server) cfg.servers}
+ ${concatMapStringsSep "\n" (server: "server " + server + " iburst") cfg.servers}
${optionalString
(cfg.initstepslew.enabled && (cfg.servers != []))
- "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.initstepslew.servers}"
+ "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.servers}"
}
driftfile ${stateDir}/chrony.drift
@@ -24,7 +24,7 @@ let
${cfg.extraConfig}
'';
- chronyFlags = "-m -u chrony -f ${configFile} ${toString cfg.extraFlags}";
+ chronyFlags = "-n -m -u chrony -f ${configFile} ${toString cfg.extraFlags}";
in
{
options = {
@@ -48,7 +48,6 @@ in
default = {
enabled = true;
threshold = 1000; # by default, same threshold as 'ntpd -g' (1000s)
- servers = cfg.servers;
};
description = ''
Allow chronyd to make a rapid measurement of the system clock error at
@@ -76,6 +75,8 @@ in
};
config = mkIf cfg.enable {
+ meta.maintainers = with lib.maintainers; [ thoughtpolice ];
+
environment.systemPackages = [ pkgs.chrony ];
users.groups = singleton
@@ -115,7 +116,7 @@ in
unitConfig.ConditionCapability = "CAP_SYS_TIME";
serviceConfig =
- { Type = "forking";
+ { Type = "simple";
ExecStart = "${pkgs.chrony}/bin/chronyd ${chronyFlags}";
ProtectHome = "yes";
diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix
similarity index 98%
rename from nixos/modules/services/networking/ntpd.nix
rename to nixos/modules/services/networking/ntp/ntpd.nix
index 588d1c6edb07..1197c84f0459 100644
--- a/nixos/modules/services/networking/ntpd.nix
+++ b/nixos/modules/services/networking/ntp/ntpd.nix
@@ -96,6 +96,7 @@ in
###### implementation
config = mkIf config.services.ntp.enable {
+ meta.maintainers = with lib.maintainers; [ thoughtpolice ];
# Make tools such as ntpq available in the system path.
environment.systemPackages = [ pkgs.ntp ];
diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/ntp/openntpd.nix
similarity index 94%
rename from nixos/modules/services/networking/openntpd.nix
rename to nixos/modules/services/networking/ntp/openntpd.nix
index 57638ebc9c01..471d15b1687b 100644
--- a/nixos/modules/services/networking/openntpd.nix
+++ b/nixos/modules/services/networking/ntp/openntpd.nix
@@ -40,7 +40,7 @@ in
};
extraOptions = mkOption {
- type = with types; string;
+ type = with types; separatedString " ";
default = "";
example = "-s";
description = ''
@@ -52,6 +52,7 @@ in
###### implementation
config = mkIf cfg.enable {
+ meta.maintainers = with lib.maintainers; [ thoughtpolice ];
services.timesyncd.enable = mkForce false;
# Add ntpctl to the environment for status checking
diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix
index b061ce34ed2c..7c171281a926 100644
--- a/nixos/modules/services/networking/nylon.nix
+++ b/nixos/modules/services/networking/nylon.nix
@@ -65,7 +65,7 @@ let
};
acceptInterface = mkOption {
- type = types.string;
+ type = types.str;
default = "lo";
description = ''
Tell nylon which interface to listen for client requests on, default is "lo".
@@ -73,7 +73,7 @@ let
};
bindInterface = mkOption {
- type = types.string;
+ type = types.str;
default = "enp3s0f0";
description = ''
Tell nylon which interface to use as an uplink, default is "enp3s0f0".
@@ -89,7 +89,7 @@ let
};
allowedIPRanges = mkOption {
- type = with types; listOf string;
+ type = with types; listOf str;
default = [ "192.168.0.0/16" "127.0.0.1/8" "172.16.0.1/12" "10.0.0.0/8" ];
description = ''
Allowed client IP ranges are evaluated first, defaults to ARIN IPv4 private ranges:
@@ -98,7 +98,7 @@ let
};
deniedIPRanges = mkOption {
- type = with types; listOf string;
+ type = with types; listOf str;
default = [ "0.0.0.0/0" ];
description = ''
Denied client IP ranges, these gets evaluated after the allowed IP ranges, defaults to all IPv4 addresses:
diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index f47122ee70bf..05be97e66a3d 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -182,12 +182,12 @@ in
options = {
username = mkOption {
description = "The username to store inside the credentials file.";
- type = types.string;
+ type = types.str;
};
password = mkOption {
description = "The password to store inside the credentials file.";
- type = types.string;
+ type = types.str;
};
};
});
diff --git a/nixos/modules/services/networking/ostinato.nix b/nixos/modules/services/networking/ostinato.nix
index 13f784dc53c1..5e8cce5b89aa 100644
--- a/nixos/modules/services/networking/ostinato.nix
+++ b/nixos/modules/services/networking/ostinato.nix
@@ -50,7 +50,7 @@ in
rpcServer = {
address = mkOption {
- type = types.string;
+ type = types.str;
default = "0.0.0.0";
description = ''
By default, the Drone RPC server will listen on all interfaces and
@@ -63,7 +63,7 @@ in
portList = {
include = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
example = ''[ "eth*" "lo*" ]'';
description = ''
diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix
index ec69cc838da9..ebfdd9f35b72 100644
--- a/nixos/modules/services/networking/pdns-recursor.nix
+++ b/nixos/modules/services/networking/pdns-recursor.nix
@@ -168,7 +168,7 @@ in {
disable-syslog = true;
};
- users.users."${username}" = {
+ users.users.${username} = {
home = dataDir;
createHome = true;
uid = config.ids.uids.pdns-recursor;
diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix
index 529115a1c6e1..dbe3b7380970 100644
--- a/nixos/modules/services/networking/polipo.nix
+++ b/nixos/modules/services/networking/polipo.nix
@@ -30,7 +30,7 @@ in
};
proxyAddress = mkOption {
- type = types.string;
+ type = types.str;
default = "127.0.0.1";
description = "IP address on which Polipo will listen.";
};
@@ -51,7 +51,7 @@ in
};
parentProxy = mkOption {
- type = types.string;
+ type = types.str;
default = "";
example = "localhost:8124";
description = ''
@@ -61,7 +61,7 @@ in
};
socksParentProxy = mkOption {
- type = types.string;
+ type = types.str;
default = "";
example = "localhost:9050";
description = ''
@@ -74,7 +74,7 @@ in
type = types.lines;
default = "";
description = ''
- Polio configuration. Contents will be added
+ Polio configuration. Contents will be added
verbatim to the configuration file.
'';
};
@@ -111,4 +111,4 @@ in
};
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix
index d8b9e8f8341a..3e7753b9dd35 100644
--- a/nixos/modules/services/networking/pptpd.nix
+++ b/nixos/modules/services/networking/pptpd.nix
@@ -8,13 +8,13 @@ with lib;
enable = mkEnableOption "pptpd, the Point-to-Point Tunneling Protocol daemon";
serverIp = mkOption {
- type = types.string;
+ type = types.str;
description = "The server-side IP address.";
default = "10.124.124.1";
};
clientIpRange = mkOption {
- type = types.string;
+ type = types.str;
description = "The range from which client IPs are drawn.";
default = "10.124.124.2-11";
};
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index 40bd9015b1eb..1ae063aa6bb5 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -297,7 +297,7 @@ in
};
dataDir = mkOption {
- type = types.string;
+ type = types.path;
description = "Directory where Prosody stores its data";
default = "/var/lib/prosody";
};
diff --git a/nixos/modules/services/networking/quicktun.nix b/nixos/modules/services/networking/quicktun.nix
index 5bcf923f909c..fb783c836464 100644
--- a/nixos/modules/services/networking/quicktun.nix
+++ b/nixos/modules/services/networking/quicktun.nix
@@ -93,18 +93,18 @@ with lib;
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
environment = {
- "INTERFACE" = name;
- "TUN_MODE" = toString qtcfg.tunMode;
- "REMOTE_ADDRESS" = qtcfg.remoteAddress;
- "LOCAL_ADDRESS" = qtcfg.localAddress;
- "LOCAL_PORT" = toString qtcfg.localPort;
- "REMOTE_PORT" = toString qtcfg.remotePort;
- "REMOTE_FLOAT" = toString qtcfg.remoteFloat;
- "PRIVATE_KEY" = qtcfg.privateKey;
- "PUBLIC_KEY" = qtcfg.publicKey;
- "TIME_WINDOW" = toString qtcfg.timeWindow;
- "TUN_UP_SCRIPT" = pkgs.writeScript "quicktun-${name}-up.sh" qtcfg.upScript;
- "SUID" = "nobody";
+ INTERFACE = name;
+ TUN_MODE = toString qtcfg.tunMode;
+ REMOTE_ADDRESS = qtcfg.remoteAddress;
+ LOCAL_ADDRESS = qtcfg.localAddress;
+ LOCAL_PORT = toString qtcfg.localPort;
+ REMOTE_PORT = toString qtcfg.remotePort;
+ REMOTE_FLOAT = toString qtcfg.remoteFloat;
+ PRIVATE_KEY = qtcfg.privateKey;
+ PUBLIC_KEY = qtcfg.publicKey;
+ TIME_WINDOW = toString qtcfg.timeWindow;
+ TUN_UP_SCRIPT = pkgs.writeScript "quicktun-${name}-up.sh" qtcfg.upScript;
+ SUID = "nobody";
};
serviceConfig = {
Type = "simple";
diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index d6fabbcd4700..1daced4a6c70 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -41,7 +41,7 @@ in
};
services.radicale.config = mkOption {
- type = types.string;
+ type = types.str;
default = "";
description = ''
Radicale configuration, this will set the service
@@ -50,7 +50,7 @@ in
};
services.radicale.extraArgs = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
description = "Extra arguments passed to the Radicale daemon.";
};
diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index ee7f82ac7bee..9b25aa575837 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -249,7 +249,7 @@ in
systemd.services.resilio = with pkgs; {
description = "Resilio Sync Service";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "local-fs.target" ];
+ after = [ "network.target" ];
serviceConfig = {
Restart = "on-abort";
UMask = "0002";
diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix
index f511a9af2562..e548ec66962a 100644
--- a/nixos/modules/services/networking/shout.nix
+++ b/nixos/modules/services/networking/shout.nix
@@ -35,7 +35,7 @@ in {
};
listenAddress = mkOption {
- type = types.string;
+ type = types.str;
default = "0.0.0.0";
description = "IP interface to listen on for http connections.";
};
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index c41d0edaf17f..d4d0594a9cdd 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -55,7 +55,7 @@ in
description = "Enable the smokeping service";
};
alertConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = ''
to = root@localhost
from = smokeping@localhost
@@ -73,19 +73,20 @@ in
description = "Configuration for alerts.";
};
cgiUrl = mkOption {
- type = types.string;
- default = "http://${cfg.hostName}:${builtins.toString cfg.port}/smokeping.cgi";
+ type = types.str;
+ default = "http://${cfg.hostName}:${toString cfg.port}/smokeping.cgi";
+ defaultText = "http://\${hostName}:\${toString port}/smokeping.cgi";
example = "https://somewhere.example.com/smokeping.cgi";
description = "URL to the smokeping cgi.";
};
config = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.lines;
default = null;
description = "Full smokeping config supplied by the user. Overrides " +
"and replaces any other configuration supplied.";
};
databaseConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = ''
step = 300
pings = 20
@@ -122,14 +123,15 @@ in
description = "Any additional customization not already included.";
};
hostName = mkOption {
- type = types.string;
+ type = types.str;
default = config.networking.hostName;
example = "somewhere.example.com";
description = "DNS name for the urls generated in the cgi.";
};
imgUrl = mkOption {
- type = types.string;
- default = "http://${cfg.hostName}:${builtins.toString cfg.port}/cache";
+ type = types.str;
+ default = "http://${cfg.hostName}:${toString cfg.port}/cache";
+ defaultText = "http://\${hostName}:\${toString port}/cache";
example = "https://somewhere.example.com/cache";
description = "Base url for images generated in the cgi.";
};
@@ -140,19 +142,19 @@ in
description = "DNS name for the urls generated in the cgi.";
};
mailHost = mkOption {
- type = types.string;
+ type = types.str;
default = "";
example = "localhost";
description = "Use this SMTP server to send alerts";
};
owner = mkOption {
- type = types.string;
+ type = types.str;
default = "nobody";
example = "Joe Admin";
description = "Real name of the owner of the instance";
};
ownerEmail = mkOption {
- type = types.string;
+ type = types.str;
default = "no-reply@${cfg.hostName}";
example = "no-reply@yourdomain.com";
description = "Email contact for owner";
@@ -170,7 +172,7 @@ in
description = "TCP port to use for the web server.";
};
presentationConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = ''
+ charts
menu = Charts
@@ -211,12 +213,12 @@ in
description = "presentation graph style";
};
presentationTemplate = mkOption {
- type = types.string;
+ type = types.str;
default = "${pkgs.smokeping}/etc/basepage.html.dist";
description = "Default page layout for the web UI.";
};
probeConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = ''
+ FPing
binary = ${config.security.wrapperDir}/fping
@@ -230,12 +232,12 @@ in
description = "Use this sendmail compatible script to deliver alerts";
};
smokeMailTemplate = mkOption {
- type = types.string;
+ type = types.str;
default = "${cfg.package}/etc/smokemail.dist";
description = "Specify the smokemail template for alerts.";
};
targetConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = ''
probe = FPing
menu = Top
@@ -253,7 +255,7 @@ in
description = "Target configuration";
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "smokeping";
description = "User that runs smokeping and (optionally) thttpd";
};
@@ -275,7 +277,7 @@ in
];
security.wrappers = {
fping.source = "${pkgs.fping}/bin/fping";
- "fping6".source = "${pkgs.fping}/bin/fping6";
+ fping6.source = "${pkgs.fping}/bin/fping6";
};
environment.systemPackages = [ pkgs.fping ];
users.users = singleton {
diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix
index 65df93a00da9..2dc73d81b258 100644
--- a/nixos/modules/services/networking/softether.nix
+++ b/nixos/modules/services/networking/softether.nix
@@ -50,7 +50,7 @@ in
};
dataDir = mkOption {
- type = types.string;
+ type = types.path;
default = "/var/lib/softether";
description = ''
Data directory for SoftEther VPN.
@@ -68,7 +68,7 @@ in
mkMerge [{
environment.systemPackages = [ package ];
- systemd.services."softether-init" = {
+ systemd.services.softether-init = {
description = "SoftEther VPN services initial task";
wantedBy = [ "network.target" ];
serviceConfig = {
diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
index 95a174122d04..dfdfc50d8ae2 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
@@ -63,7 +63,7 @@ rec {
StrongSwan default:
'';
- single = f: name: value: { "${name}" = f value; };
+ single = f: name: value: { ${name} = f value; };
mkStrParam = mkParamOfType types.str;
mkOptionalStrParam = mkStrParam null;
diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix
index 193ad27f035a..2bbb39a76049 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix
@@ -21,7 +21,7 @@ rec {
mkConf = indent : ps :
concatMapStringsSep "\n"
(name:
- let value = ps."${name}";
+ let value = ps.${name};
indentation = replicate indent " ";
in
indentation + (
@@ -58,7 +58,7 @@ rec {
) set);
# Recursively map over every parameter in the given attribute set.
- mapParamsRecursive = mapAttrsRecursiveCond' (as: (!(as ? "_type" && as._type == "param")));
+ mapParamsRecursive = mapAttrsRecursiveCond' (as: (!(as ? _type && as._type == "param")));
mapAttrsRecursiveCond' = cond: f: set:
let
@@ -67,7 +67,7 @@ rec {
g =
name: value:
if isAttrs value && cond value
- then { "${name}" = recurse (path ++ [name]) value; }
+ then { ${name} = recurse (path ++ [name]) value; }
else f (path ++ [name]) name value;
in mapAttrs'' g set;
in recurse [] set;
@@ -77,6 +77,6 @@ rec {
# Extract the options from the given set of parameters.
paramsToOptions = ps :
- mapParamsRecursive (_path: name: param: { "${name}" = param.option; }) ps;
+ mapParamsRecursive (_path: name: param: { ${name} = param.option; }) ps;
}
diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix
index 89a14966eca7..cbc899f2b4d7 100644
--- a/nixos/modules/services/networking/stunnel.nix
+++ b/nixos/modules/services/networking/stunnel.nix
@@ -35,12 +35,12 @@ let
clientConfig = {
options = {
accept = mkOption {
- type = types.string;
+ type = types.str;
description = "IP:Port on which connections should be accepted.";
};
connect = mkOption {
- type = types.string;
+ type = types.str;
description = "IP:Port destination to connect to.";
};
@@ -63,7 +63,7 @@ let
};
verifyHostname = mkOption {
- type = with types; nullOr string;
+ type = with types; nullOr str;
default = null;
description = "If set, stunnel checks if the provided certificate is valid for the given hostname.";
};
@@ -88,13 +88,13 @@ in
};
user = mkOption {
- type = with types; nullOr string;
+ type = with types; nullOr str;
default = "nobody";
description = "The user under which stunnel runs.";
};
group = mkOption {
- type = with types; nullOr string;
+ type = with types; nullOr str;
default = "nogroup";
description = "The group under which stunnel runs.";
};
diff --git a/nixos/modules/services/networking/syncplay.nix b/nixos/modules/services/networking/syncplay.nix
new file mode 100644
index 000000000000..e3147c10502c
--- /dev/null
+++ b/nixos/modules/services/networking/syncplay.nix
@@ -0,0 +1,80 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.syncplay;
+
+ cmdArgs =
+ [ "--port" cfg.port ]
+ ++ optionals (cfg.salt != null) [ "--salt" cfg.salt ]
+ ++ optionals (cfg.certDir != null) [ "--tls" cfg.certDir ];
+
+in
+{
+ options = {
+ services.syncplay = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "If enabled, start the Syncplay server.";
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 8999;
+ description = ''
+ TCP port to bind to.
+ '';
+ };
+
+ salt = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Salt to allow room operator passwords generated by this server
+ instance to still work when the server is restarted.
+ '';
+ };
+
+ certDir = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = ''
+ TLS certificates directory to use for encryption. See
+ .
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "nobody";
+ description = ''
+ User to use when running Syncplay.
+ '';
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "nogroup";
+ description = ''
+ Group to use when running Syncplay.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.syncplay = {
+ description = "Syncplay Service";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network-online.target "];
+
+ serviceConfig = {
+ ExecStart = "${pkgs.syncplay}/bin/syncplay-server ${escapeShellArgs cmdArgs}";
+ User = cfg.user;
+ Group = cfg.group;
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 126f5b7b527b..165fd5970cf8 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -373,7 +373,7 @@ in {
systemd.packages = [ pkgs.syncthing ];
users.users = mkIf (cfg.systemService && cfg.user == defaultUser) {
- "${defaultUser}" =
+ ${defaultUser} =
{ group = cfg.group;
home = cfg.dataDir;
createHome = true;
@@ -383,7 +383,7 @@ in {
};
users.groups = mkIf (cfg.systemService && cfg.group == defaultUser) {
- "${defaultUser}".gid =
+ ${defaultUser}.gid =
config.ids.gids.syncthing;
};
diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix
index 7830dfb1834c..9e97faeebc1e 100644
--- a/nixos/modules/services/networking/toxvpn.nix
+++ b/nixos/modules/services/networking/toxvpn.nix
@@ -8,7 +8,7 @@ with lib;
enable = mkEnableOption "toxvpn running on startup";
localip = mkOption {
- type = types.string;
+ type = types.str;
default = "10.123.123.1";
description = "your ip on the vpn";
};
@@ -20,10 +20,10 @@ with lib;
};
auto_add_peers = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
example = ''[ "toxid1" "toxid2" ]'';
- description = "peers to automacally connect to on startup";
+ description = "peers to automatically connect to on startup";
};
};
};
diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix
index 31e1e65fa9ca..67be60da5673 100644
--- a/nixos/modules/services/networking/vsftpd.nix
+++ b/nixos/modules/services/networking/vsftpd.nix
@@ -164,7 +164,7 @@ in
};
anonymousUmask = mkOption {
- type = types.string;
+ type = types.str;
default = "077";
example = "002";
description = "Anonymous write umask.";
diff --git a/nixos/modules/services/networking/websockify.nix b/nixos/modules/services/networking/websockify.nix
index 4b76350ecf8a..d9177df65bd6 100644
--- a/nixos/modules/services/networking/websockify.nix
+++ b/nixos/modules/services/networking/websockify.nix
@@ -44,9 +44,9 @@ let cfg = config.services.networking.websockify; in {
scriptArgs = "%i";
};
- systemd.targets."default-websockify" = {
+ systemd.targets.default-websockify = {
description = "Target to start all default websockify@ services";
- unitConfig."X-StopOnReconfiguration" = true;
+ unitConfig.X-StopOnReconfiguration = true;
wants = mapAttrsToList (name: value: "websockify@${name}:${toString value}.service") cfg.portMap;
wantedBy = [ "multi-user.target" ];
};
diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix
index 2d7cd5cebb48..8dc6f845ed85 100644
--- a/nixos/modules/services/networking/xinetd.nix
+++ b/nixos/modules/services/networking/xinetd.nix
@@ -53,7 +53,7 @@ in
services.xinetd.extraDefaults = mkOption {
default = "";
- type = types.string;
+ type = types.lines;
description = ''
Additional configuration lines added to the default section of xinetd's configuration.
'';
@@ -70,13 +70,13 @@ in
options = {
name = mkOption {
- type = types.string;
+ type = types.str;
example = "login";
description = "Name of the service.";
};
protocol = mkOption {
- type = types.string;
+ type = types.str;
default = "tcp";
description =
"Protocol of the service. Usually tcp or udp.";
@@ -90,25 +90,25 @@ in
};
user = mkOption {
- type = types.string;
+ type = types.str;
default = "nobody";
description = "User account for the service";
};
server = mkOption {
- type = types.string;
+ type = types.str;
example = "/foo/bin/ftpd";
description = "Path of the program that implements the service.";
};
serverArgs = mkOption {
- type = types.string;
+ type = types.separatedString " ";
default = "";
description = "Command-line arguments for the server program.";
};
flags = mkOption {
- type = types.string;
+ type = types.str;
default = "";
description = "";
};
diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix
index d0a3ed7bb5e0..7dbe51422d96 100644
--- a/nixos/modules/services/networking/xl2tpd.nix
+++ b/nixos/modules/services/networking/xl2tpd.nix
@@ -8,13 +8,13 @@ with lib;
enable = mkEnableOption "xl2tpd, the Layer 2 Tunnelling Protocol Daemon";
serverIp = mkOption {
- type = types.string;
+ type = types.str;
description = "The server-side IP address.";
default = "10.125.125.1";
};
clientIpRange = mkOption {
- type = types.string;
+ type = types.str;
description = "The range from which client IPs are drawn.";
default = "10.125.125.2-11";
};
diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix
index 06ccd7032e6c..78de246a816f 100644
--- a/nixos/modules/services/networking/zerobin.nix
+++ b/nixos/modules/services/networking/zerobin.nix
@@ -74,7 +74,7 @@ in
};
config = mkIf (cfg.enable) {
- users.users."${cfg.user}" =
+ users.users.${cfg.user} =
if cfg.user == "zerobin" then {
isSystemUser = true;
group = cfg.group;
@@ -82,7 +82,7 @@ in
createHome = true;
}
else {};
- users.groups."${cfg.group}" = {};
+ users.groups.${cfg.group} = {};
systemd.services.zerobin = {
enable = true;
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 42c1b9482cb2..3fcae611dc79 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -287,10 +287,20 @@ in
};
environment.systemPackages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper;
- environment.etc."cups".source = "/var/lib/cups";
+ environment.etc.cups.source = "/var/lib/cups";
services.dbus.packages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper;
+ # Allow asswordless printer admin for members of wheel group
+ security.polkit.extraConfig = mkIf polkitEnabled ''
+ polkit.addRule(function(action, subject) {
+ if (action.id == "org.opensuse.cupspkhelper.mechanism.all-edit" &&
+ subject.isInGroup("wheel")){
+ return polkit.Result.YES;
+ }
+ });
+ '';
+
# Cups uses libusb to talk to printers, and does not use the
# linux kernel driver. If the driver is not in a black list, it
# gets loaded, and then cups cannot access the printers.
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index f77b3bcd5921..e43ca014e148 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -143,7 +143,6 @@ in
};
systemd.services.fcron = {
description = "fcron daemon";
- after = [ "local-fs.target" ];
wantedBy = [ "multi-user.target" ];
path = [ pkgs.fcron ];
diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix
index c096af731ad4..43a63aa8fdc2 100644
--- a/nixos/modules/services/search/kibana.nix
+++ b/nixos/modules/services/search/kibana.nix
@@ -9,7 +9,7 @@ let
lt6_6 = builtins.compareVersions cfg.package.version "6.6" < 0;
cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON (
- (filterAttrsRecursive (n: v: v != null) ({
+ (filterAttrsRecursive (n: v: v != null && v != []) ({
server.host = cfg.listenAddress;
server.port = cfg.port;
server.ssl.certificate = cfg.cert;
@@ -150,7 +150,7 @@ in {
description = "Kibana package to use";
default = pkgs.kibana;
defaultText = "pkgs.kibana";
- example = "pkgs.kibana5";
+ example = "pkgs.kibana";
type = types.package;
};
diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix
index b1ca4ab23452..474490391463 100644
--- a/nixos/modules/services/security/fprot.nix
+++ b/nixos/modules/services/security/fprot.nix
@@ -67,7 +67,7 @@ in {
services.cron.systemCronJobs = [ "*/${toString cfg.updater.frequency} * * * * root start fprot-updater" ];
- systemd.services."fprot-updater" = {
+ systemd.services.fprot-updater = {
serviceConfig = {
Type = "oneshot";
RemainAfterExit = false;
diff --git a/nixos/modules/services/security/haka.nix b/nixos/modules/services/security/haka.nix
index b64a1b4d03e0..618e689924fd 100644
--- a/nixos/modules/services/security/haka.nix
+++ b/nixos/modules/services/security/haka.nix
@@ -69,7 +69,7 @@ in
configFile = mkOption {
default = "empty.lua";
example = "/srv/haka/myfilter.lua";
- type = types.string;
+ type = types.str;
description = ''
Specify which configuration file Haka uses.
It can be absolute path or a path relative to the sample directory of
@@ -80,7 +80,7 @@ in
interfaces = mkOption {
default = [ "eth0" ];
example = [ "any" ];
- type = with types; listOf string;
+ type = with types; listOf str;
description = ''
Specify which interface(s) Haka listens to.
Use 'any' to listen to all interfaces.
diff --git a/nixos/modules/services/security/munge.nix b/nixos/modules/services/security/munge.nix
index 1c4f8e20552f..891788864710 100644
--- a/nixos/modules/services/security/munge.nix
+++ b/nixos/modules/services/security/munge.nix
@@ -19,7 +19,7 @@ in
password = mkOption {
default = "/etc/munge/munge.key";
- type = types.string;
+ type = types.path;
description = ''
The path to a daemon's secret key.
'';
diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index 61f203ef9e7d..bb03f7fc9e43 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -284,7 +284,7 @@ in
####################################################
# UPSTREAM Configuration
upstream = mkOption {
- type = with types; coercedTo string (x: [x]) (listOf string);
+ type = with types; coercedTo str (x: [x]) (listOf str);
default = [];
description = ''
The http url(s) of the upstream endpoint or file://
@@ -523,7 +523,7 @@ in
};
keyFile = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.path;
default = null;
description = ''
oauth2_proxy allows passing sensitive configuration via environment variables.
diff --git a/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixos/modules/services/security/oauth2_proxy_nginx.nix
index a9ad5497a657..be6734f439f3 100644
--- a/nixos/modules/services/security/oauth2_proxy_nginx.nix
+++ b/nixos/modules/services/security/oauth2_proxy_nginx.nix
@@ -6,14 +6,14 @@ in
{
options.services.oauth2_proxy.nginx = {
proxy = mkOption {
- type = types.string;
+ type = types.str;
default = config.services.oauth2_proxy.httpAddress;
description = ''
The address of the reverse proxy endpoint for oauth2_proxy
'';
};
virtualHosts = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
description = ''
A list of nginx virtual hosts to put behind the oauth2 proxy
diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix
index 97fbd6aae6e0..61bcd84f2e64 100644
--- a/nixos/modules/services/security/physlock.nix
+++ b/nixos/modules/services/security/physlock.nix
@@ -99,7 +99,7 @@ in
# for physlock -l and physlock -L
environment.systemPackages = [ pkgs.physlock ];
- systemd.services."physlock" = {
+ systemd.services.physlock = {
enable = true;
description = "Physlock";
wantedBy = optional cfg.lockOn.suspend "suspend.target"
diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix
index 1b7a2ad13980..a91060dc659a 100644
--- a/nixos/modules/services/security/sks.nix
+++ b/nixos/modules/services/security/sks.nix
@@ -108,7 +108,7 @@ in {
hkpAddress = "'" + (builtins.concatStringsSep " " cfg.hkpAddress) + "'" ;
hkpPort = builtins.toString cfg.hkpPort;
in {
- "sks-db" = {
+ sks-db = {
description = "SKS database server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index abdc0cd78b4d..ed862387cce1 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -722,7 +722,6 @@ in
systemd.services.tor-init =
{ description = "Tor Daemon Init";
wantedBy = [ "tor.service" ];
- after = [ "local-fs.target" ];
script = ''
install -m 0700 -o tor -g tor -d ${torDirectory} ${torDirectory}/onion
install -m 0750 -o tor -g tor -d ${torRunDirectory}
diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix
index 20d5e3b28eb9..4ced5acd9bd9 100644
--- a/nixos/modules/services/security/usbguard.nix
+++ b/nixos/modules/services/security/usbguard.nix
@@ -195,7 +195,7 @@ in {
description = "USBGuard daemon";
wantedBy = [ "basic.target" ];
- wants = [ "systemd-udevd.service" "local-fs.target" ];
+ wants = [ "systemd-udevd.service" ];
# make sure an empty rule file and required directories exist
preStart = ''
diff --git a/nixos/modules/services/system/cgmanager.nix b/nixos/modules/services/system/cgmanager.nix
index 59d3deced867..d3d57aa76928 100644
--- a/nixos/modules/services/system/cgmanager.nix
+++ b/nixos/modules/services/system/cgmanager.nix
@@ -14,7 +14,6 @@ in {
config = mkIf cfg.enable {
systemd.services.cgmanager = {
wantedBy = [ "multi-user.target" ];
- after = [ "local-fs.target" ];
description = "Cgroup management daemon";
restartIfChanged = false;
serviceConfig = {
diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix
index 3ad555f78ef8..15fe822aec67 100644
--- a/nixos/modules/services/system/cloud-init.nix
+++ b/nixos/modules/services/system/cloud-init.nix
@@ -112,8 +112,6 @@ in
systemd.services.cloud-init-local =
{ description = "Initial cloud-init job (pre-networking)";
wantedBy = [ "multi-user.target" ];
- wants = [ "local-fs.target" ];
- after = [ "local-fs.target" ];
path = path;
serviceConfig =
{ Type = "oneshot";
@@ -127,9 +125,9 @@ in
systemd.services.cloud-init =
{ description = "Initial cloud-init job (metadata service crawler)";
wantedBy = [ "multi-user.target" ];
- wants = [ "local-fs.target" "network-online.target" "cloud-init-local.service"
+ wants = [ "network-online.target" "cloud-init-local.service"
"sshd.service" "sshd-keygen.service" ];
- after = [ "local-fs.target" "network-online.target" "cloud-init-local.service" ];
+ after = [ "network-online.target" "cloud-init-local.service" ];
before = [ "sshd.service" "sshd-keygen.service" ];
requires = [ "network.target "];
path = path;
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index e04580218442..936646a5fd78 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -44,8 +44,10 @@ in
message bus. Specifically, files in the following directories
will be included into their respective DBus configuration paths:
pkg/etc/dbus-1/system.d
+ pkg/share/dbus-1/system.d
pkg/share/dbus-1/system-services
pkg/etc/dbus-1/session.d
+ pkg/share/dbus-1/session.d
pkg/share/dbus-1/services
'';
};
diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix
index 04595fc82fbb..c3c0b432b494 100644
--- a/nixos/modules/services/system/localtime.nix
+++ b/nixos/modules/services/system/localtime.nix
@@ -22,7 +22,7 @@ in {
config = mkIf cfg.enable {
services.geoclue2 = {
enable = true;
- appConfig."localtime" = {
+ appConfig.localtime = {
isAllowed = true;
isSystem = true;
};
diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index 48ec4d692e2f..0c72505395dd 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -173,12 +173,16 @@ in {
# Provide a default set of `extraPackages`.
services.deluge.extraPackages = with pkgs; [ unzip gnutar xz p7zip bzip2 ];
- systemd.tmpfiles.rules = [ "d '${configDir}' 0770 ${cfg.user} ${cfg.group}" ]
- ++ optional (cfg.config ? "download_location")
+ systemd.tmpfiles.rules = [
+ "d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group}"
+ "d '${cfg.dataDir}/.config' 0770 ${cfg.user} ${cfg.group}"
+ "d '${cfg.dataDir}/.config/deluge' 0770 ${cfg.user} ${cfg.group}"
+ ]
+ ++ optional (cfg.config ? download_location)
"d '${cfg.config.download_location}' 0770 ${cfg.user} ${cfg.group}"
- ++ optional (cfg.config ? "torrentfiles_location")
+ ++ optional (cfg.config ? torrentfiles_location)
"d '${cfg.config.torrentfiles_location}' 0770 ${cfg.user} ${cfg.group}"
- ++ optional (cfg.config ? "move_completed_path")
+ ++ optional (cfg.config ? move_completed_path)
"d '${cfg.config.move_completed_path}' 0770 ${cfg.user} ${cfg.group}";
systemd.services.deluged = {
@@ -237,7 +241,6 @@ in {
group = cfg.group;
uid = config.ids.uids.deluge;
home = cfg.dataDir;
- createHome = true;
description = "Deluge Daemon user";
};
};
diff --git a/nixos/modules/services/torrent/flexget.nix b/nixos/modules/services/torrent/flexget.nix
index ca63f529a5df..6ac85f8fa178 100644
--- a/nixos/modules/services/torrent/flexget.nix
+++ b/nixos/modules/services/torrent/flexget.nix
@@ -19,7 +19,7 @@ in {
user = mkOption {
default = "deluge";
example = "some_user";
- type = types.string;
+ type = types.str;
description = "The user under which to run flexget.";
};
@@ -33,7 +33,7 @@ in {
interval = mkOption {
default = "10m";
example = "1h";
- type = types.string;
+ type = types.str;
description = "When to perform a flexget run. See man 7 systemd.time for the format.";
};
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index a94a471361ef..7409eb8cdcbe 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -102,7 +102,7 @@ in
config = mkIf cfg.enable {
systemd.services.transmission = {
description = "Transmission BitTorrent Service";
- after = [ "local-fs.target" "network.target" ] ++ optional apparmor "apparmor.service";
+ after = [ "network.target" ] ++ optional apparmor "apparmor.service";
requires = mkIf apparmor [ "apparmor.service" ];
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index b50de496e975..f127d8a0276d 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -92,7 +92,7 @@ in
restartIfChanged = false;
};
- systemd.services."console-getty" =
+ systemd.services.console-getty =
{ serviceConfig.ExecStart = [
"" # override upstream default with an empty ExecStart
(gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM")
diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix
index cf163271d276..59185fdbd36f 100644
--- a/nixos/modules/services/web-apps/atlassian/confluence.nix
+++ b/nixos/modules/services/web-apps/atlassian/confluence.nix
@@ -142,12 +142,12 @@ in
};
config = mkIf cfg.enable {
- users.users."${cfg.user}" = {
+ users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
};
- users.groups."${cfg.group}" = {};
+ users.groups.${cfg.group} = {};
systemd.tmpfiles.rules = [
"d '${cfg.home}' - ${cfg.user} - - -"
diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
index 020ca8d89dbb..ceab656b15e8 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -110,12 +110,12 @@ in
};
config = mkIf cfg.enable {
- users.users."${cfg.user}" = {
+ users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
};
- users.groups."${cfg.group}" = {};
+ users.groups.${cfg.group} = {};
systemd.tmpfiles.rules = [
"d '${cfg.home}' - ${cfg.user} ${cfg.group} - -"
diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix
index b0019e77ac27..ce04982e8a9e 100644
--- a/nixos/modules/services/web-apps/atlassian/jira.nix
+++ b/nixos/modules/services/web-apps/atlassian/jira.nix
@@ -148,12 +148,12 @@ in
};
config = mkIf cfg.enable {
- users.users."${cfg.user}" = {
+ users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
};
- users.groups."${cfg.group}" = {};
+ users.groups.${cfg.group} = {};
systemd.tmpfiles.rules = [
"d '${cfg.home}' - ${cfg.user} - - -"
diff --git a/nixos/modules/services/web-apps/frab.nix b/nixos/modules/services/web-apps/frab.nix
index e885dc69b3c0..7914e5cc0ee1 100644
--- a/nixos/modules/services/web-apps/frab.nix
+++ b/nixos/modules/services/web-apps/frab.nix
@@ -19,7 +19,7 @@ let
RAILS_SERVE_STATIC_FILES = "1";
} // cfg.extraEnvironment;
- frab-rake = pkgs.stdenv.mkDerivation rec {
+ frab-rake = pkgs.stdenv.mkDerivation {
name = "frab-rake";
buildInputs = [ package.env pkgs.makeWrapper ];
phases = "installPhase fixupPhase";
diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
index 95c8fb160510..d9ad7e9e3d39 100644
--- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
+++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
@@ -165,7 +165,7 @@ in {
config = mkIf cfg.enable {
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
- "${poolName}" = {
+ ${poolName} = {
user = "icingaweb2";
phpOptions = ''
extension = ${pkgs.phpPackages.imagick}/lib/php/extensions/imagick.so
@@ -189,7 +189,7 @@ in {
services.nginx = {
enable = true;
virtualHosts = mkIf (cfg.virtualHost != null) {
- "${cfg.virtualHost}" = {
+ ${cfg.virtualHost} = {
root = "${pkgs.icingaweb2}/public";
extraConfig = ''
@@ -216,7 +216,7 @@ in {
# /etc/icingaweb2
environment.etc = let
- doModule = name: optionalAttrs (cfg.modules."${name}".enable) { "icingaweb2/enabledModules/${name}".source = "${pkgs.icingaweb2}/modules/${name}"; };
+ doModule = name: optionalAttrs (cfg.modules.${name}.enable) { "icingaweb2/enabledModules/${name}".source = "${pkgs.icingaweb2}/modules/${name}"; };
in {}
# Module packages
// (mapAttrs' (k: v: nameValuePair "icingaweb2/enabledModules/${k}" { source = v; }) cfg.modulePackages)
diff --git a/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix b/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix
index 167e5e389568..e9c1d4ffe5ea 100644
--- a/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix
+++ b/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix
@@ -58,7 +58,7 @@ in {
};
backends = mkOption {
- default = { "icinga" = { resource = "icinga_ido"; }; };
+ default = { icinga = { resource = "icinga_ido"; }; };
description = "Monitoring backends to define";
type = attrsOf (submodule ({ name, ... }: {
options = {
diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix
index 2797feb32ebf..68b57a9b90dd 100644
--- a/nixos/modules/services/web-apps/limesurvey.nix
+++ b/nixos/modules/services/web-apps/limesurvey.nix
@@ -277,7 +277,7 @@ in
systemd.services.httpd.after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
- users.users."${user}".group = group;
+ users.users.${user}.group = group;
};
}
diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix
index f2516c67c6b3..7f71b86a6fe6 100644
--- a/nixos/modules/services/web-apps/moodle.nix
+++ b/nixos/modules/services/web-apps/moodle.nix
@@ -18,7 +18,7 @@ let
global $CFG;
$CFG = new stdClass();
- $CFG->dbtype = '${ { "mysql" = "mariadb"; "pgsql" = "pgsql"; }.${cfg.database.type} }';
+ $CFG->dbtype = '${ { mysql = "mariadb"; pgsql = "pgsql"; }.${cfg.database.type} }';
$CFG->dblibrary = 'native';
$CFG->dbhost = '${cfg.database.host}';
$CFG->dbname = '${cfg.database.name}';
@@ -92,8 +92,8 @@ in
type = types.int;
description = "Database host port.";
default = {
- "mysql" = 3306;
- "pgsql" = 5432;
+ mysql = 3306;
+ pgsql = 5432;
}.${cfg.database.type};
defaultText = "3306";
};
@@ -294,7 +294,7 @@ in
systemd.services.httpd.after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
- users.users."${user}".group = group;
+ users.users.${user}.group = group;
};
}
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index ada14ad39291..5f5469e48507 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -102,10 +102,10 @@ in {
phpOptions = mkOption {
type = types.attrsOf types.str;
default = {
- "short_open_tag" = "Off";
- "expose_php" = "Off";
- "error_reporting" = "E_ALL & ~E_DEPRECATED & ~E_STRICT";
- "display_errors" = "stderr";
+ short_open_tag = "Off";
+ expose_php = "Off";
+ error_reporting = "E_ALL & ~E_DEPRECATED & ~E_STRICT";
+ display_errors = "stderr";
"opcache.enable_cli" = "1";
"opcache.interned_strings_buffer" = "8";
"opcache.max_accelerated_files" = "10000";
@@ -113,7 +113,7 @@ in {
"opcache.revalidate_freq" = "1";
"opcache.fast_shutdown" = "1";
"openssl.cafile" = "/etc/ssl/certs/ca-certificates.crt";
- "catch_workers_output" = "yes";
+ catch_workers_output = "yes";
};
description = ''
Options for PHP's php.ini file for nextcloud.
@@ -289,7 +289,7 @@ in {
];
}
- { systemd.timers."nextcloud-cron" = {
+ { systemd.timers.nextcloud-cron = {
wantedBy = [ "timers.target" ];
timerConfig.OnBootSec = "5m";
timerConfig.OnUnitActiveSec = "15m";
@@ -297,7 +297,7 @@ in {
};
systemd.services = {
- "nextcloud-setup" = let
+ nextcloud-setup = let
c = cfg.config;
writePhpArrary = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]";
overrideConfig = pkgs.writeText "nextcloud-config.php" ''
@@ -397,13 +397,13 @@ in {
'';
serviceConfig.Type = "oneshot";
};
- "nextcloud-cron" = {
+ nextcloud-cron = {
environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config";
serviceConfig.Type = "oneshot";
serviceConfig.User = "nextcloud";
serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${pkgs.nextcloud}/cron.php";
};
- "nextcloud-update-plugins" = mkIf cfg.autoUpdateApps.enable {
+ nextcloud-update-plugins = mkIf cfg.autoUpdateApps.enable {
serviceConfig.Type = "oneshot";
serviceConfig.ExecStart = "${occ}/bin/nextcloud-occ app:update --all";
startAt = cfg.autoUpdateApps.startAt;
@@ -441,7 +441,7 @@ in {
services.nginx = {
enable = true;
virtualHosts = {
- "${cfg.hostName}" = {
+ ${cfg.hostName} = {
root = pkgs.nextcloud;
locations = {
"= /robots.txt" = {
diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix
index 052dbed6d4f8..3af97e146d0a 100644
--- a/nixos/modules/services/web-apps/nexus.nix
+++ b/nixos/modules/services/web-apps/nexus.nix
@@ -80,14 +80,14 @@ in
};
config = mkIf cfg.enable {
- users.users."${cfg.user}" = {
+ users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
home = cfg.home;
createHome = true;
};
- users.groups."${cfg.group}" = {};
+ users.groups.${cfg.group} = {};
systemd.services.nexus = {
description = "Sonatype Nexus3";
diff --git a/nixos/modules/services/web-apps/pgpkeyserver-lite.nix b/nixos/modules/services/web-apps/pgpkeyserver-lite.nix
index 93f69bd12651..ad70ba70bbef 100644
--- a/nixos/modules/services/web-apps/pgpkeyserver-lite.nix
+++ b/nixos/modules/services/web-apps/pgpkeyserver-lite.nix
@@ -60,7 +60,7 @@ in
services.nginx.virtualHosts = let
hkpPort = builtins.toString cfg.hkpPort;
in {
- "${cfg.hostname}" = {
+ ${cfg.hostname} = {
root = webPkg;
locations = {
"/pks".extraConfig = ''
diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix
index 6a1b4143bc16..1e7882488ac6 100644
--- a/nixos/modules/services/web-apps/restya-board.nix
+++ b/nixos/modules/services/web-apps/restya-board.nix
@@ -179,8 +179,9 @@ in
config = mkIf cfg.enable {
services.phpfpm.pools = {
- "${poolName}" = {
+ ${poolName} = {
inherit (cfg) user group;
+
phpOptions = ''
date.timezone = "CET"
@@ -207,7 +208,7 @@ in
};
services.nginx.enable = true;
- services.nginx.virtualHosts."${cfg.virtualHost.serverName}" = {
+ services.nginx.virtualHosts.${cfg.virtualHost.serverName} = {
listen = [ { addr = cfg.virtualHost.listenHost; port = cfg.virtualHost.listenPort; } ];
serverName = cfg.virtualHost.serverName;
root = runDir;
@@ -215,7 +216,6 @@ in
index index.html index.php;
gzip on;
- gzip_disable "msie6";
gzip_comp_level 6;
gzip_min_length 1100;
diff --git a/nixos/modules/services/web-apps/selfoss.nix b/nixos/modules/services/web-apps/selfoss.nix
index 56b7cafffe8b..d5a660ebf289 100644
--- a/nixos/modules/services/web-apps/selfoss.nix
+++ b/nixos/modules/services/web-apps/selfoss.nix
@@ -114,9 +114,8 @@ in
};
config = mkIf cfg.enable {
-
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
- "${poolName}" = {
+ ${poolName} = {
user = "nginx";
settings = mapAttrs (name: mkDefault) {
"listen.owner" = "nginx";
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index 59b0ee1addc6..abe4748591e9 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -520,7 +520,7 @@ let
];
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
- "${poolName}" = {
+ ${poolName} = {
inherit (cfg) user;
settings = mapAttrs (name: mkDefault) {
"listen.owner" = "nginx";
@@ -541,7 +541,7 @@ let
services.nginx = mkIf (cfg.virtualHost != null) {
enable = true;
virtualHosts = {
- "${cfg.virtualHost}" = {
+ ${cfg.virtualHost} = {
root = "${cfg.root}";
locations."/" = {
diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix
index 98dc84588189..884754370587 100644
--- a/nixos/modules/services/web-apps/wordpress.nix
+++ b/nixos/modules/services/web-apps/wordpress.nix
@@ -133,7 +133,7 @@ let
'';
};
- database = rec {
+ database = {
host = mkOption {
type = types.str;
default = "localhost";
diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix
index 691cbdc8d1d5..830edac20bac 100644
--- a/nixos/modules/services/web-apps/youtrack.nix
+++ b/nixos/modules/services/web-apps/youtrack.nix
@@ -28,28 +28,28 @@ in
The interface youtrack will listen on.
'';
default = "127.0.0.1";
- type = types.string;
+ type = types.str;
};
baseUrl = mkOption {
description = ''
Base URL for youtrack. Will be auto-detected and stored in database.
'';
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
};
extraParams = mkOption {
default = {};
description = ''
- Extra parameters to pass to youtrack. See
+ Extra parameters to pass to youtrack. See
https://www.jetbrains.com/help/youtrack/standalone/YouTrack-Java-Start-Parameters.html
for more information.
'';
example = {
"jetbrains.youtrack.overrideRootPassword" = "tortuga";
};
- type = types.attrsOf types.string;
+ type = types.attrsOf types.str;
};
package = mkOption {
@@ -73,7 +73,7 @@ in
description = ''
Where to keep the youtrack database.
'';
- type = types.string;
+ type = types.path;
default = "/var/lib/youtrack";
};
@@ -83,7 +83,7 @@ in
If null, do not setup anything.
'';
default = null;
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
};
jvmOpts = mkOption {
@@ -92,7 +92,7 @@ in
See https://www.jetbrains.com/help/youtrack/standalone/Configure-JVM-Options.html
for more information.
'';
- type = types.string;
+ type = types.separatedString " ";
example = "-XX:MetaspaceSize=250m";
default = "";
};
@@ -101,7 +101,7 @@ in
description = ''
Maximum Java heap size
'';
- type = types.string;
+ type = types.str;
default = "1g";
};
@@ -109,7 +109,7 @@ in
description = ''
Maximum java Metaspace memory.
'';
- type = types.string;
+ type = types.str;
default = "350m";
};
};
diff --git a/nixos/modules/services/web-apps/zabbix.nix b/nixos/modules/services/web-apps/zabbix.nix
index fa358ffafbc3..09538726b7cd 100644
--- a/nixos/modules/services/web-apps/zabbix.nix
+++ b/nixos/modules/services/web-apps/zabbix.nix
@@ -16,7 +16,7 @@ let
- SetHandler "proxy:unix:${fpm.listen}|fcgi://localhost/"
+ SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
AllowOverride all
diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
index 536e707137c6..9d747549c274 100644
--- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -33,7 +33,7 @@ with lib;
description = "port to listen on";
};
ip = mkOption {
- type = types.string;
+ type = types.str;
default = "*";
description = "Ip to listen on. 0.0.0.0 for ipv4 only, * for all.";
};
diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index 6a1db6087840..132c50735d96 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -27,13 +27,13 @@ in {
ca = mkOption {
default = "https://acme-v02.api.letsencrypt.org/directory";
example = "https://acme-staging-v02.api.letsencrypt.org/directory";
- type = types.string;
+ type = types.str;
description = "Certificate authority ACME server. The default (Let's Encrypt production server) should be fine for most people.";
};
email = mkOption {
default = "";
- type = types.string;
+ type = types.str;
description = "Email address (for Let's Encrypt certificate)";
};
diff --git a/nixos/modules/services/web-servers/darkhttpd.nix b/nixos/modules/services/web-servers/darkhttpd.nix
index 80870118c334..d6649fd472d9 100644
--- a/nixos/modules/services/web-servers/darkhttpd.nix
+++ b/nixos/modules/services/web-servers/darkhttpd.nix
@@ -67,7 +67,7 @@ in {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
DynamicUser = true;
- ExecStart = "${cfg.package}/bin/darkhttpd ${args}";
+ ExecStart = "${pkgs.darkhttpd}/bin/darkhttpd ${args}";
AmbientCapabilities = lib.mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
Restart = "on-failure";
RestartSec = "2s";
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 5c65a2388d6f..e597f34700ae 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -94,7 +94,6 @@ let
${optionalString (cfg.recommendedGzipSettings) ''
gzip on;
- gzip_disable "msie6";
gzip_proxied any;
gzip_comp_level 5;
gzip_types
@@ -473,7 +472,7 @@ in
};
clientMaxBodySize = mkOption {
- type = types.string;
+ type = types.str;
default = "10m";
description = "Set nginx global client_max_body_size.";
};
diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index e95e71e0d997..4ab7e3f0c0a9 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -36,7 +36,7 @@ let
poolOpts = { name, ... }:
let
- poolOpts = cfg.pools."${name}";
+ poolOpts = cfg.pools.${name};
in
{
options = {
diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix
index 5bac895d43ac..8de7df0d446c 100644
--- a/nixos/modules/services/web-servers/traefik.nix
+++ b/nixos/modules/services/web-servers/traefik.nix
@@ -67,7 +67,7 @@ in {
group = mkOption {
default = "traefik";
- type = types.string;
+ type = types.str;
example = "docker";
description = ''
Set the group that traefik runs under.
diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix
index 3f858d90fa46..af70f32f32d0 100644
--- a/nixos/modules/services/web-servers/uwsgi.nix
+++ b/nixos/modules/services/web-servers/uwsgi.nix
@@ -72,7 +72,7 @@ in {
};
runDir = mkOption {
- type = types.string;
+ type = types.path;
default = "/run/uwsgi";
description = "Where uWSGI communication sockets can live";
};
diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix
index 4cad2a2ff777..3abd506827c0 100644
--- a/nixos/modules/services/web-servers/zope2.nix
+++ b/nixos/modules/services/web-servers/zope2.nix
@@ -11,7 +11,7 @@ let
name = mkOption {
default = "${name}";
- type = types.string;
+ type = types.str;
description = "The name of the zope2 instance. If undefined, the name of the attribute set will be used.";
};
@@ -23,19 +23,19 @@ let
http_address = mkOption {
default = "localhost:8080";
- type = types.string;
+ type = types.str;
description = "Give a port and address for the HTTP server.";
};
user = mkOption {
default = "zope2";
- type = types.string;
+ type = types.str;
description = "The name of the effective user for the Zope process.";
};
clientHome = mkOption {
default = "/var/lib/zope2/${name}";
- type = types.string;
+ type = types.path;
description = "Home directory of zope2 instance.";
};
extra = mkOption {
@@ -52,7 +52,7 @@ let
'';
- type = types.string;
+ type = types.lines;
description = "Extra zope.conf";
};
diff --git a/nixos/modules/services/x11/clight.nix b/nixos/modules/services/x11/clight.nix
index 6ec395bb05ec..4daf6d8d9db7 100644
--- a/nixos/modules/services/x11/clight.nix
+++ b/nixos/modules/services/x11/clight.nix
@@ -75,7 +75,7 @@ in {
longitude = mkDefault config.location.longitude;
});
- services.geoclue2.appConfig."clightc" = {
+ services.geoclue2.appConfig.clightc = {
isAllowed = true;
isSystem = true;
};
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 527e4b18045b..9914b6687090 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -31,7 +31,7 @@ in
e.efl e.enlightenment
e.terminology e.econnman
pkgs.xorg.xauth # used by kdesu
- pkgs.gtk2 # To get GTK+'s themes.
+ pkgs.gtk2 # To get GTK's themes.
pkgs.tango-icon-theme
pkgs.gnome2.gnome_icon_theme
@@ -48,7 +48,7 @@ in
services.xserver.desktopManager.session = [
{ name = "Enlightenment";
start = ''
- # Set GTK_DATA_PREFIX so that GTK+ can find the themes
+ # Set GTK_DATA_PREFIX so that GTK can find the themes
export GTK_DATA_PREFIX=${config.system.path}
# find theme engines
export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 0caa93ad217f..30c5250221c1 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -37,7 +37,7 @@ let
picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png'
[org.gnome.shell]
- favorite-apps=[ 'org.gnome.Epiphany.desktop', 'evolution.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]
+ favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]
${cfg.extraGSettingsOverrides}
EOF
@@ -227,25 +227,29 @@ in
(mkIf serviceCfg.core-shell.enable {
services.colord.enable = mkDefault true;
+ services.gnome3.chrome-gnome-shell.enable = mkDefault true;
services.gnome3.glib-networking.enable = true;
services.gnome3.gnome-remote-desktop.enable = mkDefault true;
services.gnome3.gnome-settings-daemon.enable = true;
services.gnome3.gnome-user-share.enable = mkDefault true;
services.gnome3.rygel.enable = mkDefault true;
services.gvfs.enable = true;
+ services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
services.telepathy.enable = mkDefault true;
systemd.packages = [ pkgs.gnome3.vino ];
- services.dbus.packages =
- optional config.services.printing.enable pkgs.system-config-printer;
+
+ services.avahi.enable = mkDefault true;
+
+ xdg.portal.extraPortals = [ pkgs.gnome3.gnome-shell ];
services.geoclue2.enable = mkDefault true;
services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent
- services.geoclue2.appConfig."gnome-datetime-panel" = {
+ services.geoclue2.appConfig.gnome-datetime-panel = {
isAllowed = true;
isSystem = true;
};
- services.geoclue2.appConfig."gnome-color-panel" = {
+ services.geoclue2.appConfig.gnome-color-panel = {
isAllowed = true;
isSystem = true;
};
@@ -261,16 +265,19 @@ in
source-sans-pro
];
+ # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-shell.bst
environment.systemPackages = with pkgs.gnome3; [
adwaita-icon-theme
gnome-backgrounds
gnome-bluetooth
+ gnome-color-manager
gnome-control-center
gnome-getting-started-docs
gnome-shell
gnome-shell-extensions
gnome-themes-extra
gnome-user-docs
+ pkgs.orca
pkgs.glib # for gsettings
pkgs.gnome-menus
pkgs.gtk3.out # for gtk-launch
@@ -281,23 +288,43 @@ in
];
})
+ # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-utilities.bst
(mkIf serviceCfg.core-utilities.enable {
environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
- baobab eog epiphany evince gucharmap nautilus totem yelp gnome-calculator
- gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-monitor simple-scan
- gnome-terminal evolution file-roller gedit gnome-clocks gnome-music gnome-tweaks
- pkgs.gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
- gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool gnome-packagekit
- gnome-software gnome-power-manager gnome-todo pkgs.gnome-usage
+ baobab
+ cheese
+ eog
+ epiphany
+ geary
+ gedit
+ gnome-calculator
+ gnome-calendar
+ gnome-characters
+ gnome-clocks
+ gnome-contacts
+ gnome-font-viewer
+ gnome-logs
+ gnome-maps
+ gnome-music
+ gnome-photos
+ gnome-screenshot
+ gnome-software
+ gnome-system-monitor
+ gnome-weather
+ nautilus
+ simple-scan
+ totem
+ yelp
+ # Unsure if sensible for NixOS
+ /* gnome-boxes */
] config.environment.gnome3.excludePackages);
# Enable default programs
programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
programs.gnome-disks.enable = mkDefault true;
- programs.gnome-documents.enable = mkDefault true;
programs.gnome-terminal.enable = mkDefault true;
- services.gnome3.seahorse.enable = mkDefault true;
+ programs.seahorse.enable = mkDefault true;
services.gnome3.sushi.enable = mkDefault true;
# Let nautilus find extensions
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index e1084b0053cc..d7a871c9c704 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -48,7 +48,7 @@ in
name = "mate";
bgSupport = true;
start = ''
- # Set GTK_DATA_PREFIX so that GTK+ can find the themes
+ # Set GTK_DATA_PREFIX so that GTK can find the themes
export GTK_DATA_PREFIX=${config.system.path}
# Find theme engines
@@ -98,6 +98,9 @@ in
programs.bash.vteIntegration = mkDefault true;
programs.zsh.vteIntegration = mkDefault true;
+ # Mate uses this for printing
+ programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
+
services.gnome3.at-spi2-core.enable = true;
services.gnome3.gnome-keyring.enable = true;
services.gnome3.gnome-settings-daemon.enable = true;
@@ -105,7 +108,7 @@ in
services.gvfs.enable = true;
services.upower.enable = config.powerManagement.enable;
- security.pam.services."mate-screensaver".unixAuth = true;
+ security.pam.services.mate-screensaver.unixAuth = true;
environment.pathsToLink = [ "/share" ];
};
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index ae23015d2005..e313a194c345 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -113,9 +113,9 @@ in
services.colord.enable = mkDefault true;
services.pantheon.files.enable = mkDefault true;
services.tumbler.enable = mkDefault true;
- services.dbus.packages = mkMerge [
- ([ pkgs.pantheon.switchboard-plug-power ])
- (mkIf config.services.printing.enable ([pkgs.system-config-printer]) )
+ services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
+ services.dbus.packages = [
+ pkgs.pantheon.switchboard-plug-power
];
services.pantheon.contractor.enable = mkDefault true;
services.gnome3.at-spi2-core.enable = true;
@@ -145,6 +145,9 @@ in
programs.dconf.enable = true;
programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
+ # Otherwise you can't store NetworkManager Secrets with
+ # "Store the password only for this user"
+ programs.nm-applet.enable = true;
# Shell integration for VTE terminals
programs.bash.vteIntegration = mkDefault true;
@@ -191,6 +194,7 @@ in
gtk3.out
hicolor-icon-theme
lightlocker
+ onboard
plank
qgnomeplatform
shared-mime-info
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 94a307ae1007..b10755df4dc2 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -72,7 +72,7 @@ in
security.wrappers = {
kcheckpass.source = "${lib.getBin plasma5.kscreenlocker}/libexec/kcheckpass";
- "start_kdeinit".source = "${lib.getBin pkgs.kinit}/libexec/kf5/start_kdeinit";
+ start_kdeinit.source = "${lib.getBin pkgs.kinit}/libexec/kf5/start_kdeinit";
kwin_wayland = {
source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";
capabilities = "cap_sys_nice+ep";
@@ -210,8 +210,8 @@ in
# Enable helpful DBus services.
services.udisks2.enable = true;
services.upower.enable = config.powerManagement.enable;
- services.dbus.packages =
- mkIf config.services.printing.enable [ pkgs.system-config-printer ];
+ services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
+ services.xserver.libinput.enable = mkDefault true;
# Extra UDEV rules used by Solid
services.udev.packages = [
diff --git a/nixos/modules/services/x11/desktop-managers/surf-display.nix b/nixos/modules/services/x11/desktop-managers/surf-display.nix
index 232bbf5c55d4..140dde828daa 100644
--- a/nixos/modules/services/x11/desktop-managers/surf-display.nix
+++ b/nixos/modules/services/x11/desktop-managers/surf-display.nix
@@ -48,7 +48,7 @@ in {
enable = mkEnableOption "surf-display as a kiosk browser session";
defaultWwwUri = mkOption {
- type = types.string;
+ type = types.str;
default = "${pkgs.surf-display}/share/surf-display/empty-page.html";
example = "https://www.example.com/";
description = "Default URI to display.";
@@ -69,7 +69,7 @@ in {
};
screensaverSettings = mkOption {
- type = types.string;
+ type = types.separatedString " ";
default = "";
description = ''
Screensaver settings, see man 1 xset for possible options.
@@ -77,7 +77,7 @@ in {
};
pointerButtonMap = mkOption {
- type = types.string;
+ type = types.str;
default = "1 0 0 4 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0";
description = ''
Disable right and middle pointer device click in browser sessions
@@ -87,14 +87,14 @@ in {
};
hideIdlePointer = mkOption {
- type = types.string;
+ type = types.str;
default = "yes";
example = "no";
description = "Hide idle mouse pointer.";
};
extraConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = "";
example = ''
# Enforce fixed resolution for all displays (default: not set):
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 1102f73d1ac3..e3249aef50c7 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -48,7 +48,7 @@ in
config = mkIf cfg.enable {
environment.systemPackages = with pkgs.xfce // pkgs; [
- # Get GTK+ themes and gtk-update-icon-cache
+ # Get GTK themes and gtk-update-icon-cache
gtk2.out
# Supplies some abstract icons such as:
@@ -107,10 +107,10 @@ in
start = ''
${cfg.extraSessionCommands}
- # Set GTK_PATH so that GTK+ can find the theme engines.
+ # Set GTK_PATH so that GTK can find the theme engines.
export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0"
- # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
+ # Set GTK_DATA_PREFIX so that GTK can find the Xfce themes.
export GTK_DATA_PREFIX=${config.system.path}
${pkgs.runtimeShell} ${pkgs.xfce.xinitrc} &
diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
index 16329c093f98..57d1268d655a 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
@@ -114,10 +114,10 @@ in
name = "xfce4-14";
bgSupport = true;
start = ''
- # Set GTK_PATH so that GTK+ can find the theme engines.
+ # Set GTK_PATH so that GTK can find the theme engines.
export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0"
- # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
+ # Set GTK_DATA_PREFIX so that GTK can find the Xfce themes.
export GTK_DATA_PREFIX=${config.system.path}
${pkgs.runtimeShell} ${pkgs.xfce4-14.xinitrc} &
@@ -137,8 +137,7 @@ in
services.gvfs.enable = true;
services.gvfs.package = pkgs.xfce.gvfs;
services.tumbler.enable = true;
- services.dbus.packages =
- optional config.services.printing.enable pkgs.system-config-printer;
+ services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager
# Enable default programs
diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
index ea441fbbe715..1408df312950 100644
--- a/nixos/modules/services/x11/desktop-managers/xterm.nix
+++ b/nixos/modules/services/x11/desktop-managers/xterm.nix
@@ -5,7 +5,6 @@ with lib;
let
cfg = config.services.xserver.desktopManager.xterm;
- xserverEnabled = config.services.xserver.enable;
in
@@ -14,8 +13,7 @@ in
services.xserver.desktopManager.xterm.enable = mkOption {
type = types.bool;
- default = xserverEnabled;
- defaultText = "config.services.xserver.enable";
+ default = (versionOlder config.system.stateVersion "19.09");
description = "Enable a xterm terminal as a desktop manager.";
};
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index afa0cebbc527..c26a5b615353 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -6,7 +6,7 @@ let
xcfg = config.services.xserver;
dmcfg = xcfg.displayManager;
- xEnv = config.systemd.services."display-manager".environment;
+ xEnv = config.systemd.services.display-manager.environment;
cfg = dmcfg.lightdm;
dmDefault = xcfg.desktopManager.default;
@@ -114,7 +114,7 @@ in
};
name = mkOption {
- type = types.string;
+ type = types.str;
description = ''
The name of a .desktop file in the directory specified
in the 'package' option.
@@ -232,36 +232,41 @@ in
# Enable the accounts daemon to find lightdm's dbus interface
environment.systemPackages = [ lightdm ];
- security.pam.services.lightdm = {
- allowNullPassword = true;
- startSession = true;
- };
- security.pam.services.lightdm-greeter = {
- allowNullPassword = true;
- startSession = true;
- text = ''
- auth required pam_env.so envfile=${config.system.build.pamEnvironment}
- auth required pam_permit.so
+ security.pam.services.lightdm.text = ''
+ auth substack login
+ account include login
+ password substack login
+ session include login
+ '';
- account required pam_permit.so
+ security.pam.services.lightdm-greeter.text = ''
+ auth required pam_succeed_if.so audit quiet_success user = lightdm
+ auth optional pam_permit.so
- password required pam_deny.so
+ account required pam_succeed_if.so audit quiet_success user = lightdm
+ account sufficient pam_unix.so
+
+ password required pam_deny.so
+
+ session required pam_succeed_if.so audit quiet_success user = lightdm
+ session required pam_env.so envfile=${config.system.build.pamEnvironment}
+ session optional ${pkgs.systemd}/lib/security/pam_systemd.so
+ session optional pam_keyinit.so force revoke
+ session optional pam_permit.so
+ '';
- session required pam_env.so envfile=${config.system.build.pamEnvironment}
- session required pam_unix.so
- session optional ${pkgs.systemd}/lib/security/pam_systemd.so
- '';
- };
security.pam.services.lightdm-autologin.text = ''
- auth requisite pam_nologin.so
- auth required pam_succeed_if.so uid >= 1000 quiet
- auth required pam_permit.so
+ auth requisite pam_nologin.so
- account include lightdm
+ auth required pam_succeed_if.so uid >= 1000 quiet
+ auth required pam_permit.so
- password include lightdm
+ account sufficient pam_unix.so
- session include lightdm
+ password requisite pam_unix.so nullok sha512
+
+ session optional pam_keyinit.so revoke
+ session include login
'';
users.users.lightdm = {
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index d1ed345ac579..c6cb281c2cc2 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -7,7 +7,7 @@ let
xcfg = config.services.xserver;
dmcfg = xcfg.displayManager;
cfg = dmcfg.sddm;
- xEnv = config.systemd.services."display-manager".environment;
+ xEnv = config.systemd.services.display-manager.environment;
inherit (pkgs) sddm;
diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix
index 5523dd2bf023..1af98a1318bb 100644
--- a/nixos/modules/services/x11/extra-layouts.nix
+++ b/nixos/modules/services/x11/extra-layouts.nix
@@ -158,7 +158,10 @@ in
});
- services.xserver.xkbDir = "${pkgs.xkb_patched}/etc/X11/xkb";
+ services.xserver = {
+ xkbDir = "${pkgs.xkb_patched}/etc/X11/xkb";
+ exportConfiguration = config.services.xserver.displayManager.startx.enable;
+ };
};
diff --git a/nixos/modules/services/x11/hardware/cmt.nix b/nixos/modules/services/x11/hardware/cmt.nix
new file mode 100644
index 000000000000..95353e92098e
--- /dev/null
+++ b/nixos/modules/services/x11/hardware/cmt.nix
@@ -0,0 +1,54 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+cfg = config.services.xserver.cmt;
+etcPath = "X11/xorg.conf.d";
+
+in {
+
+ options = {
+
+ services.xserver.cmt = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable chrome multitouch input (cmt). Touchpad drivers that are configured for chromebooks.";
+ };
+ models = mkOption {
+ type = types.enum [ "atlas" "banjo" "candy" "caroline" "cave" "celes" "clapper" "cyan" "daisy" "elan" "elm" "enguarde" "eve" "expresso" "falco" "gandof" "glimmer" "gnawty" "heli" "kevin" "kip" "leon" "lulu" "orco" "pbody" "peppy" "pi" "pit" "puppy" "quawks" "rambi" "samus" "snappy" "spring" "squawks" "swanky" "winky" "wolf" "auron_paine" "auron_yuna" "daisy_skate" "nyan_big" "nyan_blaze" "veyron_jaq" "veyron_jerry" "veyron_mighty" "veyron_minnie" "veyron_speedy" ];
+ example = "banjo";
+ description = ''
+ Which models to enable cmt for. Enter the Code Name for your Chromebook.
+ Code Name can be found at .
+ '';
+ };
+ }; #closes services
+ }; #closes options
+
+ config = mkIf cfg.enable {
+
+ services.xserver.modules = [ pkgs.xf86_input_cmt ];
+
+ environment.etc = {
+ "${etcPath}/40-touchpad-cmt.conf" = {
+ source = "${pkgs.chromium-xorg-conf}/40-touchpad-cmt.conf";
+ };
+ "${etcPath}/50-touchpad-cmt-${cfg.models}.conf" = {
+ source = "${pkgs.chromium-xorg-conf}/50-touchpad-cmt-${cfg.models}.conf";
+ };
+ "${etcPath}/60-touchpad-cmt-${cfg.models}.conf" = {
+ source = "${pkgs.chromium-xorg-conf}/60-touchpad-cmt-${cfg.models}.conf";
+ };
+ };
+
+ assertions = [
+ {
+ assertion = !config.services.xserver.libinput.enable;
+ message = "cmt and libinput are incompatible, you cannot enable both (in services.xserver).";
+ }
+ ];
+ };
+}
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index a0a5e2656852..bd289976532b 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -41,13 +41,13 @@ in {
};
accelSpeed = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
};
buttonMapping = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description =
''
@@ -61,7 +61,7 @@ in {
};
calibrationMatrix = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description =
''
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index f032c5938852..22af869f1f8a 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -44,19 +44,19 @@ in {
};
accelFactor = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = "0.001";
description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
};
minSpeed = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = "0.6";
description = "Cursor speed factor for precision finger motion.";
};
maxSpeed = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = "1.0";
description = "Cursor speed factor for highest-speed finger motion.";
};
@@ -167,7 +167,7 @@ in {
services.xserver.modules = [ pkg.out ];
- environment.etc."${etcFile}".source =
+ environment.etc.${etcFile}.source =
"${pkg.out}/share/X11/xorg.conf.d/70-synaptics.conf";
environment.systemPackages = [ pkg ];
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 55f8f75021bc..6ddb4c83764a 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -81,7 +81,7 @@ in {
# needed so that .desktop files are installed, which geoclue cares about
environment.systemPackages = [ cfg.package ];
- services.geoclue2.appConfig."redshift" = {
+ services.geoclue2.appConfig.redshift = {
isAllowed = true;
isSystem = true;
};
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index a6055f26789e..0e1314122767 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -59,7 +59,7 @@ in
config = mkOption {
default = null;
- type = with lib.types; nullOr (either path string);
+ type = with lib.types; nullOr (either path str);
description = ''
Configuration from which XMonad gets compiled. If no value
is specified, the xmonad config from $HOME/.xmonad is taken.
diff --git a/nixos/modules/services/x11/xautolock.nix b/nixos/modules/services/x11/xautolock.nix
index 10eef8aefbcd..3e03131ca114 100644
--- a/nixos/modules/services/x11/xautolock.nix
+++ b/nixos/modules/services/x11/xautolock.nix
@@ -132,7 +132,7 @@ in
] ++ (lib.forEach [ "locker" "notifier" "nowlocker" "killer" ]
(option:
{
- assertion = cfg."${option}" != null -> builtins.substring 0 1 cfg."${option}" == "/";
+ assertion = cfg.${option} != null -> builtins.substring 0 1 cfg.${option} == "/";
message = "Please specify a canonical path for `services.xserver.xautolock.${option}`";
})
);
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index c94a06438315..a8406544a72f 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -659,7 +659,7 @@ in
systemd.services.display-manager =
{ description = "X11 Server";
- after = [ "systemd-udev-settle.service" "local-fs.target" "acpid.service" "systemd-logind.service" ];
+ after = [ "systemd-udev-settle.service" "acpid.service" "systemd-logind.service" ];
wants = [ "systemd-udev-settle.service" ];
restartIfChanged = false;
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix
index a550ffd6320f..a32c9dc1f2b4 100644
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixos/modules/system/boot/binfmt.nix
@@ -239,7 +239,7 @@ in {
List of systems to emulate. Will also configure Nix to
support your new systems.
'';
- type = types.listOf types.string;
+ type = types.listOf types.str;
};
};
};
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index baa8c602a99e..50dbf2f83651 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -261,7 +261,7 @@ in
source = kernelModulesConf;
};
- systemd.services."systemd-modules-load" =
+ systemd.services.systemd-modules-load =
{ wantedBy = [ "multi-user.target" ];
restartTriggers = [ kernelModulesConf ];
serviceConfig =
diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index fd2cb94b756b..27a8e0217c55 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -4,7 +4,7 @@
config = lib.mkIf (lib.any (lib.meta.platformMatch pkgs.stdenv.hostPlatform) pkgs.kexectools.meta.platforms) {
environment.systemPackages = [ pkgs.kexectools ];
- systemd.services."prepare-kexec" =
+ systemd.services.prepare-kexec =
{ description = "Preparation for kexec";
wantedBy = [ "kexec.target" ];
before = [ "systemd-kexec.service" ];
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index eca9dad64222..e13f0421d38f 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -8,7 +8,7 @@ let
efi = config.boot.loader.efi;
- grubPkgs =
+ grubPkgs =
# Package set of targeted architecture
if cfg.forcei686 then pkgs.pkgsi686Linux else pkgs;
@@ -72,7 +72,7 @@ let
else "${convertedFont}");
});
- bootDeviceCounters = fold (device: attr: attr // { "${device}" = (attr."${device}" or 0) + 1; }) {}
+ bootDeviceCounters = fold (device: attr: attr // { ${device} = (attr.${device} or 0) + 1; }) {}
(concatMap (args: args.devices) cfg.mirroredBoots);
convertedFont = (pkgs.runCommand "grub-font-converted.pf2" {}
@@ -333,7 +333,7 @@ in
};
backgroundColor = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
example = "#7EBAE4";
default = null;
description = ''
@@ -399,7 +399,7 @@ in
example = "text";
type = types.str;
description = ''
- The gfxpayload to pass to GRUB when loading a graphical boot interface under EFI.
+ The gfxpayload to pass to GRUB when loading a graphical boot interface under EFI.
'';
};
@@ -408,7 +408,7 @@ in
example = "keep";
type = types.str;
description = ''
- The gfxpayload to pass to GRUB when loading a graphical boot interface under BIOS.
+ The gfxpayload to pass to GRUB when loading a graphical boot interface under BIOS.
'';
};
@@ -535,7 +535,7 @@ in
default = false;
type = types.bool;
description = ''
- Whether to force the use of a ia32 boot loader on x64 systems. Required
+ Whether to force the use of a ia32 boot loader on x64 systems. Required
to install and run NixOS on 64bit x86 systems with 32bit (U)EFI.
'';
};
@@ -554,7 +554,7 @@ in
systemHasTPM = mkOption {
default = "";
example = "YES_TPM_is_activated";
- type = types.string;
+ type = types.str;
description = ''
Assertion that the target system has an activated TPM. It is a safety
check before allowing the activation of 'trustedBoot.enable'. TrustedBoot
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index 7db60daa60b8..1c8354e52696 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -10,7 +10,7 @@ let
builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; };
builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; };
- builder =
+ builder =
if cfg.uboot.enable then
"${builderUboot} -g ${toString cfg.uboot.configurationLimit} -t ${timeoutStr} -c"
else
@@ -86,7 +86,7 @@ in
firmwareConfig = mkOption {
default = null;
- type = types.nullOr types.string;
+ type = types.nullOr types.lines;
description = ''
Extra options that will be appended to /boot/config.txt file.
For possible values, see: https://www.raspberrypi.org/documentation/configuration/config-txt/
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index b5c8d5241a3d..a4029d766b05 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -476,7 +476,7 @@ in
boot.initrd.luks.devices = mkOption {
default = { };
- example = { "luksroot".device = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; };
+ example = { luksroot.device = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; };
description = ''
The encrypted disk that should be opened before the root
filesystem is mounted. Both LVM-over-LUKS and LUKS-over-LVM
diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix
index 34a34091a7dc..db6e06b41072 100644
--- a/nixos/modules/system/boot/systemd-nspawn.nix
+++ b/nixos/modules/system/boot/systemd-nspawn.nix
@@ -117,7 +117,7 @@ in {
environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] [];
- systemd.targets."multi-user".wants = [ "machines.target" ];
+ systemd.targets.multi-user.wants = [ "machines.target" ];
};
}
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index a79513850624..2287a82418fe 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -328,7 +328,7 @@ let
[Service]
${let env = cfg.globalEnvironment // def.environment;
in concatMapStrings (n:
- let s = optionalString (env."${n}" != null)
+ let s = optionalString (env.${n} != null)
"Environment=${builtins.toJSON "${n}=${env.${n}}"}\n";
# systemd max line length is now 1MiB
# https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af
@@ -496,7 +496,7 @@ in
systemd.generators = mkOption {
type = types.attrsOf types.path;
default = {};
- example = { "systemd-gpt-auto-generator" = "/dev/null"; };
+ example = { systemd-gpt-auto-generator = "/dev/null"; };
description = ''
Definition of systemd generators.
For each NAME = VALUE pair of the attrSet, a link is generated from
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 43764bb82f1f..688c77cb22d1 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -12,7 +12,7 @@ let
fileSystems' = toposort fsBefore (attrValues config.fileSystems);
- fileSystems = if fileSystems' ? "result"
+ fileSystems = if fileSystems' ? result
then # use topologically sorted fileSystems everywhere
fileSystems'.result
else # the assertion below will catch this,
@@ -211,7 +211,7 @@ in
ls = sep: concatMapStringsSep sep (x: x.mountPoint);
notAutoResizable = fs: fs.autoResize && !(hasPrefix "ext" fs.fsType || fs.fsType == "f2fs");
in [
- { assertion = ! (fileSystems' ? "cycle");
+ { assertion = ! (fileSystems' ? cycle);
message = "The ‘fileSystems’ option can't be topologically sorted: mountpoint dependency path ${ls " -> " fileSystems'.cycle} loops to ${ls ", " fileSystems'.loops}";
}
{ assertion = ! (any notAutoResizable fileSystems);
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index ac06b6caee30..2ed8c5aa2927 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -469,7 +469,7 @@ in
map createSyncService allPools ++
map createZfsService [ "zfs-mount" "zfs-share" "zfs-zed" ]);
- systemd.targets."zfs-import" =
+ systemd.targets.zfs-import =
let
services = map (pool: "zfs-import-${pool}.service") dataPools;
in
@@ -479,7 +479,7 @@ in
wantedBy = [ "zfs.target" ];
};
- systemd.targets."zfs".wantedBy = [ "multi-user.target" ];
+ systemd.targets.zfs.wantedBy = [ "multi-user.target" ];
})
(mkIf enableAutoSnapshots {
diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index 6d34f897d189..c6ba998b19e6 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -73,7 +73,7 @@ in
config = mkMerge [
(mkIf (!setVconsole) {
- systemd.services."systemd-vconsole-setup".enable = false;
+ systemd.services.systemd-vconsole-setup.enable = false;
})
(mkIf setVconsole (mkMerge [
@@ -83,7 +83,7 @@ in
# virtual consoles.
environment.etc."vconsole.conf".source = vconsoleConf;
# Provide kbd with additional packages.
- environment.etc."kbd".source = "${kbdEnv}/share";
+ environment.etc.kbd.source = "${kbdEnv}/share";
boot.initrd.preLVMCommands = mkBefore ''
kbd_mode ${if isUnicode then "-u" else "-a"} -C /dev/console
@@ -99,7 +99,7 @@ in
'') config.i18n.consoleColors}
'';
- systemd.services."systemd-vconsole-setup" =
+ systemd.services.systemd-vconsole-setup =
{ before = [ "display-manager.service" ];
after = [ "systemd-udev-settle.service" ];
restartTriggers = [ vconsoleConf kbdEnv ];
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 2b8a7944dc36..1726d05115ea 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -498,8 +498,8 @@ let
// mapAttrs' createSitDevice cfg.sits
// mapAttrs' createVlanDevice cfg.vlans
// {
- "network-setup" = networkSetup;
- "network-local-commands" = networkLocalCommands;
+ network-setup = networkSetup;
+ network-local-commands = networkLocalCommands;
};
services.udev.extraRules =
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index fbca54978e5b..34e270667151 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -72,7 +72,15 @@ in
};
in mkMerge [ {
enable = true;
- networks."99-main" = genericNetwork mkDefault;
+ networks."99-main" = (genericNetwork mkDefault) // {
+ # We keep the "broken" behaviour of applying this to all interfaces.
+ # In general we want to get rid of this workaround but there hasn't
+ # been any work on that.
+ # See the following issues for details:
+ # - https://github.com/NixOS/nixpkgs/issues/18962
+ # - https://github.com/NixOS/nixpkgs/issues/61629
+ matchConfig = mkDefault { Name = "*"; };
+ };
}
(mkMerge (forEach interfaces (i: {
netdevs = mkIf i.virtual ({
@@ -160,14 +168,14 @@ in
(mapAttrsToList (k: _: k) do); "";
# get those driverOptions that have been set
filterSystemdOptions = filterAttrs (sysDOpt: kOpts:
- any (kOpt: do ? "${kOpt}") kOpts.optNames);
+ any (kOpt: do ? ${kOpt}) kOpts.optNames);
# build final set of systemd options to bond values
buildOptionSet = mapAttrs (_: kOpts: with kOpts;
# we simply take the first set kernel bond option
# (one option has multiple names, which is silly)
- head (map (optN: valTransform (do."${optN}"))
+ head (map (optN: valTransform (do.${optN}))
# only map those that exist
- (filter (o: do ? "${o}") optNames)));
+ (filter (o: do ? ${o}) optNames)));
in seq assertNoUnknownOption
(buildOptionSet (filterSystemdOptions driverOptionMapping));
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 5ac753c92a78..5bf7b0d227f0 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -799,19 +799,19 @@ in
networking.wlanInterfaces = mkOption {
default = { };
example = literalExample {
- "wlan-station0" = {
+ wlan-station0 = {
device = "wlp6s0";
};
- "wlan-adhoc0" = {
+ wlan-adhoc0 = {
type = "ibss";
device = "wlp6s0";
mac = "02:00:00:00:00:01";
};
- "wlan-p2p0" = {
+ wlan-p2p0 = {
device = "wlp6s0";
mac = "02:00:00:00:00:02";
};
- "wlan-ap0" = {
+ wlan-ap0 = {
device = "wlp6s0";
mac = "02:00:00:00:00:03";
};
@@ -836,7 +836,7 @@ in
options = {
device = mkOption {
- type = types.string;
+ type = types.str;
example = "wlp6s0";
description = "The name of the underlying hardware WLAN device as assigned by udev.";
};
@@ -852,7 +852,7 @@ in
};
meshID = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
description = "MeshID of interface with type mesh.";
};
@@ -994,7 +994,7 @@ in
domainname "${cfg.domain}"
'';
- environment.etc."hostid" = mkIf (cfg.hostId != null)
+ environment.etc.hostid = mkIf (cfg.hostId != null)
{ source = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } ''
hi="${cfg.hostId}"
${if pkgs.stdenv.isBigEndian then ''
@@ -1007,7 +1007,7 @@ in
# static hostname configuration needed for hostnamectl and the
# org.freedesktop.hostname1 dbus service (both provided by systemd)
- environment.etc."hostname" = mkIf (cfg.hostName != "")
+ environment.etc.hostname = mkIf (cfg.hostName != "")
{
text = cfg.hostName + "\n";
};
@@ -1027,7 +1027,7 @@ in
# The network-interfaces target is kept for backwards compatibility.
# New modules must NOT use it.
- systemd.targets."network-interfaces" =
+ systemd.targets.network-interfaces =
{ description = "All Network Interfaces (deprecated)";
wantedBy = [ "network.target" ];
before = [ "network.target" ];
@@ -1162,13 +1162,13 @@ in
in
flip (concatMapStringsSep "\n") (attrNames wlanDeviceInterfaces) (device:
let
- interfaces = wlanListDeviceFirst device wlanDeviceInterfaces."${device}";
+ interfaces = wlanListDeviceFirst device wlanDeviceInterfaces.${device};
curInterface = elemAt interfaces 0;
newInterfaces = drop 1 interfaces;
in ''
# It is important to have that rule first as overwriting the NAME attribute also prevents the
# next rules from matching.
- ${flip (concatMapStringsSep "\n") (wlanListDeviceFirst device wlanDeviceInterfaces."${device}") (interface:
+ ${flip (concatMapStringsSep "\n") (wlanListDeviceFirst device wlanDeviceInterfaces.${device}) (interface:
''ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", ENV{INTERFACE}=="${interface._iName}", ${systemdAttrs interface._iName}, RUN+="${newInterfaceScript device interface}"'')}
# Add the required, new WLAN interfaces to the default WLAN interface with the
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 0c4ad90b4eb6..aadfc5add350 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -25,6 +25,9 @@ in
{ assertion = cfg.hvm;
message = "Paravirtualized EC2 instances are no longer supported.";
}
+ { assertion = cfg.efi -> cfg.hvm;
+ message = "EC2 instances using EFI must be HVM instances.";
+ }
];
boot.growPartition = cfg.hvm;
@@ -35,6 +38,11 @@ in
autoResize = true;
};
+ fileSystems."/boot" = mkIf cfg.efi {
+ device = "/dev/disk/by-label/ESP";
+ fsType = "vfat";
+ };
+
boot.extraModulePackages = [
config.boot.kernelPackages.ena
];
@@ -50,8 +58,10 @@ in
# Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd.
boot.loader.grub.version = if cfg.hvm then 2 else 1;
- boot.loader.grub.device = if cfg.hvm then "/dev/xvda" else "nodev";
+ boot.loader.grub.device = if (cfg.hvm && !cfg.efi) then "/dev/xvda" else "nodev";
boot.loader.grub.extraPerEntryConfig = mkIf (!cfg.hvm) "root (hd0)";
+ boot.loader.grub.efiSupport = cfg.efi;
+ boot.loader.grub.efiInstallAsRemovable = cfg.efi;
boot.loader.timeout = 0;
boot.initrd.network.enable = true;
@@ -137,7 +147,7 @@ in
networking.timeServers = [ "169.254.169.123" ];
# udisks has become too bloated to have in a headless system
- # (e.g. it depends on GTK+).
+ # (e.g. it depends on GTK).
services.udisks2.enable = false;
};
}
diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix
index 15de8638bbab..2e807131e938 100644
--- a/nixos/modules/virtualisation/amazon-options.nix
+++ b/nixos/modules/virtualisation/amazon-options.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
{
options = {
ec2 = {
@@ -9,6 +9,13 @@
Whether the EC2 instance is a HVM instance.
'';
};
+ efi = lib.mkOption {
+ default = pkgs.stdenv.hostPlatform.isAarch64;
+ internal = true;
+ description = ''
+ Whether the EC2 instance is using EFI.
+ '';
+ };
};
};
}
diff --git a/nixos/modules/virtualisation/anbox.nix b/nixos/modules/virtualisation/anbox.nix
index c63b971ead02..da5df3580734 100644
--- a/nixos/modules/virtualisation/anbox.nix
+++ b/nixos/modules/virtualisation/anbox.nix
@@ -56,7 +56,7 @@ in
dns = mkOption {
default = "1.1.1.1";
- type = types.string;
+ type = types.str;
description = ''
Container DNS server.
'';
diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix
index 770cefbcd511..036b1036f92a 100644
--- a/nixos/modules/virtualisation/azure-agent.nix
+++ b/nixos/modules/virtualisation/azure-agent.nix
@@ -166,7 +166,6 @@ in
wantedBy = [ "sshd.service" "waagent.service" ];
before = [ "sshd.service" "waagent.service" ];
- after = [ "local-fs.target" ];
path = [ pkgs.coreutils ];
script =
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index dd2108ccc379..e91dd72ff5d4 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -26,7 +26,6 @@ in
wantedBy = [ "sshd.service" "waagent.service" ];
before = [ "sshd.service" "waagent.service" ];
- after = [ "local-fs.target" ];
path = [ pkgs.coreutils ];
script =
diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix
index e716982c510a..d0efbcc808aa 100644
--- a/nixos/modules/virtualisation/brightbox-image.nix
+++ b/nixos/modules/virtualisation/brightbox-image.nix
@@ -111,7 +111,7 @@ in
# Always include cryptsetup so that NixOps can use it.
environment.systemPackages = [ pkgs.cryptsetup ];
- systemd.services."fetch-ec2-data" =
+ systemd.services.fetch-ec2-data =
{ description = "Fetch EC2 Data";
wantedBy = [ "multi-user.target" "sshd.service" ];
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index b61558b22019..9c9f8fc0c215 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -337,7 +337,7 @@ let
networkOptions = {
hostBridge = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "br0";
description = ''
@@ -387,7 +387,7 @@ let
};
hostAddress6 = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "fc00::1";
description = ''
@@ -409,7 +409,7 @@ let
};
localAddress6 = mkOption {
- type = types.nullOr types.string;
+ type = types.nullOr types.str;
default = null;
example = "fc00::2";
description = ''
@@ -565,7 +565,7 @@ in
};
interfaces = mkOption {
- type = types.listOf types.string;
+ type = types.listOf types.str;
default = [];
example = [ "eth1" "eth2" ];
description = ''
@@ -729,7 +729,7 @@ in
serviceConfig = serviceDirectives dummyConfig;
};
in {
- systemd.targets."multi-user".wants = [ "machines.target" ];
+ systemd.targets.multi-user.wants = [ "machines.target" ];
systemd.services = listToAttrs (filter (x: x.value != null) (
# The generic container template used by imperative containers
diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index db3dd9949c12..82451787e8a1 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -64,7 +64,7 @@ with lib;
serviceConfig.RemainAfterExit = true;
};
- systemd.services."print-host-key" =
+ systemd.services.print-host-key =
{ description = "Print SSH Host Key";
wantedBy = [ "multi-user.target" ];
after = [ "sshd.service" ];
diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix
index 79766970c757..327324f2921d 100644
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@@ -21,7 +21,7 @@ in
boot.initrd.kernelModules = [ "virtio_scsi" ];
boot.kernelModules = [ "virtio_pci" "virtio_net" ];
- # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd.
+ # Generate a GRUB menu.
boot.loader.grub.device = "/dev/sda";
boot.loader.timeout = 0;
@@ -29,12 +29,16 @@ in
# way to select them anyway.
boot.loader.grub.configurationLimit = 0;
- # Allow root logins only using the SSH key that the user specified
- # at instance creation time.
+ # Allow root logins only using SSH keys
+ # and disable password authentication in general
services.openssh.enable = true;
services.openssh.permitRootLogin = "prohibit-password";
services.openssh.passwordAuthentication = mkDefault false;
+ # enable OS Login. This also requires setting enable-oslogin=TRUE metadata on
+ # instance or project level
+ security.googleOsLogin.enable = true;
+
# Use GCE udev rules for dynamic disk volumes
services.udev.packages = [ gce ];
@@ -65,165 +69,80 @@ in
# GC has 1460 MTU
networking.interfaces.eth0.mtu = 1460;
- security.googleOsLogin.enable = true;
-
- systemd.services.google-clock-skew-daemon = {
- description = "Google Compute Engine Clock Skew Daemon";
- after = [
- "network.target"
- "google-instance-setup.service"
- "google-network-setup.service"
- ];
- requires = ["network.target"];
- wantedBy = ["multi-user.target"];
- serviceConfig = {
- Type = "simple";
- ExecStart = "${gce}/bin/google_clock_skew_daemon --debug";
- };
- };
-
systemd.services.google-instance-setup = {
description = "Google Compute Engine Instance Setup";
- after = ["local-fs.target" "network-online.target" "network.target" "rsyslog.service"];
- before = ["sshd.service"];
- wants = ["local-fs.target" "network-online.target" "network.target"];
- wantedBy = [ "sshd.service" "multi-user.target" ];
- path = with pkgs; [ ethtool openssh ];
+ after = [ "network-online.target" "network.target" "rsyslog.service" ];
+ before = [ "sshd.service" ];
+ path = with pkgs; [ coreutils ethtool openssh ];
serviceConfig = {
- ExecStart = "${gce}/bin/google_instance_setup --debug";
+ ExecStart = "${gce}/bin/google_instance_setup";
+ StandardOutput="journal+console";
Type = "oneshot";
};
+ wantedBy = [ "sshd.service" "multi-user.target" ];
};
systemd.services.google-network-daemon = {
description = "Google Compute Engine Network Daemon";
- after = ["local-fs.target" "network-online.target" "network.target" "rsyslog.service" "google-instance-setup.service"];
- wants = ["local-fs.target" "network-online.target" "network.target"];
- requires = ["network.target"];
- partOf = ["network.target"];
- wantedBy = [ "multi-user.target" ];
+ after = [ "network-online.target" "network.target" "google-instance-setup.service" ];
path = with pkgs; [ iproute ];
serviceConfig = {
- ExecStart = "${gce}/bin/google_network_daemon --debug";
+ ExecStart = "${gce}/bin/google_network_daemon";
+ StandardOutput="journal+console";
+ Type="simple";
};
+ wantedBy = [ "multi-user.target" ];
};
+ systemd.services.google-clock-skew-daemon = {
+ description = "Google Compute Engine Clock Skew Daemon";
+ after = [ "network.target" "google-instance-setup.service" "google-network-daemon.service" ];
+ serviceConfig = {
+ ExecStart = "${gce}/bin/google_clock_skew_daemon";
+ StandardOutput="journal+console";
+ Type = "simple";
+ };
+ wantedBy = ["multi-user.target"];
+ };
+
+
systemd.services.google-shutdown-scripts = {
description = "Google Compute Engine Shutdown Scripts";
after = [
- "local-fs.target"
"network-online.target"
"network.target"
"rsyslog.service"
- "systemd-resolved.service"
"google-instance-setup.service"
"google-network-daemon.service"
];
- wants = [ "local-fs.target" "network-online.target" "network.target"];
- wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${pkgs.coreutils}/bin/true";
- ExecStop = "${gce}/bin/google_metadata_script_runner --debug --script-type shutdown";
- Type = "oneshot";
+ ExecStop = "${gce}/bin/google_metadata_script_runner --script-type shutdown";
RemainAfterExit = true;
- TimeoutStopSec = "infinity";
+ StandardOutput="journal+console";
+ TimeoutStopSec = "0";
+ Type = "oneshot";
};
+ wantedBy = [ "multi-user.target" ];
};
systemd.services.google-startup-scripts = {
description = "Google Compute Engine Startup Scripts";
after = [
- "local-fs.target"
"network-online.target"
"network.target"
"rsyslog.service"
"google-instance-setup.service"
"google-network-daemon.service"
];
- wants = ["local-fs.target" "network-online.target" "network.target"];
- wantedBy = [ "multi-user.target" ];
serviceConfig = {
- ExecStart = "${gce}/bin/google_metadata_script_runner --debug --script-type startup";
+ ExecStart = "${gce}/bin/google_metadata_script_runner --script-type startup";
KillMode = "process";
+ StandardOutput = "journal+console";
Type = "oneshot";
};
+ wantedBy = [ "multi-user.target" ];
};
-
- # Settings taken from https://github.com/GoogleCloudPlatform/compute-image-packages/blob/master/google_config/sysctl/11-gce-network-security.conf
- boot.kernel.sysctl = {
- # Turn on SYN-flood protections. Starting with 2.6.26, there is no loss
- # of TCP functionality/features under normal conditions. When flood
- # protections kick in under high unanswered-SYN load, the system
- # should remain more stable, with a trade off of some loss of TCP
- # functionality/features (e.g. TCP Window scaling).
- "net.ipv4.tcp_syncookies" = mkDefault "1";
-
- # ignores ICMP redirects
- "net.ipv4.conf.all.accept_redirects" = mkDefault "0";
-
- # ignores ICMP redirects
- "net.ipv4.conf.default.accept_redirects" = mkDefault "0";
-
- # ignores ICMP redirects from non-GW hosts
- "net.ipv4.conf.all.secure_redirects" = mkDefault "1";
-
- # ignores ICMP redirects from non-GW hosts
- "net.ipv4.conf.default.secure_redirects" = mkDefault "1";
-
- # don't allow traffic between networks or act as a router
- "net.ipv4.ip_forward" = mkDefault "0";
-
- # don't allow traffic between networks or act as a router
- "net.ipv4.conf.all.send_redirects" = mkDefault "0";
-
- # don't allow traffic between networks or act as a router
- "net.ipv4.conf.default.send_redirects" = mkDefault "0";
-
- # strict reverse path filtering - IP spoofing protection
- "net.ipv4.conf.all.rp_filter" = mkDefault "1";
-
- # strict path filtering - IP spoofing protection
- "net.ipv4.conf.default.rp_filter" = mkDefault "1";
-
- # ignores ICMP broadcasts to avoid participating in Smurf attacks
- "net.ipv4.icmp_echo_ignore_broadcasts" = mkDefault "1";
-
- # ignores bad ICMP errors
- "net.ipv4.icmp_ignore_bogus_error_responses" = mkDefault "1";
-
- # logs spoofed, source-routed, and redirect packets
- "net.ipv4.conf.all.log_martians" = mkDefault "1";
-
- # log spoofed, source-routed, and redirect packets
- "net.ipv4.conf.default.log_martians" = mkDefault "1";
-
- # implements RFC 1337 fix
- "net.ipv4.tcp_rfc1337" = mkDefault "1";
-
- # randomizes addresses of mmap base, heap, stack and VDSO page
- "kernel.randomize_va_space" = mkDefault "2";
-
- # Reboot the machine soon after a kernel panic.
- "kernel.panic" = mkDefault "10";
-
- ## Not part of the original config
-
- # provides protection from ToCToU races
- "fs.protected_hardlinks" = mkDefault "1";
-
- # provides protection from ToCToU races
- "fs.protected_symlinks" = mkDefault "1";
-
- # makes locating kernel addresses more difficult
- "kernel.kptr_restrict" = mkDefault "1";
-
- # set ptrace protections
- "kernel.yama.ptrace_scope" = mkOverride 500 "1";
-
- # set perf only available to root
- "kernel.perf_event_paranoid" = mkDefault "2";
-
- };
-
+ environment.etc."sysctl.d/11-gce-network-security.conf".source = "${gce}/sysctl.d/11-gce-network-security.conf";
}
diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix
index 289e26e17035..36ef6d17df69 100644
--- a/nixos/modules/virtualisation/kvmgt.nix
+++ b/nixos/modules/virtualisation/kvmgt.nix
@@ -9,7 +9,7 @@ let
vgpuOptions = {
uuid = mkOption {
- type = types.string;
+ type = types.str;
description = "UUID of VGPU device. You can generate one with libossp_uuid.";
};
};
@@ -23,7 +23,7 @@ in {
'';
# multi GPU support is under the question
device = mkOption {
- type = types.string;
+ type = types.str;
default = "0000:00:02.0";
description = "PCI ID of graphics card. You can figure it with ls /sys/class/mdev_bus.";
};
@@ -35,7 +35,7 @@ in {
and find info about device via cat /sys/bus/pci/devices/*/mdev_supported_types/i915-GVTg_V5_4/description
'';
example = {
- "i915-GVTg_V5_8" = {
+ i915-GVTg_V5_8 = {
uuid = "a297db4a-f4c2-11e6-90f6-d3b88d6c9525";
};
};
diff --git a/nixos/modules/virtualisation/railcar.nix b/nixos/modules/virtualisation/railcar.nix
new file mode 100644
index 000000000000..12da1c75fc38
--- /dev/null
+++ b/nixos/modules/virtualisation/railcar.nix
@@ -0,0 +1,125 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.railcar;
+ generateUnit = name: containerConfig:
+ let
+ container = pkgs.ociTools.buildContainer {
+ args = [
+ (pkgs.writeShellScript "run.sh" containerConfig.cmd).outPath
+ ];
+ };
+ in
+ nameValuePair "railcar-${name}" {
+ enable = true;
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ ExecStart = ''
+ ${cfg.package}/bin/railcar -r ${cfg.stateDir} run ${name} -b ${container}
+ '';
+ Type = containerConfig.runType;
+ };
+ };
+ mount = with types; (submodule {
+ options = {
+ type = mkOption {
+ type = str;
+ default = "none";
+ description = ''
+ The type of the filesystem to be mounted.
+ Linux: filesystem types supported by the kernel as listed in
+ `/proc/filesystems` (e.g., "minix", "ext2", "ext3", "jfs", "xfs",
+ "reiserfs", "msdos", "proc", "nfs", "iso9660"). For bind mounts
+ (when options include either bind or rbind), the type is a dummy,
+ often "none" (not listed in /proc/filesystems).
+ '';
+ };
+ source = mkOption {
+ type = str;
+ description = "Source for the in-container mount";
+ };
+ options = mkOption {
+ type = loaOf (str);
+ default = [ "bind" ];
+ description = ''
+ Mount options of the filesystem to be used.
+
+ Support optoions are listed in the mount(8) man page. Note that
+ both filesystem-independent and filesystem-specific options
+ are listed.
+ '';
+ };
+ };
+ });
+in
+{
+ options.services.railcar = {
+ enable = mkEnableOption "railcar";
+
+ containers = mkOption {
+ default = {};
+ description = "Declarative container configuration";
+ type = with types; loaOf (submodule ({ name, config, ... }: {
+ options = {
+ cmd = mkOption {
+ type = types.lines;
+ description = "Command or script to run inside the container";
+ };
+
+ mounts = mkOption {
+ type = with types; attrsOf mount;
+ default = {};
+ description = ''
+ A set of mounts inside the container.
+
+ The defaults have been chosen for simple bindmounts, meaning
+ that you only need to provide the "source" parameter.
+ '';
+ example = ''
+ { "/data" = { source = "/var/lib/data"; }; }
+ '';
+ };
+
+ runType = mkOption {
+ type = types.str;
+ default = "oneshot";
+ description = "The systemd service run type";
+ };
+
+ os = mkOption {
+ type = types.str;
+ default = "linux";
+ description = "OS type of the container";
+ };
+
+ arch = mkOption {
+ type = types.str;
+ default = "x86_64";
+ description = "Computer architecture type of the container";
+ };
+ };
+ }));
+ };
+
+ stateDir = mkOption {
+ type = types.path;
+ default = ''/var/railcar'';
+ description = "Railcar persistent state directory";
+ };
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.railcar;
+ description = "Railcar package to use";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services = flip mapAttrs' cfg.containers (name: containerConfig:
+ generateUnit name containerConfig
+ );
+ };
+}
+
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index 41bcb909fb5c..6081d4153a6c 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -122,7 +122,7 @@ in
# Since we lack the right setuid/setcap binaries, set up a host-only network by default.
} (mkIf cfg.addNetworkInterface {
- systemd.services."vboxnet0" =
+ systemd.services.vboxnet0 =
{ description = "VirtualBox vboxnet0 Interface";
requires = [ "dev-vboxnetctl.device" ];
after = [ "dev-vboxnetctl.device" ];
diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix
index d18778f81588..f418f849759f 100644
--- a/nixos/modules/virtualisation/vmware-guest.nix
+++ b/nixos/modules/virtualisation/vmware-guest.nix
@@ -33,7 +33,7 @@ in
serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd";
};
- environment.etc."vmware-tools".source = "${open-vm-tools}/etc/vmware-tools/*";
+ environment.etc.vmware-tools.source = "${open-vm-tools}/etc/vmware-tools/*";
services.xserver = mkIf (!cfg.headless) {
videoDrivers = mkOverride 50 [ "vmware" ];
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 70e575b6c0d2..06d5c63476f9 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -119,7 +119,7 @@ in
virtualisation.xen.domains = {
extraConfig = mkOption {
- type = types.string;
+ type = types.lines;
default = "";
description =
''
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index ffa087bb6f28..9e2109d88b5f 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -68,6 +68,7 @@ in rec {
nixos.tests.chromium.x86_64-linux or []
(all nixos.tests.firefox)
(all nixos.tests.firewall)
+ (all nixos.tests.fontconfig-default-fonts)
(all nixos.tests.gnome3-xorg)
(all nixos.tests.gnome3)
(all nixos.tests.pantheon)
diff --git a/nixos/release.nix b/nixos/release.nix
index df2c52ccd0b6..c7c609658909 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -196,6 +196,22 @@ in rec {
);
+ # A disk image that can be imported to Amazon EC2 and registered as an AMI
+ amazonImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system:
+
+ with import nixpkgs { inherit system; };
+
+ hydraJob ((import lib/eval-config.nix {
+ inherit system;
+ modules =
+ [ versionModule
+ ./maintainers/scripts/ec2/amazon-image.nix
+ ];
+ }).config.system.build.amazonImage)
+
+ );
+
+
# Ensure that all packages used by the minimal NixOS config end up in the channel.
dummy = forAllSystems (system: pkgs.runCommand "dummy"
{ toplevel = (import lib/eval-config.nix {
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 557ee78df7c6..60762de76d33 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -87,6 +87,7 @@ in
flatpak = handleTest ./flatpak.nix {};
flatpak-builder = handleTest ./flatpak-builder.nix {};
fluentd = handleTest ./fluentd.nix {};
+ fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {};
fsck = handleTest ./fsck.nix {};
fwupd = handleTestOn ["x86_64-linux"] ./fwupd.nix {}; # libsmbios is unsupported on aarch64
gdk-pixbuf = handleTest ./gdk-pixbuf.nix {};
@@ -94,6 +95,7 @@ in
gitlab = handleTest ./gitlab.nix {};
gitolite = handleTest ./gitolite.nix {};
gjs = handleTest ./gjs.nix {};
+ glib-networking = handleTest ./glib-networking.nix {};
glusterfs = handleTest ./glusterfs.nix {};
gnome3-xorg = handleTest ./gnome3-xorg.nix {};
gnome3 = handleTest ./gnome3.nix {};
@@ -143,6 +145,7 @@ in
latestKernel.login = handleTest ./login.nix { latestKernel = true; };
ldap = handleTest ./ldap.nix {};
leaps = handleTest ./leaps.nix {};
+ libgdata = handleTest ./libgdata.nix {};
libxmlb = handleTest ./libxmlb.nix {};
lidarr = handleTest ./lidarr.nix {};
lightdm = handleTest ./lightdm.nix {};
@@ -223,7 +226,6 @@ in
predictable-interface-names = handleTest ./predictable-interface-names.nix {};
printing = handleTest ./printing.nix {};
prometheus = handleTest ./prometheus.nix {};
- prometheus2 = handleTest ./prometheus-2.nix {};
prometheus-exporters = handleTest ./prometheus-exporters.nix {};
prosody = handleTest ./xmpp/prosody.nix {};
prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {};
@@ -233,6 +235,7 @@ in
rabbitmq = handleTest ./rabbitmq.nix {};
radarr = handleTest ./radarr.nix {};
radicale = handleTest ./radicale.nix {};
+ redis = handleTest ./redis.nix {};
redmine = handleTest ./redmine.nix {};
roundcube = handleTest ./roundcube.nix {};
rspamd = handleTest ./rspamd.nix {};
diff --git a/nixos/tests/beegfs.nix b/nixos/tests/beegfs.nix
index 9c241fd2301a..3465272f5599 100644
--- a/nixos/tests/beegfs.nix
+++ b/nixos/tests/beegfs.nix
@@ -23,7 +23,7 @@ let
}
];
- environment.etc."${connAuthFile}" = {
+ environment.etc.${connAuthFile} = {
enable = true;
text = "ThisIsALousySecret";
mode = "0600";
@@ -47,7 +47,7 @@ let
];
environment.systemPackages = with pkgs; [ beegfs ];
- environment.etc."${connAuthFile}" = {
+ environment.etc.${connAuthFile} = {
enable = true;
text = "ThisIsALousySecret";
mode = "0600";
@@ -57,7 +57,7 @@ let
services.beegfs.default = {
mgmtdHost = "mgmt";
connAuthFile = "/etc/${connAuthFile}";
- "${service}" = {
+ ${service} = {
enable = true;
storeDir = "/data";
};
diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix
index fdb87dbea438..165f64b0d6dc 100644
--- a/nixos/tests/borgbackup.nix
+++ b/nixos/tests/borgbackup.nix
@@ -44,7 +44,7 @@ in {
client = { ... }: {
services.borgbackup.jobs = {
- local = rec {
+ local = {
paths = dataDir;
repo = localRepo;
preHook = ''
diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix
index 7408029c460e..57120ff978f7 100644
--- a/nixos/tests/ceph.nix
+++ b/nixos/tests/ceph.nix
@@ -1,12 +1,13 @@
-import ./make-test.nix ({pkgs, ...}: rec {
+import ./make-test.nix ({pkgs, lib, ...}: {
name = "All-in-one-basic-ceph-cluster";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ lejonet ];
+ maintainers = [ johanot lejonet ];
};
nodes = {
aio = { pkgs, ... }: {
virtualisation = {
+ memorySize = 1536;
emptyDiskImages = [ 20480 20480 ];
vlans = [ 1 ];
};
@@ -24,9 +25,6 @@ import ./make-test.nix ({pkgs, ...}: rec {
ceph
xfsprogs
];
- nixpkgs.config.packageOverrides = super: {
- ceph = super.ceph.override({ nss = super.nss; libxfs = super.libxfs; libaio = super.libaio; jemalloc = super.jemalloc; });
- };
boot.kernelModules = [ "xfs" ];
@@ -51,6 +49,9 @@ import ./make-test.nix ({pkgs, ...}: rec {
enable = true;
daemons = [ "0" "1" ];
};
+
+ # So that we don't have to battle systemd when bootstraping
+ systemd.targets.ceph.wantedBy = lib.mkForce [];
};
};
@@ -61,24 +62,26 @@ import ./make-test.nix ({pkgs, ...}: rec {
# Create the ceph-related directories
$aio->mustSucceed(
- "mkdir -p /var/lib/ceph/mgr/ceph-aio/",
- "mkdir -p /var/lib/ceph/mon/ceph-aio/",
- "mkdir -p /var/lib/ceph/osd/ceph-{0..1}/",
- "chown ceph:ceph -R /var/lib/ceph/"
+ "mkdir -p /var/lib/ceph/mgr/ceph-aio",
+ "mkdir -p /var/lib/ceph/mon/ceph-aio",
+ "mkdir -p /var/lib/ceph/osd/ceph-{0,1}",
+ "chown ceph:ceph -R /var/lib/ceph/",
+ "mkdir -p /etc/ceph",
+ "chown ceph:ceph -R /etc/ceph"
);
# Bootstrap ceph-mon daemon
$aio->mustSucceed(
- "mkdir -p /var/lib/ceph/bootstrap-osd && chown ceph:ceph /var/lib/ceph/bootstrap-osd",
"sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'",
- "ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --set-uid=0 --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'",
- "ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring",
- "monmaptool --create --add aio 192.168.1.1 --fsid 066ae264-2a5d-4729-8001-6ad265f50b03 /tmp/monmap",
+ "sudo -u ceph ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'",
+ "sudo -u ceph ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring",
+ "monmaptool --create --add aio 192.168.1.1 --fsid 066ae264-2a5d-4729-8001-6ad265f50b03 /tmp/monmap",
"sudo -u ceph ceph-mon --mkfs -i aio --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring",
- "touch /var/lib/ceph/mon/ceph-aio/done",
+ "sudo -u ceph touch /var/lib/ceph/mon/ceph-aio/done",
"systemctl start ceph-mon-aio"
);
$aio->waitForUnit("ceph-mon-aio");
+ $aio->mustSucceed("ceph mon enable-msgr2");
# Can't check ceph status until a mon is up
$aio->succeed("ceph -s | grep 'mon: 1 daemons'");
@@ -90,6 +93,7 @@ import ./make-test.nix ({pkgs, ...}: rec {
);
$aio->waitForUnit("ceph-mgr-aio");
$aio->waitUntilSucceeds("ceph -s | grep 'quorum aio'");
+ $aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active,'");
# Bootstrap both OSDs
$aio->mustSucceed(
@@ -112,8 +116,8 @@ import ./make-test.nix ({pkgs, ...}: rec {
"systemctl start ceph-osd-1"
);
- $aio->waitUntilSucceeds("ceph osd stat | grep '2 osds: 2 up, 2 in'");
- $aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active)'");
+ $aio->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'");
+ $aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active,'");
$aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
$aio->mustSucceed(
@@ -135,5 +139,23 @@ import ./make-test.nix ({pkgs, ...}: rec {
"ceph osd pool ls | grep 'aio-test'",
"ceph osd pool delete aio-other-test aio-other-test --yes-i-really-really-mean-it"
);
+
+ # As we disable the target in the config, we still want to test that it works as intended
+ $aio->mustSucceed(
+ "systemctl stop ceph-osd-0",
+ "systemctl stop ceph-osd-1",
+ "systemctl stop ceph-mgr-aio",
+ "systemctl stop ceph-mon-aio"
+ );
+ $aio->succeed("systemctl start ceph.target");
+ $aio->waitForUnit("ceph-mon-aio");
+ $aio->waitForUnit("ceph-mgr-aio");
+ $aio->waitForUnit("ceph-osd-0");
+ $aio->waitForUnit("ceph-osd-1");
+ $aio->succeed("ceph -s | grep 'mon: 1 daemons'");
+ $aio->waitUntilSucceeds("ceph -s | grep 'quorum aio'");
+ $aio->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'");
+ $aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active,'");
+ $aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
'';
})
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index e03bb9882540..6660eecf05b9 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -23,8 +23,7 @@ import ./make-test.nix ({ pkgs, ...} : {
maintainers = [ ehmry ];
};
- nodes = rec
- { # Alice finds peers over over ETHInterface.
+ nodes = { # Alice finds peers over over ETHInterface.
alice =
{ ... }:
{ imports = [ basicConfig ];
diff --git a/nixos/tests/cockroachdb.nix b/nixos/tests/cockroachdb.nix
index 56c624d8cf2f..496283fddc7b 100644
--- a/nixos/tests/cockroachdb.nix
+++ b/nixos/tests/cockroachdb.nix
@@ -100,7 +100,7 @@ in import ./make-test.nix ({ pkgs, ...} : {
meta.maintainers = with pkgs.stdenv.lib.maintainers;
[ thoughtpolice ];
- nodes = rec {
+ nodes = {
node1 = makeNode "country=us,region=east,dc=1" "192.168.1.1" null;
node2 = makeNode "country=us,region=west,dc=2b" "192.168.1.2" "192.168.1.1";
node3 = makeNode "country=eu,region=west,dc=2" "192.168.1.3" "192.168.1.1";
diff --git a/nixos/tests/common/letsencrypt/default.nix b/nixos/tests/common/letsencrypt/default.nix
index 8fe59bf4e70c..58d87c64e344 100644
--- a/nixos/tests/common/letsencrypt/default.nix
+++ b/nixos/tests/common/letsencrypt/default.nix
@@ -56,11 +56,11 @@
let
softhsm = pkgs.stdenv.mkDerivation rec {
- name = "softhsm-${version}";
+ pname = "softhsm";
version = "1.3.8";
src = pkgs.fetchurl {
- url = "https://dist.opendnssec.org/source/${name}.tar.gz";
+ url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz";
sha256 = "0flmnpkgp65ym7w3qyg78d3fbmvq3aznmi66rgd420n33shf7aif";
};
diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix
index 9726ca0cb0e7..f41dea91b1e4 100644
--- a/nixos/tests/containers-reloadable.nix
+++ b/nixos/tests/containers-reloadable.nix
@@ -1,11 +1,11 @@
import ./make-test.nix ({ pkgs, lib, ...} :
let
- client_base = rec {
+ client_base = {
containers.test1 = {
autoStart = true;
config = {
- environment.etc."check".text = "client_base";
+ environment.etc.check.text = "client_base";
};
};
@@ -29,7 +29,7 @@ in {
imports = [ client_base ];
containers.test1.config = {
- environment.etc."check".text = lib.mkForce "client_c1";
+ environment.etc.check.text = lib.mkForce "client_c1";
services.httpd.enable = true;
services.httpd.adminAddr = "nixos@example.com";
};
@@ -38,7 +38,7 @@ in {
imports = [ client_base ];
containers.test1.config = {
- environment.etc."check".text = lib.mkForce "client_c2";
+ environment.etc.check.text = lib.mkForce "client_c2";
services.nginx.enable = true;
};
};
diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix
index 0fb3b591e9f9..df15f5b2f455 100644
--- a/nixos/tests/containers-restart_networking.nix
+++ b/nixos/tests/containers-restart_networking.nix
@@ -1,7 +1,7 @@
# Test for NixOS' container support.
let
- client_base = rec {
+ client_base = {
networking.firewall.enable = false;
containers.webserver = {
diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix
index 05c21f4907bf..e29fe6bbf032 100644
--- a/nixos/tests/containers-tmpfs.nix
+++ b/nixos/tests/containers-tmpfs.nix
@@ -3,7 +3,7 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "containers-tmpfs";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ ckampka ];
+ maintainers = [ kampka ];
};
machine =
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix
index 95371ef44436..b33d98b85d69 100644
--- a/nixos/tests/elk.nix
+++ b/nixos/tests/elk.nix
@@ -178,13 +178,7 @@ let
'';
};
in mapAttrs mkElkTest {
- "ELK-5" = {
- elasticsearch = pkgs.elasticsearch5;
- logstash = pkgs.logstash5;
- kibana = pkgs.kibana5;
- journalbeat = pkgs.journalbeat5;
- };
- "ELK-6" =
+ ELK-6 =
if enableUnfree
then {
elasticsearch = pkgs.elasticsearch6;
@@ -198,7 +192,7 @@ in mapAttrs mkElkTest {
kibana = pkgs.kibana6-oss;
journalbeat = pkgs.journalbeat6;
};
- "ELK-7" =
+ ELK-7 =
if enableUnfree
then {
elasticsearch = pkgs.elasticsearch7;
diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix
index 064c498204ae..6c681905b19f 100644
--- a/nixos/tests/env.nix
+++ b/nixos/tests/env.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
machine = { pkgs, ... }:
{
boot.kernelPackages = pkgs.linuxPackages;
- environment.etc."plainFile".text = ''
+ environment.etc.plainFile.text = ''
Hello World
'';
environment.etc."folder/with/file".text = ''
diff --git a/nixos/tests/flannel.nix b/nixos/tests/flannel.nix
index 0b261a684772..9991c5eaa329 100644
--- a/nixos/tests/flannel.nix
+++ b/nixos/tests/flannel.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : rec {
+import ./make-test.nix ({ pkgs, ...} : {
name = "flannel";
meta = with pkgs.stdenv.lib.maintainers; {
diff --git a/nixos/tests/fontconfig-default-fonts.nix b/nixos/tests/fontconfig-default-fonts.nix
new file mode 100644
index 000000000000..1991cec92189
--- /dev/null
+++ b/nixos/tests/fontconfig-default-fonts.nix
@@ -0,0 +1,28 @@
+import ./make-test.nix ({ lib, ... }:
+{
+ name = "fontconfig-default-fonts";
+
+ machine = { config, pkgs, ... }: {
+ fonts.enableDefaultFonts = true; # Background fonts
+ fonts.fonts = with pkgs; [
+ noto-fonts-emoji
+ cantarell-fonts
+ twitter-color-emoji
+ source-code-pro
+ gentium
+ ];
+ fonts.fontconfig.defaultFonts = {
+ serif = [ "Gentium Plus" ];
+ sansSerif = [ "Cantarell" ];
+ monospace = [ "Source Code Pro" ];
+ emoji = [ "Twitter Color Emoji" ];
+ };
+ };
+
+ testScript = ''
+ $machine->succeed("fc-match serif | grep '\"Gentium Plus\"'");
+ $machine->succeed("fc-match sans-serif | grep '\"Cantarell\"'");
+ $machine->succeed("fc-match monospace | grep '\"Source Code Pro\"'");
+ $machine->succeed("fc-match emoji | grep '\"Twitter Color Emoji\"'");
+ '';
+})
diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index ac733461932d..be0b3c8746a9 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -21,7 +21,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; {
enable = true;
recommendedProxySettings = true;
virtualHosts = {
- "localhost" = {
+ localhost = {
locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
};
};
@@ -29,44 +29,14 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; {
services.gitlab = {
enable = true;
- databasePassword = "dbPassword";
- inherit initialRootPassword;
+ databasePasswordFile = pkgs.writeText "dbPassword" "xo0daiF4";
+ initialRootPasswordFile = pkgs.writeText "rootPassword" initialRootPassword;
smtp.enable = true;
secrets = {
- secret = "secret";
- otp = "otpsecret";
- db = "dbsecret";
-
- # nix-shell -p openssl --run "openssl genrsa 2048"
- jws = ''
- -----BEGIN RSA PRIVATE KEY-----
- MIIEpAIBAAKCAQEA13/qEio76OWUtWO0WIz9lWnsTWOU8Esv4sQHDq9PCEFsLt21
- PAXrlWhLjjWcxGfsrDwnh7YErGHYL62BMSxMdFJolaknlQK/O/V8UETDe45VoHM+
- Znk270RfUcfYFgiihnXUZXVmL0om9TsQSk646wCcjCY9LxtxUyKNhvT7KjgYw2aX
- z34aw7M+Js3T2p1TjZPSC82GtmtKkJEKFMi5EjprLTDE7EdcUzr9Xuw+kQ+gRm9k
- 7FE+JQqSoprwE3Q0v2OAn3UhLMgg0gNFRnsc5l6IAshDzV+H22RPqKKlJjVjjfPY
- 0TQSvYLVApigHbDPH0BoCXfjFfQazbbP3OUHrwIDAQABAoIBAQCMU+tkcMQaYIV5
- qLdjgkwO467QpivyXcOM8wF1eosIYTHFQvIlZ+WEoSmyLQ8shlADyBgls01Pw1c3
- lNAv6RzQEmmwKzpvOh61OKH+0whIiOMRXHoh2IUBQZCgfHYlwvGyhUAN4WjtGmhM
- AG4XNTQNM5S9Xpkw97nP3Qwz+YskbbkrfqtCEVy9ro+4nhbjqPsuO3adbnkva4zR
- cyurRhrHgHU6LPjn5NHnHH4qw2faY2oAsL8pmpkTbO5IqWDvOcbjNfjVPgVoq26O
- bbaa1qs4nmc80qQgMjRPJef535xyf3eLsSlDvpf6O8sPrJzVR1zaqEqixpQCZDac
- +kRiSBrhAoGBAOwHiq0PuyJh6VzBu7ybqX6+gF/wA4Jkwzx6mbfaBgurvU1aospp
- kisIonAkxSbxllZMnjbkShZEdATYKeT9o5NEhnU4YnHfc5bJZbiWOZAzYGLcY7g8
- vDQ31pBItyY4pFgPbSpNlbUvUsoPVJ45RasRADDTNCzMzdjFQQXst2V9AoGBAOm7
- sSpzYfFPLEAhieAkuhtbsX58Boo46djiKVfzGftfp6F9aHTOfzGORU5jrZ16mSbS
- qkkC6BEFrATX2051dzzXC89fWoJYALrsffE5I3KlKXsCAWSnCP1MMxOfH+Ls61Mr
- 7pK/LKfvJt53mUH4jIdbmmFUDwbg18oBEH+x9PmbAoGAS/+JqXu9N67rIxDGUE6W
- 3tacI0f2+U9Uhe67/DTZaXyc8YFTlXU0uWKIWy+bw5RaYeM9tlL/f/f+m2i25KK+
- vrZ7zNag7CWU5GJovGyykDnauTpZaYM03mN0VPT08/uc/zXIYqyknbhlIeaZynCK
- fDB3LUF0NVCknz20WCIGU0kCgYEAkxY0ZXx61Dp4pFr2wwEZxQGs7uXpz64FKyEX
- 12r6nMATY4Lh6y/Px0W6w5vis8lk+5Ny6cNUevHQ0LNuJS+yu6ywl+1vrbrnqroM
- f3LvpcPeGLSoX8jl1VDQi7aFgG6LoKly1xJLbdsH4NPutB9PgBbbTghx9GgmI88L
- rPA2M6UCgYBOmkYJocNgxg6B1/n4Tb9fN1Q/XuJrFDE6NxVUoke+IIyMPRH7FC3m
- VMYzu+b7zTVJjaBb1cmJemxl/xajziWDofJYPefhdbOVU7HXtmJFY0IG3pVxU1zW
- 3bmDj5QAtCUDpuuNa6GEIT0YR4+D/V7o3DmlZ0tVIwKJmVJoQ2f5dw==
- -----END RSA PRIVATE KEY-----
- '';
+ secretFile = pkgs.writeText "secret" "Aig5zaic";
+ otpFile = pkgs.writeText "otpsecret" "Riew9mue";
+ dbFile = pkgs.writeText "dbsecret" "we2quaeZ";
+ jwsFile = pkgs.runCommand "oidcKeyBase" {} "${pkgs.openssl}/bin/openssl genrsa 2048 > $out";
};
};
};
diff --git a/nixos/tests/glib-networking.nix b/nixos/tests/glib-networking.nix
new file mode 100644
index 000000000000..c0bbb2b3554b
--- /dev/null
+++ b/nixos/tests/glib-networking.nix
@@ -0,0 +1,17 @@
+# run installed tests
+import ./make-test.nix ({ pkgs, ... }:
+
+{
+ name = "glib-networking";
+ meta = {
+ maintainers = pkgs.glib-networking.meta.maintainers;
+ };
+
+ machine = { pkgs, ... }: {
+ environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
+ };
+
+ testScript = ''
+ $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.glib-networking.installedTests}/share'");
+ '';
+})
diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
index 1ff329bd98de..90f9793b370c 100644
--- a/nixos/tests/hardened.nix
+++ b/nixos/tests/hardened.nix
@@ -28,7 +28,7 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
let
- hardened-malloc-tests = pkgs.stdenv.mkDerivation rec {
+ hardened-malloc-tests = pkgs.stdenv.mkDerivation {
name = "hardened-malloc-tests-${pkgs.graphene-hardened-malloc.version}";
src = pkgs.graphene-hardened-malloc.src;
buildPhase = ''
diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixos/tests/hocker-fetchdocker/machine.nix
index 78343f0e02f0..885adebe1498 100644
--- a/nixos/tests/hocker-fetchdocker/machine.nix
+++ b/nixos/tests/hocker-fetchdocker/machine.nix
@@ -11,8 +11,8 @@
systemd.services.docker-load-fetchdocker-image = {
description = "Docker load hello-world-container";
wantedBy = [ "multi-user.target" ];
- wants = [ "docker.service" "local-fs.target" ];
- after = [ "docker.service" "local-fs.target" ];
+ wants = [ "docker.service" ];
+ after = [ "docker.service" ];
script = ''
${pkgs.hello-world-container}/compositeImage.sh | ${pkgs.docker}/bin/docker load
diff --git a/nixos/tests/initrd-network-ssh/default.nix b/nixos/tests/initrd-network-ssh/default.nix
index b2209f297a4f..796c50c610e3 100644
--- a/nixos/tests/initrd-network-ssh/default.nix
+++ b/nixos/tests/initrd-network-ssh/default.nix
@@ -6,7 +6,7 @@ import ../make-test.nix ({ lib, ... }:
maintainers = [ willibutz ];
};
- nodes = with lib; rec {
+ nodes = with lib; {
server =
{ config, ... }:
{
diff --git a/nixos/tests/jackett.nix b/nixos/tests/jackett.nix
index 399a0c272327..c749c32ad04e 100644
--- a/nixos/tests/jackett.nix
+++ b/nixos/tests/jackett.nix
@@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }:
with lib;
-rec {
+{
name = "jackett";
meta.maintainers = with maintainers; [ etu ];
diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix
index 212023859f6d..f21634c4ffbf 100644
--- a/nixos/tests/kubernetes/base.nix
+++ b/nixos/tests/kubernetes/base.nix
@@ -30,10 +30,7 @@ let
{ config, pkgs, lib, nodes, ... }:
mkMerge [
{
- boot = {
- postBootCommands = "rm -fr /var/lib/kubernetes/secrets /tmp/shared/*";
- kernel.sysctl = { "fs.inotify.max_user_instances" = 256; };
- };
+ boot.postBootCommands = "rm -fr /var/lib/kubernetes/secrets /tmp/shared/*";
virtualisation.memorySize = mkDefault 1536;
virtualisation.diskSize = mkDefault 4096;
networking = {
@@ -71,7 +68,7 @@ let
443 # kubernetes apiserver
];
})
- (optionalAttrs (machine ? "extraConfiguration") (machine.extraConfiguration { inherit config pkgs lib nodes; }))
+ (optionalAttrs (machine ? extraConfiguration) (machine.extraConfiguration { inherit config pkgs lib nodes; }))
(optionalAttrs (extraConfiguration != null) (extraConfiguration { inherit config pkgs lib nodes; }))
]
) machines;
diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix
index e7db0a58ab61..46bcb01a5265 100644
--- a/nixos/tests/kubernetes/dns.nix
+++ b/nixos/tests/kubernetes/dns.nix
@@ -77,7 +77,6 @@ let
singleNodeTest = {
test = ''
# prepare machine1 for test
- $machine1->waitForUnit("kubernetes.target");
$machine1->waitUntilSucceeds("kubectl get node machine1.${domain} | grep -w Ready");
$machine1->waitUntilSucceeds("docker load < ${redisImage}");
$machine1->waitUntilSucceeds("kubectl create -f ${redisPod}");
@@ -103,8 +102,6 @@ let
# Node token exchange
$machine1->waitUntilSucceeds("cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret");
$machine2->waitUntilSucceeds("cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join");
- $machine1->waitForUnit("kubernetes.target");
- $machine2->waitForUnit("kubernetes.target");
# prepare machines for test
$machine1->waitUntilSucceeds("kubectl get node machine2.${domain} | grep -w Ready");
diff --git a/nixos/tests/kubernetes/rbac.nix b/nixos/tests/kubernetes/rbac.nix
index 967fe506004f..3ce7adcd0d71 100644
--- a/nixos/tests/kubernetes/rbac.nix
+++ b/nixos/tests/kubernetes/rbac.nix
@@ -94,8 +94,6 @@ let
singlenode = base // {
test = ''
- $machine1->waitForUnit("kubernetes.target");
-
$machine1->waitUntilSucceeds("kubectl get node machine1.my.zyx | grep -w Ready");
$machine1->waitUntilSucceeds("docker load < ${kubectlImage}");
@@ -118,8 +116,6 @@ let
# Node token exchange
$machine1->waitUntilSucceeds("cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret");
$machine2->waitUntilSucceeds("cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join");
- $machine1->waitForUnit("kubernetes.target");
- $machine2->waitForUnit("kubernetes.target");
$machine1->waitUntilSucceeds("kubectl get node machine2.my.zyx | grep -w Ready");
diff --git a/nixos/tests/ldap.nix b/nixos/tests/ldap.nix
index fe859876ed25..665b9ee09b55 100644
--- a/nixos/tests/ldap.nix
+++ b/nixos/tests/ldap.nix
@@ -115,7 +115,7 @@ in
);
slapdDatabases = {
- "${dbSuffix}" = {
+ ${dbSuffix} = {
conf = ''
dn: olcBackend={1}mdb,cn=config
objectClass: olcBackendConfig
diff --git a/nixos/tests/libgdata.nix b/nixos/tests/libgdata.nix
new file mode 100644
index 000000000000..10a3ca97dd22
--- /dev/null
+++ b/nixos/tests/libgdata.nix
@@ -0,0 +1,21 @@
+# run installed tests
+import ./make-test.nix ({ pkgs, ... }:
+
+{
+ name = "libgdata";
+
+ meta = {
+ maintainers = pkgs.libgdata.meta.maintainers;
+ };
+
+ machine = { pkgs, ... }: {
+ environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
+ # # GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation dummy (GDummyTlsBackend) for ‘gio-tls-backend’
+ # Bail out! libgdata:ERROR:../gdata/tests/common.c:134:gdata_test_init: assertion failed (child_error == NULL): TLS support is not available (g-tls-error-quark, 0)
+ services.gnome3.glib-networking.enable = true;
+ };
+
+ testScript = ''
+ $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.libgdata.installedTests}/share'");
+ '';
+})
diff --git a/nixos/tests/lidarr.nix b/nixos/tests/lidarr.nix
index 58bf82503f8c..85fcbd21d8c0 100644
--- a/nixos/tests/lidarr.nix
+++ b/nixos/tests/lidarr.nix
@@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }:
with lib;
-rec {
+{
name = "lidarr";
meta.maintainers = with maintainers; [ etu ];
diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix
index 9844ad492e88..2a7c063d3033 100644
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -9,6 +9,7 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
machine =
{ pkgs, lib, ... }:
{ boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest;
+ sound.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
};
testScript =
diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix
index bd5447de15ff..b4c897c3ab5d 100644
--- a/nixos/tests/mosquitto.nix
+++ b/nixos/tests/mosquitto.nix
@@ -16,7 +16,7 @@ let
"-t ${topic}"
];
-in rec {
+in {
name = "mosquitto";
meta = with pkgs.stdenv.lib; {
maintainers = with maintainers; [ peterhoeg ];
@@ -34,7 +34,7 @@ in rec {
enable = true;
host = "0.0.0.0";
checkPasswords = true;
- users."${username}" = {
+ users.${username} = {
inherit password;
acl = [
"topic readwrite ${topic}"
diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix
index dadd16fd9a0c..652d49a24b1c 100644
--- a/nixos/tests/mumble.nix
+++ b/nixos/tests/mumble.nix
@@ -63,8 +63,8 @@ in
$client2->sendChars("y");
# Find clients in logs
- $server->waitUntilSucceeds("grep -q 'client1' /var/log/murmur/murmurd.log");
- $server->waitUntilSucceeds("grep -q 'client2' /var/log/murmur/murmurd.log");
+ $server->waitUntilSucceeds("journalctl -eu murmur -o cat | grep -q client1");
+ $server->waitUntilSucceeds("journalctl -eu murmur -o cat | grep -q client2");
$server->sleep(5); # wait to get screenshot
$client1->screenshot("screen1");
diff --git a/nixos/tests/ndppd.nix b/nixos/tests/ndppd.nix
index c53ff93a91f9..6a6f602726de 100644
--- a/nixos/tests/ndppd.nix
+++ b/nixos/tests/ndppd.nix
@@ -37,7 +37,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : {
};
services.ndppd = {
enable = true;
- proxies."eth1".rules."fd42::/112" = {};
+ proxies.eth1.rules."fd42::/112" = {};
};
containers.client = {
autoStart = true;
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 6ce64dcebea0..7452768033ab 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -440,12 +440,12 @@ let
virtual = {
name = "Virtual";
machine = {
- networking.interfaces."tap0" = {
+ networking.interfaces.tap0 = {
ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ];
ipv6.addresses = [ { address = "2001:1470:fffd:2096::"; prefixLength = 64; } ];
virtual = true;
};
- networking.interfaces."tun0" = {
+ networking.interfaces.tun0 = {
ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ];
ipv6.addresses = [ { address = "2001:1470:fffd:2097::"; prefixLength = 64; } ];
virtual = true;
@@ -561,7 +561,7 @@ let
name = "routes";
machine = {
networking.useDHCP = false;
- networking.interfaces."eth0" = {
+ networking.interfaces.eth0 = {
ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ];
ipv6.addresses = [ { address = "2001:1470:fffd:2097::"; prefixLength = 64; } ];
ipv6.routes = [
diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
index c0d347238b47..aaf37ee4c810 100644
--- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix
+++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
@@ -50,7 +50,7 @@ in {
'';
};
- systemd.services."nextcloud-setup"= {
+ systemd.services.nextcloud-setup= {
requires = ["mysql.service"];
after = ["mysql.service"];
};
diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
index 8a840a608753..81c269c23788 100644
--- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix
+++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
@@ -51,7 +51,7 @@ in {
serviceConfig.PermissionsStartOnly = true;
};
- systemd.services."nextcloud-setup"= {
+ systemd.services.nextcloud-setup= {
requires = ["postgresql.service"];
after = [
"postgresql.service"
@@ -62,7 +62,7 @@ in {
# At the time of writing, redis creates its socket with the "nobody"
# group. I figure this is slightly less bad than making the socket world
# readable.
- systemd.services."chown-redis-socket" = {
+ systemd.services.chown-redis-socket = {
enable = true;
script = ''
until ${pkgs.redis}/bin/redis-cli ping; do
diff --git a/nixos/tests/nghttpx.nix b/nixos/tests/nghttpx.nix
index d41fa01aa9a8..11611bfe1063 100644
--- a/nixos/tests/nghttpx.nix
+++ b/nixos/tests/nghttpx.nix
@@ -15,7 +15,7 @@ in
services.nginx = {
enable = true;
- virtualHosts."server" = {
+ virtualHosts.server = {
locations."/".root = nginxRoot;
};
};
diff --git a/nixos/tests/pgmanage.nix b/nixos/tests/pgmanage.nix
index 110cbd5c5b40..bacaf3f41588 100644
--- a/nixos/tests/pgmanage.nix
+++ b/nixos/tests/pgmanage.nix
@@ -21,7 +21,7 @@ in
pgmanage = {
enable = true;
connections = {
- "${conn}" = "hostaddr=127.0.0.1 port=${toString config.services.postgresql.port} dbname=postgres";
+ ${conn} = "hostaddr=127.0.0.1 port=${toString config.services.postgresql.port} dbname=postgres";
};
};
};
diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
index 788c8719c8d2..88d4ff334369 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixos/tests/plasma5.nix
@@ -30,6 +30,7 @@ import ./make-test.nix ({ pkgs, ...} :
enable = true;
user = "alice";
};
+ hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
virtualisation.memorySize = 1024;
environment.systemPackages = [ sddm_theme ];
};
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 74583ae55623..4d0df289cf75 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -1,99 +1,114 @@
# Test printing via CUPS.
-import ./make-test.nix ({pkgs, ... }: {
+import ./make-test.nix ({pkgs, ... }:
+let
+ printingServer = startWhenNeeded: {
+ services.printing.enable = true;
+ services.printing.startWhenNeeded = startWhenNeeded;
+ services.printing.listenAddresses = [ "*:631" ];
+ services.printing.defaultShared = true;
+ services.printing.extraConf =
+ ''
+
+ Order allow,deny
+ Allow from all
+
+ '';
+ networking.firewall.allowedTCPPorts = [ 631 ];
+ # Add a HP Deskjet printer connected via USB to the server.
+ hardware.printers.ensurePrinters = [{
+ name = "DeskjetLocal";
+ deviceUri = "usb://foobar/printers/foobar";
+ model = "drv:///sample.drv/deskjet.ppd";
+ }];
+ };
+ printingClient = startWhenNeeded: {
+ services.printing.enable = true;
+ services.printing.startWhenNeeded = startWhenNeeded;
+ # Add printer to the client as well, via IPP.
+ hardware.printers.ensurePrinters = [{
+ name = "DeskjetRemote";
+ deviceUri = "ipp://${if startWhenNeeded then "socketActivatedServer" else "serviceServer"}/printers/DeskjetLocal";
+ model = "drv:///sample.drv/deskjet.ppd";
+ }];
+ hardware.printers.ensureDefaultPrinter = "DeskjetRemote";
+ };
+
+in
+
+{
name = "printing";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ domenkozar eelco matthewbauer ];
};
nodes = {
+ socketActivatedServer = { ... }: (printingServer true);
+ serviceServer = { ... }: (printingServer false);
- server =
- { ... }:
- { services.printing.enable = true;
- services.printing.listenAddresses = [ "*:631" ];
- services.printing.defaultShared = true;
- services.printing.extraConf =
- ''
-
- Order allow,deny
- Allow from all
-
- '';
- networking.firewall.allowedTCPPorts = [ 631 ];
- };
-
- client =
- { ... }:
- { services.printing.enable = true;
- };
-
+ socketActivatedClient = { ... }: (printingClient true);
+ serviceClient = { ... }: (printingClient false);
};
testScript =
''
startAll;
- $client->succeed("lpstat -r") =~ /scheduler is running/ or die;
- # check local encrypted connections work without error
- $client->succeed("lpstat -E -r") =~ /scheduler is running/ or die;
- # Test that UNIX socket is used for connections.
- $client->succeed("lpstat -H") =~ "/run/cups/cups.sock" or die;
- # Test that HTTP server is available too.
- $client->succeed("curl --fail http://localhost:631/");
- $client->succeed("curl --fail http://server:631/");
- $server->fail("curl --fail --connect-timeout 2 http://client:631/");
-
- # Add a HP Deskjet printer connected via USB to the server.
- $server->succeed("lpadmin -p DeskjetLocal -E -v usb://foobar/printers/foobar");
-
- # Add it to the client as well via IPP.
- $client->succeed("lpadmin -p DeskjetRemote -E -v ipp://server/printers/DeskjetLocal");
- $client->succeed("lpadmin -d DeskjetRemote");
-
- # Do some status checks.
- $client->succeed("lpstat -a") =~ /DeskjetRemote accepting requests/ or die;
- $client->succeed("lpstat -h server:631 -a") =~ /DeskjetLocal accepting requests/ or die;
- $client->succeed("cupsdisable DeskjetRemote");
- $client->succeed("lpq") =~ /DeskjetRemote is not ready.*no entries/s or die;
- $client->succeed("cupsenable DeskjetRemote");
- $client->succeed("lpq") =~ /DeskjetRemote is ready.*no entries/s or die;
-
- # Test printing various file types.
- foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf",
- "${pkgs.groff.doc}/share/doc/*/meref.ps",
- "${pkgs.cups.out}/share/doc/cups/images/cups.png",
- "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt")
- {
- $file =~ /([^\/]*)$/; my $fn = $1;
-
- subtest "print $fn", sub {
-
- # Print the file on the client.
- $client->succeed("lp $file");
- $client->sleep(10);
- $client->succeed("lpq") =~ /active.*root.*$fn/ or die;
-
- # Ensure that a raw PCL file appeared in the server's queue
- # (showing that the right filters have been applied). Of
- # course, since there is no actual USB printer attached, the
- # file will stay in the queue forever.
- $server->waitForFile("/var/spool/cups/d*-001");
- $server->sleep(10);
- $server->succeed("lpq -a") =~ /$fn/ or die;
-
- # Delete the job on the client. It should disappear on the
- # server as well.
- $client->succeed("lprm");
- $client->sleep(10);
- $client->succeed("lpq -a") =~ /no entries/;
- Machine::retry sub {
- return 1 if $server->succeed("lpq -a") =~ /no entries/;
+ # Make sure that cups is up on both sides.
+ $serviceServer->waitForUnit("cups.service");
+ $serviceClient->waitForUnit("cups.service");
+ # wait until cups is fully initialized and ensure-printers has executed with 10s delay
+ $serviceClient->sleep(20);
+ $socketActivatedClient->waitUntilSucceeds("systemctl status ensure-printers | grep -q -E 'code=exited, status=0/SUCCESS'");
+ sub testPrinting {
+ my ($client, $server) = (@_);
+ my $clientHostname = $client->name();
+ my $serverHostname = $server->name();
+ $client->succeed("lpstat -r") =~ /scheduler is running/ or die;
+ # Test that UNIX socket is used for connections.
+ $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
+ # Test that HTTP server is available too.
+ $client->succeed("curl --fail http://localhost:631/");
+ $client->succeed("curl --fail http://$serverHostname:631/");
+ $server->fail("curl --fail --connect-timeout 2 http://$clientHostname:631/");
+ # Do some status checks.
+ $client->succeed("lpstat -a") =~ /DeskjetRemote accepting requests/ or die;
+ $client->succeed("lpstat -h $serverHostname:631 -a") =~ /DeskjetLocal accepting requests/ or die;
+ $client->succeed("cupsdisable DeskjetRemote");
+ $client->succeed("lpq") =~ /DeskjetRemote is not ready.*no entries/s or die;
+ $client->succeed("cupsenable DeskjetRemote");
+ $client->succeed("lpq") =~ /DeskjetRemote is ready.*no entries/s or die;
+ # Test printing various file types.
+ foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf",
+ "${pkgs.groff.doc}/share/doc/*/meref.ps",
+ "${pkgs.cups.out}/share/doc/cups/images/cups.png",
+ "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt")
+ {
+ $file =~ /([^\/]*)$/; my $fn = $1;
+ subtest "print $fn", sub {
+ # Print the file on the client.
+ $client->succeed("lp $file");
+ $client->waitUntilSucceeds("lpq | grep -q -E 'active.*root.*$fn'");
+ # Ensure that a raw PCL file appeared in the server's queue
+ # (showing that the right filters have been applied). Of
+ # course, since there is no actual USB printer attached, the
+ # file will stay in the queue forever.
+ $server->waitForFile("/var/spool/cups/d*-001");
+ $server->waitUntilSucceeds("lpq -a | grep -q -E '$fn'");
+ # Delete the job on the client. It should disappear on the
+ # server as well.
+ $client->succeed("lprm");
+ $client->waitUntilSucceeds("lpq -a | grep -q -E 'no entries'");
+ Machine::retry sub {
+ return 1 if $server->succeed("lpq -a") =~ /no entries/;
+ };
+ # The queue is empty already, so this should be safe.
+ # Otherwise, pairs of "c*"-"d*-001" files might persist.
+ $server->execute("rm /var/spool/cups/*");
};
- # The queue is empty already, so this should be safe.
- # Otherwise, pairs of "c*"-"d*-001" files might persist.
- $server->execute("rm /var/spool/cups/*");
- };
+ }
}
- '';
+ testPrinting($serviceClient, $serviceServer);
+ testPrinting($socketActivatedClient, $socketActivatedServer);
+ '';
})
diff --git a/nixos/tests/prometheus-2.nix b/nixos/tests/prometheus-2.nix
deleted file mode 100644
index 219c47c73d95..000000000000
--- a/nixos/tests/prometheus-2.nix
+++ /dev/null
@@ -1,239 +0,0 @@
-let
- grpcPort = 19090;
- queryPort = 9090;
- minioPort = 9000;
- pushgwPort = 9091;
-
- s3 = {
- accessKey = "BKIKJAA5BMMU2RHO6IBB";
- secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
- };
-
- objstore.config = {
- type = "S3";
- config = {
- bucket = "thanos-bucket";
- endpoint = "s3:${toString minioPort}";
- region = "us-east-1";
- access_key = s3.accessKey;
- secret_key = s3.secretKey;
- insecure = true;
- signature_version2 = false;
- encrypt_sse = false;
- put_user_metadata = {};
- http_config = {
- idle_conn_timeout = "0s";
- insecure_skip_verify = false;
- };
- trace = {
- enable = false;
- };
- };
- };
-
-in import ./make-test.nix {
- name = "prometheus-2";
-
- nodes = {
- prometheus = { pkgs, ... }: {
- virtualisation.diskSize = 2 * 1024;
- environment.systemPackages = [ pkgs.jq ];
- networking.firewall.allowedTCPPorts = [ grpcPort ];
- services.prometheus2 = {
- enable = true;
- scrapeConfigs = [
- {
- job_name = "prometheus";
- static_configs = [
- {
- targets = [ "127.0.0.1:${toString queryPort}" ];
- labels = { instance = "localhost"; };
- }
- ];
- }
- {
- job_name = "pushgateway";
- scrape_interval = "1s";
- static_configs = [
- {
- targets = [ "127.0.0.1:${toString pushgwPort}" ];
- }
- ];
- }
- ];
- rules = [
- ''
- groups:
- - name: test
- rules:
- - record: testrule
- expr: count(up{job="prometheus"})
- ''
- ];
- globalConfig = {
- external_labels = {
- some_label = "required by thanos";
- };
- };
- extraFlags = [
- # Required by thanos
- "--storage.tsdb.min-block-duration=5s"
- "--storage.tsdb.max-block-duration=5s"
- ];
- };
- services.prometheus.pushgateway = {
- enable = true;
- web.listen-address = ":${toString pushgwPort}";
- persistMetrics = true;
- persistence.interval = "1s";
- stateDir = "prometheus-pushgateway";
- };
- services.thanos = {
- sidecar = {
- enable = true;
- grpc-address = "0.0.0.0:${toString grpcPort}";
- inherit objstore;
- };
-
- # TODO: Add some tests for these services:
- #rule = {
- # enable = true;
- # http-address = "0.0.0.0:19194";
- # grpc-address = "0.0.0.0:19193";
- # query.addresses = [
- # "localhost:19191"
- # ];
- # labels = {
- # just = "some";
- # nice = "labels";
- # };
- #};
- #
- #receive = {
- # http-address = "0.0.0.0:19195";
- # enable = true;
- # labels = {
- # just = "some";
- # nice = "labels";
- # };
- #};
- };
- };
-
- query = { pkgs, ... }: {
- environment.systemPackages = [ pkgs.jq ];
- services.thanos.query = {
- enable = true;
- http-address = "0.0.0.0:${toString queryPort}";
- store.addresses = [
- "prometheus:${toString grpcPort}"
- ];
- };
- };
-
- store = { pkgs, ... }: {
- virtualisation.diskSize = 2 * 1024;
- environment.systemPackages = with pkgs; [ jq thanos ];
- services.thanos.store = {
- enable = true;
- http-address = "0.0.0.0:10902";
- grpc-address = "0.0.0.0:${toString grpcPort}";
- inherit objstore;
- sync-block-duration = "1s";
- };
- services.thanos.compact = {
- enable = true;
- http-address = "0.0.0.0:10903";
- inherit objstore;
- consistency-delay = "5s";
- };
- services.thanos.query = {
- enable = true;
- http-address = "0.0.0.0:${toString queryPort}";
- store.addresses = [
- "localhost:${toString grpcPort}"
- ];
- };
- };
-
- s3 = { pkgs, ... } : {
- # Minio requires at least 1GiB of free disk space to run.
- virtualisation.diskSize = 2 * 1024;
- networking.firewall.allowedTCPPorts = [ minioPort ];
-
- services.minio = {
- enable = true;
- inherit (s3) accessKey secretKey;
- };
-
- environment.systemPackages = [ pkgs.minio-client ];
- };
- };
-
- testScript = { nodes, ... } : ''
- # Before starting the other machines we first make sure that our S3 service is online
- # and has a bucket added for thanos:
- $s3->start;
- $s3->waitForUnit("minio.service");
- $s3->waitForOpenPort(${toString minioPort});
- $s3->succeed(
- "mc config host add minio " .
- "http://localhost:${toString minioPort} ${s3.accessKey} ${s3.secretKey} S3v4");
- $s3->succeed("mc mb minio/thanos-bucket");
-
- # Now that s3 has started we can start the other machines:
- $prometheus->start;
- $query->start;
- $store->start;
-
- # Check if prometheus responds to requests:
- $prometheus->waitForUnit("prometheus2.service");
- $prometheus->waitForOpenPort(${toString queryPort});
- $prometheus->succeed("curl -s http://127.0.0.1:${toString queryPort}/metrics");
-
- # Let's test if pushing a metric to the pushgateway succeeds:
- $prometheus->waitForUnit("pushgateway.service");
- $prometheus->succeed(
- "echo 'some_metric 3.14' | " .
- "curl --data-binary \@- http://127.0.0.1:${toString pushgwPort}/metrics/job/some_job");
-
- # Now check whether that metric gets ingested by prometheus.
- # Since we'll check for the metric several times on different machines
- # we abstract the test using the following function:
-
- # Function to check if the metric "some_metric" has been received and returns the correct value.
- local *Machine::waitForMetric = sub {
- my ($self) = @_;
- $self->waitUntilSucceeds(
- "curl -sf 'http://127.0.0.1:${toString queryPort}/api/v1/query?query=some_metric' " .
- "| jq '.data.result[0].value[1]' | grep '\"3.14\"'");
- };
-
- $prometheus->waitForMetric;
-
- # Let's test if the pushgateway persists metrics to the configured location.
- $prometheus->waitUntilSucceeds("test -e /var/lib/prometheus-pushgateway/metrics");
-
- # Test thanos
- $prometheus->waitForUnit("thanos-sidecar.service");
-
- # Test if the Thanos query service can correctly retrieve the metric that was send above.
- $query->waitForUnit("thanos-query.service");
- $query->waitForMetric;
-
- # Test if the Thanos sidecar has correctly uploaded its TSDB to S3, if the
- # Thanos storage service has correctly downloaded it from S3 and if the Thanos
- # query service running on $store can correctly retrieve the metric:
- $store->waitForUnit("thanos-store.service");
- $store->waitForMetric;
-
- $store->waitForUnit("thanos-compact.service");
-
- # Test if the Thanos bucket command is able to retrieve blocks from the S3 bucket
- # and check if the blocks have the correct labels:
- $store->succeed(
- "thanos bucket ls" .
- " --objstore.config-file=${nodes.store.config.services.thanos.store.objstore.config-file}" .
- " --output=json | jq .thanos.labels.some_label | grep 'required by thanos'");
- '';
-}
diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index 02d83f82f338..9826b56b74d7 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -297,6 +297,22 @@ let
'';
};
+ rspamd = {
+ exporterConfig = {
+ enable = true;
+ };
+ metricProvider = {
+ services.rspamd.enable = true;
+ };
+ exporterTest = ''
+ waitForUnit("rspamd.service");
+ waitForUnit("prometheus-rspamd-exporter.service");
+ waitForOpenPort(11334);
+ waitForOpenPort(7980);
+ waitUntilSucceeds("curl -sSf localhost:7980/metrics | grep -q 'rspamd_scanned{host=\"rspamd\"} 0'");
+ '';
+ };
+
snmp = {
exporterConfig = {
enable = true;
diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix
index f1b20a33d71e..52f61046be39 100644
--- a/nixos/tests/prometheus.nix
+++ b/nixos/tests/prometheus.nix
@@ -1,48 +1,239 @@
-import ./make-test.nix {
- name = "prometheus";
+let
+ grpcPort = 19090;
+ queryPort = 9090;
+ minioPort = 9000;
+ pushgwPort = 9091;
- nodes = {
- one = { ... }: {
- services.prometheus = {
- enable = true;
- scrapeConfigs = [{
- job_name = "prometheus";
- static_configs = [{
- targets = [ "127.0.0.1:9090" ];
- labels = { instance = "localhost"; };
- }];
- }];
- rules = [ ''testrule = count(up{job="prometheus"})'' ];
+ s3 = {
+ accessKey = "BKIKJAA5BMMU2RHO6IBB";
+ secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
+ };
- # a very simple version of the alertmanager configuration just to see if
- # configuration checks & service startup are working
- alertmanager = {
- enable = true;
- listenAddress = "[::1]";
- port = 9093;
- configuration = {
- route.receiver = "webhook";
- receivers = [
- {
- name = "webhook";
- webhook_configs = [
- { url = "http://localhost"; }
- ];
- }
- ];
- };
- };
+ objstore.config = {
+ type = "S3";
+ config = {
+ bucket = "thanos-bucket";
+ endpoint = "s3:${toString minioPort}";
+ region = "us-east-1";
+ access_key = s3.accessKey;
+ secret_key = s3.secretKey;
+ insecure = true;
+ signature_version2 = false;
+ encrypt_sse = false;
+ put_user_metadata = {};
+ http_config = {
+ idle_conn_timeout = "0s";
+ insecure_skip_verify = false;
+ };
+ trace = {
+ enable = false;
};
};
};
- testScript = ''
- startAll;
- $one->waitForUnit("prometheus.service");
- $one->waitForOpenPort(9090);
- $one->succeed("curl -s http://127.0.0.1:9090/metrics");
- $one->waitForUnit("alertmanager.service");
- $one->waitForOpenPort("9093");
- $one->succeed("curl -f -s http://localhost:9093/");
+in import ./make-test.nix {
+ name = "prometheus";
+
+ nodes = {
+ prometheus = { pkgs, ... }: {
+ virtualisation.diskSize = 2 * 1024;
+ environment.systemPackages = [ pkgs.jq ];
+ networking.firewall.allowedTCPPorts = [ grpcPort ];
+ services.prometheus = {
+ enable = true;
+ scrapeConfigs = [
+ {
+ job_name = "prometheus";
+ static_configs = [
+ {
+ targets = [ "127.0.0.1:${toString queryPort}" ];
+ labels = { instance = "localhost"; };
+ }
+ ];
+ }
+ {
+ job_name = "pushgateway";
+ scrape_interval = "1s";
+ static_configs = [
+ {
+ targets = [ "127.0.0.1:${toString pushgwPort}" ];
+ }
+ ];
+ }
+ ];
+ rules = [
+ ''
+ groups:
+ - name: test
+ rules:
+ - record: testrule
+ expr: count(up{job="prometheus"})
+ ''
+ ];
+ globalConfig = {
+ external_labels = {
+ some_label = "required by thanos";
+ };
+ };
+ extraFlags = [
+ # Required by thanos
+ "--storage.tsdb.min-block-duration=5s"
+ "--storage.tsdb.max-block-duration=5s"
+ ];
+ };
+ services.prometheus.pushgateway = {
+ enable = true;
+ web.listen-address = ":${toString pushgwPort}";
+ persistMetrics = true;
+ persistence.interval = "1s";
+ stateDir = "prometheus-pushgateway";
+ };
+ services.thanos = {
+ sidecar = {
+ enable = true;
+ grpc-address = "0.0.0.0:${toString grpcPort}";
+ inherit objstore;
+ };
+
+ # TODO: Add some tests for these services:
+ #rule = {
+ # enable = true;
+ # http-address = "0.0.0.0:19194";
+ # grpc-address = "0.0.0.0:19193";
+ # query.addresses = [
+ # "localhost:19191"
+ # ];
+ # labels = {
+ # just = "some";
+ # nice = "labels";
+ # };
+ #};
+ #
+ #receive = {
+ # http-address = "0.0.0.0:19195";
+ # enable = true;
+ # labels = {
+ # just = "some";
+ # nice = "labels";
+ # };
+ #};
+ };
+ };
+
+ query = { pkgs, ... }: {
+ environment.systemPackages = [ pkgs.jq ];
+ services.thanos.query = {
+ enable = true;
+ http-address = "0.0.0.0:${toString queryPort}";
+ store.addresses = [
+ "prometheus:${toString grpcPort}"
+ ];
+ };
+ };
+
+ store = { pkgs, ... }: {
+ virtualisation.diskSize = 2 * 1024;
+ environment.systemPackages = with pkgs; [ jq thanos ];
+ services.thanos.store = {
+ enable = true;
+ http-address = "0.0.0.0:10902";
+ grpc-address = "0.0.0.0:${toString grpcPort}";
+ inherit objstore;
+ sync-block-duration = "1s";
+ };
+ services.thanos.compact = {
+ enable = true;
+ http-address = "0.0.0.0:10903";
+ inherit objstore;
+ consistency-delay = "5s";
+ };
+ services.thanos.query = {
+ enable = true;
+ http-address = "0.0.0.0:${toString queryPort}";
+ store.addresses = [
+ "localhost:${toString grpcPort}"
+ ];
+ };
+ };
+
+ s3 = { pkgs, ... } : {
+ # Minio requires at least 1GiB of free disk space to run.
+ virtualisation.diskSize = 2 * 1024;
+ networking.firewall.allowedTCPPorts = [ minioPort ];
+
+ services.minio = {
+ enable = true;
+ inherit (s3) accessKey secretKey;
+ };
+
+ environment.systemPackages = [ pkgs.minio-client ];
+ };
+ };
+
+ testScript = { nodes, ... } : ''
+ # Before starting the other machines we first make sure that our S3 service is online
+ # and has a bucket added for thanos:
+ $s3->start;
+ $s3->waitForUnit("minio.service");
+ $s3->waitForOpenPort(${toString minioPort});
+ $s3->succeed(
+ "mc config host add minio " .
+ "http://localhost:${toString minioPort} ${s3.accessKey} ${s3.secretKey} S3v4");
+ $s3->succeed("mc mb minio/thanos-bucket");
+
+ # Now that s3 has started we can start the other machines:
+ $prometheus->start;
+ $query->start;
+ $store->start;
+
+ # Check if prometheus responds to requests:
+ $prometheus->waitForUnit("prometheus.service");
+ $prometheus->waitForOpenPort(${toString queryPort});
+ $prometheus->succeed("curl -s http://127.0.0.1:${toString queryPort}/metrics");
+
+ # Let's test if pushing a metric to the pushgateway succeeds:
+ $prometheus->waitForUnit("pushgateway.service");
+ $prometheus->succeed(
+ "echo 'some_metric 3.14' | " .
+ "curl --data-binary \@- http://127.0.0.1:${toString pushgwPort}/metrics/job/some_job");
+
+ # Now check whether that metric gets ingested by prometheus.
+ # Since we'll check for the metric several times on different machines
+ # we abstract the test using the following function:
+
+ # Function to check if the metric "some_metric" has been received and returns the correct value.
+ local *Machine::waitForMetric = sub {
+ my ($self) = @_;
+ $self->waitUntilSucceeds(
+ "curl -sf 'http://127.0.0.1:${toString queryPort}/api/v1/query?query=some_metric' " .
+ "| jq '.data.result[0].value[1]' | grep '\"3.14\"'");
+ };
+
+ $prometheus->waitForMetric;
+
+ # Let's test if the pushgateway persists metrics to the configured location.
+ $prometheus->waitUntilSucceeds("test -e /var/lib/prometheus-pushgateway/metrics");
+
+ # Test thanos
+ $prometheus->waitForUnit("thanos-sidecar.service");
+
+ # Test if the Thanos query service can correctly retrieve the metric that was send above.
+ $query->waitForUnit("thanos-query.service");
+ $query->waitForMetric;
+
+ # Test if the Thanos sidecar has correctly uploaded its TSDB to S3, if the
+ # Thanos storage service has correctly downloaded it from S3 and if the Thanos
+ # query service running on $store can correctly retrieve the metric:
+ $store->waitForUnit("thanos-store.service");
+ $store->waitForMetric;
+
+ $store->waitForUnit("thanos-compact.service");
+
+ # Test if the Thanos bucket command is able to retrieve blocks from the S3 bucket
+ # and check if the blocks have the correct labels:
+ $store->succeed(
+ "thanos bucket ls" .
+ " --objstore.config-file=${nodes.store.config.services.thanos.store.objstore.config-file}" .
+ " --output=json | jq .thanos.labels.some_label | grep 'required by thanos'");
'';
}
diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
index fbb798515e1a..4253ce4a8672 100644
--- a/nixos/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
@@ -4,7 +4,7 @@ let
# Build Quake with coverage instrumentation.
overrides = pkgs:
- rec {
+ {
quake3game = pkgs.quake3game.override (args: {
stdenv = pkgs.stdenvAdapters.addCoverageInstrumentation args.stdenv;
});
@@ -12,9 +12,9 @@ let
# Only allow the demo data to be used (only if it's unfreeRedistributable).
unfreePredicate = pkg: with pkgs.lib; let
- allowDrvPredicates = [ "quake3-demo" "quake3-pointrelease" ];
+ allowPackageNames = [ "quake3-demodata" "quake3-pointrelease" ];
allowLicenses = [ pkgs.lib.licenses.unfreeRedistributable ];
- in any (flip hasPrefix pkg.name) allowDrvPredicates &&
+ in elem pkg.pname allowPackageNames &&
elem (pkg.meta.license or null) allowLicenses;
in
@@ -42,7 +42,7 @@ rec {
{ server =
{ pkgs, ... }:
- { systemd.services."quake3-server" =
+ { systemd.services.quake3-server =
{ wantedBy = [ "multi-user.target" ];
script =
"${pkgs.quake3demo}/bin/quake3-server +set g_gametype 0 " +
diff --git a/nixos/tests/radarr.nix b/nixos/tests/radarr.nix
index 6b9a909e44b5..9bc5607ccd5a 100644
--- a/nixos/tests/radarr.nix
+++ b/nixos/tests/radarr.nix
@@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }:
with lib;
-rec {
+{
name = "radarr";
meta.maintainers = with maintainers; [ etu ];
diff --git a/nixos/tests/redis.nix b/nixos/tests/redis.nix
new file mode 100644
index 000000000000..325d93424dd7
--- /dev/null
+++ b/nixos/tests/redis.nix
@@ -0,0 +1,26 @@
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "redis";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ flokli ];
+ };
+
+ nodes = {
+ machine =
+ { pkgs, ... }:
+
+ {
+ services.redis.enable = true;
+ services.redis.unixSocket = "/run/redis/redis.sock";
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $machine->waitForUnit("redis");
+ $machine->waitForOpenPort("6379");
+
+ $machine->succeed("redis-cli ping | grep PONG");
+ $machine->succeed("redis-cli -s /run/redis/redis.sock ping | grep PONG");
+ '';
+})
diff --git a/nixos/tests/sonarr.nix b/nixos/tests/sonarr.nix
index 3d5c3b19b6ea..3e84445099ab 100644
--- a/nixos/tests/sonarr.nix
+++ b/nixos/tests/sonarr.nix
@@ -2,7 +2,7 @@ import ./make-test.nix ({ lib, ... }:
with lib;
-rec {
+{
name = "sonarr";
meta.maintainers = with maintainers; [ etu ];
diff --git a/nixos/tests/strongswan-swanctl.nix b/nixos/tests/strongswan-swanctl.nix
index 8bbebd423003..9bab9349ea73 100644
--- a/nixos/tests/strongswan-swanctl.nix
+++ b/nixos/tests/strongswan-swanctl.nix
@@ -65,16 +65,16 @@ in {
enable = true;
swanctl = {
connections = {
- "rw" = {
+ rw = {
local_addrs = [ moonIp ];
- local."main" = {
+ local.main = {
auth = "psk";
};
- remote."main" = {
+ remote.main = {
auth = "psk";
};
children = {
- "net" = {
+ net = {
local_ts = [ vlan0 ];
updown = "${strongswan}/libexec/ipsec/_updown iptables";
inherit esp_proposals;
@@ -85,8 +85,8 @@ in {
};
};
secrets = {
- ike."carol" = {
- id."main" = carolIp;
+ ike.carol = {
+ id.main = carolIp;
inherit secret;
};
};
@@ -107,19 +107,19 @@ in {
enable = true;
swanctl = {
connections = {
- "home" = {
+ home = {
local_addrs = [ carolIp ];
remote_addrs = [ moonIp ];
- local."main" = {
+ local.main = {
auth = "psk";
id = carolIp;
};
- remote."main" = {
+ remote.main = {
auth = "psk";
id = moonIp;
};
children = {
- "home" = {
+ home = {
remote_ts = [ vlan0 ];
start_action = "trap";
updown = "${strongswan}/libexec/ipsec/_updown iptables";
@@ -131,8 +131,8 @@ in {
};
};
secrets = {
- ike."moon" = {
- id."main" = moonIp;
+ ike.moon = {
+ id.main = moonIp;
inherit secret;
};
};
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 844ce47d743f..32637d2c1efe 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -10,17 +10,10 @@
# to run 32-bit guests.
useKvmNestedVirt ? false,
# Whether to run 64-bit guests instead of 32-bit. Requires nested KVM.
- use64bitGuest ? false,
- # Whether to enable the virtual UART in VirtualBox guests, allowing to see
- # the guest console. There is currently a bug in VirtualBox where this will
- # cause a crash if running with SW virtualization
- # (https://www.virtualbox.org/ticket/18632). If you need to debug the tests
- # then enable this and nested KVM to work around the crash (see above).
- enableVBoxUART ? false
+ use64bitGuest ? false
}:
assert use64bitGuest -> useKvmNestedVirt;
-assert enableVBoxUART -> useKvmNestedVirt; # VirtualBox bug, see above
with import ../lib/testing.nix { inherit system pkgs; };
with pkgs.lib;
@@ -65,9 +58,6 @@ let
"init=${pkgs.writeScript "mini-init.sh" miniInit}"
];
- # XXX: Remove this once TSS location detection has been fixed in VirtualBox
- boot.kernelPackages = pkgs.linuxPackages_4_9;
-
fileSystems."/" = {
device = "vboxshare";
fsType = "vboxsf";
@@ -162,11 +152,9 @@ let
"--register"
];
- vmFlags = mkFlags (
- (optionals enableVBoxUART [
- "--uart1 0x3F8 4"
- "--uartmode1 client /run/virtualbox-log-${name}.sock"
- ]) ++ [
+ vmFlags = mkFlags ([
+ "--uart1 0x3F8 4"
+ "--uartmode1 client /run/virtualbox-log-${name}.sock"
"--memory 768"
"--audio none"
] ++ (attrs.vmFlags or []));
@@ -199,7 +187,7 @@ let
];
in {
machine = {
- systemd.sockets."vboxtestlog-${name}" = mkIf enableVBoxUART {
+ systemd.sockets."vboxtestlog-${name}" = {
description = "VirtualBox Test Machine Log Socket For ${name}";
wantedBy = [ "sockets.target" ];
before = [ "multi-user.target" ];
@@ -207,7 +195,7 @@ let
socketConfig.Accept = true;
};
- systemd.services."vboxtestlog-${name}@" = mkIf enableVBoxUART {
+ systemd.services."vboxtestlog-${name}@" = {
description = "VirtualBox Test Machine Log For ${name}";
serviceConfig.StandardInput = "socket";
serviceConfig.StandardOutput = "syslog";
diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix
index 12d8a050d47b..6cb4fae2021f 100644
--- a/nixos/tests/xfce.nix
+++ b/nixos/tests/xfce.nix
@@ -17,6 +17,10 @@ import ./make-test.nix ({ pkgs, ...} : {
services.xserver.desktopManager.xfce.enable = true;
environment.systemPackages = [ pkgs.xorg.xmessage ];
+
+ hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
+
+ virtualisation.memorySize = 1024;
};
testScript =
diff --git a/nixos/tests/xfce4-14.nix b/nixos/tests/xfce4-14.nix
index d9b10aabaa1f..94378f0c8d34 100644
--- a/nixos/tests/xfce4-14.nix
+++ b/nixos/tests/xfce4-14.nix
@@ -12,6 +12,10 @@ import ./make-test.nix ({ pkgs, ...} : {
services.xserver.displayManager.auto.user = "alice";
services.xserver.desktopManager.xfce4-14.enable = true;
+
+ hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
+
+ virtualisation.memorySize = 1024;
};
testScript =
diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix
index 3ea7b90f84a7..d9a05e0bf660 100644
--- a/pkgs/applications/audio/AMB-plugins/default.nix
+++ b/pkgs/applications/audio/AMB-plugins/default.nix
@@ -2,10 +2,10 @@
}:
stdenv.mkDerivation rec {
- name = "AMB-plugins-${version}";
+ pname = "AMB-plugins";
version = "0.8.1";
src = fetchurl {
- url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+ url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
sha256 = "0x4blm4visjqj0ndqr0cg776v3b7lvplpc8cgi9n51llhavn0jpl";
};
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
longDescription = ''
Mono and stereo to B-format panning, horizontal rotator, square, hexagon and cube decoders.
'';
- version = "${version}";
+ version = version;
homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.magnetophon ];
diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/applications/audio/FIL-plugins/default.nix
index b9322c37df00..cf383c1dd495 100644
--- a/pkgs/applications/audio/FIL-plugins/default.nix
+++ b/pkgs/applications/audio/FIL-plugins/default.nix
@@ -2,10 +2,10 @@
}:
stdenv.mkDerivation rec {
- name = "FIL-plugins-${version}";
+ pname = "FIL-plugins";
version = "0.3.0";
src = fetchurl {
- url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+ url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
sha256 = "1scfv9j7jrp50r565haa4rvxn1vk2ss86xssl5qgcr8r45qz42qw";
};
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
All switches and controls are internally smoothed, so they can be used 'live' whithout any clicks or zipper noises.
This should make this plugin a good candidate for use in systems that allow automation of plugin control ports, such as Ardour, or for stage use.
'';
- version = "${version}";
+ version = version;
homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.magnetophon ];
diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix
index ed7a8481f693..92f46abddd5a 100644
--- a/pkgs/applications/audio/MMA/default.nix
+++ b/pkgs/applications/audio/MMA/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "16.06";
- name = "mma-${version}";
+ pname = "mma";
src = fetchurl {
url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index 70709ae4ac4c..283317200484 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -4,8 +4,8 @@
let
inherit (python2Packages) python dbus-python;
-in stdenv.mkDerivation rec {
- name = "a2jmidid-${version}";
+in stdenv.mkDerivation {
+ pname = "a2jmidid";
version = "8";
src = fetchurl {
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index b602707b3921..adb38d4bbbab 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -6,7 +6,8 @@
let version = "2.9.3";
in
stdenv.mkDerivation {
- name = "abcde-${version}";
+ pname = "abcde";
+ inherit version;
src = fetchurl {
url = "https://abcde.einval.com/download/abcde-${version}.tar.gz";
sha256 = "091ip2iwb6b67bhjsj05l0sxyq2whqjycbzqpkfbpm4dlyxx0v04";
diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix
index 7b80b32331bc..389052d30e1c 100644
--- a/pkgs/applications/audio/aeolus/default.nix
+++ b/pkgs/applications/audio/aeolus/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "aeolus-${version}";
+ pname = "aeolus";
version = "0.9.7";
src = fetchurl {
- url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+ url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
sha256 = "0lhbr95hmbfj8ynbcpawn7jzjbpvrkm6k2yda39yhqk1bzg38v2k";
};
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index a4aa64280975..c72815d5ca25 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -6,12 +6,9 @@
, curl, ffmpeg, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
}:
-let
+mkDerivation rec {
pname = "amarok";
- version = "2.9.0-20180618";
-
-in mkDerivation {
- name = "${pname}-${version}";
+ version = "2.9.0-20190824";
src = fetchgit {
# master has the Qt5 version as of April 2018 but a formal release has not
@@ -19,8 +16,8 @@ in mkDerivation {
# release is out
url = git://anongit.kde.org/amarok.git;
# url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
- rev = "5d43efa454b6a6c9c833a6f3d7f8ff3cae738c96";
- sha256 = "0fyrbgldg4wbb2darm4aav5fpzbacxzfjrdqwkhv9xr13j7zsvm3";
+ rev = "457fbda25a85a102bfda92aa7137e7ef5e4c8b00";
+ sha256 = "1ig2mg8pqany6m2zplkrvldcv4ibxwsypnyv5igm7nz7ax82cd5j";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix
index d6064e80e3ff..0750c38550b1 100644
--- a/pkgs/applications/audio/ams-lv2/default.nix
+++ b/pkgs/applications/audio/ams-lv2/default.nix
@@ -2,7 +2,7 @@
, wafHook }:
stdenv.mkDerivation rec {
- name = "ams-lv2-${version}";
+ pname = "ams-lv2";
version = "1.2.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix
index 02d818410df4..4b48f5f1eea2 100644
--- a/pkgs/applications/audio/ario/default.nix
+++ b/pkgs/applications/audio/ario/default.nix
@@ -5,10 +5,10 @@
stdenv.mkDerivation rec {
version = "1.6";
- name = "ario-${version}";
+ pname = "ario";
src = fetchurl {
- url = "mirror://sourceforge/ario-player/${name}.tar.gz";
+ url = "mirror://sourceforge/ario-player/${pname}-${version}.tar.gz";
sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl";
};
diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix
index 91a0a1f140c2..4b76ebdf6053 100644
--- a/pkgs/applications/audio/artyFX/default.nix
+++ b/pkgs/applications/audio/artyFX/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:
stdenv.mkDerivation rec {
- name = "artyFX-${version}";
+ pname = "artyFX";
version = "1.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix
index 9c42c98ba5e3..e4c145b35c75 100644
--- a/pkgs/applications/audio/asunder/default.nix
+++ b/pkgs/applications/audio/asunder/default.nix
@@ -13,9 +13,9 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "2.9.3";
- name = "asunder-${version}";
+ pname = "asunder";
src = fetchurl {
- url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2";
+ url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2";
sha256 = "1630i1df06y840v3fgdf75jxw1s8kwbfn5bhi0686viah0scccw5";
};
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 68660b5d054b..12e8237d4857 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -7,7 +7,7 @@
}:
stdenv.mkDerivation rec {
- name = "audacious-${version}";
+ pname = "audacious";
version = "3.9";
src = fetchurl {
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index b685fda7683d..6be40a7b93aa 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -8,7 +8,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "2.3.2";
- name = "audacity-${version}";
+ pname = "audacity";
src = fetchurl {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix
index 7b84cd02a627..534b87e9fa74 100644
--- a/pkgs/applications/audio/audio-recorder/default.nix
+++ b/pkgs/applications/audio/audio-recorder/default.nix
@@ -5,11 +5,11 @@
, pulseaudioSupport ? true, libpulseaudio ? null }:
stdenv.mkDerivation rec {
- name = "audio-recorder-${version}";
+ pname = "audio-recorder";
version = "2.1.3";
src = fetchurl {
- name = "${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ebionic.tar.gz";
sha256 = "160pnmnmc9zwzyclsci3w1qwlgxkfx1y3x5ck6i587w78570an1r";
};
diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix
index c49470b76e2d..7ca5d83b48b2 100644
--- a/pkgs/applications/audio/avldrums-lv2/default.nix
+++ b/pkgs/applications/audio/avldrums-lv2/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, pango, cairo, libGLU, lv2 }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "avldrums.lv2";
version = "0.3.5";
diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix
index e3f1b6acf874..fb9b3c9513f8 100644
--- a/pkgs/applications/audio/axoloti/default.nix
+++ b/pkgs/applications/audio/axoloti/default.nix
@@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
version = "1.0.12-2";
- name = "axoloti-${version}";
+ pname = "axoloti";
src = fetchFromGitHub {
owner = "axoloti";
repo = "axoloti";
- rev = "${version}";
+ rev = version;
sha256 = "1qffis277wshldr3i939b0r2x3a2mlr53samxqmr2nk1sfm2b4w9";
};
diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix
index 07a78260991f..e9fa6daecfe3 100644
--- a/pkgs/applications/audio/axoloti/dfu-util.nix
+++ b/pkgs/applications/audio/axoloti/dfu-util.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, libusb1-axoloti }:
stdenv.mkDerivation rec {
- name="dfu-util-${version}";
+ pname = "dfu-util";
version = "0.8";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libusb1-axoloti ];
src = fetchurl {
- url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz";
+ url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz";
sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm";
};
diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix
index 6827d12b3217..c35df95b24c7 100644
--- a/pkgs/applications/audio/baudline/default.nix
+++ b/pkgs/applications/audio/baudline/default.nix
@@ -7,7 +7,7 @@ let
[ libXmu libXt libX11 libXext libXxf86vm libjack2 ];
in
stdenv.mkDerivation rec {
- name = "baudline-${version}";
+ pname = "baudline";
version = "1.08";
src =
diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix
index fbe2c97042f0..6f471f3a0283 100644
--- a/pkgs/applications/audio/bitmeter/default.nix
+++ b/pkgs/applications/audio/bitmeter/default.nix
@@ -1,11 +1,11 @@
{ stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkgconfig }:
stdenv.mkDerivation rec {
- name = "bitmeter-${version}";
+ pname = "bitmeter";
version = "1.2";
src = fetchurl {
- url = "https://devel.tlrmx.org/audio/source/${name}.tar.gz";
+ url = "https://devel.tlrmx.org/audio/source/${pname}-${version}.tar.gz";
sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7";
};
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
index 31716fce1c21..835868471906 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
@@ -6,7 +6,7 @@
, xdg_utils, zenity, zlib }:
stdenv.mkDerivation rec {
- name = "bitwig-studio-${version}";
+ pname = "bitwig-studio";
version = "1.3.16";
src = fetchurl {
diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix
index e1ed12b9bd2e..504900d65955 100644
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }:
stdenv.mkDerivation rec {
- name = "bristol-${version}";
+ pname = "bristol";
version = "0.60.11";
src = fetchurl {
- url = "mirror://sourceforge/bristol/${name}.tar.gz";
+ url = "mirror://sourceforge/bristol/${pname}-${version}.tar.gz";
sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx";
};
diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix
index adda92353647..2dee463aeee2 100644
--- a/pkgs/applications/audio/bs1770gain/default.nix
+++ b/pkgs/applications/audio/bs1770gain/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ffmpeg, sox }:
stdenv.mkDerivation rec {
- name = "bs1770gain-${version}";
+ pname = "bs1770gain";
version = "0.5.2";
src = fetchurl {
- url = "mirror://sourceforge/bs1770gain/${name}.tar.gz";
+ url = "mirror://sourceforge/bs1770gain/${pname}-${version}.tar.gz";
sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk";
};
diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
index 7d7d25ea88a0..0106e8b45846 100644
--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/applications/audio/calf/default.nix
@@ -2,11 +2,11 @@
, gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }:
stdenv.mkDerivation rec {
- name = "calf-${version}";
+ pname = "calf";
version = "0.90.3";
src = fetchurl {
- url = "https://calf-studio-gear.org/files/${name}.tar.gz";
+ url = "https://calf-studio-gear.org/files/${pname}-${version}.tar.gz";
sha256 = "17x4hylgq4dn9qycsdacfxy64f5cv57n2qgkvsdp524gnqzw4az3";
};
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 292f28554d08..bdbf6a45a6d4 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -35,7 +35,7 @@ let
withUdisks = (withTaglib && withDevices);
-in mkDerivation rec {
+in mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix
index 1f53809e9059..eabbf8668375 100644
--- a/pkgs/applications/audio/caps/default.nix
+++ b/pkgs/applications/audio/caps/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "caps-${version}";
+ pname = "caps";
version = "0.9.26";
src = fetchurl {
url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";
diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix
index 04f0f9d30259..1ab39311258b 100644
--- a/pkgs/applications/audio/caudec/default.nix
+++ b/pkgs/applications/audio/caudec/default.nix
@@ -4,8 +4,9 @@ let
version = "1.7.5";
in
-stdenv.mkDerivation rec {
- name = "caudec-${version}";
+stdenv.mkDerivation {
+ pname = "caudec";
+ inherit version;
src = fetchurl {
url = "http://caudec.net/downloads/caudec-${version}.tar.gz";
diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix
index 439175b090a8..5c5c262056ec 100644
--- a/pkgs/applications/audio/cava/default.nix
+++ b/pkgs/applications/audio/cava/default.nix
@@ -2,7 +2,7 @@
libpulseaudio, ncurses }:
stdenv.mkDerivation rec {
- name = "cava-${version}";
+ pname = "cava";
version = "0.6.1";
buildInputs = [
diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix
index 382d4a1b6675..76f76c1e750d 100644
--- a/pkgs/applications/audio/cd-discid/default.nix
+++ b/pkgs/applications/audio/cd-discid/default.nix
@@ -2,11 +2,11 @@
, IOKit ? null }:
stdenv.mkDerivation rec {
- name = "cd-discid-${version}";
+ pname = "cd-discid";
version = "1.4";
src = fetchurl {
- url = "http://linukz.org/download/${name}.tar.gz";
+ url = "http://linukz.org/download/${pname}-${version}.tar.gz";
sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz";
};
diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix
index da26a7188357..692485d0dcfd 100644
--- a/pkgs/applications/audio/chuck/default.nix
+++ b/pkgs/applications/audio/chuck/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "1.4.0.0";
- name = "chuck-${version}";
+ pname = "chuck";
src = fetchurl {
url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz";
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 1b0dfebe22c2..f48a429b3896 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -67,7 +67,8 @@ let
'';
free = stdenv.mkDerivation {
- name = "clementine-free-${version}";
+ pname = "clementine-free";
+ inherit version;
inherit src patches nativeBuildInputs postPatch;
# gst_plugins needed for setup-hooks
@@ -95,7 +96,8 @@ let
# Unfree Spotify blob for Clementine
unfree = stdenv.mkDerivation {
- name = "clementine-blob-${version}";
+ pname = "clementine-blob";
+ inherit version;
# Use the same patches and sources as Clementine
inherit src nativeBuildInputs postPatch;
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index b574993338de..b88951c0fc5b 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -101,7 +101,7 @@ let
in
stdenv.mkDerivation rec {
- name = "cmus-${version}";
+ pname = "cmus";
version = "2.8.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix
index 2147a84f24be..54f1050da466 100644
--- a/pkgs/applications/audio/cmusfm/default.nix
+++ b/pkgs/applications/audio/cmusfm/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2018-10-11";
- name = "cmusfm-unstable-${version}";
+ pname = "cmusfm-unstable";
src = fetchFromGitHub {
owner = "Arkq";
repo = "cmusfm";
diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix
index f9a53f59e4d4..865bc130db91 100644
--- a/pkgs/applications/audio/cozy-audiobooks/default.nix
+++ b/pkgs/applications/audio/cozy-audiobooks/default.nix
@@ -74,7 +74,7 @@ python3Packages.buildPythonApplication rec {
'';
meta = with stdenv.lib; {
- description = "A modern audio book player for Linux using GTK+ 3";
+ description = "A modern audio book player for Linux using GTK 3";
homepage = https://cozy.geigi.de/;
maintainers = [ maintainers.makefu ];
license = licenses.gpl3;
diff --git a/pkgs/applications/audio/csa/default.nix b/pkgs/applications/audio/csa/default.nix
index c3b3b9441357..0b8afada0206 100644
--- a/pkgs/applications/audio/csa/default.nix
+++ b/pkgs/applications/audio/csa/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "csa-${version}";
+ pname = "csa";
version = "0.5.100810";
src = fetchurl {
- url = "mirror://sourceforge/csa/${name}.tar.gz";
+ url = "mirror://sourceforge/csa/${pname}-${version}.tar.gz";
sha256 = "1syg81dzdil0dyx1mlx1n7if3qsf2iz243p2zv34a1acfqm509r3";
};
diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix
index df0fcb0ee9cd..5cc8d71383b7 100644
--- a/pkgs/applications/audio/csound/csound-manual/default.nix
+++ b/pkgs/applications/audio/csound/csound-manual/default.nix
@@ -4,7 +4,7 @@
libxslt
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "csound-manual";
version = "unstable-2019-02-22";
diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix
index e97341acbb44..d16d93318216 100644
--- a/pkgs/applications/audio/csound/csound-qt/default.nix
+++ b/pkgs/applications/audio/csound/csound-qt/default.nix
@@ -3,13 +3,13 @@
qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }:
stdenv.mkDerivation rec {
- name = "csound-qt-${version}";
+ pname = "csound-qt";
version = "0.9.6-beta3";
src = fetchFromGitHub {
owner = "CsoundQt";
repo = "CsoundQt";
- rev = "${version}";
+ rev = version;
sha256 = "007jhkh0k6qk52r77i067999dwdiimazix6ggp2hvyc4pj6n5dip";
};
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index cb968ee9e00f..758448c2fb33 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -13,7 +13,7 @@
}:
stdenv.mkDerivation rec {
- name = "csound-${version}";
+ pname = "csound";
# When updating, please check if https://github.com/csound/csound/issues/1078
# has been fixed in the new version so we can use the normal fluidsynth
# version and remove fluidsynth 1.x from nixpkgs again.
diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
index dab3a97f6e73..b26360f0c469 100644
--- a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }:
stdenv.mkDerivation rec {
- name = "deadbeef-headerbar-gtk3-plugin-${version}";
+ pname = "deadbeef-headerbar-gtk3-plugin";
version = "1.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/pkgs/applications/audio/deadbeef/plugins/infobar.nix
index d2355681b728..8a81101983f7 100644
--- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/infobar.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, deadbeef, gtk3, libxml2 }:
stdenv.mkDerivation rec {
- name = "deadbeef-infobar-plugin-${version}";
+ pname = "deadbeef-infobar-plugin";
version = "1.4";
src = fetchurl {
diff --git a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix
index 97e054bda64c..699f9d86f68d 100644
--- a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "deadbeef-lyricbar-plugin";
version = "unstable-2019-01-29";
diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
index 4d5367087c10..5b27f3c3f323 100644
--- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, deadbeef, glib }:
stdenv.mkDerivation rec {
- name = "deadbeef-mpris2-plugin-${version}";
+ pname = "deadbeef-mpris2-plugin";
version = "1.12";
src = fetchurl {
- url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz";
+ url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "0s3y4ka4qf38cypc0xspy79q0g5y1kqx6ldad7yr6a45nw6j95jh";
};
diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix
index d01e7879335d..331e3fb96989 100644
--- a/pkgs/applications/audio/denemo/default.nix
+++ b/pkgs/applications/audio/denemo/default.nix
@@ -5,7 +5,7 @@
, portaudio, portmidi, fftw, makeWrapper }:
stdenv.mkDerivation rec {
- name = "denemo-${version}";
+ pname = "denemo";
version = "2.3.0";
src = fetchurl {
diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index d16534b03d32..1785ca60060c 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -27,7 +27,7 @@ let
};
in stdenv.mkDerivation rec {
- name = "dfasma-${version}";
+ pname = "dfasma";
version = "1.4.5";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix
index 6d56f53bd16f..1fcdda408966 100644
--- a/pkgs/applications/audio/dirt/default.nix
+++ b/pkgs/applications/audio/dirt/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dirt-2018-01-01";
src = fetchFromGitHub {
repo = "Dirt";
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 1c41451b08f3..054fc758d645 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -8,7 +8,7 @@ let
else if stdenv.hostPlatform.isWindows then "mingw"
else "linux";
in stdenv.mkDerivation rec {
- name = "distrho-ports-${version}";
+ pname = "distrho-ports";
version = "2018-04-16";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index e5354b060946..11b214f6bb38 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -4,10 +4,10 @@
stdenv.mkDerivation rec {
version = "0.9.17";
- name = "drumgizmo-${version}";
+ pname = "drumgizmo";
src = fetchurl {
- url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
+ url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "177c27kz9srds7a659zz9yhp58z0zsk0ydwww7l3jkjlylm1p8x1";
};
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index f8e1db4814cc..8f1f79169d7b 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }:
stdenv.mkDerivation rec {
- name = "drumkv1-${version}";
+ pname = "drumkv1";
version = "0.9.9";
src = fetchurl {
- url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
+ url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz";
sha256 = "02sa29fdjgwcf7izly685gxvga3bxyyqvskvfiisgm2xg3h9r983";
};
diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix
index 1013b8a560ca..6c9cd628a518 100644
--- a/pkgs/applications/audio/ecasound/default.nix
+++ b/pkgs/applications/audio/ecasound/default.nix
@@ -14,7 +14,7 @@
# TODO: fix readline, ncurses, lilv, liblo, liboil and python. See configure log.
stdenv.mkDerivation rec {
- name = "ecasound-${version}";
+ pname = "ecasound";
version = "2.9.2";
src = fetchurl {
diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix
index 4138a07ec067..2338c0ed376e 100644
--- a/pkgs/applications/audio/eflite/default.nix
+++ b/pkgs/applications/audio/eflite/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }:
stdenv.mkDerivation rec {
- name = "eflite-${version}";
+ pname = "eflite";
version = "0.4.1";
src = fetchurl {
- url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${name}.tar.gz";
+ url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${pname}-${version}.tar.gz";
sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci";
};
diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix
index 209ffa05bf28..0e2c950051a5 100644
--- a/pkgs/applications/audio/ekho/default.nix
+++ b/pkgs/applications/audio/ekho/default.nix
@@ -5,7 +5,8 @@
let
version = "5.8.2";
in stdenv.mkDerivation rec {
- name = "ekho-${version}";
+ pname = "ekho";
+ inherit version;
meta = with stdenv.lib; {
description = "Chinese text-to-speech software";
@@ -23,7 +24,7 @@ in stdenv.mkDerivation rec {
};
src = fetchurl {
- url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${name}.tar.xz";
+ url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${pname}-${version}.tar.xz";
sha256 = "0ym6lpcpsvwvsiwlzkl1509a2hljwcw7synngrmqjq1n49ww00nj";
};
diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix
index 651604c71a11..0308fad831d0 100644
--- a/pkgs/applications/audio/eq10q/default.nix
+++ b/pkgs/applications/audio/eq10q/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig
, xorg }:
stdenv.mkDerivation rec {
- name = "eq10q-${version}";
+ pname = "eq10q";
version = "2.2";
src = fetchurl {
- url = "mirror://sourceforge/project/eq10q/${name}.tar.gz";
+ url = "mirror://sourceforge/project/eq10q/${pname}-${version}.tar.gz";
sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk";
};
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix
index 5d0af8cf17ab..043d5b9d2d3a 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@@ -4,7 +4,7 @@
, sonicSupport ? true, sonic }:
stdenv.mkDerivation rec {
- name = "espeak-ng-${version}";
+ pname = "espeak-ng";
version = "1.49.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/pkgs/applications/audio/eteroj.lv2/default.nix
index 28e4879efdc0..bbfe1ad5623f 100644
--- a/pkgs/applications/audio/eteroj.lv2/default.nix
+++ b/pkgs/applications/audio/eteroj.lv2/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "eteroj.lv2";
version = "0.4.0";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "OpenMusicKontrollers";
diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix
index 6e47d921d345..687608b43524 100644
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/pkgs/applications/audio/faust/faust1.nix
@@ -25,7 +25,8 @@ let
};
faust = stdenv.mkDerivation {
- name = "faust-${version}";
+ pname = "faust";
+ inherit version;
inherit src;
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 383d2deb10bb..21cd3fbdb25a 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -20,7 +20,7 @@ let
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faust";
- rev = "${version}";
+ rev = version;
sha256 = "1pci8ac6sqrm3mb3yikmmr3iy35g3nj4iihazif1amqkbdz719rc";
fetchSubmodules = true;
};
@@ -35,7 +35,8 @@ let
faust = stdenv.mkDerivation {
- name = "faust-${version}";
+ pname = "faust";
+ inherit version;
inherit src;
diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix
index 754c48070603..3b6ca9e4053f 100644
--- a/pkgs/applications/audio/faust/faustlive.nix
+++ b/pkgs/applications/audio/faust/faustlive.nix
@@ -3,8 +3,8 @@
, bc, coreutils, which
}:
-stdenv.mkDerivation rec {
- name = "faustlive-${version}";
+stdenv.mkDerivation {
+ pname = "faustlive";
version = "2017-12-05";
src = fetchFromGitHub {
owner = "grame-cncm";
diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index fb5390cb46ef..df3aa987c3fb 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libogg }:
stdenv.mkDerivation rec {
- name = "flac-1.3.2";
+ name = "flac-1.3.3";
src = fetchurl {
url = "http://downloads.xiph.org/releases/flac/${name}.tar.xz";
- sha256 = "0gymm2j3276kr9nz6vmgfwsdfrq6c449n40a0mzz8h6wc7nw7kwi";
+ sha256 = "0j0p9sf56a2fm2hkjnf7x3py5ir49jyavg4q5zdyd7bcf6yq4gi1";
};
buildInputs = [ libogg ];
diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix
index f0863bfc50b0..19ed23523556 100644
--- a/pkgs/applications/audio/flac123/default.nix
+++ b/pkgs/applications/audio/flac123/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, flac, libao, libogg, popt }:
stdenv.mkDerivation rec {
- name = "flac123-${version}";
+ pname = "flac123";
version = "0.0.12";
src = fetchurl {
- url = "mirror://sourceforge/flac-tools/${name}-release.tar.gz";
+ url = "mirror://sourceforge/flac-tools/${pname}-${version}-release.tar.gz";
sha256 = "0zg4ahkg7v81za518x32wldf42g0rrvlrcqhrg9sv3li9bayyxhr";
};
diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix
index 2d2d88308cc1..02317fee15f1 100644
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/applications/audio/flacon/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "flacon-${version}";
+ pname = "flacon";
version = "5.4.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index 404c9cc825e9..bb86787a3cf0 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -19,7 +19,7 @@ in
with versionMap.${version};
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "fluidsynth-${fluidsynthVersion}";
version = fluidsynthVersion;
diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix
index 58d095080fe5..5e95d7179689 100644
--- a/pkgs/applications/audio/fmsynth/default.nix
+++ b/pkgs/applications/audio/fmsynth/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }:
-stdenv.mkDerivation rec {
- name = "fmsynth-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "fmsynth-unstable";
version = "2015-02-07";
src = fetchFromGitHub {
owner = "Themaister";
diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix
index 680fab4ca643..a92d331baadb 100644
--- a/pkgs/applications/audio/fomp/default.nix
+++ b/pkgs/applications/audio/fomp/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, lv2, pkgconfig, python2, wafHook }:
stdenv.mkDerivation rec {
- name = "fomp-${version}";
+ pname = "fomp";
version = "1.0.0";
src = fetchurl {
- url = "https://download.drobilla.net/${name}.tar.bz2";
+ url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5";
};
diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix
index 28b2cd98e02c..b17561e1567a 100644
--- a/pkgs/applications/audio/foo-yc20/default.nix
+++ b/pkgs/applications/audio/foo-yc20/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "git-2015-05-21";
- name = "foo-yc20-${version}";
+ pname = "foo-yc20";
src = fetchFromGitHub {
owner = "sampov2";
repo = "foo-yc20";
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
index efb832ae625f..a2588093309d 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -7,7 +7,7 @@ let
in
stdenv.mkDerivation rec {
- name = "freewheeling-${version}";
+ pname = "freewheeling";
version = "0.6.5";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix
index a0a79785283c..d95b3eea596d 100644
--- a/pkgs/applications/audio/game-music-emu/default.nix
+++ b/pkgs/applications/audio/game-music-emu/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.6.1";
- name = "game-music-emu-${version}";
+ pname = "game-music-emu";
src = fetchurl {
- url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${name}.tar.bz2";
+ url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.bz2";
sha256 = "08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw";
};
diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix
index e9ce20f6c80a..d8fada45eb16 100644
--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/pkgs/applications/audio/gigedit/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "gigedit-${version}";
+ pname = "gigedit";
version = "1.1.0";
src = fetchurl {
- url = "https://download.linuxsampler.org/packages/${name}.tar.bz2";
+ url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni";
};
diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index 07d5684e98e7..cae35b625190 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "gmpc-${version}";
+ pname = "gmpc";
version = "11.8.16";
libmpd = stdenv.mkDerivation {
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
index 3981bc792769..eeafdc80344d 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -3,9 +3,9 @@
# TODO: build from git for easier updates
# rustPlatform.buildRustPackage rec {
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.4.6";
- name = "gnome-podcasts-${version}";
+ pname = "gnome-podcasts";
src = fetchurl {
url = https://gitlab.gnome.org/World/podcasts/uploads/e59ac5d618d7daf4c7f33ba72957c466/gnome-podcasts-0.4.6.tar.xz;
diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index 7716b1e0c355..b51b72f1c8a4 100644
--- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -43,7 +43,8 @@ let
in
stdenv.mkDerivation {
- name = "google-play-music-desktop-player-${version}";
+ pname = "google-play-music-desktop-player";
+ inherit version;
src = fetchurl {
url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix
index 3aea07235d8a..c4a8f2fce026 100644
--- a/pkgs/applications/audio/gradio/default.nix
+++ b/pkgs/applications/audio/gradio/default.nix
@@ -18,8 +18,9 @@
let
version = "7.2";
-in stdenv.mkDerivation rec {
- name = "gradio-${version}";
+in stdenv.mkDerivation {
+ pname = "gradio";
+ inherit version;
src = fetchFromGitHub {
owner = "haecker-felix";
diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix
index e7a23b6f204c..e027680f5fe6 100644
--- a/pkgs/applications/audio/greg/default.nix
+++ b/pkgs/applications/audio/greg/default.nix
@@ -3,7 +3,6 @@
with pythonPackages; buildPythonApplication rec {
pname = "greg";
version = "0.4.7";
- name = pname + "-" + version;
disabled = !isPy3k;
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index e01dbc1d30fe..fd3632ee1552 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -4,10 +4,10 @@
stdenv.mkDerivation rec {
version = "2.1.5";
- name = "gtkpod-${version}";
+ pname = "gtkpod";
src = fetchurl {
- url = "mirror://sourceforge/gtkpod/${name}.tar.gz";
+ url = "mirror://sourceforge/gtkpod/${pname}-${version}.tar.gz";
sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
};
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 9df4308131eb..91f4b1dcdfe9 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -11,7 +11,7 @@ let
in
stdenv.mkDerivation rec {
- name = "guitarix-${version}";
+ pname = "guitarix";
version = "0.38.1";
src = fetchurl {
diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix
index 04cb57800f95..1f4323eb9d55 100644
--- a/pkgs/applications/audio/gxplugins-lv2/default.nix
+++ b/pkgs/applications/audio/gxplugins-lv2/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "GxPlugins.lv2";
version = "0.7";
diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix
index fa76a1a26e82..64de722afe9e 100644
--- a/pkgs/applications/audio/helm/default.nix
+++ b/pkgs/applications/audio/helm/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2
, lv2, pkgconfig, libGLU_combined }:
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
version = "0.9.0";
- name = "helm-${version}";
+ pname = "helm";
src = fetchFromGitHub {
owner = "mtytel";
diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix
index d68bfbf2ae4e..50093f8a61de 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "0.9.7";
- name = "hydrogen-${version}";
+ pname = "hydrogen";
src = fetchurl {
url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz";
diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix
index 69fc4b419c06..2cc39e649434 100644
--- a/pkgs/applications/audio/i-score/default.nix
+++ b/pkgs/applications/audio/i-score/default.nix
@@ -27,7 +27,7 @@
stdenv.mkDerivation rec {
version = "1.0.0-b31";
- name = "i-score-${version}";
+ pname = "i-score";
src = fetchFromGitHub {
owner = "OSSIA";
diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
index c26980e1bb26..a893390d74ed 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
}:
-stdenv.mkDerivation rec {
- name = "iannix-${version}";
+stdenv.mkDerivation {
+ pname = "iannix";
version = "2016-01-31";
src = fetchFromGitHub {
owner = "iannix";
diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix
index d2720fcace67..0fdb3b2a4a14 100644
--- a/pkgs/applications/audio/id3v2/default.nix
+++ b/pkgs/applications/audio/id3v2/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, id3lib, groff, zlib}:
stdenv.mkDerivation rec {
- name = "id3v2-${version}";
+ pname = "id3v2";
version = "0.1.12";
src = fetchurl {
- url = "mirror://sourceforge/id3v2/${name}.tar.gz";
+ url = "mirror://sourceforge/id3v2/${pname}-${version}.tar.gz";
sha256 = "1gr22w8gar7zh5pyyvdy7cy26i47l57jp1l1nd60xfwx339zl1c1";
};
diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix
index 2b8c041a0740..341c41818421 100644
--- a/pkgs/applications/audio/infamousPlugins/default.nix
+++ b/pkgs/applications/audio/infamousPlugins/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }:
stdenv.mkDerivation rec {
- name = "infamousPlugins-${version}";
+ pname = "infamousPlugins";
version = "0.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix
index 84be6b866fae..9d3656a81f97 100644
--- a/pkgs/applications/audio/ir.lv2/default.nix
+++ b/pkgs/applications/audio/ir.lv2/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }:
stdenv.mkDerivation rec {
- name = "ir.lv2-${version}";
+ pname = "ir.lv2";
version = "1.2.4";
src = fetchFromGitHub {
owner = "tomszilagyi";
repo = "ir.lv2";
- rev = "${version}";
+ rev = version;
sha256 = "1p6makmgr898fakdxzl4agh48qqwgv1k1kwm8cgq187n0mhiknp6";
};
diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix
index 33c74f2b0443..92b2f8ac5153 100644
--- a/pkgs/applications/audio/jaaa/default.nix
+++ b/pkgs/applications/audio/jaaa/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }:
stdenv.mkDerivation rec {
- name = "jaaa-${version}";
+ pname = "jaaa";
version = "0.9.2";
src = fetchurl {
- url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+ url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
sha256 = "1czksxx2g8na07k7g57qlz0vvkkgi5bzajcx7vc7jhb94hwmmxbc";
};
diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix
index f11bba34c74c..c62ccc4fc883 100644
--- a/pkgs/applications/audio/jack-capture/default.nix
+++ b/pkgs/applications/audio/jack-capture/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libjack2, libsndfile, pkgconfig }:
stdenv.mkDerivation rec {
- name = "jack_capture-${version}";
+ pname = "jack_capture";
version = "0.9.73";
src = fetchurl {
- url = "https://archive.notam02.no/arkiv/src/${name}.tar.gz";
+ url = "https://archive.notam02.no/arkiv/src/${pname}-${version}.tar.gz";
sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1";
};
diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix
index 75a8a6a4b1a1..d31bc981e0cb 100644
--- a/pkgs/applications/audio/jack-oscrolloscope/default.nix
+++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, SDL, libjack2, libGLU_combined, pkgconfig }:
stdenv.mkDerivation rec {
- name = "jack_oscrolloscope-${version}";
+ pname = "jack_oscrolloscope";
version = "0.7";
src = fetchurl {
- url = "http://das.nasophon.de/download/${name}.tar.gz";
+ url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";
sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash";
};
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix
index 83644dd5ea51..fe7c83dd56f1 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/applications/audio/jackmix/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, scons, qt4, lash, libjack2, jack ? libjack2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "jackmix-0.5.2";
src = fetchurl {
url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz;
diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix
index 0f1ed143dddd..a40d5101b34f 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -2,11 +2,11 @@
, serd, sord , sratom, suil, wafHook }:
stdenv.mkDerivation rec {
- name = "jalv-${version}";
+ pname = "jalv";
version = "1.6.2";
src = fetchurl {
- url = "https://download.drobilla.net/${name}.tar.bz2";
+ url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
sha256 = "13al2hb9s3m7jgbg051x704bmzmcg4wb56cfh8z588kiyh0mxpaa";
};
diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix
index 18b7bcd1d568..a9eb15aabf35 100644
--- a/pkgs/applications/audio/japa/default.nix
+++ b/pkgs/applications/audio/japa/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.9.2";
- name = "japa-${version}";
+ pname = "japa";
src = fetchurl {
- url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+ url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
sha256 = "1zmi4wg23hwsypg3h6y3qb72cbrihqcs19qrbzgs5a67d13q4897";
};
diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix
index 344e6894baf5..4bb1d63a1e71 100644
--- a/pkgs/applications/audio/keyfinder-cli/default.nix
+++ b/pkgs/applications/audio/keyfinder-cli/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libav, libkeyfinder }:
stdenv.mkDerivation rec {
- name = "keyfinder-cli-${version}";
+ pname = "keyfinder-cli";
version = "2015-09-13";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix
index 55039e8508bc..d47fc3b6190d 100644
--- a/pkgs/applications/audio/keyfinder/default.nix
+++ b/pkgs/applications/audio/keyfinder/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }:
stdenv.mkDerivation rec {
- name = "keyfinder-${version}";
+ pname = "keyfinder";
version = "2.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
index 04d0349c88f6..dfb07c4f4568 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
- name = "kid3-${version}";
+ pname = "kid3";
version = "3.7.1";
src = fetchurl {
- url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz";
sha256 = "0xkrsjrbr3z8cn8hjf623l28r3b755gr11i0clv8d8i3s10vhbd8";
};
diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix
index 5e54609f8bf0..f33245d8f1c9 100644
--- a/pkgs/applications/audio/klick/default.nix
+++ b/pkgs/applications/audio/klick/default.nix
@@ -2,11 +2,11 @@
, libsamplerate, libsndfile, liblo, libjack2, boost }:
stdenv.mkDerivation rec {
- name = "klick-${version}";
+ pname = "klick";
version = "0.12.2";
src = fetchurl {
- url = "http://das.nasophon.de/download/${name}.tar.gz";
+ url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";
sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42";
};
diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix
index a60b3db2fb86..44186abc3c46 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/pkgs/applications/audio/ladspa-plugins/default.nix
@@ -2,7 +2,7 @@
, perlPackages }:
stdenv.mkDerivation rec {
- name = "swh-plugins-${version}";
+ pname = "swh-plugins";
version = "0.4.17";
diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix
index 72bb7010b627..a7779ee8aeea 100644
--- a/pkgs/applications/audio/ladspa-sdk/default.nix
+++ b/pkgs/applications/audio/ladspa-sdk/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ladspa-sdk-${version}";
+ pname = "ladspa-sdk";
version = "1.15";
src = fetchurl {
url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
index b57b7283b850..3fad5de1de59 100644
--- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ladspa.h-${version}";
+ pname = "ladspa.h";
version = "1.15";
src = fetchurl {
url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix
index 7fb5a01e2c80..e96972b0d1b1 100644
--- a/pkgs/applications/audio/lash/default.nix
+++ b/pkgs/applications/audio/lash/default.nix
@@ -4,11 +4,11 @@
assert libuuid != null;
stdenv.mkDerivation rec {
- name = "lash-${version}";
+ pname = "lash";
version = "0.5.4";
src = fetchurl {
- url = "mirror://savannah/lash/${name}.tar.gz";
+ url = "mirror://savannah/lash/${pname}-${version}.tar.gz";
sha256 = "05kc4brcx8mncai0rj2gz4s4bsrsy9q8xlnaddf75i0m8jl7snhh";
};
diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix
index a8e33c23dc0d..b5a99150cb22 100644
--- a/pkgs/applications/audio/linuxband/default.nix
+++ b/pkgs/applications/audio/linuxband/default.nix
@@ -4,10 +4,10 @@ let
inherit (python2Packages) pyGtkGlade pygtksourceview python;
in stdenv.mkDerivation rec {
version = "12.02.1";
- name = "linuxband-${version}";
+ pname = "linuxband";
src = fetchurl {
- url = "http://linuxband.org/assets/sources/${name}.tar.gz";
+ url = "http://linuxband.org/assets/sources/${pname}-${version}.tar.gz";
sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n";
};
diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix
index f173e41321f0..26fc2408d8ac 100644
--- a/pkgs/applications/audio/linuxsampler/default.nix
+++ b/pkgs/applications/audio/linuxsampler/default.nix
@@ -2,11 +2,11 @@
, alsaLib, asio, libjack2, libgig, libsndfile, lv2 }:
stdenv.mkDerivation rec {
- name = "linuxsampler-${version}";
+ pname = "linuxsampler";
version = "2.1.0";
src = fetchurl {
- url = "https://download.linuxsampler.org/packages/${name}.tar.bz2";
+ url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf";
};
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 59e94e0bdad5..d22065eb9fe0 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -4,7 +4,7 @@
, qtbase, qtx11extras, qttools, SDL ? null }:
stdenv.mkDerivation rec {
- name = "lmms-${version}";
+ pname = "lmms";
version = "1.2.0-rc7";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix
index c80485734cae..f3abfbca145d 100644
--- a/pkgs/applications/audio/lsp-plugins/default.nix
+++ b/pkgs/applications/audio/lsp-plugins/default.nix
@@ -6,12 +6,11 @@
stdenv.mkDerivation rec {
pname = "lsp-plugins";
version = "1.1.9";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "sadko4u";
- repo = "${pname}";
- rev = "${name}";
+ repo = pname;
+ rev = "${pname}-${version}";
sha256 = "1dzpl7f354rwp37bkr9h2yyafykcdn6m1qqfshqg77fj0pcsw8r2";
};
diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/pkgs/applications/audio/ltc-tools/default.nix
index 81db133ff9ab..c986e3af288e 100644
--- a/pkgs/applications/audio/ltc-tools/default.nix
+++ b/pkgs/applications/audio/ltc-tools/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, pkgconfig, libltc, libsndfile, jack2}:
stdenv.mkDerivation rec {
- name = "ltc-tools-${version}";
+ pname = "ltc-tools";
version = "0.7.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix
index d3821c51fbc6..f1eddb626245 100644
--- a/pkgs/applications/audio/lv2bm/default.nix
+++ b/pkgs/applications/audio/lv2bm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, glib, lilv, lv2, pkgconfig, serd, sord, sratom }:
-stdenv.mkDerivation rec {
- name = "lv2bm-${version}";
+stdenv.mkDerivation {
+ pname = "lv2bm";
version = "git-2015-11-29";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
index f355c540f301..6488d1bd65e5 100644
--- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
- name = "CharacterCompressor-${version}";
+ pname = "CharacterCompressor";
version = "0.3.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
index 90e4eabeef0b..c5728b6e8b7b 100644
--- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
- name = "CompBus-${version}";
+ pname = "CompBus";
version = "1.1.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
index 73dd7b48e9c4..331e58c4bd29 100644
--- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
- name = "constant-detune-chorus-${version}";
+ pname = "constant-detune-chorus";
version = "0.1.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
index 39065db6edeb..046ee70e990c 100644
--- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
- name = "LazyLimiter-${version}";
+ pname = "LazyLimiter";
version = "0.3.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
index 362451988d38..aa7da17dafd1 100644
--- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
- name = "MBdistortion-${version}";
+ pname = "MBdistortion";
version = "1.1.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
index 3f809aa78474..ae05866e57d0 100644
--- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
- name = "RhythmDelay-${version}";
+ pname = "RhythmDelay";
version = "2.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
index 740763889ffd..718bbdaf49ea 100644
--- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }:
stdenv.mkDerivation rec {
- name = "VoiceOfFaust-${version}";
+ pname = "VoiceOfFaust";
version = "1.1.4";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
index 6237628e600c..356e95bf97c8 100644
--- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
- name = "pluginUtils-${version}";
+ pname = "pluginUtils";
version = "1.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
index cb9247fd3d08..292cd3dfd860 100644
--- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
- name = "shelfMultiBand-${version}";
+ pname = "shelfMultiBand";
version = "0.6.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix
index 26290e5bf888..901be5a23d08 100644
--- a/pkgs/applications/audio/mda-lv2/default.nix
+++ b/pkgs/applications/audio/mda-lv2/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
- name = "mda-lv2-${version}";
+ pname = "mda-lv2";
version = "1.2.2";
src = fetchurl {
- url = "https://download.drobilla.net/${name}.tar.bz2";
+ url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4";
};
diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix
index d16107e4c292..4d2fa0e15b48 100644
--- a/pkgs/applications/audio/meterbridge/default.nix
+++ b/pkgs/applications/audio/meterbridge/default.nix
@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
version = "0.9.3";
- name = "meterbridge-${version}";
+ pname = "meterbridge";
src = fetchurl {
- url = "http://plugin.org.uk/meterbridge/${name}.tar.gz";
+ url = "http://plugin.org.uk/meterbridge/${pname}-${version}.tar.gz";
sha256 = "0s7n3czfpil94vsd7iblv4xrck9c7zvsz4r3yfbkqcv85pjz1viz";
};
diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix
index db70e59218b3..e4d6c0293df8 100644
--- a/pkgs/applications/audio/mhwaveedit/default.nix
+++ b/pkgs/applications/audio/mhwaveedit/default.nix
@@ -3,7 +3,7 @@
, vorbis-tools }:
stdenv.mkDerivation rec {
- name = "mhwaveedit-${version}";
+ pname = "mhwaveedit";
version = "1.4.24";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix
index dd8b28fc2d8b..48052fc4ec88 100644
--- a/pkgs/applications/audio/midisheetmusic/default.nix
+++ b/pkgs/applications/audio/midisheetmusic/default.nix
@@ -5,7 +5,8 @@
let
version = "2.6";
in stdenv.mkDerivation {
- name = "midisheetmusic-${version}";
+ pname = "midisheetmusic";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/midisheetmusic/MidiSheetMusic-${version}-linux-src.tar.gz";
diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index 6b3abeb1e23c..7f86e2c20716 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/pkgs/applications/audio/milkytracker/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "1.02.00";
- name = "milkytracker-${version}";
+ pname = "milkytracker";
src = fetchFromGitHub {
owner = "milkytracker";
diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix
index dcaffe3eb9b4..e91b2c9360de 100644
--- a/pkgs/applications/audio/mimic/default.nix
+++ b/pkgs/applications/audio/mimic/default.nix
@@ -3,7 +3,7 @@
, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }:
stdenv.mkDerivation rec {
- name = "mimic-${version}";
+ pname = "mimic";
version = "1.2.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index bc7c2ff9a24f..5cf9b1b8ab70 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -7,7 +7,7 @@
}:
mkDerivation rec {
- name = "mixxx-${version}";
+ pname = "mixxx";
version = "2.2.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index 3ed330cc7437..89d062d584e5 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -30,7 +30,7 @@ let
in stdenv.mkDerivation rec {
- name = "moc-${version}";
+ pname = "moc";
version = "2.5.2";
src = fetchurl {
diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix
index c66f78373228..c20f04ec9470 100644
--- a/pkgs/applications/audio/mod-distortion/default.nix
+++ b/pkgs/applications/audio/mod-distortion/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, lv2 }:
-stdenv.mkDerivation rec {
- name = "mod-distortion-git-${version}";
+stdenv.mkDerivation {
+ pname = "mod-distortion-git";
version = "2016-08-19";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix
index 1b3e89d4885e..58bb4d3e3274 100644
--- a/pkgs/applications/audio/monkeys-audio/default.nix
+++ b/pkgs/applications/audio/monkeys-audio/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
version = "3.99-u4-b5";
pname = "monkeys-audio";
- name = pname + "-" + version;
patches = [ ./buildfix.diff ];
diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix
index eb5aa7c036cc..727133be78df 100644
--- a/pkgs/applications/audio/mp3blaster/default.nix
+++ b/pkgs/applications/audio/mp3blaster/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
version = "3.2.6";
- name = "mp3blaster-${version}";
+ pname = "mp3blaster";
src = fetchFromGitHub {
owner = "stragulus";
diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix
index f2922e7eecf9..f067c5af6df3 100644
--- a/pkgs/applications/audio/mp3splt/default.nix
+++ b/pkgs/applications/audio/mp3splt/default.nix
@@ -3,11 +3,10 @@
stdenv.mkDerivation rec {
pname = "mp3splt";
version = "2.6.2";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+ url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1aiv20gypb6r84qabz8gblk8vi42cg3x333vk2pi3fyqvl82phry";
};
diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/applications/audio/mp3val/default.nix
index 7477bea7602c..6c35779f6c4c 100644
--- a/pkgs/applications/audio/mp3val/default.nix
+++ b/pkgs/applications/audio/mp3val/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "mp3val-${version}";
+ pname = "mp3val";
version = "0.1.8";
src = fetchurl {
- url = "mirror://sourceforge/mp3val/${name}-src.tar.gz";
+ url = "mirror://sourceforge/mp3val/${pname}-${version}-src.tar.gz";
sha256 = "17y3646ghr38r620vkrxin3dksxqig5yb3nn4cfv6arm7kz6x8cm";
};
diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index 220e72b568af..b13e1cc037a0 100644
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mpd_clientlib }:
stdenv.mkDerivation rec {
- name = "mpc-${version}";
+ pname = "mpc";
version = "0.28";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix
index efaef97257e0..f024e5a6a1d1 100644
--- a/pkgs/applications/audio/mpc123/default.nix
+++ b/pkgs/applications/audio/mpc123/default.nix
@@ -2,10 +2,11 @@
let version = "0.2.4"; in
stdenv.mkDerivation rec {
- name = "mpc123-${version}";
+ pname = "mpc123";
+ inherit version;
src = fetchurl {
- url = "mirror://sourceforge/mpc123/version%20${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/mpc123/version%20${version}/${pname}-${version}.tar.gz";
sha256 = "0sf4pns0245009z6mbxpx7kqy4kwl69bc95wz9v23wgappsvxgy1";
};
diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix
index 3ffc5265f7a0..65dfe3484b66 100644
--- a/pkgs/applications/audio/mpg321/default.nix
+++ b/pkgs/applications/audio/mpg321/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "mpg321-${version}";
+ pname = "mpg321";
version = "0.3.2";
src = fetchurl {
diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix
index b3efa82ead47..02b1d8ea5111 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/applications/audio/muse/default.nix
@@ -16,8 +16,8 @@
, gitAndTools
}:
-stdenv.mkDerivation rec {
- name = "muse-sequencer-${version}";
+stdenv.mkDerivation {
+ pname = "muse-sequencer";
version = "3.1pre1";
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix
index e14594ae3b2d..8b08aed62b8b 100644
--- a/pkgs/applications/audio/musescore/darwin.nix
+++ b/pkgs/applications/audio/musescore/darwin.nix
@@ -8,8 +8,8 @@ in
with lib;
stdenv.mkDerivation rec {
- name = "musescore-darwin-${version}";
- version = "${concatStringsSep "." versionComponents}";
+ pname = "musescore-darwin";
+ version = concatStringsSep "." versionComponents;
src = fetchurl {
url = "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg";
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index a595bb069005..5368fcb61656 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -5,12 +5,12 @@
}:
mkDerivation rec {
- name = "musescore-${version}";
- version = "3.0.5";
+ pname = "musescore";
+ version = "3.2.3";
src = fetchzip {
- url = "https://download.musescore.com/releases/MuseScore-${version}/MuseScore-${version}.zip";
- sha256 = "1pbf6v0l3nixxr8k5igwhj09wnqvw92av6q6yjrbb3kyjh5br2d8";
+ url = "https://github.com/musescore/MuseScore/releases/download/v${version}/MuseScore-${version}.zip";
+ sha256 = "17mr0c8whw6vz86lp1j36rams4h8virc4z68fld0q3rpq6g05szs";
stripRoot = false;
};
diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix
index 47370d4bc2f7..e7a9e22c2d68 100644
--- a/pkgs/applications/audio/musly/default.nix
+++ b/pkgs/applications/audio/musly/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, eigen, libav_all }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "musly";
version = "unstable-2017-04-26";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index a35d9c670fe8..d89b61aa21f4 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -2,7 +2,7 @@
, mpd_clientlib, gettext, boost }:
stdenv.mkDerivation rec {
- name = "ncmpc-${version}";
+ pname = "ncmpc";
version = "0.34";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
index d35cefb88416..2ba36b4a50d9 100644
--- a/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -11,11 +11,11 @@ assert taglibSupport -> (taglib != null);
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "ncmpcpp-${version}";
+ pname = "ncmpcpp";
version = "0.8.2";
src = fetchurl {
- url = "https://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
+ url = "https://ncmpcpp.rybczak.net/stable/${pname}-${version}.tar.bz2";
sha256 = "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5";
};
diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix
index 8b715a24e3cb..53ed9b3297c1 100644
--- a/pkgs/applications/audio/ncpamixer/default.nix
+++ b/pkgs/applications/audio/ncpamixer/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "ncpamixer-${version}";
+ pname = "ncpamixer";
version = "1.3.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index 44dd0d2d4ec3..5f8c82b98d04 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -2,8 +2,8 @@
, libsndfile, ladspaH, liblrdf, liblo, libsigcxx, wafHook
}:
-stdenv.mkDerivation rec {
- name = "non-${version}";
+stdenv.mkDerivation {
+ pname = "non";
version = "2018-02-15";
src = fetchFromGitHub {
owner = "original-male";
diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix
index 85c902d38396..490ecc967bbf 100644
--- a/pkgs/applications/audio/normalize/default.nix
+++ b/pkgs/applications/audio/normalize/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libmad }:
stdenv.mkDerivation rec {
- name = "normalize-${version}";
+ pname = "normalize";
version = "0.7.7";
src = fetchurl {
- url = "mirror://savannah/normalize/${name}.tar.gz";
+ url = "mirror://savannah/normalize/${pname}-${version}.tar.gz";
sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0";
};
diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix
index bb186687c66e..0bb970500bdc 100644
--- a/pkgs/applications/audio/nova-filters/default.nix
+++ b/pkgs/applications/audio/nova-filters/default.nix
@@ -1,8 +1,8 @@
{stdenv, fetchurl, sconsPackages, boost, ladspaH, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.2-2";
- name = "nova-filters-${version}";
+ pname = "nova-filters";
src = fetchurl {
url = https://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz;
diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix
index f8f08369ab93..c9d69b5c7f23 100644
--- a/pkgs/applications/audio/openmpt123/default.nix
+++ b/pkgs/applications/audio/openmpt123/default.nix
@@ -3,8 +3,9 @@
let
version = "0.4.1";
-in stdenv.mkDerivation rec {
- name = "openmpt123-${version}";
+in stdenv.mkDerivation {
+ pname = "openmpt123";
+ inherit version;
src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix
index cc4a781ef66c..2507f08e9e59 100644
--- a/pkgs/applications/audio/pamix/default.nix
+++ b/pkgs/applications/audio/pamix/default.nix
@@ -3,7 +3,7 @@
, libpulseaudio, ncurses }:
stdenv.mkDerivation rec {
- name = "pamix-${version}";
+ pname = "pamix";
version = "1.6";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix
index 7f3940e0ae9c..e7c4cab9af18 100644
--- a/pkgs/applications/audio/patchage/default.nix
+++ b/pkgs/applications/audio/patchage/default.nix
@@ -2,8 +2,8 @@
, gtkmm2, libjack2, pkgconfig, python2, wafHook
}:
-stdenv.mkDerivation rec {
- name = "patchage-${version}";
+stdenv.mkDerivation {
+ pname = "patchage";
version = "1.0.1";
src = fetchsvn {
url = http://svn.drobilla.net/lad/trunk/patchage/;
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index 0cff6c419a08..fee86cb5bcae 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "PulseAudio Volume Control";
longDescription = ''
- PulseAudio Volume Control (pavucontrol) provides a GTK+
+ PulseAudio Volume Control (pavucontrol) provides a GTK
graphical user interface to connect to a PulseAudio server and
easily control the volume of all clients, sinks, etc.
'';
diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix
index ae43bad5b2c2..6440f6e787ff 100644
--- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix
+++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, puredata }:
stdenv.mkDerivation rec {
- name = "cyclone-${version}";
+ pname = "cyclone";
version = "0.3beta-2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
index faa914e13287..6c7a4b03ef59 100644
--- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
+++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip, puredata }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "helmholtz";
src = fetchurl {
diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix
index 0eb75d77c68c..21ba375200bc 100644
--- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix
+++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, puredata }:
stdenv.mkDerivation rec {
- name = "maxlib-${version}";
+ pname = "maxlib";
version = "1.5.7";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
index 972a162b73f4..028a4667cb2d 100644
--- a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
+++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, puredata }:
-stdenv.mkDerivation rec {
- name = "mrpeach-${version}";
+stdenv.mkDerivation {
+ pname = "mrpeach";
version = "1.1";
# this was to only usable url I could find:
diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix
index 37d692a3ab5a..c214d3fcf405 100644
--- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix
+++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip, puredata }:
stdenv.mkDerivation rec {
- name = "puremapping-${version}";
+ pname = "puremapping";
version = "20160130";
src = fetchurl {
diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix
index f2e54b327fce..fa9660fbbf61 100644
--- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix
+++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.7.0";
- name = "timbreid-${version}";
+ pname = "timbreid";
src = fetchurl {
url = "http://williambrent.conflations.com/pd/timbreID-${version}-src.zip";
diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix
index d56462ccc844..cc307417c061 100644
--- a/pkgs/applications/audio/pd-plugins/zexy/default.nix
+++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoconf, automake, puredata }:
stdenv.mkDerivation rec {
- name = "zexy-${version}";
+ pname = "zexy";
version = "2.2.4";
src = fetchurl {
- url = "https://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz";
+ url = "https://puredata.info/downloads/zexy/releases/${version}/${pname}-${version}.tar.gz";
sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp";
};
diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix
index d86e5aae2cd4..8bbeffb1f7a3 100644
--- a/pkgs/applications/audio/petrifoo/default.nix
+++ b/pkgs/applications/audio/petrifoo/default.nix
@@ -3,11 +3,11 @@
, pkgconfig, openssl }:
stdenv.mkDerivation rec {
- name = "petri-foo-${version}";
+ pname = "petri-foo";
version = "0.1.87";
src = fetchurl {
- url = "mirror://sourceforge/petri-foo/${name}.tar.bz2";
+ url = "mirror://sourceforge/petri-foo/${pname}-${version}.tar.bz2";
sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh";
};
diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix
index 53afcdd2306a..448b219a1afa 100644
--- a/pkgs/applications/audio/pianobooster/default.nix
+++ b/pkgs/applications/audio/pianobooster/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }:
-stdenv.mkDerivation rec {
- name = "pianobooster-${version}";
+stdenv.mkDerivation {
+ pname = "pianobooster";
version = "0.6.4b";
src = fetchurl {
diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix
index 16d5eb69cb97..8c21dc8f2ad7 100644
--- a/pkgs/applications/audio/playbar2/default.nix
+++ b/pkgs/applications/audio/playbar2/default.nix
@@ -7,7 +7,7 @@
}:
stdenv.mkDerivation rec {
- name = "playbar2-${version}";
+ pname = "playbar2";
version = "2.5";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix
index 5529998803cf..f444ad6cb323 100644
--- a/pkgs/applications/audio/plugin-torture/default.nix
+++ b/pkgs/applications/audio/plugin-torture/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }:
-stdenv.mkDerivation rec {
- name = "plugin-torture-${version}";
+stdenv.mkDerivation {
+ pname = "plugin-torture";
version = "2016-07-25";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix
index 9f51d3008259..f9b3fbae2137 100644
--- a/pkgs/applications/audio/pmidi/default.nix
+++ b/pkgs/applications/audio/pmidi/default.nix
@@ -3,7 +3,8 @@
, sourceSha256 ? "051mv6f13c8y13c1iv3279k1hhzpz4fm9sfczhgp9sim2bjdj055"
}:
stdenv.mkDerivation {
- name = "pmidi-${version}";
+ pname = "pmidi";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/pmidi/${version}/pmidi-${version}.tar.gz";
diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix
index 5cfbb7bf5a48..6d168ec56618 100644
--- a/pkgs/applications/audio/ponymix/default.nix
+++ b/pkgs/applications/audio/ponymix/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkgconfig }:
stdenv.mkDerivation rec {
- name = "ponymix-${version}";
+ pname = "ponymix";
version = "5";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix
index 5db5035c8352..9414f4211d7a 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, alsaLib, gtk2, pkgconfig }:
stdenv.mkDerivation rec {
- name = "praat-${version}";
+ pname = "praat";
version = "6.0.43";
src = fetchurl {
diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix
index d414cb756114..a9f56cca0015 100644
--- a/pkgs/applications/audio/pulseaudio-dlna/default.nix
+++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix
@@ -17,7 +17,7 @@ assert vorbisSupport -> vorbisTools != null;
let
zeroconf = pythonPackages.callPackage ./zeroconf.nix { };
-in pythonPackages.buildPythonApplication rec {
+in pythonPackages.buildPythonApplication {
pname = "pulseaudio-dlna";
version = "2017-11-01";
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index 9989f75c0bd7..b8082c12c644 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -23,7 +23,7 @@ let
'';
in stdenv.mkDerivation rec {
- name = "pulseaudio-modules-bt-${version}";
+ pname = "pulseaudio-modules-bt";
version = "1.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
index 6ade9042b532..5886a465409a 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/pkgs/applications/audio/puredata/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "puredata-${version}";
+ pname = "puredata";
version = "0.49-0";
src = fetchurl {
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 9b8c8035239d..0b50d3098aa2 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -2,12 +2,12 @@
mkDerivation rec {
version = "0.5.9";
- name = "qjackctl-${version}";
+ pname = "qjackctl";
# some dependencies such as killall have to be installed additionally
src = fetchurl {
- url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
+ url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz";
sha256 = "1saywsda9m124rmjp7i3n0llryaliabjxhqhvqr6dm983qy7pypk";
};
diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index 16e76bb631c9..d627f352e734 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.5.5";
- name = "qmidinet-${version}";
+ pname = "qmidinet";
src = fetchurl {
- url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
+ url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz";
sha256 = "0az20hh14g7k6h779dk1b6fshxnfj2664sj6ypgllzriwv430x9y";
};
diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix
index 7f5191a02c20..2a83d98b6ea3 100644
--- a/pkgs/applications/audio/qmidiroute/default.nix
+++ b/pkgs/applications/audio/qmidiroute/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.4.0";
- name = "qmidiroute-${version}";
+ pname = "qmidiroute";
src = fetchurl {
- url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${pname}-${version}.tar.gz";
sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n";
};
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 03f6bb1b7936..ef52c65b1051 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, xlibsWrapper
+{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, xlibsWrapper
, qtbase, qttools, qtmultimedia, qtx11extras
# transports
, curl, libmms
@@ -28,7 +28,7 @@
# Qmmp installs working .desktop file(s) all by itself, so we don't need to
# handle that.
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "qmmp-1.3.3";
src = fetchurl {
diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
index 4e6df82a32a9..a878f4edad8f 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -2,11 +2,11 @@
, liblscp, libgig, qtbase }:
stdenv.mkDerivation rec {
- name = "qsampler-${version}";
+ pname = "qsampler";
version = "0.5.6";
src = fetchurl {
- url = "mirror://sourceforge/qsampler/${name}.tar.gz";
+ url = "mirror://sourceforge/qsampler/${pname}-${version}.tar.gz";
sha256 = "0lx2mzyajmjckwfvgf8p8bahzpj0n0lflyip41jk32nwd2hzjhbs";
};
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix
index 82e003b2bea3..81b7e35b6309 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/applications/audio/qsynth/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qt5, autoconf, pkgconfig }:
stdenv.mkDerivation rec {
- name = "qsynth-${version}";
+ pname = "qsynth";
version = "0.5.7";
src = fetchurl {
- url = "mirror://sourceforge/qsynth/${name}.tar.gz";
+ url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz";
sha256 = "18im4w8agj60nkppwbkxqnhpp13z5li3w30kklv4lgs20rvgbvl6";
};
diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix
index 453da89953e0..68e8e6402acf 100644
--- a/pkgs/applications/audio/qtscrobbler/default.nix
+++ b/pkgs/applications/audio/qtscrobbler/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkgconfig, which, qt4, qmake4Hook }:
stdenv.mkDerivation rec {
- name = "qtscrobbler-${version}";
+ pname = "qtscrobbler";
version = "0.11";
src = fetchurl {
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 8db837105f82..c874bdd40d24 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -46,11 +46,11 @@ python3.pkgs.buildPythonApplication rec {
preFixup = stdenv.lib.optionalString (kakasi != null) "gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)";
meta = with stdenv.lib; {
- description = "GTK+-based audio player written in Python, using the Mutagen tagging library";
+ description = "GTK-based audio player written in Python, using the Mutagen tagging library";
license = licenses.gpl2Plus;
longDescription = ''
- Quod Libet is a GTK+-based audio player written in Python, using
+ Quod Libet is a GTK-based audio player written in Python, using
the Mutagen tagging library. It's designed around the idea that
you know how to organize your music better than we do. It lets
you make playlists based on regular expressions (don't worry,
diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix
index ec71cfb427c6..36302458a75b 100644
--- a/pkgs/applications/audio/rakarrack/default.nix
+++ b/pkgs/applications/audio/rakarrack/default.nix
@@ -2,11 +2,11 @@
libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }:
stdenv.mkDerivation rec {
- name = "rakarrack-${version}";
+ pname = "rakarrack";
version = "0.6.1";
src = fetchurl {
- url = "mirror://sourceforge/rakarrack/${name}.tar.bz2";
+ url = "mirror://sourceforge/rakarrack/${pname}-${version}.tar.bz2";
sha256 = "1rpf63pdn54c4yg13k7cb1w1c7zsvl97c4qxcpz41c8l91xd55kn";
};
diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 6530d737c33d..9cff98f61372 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "reaper-${version}";
+ pname = "reaper";
version = "5.981";
src = fetchurl {
diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/applications/audio/redoflacs/default.nix
index 1918fa9e3a99..e32fd42af323 100644
--- a/pkgs/applications/audio/redoflacs/default.nix
+++ b/pkgs/applications/audio/redoflacs/default.nix
@@ -2,7 +2,7 @@
, flac, sox }:
stdenv.mkDerivation rec {
- name = "redoflacs-${version}";
+ pname = "redoflacs";
version = "0.30.20150202";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index ddbefd129ffe..62625aa421d1 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -14,7 +14,7 @@ let
in
stdenv.mkDerivation rec {
- name = "renoise-${version}";
+ pname = "renoise";
version = "3.1.0";
src =
diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix
index 6516532df33f..e3eb750496ba 100644
--- a/pkgs/applications/audio/rhvoice/default.nix
+++ b/pkgs/applications/audio/rhvoice/default.nix
@@ -3,8 +3,9 @@
let
version = "unstable-2018-02-10";
-in stdenv.mkDerivation rec {
- name = "rhvoice-${version}";
+in stdenv.mkDerivation {
+ pname = "rhvoice";
+ inherit version;
src = fetchFromGitHub {
owner = "Olga-Yakovleva";
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index 313227f77985..9445bf3723c9 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -4,10 +4,10 @@
stdenv.mkDerivation (rec {
version = "19.06";
- name = "rosegarden-${version}";
+ pname = "rosegarden";
src = fetchurl {
- url = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
+ url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2";
sha256 = "169qb58v2s8va59hzkih8nqb2aipsqlrbfs8q39ywqa8w5d60gcc";
};
diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix
index 9e0a3712c971..82aa86f795bb 100644
--- a/pkgs/applications/audio/rubyripper/default.nix
+++ b/pkgs/applications/audio/rubyripper/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ruby, cdparanoia, makeWrapper }:
stdenv.mkDerivation rec {
version = "0.6.2";
- name = "rubyripper-${version}";
+ pname = "rubyripper";
src = fetchurl {
url = "https://rubyripper.googlecode.com/files/rubyripper-${version}.tar.bz2";
sha256 = "1fwyk3y0f45l2vi3a481qd7drsy82ccqdb8g2flakv58m45q0yl1";
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index f9b1fe6afe00..5a62a8a4292d 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }:
stdenv.mkDerivation rec {
- name = "samplv1-${version}";
+ pname = "samplv1";
version = "0.9.9";
src = fetchurl {
- url = "mirror://sourceforge/samplv1/${name}.tar.gz";
+ url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz";
sha256 = "1y61wb0bzm1cz7y8xxv6hp8mrkfb9zm9irg6zs4g6aanw539r6l8";
};
diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix
index fbe90c5377df..c4258174500f 100644
--- a/pkgs/applications/audio/sayonara/default.nix
+++ b/pkgs/applications/audio/sayonara/default.nix
@@ -1,45 +1,82 @@
-{ stdenv, fetchurl, cmake, qt5, zlib, taglib, pkgconfig, pcre, gst_all_1 }:
+{ mkDerivation
+, cmake
+, fetchgit
+, gst_all_1
+, lib
+, libpulseaudio
+, ninja
+, pcre
+, pkgconfig
+, qtbase
+, qttools
+, taglib
+, zlib
+}:
-let
- version = "1.1.1-git1-20180828";
-in
-stdenv.mkDerivation {
- name = "sayonara-player-${version}";
+mkDerivation rec {
+ pname = "sayonara-player";
+ version = "1.5.1-stable5";
- src = fetchurl {
- url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz";
- sha256 = "0rvy47qvavrp03zjdrw025dmq9fq5aaii3q1qq8b94byarl0c5kn";
+ src = fetchgit {
+ url = "https://git.sayonara-player.com/sayonara.git";
+ rev = version;
+ sha256 = "13l7r3gaszrkyf4z8rdijfzxvcnilax4ki2mcm30wqk8d4g4qdzj";
};
- nativeBuildInputs = [ cmake pkgconfig ];
- buildInputs = with qt5; with gst_all_1;
- [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly
- pcre qtbase qttools taglib zlib
- ];
-
- # CMake Error at src/GUI/Resources/Icons/cmake_install.cmake:49 (file):
- # file cannot create directory: /usr/share/icons. Maybe need administrative
- # privileges.
- # Call Stack (most recent call first):
- # src/GUI/Resources/cmake_install.cmake:50 (include)
- # src/GUI/cmake_install.cmake:50 (include)
- # src/cmake_install.cmake:59 (include)
- # cmake_install.cmake:42 (include)
+ # all this can go with version 1.5.2
postPatch = ''
- substituteInPlace src/GUI/Resources/Icons/CMakeLists.txt \
- --replace "/usr/share" "$out/share"
+ # if we don't delete this, sayonara will look here instead of the provided taglib
+ rm -r src/3rdParty/taglib
+
+ for f in \
+ src/DBus/DBusNotifications.cpp \
+ src/Gui/Resources/Icons/CMakeLists.txt \
+ src/Utils/Utils.cpp \
+ test/Util/FileHelperTest.cpp \
+ ; do
+
+ substituteInPlace $f --replace /usr $out
+ done
+
+ substituteInPlace src/Components/Shutdown/Shutdown.cpp \
+ --replace /usr/bin/systemctl systemctl
'';
- # [ 65%] Building CXX object src/Components/Engine/CMakeFiles/say_comp_engine.dir/AbstractPipeline.cpp.o
- # /tmp/nix-build-sayonara-player-1.0.0-git5-20180115.drv-0/sayonara-player/src/Components/Engine/AbstractPipeline.cpp:28:32: fatal error: gst/app/gstappsink.h: No such file or directory
- # #include
+ nativeBuildInputs = [ cmake ninja pkgconfig qttools ];
+
+ buildInputs = [
+ libpulseaudio
+ pcre
+ qtbase
+ taglib
+ zlib
+ ]
+ ++ (with gst_all_1; [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-good
+ gst-plugins-bad
+ gst-plugins-ugly
+ ]);
+
+ # we carry the patched taglib 1.11.1 that doesn't break ogg but sayonara just
+ # checks for the version
+ cmakeFlags = [
+ "-DWITH_SYSTEM_TAGLIB=ON"
+ ];
+
+ # gstreamer cannot otherwise be found
NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
- meta = with stdenv.lib;
- { description = "Sayonara music player";
- homepage = https://sayonara-player.com/;
- license = licenses.gpl3;
- platforms = platforms.linux;
- maintainers = [ maintainers.deepfire ];
- };
+ postInstall = ''
+ qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+ '';
+
+ meta = with lib; {
+ description = "Sayonara music player";
+ homepage = "https://sayonara-player.com/";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ deepfire ];
+ platforms = platforms.unix;
+ };
}
diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix
index ab1a6e387383..f902b2dd41b0 100644
--- a/pkgs/applications/audio/schismtracker/default.nix
+++ b/pkgs/applications/audio/schismtracker/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "20120105";
- name = "schismtracker-${version}";
+ pname = "schismtracker";
src = fetchurl {
- url = "http://schismtracker.org/dl/${name}.tar.bz2";
+ url = "http://schismtracker.org/dl/${pname}-${version}.tar.bz2";
sha256 = "1ny7wv2wxm1av299wvpskall6438wjjpadphmqc7c0h6d0zg5kii";
};
diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix
index d47ede27ece2..9bab024f021e 100644
--- a/pkgs/applications/audio/seq24/default.nix
+++ b/pkgs/applications/audio/seq24/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }:
stdenv.mkDerivation rec {
- name = "seq24-${version}";
+ pname = "seq24";
version = "0.9.3";
src = fetchurl {
- url = "https://launchpad.net/seq24/trunk/${version}/+download/${name}.tar.gz";
+ url = "https://launchpad.net/seq24/trunk/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "1qpyb7355s21sgy6gibkybxpzx4ikha57a8w644lca6qy9mhcwi3";
};
diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix
index 1047734a2c18..9502cb7b7e7e 100644
--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/pkgs/applications/audio/setbfree/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "setbfree-${version}";
+ pname = "setbfree";
version = "0.8.8";
src = fetchurl {
diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix
index a98d1431d65e..706d0faa3bc1 100644
--- a/pkgs/applications/audio/sfxr-qt/default.nix
+++ b/pkgs/applications/audio/sfxr-qt/default.nix
@@ -1,12 +1,15 @@
-{ stdenv, fetchFromGitHub
+{ lib
+, mkDerivation
+, fetchFromGitHub
, cmake
-, qtbase, qtquickcontrols2
+, qtbase
+, qtquickcontrols2
, SDL
, python3
}:
-stdenv.mkDerivation rec {
- name = "sfxr-qt-${version}";
+mkDerivation rec {
+ pname = "sfxr-qt";
version = "1.2.0";
src = fetchFromGitHub {
owner = "agateau";
@@ -20,12 +23,13 @@ stdenv.mkDerivation rec {
(python3.withPackages (pp: with pp; [ pyyaml jinja2 ]))
];
buildInputs = [
- qtbase qtquickcontrols2
+ qtbase
+ qtquickcontrols2
SDL
];
configurePhase = "cmake . -DCMAKE_INSTALL_PREFIX=$out";
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/agateau/sfxr-qt;
description = "A sound effect generator, QtQuick port of sfxr";
license = licenses.gpl2;
diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix
index 8645251b384d..e3bfc60a40a5 100644
--- a/pkgs/applications/audio/shntool/default.nix
+++ b/pkgs/applications/audio/shntool/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, flac }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "3.0.10";
- name = "shntool-${version}";
+ pname = "shntool";
src = fetchurl {
url = http://www.etree.org/shnutils/shntool/dist/src/shntool-3.0.10.tar.gz;
diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix
index b857c5b68358..aff8c173d9f2 100644
--- a/pkgs/applications/audio/sidplayfp/default.nix
+++ b/pkgs/applications/audio/sidplayfp/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.4.4";
- name = "sidplayfp-${version}";
+ pname = "sidplayfp";
src = fetchurl {
- url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${name}.tar.gz";
+ url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${pname}-${version}.tar.gz";
sha256 = "0arsrg3f0fsinal22qjmj3r6500bcbgqnx26fsz049ldl716kz1m";
};
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
index 5730dec6b994..21a36cecbe54 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -32,7 +32,7 @@ let
in
stdenv.mkDerivation rec {
- name = "snapcast-${version}";
+ pname = "snapcast";
version = "0.15.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index d5985f097e9f..ce2a4e9d2c80 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -41,7 +41,7 @@ in buildPythonApplication rec {
longDescription = ''
Sonata is an elegant client for the Music Player Daemon.
- Written in Python and using the GTK+ 3 widget set, its features
+ Written in Python and using the GTK 3 widget set, its features
include:
- Expanded and collapsed views
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index ee72b6cdb1a4..2a39caa08659 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -1,4 +1,6 @@
-{ stdenv
+{ mkDerivation
+, lib
+, qtbase
, fetchFromGitHub
, fftwSinglePrec
, ruby
@@ -6,22 +8,23 @@
, aubio
, cmake
, pkgconfig
-, qt5
-, libsForQt5
, boost
, bash
-, makeWrapper
, jack2Full
+, supercollider
+, qscintilla
+, qwt
}:
let
- supercollider = libsForQt5.callPackage ../../../development/interpreters/supercollider {
- fftw = fftwSinglePrec;
- };
-in stdenv.mkDerivation rec {
+ supercollider_single_prec = supercollider.override { fftw = fftwSinglePrec; };
+
+in
+
+mkDerivation rec {
version = "3.1.0";
- name = "sonic-pi-${version}";
+ pname = "sonic-pi";
src = fetchFromGitHub {
owner = "samaaron";
@@ -33,15 +36,14 @@ in stdenv.mkDerivation rec {
buildInputs = [
bash
cmake
- makeWrapper
pkgconfig
- qt5.qtbase
- libsForQt5.qscintilla
- libsForQt5.qwt
+ qtbase
+ qscintilla
+ qwt
ruby
libffi
aubio
- supercollider
+ supercollider_single_prec
boost
];
@@ -80,20 +82,23 @@ in stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
-
cp -r . $out
- wrapProgram $out/bin/sonic-pi \
+ runHook postInstall
+ '';
+
+ # $out/bin/sonic-pi is a shell script, and wrapQtAppsHook doesn't wrap them.
+ dontWrapQtApps = true;
+ preFixup = ''
+ wrapQtApp "$out/bin/sonic-pi" \
--prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2Full}/bin \
--set AUBIO_LIB "${aubio}/lib/libaubio.so"
-
- runHook postInstall
'';
meta = {
homepage = http://sonic-pi.net/;
description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ Phlogistique kamilchm ];
- platforms = stdenv.lib.platforms.linux;
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ Phlogistique kamilchm ];
+ platforms = lib.platforms.linux;
};
}
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index d5f613b45945..501d097f29fa 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -7,11 +7,11 @@
}:
stdenv.mkDerivation rec {
- name = "sonic-visualiser-${version}";
+ pname = "sonic-visualiser";
version = "2.4.1";
src = fetchurl {
- url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${name}.tar.gz";
+ url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${pname}-${version}.tar.gz";
sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb";
};
diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix
index bf4d96c6fc4e..768b40a11388 100644
--- a/pkgs/applications/audio/sooperlooper/default.nix
+++ b/pkgs/applications/audio/sooperlooper/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "sooperlooper-git-${version}";
+ pname = "sooperlooper-git";
version = "2016-07-19";
src = fetchFromGitHub {
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
and the engine can be run standalone on a computer without a monitor.
'';
- version = "${version}";
+ version = version;
homepage = http://essej.net/sooperlooper/index.html;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.magnetophon ];
diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix
index cf0b5db81f62..5d8ae0928c90 100644
--- a/pkgs/applications/audio/sorcer/default.nix
+++ b/pkgs/applications/audio/sorcer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }:
stdenv.mkDerivation rec {
- name = "sorcer-${version}";
+ pname = "sorcer";
version = "1.1.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix
index babe4edff9df..30ff41da3695 100644
--- a/pkgs/applications/audio/soundscape-renderer/default.nix
+++ b/pkgs/applications/audio/soundscape-renderer/default.nix
@@ -14,8 +14,8 @@
, libGLU_combined # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
}:
-stdenv.mkDerivation rec {
- name = "soundscape-renderer-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "soundscape-renderer-unstable";
version = "2016-11-03";
diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix
index 64deede535b2..7544a3520c76 100644
--- a/pkgs/applications/audio/spectmorph/default.nix
+++ b/pkgs/applications/audio/spectmorph/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }:
stdenv.mkDerivation rec {
- name = "spectmorph-${version}";
+ pname = "spectmorph";
version = "0.5.0";
src = fetchurl {
- url = "http://spectmorph.org/files/releases/${name}.tar.bz2";
+ url = "http://spectmorph.org/files/releases/${pname}-${version}.tar.bz2";
sha256 = "003wznv3sy1b4g55vqii9pr3i3bb3zmj7nqvwrz7vjsfn2xyd1bn";
};
diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix
index 6614e3702247..4c1682b1e0b8 100644
--- a/pkgs/applications/audio/spectrojack/default.nix
+++ b/pkgs/applications/audio/spectrojack/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libjack2, fftwFloat, gtk2 }:
stdenv.mkDerivation rec {
- name = "spectrojack-${version}";
+ pname = "spectrojack";
version = "0.4.1";
src = fetchurl {
- url = "http://sed.free.fr/spectrojack/${name}.tar.gz";
+ url = "http://sed.free.fr/spectrojack/${pname}-${version}.tar.gz";
sha256 = "1kiwx0kag7kq7rhg0bvckfm8r7pqmbk76ppa39cq2980jb5v8rfp";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix
index 2401dc60b09a..6598d24fb07a 100644
--- a/pkgs/applications/audio/speech-denoiser/default.nix
+++ b/pkgs/applications/audio/speech-denoiser/default.nix
@@ -8,7 +8,7 @@ let
sha256 = "189l6lz8sz5vr6bjyzgcsrvksl1w6crqsg0q65r94b5yjsmjnpr4";
};
- rnnoise-nu = stdenv.mkDerivation rec {
+ rnnoise-nu = stdenv.mkDerivation {
pname = "rnnoise-nu";
version = "unstable-07-10-2019";
src = speech-denoiser-src;
@@ -18,7 +18,7 @@ let
installTargets = [ "install-rnnoise-nu" ];
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "speech-denoiser";
version = "unstable-07-10-2019";
diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix
index 8af7888f74bb..f4922e388c46 100644
--- a/pkgs/applications/audio/spek/default.nix
+++ b/pkgs/applications/audio/spek/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchzip, autoconf, automake, intltool, pkgconfig, ffmpeg, wxGTK }:
stdenv.mkDerivation rec {
- name = "spek-${version}";
+ pname = "spek";
version = "0.8.3";
src = fetchzip {
- name = "${name}-src";
+ name = "${pname}-${version}-src";
url = "https://github.com/alexkay/spek/archive/v${version}.tar.gz";
sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv";
};
diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix
index 372e507ed0e9..3c9565df9199 100644
--- a/pkgs/applications/audio/split2flac/default.nix
+++ b/pkgs/applications/audio/split2flac/default.nix
@@ -18,7 +18,7 @@ let
'';
in stdenv.mkDerivation rec {
- name = "split2flac-${version}";
+ pname = "split2flac";
version = "122";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 77aa79949943..3f99e22a4cbd 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -60,7 +60,8 @@ let
in
stdenv.mkDerivation {
- name = "spotify-${version}";
+ pname = "spotify";
+ inherit version;
# fetch from snapcraft instead of the debian repository most repos fetch from.
# That is a bit more cumbersome. But the debian repository only keeps the last
@@ -77,8 +78,6 @@ stdenv.mkDerivation {
buildInputs = [ squashfsTools makeWrapper ];
- doConfigure = false;
- doBuild = false;
dontStrip = true;
dontPatchELF = true;
diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
index 3daed9f63501..9035a2a73c57 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "Spotifyd";
repo = "spotifyd";
- rev = "${version}";
+ rev = version;
sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1";
};
diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix
index 64ae9491535a..2380c8e5d9ed 100644
--- a/pkgs/applications/audio/spotifywm/default.nix
+++ b/pkgs/applications/audio/spotifywm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }:
-stdenv.mkDerivation rec {
- name = "spotifywm-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "spotifywm-unstable";
version = "2016-11-28";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix
index 19386b477942..1247bbc19f97 100644
--- a/pkgs/applications/audio/ssrc/default.nix
+++ b/pkgs/applications/audio/ssrc/default.nix
@@ -2,7 +2,6 @@
stdenv.mkDerivation rec {
pname = "ssrc";
- name = "${pname}-${version}";
version = "1.33";
src = fetchFromGitHub {
@@ -33,7 +32,7 @@ stdenv.mkDerivation rec {
without audible degradation.
'';
- version = "${version}";
+ version = version;
homepage = http://shibatch.sourceforge.net/;
license = licenses.gpl2;
maintainers = with maintainers; [ leenaars];
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
new file mode 100644
index 000000000000..83455460123c
--- /dev/null
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -0,0 +1,97 @@
+{ mkDerivation
+, stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, alsaLib
+, boost
+, chromaprint
+, fftw
+, gnutls
+, libcdio
+, libmtp
+, libpthreadstubs
+, libtasn1
+, libXdmcp
+, ninja
+, pcre
+, protobuf
+, sqlite
+, taglib
+, libpulseaudio ? null
+, libselinux ? null
+, libsepol ? null
+, p11_kit ? null
+, utillinux ? null
+, qtbase
+, qtx11extras
+, qttools
+, withGstreamer ? true
+, gst_all_1 ? null
+, withVlc ? true
+, vlc ? null
+}:
+
+mkDerivation rec {
+ pname = "strawberry";
+ version = "0.6.3";
+
+ src = fetchFromGitHub {
+ owner = "jonaski";
+ repo = pname;
+ rev = version;
+ sha256 = "01j5jzzicy895kg9sjy46lbcm5kvf3642d3q5wwb2fyvyq1fbcv0";
+ };
+
+ buildInputs = [
+ alsaLib
+ boost
+ chromaprint
+ fftw
+ gnutls
+ libcdio
+ libmtp
+ libpthreadstubs
+ libtasn1
+ libXdmcp
+ pcre
+ protobuf
+ sqlite
+ taglib
+ qtbase
+ qtx11extras
+ ]
+ ++ lib.optionals stdenv.isLinux [
+ libpulseaudio
+ libselinux
+ libsepol
+ p11_kit
+ utillinux
+ ]
+ ++ lib.optionals withGstreamer (with gst_all_1; [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-good
+ gst-plugins-ugly
+ ])
+ ++ lib.optional withVlc vlc;
+
+ nativeBuildInputs = [ cmake ninja pkgconfig qttools ];
+
+ cmakeFlags = [
+ "-DUSE_SYSTEM_TAGLIB=ON"
+ ];
+
+ postInstall = ''
+ qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+ '';
+
+ meta = with lib; {
+ description = "Music player and music collection organizer";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ peterhoeg ];
+ # upstream says darwin should work but they lack maintainers as of 0.6.3
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix
index 39d1c266a373..efa87a2f72cc 100644
--- a/pkgs/applications/audio/streamripper/default.nix
+++ b/pkgs/applications/audio/streamripper/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }:
stdenv.mkDerivation rec {
- name = "streamripper-${version}";
+ pname = "streamripper";
version = "1.64.6";
src = fetchurl {
- url = "mirror://sourceforge/streamripper/${name}.tar.gz";
+ url = "mirror://sourceforge/streamripper/${pname}-${version}.tar.gz";
sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1";
};
diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix
index 957ee50ca7ad..1a3d1a96c85d 100644
--- a/pkgs/applications/audio/sunvox/default.nix
+++ b/pkgs/applications/audio/sunvox/default.nix
@@ -12,7 +12,7 @@ let
else "x86";
in
stdenv.mkDerivation rec {
- name = "SunVox-${version}";
+ pname = "SunVox";
version = "1.9.4c";
src = fetchurl {
diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix
index 5e26b6c1cdb8..8acd8e0b88b1 100644
--- a/pkgs/applications/audio/svox/default.nix
+++ b/pkgs/applications/audio/svox/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
- name = "svox-${version}";
+stdenv.mkDerivation {
+ pname = "svox";
version = "2017-07-18";
src = fetchgit {
diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix
index 6fa0eb7f8f2b..b59752d7cc3e 100644
--- a/pkgs/applications/audio/swh-lv2/default.nix
+++ b/pkgs/applications/audio/swh-lv2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }:
stdenv.mkDerivation rec {
- name = "swh-lv2-${version}";
+ pname = "swh-lv2";
version = "1.0.16";
src = fetchurl {
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index d28329b01171..1c373aefb4f6 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, qt5, libjack2, alsaLib, liblo, lv2 }:
stdenv.mkDerivation rec {
- name = "synthv1-${version}";
+ pname = "synthv1";
version = "0.9.9";
src = fetchurl {
- url = "mirror://sourceforge/synthv1/${name}.tar.gz";
+ url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz";
sha256 = "0cvamqzg74qfr7kzk3skimskmv0j3d1rmmpbpsmfcrg8srvyx9r2";
};
diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/applications/audio/tambura/default.nix
index a739d72898e2..030bb2c01a72 100644
--- a/pkgs/applications/audio/tambura/default.nix
+++ b/pkgs/applications/audio/tambura/default.nix
@@ -1,12 +1,11 @@
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
pname = "Tambura";
- name = "${pname}-${version}";
version = "1.0";
src = fetchFromGitHub {
owner = "olilarkin";
- repo = "${pname}";
+ repo = pname;
rev = "v${version}";
sha256 = "1w80cmiyzca1wirf5gypg3hcix1ky777id8wnd3k92mn1jf4a24y";
};
diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix
index 257963de256f..40362fdd4968 100644
--- a/pkgs/applications/audio/tetraproc/default.nix
+++ b/pkgs/applications/audio/tetraproc/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "tetraproc-${version}";
+ pname = "tetraproc";
version = "0.8.6";
src = fetchurl {
- url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+ url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
sha256 = "02155ljfwgvfgq9z258fb4z7jrz7qx022d054fj5gr0v007cv0r7";
};
diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix
index 78bd43383539..c983123ca383 100644
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@@ -12,11 +12,11 @@ assert enableKDE -> kdelibs4 != null;
assert enableTelepathy -> telepathy-qt != null;
stdenv.mkDerivation rec {
- name = "tomahawk-${version}";
+ pname = "tomahawk";
version = "0.8.4";
src = fetchurl {
- url = "http://download.tomahawk-player.org/${name}.tar.bz2";
+ url = "http://download.tomahawk-player.org/${pname}-${version}.tar.bz2";
sha256 = "0j84h36wkjfjbsd7ybyji7rcc9wpjdbl0f1xdcc1g7h0nz34pc0g";
};
diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix
index 740790419482..8eb846ac9c56 100644
--- a/pkgs/applications/audio/transcribe/default.nix
+++ b/pkgs/applications/audio/transcribe/default.nix
@@ -2,7 +2,7 @@
, glib, gst_all_1, gtk3, libSM, libX11, libpng12, pango, zlib }:
stdenv.mkDerivation rec {
- name = "transcribe-${version}";
+ pname = "transcribe";
version = "8.72";
src = if stdenv.hostPlatform.system == "i686-linux" then
diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix
index 0c432acf4afe..9188003ce66d 100644
--- a/pkgs/applications/audio/traverso/default.nix
+++ b/pkgs/applications/audio/traverso/default.nix
@@ -2,8 +2,8 @@
, alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio
, libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack
}:
-stdenv.mkDerivation rec {
- name = "traverso-${version}";
+stdenv.mkDerivation {
+ pname = "traverso";
version = "0.49.6";
src = fetchurl {
diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/pkgs/applications/audio/tree-from-tags/default.nix
index cdee979768cf..521133cb08fc 100644
--- a/pkgs/applications/audio/tree-from-tags/default.nix
+++ b/pkgs/applications/audio/tree-from-tags/default.nix
@@ -7,7 +7,8 @@ let
gemdir = ./.;
};
in stdenv.mkDerivation {
- name = "tree-from-tags-${version}";
+ pname = "tree-from-tags";
+ inherit version;
src = fetchFromGitHub {
owner = "dbrock";
repo = "bongo";
diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix
index 7db3b7ec2376..844eea11f514 100644
--- a/pkgs/applications/audio/uade123/default.nix
+++ b/pkgs/applications/audio/uade123/default.nix
@@ -2,8 +2,9 @@
let
version = "2.13";
-in stdenv.mkDerivation rec {
- name = "uade123-${version}";
+in stdenv.mkDerivation {
+ pname = "uade123";
+ inherit version;
src = fetchurl {
url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2";
sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v";
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index 9a27ed302e6c..234b98a893c8 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -27,7 +27,7 @@ let
};
in
with stdenv.lib; stdenv.mkDerivation rec {
- name = "VCV-Rack-${version}";
+ pname = "VCV-Rack";
version = "1.1.4";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix
index ce561b5db314..7f02ea9cefec 100644
--- a/pkgs/applications/audio/vimpc/default.nix
+++ b/pkgs/applications/audio/vimpc/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "0.09.2";
- name = "vimpc-${version}";
+ pname = "vimpc";
src = fetchFromGitHub {
owner = "boysetsfrog";
diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix
index b7b0fba2d548..485edaa1ff27 100644
--- a/pkgs/applications/audio/vkeybd/default.nix
+++ b/pkgs/applications/audio/vkeybd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, alsaLib, libX11, makeWrapper, tcl, tk }:
stdenv.mkDerivation rec {
- name = "vkeybd-${version}";
+ pname = "vkeybd";
version = "0.1.18d";
src = fetchurl {
- url = "ftp://ftp.suse.com/pub/people/tiwai/vkeybd/${name}.tar.bz2";
+ url = "ftp://ftp.suse.com/pub/people/tiwai/vkeybd/${pname}-${version}.tar.bz2";
sha256 = "0107b5j1gf7dwp7qb4w2snj4bqiyps53d66qzl2rwj4jfpakws5a";
};
diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix
index dde96764fe6c..2bc40a78af48 100644
--- a/pkgs/applications/audio/vmpk/default.nix
+++ b/pkgs/applications/audio/vmpk/default.nix
@@ -5,7 +5,8 @@
let
version = "0.5.1";
in stdenv.mkDerivation rec {
- name = "vmpk-${version}";
+ pname = "vmpk";
+ inherit version;
meta = with stdenv.lib; {
description = "Virtual MIDI Piano Keyboard";
@@ -15,7 +16,7 @@ in stdenv.mkDerivation rec {
};
src = fetchurl {
- url = "mirror://sourceforge/vmpk/${version}/${name}.tar.bz2";
+ url = "mirror://sourceforge/vmpk/${version}/${pname}-${version}.tar.bz2";
sha256 = "11fqnxgs9hr9255d93n7lazxzjwn8jpmn23nywdksh0pb1ffvfrc";
};
diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix
index 382a1a8b2e21..79801f2e99fa 100644
--- a/pkgs/applications/audio/whipper/default.nix
+++ b/pkgs/applications/audio/whipper/default.nix
@@ -30,7 +30,7 @@ python2.pkgs.buildPythonApplication rec {
];
makeWrapperArgs = [
- "--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ]}"
+ "--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ])
];
# some tests require internet access
diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix
index 735e4eb632c2..13bf1d674c7c 100644
--- a/pkgs/applications/audio/wolf-shaper/default.nix
+++ b/pkgs/applications/audio/wolf-shaper/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkgconfig }:
stdenv.mkDerivation rec {
- name = "wolf-shaper-${version}";
+ pname = "wolf-shaper";
version = "0.1.7";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index ece2f5677912..22594d3ec85d 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -4,10 +4,10 @@
stdenv.mkDerivation rec {
version = "20190714";
- name = "x42-plugins-${version}";
+ pname = "x42-plugins";
src = fetchurl {
- url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz";
+ url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
sha256 = "1mifmdy9pi1lg0h4nsvyjjnnni41vhgg34lks94mrx46wq90bgx4";
};
diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix
index a55b47a6c16b..c0803ffa4185 100644
--- a/pkgs/applications/audio/xsynth-dssi/default.nix
+++ b/pkgs/applications/audio/xsynth-dssi/default.nix
@@ -2,11 +2,11 @@
ladspaH, ladspaPlugins, liblo, pkgconfig }:
stdenv.mkDerivation rec {
- name = "xsynth-dssi-${version}";
+ pname = "xsynth-dssi";
version = "0.9.4";
src = fetchurl {
- url = "mirror://sourceforge/dssi/${name}.tar.gz";
+ url = "mirror://sourceforge/dssi/${pname}-${version}.tar.gz";
sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
};
diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix
index ca6d6240688a..c8902f1dda4b 100644
--- a/pkgs/applications/audio/yasr/default.nix
+++ b/pkgs/applications/audio/yasr/default.nix
@@ -1,12 +1,12 @@
{stdenv,fetchurl}:
stdenv.mkDerivation rec {
- name = "yasr-${version}";
+ pname = "yasr";
version = "0.6.9";
src = fetchurl {
- url = "https://sourceforge.net/projects/yasr/files/yasr/${version}/${name}.tar.gz";
+ url = "https://sourceforge.net/projects/yasr/files/yasr/${version}/${pname}-${version}.tar.gz";
sha256 = "1prv9r9y6jb5ga5578ldiw507fa414m60xhlvjl29278p3x7rwa1";
};
diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix
index b800df016c9a..7976f7477171 100644
--- a/pkgs/applications/audio/ympd/default.nix
+++ b/pkgs/applications/audio/ympd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, mpd_clientlib, openssl }:
stdenv.mkDerivation rec {
- name = "ympd-${version}";
+ pname = "ympd";
version = "1.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 00a22ac711e7..0936fe5a8ed7 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -5,11 +5,11 @@
assert stdenv ? glibc;
stdenv.mkDerivation rec {
- name = "yoshimi-${version}";
+ pname = "yoshimi";
version = "1.5.11.3";
src = fetchurl {
- url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
+ url = "mirror://sourceforge/yoshimi/${pname}-${version}.tar.bz2";
sha256 = "00w0ll94dpss9f1rnaxjmw6mgjx5q2dz8w4mc3wyrk4s4gbd7154";
};
diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix
index 69906b814382..eeeb8ae2ea44 100644
--- a/pkgs/applications/audio/zam-plugins/default.nix
+++ b/pkgs/applications/audio/zam-plugins/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }:
-stdenv.mkDerivation rec {
- name = "zam-plugins-${version}";
+stdenv.mkDerivation {
+ pname = "zam-plugins";
version = "3.11";
src = fetchgit {
diff --git a/pkgs/applications/audio/zita-njbridge/default.nix b/pkgs/applications/audio/zita-njbridge/default.nix
index faa90e684aea..1ec6946cf38c 100644
--- a/pkgs/applications/audio/zita-njbridge/default.nix
+++ b/pkgs/applications/audio/zita-njbridge/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.4.4";
- name = "zita-njbridge-${version}";
+ pname = "zita-njbridge";
src = fetchurl {
- url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+ url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
sha256 = "1l8rszdjhp0gq7mr54sdgfs6y6cmw11ssmqb1v9yrkrz5rmwzg8j";
};
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index 7bc1c07befa1..e22bf9ed653a 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "zynaddsubfx-${version}";
+ pname = "zynaddsubfx";
version = "3.0.5";
src = fetchurl {
diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix
index a9647b11eeea..d02aa4b8444f 100644
--- a/pkgs/applications/backup/areca/default.nix
+++ b/pkgs/applications/backup/areca/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ant, jre, jdk, swt, acl, attr }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "areca-7.5";
src = fetchurl {
diff --git a/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch b/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch
deleted file mode 100644
index 7fa68ba4a388..000000000000
--- a/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./scripts/CrashPlanDesktop 2016-03-02 21:01:58.000000000 -0500
-+++ ./scripts/CrashPlanDesktop-1 2016-03-18 20:52:10.117686266 -0400
-@@ -11,7 +11,7 @@
- cd ${TARGETDIR}
-
- if [ "_${VERSION_5_UI}" == "_true" ]; then
-- ${TARGETDIR}/electron/crashplan > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
-+ ${TARGETDIR}/electron/crashplan &
- else
-- ${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
-+ ${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop &
- fi
diff --git a/pkgs/applications/backup/crashplan/CrashPlanEngine.patch b/pkgs/applications/backup/crashplan/CrashPlanEngine.patch
deleted file mode 100644
index de2afe2da684..000000000000
--- a/pkgs/applications/backup/crashplan/CrashPlanEngine.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./scripts/CrashPlanEngine 2014-02-19 23:17:19.000000000 +0000
-+++ ./scripts/CrashPlanEngine.1 2014-07-24 17:36:37.330333581 +0100
-@@ -11,7 +11,7 @@
-
- cd $TARGETDIR
-
-- nice -n 19 $JAVACOMMON $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $TARGETDIR/log/engine_output.log 2> $TARGETDIR/log/engine_error.log &
-+ nice -n 19 $JAVACOMMON $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $VARDIR/log/engine_output.log 2> $VARDIR/log/engine_error.log &
-
- if [[ $! -gt 0 ]]; then
- echo $! > $PIDFILE
-@@ -26,7 +26,7 @@
-
- echo "Using Ubuntu 9.04 startup"
-
-- start-stop-daemon -v --pidfile $PIDFILE --make-pidfile --background --chdir $TARGETDIR --start --nicelevel 19 --exec $JAVACOMMON -- $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $TARGETDIR/log/engine_output.log 2> $TARGETDIR/log/engine_error.log
-+ start-stop-daemon -v --pidfile $PIDFILE --make-pidfile --background --chdir $TARGETDIR --start --nicelevel 19 --exec $JAVACOMMON -- $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $VARDIR/log/engine_output.log 2> $VARDIR/log/engine_error.log
-
- # This test isn't as useful as one might like; start-stop-daemon can't accurately report the state of child processes when --background is used.
- # We use this mainly to report the specific error value returned by start-stop-daemon if something goes wrong, but be aware that a return value
-@@ -91,7 +91,6 @@
- DESC="CrashPlan Engine"
- NAME=CrashPlanEngine
- DAEMON=$TARGETDIR/lib/com.backup42.desktop.jar
--PIDFILE="$TARGETDIR/${NAME}.pid"
-
- if [[ -f $TARGETDIR/install.vars ]]; then
- . $TARGETDIR/install.vars
-@@ -100,6 +99,8 @@
- exit 1
- fi
-
-+PIDFILE="$VARDIR/${NAME}.pid"
-+
- if [[ ! -f $DAEMON ]]; then
- echo "Could not find JAR file $DAEMON"
- exit 0
diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
deleted file mode 100644
index 5db4badeb6c0..000000000000
--- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused,
- procps, which, gtk2, atk, glib, pango, gdk-pixbuf, cairo, freetype,
- fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev,
- libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite,
- libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages,
- maxRam ? "1024m" }:
-
-stdenv.mkDerivation rec {
- version = "6.7.0";
- rev = "1512021600670_4503";
- pname = "CrashPlanSmb";
- name = "${pname}_${version}_${rev}";
-
- src = fetchurl {
- url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz";
- sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q";
- };
-
- nativeBuildInputs = [ makeWrapper cpio nodePackages.asar ];
- buildInputs = [ getopt which ];
-
- vardir = "/var/lib/crashplan";
- manifestdir = "${vardir}/manifest";
-
- postPatch = ''
- # patch scripts/CrashPlanEngine
- substituteInPlace scripts/CrashPlanEngine \
- --replace /bin/ps ${procps}/bin/ps \
- --replace awk ${gawk}/bin/awk \
- --replace '`sed' '`${gnused}/bin/sed' \
- --replace grep ${gnugrep}/bin/grep \
- --replace TARGETDIR/log VARDIR/log \
- --replace TARGETDIR/\''${NAME} VARDIR/\''${NAME} \
- --replace \$TARGETDIR/bin/run.conf $out/bin/run.conf \
- --replace \$VARDIR ${vardir}
-
- # patch scripts/CrashPlanDesktop
- substituteInPlace scripts/CrashPlanDesktop \
- --replace awk ${gawk}/bin/awk \
- --replace "\"\$SCRIPTDIR/..\"" "$out" \
- --replace "\$(dirname \$SCRIPT)" "$out" \
- --replace "\''${TARGETDIR}/log" ${vardir}/log \
- --replace "\''${TARGETDIR}" "$out"
- '';
-
- installPhase = ''
- mkdir $out
- zcat -v ${pname}_${version}.cpi | (cd $out; cpio -i -d -v --no-preserve-owner)
-
- install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop
- install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine
- install -D -m 644 scripts/run.conf $out/bin/run.conf
- install -D -m 644 scripts/CrashPlan.desktop $out/share/applications/CrashPlan.desktop
-
- # unpack, patch and repack app.asar to stop electron from creating /usr/local/crashplan/log to store the ui logs.
- asar e $out/app.asar $out/app.asar-unpacked
- rm -v $out/app.asar
- substituteInPlace $out/app.asar-unpacked/shared_modules/shell/platform_paths.js \
- --replace "getLogFileParentPath();" "\"$vardir/log\";"
- asar p $out/app.asar-unpacked $out/app.asar
-
- mv -v $out/*.asar $out/electron/resources
- chmod 755 "$out/electron/crashplan"
-
- rm -r $out/log
- mv -v $out/conf $out/conf.template
- ln -s $vardir/log $out/log
- ln -s $vardir/cache $out/cache
- ln -s $vardir/conf $out/conf
-
- substituteInPlace $out/bin/run.conf \
- --replace "-Xmx1024m" "-Xmx${maxRam}"
-
- echo "JAVACOMMON=${jre}/bin/java" > $out/install.vars
- echo "APP_BASENAME=CrashPlan" >> $out/install.vars
- echo "TARGETDIR=$out" >> $out/install.vars
- echo "BINSDIR=$out/bin" >> $out/install.vars
- echo "MANIFESTDIR=${manifestdir}" >> $out/install.vars
- echo "VARDIR=${vardir}" >> $out/install.vars
- echo "INITDIR=" >> $out/install.vars
- echo "RUNLVLDIR=" >> $out/install.vars
- echo "INSTALLDATE=" >> $out/install.vars
-
- '';
-
- postFixup = ''
- patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan
- wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [
- stdenv.cc.cc.lib gtk2 atk glib pango gdk-pixbuf cairo freetype
- fontconfig dbus gconf nss nspr alsaLib cups expat udev
- libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite
- libXext libXfixes libXrender libXtst libXScrnSaver]}"
- '';
-
- meta = with stdenv.lib; {
- description = "An online backup solution";
- homepage = http://www.crashplan.com/business/;
- license = licenses.unfree;
- platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ xvapx ];
- broken = true; # 2018-12-06
- };
-}
diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
deleted file mode 100644
index 2c76891b3f9e..000000000000
--- a/pkgs/applications/backup/crashplan/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, gtk2, glib, libXtst }:
-
-stdenv.mkDerivation rec {
- version = "4.8.3";
- rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time
- name = "crashplan-${version}-r${rev}";
-
- src = fetchurl {
- url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz";
- sha256 = "c25d87ec1d442a396b668547e39b70d66dcfe02250cc57a25916ebb42a407113";
- };
-
- meta = with stdenv.lib; {
- description = "An online/offline backup solution";
- homepage = http://www.crashplan.org;
- license = licenses.unfree;
- maintainers = with maintainers; [ sztupi domenkozar jerith666 ];
- };
-
- buildInputs = [ makeWrapper cpio ];
-
- vardir = "/var/lib/crashplan";
-
- manifestdir = "${vardir}/manifest";
-
- patches = [ ./CrashPlanEngine.patch ./CrashPlanDesktop.patch ];
-
- installPhase = ''
- mkdir $out
- zcat -v CrashPlan_${version}.cpi | (cd $out; cpio -i -d -v --no-preserve-owner)
-
- # sed -i "s|manifest|${manifestdir}|g" $out/conf/default.service.xml
-
- # Fix for encoding troubles (CrashPlan ticket 178827)
- # Make sure the daemon is running using the same localization as
- # the (installing) user
- echo "" >> run.conf
- echo "LC_ALL=en_US.UTF-8" >> run.conf
-
- install -d -m 755 unpacked $out
-
- install -D -m 644 run.conf $out/bin/run.conf
- install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop
- install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine
- install -D -m 644 scripts/CrashPlan.desktop $out/share/applications/CrashPlan.desktop
-
- rm -r $out/log
- mv -v $out/conf $out/conf.template
- ln -s $vardir/log $out/log
- ln -s $vardir/cache $out/cache
- ln -s $vardir/backupArchives $out/backupArchives
- ln -s $vardir/conf $out/conf
-
- echo "JAVACOMMON=${jre}/bin/java" > $out/install.vars
- echo "APP_BASENAME=CrashPlan" >> $out/install.vars
- echo "TARGETDIR=${vardir}" >> $out/install.vars
- echo "BINSDIR=$out/bin" >> $out/install.vars
- echo "MANIFESTDIR=${manifestdir}" >> $out/install.vars
- echo "VARDIR=${vardir}" >> $out/install.vars
- echo "INITDIR=" >> $out/install.vars
- echo "RUNLVLDIR=" >> $out/install.vars
- echo "INSTALLDATE=" >> $out/install.vars
- '';
-
- postFixup = ''
- for f in $out/bin/CrashPlanDesktop $out/bin/CrashPlanEngine; do
- echo "substitutions in $f"
- substituteInPlace $f --replace /bin/ps ${procps}/bin/ps
- substituteInPlace $f --replace awk ${gawk}/bin/awk
- substituteInPlace $f --replace sed ${gnused}/bin/sed
- substituteInPlace $f --replace grep ${gnugrep}/bin/grep
- done
-
- substituteInPlace $out/share/applications/CrashPlan.desktop \
- --replace /usr/local $out \
- --replace crashplan/skin skin \
- --replace bin/CrashPlanDesktop CrashPlanDesktop
-
- wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ gtk2 glib libXtst ]}"
- '';
-}
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index 2ff51db54041..7120a1934f6e 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas
+ substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"}
'';
nativeBuildInputs = [
diff --git a/pkgs/applications/backup/vdmfec/default.nix b/pkgs/applications/backup/vdmfec/default.nix
index 3a480f70d4b7..1366bb484a91 100644
--- a/pkgs/applications/backup/vdmfec/default.nix
+++ b/pkgs/applications/backup/vdmfec/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "vdmfec-${version}";
+ pname = "vdmfec";
version = "1.0";
src = fetchurl {
- url = "http://members.tripod.com/professor_tom/archives/${name}.tgz";
+ url = "http://members.tripod.com/professor_tom/archives/${pname}-${version}.tgz";
sha256 = "0i7q4ylx2xmzzq778anpkj4nqir5gf573n1lbpxnbc10ymsjq2rm";
};
diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix
index 5a09641c70d1..d65889be3ac0 100644
--- a/pkgs/applications/blockchains/aeon/default.nix
+++ b/pkgs/applications/blockchains/aeon/default.nix
@@ -7,7 +7,8 @@ let
version = "0.12.9.0";
in
stdenv.mkDerivation {
- name = "aeon-${version}";
+ pname = "aeon";
+ inherit version;
src = fetchFromGitHub {
owner = "aeonix";
diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix
index 481e19c66cdc..b20a6b3e8aa8 100644
--- a/pkgs/applications/blockchains/clightning.nix
+++ b/pkgs/applications/blockchains/clightning.nix
@@ -3,18 +3,20 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "clightning-${version}";
- version = "0.7.1";
+ pname = "clightning";
+ version = "0.7.2.1";
src = fetchurl {
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
- sha256 = "557be34410f27a8d55d9f31a40717a8f5e99829f2bd114c24e7ca1dd5f6b7d85";
+ sha256 = "3be716948efc1208b5e6a41e3034e4e4eecc5abbdac769fd1d999a104ac3a2ec";
};
enableParallelBuilding = true;
nativeBuildInputs = [ autoconf autogen automake libtool pkgconfig which unzip ];
- buildInputs = [ sqlite gmp zlib python3 ];
+ buildInputs =
+ let py3 = python3.withPackages (p: [ p.Mako ]);
+ in [ sqlite gmp zlib py3 ];
makeFlags = [ "prefix=$(out) VERSION=v${version}" ];
@@ -23,7 +25,10 @@ stdenv.mkDerivation rec {
'';
postPatch = ''
- patchShebangs tools/generate-wire.py
+ patchShebangs \
+ tools/generate-wire.py \
+ tools/update-mocks.sh \
+ tools/mockup.sh
'';
doCheck = false;
diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix
index b2f2a457a99d..03dcd6cb54e6 100644
--- a/pkgs/applications/blockchains/dashpay.nix
+++ b/pkgs/applications/blockchains/dashpay.nix
@@ -8,7 +8,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "dashpay-${version}";
+ pname = "dashpay";
version = "0.12.2.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/dcrd.nix b/pkgs/applications/blockchains/dcrd.nix
index cc3e83befa64..16d39e85da15 100644
--- a/pkgs/applications/blockchains/dcrd.nix
+++ b/pkgs/applications/blockchains/dcrd.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }:
buildGoPackage rec {
- name = "dcrd-${version}";
+ pname = "dcrd";
version = "1.1.2";
rev = "refs/tags/v${version}";
goPackagePath = "github.com/decred/dcrd";
diff --git a/pkgs/applications/blockchains/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet.nix
index 8d966684b23c..163ed2615d33 100644
--- a/pkgs/applications/blockchains/dcrwallet.nix
+++ b/pkgs/applications/blockchains/dcrwallet.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }:
buildGoPackage rec {
- name = "dcrwallet-${version}";
+ pname = "dcrwallet";
version = "1.1.2";
rev = "refs/tags/v${version}";
goPackagePath = "github.com/decred/dcrwallet";
diff --git a/pkgs/applications/blockchains/dero.nix b/pkgs/applications/blockchains/dero.nix
index 8405ea8f842b..0ab63bb53951 100644
--- a/pkgs/applications/blockchains/dero.nix
+++ b/pkgs/applications/blockchains/dero.nix
@@ -2,7 +2,7 @@
, lmdb, miniupnpc, readline }:
stdenv.mkDerivation rec {
- name = "dero-${version}";
+ pname = "dero";
version = "0.11.6";
src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix
index 21d69f14d7f3..5bc81a6daf66 100644
--- a/pkgs/applications/blockchains/ethabi.nix
+++ b/pkgs/applications/blockchains/ethabi.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "ethabi-${version}";
+ pname = "ethabi";
version = "7.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/freicoin.nix b/pkgs/applications/blockchains/freicoin.nix
index 664159be2013..6cf84f76f919 100644
--- a/pkgs/applications/blockchains/freicoin.nix
+++ b/pkgs/applications/blockchains/freicoin.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.8.6-2";
- name = "freicoin-${version}";
+ pname = "freicoin";
src = fetchFromGitHub {
owner = "freicoin";
diff --git a/pkgs/applications/blockchains/go-ethereum-classic/default.nix b/pkgs/applications/blockchains/go-ethereum-classic/default.nix
deleted file mode 100644
index 7461e4c376ab..000000000000
--- a/pkgs/applications/blockchains/go-ethereum-classic/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, buildGoPackage, fetchgit }:
-
-buildGoPackage rec {
- name = "go-ethereum-classic-${version}";
- version = "4.0.0";
-
- goPackagePath = "github.com/ethereumproject/go-ethereum";
- subPackages = [ "cmd/evm" "cmd/geth" ];
-
- src = fetchgit {
- rev = "v${version}";
- url = "https://github.com/ethereumproject/go-ethereum";
- sha256 = "06f1w7s45q4zva1xjrx92xinsdrixl0m6zhx5hvdjmg3xqcbwr79";
- };
-
- goDeps = ./deps.nix;
-
- meta = {
- description = "Golang implementation of Ethereum Classic";
- homepage = https://github.com/ethereumproject/go-ethereum;
- license = with lib.licenses; [ lgpl3 gpl3 ];
- maintainers = with lib.maintainers; [ sorpaas ];
- };
-}
diff --git a/pkgs/applications/blockchains/go-ethereum-classic/deps.nix b/pkgs/applications/blockchains/go-ethereum-classic/deps.nix
deleted file mode 100644
index 0aa6755ee960..000000000000
--- a/pkgs/applications/blockchains/go-ethereum-classic/deps.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
-[
- {
- goPackagePath = "github.com/maruel/panicparse";
- fetch = {
- type = "git";
- url = "https://github.com/maruel/panicparse";
- rev = "ae43f192cef2add653fe1481a3070ed00a4a6981";
- sha256 = "11q8v4adbrazqvh24235s5nifck0d1083gbwv4dh5lhd10xlwdvr";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-runewidth";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-runewidth";
- rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d";
- sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/go-wordwrap";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/go-wordwrap";
- rev = "ad45545899c7b13c020ea92b2072220eefad42b8";
- sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9";
- };
- }
- {
- goPackagePath = "github.com/nsf/termbox-go";
- fetch = {
- type = "git";
- url = "https://github.com/nsf/termbox-go";
- rev = "4163cd39dda1c0dda883a713640bc01e08951c24";
- sha256 = "1vzrhxf8823lrnwf1bfyxwlm52pph5iq2hgr1d0n07v8kjgqkrmx";
- };
- }
-]
diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index 740ecfa228fd..5f347fe91e9c 100644
--- a/pkgs/applications/blockchains/go-ethereum.nix
+++ b/pkgs/applications/blockchains/go-ethereum.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "go-ethereum";
- version = "1.9.2";
+ version = "1.9.3";
goPackagePath = "github.com/ethereum/go-ethereum";
@@ -17,7 +17,7 @@ buildGoPackage rec {
owner = "ethereum";
repo = pname;
rev = "v${version}";
- sha256 = "0lymwylh4j63fzj9jy7mcw676a2ksgpsj9mazif1r3d2q73h9m88";
+ sha256 = "0lv6gxp34j26hqazcvyr4c7rsl1vljm6cfzkcmlapsjdgym505bg";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/blockchains/masari.nix b/pkgs/applications/blockchains/masari.nix
index 02a6d25df516..dfa005abb6ec 100644
--- a/pkgs/applications/blockchains/masari.nix
+++ b/pkgs/applications/blockchains/masari.nix
@@ -2,7 +2,7 @@
, lmdb, miniupnpc, readline }:
stdenv.mkDerivation rec {
- name = "masari-${version}";
+ pname = "masari";
version = "0.1.4.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix
index f351c9fa5043..b6f074528616 100644
--- a/pkgs/applications/blockchains/monero/default.nix
+++ b/pkgs/applications/blockchains/monero/default.nix
@@ -11,7 +11,7 @@ assert stdenv.isDarwin -> IOKit != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "monero-${version}";
+ pname = "monero";
version = "0.14.1.0";
src = fetchgit {
diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix
index 58ab367c020f..2b7ae5d9c6e6 100644
--- a/pkgs/applications/blockchains/nano-wallet/default.nix
+++ b/pkgs/applications/blockchains/nano-wallet/default.nix
@@ -1,15 +1,16 @@
-{lib, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}:
+{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook, boost, libGL
+, qtbase}:
stdenv.mkDerivation rec {
- name = "nano-wallet-${version}";
- version = "18.0";
+ pname = "nano-wallet";
+ version = "19.0";
src = fetchFromGitHub {
owner = "nanocurrency";
repo = "raiblocks";
rev = "V${version}";
- sha256 = "03f9g1x7rs7vic9yzsjxsh5ddx9ys78rssbfghbccfw9qrwylh3y";
+ sha256 = "1y5fc4cvfqh33imjkh91sqhy5bb9kh0icwyvdgm1cl564vnjax80";
fetchSubmodules = true;
};
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
cmakeFlags = let
options = {
- BOOST_ROOT = "${boost}";
+ BOOST_ROOT = boost;
Boost_USE_STATIC_LIBS = "OFF";
RAIBLOCKS_GUI = "ON";
RAIBLOCKS_TEST = "ON";
@@ -32,13 +33,19 @@ stdenv.mkDerivation rec {
optionToFlag = name: value: "-D${name}=${value}";
in lib.mapAttrsToList optionToFlag options;
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
buildInputs = [ boost libGL qtbase ];
buildPhase = ''
make nano_wallet
'';
+ # Move executables under bin directory
+ postInstall = ''
+ mkdir -p $out/bin
+ mv $out/nano* $out/bin/
+ '';
+
checkPhase = ''
./core_test
'';
diff --git a/pkgs/applications/blockchains/parity-ui/default.nix b/pkgs/applications/blockchains/parity-ui/default.nix
index c59b2ccb8ac3..0615aed2ca03 100644
--- a/pkgs/applications/blockchains/parity-ui/default.nix
+++ b/pkgs/applications/blockchains/parity-ui/default.nix
@@ -5,13 +5,13 @@ let
uiEnv = pkgs.callPackage ./env.nix { };
in stdenv.mkDerivation rec {
- name = "parity-ui-${version}";
+ pname = "parity-ui";
version = "0.3.4";
src = fetchurl {
url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb";
sha256 = "1xbd00r9ph8w2d6d2c5xg4b5l74ljzs50rpc6kahfznypmh4kr73";
- name = "${name}.deb";
+ name = "${pname}-${version}.deb";
};
nativeBuildInputs = [ makeWrapper nodePackages.asar ];
diff --git a/pkgs/applications/blockchains/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix
index 4b6a88fd410a..a6d4660dff11 100644
--- a/pkgs/applications/blockchains/parity/beta.nix
+++ b/pkgs/applications/blockchains/parity/beta.nix
@@ -1,6 +1,6 @@
let
- version = "2.6.1";
- sha256 = "0yvscs2ivy08zla3jhirxhwwaqsn9j5ml4sqbgx6h5rh19c941vh";
- cargoSha256 = "1s3c44cggajrmc504klf4cyb1s4l5ny48yihs9c3fc0n8d064017";
+ version = "2.6.2";
+ sha256 = "1j4249m5k3bi7di0wq6fm64zv3nlpgmg4hr5hnn94fyc09nz9n1r";
+ cargoSha256 = "1wr0i54zc3l6n0x6cvlq9zfy3bw9w5fcvdz4vmyym9r1nkvk31s7";
in
import ./parity.nix { inherit version sha256 cargoSha256; }
diff --git a/pkgs/applications/blockchains/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix
index 873f83190fde..88d24a87e135 100644
--- a/pkgs/applications/blockchains/parity/default.nix
+++ b/pkgs/applications/blockchains/parity/default.nix
@@ -1,6 +1,6 @@
let
- version = "2.5.6";
- sha256 = "1qkrqkkgjvm27babd6bidhf1n6vdp8rac1zy5kf61nfzplxzr2dy";
- cargoSha256 = "0aa0nkv3jr7cdzswbxghxxv0y65a59jgs1682ch8vrasi0x17m1x";
+ version = "2.5.7";
+ sha256 = "0aprs71cbf98dsvjz0kydngkvdg5x7dijji8j6xadgvsarl1ljnj";
+ cargoSha256 = "11mr5q5aynli9xm4wnxcypl3ij7f4b0p7l557yi9n0cvdraw8ki4";
in
import ./parity.nix { inherit version sha256 cargoSha256; }
diff --git a/pkgs/applications/blockchains/parity/parity.nix b/pkgs/applications/blockchains/parity/parity.nix
index 79831f3304df..7f28d97bf81a 100644
--- a/pkgs/applications/blockchains/parity/parity.nix
+++ b/pkgs/applications/blockchains/parity/parity.nix
@@ -7,14 +7,13 @@
, fetchFromGitHub
, rustPlatform
-, pkgconfig
-, openssl
-, systemd
, cmake
-, perl
+, openssl
+, pkgconfig
+, systemd
}:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
pname = "parity";
inherit version;
inherit cargoSha256;
@@ -26,10 +25,9 @@ rustPlatform.buildRustPackage rec {
inherit sha256;
};
- buildInputs = [
- pkgconfig cmake perl
- systemd.lib systemd.dev openssl openssl.dev
- ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [ openssl systemd ];
cargoBuildFlags = [ "--features final" ];
diff --git a/pkgs/applications/blockchains/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix
index f5efa0bb52c2..613d57cd9c8c 100644
--- a/pkgs/applications/blockchains/particl/particl-core.nix
+++ b/pkgs/applications/blockchains/particl/particl-core.nix
@@ -16,7 +16,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "particl-core-${version}";
+ pname = "particl-core";
version = "0.17.1.2";
src = fetchurl {
diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix
index e2cf8aa182f3..c0833de7dbf3 100644
--- a/pkgs/applications/blockchains/pivx.nix
+++ b/pkgs/applications/blockchains/pivx.nix
@@ -9,7 +9,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "pivx-${version}";
+ pname = "pivx";
version = "3.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix
index 26c9192ee6fa..100c0f8ba41f 100644
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@@ -6,7 +6,7 @@
}:
rustPlatform.buildRustPackage rec {
- name = "polkadot-${version}";
+ pname = "polkadot";
version = "0.2.17";
src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/sumokoin.nix b/pkgs/applications/blockchains/sumokoin.nix
index 026008b2761a..ad65da057aec 100644
--- a/pkgs/applications/blockchains/sumokoin.nix
+++ b/pkgs/applications/blockchains/sumokoin.nix
@@ -2,7 +2,7 @@
, libunwind, lmdb, miniupnpc }:
stdenv.mkDerivation rec {
- name = "sumokoin-${version}";
+ pname = "sumokoin";
version = "0.2.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix
index 7185b3510601..41510eebff60 100644
--- a/pkgs/applications/blockchains/wasabiwallet/default.nix
+++ b/pkgs/applications/blockchains/wasabiwallet/default.nix
@@ -2,37 +2,37 @@
stdenv.mkDerivation rec {
pname = "wasabiwallet";
- version = "1.1.5";
+ version = "1.1.8";
- src = fetchurl {
- url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz";
- sha256 = "1iq7qkpq073yq1bz8pam4cbm2myznhpjr3g9afblvmxwgbdjxak0";
- };
+ src = fetchurl {
+ url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz";
+ sha256 = "10w4f9d0li25ifkmlmj6302i70sw3drdwd54d4r7x1n5kc6p164j";
+ };
- dontBuild = true;
- dontPatchELF = true;
+ dontBuild = true;
+ dontPatchELF = true;
- desktopItem = makeDesktopItem {
- name = "wasabi";
- exec = "wasabiwallet";
- desktopName = "Wasabi";
- genericName = "Bitcoin wallet";
- comment = meta.description;
- categories = "Application;Network;Utility;";
- };
+ desktopItem = makeDesktopItem {
+ name = "wasabi";
+ exec = "wasabiwallet";
+ desktopName = "Wasabi";
+ genericName = "Bitcoin wallet";
+ comment = meta.description;
+ categories = "Application;Network;Utility;";
+ };
installPhase = ''
- mkdir -p $out/opt/${pname} $out/bin $out/share/applications
- cp -Rv . $out/opt/${pname}
- cd $out/opt/${pname}
- for i in $(find . -type f -name '*.so') wassabee
- do
- patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i
- done
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee
- ln -s $out/opt/${pname}/wassabee $out/bin/${pname}
- cp -v $desktopItem/share/applications/* $out/share/applications
- '';
+ mkdir -p $out/opt/${pname} $out/bin $out/share/applications
+ cp -Rv . $out/opt/${pname}
+ cd $out/opt/${pname}
+ for i in $(find . -type f -name '*.so') wassabee
+ do
+ patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i
+ done
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee
+ ln -s $out/opt/${pname}/wassabee $out/bin/${pname}
+ cp -v $desktopItem/share/applications/* $out/share/applications
+ '';
meta = with stdenv.lib; {
description = "Privacy focused Bitcoin wallet";
diff --git a/pkgs/applications/blockchains/wownero.nix b/pkgs/applications/blockchains/wownero.nix
index 7aed32978326..365afb5a2411 100644
--- a/pkgs/applications/blockchains/wownero.nix
+++ b/pkgs/applications/blockchains/wownero.nix
@@ -6,7 +6,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "wownero-${version}";
+ pname = "wownero";
version = "0.6.1.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
index 3aeee7e6972f..634d4e8538a1 100644
--- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "librustzcash-unstable-${version}";
+ pname = "librustzcash-unstable";
version = "2017-03-17";
src = fetchFromGitHub {
diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
index 45fd3cb8cbb7..accdea3ae2d3 100644
--- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
@@ -2,9 +2,9 @@
, dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.2.1";
- name = "lightdm-enso-os-greeter-${version}";
+ pname = "lightdm-enso-os-greeter";
src = fetchgit {
url = https://github.com/nick92/Enso-OS;
diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
index 91446f73507e..69635718e3ba 100644
--- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3 }:
stdenv.mkDerivation rec {
- name = "lightdm-mini-greeter-${version}";
+ pname = "lightdm-mini-greeter";
version = "0.3.4";
src = fetchFromGitHub {
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 61d65cb64b6b..1df67578b3ac 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -61,13 +61,12 @@ stdenv.mkDerivation rec {
"--localstatedir=/var"
"--sysconfdir=/etc"
"--disable-tests"
- "--disable-static"
"--disable-dmrc"
] ++ optional withQt4 "--enable-liblightdm-qt"
++ optional withQt5 "--enable-liblightdm-qt5";
installFlags = [
- "sysconfdir=${placeholder ''out''}/etc"
+ "sysconfdir=${placeholder "out"}/etc"
"localstatedir=\${TMPDIR}"
];
diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
index 61db182f7446..f892a9da50b9 100644
--- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
+++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
@@ -12,10 +12,11 @@ let
version = "2.0.6";
in
stdenv.mkDerivation rec {
- name = "lightdm-gtk-greeter-${version}";
+ pname = "lightdm-gtk-greeter";
+ inherit version;
src = fetchurl {
- url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
+ url = "${meta.homepage}/${ver_branch}/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15";
};
diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix
index e8edcc3f634c..2f0a770bc71c 100644
--- a/pkgs/applications/display-managers/ly/default.nix
+++ b/pkgs/applications/display-managers/ly/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, linux-pam }:
stdenv.mkDerivation rec {
- name = "ly-${version}";
+ pname = "ly";
version = "0.2.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index b5d32493003d..526041124bcc 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,13 +1,14 @@
{ mkDerivation, lib, fetchFromGitHub
, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs
-, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
+, libXdmcp, libXau, qtbase, qtdeclarative, qtquickcontrols2, qttools, pam, systemd
}:
let
version = "0.18.1";
-in mkDerivation rec {
- name = "sddm-${version}";
+in mkDerivation {
+ pname = "sddm";
+ inherit version;
src = fetchFromGitHub {
owner = "sddm";
@@ -29,7 +30,7 @@ in mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
buildInputs = [
- libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative systemd
+ libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative qtquickcontrols2 systemd
];
cmakeFlags = [
diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix
index 214b435429ae..1bd73bebe03b 100644
--- a/pkgs/applications/editors/aewan/default.nix
+++ b/pkgs/applications/editors/aewan/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, ncurses }:
stdenv.mkDerivation rec {
- name = "aewan-${version}";
+ pname = "aewan";
version = "1.0.01";
src = fetchurl {
- url = "mirror://sourceforge/aewan/${name}.tar.gz";
+ url = "mirror://sourceforge/aewan/${pname}-${version}.tar.gz";
sha256 = "5266dec5e185e530b792522821c97dfa5f9e3892d0dca5e881d0c30ceac21817";
};
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index 50a752b3eb96..0d406ad2d360 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -40,7 +40,7 @@
let
drvName = "android-studio-${channel}-${version}";
androidStudio = stdenv.mkDerivation {
- name = drvName;
+ name = "${drvName}-unwrapped";
src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.tar.gz";
@@ -133,7 +133,7 @@ let
multiPkgs = pkgs: [ pkgs.ncurses5 ];
};
in runCommand
- "${drvName}-wrapper"
+ drvName
{
startScript = ''
#!${bash}/bin/bash
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 9f7997860c61..2a9129cfebf2 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -14,11 +14,11 @@ let
};
betaVersion = stableVersion;
latestVersion = { # canary & dev
- version = "3.6.0.9"; # "Android Studio 3.6 Canary 9"
- build = "192.5830636";
- sha256Hash = "0c9zmxf2scsf9pygcbabzngl7cdyjgpir5pggjaj535ni0nsrr7p";
+ version = "3.6.0.11"; # "Android Studio 3.6 Canary 11"
+ build = "192.5863777";
+ sha256Hash = "1wz4vcdj4225vffsq0ji4zgg9qaqlfd21x7c6nczhqvydbyrjzg8";
};
-in rec {
+in {
# Attributes are named by their corresponding release channels
stable = mkStudio (stableVersion // {
diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix
index 7db4d3e947bf..170fde7b9caf 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/pkgs/applications/editors/aseprite/default.nix
@@ -10,7 +10,7 @@ let
skia = callPackage ./skia.nix {};
in
stdenv.mkDerivation rec {
- name = "aseprite-${version}";
+ pname = "aseprite";
version = if unfree then "1.2.11" else "1.1.7";
src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix
index 038ff96ad3bd..8bf2adf484e2 100644
--- a/pkgs/applications/editors/aseprite/skia.nix
+++ b/pkgs/applications/editors/aseprite/skia.nix
@@ -7,7 +7,7 @@ let
# skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly'
depSrcs = import ./skia-deps.nix { inherit fetchgit; };
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "skia-aseprite-m71";
src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix
index 9f1db1464482..a12ccd257f8a 100644
--- a/pkgs/applications/editors/bonzomatic/default.nix
+++ b/pkgs/applications/editors/bonzomatic/default.nix
@@ -1,7 +1,6 @@
{ stdenv, makeWrapper, fetchFromGitHub, cmake, alsaLib, mesa_glu, libXcursor, libXinerama, libXrandr, xorgserver }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "bonzomatic";
version = "2018-03-29";
diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix
index 17ae40521986..439b721632d0 100644
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/pkgs/applications/editors/brackets/default.nix
@@ -8,13 +8,13 @@ let
];
in
stdenv.mkDerivation rec {
- name = "brackets-${version}";
+ pname = "brackets";
version = "1.9";
src = fetchurl {
url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb";
sha256 = "0c4l2rr0853xd21kw8hhxlmrx8mqwb7iqa2k24zvwyjp4nnwkgbp";
- name = "${name}.deb";
+ name = "${pname}-${version}.deb";
};
phases = [ "installPhase" "fixupPhase" ];
diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix
index f5e14ff1e096..3237c543ee69 100644
--- a/pkgs/applications/editors/bvi/default.nix
+++ b/pkgs/applications/editors/bvi/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "bvi-${version}";
+ pname = "bvi";
version = "1.4.0";
src = fetchurl {
- url = "mirror://sourceforge/bvi/${name}.src.tar.gz";
+ url = "mirror://sourceforge/bvi/${pname}-${version}.src.tar.gz";
sha256 = "00pq9rv7s8inqxq2m3xshxi58691i3pxw9smibcrgh6768l3qnh1";
};
diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix
index d08e006ec5b3..2c6b153370e4 100644
--- a/pkgs/applications/editors/bviplus/default.nix
+++ b/pkgs/applications/editors/bviplus/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "bviplus-${version}";
+ pname = "bviplus";
version = "0.9.4";
src = fetchurl {
diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix
index 4ab11064eae3..65ec43939127 100644
--- a/pkgs/applications/editors/deadpixi-sam/default.nix
+++ b/pkgs/applications/editors/deadpixi-sam/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2017-10-27";
- name = "deadpixi-sam-unstable-${version}";
+ pname = "deadpixi-sam-unstable";
src = fetchFromGitHub {
owner = "deadpixi";
diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix
index f4581c4beceb..efb3a2f9ffab 100644
--- a/pkgs/applications/editors/dhex/default.nix
+++ b/pkgs/applications/editors/dhex/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "dhex-${version}";
+ pname = "dhex";
version = "0.69";
src = fetchurl {
diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix
index 12ca7a071406..2f83b0b8d992 100644
--- a/pkgs/applications/editors/dit/default.nix
+++ b/pkgs/applications/editors/dit/default.nix
@@ -1,11 +1,11 @@
{ lib, fetchurl, stdenv, libiconv, ncurses, lua }:
stdenv.mkDerivation rec {
- name = "dit-${version}";
+ pname = "dit";
version = "0.5";
src = fetchurl {
- url = "https://hisham.hm/dit/releases/${version}/${name}.tar.gz";
+ url = "https://hisham.hm/dit/releases/${version}/${pname}-${version}.tar.gz";
sha256 = "05vhr1gl3bb5fg49v84xhmjaqdjw6djampvylw10ydvbpnpvjvjc";
};
diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index 0b6e28434f56..0de514233f8e 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
stdenv.mkDerivation rec {
- name = "edbrowse-${version}";
+ pname = "edbrowse";
version = "3.7.4";
buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix
index 17fa75fe6343..27c13c0cb396 100644
--- a/pkgs/applications/editors/edit/default.nix
+++ b/pkgs/applications/editors/edit/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, unzip, pkgconfig, ncurses, libX11, libXft, cwebbin }:
-stdenv.mkDerivation rec {
- name = "edit-nightly-${version}";
+stdenv.mkDerivation {
+ pname = "edit-nightly";
version = "20160425";
src = fetchgit {
diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix
index 078b8a03b5d9..4b7e4c8a3ca4 100644
--- a/pkgs/applications/editors/elvis/default.nix
+++ b/pkgs/applications/editors/elvis/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, fetchpatch, stdenv, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "elvis-2.2_0";
src = fetchurl {
diff --git a/pkgs/applications/editors/emacs-modes/cedille/default.nix b/pkgs/applications/editors/emacs-modes/cedille/default.nix
index 2d1cbb75981e..3af53cda492f 100644
--- a/pkgs/applications/editors/emacs-modes/cedille/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cedille/default.nix
@@ -1,7 +1,7 @@
{ stdenv, cedille, emacs }:
-stdenv.mkDerivation rec {
- name = "cedille-mode-${version}";
+stdenv.mkDerivation {
+ pname = "cedille-mode";
version = cedille.version;
src = cedille.src;
diff --git a/pkgs/applications/editors/emacs-modes/coffee/default.nix b/pkgs/applications/editors/emacs-modes/coffee/default.nix
deleted file mode 100644
index 495b1aca4b53..000000000000
--- a/pkgs/applications/editors/emacs-modes/coffee/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchgit, emacs }:
-
-stdenv.mkDerivation rec {
- name = "coffee-mode-0.4.1";
-
- src = fetchgit {
- url = "https://github.com/defunkt/coffee-mode.git";
- rev = "c45c5f7a529363bc7aa57db0f3df26389fd233d8";
- sha256 = "36a7792b5ffbcc5a580e8d5b2425494c60a8015cfde0e3f8a946a685da231ce2";
- };
-
- buildInputs = [ emacs ];
-
- buildPhase = ''
- emacs --batch -f batch-byte-compile coffee-mode.el
- '';
-
- installPhase = ''
- install -d $out/share/emacs/site-lisp
- install coffee-mode.el coffee-mode.elc $out/share/emacs/site-lisp
- '';
-
- meta = {
- description = "Emacs major mode for CoffeeScript, unfancy JavaScript";
- homepage = https://github.com/defunkt/coffee-mode;
- license = stdenv.lib.licenses.gpl2Plus;
-
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
index fb3de6ea3d9e..3d34c7a462e3 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
+++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
@@ -2,7 +2,7 @@
let
commit = "412713a0fcedd520d208a7b783fea03d710bcc61";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "color-theme-solarized-1.0.0";
src = fetchzip {
diff --git a/pkgs/applications/editors/emacs-modes/cua/builder.sh b/pkgs/applications/editors/emacs-modes/cua/builder.sh
deleted file mode 100644
index 6f7bb428c1a6..000000000000
--- a/pkgs/applications/editors/emacs-modes/cua/builder.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/emacs/site-lisp
-cp $src $out/emacs/site-lisp/cua.el
diff --git a/pkgs/applications/editors/emacs-modes/cua/default.nix b/pkgs/applications/editors/emacs-modes/cua/default.nix
deleted file mode 100644
index 0305be28ad62..000000000000
--- a/pkgs/applications/editors/emacs-modes/cua/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
- name = "cua-mode-2.10";
- builder = ./builder.sh;
- src = fetchurl {
- url = http://tarballs.nixos.org/cua-mode-2.10.el;
- sha256 = "01877xjbq0v9wrpcbnhvppdn9wxliwkkjg3dr6k795mjgslwhr1b";
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index 5f0c863b5861..a6bea779eae0 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -36,13 +36,7 @@ self: let
super = removeAttrs imported [ "dash" ];
overrides = {
- # upstream issue: missing footer
- ebdb-i18n-chn = markBroken super.ebdb-i18n-chn;
- el-search = markBroken super.el-search; # requires emacs-25
- iterators = markBroken super.iterators; # requires emacs-25
- midi-kbd = markBroken super.midi-kbd; # requires emacs-25
rcirc-menu = markBroken super.rcirc-menu; # Missing file header
- stream = markBroken super.stream; # requires emacs-25
cl-lib = null; # builtin
tle = null; # builtin
advice = null; # builtin
diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
deleted file mode 100644
index 23a9b3b19206..000000000000
--- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ clangStdenv, fetchgit, llvmPackages }:
-
-clangStdenv.mkDerivation {
- name = "emacs-clang-complete-async-20130218";
- src = fetchgit {
- url = "git://github.com/Golevka/emacs-clang-complete-async.git";
- rev = "f01488971ec8b5752780d130fb84de0c16a46f31";
- sha256 = "01smjinrvx0w5z847a43fh2hyr6rrq1kaglfakbr6dcr313w89x9";
- };
-
- buildInputs = [ llvmPackages.llvm ];
-
- patches = [ ./fix-build.patch ];
-
- CFLAGS = "-I${llvmPackages.clang}/include";
- LDFLAGS = "-L${llvmPackages.clang}/lib";
-
- installPhase = ''
- mkdir -p $out/bin
- mkdir -p $out/share/emacs/site-lisp
- install -m 755 clang-complete $out/bin
- install -m 644 auto-complete-clang-async.el $out/share/emacs/site-lisp
- '';
-
- meta = {
- homepage = https://github.com/Golevka/emacs-clang-complete-async;
- description = "An emacs plugin to complete C and C++ code using libclang";
- license = clangStdenv.lib.licenses.gpl3Plus;
-
- # Fails with:
- # ./src/completion.h:5:10: fatal error: 'clang-c/Index.h' file not found
- # include
- broken = true;
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch
deleted file mode 100644
index 89de339a436b..000000000000
--- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- old/src/completion.h 2014-11-16 16:58:16.625150124 +0100
-+++ new/src/completion.h 2014-11-16 16:58:28.020207508 +0100
-@@ -3,6 +3,7 @@
-
-
- #include
-+#include
-
-
- typedef struct __completion_Session_struct
diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs-modes/emacs2nix.nix
index 4c1a0dd2312d..cedc56e97ceb 100644
--- a/pkgs/applications/editors/emacs-modes/emacs2nix.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs2nix.nix
@@ -14,7 +14,7 @@ in pkgs.mkShell {
pkgs.bash
];
- EMACS2NIX = "${src}";
+ EMACS2NIX = src;
shellHook = ''
export PATH=$PATH:${src}
diff --git a/pkgs/applications/editors/emacs-modes/gn/default.nix b/pkgs/applications/editors/emacs-modes/gn/default.nix
deleted file mode 100644
index 39e7d1abf386..000000000000
--- a/pkgs/applications/editors/emacs-modes/gn/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchgit, emacs }:
-
-stdenv.mkDerivation {
- name = "gn-mode-2017-09-21";
- src = fetchgit {
- url = "https://chromium.googlesource.com/chromium/src/tools/gn";
- rev = "34f2780efb3fe14fe361ec161ad58440de5a6b36";
- sha256 = "10cisqz3l6ny3471yi7y1z8v622lpl65zh0liqr6absvmy63g866";
- };
- buildInputs = [ emacs ];
-
- buildPhase = ''
- emacs --batch -f batch-byte-compile misc/emacs/gn-mode.el
- '';
-
- installPhase = ''
- mkdir -p $out/share/emacs/site-lisp/
- cp misc/emacs/gn-mode.el* $out/share/emacs/site-lisp/
- '';
-}
diff --git a/pkgs/applications/editors/emacs-modes/helm-words/default.nix b/pkgs/applications/editors/emacs-modes/helm-words/default.nix
index b28d0ae24a34..c6e1c5a50f4a 100644
--- a/pkgs/applications/editors/emacs-modes/helm-words/default.nix
+++ b/pkgs/applications/editors/emacs-modes/helm-words/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation {
- name = "helm-words-20150413";
+ name = "helm-words-20190917";
src = fetchgit {
url = "https://github.com/pronobis/helm-words.git";
- rev = "637aa3a7e9cfd34e0127472c5b1f993a4da26185";
- sha256 = "19l8vysjygscr1nsddjz2yv0fjhbsswfq40rdny8zsmaa6qhpj35";
+ rev = "e6387ece1940a06695b9d910de3d90252efb8d29";
+ sha256 = "1ly0mbzlgc26fqvf7rxpmy698g0cf9qldrwrx022ar6r68l1h7xf";
};
installPhase = ''
diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/pkgs/applications/editors/emacs-modes/hol_light/default.nix
index 38457af120bc..255b30d60ed1 100644
--- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix
+++ b/pkgs/applications/editors/emacs-modes/hol_light/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchsvn }:
stdenv.mkDerivation rec {
- name = "hol_light-mode-${version}";
+ pname = "hol_light-mode";
version = "73";
src = fetchsvn {
diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/pkgs/applications/editors/emacs-modes/hsc3/default.nix
index 199a5886e1df..75b72516a3cd 100644
--- a/pkgs/applications/editors/emacs-modes/hsc3/default.nix
+++ b/pkgs/applications/editors/emacs-modes/hsc3/default.nix
@@ -6,7 +6,8 @@
let version = "0.15";
in stdenv.mkDerivation {
- name = "hsc3-mode-${version}";
+ pname = "hsc3-mode";
+ inherit version;
src = fetchurl {
url = mirror://hackage/hsc3-0.15/hsc3-0.15.tar.gz;
sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6";
diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix
index 17cf213a799d..27dcd1063bf2 100644
--- a/pkgs/applications/editors/emacs-modes/icicles/default.nix
+++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix
@@ -21,7 +21,7 @@ let
in
stdenv.mkDerivation rec {
version = "2019-02-22";
- name = "icicles-${version}";
+ pname = "icicles";
srcs = forAll ({name, sha256}: fetchurl { url = "https://www.emacswiki.org/emacs/download/${name}"; inherit sha256; });
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildPhase = "emacs --batch -L . -f batch-byte-compile *.el";
- installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/";
+ installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/";
meta = {
homepage = https://www.emacswiki.org/emacs/Icicles;
diff --git a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
index 3cc8156337e0..eaa0f2c2a5b1 100644
--- a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
@@ -4,7 +4,8 @@ let
version = "3.6-4-gb659bf8";
in
stdenv.mkDerivation {
- name = "ido-ubiquitous-${version}";
+ pname = "ido-ubiquitous";
+ inherit version;
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
diff --git a/pkgs/applications/editors/emacs-modes/libgenerated.nix b/pkgs/applications/editors/emacs-modes/libgenerated.nix
index 73d66dc2b3c4..0529fce2b16d 100644
--- a/pkgs/applications/editors/emacs-modes/libgenerated.nix
+++ b/pkgs/applications/editors/emacs-modes/libgenerated.nix
@@ -53,7 +53,7 @@ in {
, sha256 ? null
, ... }@args:
let
- sourceArgs = args."${variant}";
+ sourceArgs = args.${variant};
version = sourceArgs.version or null;
deps = sourceArgs.deps or null;
error = sourceArgs.error or args.error or null;
@@ -78,7 +78,7 @@ in {
inherit sha256;
};
packageRequires = lib.optional (! isNull deps)
- (map (dep: pkgargs."${dep}" or self."${dep}" or null)
+ (map (dep: pkgargs.${dep} or self.${dep} or null)
deps);
meta = (sourceArgs.meta or {}) // {
inherit broken;
diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix
index 92c9f96ed70e..fd62ea18b713 100644
--- a/pkgs/applications/editors/emacs-modes/manual-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix
@@ -6,7 +6,7 @@
src = pkgs.fetchFromGitHub {
owner = "skeeto";
repo = "elisp-ffi";
- rev = "${version}";
+ rev = version;
sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22";
};
buildInputs = [ external.libffi ];
@@ -59,7 +59,7 @@
font-lock-plus = callPackage ./font-lock-plus { };
- ghc-mod = melpaBuild rec {
+ ghc-mod = melpaBuild {
pname = "ghc";
version = external.ghc-mod.version;
src = external.ghc-mod.src;
@@ -75,7 +75,7 @@
};
};
- haskell-unicode-input-method = melpaBuild rec {
+ haskell-unicode-input-method = melpaBuild {
pname = "emacs-haskell-unicode-input-method";
version = "20110905.2307";
src = pkgs.fetchFromGitHub {
@@ -104,7 +104,7 @@
icicles = callPackage ./icicles { };
- rtags = melpaBuild rec {
+ rtags = melpaBuild {
inherit (external.rtags) version src meta;
pname = "rtags";
@@ -130,8 +130,6 @@
railgun = callPackage ./railgun { };
- gn = callPackage ./gn { };
-
structured-haskell-mode = self.shm;
thingatpt-plus = callPackage ./thingatpt-plus { };
@@ -145,12 +143,9 @@
# From old emacsPackages (pre emacsPackagesNg)
cedet = callPackage ./cedet { };
cedille = callPackage ./cedille { cedille = pkgs.cedille; };
- coffee = callPackage ./coffee { };
colorThemeSolarized = callPackage ./color-theme-solarized {
colorTheme = self.color-theme;
};
- cua = callPackage ./cua { };
- emacsClangCompleteAsync = callPackage ./emacs-clang-complete-async { };
emacsSessionManagement = callPackage ./session-management-for-emacs { };
hsc3-mode = callPackage ./hsc3 { };
hol_light_mode = callPackage ./hol_light { };
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 12cc2c571d8b..838e57343c43 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -34,7 +34,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson));
overrides = rec {
- shared = {
+ shared = rec {
# Expects bash to be at /bin/bash
ac-rtags = markBroken super.ac-rtags;
@@ -42,8 +42,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
inherit (self.melpaPackages) powerline;
};
- # upstream issue: missing file header
- bufshow = markBroken super.bufshow;
+ auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs(old: {
+ buildInputs = old.buildInputs ++ [ external.llvmPackages.llvm ];
+ CFLAGS = "-I${external.llvmPackages.clang}/include";
+ LDFLAGS = "-L${external.llvmPackages.clang}/lib";
+ });
+ emacsClangCompleteAsync = auto-complete-clang-async;
# part of a larger package
caml = dontConfigure super.caml;
@@ -64,13 +68,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
inherit (self.melpaPackages) easy-kill;
};
- # upstream issue: missing file header
- elmine = markBroken super.elmine;
-
- elpy = super.elpy.overrideAttrs(old: {
- propagatedUserEnvPkgs = old.propagatedUserEnvPkgs ++ [ external.elpy ];
- });
-
emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [ pkgs.sqlite ];
@@ -101,9 +98,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# Expects bash to be at /bin/bash
flycheck-rtags = markBroken super.flycheck-rtags;
- # build timeout
- graphene = markBroken super.graphene;
-
pdf-tools = super.pdf-tools.overrideAttrs(old: {
nativeBuildInputs = [ external.pkgconfig ];
buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ];
@@ -123,12 +117,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
propagatedUserEnvPkgs = [ external.hindent ];
});
- # upstream issue: missing file header
- ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
-
- # upstream issue: missing file header
- initsplit = markBroken super.initsplit;
-
irony = super.irony.overrideAttrs (old: {
cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ];
NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR";
@@ -162,12 +150,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# Expects bash to be at /bin/bash
ivy-rtags = markBroken super.ivy-rtags;
- # upstream issue: missing file header
- jsfmt = markBroken super.jsfmt;
-
- # upstream issue: missing file header
- maxframe = markBroken super.maxframe;
-
magit = super.magit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
@@ -210,13 +192,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
- kubernetes = super.kubernetes.overrideAttrs (attrs: {
- # searches for Git at build time
- nativeBuildInputs =
- (attrs.nativeBuildInputs or []) ++ [ external.git ];
- });
+ kubernetes = super.kubernetes.overrideAttrs (attrs: {
+ # searches for Git at build time
+ nativeBuildInputs =
+ (attrs.nativeBuildInputs or []) ++ [ external.git ];
+ });
- # upstream issue: missing file header
+ # upstream issue: missing file header
mhc = super.mhc.override {
inherit (self.melpaPackages) calfw;
};
@@ -227,25 +209,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# part of a larger package
notmuch = dontConfigure super.notmuch;
- # missing OCaml
- ocp-indent = markBroken super.ocp-indent;
-
- # upstream issue: missing file header
- qiita = markBroken super.qiita;
-
- # upstream issue: missing file header
- speech-tagger = markBroken super.speech-tagger;
-
shm = super.shm.overrideAttrs (attrs: {
propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
});
- # upstream issue: missing file header
- tawny-mode = markBroken super.tawny-mode;
-
# Telega has a server portion for it's network protocol
telega = super.telega.overrideAttrs(old: {
-
buildInputs = old.buildInputs ++ [ pkgs.tdlib ];
postBuild = ''
@@ -258,26 +227,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
mkdir -p $out/bin
install -m755 -Dt $out/bin ./source/server/telega-server
'';
-
});
- # upstream issue: missing file header
- textmate = markBroken super.textmate;
-
- # missing OCaml
- utop = markBroken super.utop;
-
vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: {
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
- # upstream issue: missing file header
- voca-builder = markBroken super.voca-builder;
-
- # upstream issue: missing file header
- window-numbering = markBroken super.window-numbering;
-
zmq = super.zmq.overrideAttrs(old: {
stripDebugList = [ "share" ];
preBuild = ''
@@ -317,9 +273,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
};
stable = shared // {
+
+ # upstream issue: missing file header
+ bufshow = markBroken super.bufshow;
+
# part of a larger package
# upstream issue: missing package version
- cmake-mode = markBroken (dontConfigure super.cmake-mode);
+ cmake-mode = dontConfigure super.cmake-mode;
# upstream issue: missing file header
connection = markBroken super.connection;
@@ -330,47 +290,48 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# missing git
egg = markBroken super.egg;
- # upstream issue: missing dependency redshank
- emr = markBroken super.emr;
+ # upstream issue: missing file header
+ elmine = markBroken super.elmine;
+
+ # upstream issue: missing file header
+ ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
+
+ # upstream issue: missing file header
+ initsplit = markBroken super.initsplit;
+
+ # upstream issue: missing file header
+ jsfmt = markBroken super.jsfmt;
+
+ # upstream issue: missing file header
+ maxframe = markBroken super.maxframe;
# upstream issue: doesn't build
eterm-256color = markBroken super.eterm-256color;
- # upstream issue: missing dependency highlight
- evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
-
- # upstream issue: missing dependency highlight
- floobits = markBroken super.floobits;
-
- # missing OCaml
- flycheck-ocaml = markBroken super.flycheck-ocaml;
-
- # upstream issue: missing dependency
- fold-dwim-org = markBroken super.fold-dwim-org;
-
- # build timeout
- graphene = markBroken super.graphene;
-
# Expects bash to be at /bin/bash
helm-rtags = markBroken super.helm-rtags;
# upstream issue: missing file header
- link = markBroken super.link;
-
- # missing OCaml
- merlin = markBroken super.merlin;
+ qiita = markBroken super.qiita;
# upstream issue: missing file header
- po-mode = markBroken super.po-mode;
+ speech-tagger = markBroken super.speech-tagger;
+
+ # upstream issue: missing file header
+ textmate = markBroken super.textmate;
+
+ # upstream issue: missing file header
+ link = markBroken super.link;
+
+ # upstream issue: missing file header
+ voca-builder = markBroken super.voca-builder;
+
+ # upstream issue: missing file header
+ window-numbering = markBroken super.window-numbering;
- # upstream issue: truncated file
- powershell = markBroken super.powershell;
};
unstable = shared // {
- # upstream issue: mismatched filename
- ack-menu = markBroken super.ack-menu;
-
editorconfig = super.editorconfig.overrideAttrs (attrs: {
propagatedUserEnvPkgs = [ external.editorconfig-core-c ];
});
@@ -392,9 +353,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
- # upstream issue: mismatched filename
- helm-lobsters = markBroken super.helm-lobsters;
-
# Expects bash to be at /bin/bash
helm-rtags = markBroken super.helm-rtags;
@@ -410,9 +368,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
HOME = "/tmp";
});
- # upstream issue: mismatched filename
- processing-snippets = markBroken super.processing-snippets;
-
racer = super.racer.overrideAttrs (attrs: {
postPatch = attrs.postPatch or "" + ''
substituteInPlace racer.el \
@@ -420,9 +375,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
'';
});
- # upstream issue: missing file footer
- seoul256-theme = markBroken super.seoul256-theme;
-
spaceline = super.spaceline.override {
inherit (self.melpaPackages) powerline;
};
@@ -462,7 +414,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
};
});
- in pkgs.stdenv.mkDerivation rec {
+ in pkgs.stdenv.mkDerivation {
inherit (super.vterm) name version src;
nativeBuildInputs = [ pkgs.cmake ];
@@ -495,6 +447,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
};
};
- in super // overrides."${variant}");
+ in super // overrides.${variant});
in generateMelpa { }
diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix
index 9f8d408dd5a2..becc2dc5dc9b 100644
--- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix
@@ -5,7 +5,8 @@
let version = stdenv.lib.removePrefix "ocaml-" ocaml.name;
in stdenv.mkDerivation {
- name = "ocaml-mode-${version}";
+ pname = "ocaml-mode";
+ inherit version;
inherit (ocaml) prefixKey src;
# a quick configure to get the Makefile generated. Since
diff --git a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
index 1937a94cad11..241ec3b42c9e 100644
--- a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, emacs}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "org-mac-link-1.2";
src = fetchurl {
diff --git a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix
index 97d063d452cd..9f251f54d6aa 100644
--- a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix
+++ b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "perl-completion";
src = fetchurl {
diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
index 1f218439a5ff..54e5a89dd9f6 100644
--- a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
+++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, emacs}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "rect-mark-1.4";
src = fetchurl {
diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
index f5aeb35d1840..165e0c13c8fe 100644
--- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
+++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, emacs}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "session-management-for-emacs-2.2a";
src = fetchurl {
diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
index aa27e302e5d6..fcb37e7ebad3 100644
--- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
+++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchgit, emacs}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "sunrise-commander-6r435";
src = fetchgit {
diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/pkgs/applications/editors/emacs-modes/tramp/default.nix
index b0cfe9979081..3b746c293d88 100644
--- a/pkgs/applications/editors/emacs-modes/tramp/default.nix
+++ b/pkgs/applications/editors/emacs-modes/tramp/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, emacs, texinfo }:
stdenv.mkDerivation rec {
- name = "tramp-2.3.0";
+ name = "tramp-2.4.2";
src = fetchurl {
url = "mirror://gnu/tramp/${name}.tar.gz";
- sha256 = "1srwm24lwyf00w1661wbx03xg6j943dk05jhwnwdjf99m82cqbgi";
+ sha256 = "082nwvi99y0bvpl1yhn4yjc8a613jh1pdck253lxn062lkcxxw61";
};
buildInputs = [ emacs texinfo ];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix b/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix
index e147fd53b229..209a99245ecd 100644
--- a/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix
+++ b/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, emacs}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "yaoddmuse-0.1.2";
src = fetchurl {
diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix
index 6d420599152a..e48fba1551e7 100644
--- a/pkgs/applications/editors/featherpad/default.nix
+++ b/pkgs/applications/editors/featherpad/default.nix
@@ -4,7 +4,7 @@ with qt5;
stdenv.mkDerivation rec {
version = "0.10.0";
- name = "featherpad-${version}";
+ pname = "featherpad";
src = fetchFromGitHub {
owner = "tsujan";
repo = "FeatherPad";
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index 104206a14913..b8b11e5e831e 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fltk13, ghostscript }:
stdenv.mkDerivation rec {
- name = "flpsed-${version}";
+ pname = "flpsed";
version = "0.7.3";
src = fetchurl {
- url = "http://www.flpsed.org/${name}.tar.gz";
+ url = "http://www.flpsed.org/${pname}-${version}.tar.gz";
sha256 = "0vngqxanykicabhfdznisv82k5ypkxwg0s93ms9ribvhpm8vf2xp";
};
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 0ff56e9145fb..a30a8f702242 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -7,10 +7,11 @@ let
in
stdenv.mkDerivation rec {
- name = "geany-${version}";
+ pname = "geany";
+ inherit version;
src = fetchurl {
- url = "https://download.geany.org/${name}.tar.bz2";
+ url = "https://download.geany.org/${pname}-${version}.tar.bz2";
sha256 = "179xfnvhcxsv54v2mlrhykqv2j7klniln5sffvqqpjmdvwyivvim";
};
diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix
index ac35560c7f63..f7351454fb8c 100644
--- a/pkgs/applications/editors/geany/with-vte.nix
+++ b/pkgs/applications/editors/geany/with-vte.nix
@@ -1,7 +1,7 @@
{ runCommand, makeWrapper, geany, gnome2 }:
let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name;
in
-runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } "
+runCommand name { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } "
mkdir -p $out
ln -s ${geany}/share $out
makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib
diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix
index ec05f0f82622..3abe2834db46 100644
--- a/pkgs/applications/editors/gobby/default.nix
+++ b/pkgs/applications/editors/gobby/default.nix
@@ -4,7 +4,7 @@
let
libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; };
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "gobby-unstable-2018-04-03";
src = fetchFromGitHub {
owner = "gobby";
diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/applications/editors/hecate/default.nix
index 8aea8508aefd..de57fb092157 100644
--- a/pkgs/applications/editors/hecate/default.nix
+++ b/pkgs/applications/editors/hecate/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
version = "0.0.1";
- name = "hecate-${version}";
+ pname = "hecate";
src = fetchFromGitHub {
owner = "evanmiller";
diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix
index dce02b568906..4e67fc304b18 100644
--- a/pkgs/applications/editors/heme/default.nix
+++ b/pkgs/applications/editors/heme/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "heme-${version}";
+ pname = "heme";
version = "0.4.2";
src = fetchurl {
url = "mirror://sourceforge/project/heme/heme/heme-${version}/heme-${version}.tar.gz";
diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix
index 22cc4d47e680..a6437f070b98 100644
--- a/pkgs/applications/editors/hexcurse/default.nix
+++ b/pkgs/applications/editors/hexcurse/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, ncurses }:
stdenv.mkDerivation rec {
- name = "hexcurse-${version}";
+ pname = "hexcurse";
version = "1.60.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix
index 4671df77554f..09191b38e1bc 100644
--- a/pkgs/applications/editors/hexedit/default.nix
+++ b/pkgs/applications/editors/hexedit/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "hexedit-${version}";
+ pname = "hexedit";
version = "1.2.13";
src = fetchurl {
- url = "http://rigaux.org/${name}.src.tgz";
+ url = "http://rigaux.org/${pname}-${version}.src.tgz";
sha256 = "1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka";
};
diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix
index e7f200a4c077..5e5f2f8563cb 100644
--- a/pkgs/applications/editors/howl/default.nix
+++ b/pkgs/applications/editors/howl/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "howl-${version}";
+ pname = "howl";
version = "0.6";
# Use the release tarball containing pre-downloaded dependencies sources
diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix
index 63864bc581df..fc1fe969bdc0 100644
--- a/pkgs/applications/editors/ht/default.nix
+++ b/pkgs/applications/editors/ht/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "ht-${version}";
+ pname = "ht";
version = "2.1.0";
src = fetchurl {
diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix
index 11322e8240c2..21a6a8475182 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/pkgs/applications/editors/jedit/default.nix
@@ -13,7 +13,8 @@ let
in
stdenv.mkDerivation {
- name = "jedit-${version}";
+ pname = "jedit";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2";
sha256 = "03wmbh90rl5lsc35d7jwcp9j5qyyzq1nccxf4fal8bmnx8n4si0x";
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 92355552fcec..a33b9531730f 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -11,7 +11,7 @@ let
# Sorted alphabetically
buildClion = { name, version, src, license, description, wmClass, ... }:
- lib.overrideDerivation (mkJetBrainsProduct rec {
+ lib.overrideDerivation (mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "CLion";
meta = with stdenv.lib; {
@@ -121,7 +121,7 @@ let
});
buildIdea = { name, version, src, license, description, wmClass, ... }:
- (mkJetBrainsProduct rec {
+ (mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "IDEA";
meta = with stdenv.lib; {
@@ -156,7 +156,7 @@ let
});
buildPycharm = { name, version, src, license, description, wmClass, ... }:
- (mkJetBrainsProduct rec {
+ (mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "PyCharm";
meta = with stdenv.lib; {
@@ -183,7 +183,7 @@ let
};
buildRider = { name, version, src, license, description, wmClass, ... }:
- lib.overrideDerivation (mkJetBrainsProduct rec {
+ lib.overrideDerivation (mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "Rider";
meta = with stdenv.lib; {
@@ -209,7 +209,7 @@ let
});
buildRubyMine = { name, version, src, license, description, wmClass, ... }:
- (mkJetBrainsProduct rec {
+ (mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "RubyMine";
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix
index b2ace8accd8a..6f5839b3d06f 100644
--- a/pkgs/applications/editors/joe/default.nix
+++ b/pkgs/applications/editors/joe/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "4.6";
- name = "joe-${version}";
+ pname = "joe";
src = fetchurl {
- url = "mirror://sourceforge/joe-editor/${name}.tar.gz";
+ url = "mirror://sourceforge/joe-editor/${pname}-${version}.tar.gz";
sha256 = "1pmr598xxxm9j9dl93kq4dv36zyw0q2dh6d7x07hf134y9hhlnj9";
};
diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix
index 9547b82efa1f..cb9f10281c70 100644
--- a/pkgs/applications/editors/jucipp/default.nix
+++ b/pkgs/applications/editors/jucipp/default.nix
@@ -6,7 +6,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "juicipp-${version}";
+ pname = "juicipp";
version = "1.2.3";
meta = {
diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix
index 5e6406e33f28..4a44b35a0fa7 100644
--- a/pkgs/applications/editors/jupp/default.nix
+++ b/pkgs/applications/editors/jupp/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
- name = "jupp-${version}";
+ pname = "jupp";
version = "3.1";
srcName = "joe-3.1jupp31";
diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix
index 4a079625d183..43cea9fcae93 100644
--- a/pkgs/applications/editors/jupyter/kernel.nix
+++ b/pkgs/applications/editors/jupyter/kernel.nix
@@ -8,7 +8,7 @@ let
in {
displayName = "Python 3";
argv = [
- "${env.interpreter}"
+ env.interpreter
"-m"
"ipykernel_launcher"
"-f"
@@ -26,7 +26,7 @@ in
# Definitions is an attribute set.
- create = { definitions ? default }: with lib; stdenv.mkDerivation rec {
+ create = { definitions ? default }: with lib; stdenv.mkDerivation {
name = "jupyter-kernels";
diff --git a/pkgs/applications/editors/kakoune/plugins.nix b/pkgs/applications/editors/kakoune/plugins.nix
deleted file mode 100644
index d2f3607d63cb..000000000000
--- a/pkgs/applications/editors/kakoune/plugins.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ parinfer-rust }:
-
-{
- inherit parinfer-rust;
-}
diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix
new file mode 100644
index 000000000000..61e2b3a58459
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/default.nix
@@ -0,0 +1,12 @@
+{ pkgs, parinfer-rust }:
+
+{
+ inherit parinfer-rust;
+
+ kak-ansi = pkgs.callPackage ./kak-ansi.nix { };
+ kak-auto-pairs = pkgs.callPackage ./kak-auto-pairs.nix { };
+ kak-buffers = pkgs.callPackage ./kak-buffers.nix { };
+ kak-fzf = pkgs.callPackage ./kak-fzf.nix { };
+ kak-powerline = pkgs.callPackage ./kak-powerline.nix { };
+ kak-vertical-selection = pkgs.callPackage ./kak-vertical-selection.nix { };
+}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix b/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix
new file mode 100644
index 000000000000..408cba45fbe6
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/kak-ansi.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "kak-ansi";
+ version = "0.2.1";
+
+ src = fetchFromGitHub {
+ owner = "eraserhd";
+ repo = "kak-ansi";
+ rev = "v${version}";
+ sha256 = "0ddjih8hfyf6s4g7y46p1355kklaw1ydzzh61141i0r45wyb2d0d";
+ };
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/kak/autoload/plugins/
+ cp kak-ansi-filter $out/bin/
+ # Hard-code path of filter and don't try to build when Kakoune boots
+ sed '
+ /^declare-option.* ansi_filter /i\
+declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter}
+ /^declare-option.* ansi_filter /,/^}/d
+ ' rc/ansi.kak >$out/share/kak/autoload/plugins/ansi.kak
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Kakoune support for rendering ANSI code";
+ homepage = "https://github.com/eraserhd/kak-ansi";
+ license = licenses.unlicense;
+ maintainers = with maintainers; [ eraserhd ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix b/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix
new file mode 100644
index 000000000000..48dc7106b626
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation {
+ name = "kak-auto-pairs";
+ version = "2019-07-27";
+ src = fetchFromGitHub {
+ owner = "alexherbo2";
+ repo = "auto-pairs.kak";
+ rev = "886449b1a04d43e5deb2f0ef4b1aead6084c7a5f";
+ sha256 = "0knfhdvslzw1f1r1k16733yhkczrg3yijjz6n2qwira84iv3239j";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/kak/autoload/plugins
+ cp -r rc $out/share/kak/autoload/plugins/auto-pairs
+ '';
+
+ meta = with stdenv.lib;
+ { description = "Kakoune extension to enable automatic closing of pairs";
+ homepage = "https://github.com/alexherbo2/auto-pairs.kak";
+ license = licenses.publicDoman;
+ maintainers = with maintainers; [ nrdxp ];
+ platform = platforms.all;
+ };
+}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix b/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix
new file mode 100644
index 000000000000..8a2474f07622
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation {
+ name = "kak-buffers";
+ version = "2019-04-03";
+ src = fetchFromGitHub {
+ owner = "Delapouite";
+ repo = "kakoune-buffers";
+ rev = "3b35b23ac2be661a37c085d34dd04d066450f757";
+ sha256 = "0f3g0v1sjinii3ig9753jjj35v2km4h9bcfw9xgzwz8b10d75bax";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/kak/autoload/plugins
+ cp -r buffers.kak $out/share/kak/autoload/plugins
+ '';
+
+ meta = with stdenv.lib;
+ { description = "Ease navigation between opened buffers in Kakoune";
+ homepage = "https://github.com/Delapouite/kakoune-buffers";
+ license = licenses.publicDoman;
+ maintainers = with maintainers; [ nrdxp ];
+ platform = platforms.all;
+ };
+}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
new file mode 100644
index 000000000000..9877c72252be
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, fzf }:
+
+assert stdenv.lib.asserts.assertOneOf "fzf" fzf.pname [ "fzf" "skim" ];
+
+stdenv.mkDerivation {
+ name = "kak-fzf";
+ version = "2019-07-16";
+ src = fetchFromGitHub {
+ owner = "andreyorst";
+ repo = "fzf.kak";
+ rev = "ede90d3e02bceb714f997adfcbab8260b42e0a19";
+ sha256 = "18w90j3fpk2ddn68497s33n66aap8phw5636y1r7pqsa641zdxcv";
+ };
+
+ configurePhase = ''
+ if [[ -x "${fzf}/bin/fzf" ]]; then
+ fzfImpl='${fzf}/bin/fzf'
+ else
+ fzfImpl='${fzf}/bin/sk'
+ fi
+
+ substituteInPlace rc/fzf.kak \
+ --replace \'fzf\' \'"$fzfImpl"\'
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/kak/autoload/plugins
+ cp -r rc $out/share/kak/autoload/plugins/fzf
+ '';
+
+ meta = with stdenv.lib;
+ { description = "Kakoune plugin that brings integration with fzf";
+ homepage = "https://github.com/andreyorst/fzf.kak";
+ license = licenses.publicDoman;
+ maintainers = with maintainers; [ nrdxp ];
+ platform = platforms.all;
+ };
+}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix b/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix
new file mode 100644
index 000000000000..76af06504ea3
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix
@@ -0,0 +1,29 @@
+{ stdenv, git, fetchFromGitHub }:
+stdenv.mkDerivation {
+ name = "kak-powerline";
+ version = "2019-07-23";
+ src = fetchFromGitHub {
+ owner = "andreyorst";
+ repo = "powerline.kak";
+ rev = "82b01eb6c97c7380b7da253db1fd484a5de13ea4";
+ sha256 = "1480wp2jc7c84z1wqmpf09lzny6kbnbhiiym2ffaddxrd4ns9i6z";
+ };
+
+ configurePhase = ''
+ substituteInPlace rc/modules/git.kak \
+ --replace \'git\' \'${git}/bin/git\'
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/kak/autoload/plugins
+ cp -r rc $out/share/kak/autoload/plugins/powerline
+ '';
+
+ meta = with stdenv.lib;
+ { description = "Kakoune modeline, but with passion";
+ homepage = "https://github.com/andreyorst/powerline.kak";
+ license = licenses.publicDoman;
+ maintainers = with maintainers; [ nrdxp ];
+ platform = platforms.all;
+ };
+}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix b/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix
new file mode 100644
index 000000000000..280fb664b8f4
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation {
+ name = "kak-vertical-selection";
+ version = "2019-04-11";
+ src = fetchFromGitHub {
+ owner = "occivink";
+ repo = "kakoune-vertical-selection";
+ rev = "c420f8b867ce47375fac303886e31623669a42b7";
+ sha256 = "13jdyd2j45wvgqvxdzw9zww14ly93bqjb6700zzxj7mkbiff6wsb";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/kak/autoload/plugins
+ cp -r vertical-selection.kak $out/share/kak/autoload/plugins
+ '';
+
+ meta = with stdenv.lib;
+ { description = "Select up and down lines that match the same pattern in Kakoune";
+ homepage = "https://github.com/occivink/kakoune-vertical-selection";
+ license = licenses.publicDoman;
+ maintainers = with maintainers; [ nrdxp ];
+ platform = platforms.all;
+ };
+}
diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix
index 54e99b35b5eb..e367b586f307 100644
--- a/pkgs/applications/editors/kdevelop5/kdev-php.nix
+++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kdev-php";
- version = "5.4.1";
+ version = "5.4.2";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
- sha256 = "07j06k2f5rbwgknwcbj70wwn831a54is4kiwlpfd4la2c05slmy5";
+ sha256 = "1ilazq2y671wifcrh7pa0zf9yqymqxwj1m2kd389ik2p6wm68jx8";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix
index 8763905fbfd8..1052c5e1ba34 100644
--- a/pkgs/applications/editors/kdevelop5/kdev-python.nix
+++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kdev-python";
- version = "5.4.1";
+ version = "5.4.2";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
- sha256 = "1dazd77bkjs11h318q4ia6ijk0d0s04v0zm8lwqlgcj271sqrfqb";
+ sha256 = "1nnspa1mixdb5z0a8m4nbpsk6c4s81iwrirhrl7091hsw02bsx3f";
};
cmakeFlags = [
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index be80587ef3a6..4c2011b5b035 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -9,11 +9,11 @@
mkDerivation rec {
pname = "kdevelop";
- version = "5.4.1";
+ version = "5.4.2";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
- sha256 = "12iqgmhaxm9q085h50dzkswcmsp02jzm4jjgrhkx4jlzmf4w4jb8";
+ sha256 = "1i665m4jd1r5bl77pcfybpn9szxzccrajs4m0prqwhlj93d57qjj";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix
index b212773712c2..a106c3166747 100644
--- a/pkgs/applications/editors/kodestudio/default.nix
+++ b/pkgs/applications/editors/kodestudio/default.nix
@@ -20,8 +20,9 @@ let
in
- stdenv.mkDerivation rec {
- name = "kodestudio-${version}";
+ stdenv.mkDerivation {
+ pname = "kodestudio";
+ inherit version;
src = fetchurl {
url = urlStr;
diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix
index c3b46cf61df8..508d2329edc4 100644
--- a/pkgs/applications/editors/leafpad/default.nix
+++ b/pkgs/applications/editors/leafpad/default.nix
@@ -2,9 +2,9 @@
stdenv.mkDerivation rec {
version = "0.8.18.1";
- name = "leafpad-${version}";
+ pname = "leafpad";
src = fetchurl {
- url = "https://download.savannah.gnu.org/releases/leafpad/${name}.tar.gz";
+ url = "https://download.savannah.gnu.org/releases/leafpad/${pname}-${version}.tar.gz";
sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm";
};
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- description = "A notepad clone for GTK+ 2.0";
+ description = "A notepad clone for GTK 2.0";
homepage = http://tarot.freeshell.org/leafpad;
platforms = platforms.linux;
maintainers = [ maintainers.flosse ];
diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
index a2274be463ed..bd433436eb02 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -1,7 +1,7 @@
{ stdenv, python3, fetchFromGitHub, makeWrapper, makeDesktopItem }:
stdenv.mkDerivation rec {
- name = "leo-editor-${version}";
+ pname = "leo-editor";
version = "5.7.3";
src = fetchFromGitHub {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper python3 ];
propagatedBuildInputs = with python3.pkgs; [ pyqt5 docutils ];
- desktopItem = makeDesktopItem rec {
+ desktopItem = makeDesktopItem {
name = "leo-editor";
exec = "leo %U";
icon = "leoapp32";
diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index c3a280aed921..90e8c73e075d 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -21,13 +21,13 @@ let
in
stdenv.mkDerivation rec {
- name = "lighttable-${version}";
+ pname = "lighttable";
version = "0.8.1";
src =
fetchurl {
name = "LightTableLinux64.tar.gz";
- url = "https://github.com/LightTable/LightTable/releases/download/${version}/${name}-linux.tar.gz";
+ url = "https://github.com/LightTable/LightTable/releases/download/${version}/${pname}-${version}-linux.tar.gz";
sha256 = "06fj725xfhf3fwrf7dya7ijmxq3v76kfmd4lr2067a92zhlwr5pv";
};
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
installPhase = ''
tar xf ${src}
mkdir -p $out/{bin,share/LightTable}
- mv ./${name}-linux/* $out/share/LightTable
+ mv ./${pname}-${version}-linux/* $out/share/LightTable
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix
index 4fb8d51b9692..de1a5ce7879f 100644
--- a/pkgs/applications/editors/mg/default.nix
+++ b/pkgs/applications/editors/mg/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libbsd, ncurses, buildPackages }:
stdenv.mkDerivation rec {
- name = "mg-${version}";
+ pname = "mg";
version = "20171014";
src = fetchurl {
- url = "http://homepage.boetes.org/software/mg/${name}.tar.gz";
+ url = "http://homepage.boetes.org/software/mg/${pname}-${version}.tar.gz";
sha256 = "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai";
};
diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix
index fab3646efdff..e6b93f20c488 100644
--- a/pkgs/applications/editors/micro/default.nix
+++ b/pkgs/applications/editors/micro/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "micro-${version}";
+ pname = "micro";
version = "1.4.1";
goPackagePath = "github.com/zyedidia/micro";
diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix
index a027242c5eef..9cfcf95e78b1 100644
--- a/pkgs/applications/editors/mindforger/default.nix
+++ b/pkgs/applications/editors/mindforger/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, qmake, qtbase, qtwebkit }:
stdenv.mkDerivation rec {
- name = "mindforger-${version}";
+ pname = "mindforger";
version = "1.48.2";
src = fetchurl {
diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix
index 3f7eba73ca49..4e960524b94f 100644
--- a/pkgs/applications/editors/moe/default.nix
+++ b/pkgs/applications/editors/moe/default.nix
@@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "moe-${version}";
+ pname = "moe";
version = "1.10";
src = fetchurl {
- url = "mirror://gnu/moe/${name}.tar.lz";
+ url = "mirror://gnu/moe/${pname}-${version}.tar.lz";
sha256 = "0fymywdiy9xqppcmvgs7mf7d3gfrky3jp5jkxs2l3v93asml9zcc";
};
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index c2917aa394f9..3a21eec07f42 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -7,10 +7,10 @@
stdenv.mkDerivation rec {
version = "5.9.4.5";
revision = "8010a90f6e246b32364e3fb46ef2c9d1be9c9a2b";
- name = "monodevelop-${version}";
+ pname = "monodevelop";
src = fetchurl {
- url = "https://download.mono-project.com/sources/monodevelop/${name}.tar.bz2";
+ url = "https://download.mono-project.com/sources/monodevelop/${pname}-${version}.tar.bz2";
sha256 = "0bim4bfv3zwijafl9g0cx3159zq43dlcv74mnyrda41j4p52w5ji";
};
diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix
index 1b1c6eaf9e54..70f99fa749b7 100644
--- a/pkgs/applications/editors/music/tuxguitar/default.nix
+++ b/pkgs/applications/editors/music/tuxguitar/default.nix
@@ -7,10 +7,10 @@ let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostP
{ arch = "x86_64"; sha256 = "12af47jhlrh9aq5b3d13l7cdhlndgnfpy61gz002hajbq7i00ixh"; };
in stdenv.mkDerivation rec {
version = "1.2";
- name = "tuxguitar-${version}";
+ pname = "tuxguitar";
src = fetchurl {
- url = "mirror://sourceforge/tuxguitar/${name}-linux-${metadata.arch}.tar.gz";
+ url = "mirror://sourceforge/tuxguitar/${pname}-${version}-linux-${metadata.arch}.tar.gz";
sha256 = metadata.sha256;
};
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 44f8c243bd6d..aea585ce8d66 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -19,11 +19,11 @@ let
};
in stdenv.mkDerivation rec {
- name = "nano-${version}";
+ pname = "nano";
version = "4.4";
src = fetchurl {
- url = "mirror://gnu/nano/${name}.tar.xz";
+ url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
sha256 = "1iw2ypq34g1gfqyhgka2fz5yj5vrlz85q6zk7amgyj286ph25wia";
};
diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix
index fb30036e146f..eab37fba19a7 100644
--- a/pkgs/applications/editors/nano/nanorc/default.nix
+++ b/pkgs/applications/editors/nano/nanorc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "nanorc-${version}";
+stdenv.mkDerivation {
+ pname = "nanorc";
version = "2018-09-05";
src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix
index 9bc6425bc411..96687ab81d67 100644
--- a/pkgs/applications/editors/ne/default.nix
+++ b/pkgs/applications/editors/ne/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "ne-${version}";
+ pname = "ne";
version = "3.1.2";
src = fetchFromGitHub {
owner = "vigna";
diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix
index 6fff6df8cdda..b1b3a416178b 100644
--- a/pkgs/applications/editors/nedit/default.nix
+++ b/pkgs/applications/editors/nedit/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, xlibsWrapper, motif, libXpm }:
stdenv.mkDerivation rec {
- name = "nedit-${version}";
+ pname = "nedit";
version = "5.7";
src = fetchurl {
- url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz";
+ url = "mirror://sourceforge/nedit/nedit-source/${pname}-${version}-src.tar.gz";
sha256 = "0ym1zhjx9976rf2z5nr7dj4mjkxcicimhs686snjhdcpzxwsrndd";
};
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 0d0877015eee..7d558dfb8937 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -20,7 +20,7 @@ let
));
in
stdenv.mkDerivation rec {
- name = "neovim-unwrapped-${version}";
+ pname = "neovim-unwrapped";
version = "0.3.8";
src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix
index 3d215b288564..ba01304f723a 100644
--- a/pkgs/applications/editors/netbeans/default.nix
+++ b/pkgs/applications/editors/netbeans/default.nix
@@ -15,7 +15,8 @@ let
};
in
stdenv.mkDerivation {
- name = "netbeans-${version}";
+ pname = "netbeans";
+ inherit version;
src = fetchurl {
url = "mirror://apache/incubator/netbeans/incubating-netbeans/incubating-${version}/incubating-netbeans-${version}-bin.zip";
sha512 = "15mv59njrnq3sjfzb0n7xcc79kpixygf37cxvbswnvm651cw6lb1i9w8wbjivh0z4zcf3f62vbmshxh5pkaxqpqsg0iyy6gddfbwzwx";
diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix
index 82c89ebdca6e..a7a6b35a24a0 100644
--- a/pkgs/applications/editors/nvi/default.nix
+++ b/pkgs/applications/editors/nvi/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "nvi-1.79";
src = fetchurl {
diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index 03bdd5e08822..287758e0fd83 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -3,11 +3,11 @@
, qca-qt5, shared-mime-info }:
stdenv.mkDerivation rec {
- name = "okteta-${version}";
+ pname = "okteta";
version = "0.26.2";
src = fetchurl {
- url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz";
+ url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";
sha256 = "0k38hd9wq6jvzy0225y61rzr7lgwbac1haalhsrfpmyjy6d833dv";
};
diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix
index a7dc02a9a636..d1028ec6ce8d 100644
--- a/pkgs/applications/editors/retext/default.nix
+++ b/pkgs/applications/editors/retext/default.nix
@@ -8,7 +8,7 @@ let
version = "7.0.4";
python = let
packageOverrides = self: super: {
- markdown = super.markdown.overridePythonAttrs(old: rec {
+ markdown = super.markdown.overridePythonAttrs(old: {
src = super.fetchPypi {
version = "3.0.1";
pname = "Markdown";
@@ -16,7 +16,7 @@ let
};
});
- chardet = super.chardet.overridePythonAttrs(old: rec {
+ chardet = super.chardet.overridePythonAttrs(old: {
src = super.fetchPypi {
version = "2.3.0";
pname = "chardet";
@@ -35,7 +35,7 @@ in python.pkgs.buildPythonApplication {
src = fetchFromGitHub {
owner = "retext-project";
repo = "retext";
- rev = "${version}";
+ rev = version;
sha256 = "1zcapywspc9v5zf5cxqkcy019np9n41gmryqixj66zsvd544c6si";
};
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index f90e17a6065b..933644cc4717 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -4,6 +4,7 @@
, llvmPackages
}:
+with stdenv.lib;
let
verMajor = "1";
verMinor = "2";
@@ -13,7 +14,8 @@ let
gwtVer = "2.8.1";
in
stdenv.mkDerivation rec {
- name = "RStudio-${version}";
+ pname = "RStudio";
+ inherit version;
nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ];
@@ -46,7 +48,13 @@ stdenv.mkDerivation rec {
sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb";
};
- hunspellDictionaries = with stdenv.lib; filter isDerivation (unique (attrValues hunspellDicts));
+ hunspellDictionaries = filter isDerivation (unique (attrValues hunspellDicts));
+ # These dicts contain identically-named dict files, so we only keep the
+ # -large versions in case of clashes
+ largeDicts = filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries;
+ otherDicts = filter (d: !(hasAttr "dictFileName" d &&
+ elem d.dictFileName (map (d: d.dictFileName) largeDicts))) hunspellDictionaries;
+ dictionaries = largeDicts ++ otherDicts;
mathJaxSrc = fetchurl {
url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip;
@@ -76,7 +84,7 @@ stdenv.mkDerivation rec {
mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer}
mkdir dependencies/common/dictionaries
- for dict in ${builtins.concatStringsSep " " hunspellDictionaries}; do
+ for dict in ${builtins.concatStringsSep " " dictionaries}; do
for i in "$dict/share/hunspell/"*; do
ln -sv $i dependencies/common/dictionaries/
done
@@ -98,7 +106,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ];
desktopItem = makeDesktopItem {
- name = name;
+ name = "${pname}-${version}";
exec = "rstudio %F";
icon = "rstudio";
desktopName = "RStudio";
diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix
index 2f4693982a9c..78dd0d095414 100644
--- a/pkgs/applications/editors/scite/default.nix
+++ b/pkgs/applications/editors/scite/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, gtk2 }:
-stdenv.mkDerivation rec {
- name = "scite-${version}";
+stdenv.mkDerivation {
+ pname = "scite";
version = "4.0.5";
src = fetchurl {
diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix
index 90d89ce7799f..ac171f60ead7 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@@ -5,7 +5,7 @@
}:
mkDerivation rec {
- name = "sigil-${version}";
+ pname = "sigil";
version = "0.9.14";
src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix
index 2d52aedc831c..5a13d91aef2c 100644
--- a/pkgs/applications/editors/standardnotes/default.nix
+++ b/pkgs/applications/editors/standardnotes/default.nix
@@ -4,18 +4,19 @@ let
version = "3.0.15";
plat = {
- "i386-linux" = "i386";
- "x86_64-linux" = "x86_64";
+ i386-linux = "i386";
+ x86_64-linux = "x86_64";
}.${stdenv.hostPlatform.system};
sha256 = {
- "i386-linux" = "0v2nsis6vb1lnhmjd28vrfxqwwpycv02j0nvjlfzcgj4b3400j7a";
- "x86_64-linux" = "130n586cw0836zsbwqcz3pp3h0d4ny74ngqs4k4cvfb92556r7xh";
+ i386-linux = "0v2nsis6vb1lnhmjd28vrfxqwwpycv02j0nvjlfzcgj4b3400j7a";
+ x86_64-linux = "130n586cw0836zsbwqcz3pp3h0d4ny74ngqs4k4cvfb92556r7xh";
}.${stdenv.hostPlatform.system};
in
-stdenv.mkDerivation rec {
- name = "standardnotes-${version}";
+stdenv.mkDerivation {
+ pname = "standardnotes";
+ inherit version;
src = fetchurl {
url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}-${plat}.AppImage";
diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix
index b8fef39d3ea2..82d92ba2fe11 100644
--- a/pkgs/applications/editors/sublime/3/packages.nix
+++ b/pkgs/applications/editors/sublime/3/packages.nix
@@ -3,7 +3,7 @@
let
common = opts: callPackage (import ./common.nix opts);
in
- rec {
+ {
sublime3-dev = common {
buildVersion = "3208";
dev = true;
diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix
index a6d624d4b1ec..6714f917315c 100644
--- a/pkgs/applications/editors/supertux-editor/default.nix
+++ b/pkgs/applications/editors/supertux-editor/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "git-2014-08-20";
- name = "supertux-editor-${version}";
+ pname = "supertux-editor";
src = fetchFromGitHub {
owner = "SuperTux";
diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix
index dd986b346a37..48af4a99dada 100644
--- a/pkgs/applications/editors/tecoc/default.nix
+++ b/pkgs/applications/editors/tecoc/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
- name = "tecoc-git-${version}";
+ pname = "tecoc-git";
version = "20150606";
src = fetchFromGitHub {
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
makeFlags = [ "CC=${stdenv.cc}/bin/cc" "-C src/" ];
installPhase = ''
- mkdir -p $out/bin $out/share/doc/${name} $out/lib/teco/macros
+ mkdir -p $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros
cp src/tecoc $out/bin
- cp src/aaout.txt doc/* $out/share/doc/${name}
+ cp src/aaout.txt doc/* $out/share/doc/${pname}-${version}
cp lib/* lib2/* $out/lib/teco/macros
(cd $out/bin
ln -s tecoc Make
diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix
index dfb2e49e0c8d..5d5843890e14 100644
--- a/pkgs/applications/editors/texmacs/darwin.nix
+++ b/pkgs/applications/editors/texmacs/darwin.nix
@@ -15,7 +15,8 @@ let
};
in
stdenv.mkDerivation {
- name = "TeXmacs-${version}";
+ pname = "TeXmacs";
+ inherit version;
src= fetchurl {
url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
index 79ece9d62a98..2a4459ddc3ed 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -3,10 +3,9 @@
stdenv.mkDerivation rec {
pname = "texmaker";
version = "5.0.3";
- name = "${pname}-${version}";
src = fetchurl {
- url = "http://www.xm1math.net/texmaker/${name}.tar.bz2";
+ url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2";
sha256 = "0vrj9w5lk3vf6138n5bz8phmy3xp5kv4dq1rgirghcf4hbxdyx30";
};
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 50113dd1566b..04e2cb45e283 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "texstudio";
version = "2.12.16";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "${pname}-org";
diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix
index 79cad6a9782c..85006e51b663 100644
--- a/pkgs/applications/editors/textadept/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }:
stdenv.mkDerivation rec {
version = "10.2";
- name = "textadept-${version}";
+ pname = "textadept";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix
index 86904c11f748..8042363f73c9 100644
--- a/pkgs/applications/editors/texworks/default.nix
+++ b/pkgs/applications/editors/texworks/default.nix
@@ -4,7 +4,7 @@
, withPython ? true, python3 }:
stdenv.mkDerivation rec {
- name = "texworks-${version}";
+ pname = "texworks";
version = "0.6.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix
index aa3b4b99d7a0..6bfce921d0f6 100644
--- a/pkgs/applications/editors/tweak/default.nix
+++ b/pkgs/applications/editors/tweak/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "tweak-${version}";
+ pname = "tweak";
version = "3.02";
src = fetchurl {
- url = "https://www.chiark.greenend.org.uk/~sgtatham/tweak/${name}.tar.gz";
+ url = "https://www.chiark.greenend.org.uk/~sgtatham/tweak/${pname}-${version}.tar.gz";
sha256 = "06js54pr5hwpwyxj77zs5s40n5aqvaw48dkj7rid2d47pyqijk2v";
};
diff --git a/pkgs/applications/editors/uemacs/default.nix b/pkgs/applications/editors/uemacs/default.nix
index 551fa67d9863..0a2df6b6d4bb 100644
--- a/pkgs/applications/editors/uemacs/default.nix
+++ b/pkgs/applications/editors/uemacs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, ncurses }:
-stdenv.mkDerivation rec {
- name = "uemacs-${version}";
+stdenv.mkDerivation {
+ pname = "uemacs";
version = "2014-12-08";
src = fetchgit {
diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix
index 8d3a5353c989..d1aa59569e62 100644
--- a/pkgs/applications/editors/vbindiff/default.nix
+++ b/pkgs/applications/editors/vbindiff/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "vbindiff-${version}";
+ pname = "vbindiff";
version = "3.0_beta5";
buildInputs = [ ncurses ];
src = fetchurl {
- url = "https://www.cjmweb.net/vbindiff/${name}.tar.gz";
+ url = "https://www.cjmweb.net/vbindiff/${pname}-${version}.tar.gz";
sha256 = "1f1kj4jki08bnrwpzi663mjfkrx4wnfpzdfwd2qgijlkx5ysjkgh";
};
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 63d8add3a012..567da2a08f20 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
- version = "8.1.1547";
+ version = "8.1.1967";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
- sha256 = "01v35wq8wjrbzmdf5r02gp0sfa9yyfswsi3fqzn94cd68qhskkpr";
+ sha256 = "0cdfi67jwv8j982i1jxdfqv4aqglig8f0hzadgygk69i0wwkymwk";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 4d37b77f61bf..d21d0ad5ee00 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -68,12 +68,12 @@ let
in stdenv.mkDerivation rec {
- name = "vim_configurable-${version}";
+ pname = "vim_configurable";
inherit (common) version postPatch hardeningDisable enableParallelBuilding meta;
src = builtins.getAttr source {
- "default" = common.src; # latest release
+ default = common.src; # latest release
};
patches = [ ./cflags-prune.diff ] ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch;
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 26cd61d182bd..ae4e9ac8a9c9 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -12,8 +12,8 @@
let
common = callPackage ./common.nix {};
in
-stdenv.mkDerivation rec {
- name = "vim-${version}";
+stdenv.mkDerivation {
+ pname = "vim";
inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 369184a35e23..6081bbc8b0ca 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -24,8 +24,8 @@ let
'';
in
-stdenv.mkDerivation rec {
- name = "macvim-${version}";
+stdenv.mkDerivation {
+ pname = "macvim";
version = "8.1.1722";
diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index 7825188fea9b..1bda6958206b 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "vis-${version}";
+ pname = "vis";
version = "0.5";
src = fetchFromGitHub {
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
--prefix VIS_PATH : "\$HOME/.config:$out/share/vis"
'';
- desktopItem = makeDesktopItem rec {
+ desktopItem = makeDesktopItem {
name = "vis";
exec = "vis %U";
type = "Application";
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index e42ca8a0bbf8..7b7209a5e1f4 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -11,7 +11,7 @@
let
inherit (stdenv.hostPlatform) system;
in
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
inherit pname version src sourceRoot;
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 369ed7728909..40d16733db27 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -4,20 +4,20 @@ let
inherit (stdenv.hostPlatform) system;
plat = {
- "x86_64-linux" = "linux-x64";
- "x86_64-darwin" = "darwin";
+ x86_64-linux = "linux-x64";
+ x86_64-darwin = "darwin";
}.${system};
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- "x86_64-linux" = "1np7j6xv0bxmq7762ml0h6pib8963s2vdmyvigi0fz2iik92zv8z";
- "x86_64-darwin" = "0f87cv1sbcvix9f7hhw0vsypp0bf627xdyh4bmh0g41k17ls8wvc";
+ x86_64-linux = "1iz36nhkg78346g5407df6jv4d1ydb22hhgs8hiaxql3hq5z7x3q";
+ x86_64-darwin = "1iijk0kx90rax39iradbbafyvd3vwnzsgvyb3s13asy42pbhhkky";
}.${system};
in
callPackage ./generic.nix rec {
- version = "1.37.1";
+ version = "1.38.0";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 49472fde464b..02d0396a94f5 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -4,20 +4,20 @@ let
inherit (stdenv.hostPlatform) system;
plat = {
- "x86_64-linux" = "linux-x64";
- "x86_64-darwin" = "darwin";
+ x86_64-linux = "linux-x64";
+ x86_64-darwin = "darwin";
}.${system};
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- "x86_64-linux" = "0j6188gm66bwffyg0vn3ak8242vs2vb2cw92b9wfkiml6sfg555n";
- "x86_64-darwin" = "0iblg0hn6jdds7d2hzp0icb5yh6hhw3fd5g4iim64ibi7lpwj2cj";
+ x86_64-linux = "09rq5jx7aicwp3qqi5pcv6bmyyp1rm5cfa96hvy3f4grhq1fi132";
+ x86_64-darwin = "1y1lbb3q5myaz7jg21x5sl0in8wr46brqj9zyrg3f16zahsagzr4";
}.${system};
in
callPackage ./generic.nix rec {
- version = "1.37.1";
+ version = "1.38.0";
pname = "vscodium";
executableName = "codium";
diff --git a/pkgs/applications/editors/wily/default.nix b/pkgs/applications/editors/wily/default.nix
index ce67cc2d6484..aab3aecd7d69 100644
--- a/pkgs/applications/editors/wily/default.nix
+++ b/pkgs/applications/editors/wily/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.13.42";
- name = "wily-${version}";
+ pname = "wily";
src = fetchurl {
- url = "mirror://sourceforge/wily/${name}.tar.gz";
+ url = "mirror://sourceforge/wily/${pname}-${version}.tar.gz";
sha256 = "1jy4czk39sh365b0mjpj4d5wmymj98x163vmwzyx3j183jqrhm2z";
};
diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix
index c345e8a95d55..4725d8143b47 100644
--- a/pkgs/applications/editors/wxhexeditor/default.nix
+++ b/pkgs/applications/editors/wxhexeditor/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }:
stdenv.mkDerivation rec {
- name = "wxHexEditor-${version}";
+ pname = "wxHexEditor";
version = "0.24";
src = fetchFromGitHub {
@@ -26,11 +26,10 @@ stdenv.mkDerivation rec {
url = https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch;
sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj";
})
+ ./missing-semicolon.patch
];
- buildPhase = ''
- make OPTFLAGS="-fopenmp"
- '';
+ makeFlags = [ "OPTFLAGS=-fopenmp" ];
meta = {
description = "Hex Editor / Disk Editor for Huge Files or Devices";
diff --git a/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch b/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch
new file mode 100644
index 000000000000..75722c9c7c55
--- /dev/null
+++ b/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch
@@ -0,0 +1,35 @@
+diff --git a/src/HexDialogs.cpp b/src/HexDialogs.cpp
+index 091a6f9..12e6a78 100644
+--- a/src/HexDialogs.cpp
++++ b/src/HexDialogs.cpp
+@@ -420,7 +420,7 @@ void FindDialog::OnChar( wxKeyEvent& event ){
+ }
+
+ void FindDialog::EventHandler( wxCommandEvent& event ){
+- WX_CLEAR_ARRAY(parent->HighlightArray )
++ WX_CLEAR_ARRAY(parent->HighlightArray );
+ parent->HighlightArray.Shrink();
+
+ if( event.GetId() == btnFind->GetId())
+diff --git a/src/HexEditorCtrl/HexEditorCtrl.cpp b/src/HexEditorCtrl/HexEditorCtrl.cpp
+index 7a3b0e2..f12097f 100644
+--- a/src/HexEditorCtrl/HexEditorCtrl.cpp
++++ b/src/HexEditorCtrl/HexEditorCtrl.cpp
+@@ -64,9 +64,9 @@ HexEditorCtrl::~HexEditorCtrl( void ){
+ Dynamic_Disconnector();
+ Clear();
+
+- WX_CLEAR_ARRAY(MainTagArray)
+- WX_CLEAR_ARRAY(HighlightArray)
+- WX_CLEAR_ARRAY(CompareArray)
++ WX_CLEAR_ARRAY(MainTagArray);
++ WX_CLEAR_ARRAY(HighlightArray);
++ WX_CLEAR_ARRAY(CompareArray);
+
+ MainTagArray.Shrink();
+ HighlightArray.Shrink();
+@@ -1224,4 +1224,3 @@ void wxHugeScrollBar::OnOffsetScroll( wxScrollEvent& event ){
+ #endif
+ event.Skip();
+ }
+-
diff --git a/pkgs/applications/editors/xmlcopyeditor/default.nix b/pkgs/applications/editors/xmlcopyeditor/default.nix
index d91403bc54ff..eeda097db258 100644
--- a/pkgs/applications/editors/xmlcopyeditor/default.nix
+++ b/pkgs/applications/editors/xmlcopyeditor/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, aspell, boost, expat, intltool, libxml2, libxslt, pcre, wxGTK, xercesc }:
stdenv.mkDerivation rec {
- name = "xmlcopyeditor-${version}";
+ pname = "xmlcopyeditor";
version = "1.2.1.3";
src = fetchurl {
- name = "${name}.tar.gz";
- url = "mirror://sourceforge/xml-copy-editor/${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
+ url = "mirror://sourceforge/xml-copy-editor/${pname}-${version}.tar.gz";
sha256 = "0bwxn89600jbrkvlwyawgc0c0qqxpl453mbgcb9qbbxl8984ns4v";
};
diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix
index a90275638dc8..fe5fcc1724b4 100644
--- a/pkgs/applications/editors/yi/wrapper.nix
+++ b/pkgs/applications/editors/yi/wrapper.nix
@@ -8,8 +8,8 @@ let
yiEnv = haskellPackages.ghcWithPackages
(self: [ self.yi ] ++ extraPackages self);
in
-stdenv.mkDerivation rec {
- name = "yi-custom-${version}";
+stdenv.mkDerivation {
+ pname = "yi-custom";
version = "0.0.0.1";
dontUnpack = true;
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix
index 38aeee6d13ef..244f37b10dff 100644
--- a/pkgs/applications/gis/openorienteering-mapper/default.nix
+++ b/pkgs/applications/gis/openorienteering-mapper/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "OpenOrienteering-Mapper-${version}";
+ pname = "OpenOrienteering-Mapper";
version = "0.8.4";
buildInputs = [ gdal qtbase qttools qtlocation qtimageformats
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 7440e2633a33..feb79f444b81 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -2,10 +2,9 @@
libharu, opencv, vigra, postgresql, Cocoa,
unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "saga";
version = "7.3.0";
- name = "${pname}-${version}";
# See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
# for why the have additional buildInputs on darwin
diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix
index d82bdc665498..4c7f9cde5ce7 100644
--- a/pkgs/applications/gis/whitebox-tools/default.nix
+++ b/pkgs/applications/gis/whitebox-tools/default.nix
@@ -1,6 +1,6 @@
{ stdenv, rustPlatform , fetchFromGitHub, Security }:
rustPlatform.buildRustPackage rec {
- name = "whitebox_tools-${version}";
+ pname = "whitebox_tools";
version = "0.9.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 003a17aa3d44..654363d36f24 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -19,8 +19,8 @@ let
};
in
-stdenv.mkDerivation rec {
- name = "imagemagick-${version}";
+stdenv.mkDerivation {
+ pname = "imagemagick";
inherit (cfg) version;
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index ecc6a5b00dec..993d4ba7ecdb 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -31,8 +31,8 @@ let
};
in
-stdenv.mkDerivation rec {
- name = "imagemagick-${version}";
+stdenv.mkDerivation {
+ pname = "imagemagick";
inherit (cfg) version;
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix
index 938df76e2572..e35a0190d8bc 100644
--- a/pkgs/applications/graphics/PythonMagick/default.nix
+++ b/pkgs/applications/graphics/PythonMagick/default.nix
@@ -3,7 +3,7 @@
{ stdenv, fetchurl, python, pkgconfig, imagemagick, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "pythonmagick-${version}";
+ pname = "pythonmagick";
version = "0.9.16";
src = fetchurl {
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 5210af4df7ad..fb06266cdc59 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -7,7 +7,7 @@
assert useUnrar -> unrar != null;
stdenv.mkDerivation rec {
- name = "ahoviewer-${version}";
+ pname = "ahoviewer";
version = "1.6.5";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix
index 09664889f35b..5132d5950aab 100644
--- a/pkgs/applications/graphics/alchemy/default.nix
+++ b/pkgs/applications/graphics/alchemy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre, runtimeShell }:
stdenv.mkDerivation rec {
- name = "alchemy-${version}";
+ pname = "alchemy";
version = "008";
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/animbar/default.nix b/pkgs/applications/graphics/animbar/default.nix
index c918e4b302bb..c4f1b4218d07 100644
--- a/pkgs/applications/graphics/animbar/default.nix
+++ b/pkgs/applications/graphics/animbar/default.nix
@@ -3,10 +3,9 @@
stdenv.mkDerivation rec {
pname = "animbar";
version = "1.2";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+ url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0836nwcpyfdrapyj3hbg3wh149ihc26pc78h01adpc7c0r7d9pr9";
};
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index 0257a109568e..3c39aadda98e 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -8,8 +8,8 @@ let
gitBranch = "develop";
gitTag = "0.9.3";
in
- stdenv.mkDerivation rec {
- name = "antimony-${version}";
+ stdenv.mkDerivation {
+ pname = "antimony";
version = "2018-10-20";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index c98c323fc79c..5ce36f4f10e9 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit }:
stdenv.mkDerivation rec {
- name = "apitrace-${version}";
+ pname = "apitrace";
version = "7.1-572-g${builtins.substring 0 8 src.rev}";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/autotrace/autofig.nix b/pkgs/applications/graphics/autotrace/autofig.nix
index 31ee0ff0d07b..0f53965786b9 100644
--- a/pkgs/applications/graphics/autotrace/autofig.nix
+++ b/pkgs/applications/graphics/autotrace/autofig.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "autofig-0.1";
src = fetchurl {
diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix
index cc08dce906c3..57e95dfef106 100644
--- a/pkgs/applications/graphics/autotrace/default.nix
+++ b/pkgs/applications/graphics/autotrace/default.nix
@@ -6,11 +6,11 @@
# libpng16.so.16 rather than libpng12.
stdenv.mkDerivation rec {
- name = "autotrace-${version}";
+ pname = "autotrace";
version = "0.31.1";
src = fetchurl {
- url = "mirror://sourceforge/autotrace/AutoTrace/0.31.1/${name}.tar.gz";
+ url = "mirror://sourceforge/autotrace/AutoTrace/0.31.1/${pname}-${version}.tar.gz";
sha256 = "1xmgja5fv48mdbsa51inf7ksz36nqd6bsaybrk5xgprm6cy946js";
};
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 552ca714476f..5e1cba31b7ec 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "avocode-${version}";
+ pname = "avocode";
version = "3.9.2";
src = fetchurl {
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index df742645e86b..b827a12f81c8 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -22,8 +22,9 @@ let
install -D bin-linux/QtnPEG $out/bin/QtnPEG
'';
};
-in stdenv.mkDerivation rec {
- name = "awesomebump-${version}";
+in stdenv.mkDerivation {
+ pname = "awesomebump";
+ inherit version;
inherit src;
diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix
new file mode 100644
index 000000000000..b2060f5db31e
--- /dev/null
+++ b/pkgs/applications/graphics/azpainter/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, autoreconfHook
+, libX11, libXext, libXi
+, freetype, fontconfig
+, libpng, libjpeg
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "azpainter";
+ version = "2.1.4";
+
+ src = fetchFromGitHub {
+ owner = "Symbian9";
+ repo = pname;
+ rev = "refs/tags/v${version}";
+ sha256 = "1hrr9lhsbjyzar3nxvli6cazr7zhyzh0p8hwpg4g9ga6njs8vi8m";
+ };
+
+ nativeBuildInputs = [ autoreconfHook ];
+
+ buildInputs = [
+ libX11 libXext libXi
+ freetype fontconfig
+ libpng libjpeg
+ zlib
+ ];
+
+ configureFlags = [
+ "--with-freetype-dir=${stdenv.lib.getDev freetype}/include/freetype2"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Full color painting software for illustration drawing";
+ homepage = "https://osdn.net/projects/azpainter";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dtzWill ];
+ };
+}
diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix
index 7e1c6d7c8c4b..ad86e66204b2 100644
--- a/pkgs/applications/graphics/c3d/default.nix
+++ b/pkgs/applications/graphics/c3d/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchgit, cmake, itk, Cocoa }:
-stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+stdenv.mkDerivation {
pname = "c3d";
version = "2018-10-04";
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index a32681c754ca..d3c7691ccff9 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
version = "2.6.2";
- name = "darktable-${version}";
+ pname = "darktable";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
diff --git a/pkgs/applications/graphics/deskew/default.nix b/pkgs/applications/graphics/deskew/default.nix
index 71e2d82ea7ca..c35aaa044aef 100644
--- a/pkgs/applications/graphics/deskew/default.nix
+++ b/pkgs/applications/graphics/deskew/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "deskew-${version}";
+ pname = "deskew";
version = "1.25";
src = fetchFromBitbucket {
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 0ce160242e56..a1f96337d743 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -3,8 +3,8 @@ libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme,
gtk-mac-integration-gtk2 }:
-stdenv.mkDerivation rec {
- name = "dia-${version}";
+stdenv.mkDerivation {
+ pname = "dia";
version = "0.97.3.20170622";
src = fetchgit {
diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index d90fb41c03ba..1917640fd2e5 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -3,11 +3,11 @@
, darwin }:
stdenv.mkDerivation rec {
- name = "djview-${version}";
+ pname = "djview";
version = "4.10.6";
src = fetchurl {
- url = "mirror://sourceforge/djvu/${name}.tar.gz";
+ url = "mirror://sourceforge/djvu/${pname}-${version}.tar.gz";
sha256 = "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4";
};
diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix
index 30101bb94770..e59d14f7dd6e 100644
--- a/pkgs/applications/graphics/draftsight/default.nix
+++ b/pkgs/applications/graphics/draftsight/default.nix
@@ -6,7 +6,8 @@
let version = "2018SP2"; in
stdenv.mkDerivation {
- name = "draftsight-${version}";
+ pname = "draftsight";
+ inherit version;
nativeBuildInputs = [ dpkg makeWrapper ];
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index eca3740f9758..46bfe64dd030 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, mkDerivation
, fetchurl
, cmake
, extra-cmake-modules
@@ -31,7 +32,7 @@
, enableKisTablet ? false # enable improved graphics tablet support
}:
-with stdenv.lib;
+with lib;
let
commonDeps = [
@@ -57,8 +58,8 @@ let
qtx11extras
];
-in stdenv.mkDerivation rec {
- name = "drawpile-${version}";
+in mkDerivation rec {
+ pname = "drawpile";
version = "2.1.11";
src = fetchurl {
diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix
index 7980d09fed12..c8928540bb65 100644
--- a/pkgs/applications/graphics/exrtools/default.nix
+++ b/pkgs/applications/graphics/exrtools/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }:
stdenv.mkDerivation rec {
- name = "exrtools-${version}";
+ pname = "exrtools";
version = "0.4";
src = fetchurl {
- url = "http://scanline.ca/exrtools/${name}.tar.gz";
+ url = "http://scanline.ca/exrtools/${pname}-${version}.tar.gz";
sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z";
};
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index fbc6cd2fafef..fef068eaf0ff 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "feh-${version}";
+ pname = "feh";
version = "3.2.1";
src = fetchurl {
- url = "https://feh.finalrewind.org/${name}.tar.bz2";
+ url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
sha256 = "070axq8jpibcabmjfv4fmjmpk3k349vzvh4qhsi4n62bkcwl35wg";
};
diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix
index 1e54152fff4d..ae38730226a4 100644
--- a/pkgs/applications/graphics/fig2dev/default.nix
+++ b/pkgs/applications/graphics/fig2dev/default.nix
@@ -4,7 +4,8 @@ let
version = "3.2.7a";
in stdenv.mkDerivation {
- name = "fig2dev-${version}";
+ pname = "fig2dev";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";
diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix
index 8ca093b90c3e..3b8662976032 100644
--- a/pkgs/applications/graphics/fontmatrix/default.nix
+++ b/pkgs/applications/graphics/fontmatrix/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, qt4 }:
stdenv.mkDerivation rec {
- name = "fontmatrix-${version}";
+ pname = "fontmatrix";
version = "0.6.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index b8f4d5445036..ee7586709dcb 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, mkDerivation, fetchurl, cmake, ninja, coin3d, xercesc, ode, eigen, qt5, opencascade-occt, gts
-, hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu
-, soqt, libf2c, libGLU, makeWrapper, pkgconfig
-, mpi ? null }:
+{ stdenv, mkDerivation, fetchurl, fetchpatch, cmake, ninja, coin3d, xercesc, ode
+, eigen, qtbase, qttools, qtwebkit, opencascade-occt, gts, hdf5, vtk, medfile
+, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU
+, makeWrapper, pkgconfig, mpi ? null }:
assert mpi != null;
let
pythonPackages = python3Packages;
in mkDerivation rec {
- name = "freecad-${version}";
+ pname = "freecad";
version = "0.18.3";
src = fetchurl {
@@ -19,13 +19,20 @@ in mkDerivation rec {
nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ];
buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts
zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
- libGLU libXmu
- ] ++ (with qt5; [
- qtbase qttools qtwebkit
- ]) ++ (with pythonPackages; [
+ libGLU libXmu qtbase qttools qtwebkit
+ ] ++ (with pythonPackages; [
matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost
]);
+ # Fix missing app icon on Wayland. Has been upstreamed and should be safe to
+ # remove in versions >= 0.19
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/FreeCAD/FreeCAD/commit/c4d2a358ca125d51d059dfd72dcbfba326196dfc.patch";
+ sha256 = "0yqc9zrxgi2c2xcidm8wh7a9yznkphqvjqm9742qm5fl20p8gl4h";
+ })
+ ];
+
cmakeFlags = [
"-DBUILD_QT5=ON"
"-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include"
diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix
index bdb1e87d70ec..1d712a63fbdf 100644
--- a/pkgs/applications/graphics/fstl/default.nix
+++ b/pkgs/applications/graphics/fstl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, mkDerivation, qtbase, mesa_glu }:
mkDerivation rec {
- name = "fstl-${version}";
+ pname = "fstl";
version = "0.9.3";
buildInputs = [qtbase mesa_glu];
diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix
index 025b3ae65ece..2762748bc1ad 100644
--- a/pkgs/applications/graphics/gcolor2/default.nix
+++ b/pkgs/applications/graphics/gcolor2/default.nix
@@ -2,7 +2,8 @@
let version = "0.4"; in
stdenv.mkDerivation {
- name = "gcolor2-${version}";
+ pname = "gcolor2";
+ inherit version;
arch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" else "386";
src = fetchurl {
@@ -25,7 +26,7 @@ stdenv.mkDerivation {
++ (with perlPackages; [ perl XMLParser ]);
meta = {
- description = "Simple GTK+2 color selector";
+ description = "Simple GTK 2 color selector";
homepage = http://gcolor2.sourceforge.net/;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ notthemessiah ];
diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix
index 5ad7cb88b03a..c7555b612f7b 100644
--- a/pkgs/applications/graphics/gcolor3/default.nix
+++ b/pkgs/applications/graphics/gcolor3/default.nix
@@ -3,7 +3,8 @@
let
version = "2.3.1";
in stdenv.mkDerivation {
- name = "gcolor3-${version}";
+ pname = "gcolor3";
+ inherit version;
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 08b2757dd6e8..4275c6f0dcfd 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "geeqie-${version}";
+ pname = "geeqie";
version = "1.4";
src = fetchurl {
- url = "http://geeqie.org/${name}.tar.xz";
+ url = "http://geeqie.org/${pname}-${version}.tar.xz";
sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w";
};
@@ -46,11 +46,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
- description = "Lightweight GTK+ based image viewer";
+ description = "Lightweight GTK based image viewer";
longDescription =
''
- Geeqie is a lightweight GTK+ based image viewer for Unix like
+ Geeqie is a lightweight GTK based image viewer for Unix like
operating systems. It features: EXIF, IPTC and XMP metadata
browsing and editing interoperability; easy integration with other
software; geeqie works on files and directories, there is no need to
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 008bfdf881e5..2c520f21f848 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -152,7 +152,9 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {
installPhase = "installPlugins src/gimp-lqr-plugin";
};
- gmic = pkgs.gmic.gimpPlugin;
+ gmic = pkgs.gmic-qt.override {
+ variant = "gimp";
+ };
ufraw = pkgs.ufraw.gimpPlugin;
diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix
index ec708ad971a4..9ba7dbed37b3 100644
--- a/pkgs/applications/graphics/giv/default.nix
+++ b/pkgs/applications/graphics/giv/default.nix
@@ -2,7 +2,7 @@
, pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }:
stdenv.mkDerivation rec {
- name = "giv-${version}";
+ pname = "giv";
version = "0.9.26";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix
index b3671ead377a..2535f7514f1d 100644
--- a/pkgs/applications/graphics/gnuclad/default.nix
+++ b/pkgs/applications/graphics/gnuclad/default.nix
@@ -2,14 +2,16 @@
}:
stdenv.mkDerivation rec {
- name = "gnuclad-${version}";
+ pname = "gnuclad";
version = "0.2.4";
src = fetchurl {
- url = "https://launchpad.net/gnuclad/trunk/${lib.versions.majorMinor version}/+download/${name}.tar.gz";
+ url = "https://launchpad.net/gnuclad/trunk/${lib.versions.majorMinor version}/+download/${pname}-${version}.tar.gz";
sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki";
};
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ];
+
nativeBuildInputs = [ pkgconfig ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
index b25ba8f567df..e4ab5639ba66 100644
--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -2,7 +2,7 @@
, glfw3, gtk3, libpng12 }:
stdenv.mkDerivation rec {
- name = "goxel-${version}";
+ pname = "goxel";
version = "0.10.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix
index b1580d73b641..039bb1917d37 100644
--- a/pkgs/applications/graphics/grafx2/default.nix
+++ b/pkgs/applications/graphics/grafx2/default.nix
@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
version = "2.4.2035";
- name = "grafx2-${version}";
+ pname = "grafx2";
src = fetchurl {
- url = "https://grafx2.googlecode.com/files/${name}-src.tgz";
+ url = "https://grafx2.googlecode.com/files/${pname}-${version}-src.tgz";
sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q";
};
diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix
index fedcafc59788..9517aa78ee46 100644
--- a/pkgs/applications/graphics/graphicsmagick/compat.nix
+++ b/pkgs/applications/graphics/graphicsmagick/compat.nix
@@ -1,7 +1,7 @@
{ stdenv, graphicsmagick }:
-stdenv.mkDerivation rec {
- name = "graphicsmagick-imagemagick-compat-${version}";
+stdenv.mkDerivation {
+ pname = "graphicsmagick-imagemagick-compat";
inherit (graphicsmagick) version;
dontUnpack = true;
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 84d1450da823..403a5285e150 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -3,7 +3,7 @@
, libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
- name = "graphicsmagick-${version}";
+ pname = "graphicsmagick";
version = "1.3.32";
src = fetchurl {
diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix
index 061dc2b69a61..d7b964259683 100644
--- a/pkgs/applications/graphics/guetzli/default.nix
+++ b/pkgs/applications/graphics/guetzli/default.nix
@@ -3,7 +3,8 @@ let
version = "1.0.1";
in
stdenv.mkDerivation {
- name = "guetzli-${version}";
+ pname = "guetzli";
+ inherit version;
src = fetchFromGitHub {
owner = "google";
repo = "guetzli";
diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix
index 0bbd543a3076..6472712bcb40 100644
--- a/pkgs/applications/graphics/imagej/default.nix
+++ b/pkgs/applications/graphics/imagej/default.nix
@@ -7,8 +7,8 @@
# on linux systems, but we here do not attempt to fix it.)
let
- imagej150 = stdenv.mkDerivation rec {
- name = "imagej-${version}";
+ imagej150 = stdenv.mkDerivation {
+ pname = "imagej";
version = "150";
src = fetchurl {
diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix
index a881c0fc1f93..49868bbd831f 100644
--- a/pkgs/applications/graphics/imlibsetroot/default.nix
+++ b/pkgs/applications/graphics/imlibsetroot/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libX11, libXinerama, imlib2 }:
-stdenv.mkDerivation rec {
- name = "imlibsetroot-${version}";
+stdenv.mkDerivation {
+ pname = "imlibsetroot";
version = "1.2";
src = fetchurl {
url = "https://robotmonkeys.net/wp-content/uploads/2010/03/imlibsetroot-12.tar.gz";
diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix
index 89712d4d1f7a..5f06feb7c622 100644
--- a/pkgs/applications/graphics/imv/default.nix
+++ b/pkgs/applications/graphics/imv/default.nix
@@ -1,27 +1,53 @@
-{ stdenv, fetchFromGitHub, SDL2, SDL2_ttf
+{ stdenv, fetchFromGitHub
, freeimage, fontconfig, pkgconfig
, asciidoc, docbook_xsl, libxslt, cmocka
-, librsvg
+, librsvg, pango, libxkbcommon, wayland
+, libGLU
}:
stdenv.mkDerivation rec {
- name = "imv-${version}";
- version = "3.1.2";
+ pname = "imv";
+ version = "4.0.1";
src = fetchFromGitHub {
owner = "eXeC64";
repo = "imv";
rev = "v${version}";
- sha256 = "0gg362x2f7hli6cr6s7dmlanh4cqk7fd2pmk4zs9438jvqklf4cl";
+ sha256 = "sha256:01fbkbwwsyr00k3mwans8jfb9p4gl02v6z62vgx0pkgrzxjkcz07";
};
+ preBuild = ''
+ # Version is 4.0.1, but Makefile was not updated
+ sed -i 's/echo v4\.0\.0/echo v4.0.1/' Makefile
+ '';
+
+ nativeBuildInputs = [
+ asciidoc
+ cmocka
+ docbook_xsl
+ libxslt
+ ];
+
buildInputs = [
- SDL2 SDL2_ttf freeimage fontconfig pkgconfig
- asciidoc docbook_xsl libxslt cmocka librsvg
+ freeimage
+ libGLU
+ librsvg
+ libxkbcommon
+ pango
+ pkgconfig
+ wayland
];
installFlags = [ "PREFIX=$(out)" "CONFIGPREFIX=$(out)/etc" ];
+ postFixup = ''
+ # The `bin/imv` script assumes imv-wayland or imv-x11 in PATH,
+ # so we have to fix those to the binaries we installed into the /nix/store
+
+ sed -i "s|\bimv-wayland\b|$out/bin/imv-wayland|" $out/bin/imv
+ sed -i "s|\bimv-x11\b|$out/bin/imv-x11|" $out/bin/imv
+ '';
+
doCheck = true;
meta = with stdenv.lib; {
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 1729f3c5cdab..547e2914399b 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -3,6 +3,7 @@
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
, gsl, python2, poppler, imagemagick, libwpg, librevenge
, libvisio, libcdr, libexif, potrace, cmake, hicolor-icon-theme
+, librsvg, wrapGAppsHook
}:
let
@@ -40,7 +41,7 @@ stdenv.mkDerivation rec {
--replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
'';
- nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env ]
+ nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env wrapGAppsHook ]
++ (with perlPackages; [ perl XMLParser ]);
buildInputs = [
libXft libpng zlib popt boehmgc
@@ -48,6 +49,8 @@ stdenv.mkDerivation rec {
gsl poppler imagemagick libwpg librevenge
libvisio libcdr libexif potrace hicolor-icon-theme
+ librsvg # for loading icons
+
python2Env perlPackages.perl
];
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index d4a7e396cb05..ae2db5181ccb 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sourceRoot = "${name}/src";
- IPEPREFIX="${placeholder "out"}";
+ IPEPREFIX=placeholder "out";
URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/";
LUA_PACKAGE = "lua";
diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix
index 42ed667dee98..4eb7518cc102 100644
--- a/pkgs/applications/graphics/jbrout/default.nix
+++ b/pkgs/applications/graphics/jbrout/default.nix
@@ -3,7 +3,7 @@
let
inherit (pythonPackages) python;
in pythonPackages.buildPythonApplication rec {
- name = "jbrout-${version}";
+ pname = "jbrout";
version = "338";
src = fetchsvn {
diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/applications/graphics/jpeg-archive/default.nix
index ed583490c90d..97c15d2eec09 100644
--- a/pkgs/applications/graphics/jpeg-archive/default.nix
+++ b/pkgs/applications/graphics/jpeg-archive/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, mozjpeg, makeWrapper, coreutils, parallel, findutils }:
-stdenv.mkDerivation rec {
- name = "jpeg-archive-${version}";
+stdenv.mkDerivation {
+ pname = "jpeg-archive";
version = "2.2.0"; # can be found here https://github.com/danielgtaylor/jpeg-archive/blob/master/src/util.c#L15
# update with
diff --git a/pkgs/applications/graphics/jpeginfo/default.nix b/pkgs/applications/graphics/jpeginfo/default.nix
index f438bf6f7ed8..e15aedd77e1c 100644
--- a/pkgs/applications/graphics/jpeginfo/default.nix
+++ b/pkgs/applications/graphics/jpeginfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libjpeg }:
stdenv.mkDerivation rec {
- name = "jpeginfo-${version}";
+ pname = "jpeginfo";
version = "1.6.1";
src = fetchurl {
- url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz";
+ url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz";
sha256 = "0lvn3pnylyj56158d3ix9w1gas1s29klribw9bz1xym03p7k37k2";
};
diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix
index b24b14698e6a..cc1ca3a0ff2a 100644
--- a/pkgs/applications/graphics/jpegoptim/default.nix
+++ b/pkgs/applications/graphics/jpegoptim/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.4.6";
- name = "jpegoptim-${version}";
+ pname = "jpegoptim";
src = fetchurl {
- url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz";
+ url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz";
sha256 = "1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8";
};
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index 301dc902dce9..1487fb8adbac 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
version = "0.8.0.6";
- name = "k3d-${version}";
+ pname = "k3d";
src = fetchFromGitHub {
owner = "K-3D";
repo = "k3d";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "0vdjjg6h8mxm2n8mvkkg2mvd27jn2xx90hnmx23cbd35mpz9p4aa";
};
diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix
index e70fafa24b60..9b96b30c62b1 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -5,11 +5,11 @@
}:
mkDerivation rec {
- name = "kgraphviewer-${version}";
+ pname = "kgraphviewer";
version = "2.4.3";
src = fetchurl {
- url = "mirror://kde/stable/kgraphviewer/${version}/${name}.tar.xz";
+ url = "mirror://kde/stable/kgraphviewer/${version}/${pname}-${version}.tar.xz";
sha256 = "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l";
};
diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix
deleted file mode 100644
index de51422d1da6..000000000000
--- a/pkgs/applications/graphics/kipi-plugins/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- stdenv, fetchurl,
- extra-cmake-modules,
- karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
- libkipi, qtbase, qtsvg, qtxmlpatterns
-}:
-
-stdenv.mkDerivation rec {
- pname = "kipi-plugins";
- version = "5.9.1";
-
- src = fetchurl {
- url = "http://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0hjm05nkz0w926sn4lav5258rda6zkd6gfnqd8hh3fa2q0dd7cq4";
- };
-
- nativeBuildInputs = [ extra-cmake-modules ];
- buildInputs = [
- karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
- qtbase qtsvg qtxmlpatterns
- ];
-
- meta = {
- description = "Plugins for KDE-based image applications";
- license = stdenv.lib.licenses.gpl2;
- homepage = https://www.digikam.org;
- maintainers = with stdenv.lib.maintainers; [ ttuegel ];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
index 4f86e5736899..201a4fe113e3 100644
--- a/pkgs/applications/graphics/leocad/default.nix
+++ b/pkgs/applications/graphics/leocad/default.nix
@@ -6,7 +6,7 @@ set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/
{ stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }:
stdenv.mkDerivation rec {
- name = "leocad-${version}";
+ pname = "leocad";
version = "19.07.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix
index eea0e501cb8e..7ae5286f7622 100644
--- a/pkgs/applications/graphics/mcomix/default.nix
+++ b/pkgs/applications/graphics/mcomix/default.nix
@@ -19,7 +19,7 @@ python27Packages.buildPythonApplication rec {
MComix is an user-friendly, customizable image viewer. It is specifically
designed to handle comic books, but also serves as a generic viewer.
It reads images in ZIP, RAR, 7Zip or tar archives as well as plain image
- files. It is written in Python and uses GTK+ through the PyGTK bindings,
+ files. It is written in Python and uses GTK through the PyGTK bindings,
and runs on both Linux and Windows.
MComix is a fork of the Comix project, and aims to add bug fixes and
diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix
index c25c1277ee0b..7ad8c388a203 100644
--- a/pkgs/applications/graphics/meh/default.nix
+++ b/pkgs/applications/graphics/meh/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libX11, libXext, libjpeg, libpng, giflib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "meh-unstable-2015-04-11";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/meme/default.nix b/pkgs/applications/graphics/meme/default.nix
index 2fddc39e0d07..5f8a0bb6eed3 100644
--- a/pkgs/applications/graphics/meme/default.nix
+++ b/pkgs/applications/graphics/meme/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "meme-unstable-${version}";
+ pname = "meme-unstable";
version = "2017-09-10";
owner = "nomad-software";
diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix
index c06a79727094..fbe8f10c72f7 100644
--- a/pkgs/applications/graphics/mirage/default.nix
+++ b/pkgs/applications/graphics/mirage/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pythonPackages, libX11, gettext }:
pythonPackages.buildPythonApplication rec {
- name = "mirage-${version}";
+ pname = "mirage";
version = "0.9.5.2";
src = fetchurl {
- url = "mirror://sourceforge/mirageiv/${name}.tar.bz2";
+ url = "mirror://sourceforge/mirageiv/${pname}-${version}.tar.bz2";
sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c";
};
diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix
index b48fd891a6ac..63cc4a3a8d35 100644
--- a/pkgs/applications/graphics/mozjpeg/default.nix
+++ b/pkgs/applications/graphics/mozjpeg/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "3.3.1";
- name = "mozjpeg-${version}";
+ pname = "mozjpeg";
src = fetchFromGitHub {
owner = "mozilla";
diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix
index 8a2a218d9891..7274bdacd9d0 100644
--- a/pkgs/applications/graphics/mtpaint/default.nix
+++ b/pkgs/applications/graphics/mtpaint/default.nix
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
];
meta = {
- description = "A simple GTK+1/2 painting program";
+ description = "A simple GTK painting program";
longDescription = ''
- mtPaint is a simple GTK+1/2 painting program designed for
+ mtPaint is a simple GTK painting program designed for
creating icons and pixel based artwork. It can edit indexed palette
or 24 bit RGB images and offers basic painting and palette manipulation
tools. It also has several other more powerful features such as channels,
diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix
index 466ab3e26fb8..1b51732b918c 100644
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@@ -3,8 +3,8 @@
let
inherit (python2Packages) python pycairo pygobject3 numpy;
-in stdenv.mkDerivation rec {
- name = "mypaint-${version}";
+in stdenv.mkDerivation {
+ pname = "mypaint";
version = "1.2.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index d0838070262a..62fae518b929 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -1,9 +1,8 @@
{ stdenv
+, mkDerivation
, fetchFromGitHub
, cmake
, pkgconfig
-, wrapGAppsHook
-, gsettings-desktop-schemas
, qtbase
, qttools
@@ -16,8 +15,8 @@
, quazip
}:
-stdenv.mkDerivation rec {
- name = "nomacs-${version}";
+mkDerivation rec {
+ pname = "nomacs";
version = "3.12";
src = fetchFromGitHub {
@@ -38,8 +37,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [cmake
- pkgconfig
- wrapGAppsHook];
+ pkgconfig];
buildInputs = [qtbase
qttools
@@ -48,13 +46,13 @@ stdenv.mkDerivation rec {
opencv
libraw
libtiff
- quazip
- gsettings-desktop-schemas];
+ quazip];
cmakeFlags = ["-DENABLE_OPENCV=ON"
"-DENABLE_RAW=ON"
"-DENABLE_TIFF=ON"
"-DENABLE_QUAZIP=ON"
+ "-DENABLE_TRANSLATIONS=ON"
"-DUSE_SYSTEM_QUAZIP=ON"];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index cf13c6fb05e9..13a00991265f 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -5,7 +5,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper
}:
stdenv.mkDerivation rec {
- name = "paraview-${version}";
+ pname = "paraview";
version = "5.6.0";
# fetching from GitHub instead of taking an "official" source
diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix
index 3cc7166b4e46..78f6d8bcbaff 100644
--- a/pkgs/applications/graphics/pbrt/default.nix
+++ b/pkgs/applications/graphics/pbrt/default.nix
@@ -1,9 +1,9 @@
{stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2018-08-15";
- name = "pbrt-v3-${version}";
+ pname = "pbrt-v3";
src = fetchFromGitHub {
rev = "86b5821308088deea70b207bc8c22219d0103d65";
diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix
index c1b2beadcd53..7b1077d18a9d 100644
--- a/pkgs/applications/graphics/pdfcpu/default.nix
+++ b/pkgs/applications/graphics/pdfcpu/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pdfcpu";
- version = "0.2.3";
+ version = "0.2.4";
src = fetchFromGitHub {
owner = "pdfcpu";
repo = pname;
rev = "v${version}";
- sha256 = "11q57j3wzmy2glkv53i9n7jkp14x4bqm20f3rqs3gkm4j9bcas4y";
+ sha256 = "0inlwrpv5zkcv48g5gq1xdrvd7w1zkhf8p57fpr2cpd7hd3am7n8";
};
- modSha256 = "0cz4gs88s9z2yv1gc9ap92vv2j93ab6kr25zjgl2r7z6clbl5fzp";
+ modSha256 = "1nagb3k2ghfw27g4vcmn7v8s5flg387jpf1l18gw6c44a1xjcivs";
subPackages = [ "cmd/pdfcpu" ];
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index f622d3f388e2..37857fc459ea 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
version = "3.0.4";
- name = "pencil-${version}";
+ pname = "pencil";
src = fetchurl {
url = "http://pencil.evolus.vn/dl/V${version}/Pencil_${version}_amd64.deb";
diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
index 6bd2fa98b1bb..09b5bd378397 100644
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/pkgs/applications/graphics/photivo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16,
lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "photivo-2014-01-25";
src = fetchhg {
diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix
index 7da1d4b612f9..5e7fb5cf7a0a 100644
--- a/pkgs/applications/graphics/phototonic/default.nix
+++ b/pkgs/applications/graphics/phototonic/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }:
stdenv.mkDerivation rec {
- name = "phototonic-${version}";
+ pname = "phototonic";
version = "2.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix
index 132136da658b..f50af2925a3a 100644
--- a/pkgs/applications/graphics/potrace/default.nix
+++ b/pkgs/applications/graphics/potrace/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
- name = "potrace-${version}";
+ pname = "potrace";
version = "1.15";
src = fetchurl {
diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix
index ec4ce69d5e87..1ad51e92d472 100644
--- a/pkgs/applications/graphics/pqiv/default.nix
+++ b/pkgs/applications/graphics/pqiv/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation (rec {
- name = "pqiv-${version}";
+ pname = "pqiv";
version = "2.11";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix
index c37e21ec898a..4d416a7c106d 100644
--- a/pkgs/applications/graphics/qcomicbook/default.nix
+++ b/pkgs/applications/graphics/qcomicbook/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }:
stdenv.mkDerivation rec {
- name = "qcomicbook-${version}";
+ pname = "qcomicbook";
version = "0.9.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix
index ce08e2b1be92..750217d99188 100644
--- a/pkgs/applications/graphics/qiv/default.nix
+++ b/pkgs/applications/graphics/qiv/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation (rec {
version = "2.3.2";
- name = "qiv-${version}";
+ pname = "qiv";
src = fetchurl {
- url = "https://spiegl.de/qiv/download/${name}.tgz";
+ url = "https://spiegl.de/qiv/download/${pname}-${version}.tgz";
sha256 = "1mc0f2nnas4q0d7zc9r6g4z93i32xlx0p9hl4fn5zkyml24a1q28";
};
diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index b300c0071fae..7e9547c1067c 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "0.9.8";
- name = "rapcad-${version}";
+ pname = "rapcad";
src = fetchFromGitHub {
owner = "gilesbathgate";
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index 3fd4521d7cd8..594429503a35 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -13,7 +13,7 @@ let
in
stdenv.mkDerivation rec {
version = "1.4";
- name = "renderdoc-${version}";
+ pname = "renderdoc";
src = fetchFromGitHub {
owner = "baldurk";
diff --git a/pkgs/applications/graphics/runwayml/default.nix b/pkgs/applications/graphics/runwayml/default.nix
index f96b70a77b47..c527ce2b229a 100644
--- a/pkgs/applications/graphics/runwayml/default.nix
+++ b/pkgs/applications/graphics/runwayml/default.nix
@@ -16,7 +16,7 @@ let
};
binary = appimageTools.wrapType2 {
- name = "${pname}";
+ name = pname;
inherit src;
};
# we only use this to extract the icon
diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/applications/graphics/sane/backends/dsseries/default.nix
index 01c203b407c1..d4165be3784f 100644
--- a/pkgs/applications/graphics/sane/backends/dsseries/default.nix
+++ b/pkgs/applications/graphics/sane/backends/dsseries/default.nix
@@ -1,18 +1,18 @@
{ stdenv, fetchurl, rpmextract }:
stdenv.mkDerivation rec {
- name = "libsane-dsseries-${version}";
+ pname = "libsane-dsseries";
version = "1.0.5-1";
src = fetchurl {
- url = "https://download.brother.com/welcome/dlf100974/${name}.x86_64.rpm";
+ url = "https://download.brother.com/welcome/dlf100974/${pname}-${version}.x86_64.rpm";
sha256 = "1wfdbfbf51cc7njzikdg48kwpnpc0pg5s6p0s0y3z0q7y59x2wbq";
};
nativeBuildInputs = [ rpmextract ];
unpackCmd = ''
- mkdir ${name} && pushd ${name}
+ mkdir ${pname}-${version} && pushd ${pname}-${version}
rpmextract $curSrc
popd
'';
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
index f6994db81e4b..66473c4a155f 100644
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }:
stdenv.mkDerivation rec {
- name = "sane-frontends-${version}";
+ pname = "sane-frontends";
version = "1.0.14";
src = fetchurl {
- url = "https://alioth.debian.org/frs/download.php/latestfile/175/${name}.tar.gz";
+ url = "https://alioth.debian.org/frs/download.php/latestfile/175/${pname}-${version}.tar.gz";
sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7";
};
diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
index d55441e39fa5..63f16f688acd 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -3,7 +3,7 @@
, qtbase, qttools }:
stdenv.mkDerivation rec {
- name = "scantailor-advanced-${version}";
+ pname = "scantailor-advanced";
version = "1.0.16";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix
index 395179ff70ae..14efe48f30db 100644
--- a/pkgs/applications/graphics/scantailor/default.nix
+++ b/pkgs/applications/graphics/scantailor/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "scantailor-0.9.12.1";
src = fetchurl {
diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix
index 292ae9c8faa8..88bbbd9d8646 100644
--- a/pkgs/applications/graphics/screencloud/default.nix
+++ b/pkgs/applications/graphics/screencloud/default.nix
@@ -2,7 +2,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "screencloud-${version}";
+ pname = "screencloud";
version = "1.2.0";
# API Keys. According to the author of the AUR package, these are only used
diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index 527a21f93fe3..957692b4ba17 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -13,7 +13,7 @@ let
EncodeLocale TryTiny TypesSerialiser LWPMediaTypes
];
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "shutter-0.94.3";
src = fetchurl {
diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix
index d0f2a48c589d..f56646e5aedd 100644
--- a/pkgs/applications/graphics/swingsane/default.nix
+++ b/pkgs/applications/graphics/swingsane/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeDesktopItem, unzip, jre, runtimeShell }:
stdenv.mkDerivation rec {
- name = "swingsane-${version}";
+ pname = "swingsane";
version = "0.2";
src = fetchurl {
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index b399dd2d2284..188f7cb29343 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -6,7 +6,7 @@
let
version = "1.0.2";
- ETL = stdenv.mkDerivation rec {
+ ETL = stdenv.mkDerivation {
name = "ETL-0.04.19";
src = fetchFromGitHub {
@@ -21,8 +21,9 @@ let
nativeBuildInputs = [ autoreconfHook ];
};
- synfig = stdenv.mkDerivation rec {
- name = "synfig-${version}";
+ synfig = stdenv.mkDerivation {
+ pname = "synfig";
+ inherit version;
src = fetchFromGitHub {
repo = "synfig";
@@ -46,8 +47,9 @@ let
meta.broken = true;
};
in
-stdenv.mkDerivation rec {
- name = "synfigstudio-${version}";
+stdenv.mkDerivation {
+ pname = "synfigstudio";
+ inherit version;
src = fetchFromGitHub {
repo = "synfig";
diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix
index 23713271c409..157c0b9742bf 100644
--- a/pkgs/applications/graphics/tesseract/tesseract3.nix
+++ b/pkgs/applications/graphics/tesseract/tesseract3.nix
@@ -2,7 +2,7 @@
, leptonica, libpng, libtiff, icu, pango, opencl-headers }:
stdenv.mkDerivation rec {
- name = "tesseract-${version}";
+ pname = "tesseract";
version = "3.05.00";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix
index af0063301f1a..548f58a50fb1 100644
--- a/pkgs/applications/graphics/tesseract/tesseract4.nix
+++ b/pkgs/applications/graphics/tesseract/tesseract4.nix
@@ -2,7 +2,7 @@
, leptonica, libpng, libtiff, icu, pango, opencl-headers }:
stdenv.mkDerivation rec {
- name = "tesseract-${version}";
+ pname = "tesseract";
version = "4.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/pkgs/applications/graphics/timelapse-deflicker/default.nix
index b4ddb1436856..8355545e8dd6 100644
--- a/pkgs/applications/graphics/timelapse-deflicker/default.nix
+++ b/pkgs/applications/graphics/timelapse-deflicker/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }:
stdenv.mkDerivation rec {
- name = "timelapse-deflicker-${version}";
+ pname = "timelapse-deflicker";
version = "0.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix
index 39b4640dc431..131d83f0d58e 100644
--- a/pkgs/applications/graphics/ufraw/default.nix
+++ b/pkgs/applications/graphics/ufraw/default.nix
@@ -24,7 +24,7 @@
assert withGimpPlugin -> gimp != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ufraw";
version = "unstable-2019-06-12";
diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix
index 3a139f3740cc..09abfc60a528 100644
--- a/pkgs/applications/graphics/unigine-valley/default.nix
+++ b/pkgs/applications/graphics/unigine-valley/default.nix
@@ -27,7 +27,8 @@ let
in
stdenv.mkDerivation rec {
- name = "unigine-valley-${version}";
+ pname = "unigine-valley";
+ inherit version;
src = fetchurl {
url = "http://assets.unigine.com/d/Unigine_Valley-${version}.run";
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix
index 48930ccbbb96..4f5fb12faa62 100644
--- a/pkgs/applications/graphics/viewnior/default.nix
+++ b/pkgs/applications/graphics/viewnior/default.nix
@@ -2,13 +2,13 @@
, intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}:
stdenv.mkDerivation rec {
- name = "viewnior-${version}";
+ pname = "viewnior";
version = "1.6";
src = fetchFromGitHub {
owner = "xsisqox";
repo = "Viewnior";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "06ppv3r85l3id4ij6h4y5fgm3nib2587fdrdv9fccyi75zk7fs0p";
};
diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix
index e11bc3dd5bb9..232eeeb01153 100644
--- a/pkgs/applications/graphics/write_stylus/default.nix
+++ b/pkgs/applications/graphics/write_stylus/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }:
stdenv.mkDerivation rec {
- name = "write_stylus-${version}";
+ pname = "write_stylus";
version = "209";
desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix
index 182f68f3112c..e80362c386b9 100644
--- a/pkgs/applications/graphics/xaos/default.nix
+++ b/pkgs/applications/graphics/xaos/default.nix
@@ -2,11 +2,11 @@
, libXt, zlib, gettext, intltool, perl }:
stdenv.mkDerivation rec {
- name = "xaos-${version}";
+ pname = "xaos";
version = "3.6";
src = fetchurl {
- url = "mirror://sourceforge/xaos/${name}.tar.gz";
+ url = "mirror://sourceforge/xaos/${pname}-${version}.tar.gz";
sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq";
};
diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix
index 429af12b9bb3..fe5a13703329 100644
--- a/pkgs/applications/graphics/xfig/default.nix
+++ b/pkgs/applications/graphics/xfig/default.nix
@@ -6,7 +6,8 @@ let
version = "3.2.7a";
in stdenv.mkDerivation {
- name = "xfig-${version}";
+ pname = "xfig";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz";
diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix
index 2269f1c18f14..ae4765fc9e76 100644
--- a/pkgs/applications/graphics/xfractint/default.nix
+++ b/pkgs/applications/graphics/xfractint/default.nix
@@ -1,6 +1,5 @@
{stdenv, fetchurl, libX11, libXft}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "xfractint";
version = "20.04p14";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix
index 2487b093148a..41539f32b071 100644
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/pkgs/applications/graphics/xournalpp/default.nix
@@ -23,7 +23,7 @@
}:
stdenv.mkDerivation rec {
- name = "xournalpp-${version}";
+ pname = "xournalpp";
version = "1.0.12";
src = fetchFromGitHub {
diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix
index 69ab67dffb73..de3f3a78988b 100644
--- a/pkgs/applications/graphics/xzgv/default.nix
+++ b/pkgs/applications/graphics/xzgv/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }:
stdenv.mkDerivation rec {
- name = "xzgv-${version}";
+ pname = "xzgv";
version = "0.9.2";
src = fetchurl {
url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz";
diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix
index 3cf42343658c..e545dd5a7230 100644
--- a/pkgs/applications/graphics/yacreader/default.nix
+++ b/pkgs/applications/graphics/yacreader/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "yacreader-${version}";
+ pname = "yacreader";
version = "9.5.0";
src = fetchurl {
- url = "https://github.com/YACReader/yacreader/releases/download/${version}/${name}-src.tar.xz";
+ url = "https://github.com/YACReader/yacreader/releases/download/${version}/${pname}-${version}-src.tar.xz";
sha256 = "0cv5y76kjvsqsv4fp99j8np5pm4m76868i1nn40q6hy573dmxwm6";
};
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index 799ceef1beda..0038d41475fb 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchzip, makeWrapper, unzip, jre }:
stdenv.mkDerivation rec {
- name = "yEd-${version}";
+ pname = "yEd";
version = "3.19";
src = fetchzip {
- url = "https://www.yworks.com/resources/yed/demo/${name}.zip";
+ url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip";
sha256 = "0l70pc7wl2ghfkjab9w2mbx7crwha7xwkrpmspsi5c6q56dw7s33";
};
diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix
index ac3d303a7a60..db07b9e1db4e 100644
--- a/pkgs/applications/graphics/zgrviewer/default.nix
+++ b/pkgs/applications/graphics/zgrviewer/default.nix
@@ -2,9 +2,8 @@
stdenv.mkDerivation rec {
version = "0.9.0";
pname = "zgrviewer";
- name="${pname}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/zvtm/${pname}/${version}/${name}.zip";
+ url = "mirror://sourceforge/zvtm/${pname}/${version}/${pname}-${version}.zip";
sha256 = "1yg2rck81sqqrgfi5kn6c1bz42dr7d0zqpcsdjhicssi1y159f23";
};
buildInputs = [jre unzip];
diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix
index 7a49e5b2cb7f..8ef705f7ef4b 100644
--- a/pkgs/applications/graphics/zgv/default.nix
+++ b/pkgs/applications/graphics/zgv/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, SDL, SDL_image, libjpeg, libpng, libtiff }:
stdenv.mkDerivation rec {
- name = "zgv-${version}";
+ pname = "zgv";
version = "5.9";
src = fetchurl {
- url = "https://www.svgalib.org/rus/zgv/${name}.tar.gz";
+ url = "https://www.svgalib.org/rus/zgv/${pname}-${version}.tar.gz";
sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj";
};
diff --git a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
index 24ed20fd83fb..c3964c5c05b5 100644
--- a/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
+++ b/pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch
@@ -9,11 +9,11 @@ This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a.
KF5AkonadiConfig.cmake.in | 6 +++---
2 files changed, 3 insertions(+), 6 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9788bea94..15bad00fd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -285,9 +285,6 @@ configure_package_config_file(
+Index: akonadi-19.08.0/CMakeLists.txt
+===================================================================
+--- akonadi-19.08.0.orig/CMakeLists.txt
++++ akonadi-19.08.0/CMakeLists.txt
+@@ -306,9 +306,6 @@ configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
@@ -23,13 +23,13 @@ index 9788bea94..15bad00fd 100644
)
install(FILES
-diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
-index 75abede50..10f039376 100644
---- a/KF5AkonadiConfig.cmake.in
-+++ b/KF5AkonadiConfig.cmake.in
-@@ -13,8 +13,8 @@ find_dependency(KF5ConfigWidgets "@KF5_VERSION@")
- find_dependency(Qt5DBus "@QT_REQUIRED_VERSION@")
- find_dependency(Qt5Network "@QT_REQUIRED_VERSION@")
+Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in
+===================================================================
+--- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in
++++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in
+@@ -26,8 +26,8 @@ if(BUILD_TESTING)
+ find_dependency(Qt5Test "@QT_REQUIRED_VERSION@")
+ endif()
-set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
-set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@")
@@ -38,15 +38,12 @@ index 75abede50..10f039376 100644
find_dependency(Boost "@Boost_MINIMUM_VERSION@")
-@@ -22,7 +22,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake)
+@@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako
include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake)
# The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
+set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@")
-
+
####################################################################################
# CMAKE_AUTOMOC
---
-2.15.1
-
diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch
index fcbbbbb72eb3..ba6bbedeeae7 100644
--- a/pkgs/applications/kde/akonadi/akonadi-paths.patch
+++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch
@@ -1,8 +1,8 @@
-diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
-index d85c1a79b..8df02710c 100644
---- a/src/akonadicontrol/agentmanager.cpp
-+++ b/src/akonadicontrol/agentmanager.cpp
-@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose, QObject *parent)
+Index: akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp
+===================================================================
+--- akonadi-19.08.0.orig/src/akonadicontrol/agentmanager.cpp
++++ akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp
+@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose,
mStorageController = new Akonadi::ProcessControl;
mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld
connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
@@ -17,11 +17,11 @@ index d85c1a79b..8df02710c 100644
}
}
-diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
-index be1cc4afb..6d0c1d7e5 100644
---- a/src/akonadicontrol/agentprocessinstance.cpp
-+++ b/src/akonadicontrol/agentprocessinstance.cpp
-@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
+Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp
+===================================================================
+--- akonadi-19.08.0.orig/src/akonadicontrol/agentprocessinstance.cpp
++++ akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp
+@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A
} else {
Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
const QStringList arguments = QStringList() << executable << identifier();
@@ -30,11 +30,11 @@ index be1cc4afb..6d0c1d7e5 100644
mController->start(agentLauncherExec, arguments);
}
return true;
-diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
-index dfff6fc29..419e54a5b 100644
---- a/src/server/storage/dbconfigmysql.cpp
-+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -82,7 +82,6 @@ bool DbConfigMysql::init(QSettings &settings)
+Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
+===================================================================
+--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp
++++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
+@@ -83,7 +83,6 @@ bool DbConfigMysql::init(QSettings &sett
// determine default settings depending on the driver
QString defaultHostName;
QString defaultOptions;
@@ -42,7 +42,7 @@ index dfff6fc29..419e54a5b 100644
QString defaultCleanShutdownCommand;
#ifndef Q_OS_WIN
-@@ -90,16 +89,7 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -92,16 +91,7 @@ bool DbConfigMysql::init(QSettings &sett
#endif
const bool defaultInternalServer = true;
@@ -59,8 +59,8 @@ index dfff6fc29..419e54a5b 100644
+ const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN);
if (!mysqladminPath.isEmpty()) {
#ifndef Q_OS_WIN
- defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
-@@ -109,10 +99,10 @@ bool DbConfigMysql::init(QSettings &settings)
+ defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown")
+@@ -111,10 +101,10 @@ bool DbConfigMysql::init(QSettings &sett
#endif
}
@@ -73,7 +73,7 @@ index dfff6fc29..419e54a5b 100644
qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
-@@ -129,7 +119,7 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -131,7 +121,7 @@ bool DbConfigMysql::init(QSettings &sett
mUserName = settings.value(QStringLiteral("User")).toString();
mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@@ -82,7 +82,7 @@ index dfff6fc29..419e54a5b 100644
mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
settings.endGroup();
-@@ -139,9 +129,6 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -141,9 +131,6 @@ bool DbConfigMysql::init(QSettings &sett
// intentionally not namespaced as we are the only one in this db instance when using internal mode
mDatabaseName = QStringLiteral("akonadi");
}
@@ -92,7 +92,7 @@ index dfff6fc29..419e54a5b 100644
qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
-@@ -150,9 +137,6 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -152,9 +139,6 @@ bool DbConfigMysql::init(QSettings &sett
settings.setValue(QStringLiteral("Name"), mDatabaseName);
settings.setValue(QStringLiteral("Host"), mHostName);
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@@ -102,7 +102,7 @@ index dfff6fc29..419e54a5b 100644
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup();
settings.sync();
-@@ -206,7 +190,7 @@ bool DbConfigMysql::startInternalServer()
+@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer(
#endif
// generate config file
@@ -111,56 +111,35 @@ index dfff6fc29..419e54a5b 100644
const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
if (globalConfig.isEmpty()) {
-diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
-index 6b50ae50e..f94a8c5eb 100644
---- a/src/server/storage/dbconfigpostgresql.cpp
-+++ b/src/server/storage/dbconfigpostgresql.cpp
-@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
+Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp
+===================================================================
+--- akonadi-19.08.0.orig/src/server/storage/dbconfigpostgresql.cpp
++++ akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp
+@@ -140,9 +140,7 @@ bool DbConfigPostgresql::init(QSettings
// determine default settings depending on the driver
QString defaultHostName;
QString defaultOptions;
- QString defaultServerPath;
QString defaultInitDbPath;
+- QString defaultPgUpgradePath;
QString defaultPgData;
-@@ -70,35 +69,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
+ #ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows
+@@ -153,12 +151,8 @@ bool DbConfigPostgresql::init(QSettings
mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
if (mInternalServer) {
-- QStringList postgresSearchPath;
+- const auto paths = postgresSearchPaths(QStringLiteral("/usr/lib/postgresql"));
-
--#ifdef POSTGRES_PATH
-- const QString dir(QStringLiteral(POSTGRES_PATH));
-- if (QDir(dir).exists()) {
-- postgresSearchPath << QStringLiteral(POSTGRES_PATH);
-- }
--#endif
-- postgresSearchPath << QStringLiteral("/usr/bin")
-- << QStringLiteral("/usr/sbin")
-- << QStringLiteral("/usr/local/sbin");
-- // Locale all versions in /usr/lib/postgresql (i.e. /usr/lib/postgresql/X.Y) in reversed
-- // sorted order, so we search from the newest one to the oldest.
-- QStringList postgresVersionedSearchPaths;
-- QDir versionedDir(QStringLiteral("/usr/lib/postgresql"));
-- if (versionedDir.exists()) {
-- const auto versionedDirs = versionedDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name | QDir::Reversed);
-- for (const auto &path : versionedDirs) {
-- // Don't break once PostgreSQL 10 is released, but something more future-proof will be needed
-- if (path.fileName().startsWith(QLatin1String("10."))) {
-- postgresVersionedSearchPaths.prepend(path.absoluteFilePath() + QStringLiteral("/bin"));
-- } else {
-- postgresVersionedSearchPaths.append(path.absoluteFilePath() + QStringLiteral("/bin"));
-- }
-- }
-- }
-- postgresSearchPath.append(postgresVersionedSearchPaths);
-- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), postgresSearchPath);
-- defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), postgresSearchPath);
+- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), paths);
+- defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), paths);
+ defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB);
defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
+- defaultPgUpgradePath = QStandardPaths::findExecutable(QStringLiteral("pg_upgrade"), paths);
defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
}
-@@ -118,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
+
+@@ -177,20 +171,14 @@ bool DbConfigPostgresql::init(QSettings
mUserName = settings.value(QStringLiteral("User")).toString();
mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@@ -172,7 +151,18 @@ index 6b50ae50e..f94a8c5eb 100644
qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
if (mInternalServer && mInitDbPath.isEmpty()) {
-@@ -142,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
+ mInitDbPath = defaultInitDbPath;
+ }
+ qCDebug(AKONADISERVER_LOG) << "Found initdb:" << mServerPath;
+- mPgUpgradePath = settings.value(QStringLiteral("UpgradePath"), defaultPgUpgradePath).toString();
+- if (mInternalServer && mPgUpgradePath.isEmpty()) {
+- mPgUpgradePath = defaultPgUpgradePath;
+- }
++ mPgUpgradePath = QLatin1String(NIXPKGS_POSTGRES_PG_UPGRADE);
+ qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath;
+ mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString();
+ if (mPgData.isEmpty()) {
+@@ -206,7 +194,6 @@ bool DbConfigPostgresql::init(QSettings
settings.setValue(QStringLiteral("Port"), mHostPort);
}
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@@ -180,6 +170,3 @@ index 6b50ae50e..f94a8c5eb 100644
settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup();
---
-2.18.1
-
diff --git a/pkgs/applications/kde/akonadi/akonadi-timestamps.patch b/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
index 25a835f5ba24..e299a6991f05 100644
--- a/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
+++ b/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
@@ -1,8 +1,8 @@
-Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
+Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
===================================================================
---- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp
-+++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
-@@ -229,8 +229,7 @@ bool DbConfigMysql::startInternalServer(
+--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp
++++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
+@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer(
bool confUpdate = false;
QFile actualFile(actualConfig);
// update conf only if either global (or local) is newer than actual
diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index cba0b1e59e3a..b9a96394a674 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -25,6 +25,7 @@ mkDerivation {
''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mysql}/bin/mysql_install_db\"''
''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mysql}/bin/mysqlcheck\"''
''-DNIXPKGS_POSTGRES_PG_CTL=\"\"''
+ ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"''
''-DNIXPKGS_POSTGRES_INITDB=\"\"''
];
preConfigure = ''
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 01df2bd26316..9b146aa50364 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -38,7 +38,7 @@ let
let
inherit (args) name;
sname = args.sname or name;
- inherit (srcs."${sname}") src version;
+ inherit (srcs.${sname}) src version;
mkDerivation =
libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
in
@@ -60,7 +60,7 @@ let
inherit mkDerivation;
# Team of maintainers assigned to the KDE PIM suite
- kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ];
+ kdepimTeam = with lib.maintainers; [ ttuegel vandenoever nyanloutre ];
};
in {
akonadi = callPackage ./akonadi {};
@@ -116,6 +116,7 @@ let
kidentitymanagement = callPackage ./kidentitymanagement.nix {};
kig = callPackage ./kig.nix {};
kimap = callPackage ./kimap.nix {};
+ kipi-plugins = callPackage ./kipi-plugins.nix {};
kitinerary = callPackage ./kitinerary.nix {};
kio-extras = callPackage ./kio-extras.nix {};
kldap = callPackage ./kldap.nix {};
@@ -128,6 +129,7 @@ let
kmix = callPackage ./kmix.nix {};
kmplot = callPackage ./kmplot.nix {};
knotes = callPackage ./knotes.nix {};
+ kolf = callPackage ./kolf.nix {};
kolourpaint = callPackage ./kolourpaint.nix {};
kompare = callPackage ./kompare.nix {};
konsole = callPackage ./konsole.nix {};
@@ -171,6 +173,7 @@ let
pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};
print-manager = callPackage ./print-manager.nix {};
spectacle = callPackage ./spectacle.nix {};
+ yakuake = callPackage ./yakuake.nix {};
# Okteta was removed from kde applications and will now be released independently
# Lets keep an alias for compatibility reasons
inherit okteta;
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index bd96cb966933..ee19f5cebfe2 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/19.04.1/ )
+WGET_ARGS=( https://download.kde.org/stable/applications/19.08.1/ )
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index ceb928acdf2f..3d03d1dea3e7 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
exiv2, lcms2,
baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi,
- phonon, qtimageformats, qtsvg, qtx11extras, kinit, fetchpatch
+ phonon, qtimageformats, qtsvg, qtx11extras, kinit
}:
mkDerivation {
@@ -18,12 +18,4 @@ mkDerivation {
qtimageformats qtsvg qtx11extras
];
propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ];
-
- # Fixes build with exiv2-0.27.1. Drop in 19.04.2
- patches = [
- (fetchpatch {
- url = "https://github.com/KDE/gwenview/commit/172560b845460b6121154f88221c855542219943.patch";
- sha256 = "0y1l34h2s7rhfknvg6ggcc389jfzhpq69wf0s3xd5ccwfw7c0ycq";
- })
- ];
}
diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix
index e6b4f6b6bdd4..95ff6cf198b2 100644
--- a/pkgs/applications/kde/kate.nix
+++ b/pkgs/applications/kde/kate.nix
@@ -13,6 +13,7 @@ mkDerivation {
license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
maintainers = [ lib.maintainers.ttuegel ];
};
+
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ libgit2 ];
propagatedBuildInputs = [
diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix
index 3cb89cb4daa6..4e2a308b17f5 100644
--- a/pkgs/applications/kde/kcalc.nix
+++ b/pkgs/applications/kde/kcalc.nix
@@ -2,7 +2,7 @@
mkDerivation, lib,
extra-cmake-modules, kdoctools,
gmp, kconfig, kconfigwidgets, kcrash, kguiaddons, ki18n, kinit,
- knotifications, kxmlgui,
+ knotifications, kxmlgui, mpfr,
}:
mkDerivation {
@@ -14,6 +14,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
gmp kconfig kconfigwidgets kcrash kguiaddons ki18n kinit knotifications
- kxmlgui
+ kxmlgui mpfr
];
}
diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix
index 75c1bf5be8bf..0fe33ea017da 100644
--- a/pkgs/applications/kde/kdepim-addons.nix
+++ b/pkgs/applications/kde/kdepim-addons.nix
@@ -5,7 +5,7 @@
incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass,
- kitinerary
+ kitinerary, kontactinterface
}:
mkDerivation {
@@ -20,6 +20,6 @@ mkDerivation {
incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative
kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar
libksieve mailcommon mailimporter messagelib poppler prison kpkpass
- kitinerary
+ kitinerary kontactinterface
];
}
diff --git a/pkgs/applications/kde/kipi-plugins.nix b/pkgs/applications/kde/kipi-plugins.nix
new file mode 100644
index 000000000000..5fb953acbd62
--- /dev/null
+++ b/pkgs/applications/kde/kipi-plugins.nix
@@ -0,0 +1,23 @@
+{
+ mkDerivation, lib,
+ extra-cmake-modules,
+ karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
+ libkipi, qtbase, qtsvg, qtxmlpatterns
+}:
+
+mkDerivation {
+ name = "kipi-plugins";
+
+ nativeBuildInputs = [ extra-cmake-modules ];
+ buildInputs = [
+ karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
+ qtbase qtsvg qtxmlpatterns
+ ];
+
+ meta = {
+ description = "Plugins for KDE-based image applications";
+ license = lib.licenses.gpl2;
+ homepage = https://cgit.kde.org/kipi-plugins.git;
+ maintainers = with lib.maintainers; [ ttuegel ];
+ };
+}
diff --git a/pkgs/applications/kde/kolf.nix b/pkgs/applications/kde/kolf.nix
new file mode 100644
index 000000000000..f9fa31b665b2
--- /dev/null
+++ b/pkgs/applications/kde/kolf.nix
@@ -0,0 +1,16 @@
+{ lib
+, mkDerivation
+, extra-cmake-modules
+, kdoctools
+, libkdegames, kconfig, kio, ktextwidgets
+}:
+
+mkDerivation {
+ name = "kolf";
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ libkdegames kio ktextwidgets ];
+ meta = {
+ license = with lib.licenses; [ gpl2 ];
+ maintainers = with lib.maintainers; [ peterhoeg ];
+ };
+}
diff --git a/pkgs/applications/kde/ktouch.nix b/pkgs/applications/kde/ktouch.nix
index 64179f2e64dc..7e300ea7157e 100644
--- a/pkgs/applications/kde/ktouch.nix
+++ b/pkgs/applications/kde/ktouch.nix
@@ -3,7 +3,8 @@
, kconfig, kconfigwidgets, kcoreaddons, kdeclarative, ki18n
, kitemviews, kcmutils, kio, knewstuff, ktexteditor, kwidgetsaddons
, kwindowsystem, kxmlgui, qtscript, qtdeclarative, kqtquickcharts
-, qtx11extras, qtgraphicaleffects, qtxmlpatterns, xorg
+, qtx11extras, qtgraphicaleffects, qtxmlpatterns, qtquickcontrols2
+, xorg
}:
@@ -19,7 +20,7 @@
kconfig kconfigwidgets kcoreaddons kdeclarative ki18n
kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons
kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts
- qtx11extras qtgraphicaleffects qtxmlpatterns
+ qtx11extras qtgraphicaleffects qtxmlpatterns qtquickcontrols2
xorg.libxkbfile xorg.libxcb
];
diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix
index bbbcca13d980..cd9ff2528fac 100644
--- a/pkgs/applications/kde/pimcommon.nix
+++ b/pkgs/applications/kde/pimcommon.nix
@@ -4,7 +4,7 @@
akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs,
kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons,
kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit,
- kwallet, kwindowsystem, libkdepim, qtwebengine
+ kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine
}:
mkDerivation {
@@ -17,7 +17,7 @@ mkDerivation {
buildInputs = [
akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets
kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit
- kwallet kwindowsystem libkdepim qtwebengine
+ kpurpose kwallet kwindowsystem libkdepim qtwebengine
];
propagatedBuildInputs = [
akonadi akonadi-contacts kconfig kcontacts kimap
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 43deb08c39f5..9e5346be9cd5 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1723 +3,1739 @@
{
akonadi = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/akonadi-19.04.1.tar.xz";
- sha256 = "b157c4199e3b913c4f684f56ed9d76bef67b3c120c319c88ae24bded6fc927bc";
- name = "akonadi-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/akonadi-19.08.1.tar.xz";
+ sha256 = "32233b59c696a5053f2ee4b7368804635a04e2a5f6d3605848eadafa0306c44d";
+ name = "akonadi-19.08.1.tar.xz";
};
};
akonadi-calendar = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/akonadi-calendar-19.04.1.tar.xz";
- sha256 = "6ef352dc20998416b8d379b085edfcfba5bcf6a5f448e11a4e51aca6b3241e48";
- name = "akonadi-calendar-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/akonadi-calendar-19.08.1.tar.xz";
+ sha256 = "5e8c66d4c86e6458469dbb393458ee8b5e6afc1b4712ce8395709d4226864d6c";
+ name = "akonadi-calendar-19.08.1.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/akonadi-calendar-tools-19.04.1.tar.xz";
- sha256 = "6a8eb905d0e5a1602ce59d5cf28322d844dc178c4daf98db1cf9e0c95eeb3531";
- name = "akonadi-calendar-tools-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/akonadi-calendar-tools-19.08.1.tar.xz";
+ sha256 = "033fae40bcbdcfa52981026f783b7cc8fecde384d6683747cd3f307bd43b2570";
+ name = "akonadi-calendar-tools-19.08.1.tar.xz";
};
};
akonadiconsole = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/akonadiconsole-19.04.1.tar.xz";
- sha256 = "33846348b0308eaf4ca81e8d577ce0eb6c17d49632e034607506413e86531262";
- name = "akonadiconsole-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/akonadiconsole-19.08.1.tar.xz";
+ sha256 = "9a0f88903757eaf0d3271d4438b3a170640b7cb01a7b2f0fbf10a75fa0093184";
+ name = "akonadiconsole-19.08.1.tar.xz";
};
};
akonadi-contacts = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/akonadi-contacts-19.04.1.tar.xz";
- sha256 = "4c58a73db7924250e47fb030657dc768fe44405806ec2d94ee00a264b414febc";
- name = "akonadi-contacts-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/akonadi-contacts-19.08.1.tar.xz";
+ sha256 = "f182883b4cc16034a798feb966df268e84d9c5b8d3c6e14d5698f7ead85a21d7";
+ name = "akonadi-contacts-19.08.1.tar.xz";
};
};
akonadi-import-wizard = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/akonadi-import-wizard-19.04.1.tar.xz";
- sha256 = "2699ca57ea6a04228875dd795255fd32a1120e2e5c4834290aea3270c43403e7";
- name = "akonadi-import-wizard-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/akonadi-import-wizard-19.08.1.tar.xz";
+ sha256 = "d66088ded8917f6034de8981ce71d5d0e1808f6d58f7fdb7e0a806ff0834e27b";
+ name = "akonadi-import-wizard-19.08.1.tar.xz";
};
};
akonadi-mime = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/akonadi-mime-19.04.1.tar.xz";
- sha256 = "4572aa7c953cc641a98ae3c2685dcdf259d621dcbbab1ccb7d11e2748c67b1a8";
- name = "akonadi-mime-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/akonadi-mime-19.08.1.tar.xz";
+ sha256 = "0a4f4652a665229b290431adb59940890effba0804fe33a0e79a24322f90b35c";
+ name = "akonadi-mime-19.08.1.tar.xz";
};
};
akonadi-notes = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/akonadi-notes-19.04.1.tar.xz";
- sha256 = "e503101e8806485ecf6ef22d1bafd8c299676ca75a388499e5418b8641604277";
- name = "akonadi-notes-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/akonadi-notes-19.08.1.tar.xz";
+ sha256 = "44896f17fc2f625f9fc8c77690acd787291c5e08e8261c5d113c94045bd5bdd8";
+ name = "akonadi-notes-19.08.1.tar.xz";
};
};
akonadi-search = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/akonadi-search-19.04.1.tar.xz";
- sha256 = "8438876407e9fd8fa08afe6942ab8dd3677202bc2ff1eba4fd7a49dd926f26d6";
- name = "akonadi-search-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/akonadi-search-19.08.1.tar.xz";
+ sha256 = "c68387f3452bcd390f1c99549531c72d95db0def29d8ba10330e68891b0d0b53";
+ name = "akonadi-search-19.08.1.tar.xz";
};
};
akregator = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/akregator-19.04.1.tar.xz";
- sha256 = "b2e731a3eac0a68865a90b71f17307c3aea8db304bf6663b551bc95907a490f1";
- name = "akregator-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/akregator-19.08.1.tar.xz";
+ sha256 = "b73fcf1c509398ff496864f0105491792b5b15f37c52f9a8ca74ca254a75494a";
+ name = "akregator-19.08.1.tar.xz";
};
};
analitza = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/analitza-19.04.1.tar.xz";
- sha256 = "b96da492805a48faff72e93e1b8b211c468b041fe217489eb097d554773d3381";
- name = "analitza-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/analitza-19.08.1.tar.xz";
+ sha256 = "f963a8abe31d4c0d2b0e0a7e78ec78ced8eb7a0af60df1620ccc2f2409df6a91";
+ name = "analitza-19.08.1.tar.xz";
};
};
ark = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ark-19.04.1.tar.xz";
- sha256 = "6d348b2b9566ce0b8a1ba1b56d0a8c5d434d4748c479c5a853fdcdecfec753e6";
- name = "ark-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ark-19.08.1.tar.xz";
+ sha256 = "b5638bc4559d775d0a0c2aee022cadc021543bf92e8be6b9b803c50e7e7f1835";
+ name = "ark-19.08.1.tar.xz";
};
};
artikulate = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/artikulate-19.04.1.tar.xz";
- sha256 = "11a54ef7abf001bd3debcaf46bc60764af55a2dbda6320c3c220461374f74432";
- name = "artikulate-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/artikulate-19.08.1.tar.xz";
+ sha256 = "856488a4914ae0cfa594106b4d5c7b5ffd996b009075dfa009ab9cdd2cbc2f9d";
+ name = "artikulate-19.08.1.tar.xz";
};
};
audiocd-kio = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/audiocd-kio-19.04.1.tar.xz";
- sha256 = "fad61ea586db7a4ce202fbb16854f69a20e8e16518dd60c27112447a904edb98";
- name = "audiocd-kio-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/audiocd-kio-19.08.1.tar.xz";
+ sha256 = "e072ed20f07fe246267b3e7c459812fe63d94125a1d2fbcda1c0403e9fe0a520";
+ name = "audiocd-kio-19.08.1.tar.xz";
};
};
baloo-widgets = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/baloo-widgets-19.04.1.tar.xz";
- sha256 = "7f7f0b3ba1bbdb3a47cdfa85830295b4b91fa5ac6c87b41d1cf29c354d8a4cf6";
- name = "baloo-widgets-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/baloo-widgets-19.08.1.tar.xz";
+ sha256 = "83429a70de735edc4714dc1b6f1a5a8c7d3d68a93165e98d2cadeecafa82af7b";
+ name = "baloo-widgets-19.08.1.tar.xz";
};
};
blinken = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/blinken-19.04.1.tar.xz";
- sha256 = "87fbf14568692885e7a496a8dae0c4f53a2837d1a824f9c7cf1038a7e8c861ca";
- name = "blinken-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/blinken-19.08.1.tar.xz";
+ sha256 = "dbe7b13bc6cad69f049f9eefa56f99012bc0906233193bf951477b3f5c8eb87e";
+ name = "blinken-19.08.1.tar.xz";
};
};
bomber = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/bomber-19.04.1.tar.xz";
- sha256 = "1359ebcaab26acd2dfa738160f9dd7a86e5bfa3d3b2f8a86c656ee187ad6c3fe";
- name = "bomber-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/bomber-19.08.1.tar.xz";
+ sha256 = "750110da07a1e316e2a55d043a0e988c91e6e57866b941a5cce1b6f569096f4f";
+ name = "bomber-19.08.1.tar.xz";
};
};
bovo = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/bovo-19.04.1.tar.xz";
- sha256 = "46b5286349ba7765b81edf92f834c3e8e5c0ecd65466deb5fa593477e76f0763";
- name = "bovo-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/bovo-19.08.1.tar.xz";
+ sha256 = "0d923b6b0eaf2ffd7a1eca833d1f110cc6fdaade3b11d07e8fa53a244a778658";
+ name = "bovo-19.08.1.tar.xz";
};
};
calendarsupport = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/calendarsupport-19.04.1.tar.xz";
- sha256 = "9b44e868a24494c3ce595dc71e8981f97a8ce75dc4646e1417ebde973ee5f535";
- name = "calendarsupport-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/calendarsupport-19.08.1.tar.xz";
+ sha256 = "74d1b19a924f2aad7f5a034a7e3b11f2ed5bb94cd21458f0255a64ac6163de97";
+ name = "calendarsupport-19.08.1.tar.xz";
};
};
cantor = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/cantor-19.04.1.tar.xz";
- sha256 = "95ce049f38182f9c0f7fb749c0940c24a51cc88053d218148ac82e925d9dfbb1";
- name = "cantor-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/cantor-19.08.1.tar.xz";
+ sha256 = "93b43426c3383718e6ff7b62f073e3c39371a519b98e890c2b7c15cb5086c039";
+ name = "cantor-19.08.1.tar.xz";
};
};
cervisia = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/cervisia-19.04.1.tar.xz";
- sha256 = "fe72361330b055922e4ae66edb2e6958897b7c443ab3066ab7bbef1b8fd9d41b";
- name = "cervisia-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/cervisia-19.08.1.tar.xz";
+ sha256 = "726c8d4bd942280e08891e15e47d0a0a88ee951addb3c10e1e9955fad2794b7f";
+ name = "cervisia-19.08.1.tar.xz";
};
};
dolphin = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/dolphin-19.04.1.tar.xz";
- sha256 = "72cab4d9f49ac05d3e0e8e1ff67cf29c0cacbe2c3a43506eca4c849ea878370a";
- name = "dolphin-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/dolphin-19.08.1.tar.xz";
+ sha256 = "a612dac0cf50301af46ad5fa29aad630bb33a8a4bd416a4d6023b65fb00f25cc";
+ name = "dolphin-19.08.1.tar.xz";
};
};
dolphin-plugins = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/dolphin-plugins-19.04.1.tar.xz";
- sha256 = "dc528e93d3f7809b8480da5134ead3886205a172a85b25ffdd5720ec67892105";
- name = "dolphin-plugins-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/dolphin-plugins-19.08.1.tar.xz";
+ sha256 = "ce2452d9f878dfcff45739ff9eb4a3bde69c449c36182dee6b768f362e75ae2e";
+ name = "dolphin-plugins-19.08.1.tar.xz";
};
};
dragon = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/dragon-19.04.1.tar.xz";
- sha256 = "f8acfc09aeec180850345f8881f963c19a3956cd7e07e42463bbe95ff2227ab8";
- name = "dragon-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/dragon-19.08.1.tar.xz";
+ sha256 = "b015dbba4b8278a4987164f12a9d9e42745d2eb1772da8b8b0c849b28ba03c90";
+ name = "dragon-19.08.1.tar.xz";
};
};
eventviews = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/eventviews-19.04.1.tar.xz";
- sha256 = "1fae8263d17a802393e5b1ece80879b66303f4d5bc8cc040cf142d6d5e8cc763";
- name = "eventviews-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/eventviews-19.08.1.tar.xz";
+ sha256 = "a44d82e774017171f2eef3ef94b3c5b2765ce08fab5eec0a87b286fd5ea815f7";
+ name = "eventviews-19.08.1.tar.xz";
};
};
ffmpegthumbs = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ffmpegthumbs-19.04.1.tar.xz";
- sha256 = "76f912f09c01698ed020bce2109f7cb893a9ca3ca7c014b118c0f97b4b4982ae";
- name = "ffmpegthumbs-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ffmpegthumbs-19.08.1.tar.xz";
+ sha256 = "527ef798db833e71e2faf315fc89596716bd2bd7d11c78bc1bb2ef9b1549a71b";
+ name = "ffmpegthumbs-19.08.1.tar.xz";
};
};
filelight = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/filelight-19.04.1.tar.xz";
- sha256 = "7595efbff5cbbe59b3fc4f6af69b9557107bc8661f38951577947503ac7883bd";
- name = "filelight-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/filelight-19.08.1.tar.xz";
+ sha256 = "170e633e0d2f8c9b13cccfd5957590100be435f9e7258e84c6f15fabc636768e";
+ name = "filelight-19.08.1.tar.xz";
};
};
granatier = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/granatier-19.04.1.tar.xz";
- sha256 = "372dd577805457425bb9c35b5f434089aa2bb7c1e6f54908b2be60d4dda2cb22";
- name = "granatier-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/granatier-19.08.1.tar.xz";
+ sha256 = "3015a25f961ae3d746db2814a322bfb204e4e39cd95145fbf2aa819f1dc0417e";
+ name = "granatier-19.08.1.tar.xz";
};
};
grantlee-editor = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/grantlee-editor-19.04.1.tar.xz";
- sha256 = "b07f3c3179010b1d9a9170bc6e2b85517c3dfbd277336316882f4503823e076a";
- name = "grantlee-editor-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/grantlee-editor-19.08.1.tar.xz";
+ sha256 = "77661ac1d125349cd3439d130164ad172f0022376d6c6038c860c0440939e52c";
+ name = "grantlee-editor-19.08.1.tar.xz";
};
};
grantleetheme = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/grantleetheme-19.04.1.tar.xz";
- sha256 = "fdcf77c996123daea0559cc2ac4251b330e2c4388104ee95f814af770fc33d8b";
- name = "grantleetheme-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/grantleetheme-19.08.1.tar.xz";
+ sha256 = "61ec8f4902573727d5a292ba55c3663b267d3b1b8017c003ac3445164c2627cb";
+ name = "grantleetheme-19.08.1.tar.xz";
};
};
gwenview = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/gwenview-19.04.1.tar.xz";
- sha256 = "636498100284be86194d328c40ed70166cc96a5fc7665090e4a1ca9538b2f13c";
- name = "gwenview-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/gwenview-19.08.1.tar.xz";
+ sha256 = "1ed46507ea30c43e4672b51996ac413683a863978999be91a9df135f9369f3cb";
+ name = "gwenview-19.08.1.tar.xz";
};
};
incidenceeditor = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/incidenceeditor-19.04.1.tar.xz";
- sha256 = "f0f5191e4246068fb941fde10df87b76b5ca1d6f491d864e4b7e4acacebcae58";
- name = "incidenceeditor-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/incidenceeditor-19.08.1.tar.xz";
+ sha256 = "591781da9b3bc4b0f366ffa8de658aa31f48e1f435a434669b7c11b5f3a55403";
+ name = "incidenceeditor-19.08.1.tar.xz";
};
};
juk = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/juk-19.04.1.tar.xz";
- sha256 = "f141c0e33eccd931438a1b1fe37810951ab177b3fe853d6dd387f28f59382e51";
- name = "juk-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/juk-19.08.1.tar.xz";
+ sha256 = "f91de1fa697fba3fe73a086b0f3c254959fbceb769d3752353ee2078b86611f9";
+ name = "juk-19.08.1.tar.xz";
};
};
k3b = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/k3b-19.04.1.tar.xz";
- sha256 = "8de611bec14deee5b5c2b340fa4b32d22a7df93a72b657979118b510396f0942";
- name = "k3b-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/k3b-19.08.1.tar.xz";
+ sha256 = "8995f39457932fb6597f0f6124e0dfe09ecb2a25a6ec8506ce3ef870da293749";
+ name = "k3b-19.08.1.tar.xz";
};
};
kaccounts-integration = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kaccounts-integration-19.04.1.tar.xz";
- sha256 = "0e37dc9b7b1520ea16afc7209da3cbaab1d43c3909896eba2f0422fb23f15433";
- name = "kaccounts-integration-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kaccounts-integration-19.08.1.tar.xz";
+ sha256 = "7436bb0c8e024122d7137971749ef975878dee557befa4b95bc02ce0801a8450";
+ name = "kaccounts-integration-19.08.1.tar.xz";
};
};
kaccounts-providers = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kaccounts-providers-19.04.1.tar.xz";
- sha256 = "006ccdc20738b8f77155e849b83987b9c9eeb50acf4e88d2fb948060c5f51011";
- name = "kaccounts-providers-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kaccounts-providers-19.08.1.tar.xz";
+ sha256 = "ce885be3c0d59b7f65373fbadc8ff4510998f9067d3a7c96dc1eb05df78b071b";
+ name = "kaccounts-providers-19.08.1.tar.xz";
};
};
kaddressbook = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kaddressbook-19.04.1.tar.xz";
- sha256 = "15e84e6785e20e4f48020c093555e6c28930fcd946aa3421c56956564eba84fd";
- name = "kaddressbook-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kaddressbook-19.08.1.tar.xz";
+ sha256 = "8091a3bd77ec17757386d71a98a0ef2b6d68e35ca2f9f9b71e4e36c2a3cce5c9";
+ name = "kaddressbook-19.08.1.tar.xz";
};
};
kajongg = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kajongg-19.04.1.tar.xz";
- sha256 = "5139ec428d4951b8e3dca8d30134002bc06b186c5c63c69831b3a98b49198475";
- name = "kajongg-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kajongg-19.08.1.tar.xz";
+ sha256 = "ae40b7ceb7c591f8d92371e3c7584eeae0d84e4680927834eca7ffacd5b9bbf6";
+ name = "kajongg-19.08.1.tar.xz";
};
};
kalarm = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kalarm-19.04.1.tar.xz";
- sha256 = "e8a58584e765c1d98beb4b6bcac0ab835dcb1f1c1bab8cf1c01fa01a2a56bbfd";
- name = "kalarm-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kalarm-19.08.1.tar.xz";
+ sha256 = "9eb7c6b160e82ae8d5d294ebd781ef2ac5579e556a564c70598c08925e2021fa";
+ name = "kalarm-19.08.1.tar.xz";
};
};
kalarmcal = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kalarmcal-19.04.1.tar.xz";
- sha256 = "69a265ad7e82034974a47c795b81ee8768873dcb76018dc794a9905365111646";
- name = "kalarmcal-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kalarmcal-19.08.1.tar.xz";
+ sha256 = "add9ee09287491236c9a25cfcb32d437845d094d8fef3682954f561dc2917984";
+ name = "kalarmcal-19.08.1.tar.xz";
};
};
kalgebra = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kalgebra-19.04.1.tar.xz";
- sha256 = "689d65f1a62623fc67d5de0a551aef03b241d85b105f31e91bd873d3b818c74f";
- name = "kalgebra-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kalgebra-19.08.1.tar.xz";
+ sha256 = "c9859e0b2b847652007a3244bc658f7e160fe88fc70ea7da6e60f003f54f46c9";
+ name = "kalgebra-19.08.1.tar.xz";
};
};
kalzium = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kalzium-19.04.1.tar.xz";
- sha256 = "80798b3dca98cdd5ae24bbe7f077ecbe8def6bb96ad02a66ff69cb5312a459f5";
- name = "kalzium-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kalzium-19.08.1.tar.xz";
+ sha256 = "2519866172476bec297e9d02ff917b1c676b980edc2f20a9c3297bc255e045f0";
+ name = "kalzium-19.08.1.tar.xz";
};
};
kamera = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kamera-19.04.1.tar.xz";
- sha256 = "3d5f97ac4b454c1512762f4039003d5745372aafa4fda4f293bda885ee70984f";
- name = "kamera-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kamera-19.08.1.tar.xz";
+ sha256 = "109a030ef55b941758e8d4a58b2abed4c5e1bb7e13e8d239b7132867c801acf5";
+ name = "kamera-19.08.1.tar.xz";
};
};
kamoso = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kamoso-19.04.1.tar.xz";
- sha256 = "72f31d26319aed86daf200db7cc0bbe1e6ad77d891b644001ffd4c992a68e796";
- name = "kamoso-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kamoso-19.08.1.tar.xz";
+ sha256 = "76d7a9ea70646f8e86e912b72bd9f9ab42711f0cd53c7bed1403a274de036675";
+ name = "kamoso-19.08.1.tar.xz";
};
};
kanagram = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kanagram-19.04.1.tar.xz";
- sha256 = "70b0f7b20f2ebd951e3a10097990f9232cd1e3e6c11441d93513d435a7cb7f38";
- name = "kanagram-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kanagram-19.08.1.tar.xz";
+ sha256 = "85ba60dc1485f61054847262832edd112224a618effe8759a2dcc8ee73b130a6";
+ name = "kanagram-19.08.1.tar.xz";
};
};
kapman = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kapman-19.04.1.tar.xz";
- sha256 = "7714a0cbd8e24f3ce46679d1f16d690c8bc62a988f0b3175095e0f0c23ce1400";
- name = "kapman-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kapman-19.08.1.tar.xz";
+ sha256 = "e80057b4fa9b8af86ecae30871005d4c7508bbc99618cf36dcf1c9c7fa905321";
+ name = "kapman-19.08.1.tar.xz";
};
};
kapptemplate = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kapptemplate-19.04.1.tar.xz";
- sha256 = "5985705081aa94d282d173277e5717eede6f923eef4ed2d99182c46fbd1c9fd3";
- name = "kapptemplate-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kapptemplate-19.08.1.tar.xz";
+ sha256 = "c1e5d239ce3749e72bcce30dfc8c0a12c3d347b72a2566caa0d23dcc930499a2";
+ name = "kapptemplate-19.08.1.tar.xz";
};
};
kate = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kate-19.04.1.tar.xz";
- sha256 = "af55513f00af1712a39631352e393dbd2f63ec6bd471831b44853a16d4bfbe8f";
- name = "kate-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kate-19.08.1.tar.xz";
+ sha256 = "5389e1620a7eb8d7bab7396ee0db1a886fbdd44c8415291db6a917e89dcc77b7";
+ name = "kate-19.08.1.tar.xz";
};
};
katomic = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/katomic-19.04.1.tar.xz";
- sha256 = "2addfb86ec0043ab81046d64862e8fbeb3b4dd3b8d18f618ac8c39d995a05ce5";
- name = "katomic-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/katomic-19.08.1.tar.xz";
+ sha256 = "05453f2a1cba1a9bb7c558e9628361685d9b9b44fc4d65599eb05fec6ca3bd5d";
+ name = "katomic-19.08.1.tar.xz";
};
};
kbackup = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kbackup-19.04.1.tar.xz";
- sha256 = "29bed4258ec218edf05702808d0cfbff757016b7f3a80eb99e18610ab398036f";
- name = "kbackup-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kbackup-19.08.1.tar.xz";
+ sha256 = "93ec83cdb8cb1ad28f444f85aaec2270fbbf3108b3ce0cf22f42a737e0f9cc59";
+ name = "kbackup-19.08.1.tar.xz";
};
};
kblackbox = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kblackbox-19.04.1.tar.xz";
- sha256 = "9b5d57d0058c2458b7e24bd885d164cc1523d0c45827082e55af6ce669992431";
- name = "kblackbox-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kblackbox-19.08.1.tar.xz";
+ sha256 = "478b235e9498e9c5bf1c3626db651c85cf41bdd824dec484bccd38f6e73ffcc7";
+ name = "kblackbox-19.08.1.tar.xz";
};
};
kblocks = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kblocks-19.04.1.tar.xz";
- sha256 = "0ae62f1aa9aeaa58f6e5fd62d6281159ef8a2bbee28d84b9d7a2ab207ec95390";
- name = "kblocks-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kblocks-19.08.1.tar.xz";
+ sha256 = "15afc3b7083fc1ea08d6caa196d883a6ec7f9603302b5774c7ad97eea833f449";
+ name = "kblocks-19.08.1.tar.xz";
};
};
kblog = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kblog-19.04.1.tar.xz";
- sha256 = "6c162cd25a67c4fddbdc1063942fdfad1bbb239c714f205ae4f89585c2f65e93";
- name = "kblog-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kblog-19.08.1.tar.xz";
+ sha256 = "e1926ebfb352f6b8c35963fdece240b03be8d3ec094cee46ba694e2869c85cae";
+ name = "kblog-19.08.1.tar.xz";
};
};
kbounce = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kbounce-19.04.1.tar.xz";
- sha256 = "729662f29e1b5b17b775bfa6895088cf3a7ee4ce3d4f2bc3db4f69ab0f07ca12";
- name = "kbounce-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kbounce-19.08.1.tar.xz";
+ sha256 = "e3d67ab3fac471b07a45abbcd78d02912392ad3f25e9d48b70a050bfda4a5fb0";
+ name = "kbounce-19.08.1.tar.xz";
};
};
kbreakout = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kbreakout-19.04.1.tar.xz";
- sha256 = "9f40bb1c2d2e29a1098e371ffd0e97595d8e23cc7af2111fd143b67fac1393ad";
- name = "kbreakout-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kbreakout-19.08.1.tar.xz";
+ sha256 = "1f086f6794b40c6054f0c00d7fbebecea845f2ee7e7e3253efe33942f4ebe19e";
+ name = "kbreakout-19.08.1.tar.xz";
};
};
kbruch = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kbruch-19.04.1.tar.xz";
- sha256 = "ab9033b6b8758803a87f046d05c9f6a5d247d1929bad147628cb6c2e5ba65b00";
- name = "kbruch-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kbruch-19.08.1.tar.xz";
+ sha256 = "74b387e6eafc5fac8b7a75df6f8d61a2b4b0380a82b5c43f3a10c9b75855318f";
+ name = "kbruch-19.08.1.tar.xz";
};
};
kcachegrind = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kcachegrind-19.04.1.tar.xz";
- sha256 = "4b862becaa415601dc33391814637d8f089f2e2732192111ec029beb89991ac2";
- name = "kcachegrind-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kcachegrind-19.08.1.tar.xz";
+ sha256 = "e677f82e5527caecb0cdacad3f001665c40ba9e6a542a6a4d91fb898b45026c1";
+ name = "kcachegrind-19.08.1.tar.xz";
};
};
kcalc = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kcalc-19.04.1.tar.xz";
- sha256 = "46d992a9e746231b57398b9bcdbe3933f6601e3cee7e3932ccc2e312779a4c91";
- name = "kcalc-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kcalc-19.08.1.tar.xz";
+ sha256 = "7b3c110a97b851e8db03302484cadc59a59ec8378501ee61dd094ac2c7caa203";
+ name = "kcalc-19.08.1.tar.xz";
};
};
kcalcore = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kcalcore-19.04.1.tar.xz";
- sha256 = "d14bf2f8270c0072e415cf8fe87c0fb8eefad1b95a8713e184bba3e3ae6002f9";
- name = "kcalcore-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kcalcore-19.08.1.tar.xz";
+ sha256 = "8c1bbd8e7673907de2c3682cbc1c4fe4a165cbe0b9a2fe399c4b0ae73894228a";
+ name = "kcalcore-19.08.1.tar.xz";
};
};
kcalutils = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kcalutils-19.04.1.tar.xz";
- sha256 = "8856a1e812f81848f1e2adc179182349acfac9e189b55f29afeb020c148909ec";
- name = "kcalutils-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kcalutils-19.08.1.tar.xz";
+ sha256 = "b0f17fd7ced68d03666038ee97e6ca96bd504fc8b7f0ae9b53443cefb57558d7";
+ name = "kcalutils-19.08.1.tar.xz";
};
};
kcharselect = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kcharselect-19.04.1.tar.xz";
- sha256 = "c54570a6f968b2ccbe42c0a8dbaecb1f263fbd392f67b2d735ade492553ff9ec";
- name = "kcharselect-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kcharselect-19.08.1.tar.xz";
+ sha256 = "8b5c418e9b35a12eeaa1ebf7834f2a13613926e824699e13214fe35276c42457";
+ name = "kcharselect-19.08.1.tar.xz";
};
};
kcolorchooser = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kcolorchooser-19.04.1.tar.xz";
- sha256 = "bfc2cdafd709d8829e19367151f59725152af2f4a80c583df671a9df1378e57a";
- name = "kcolorchooser-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kcolorchooser-19.08.1.tar.xz";
+ sha256 = "a36cccbbf5dda16c0d97bff2ce415e678481fee5c2a7640b2c2db2f0ea7c70cb";
+ name = "kcolorchooser-19.08.1.tar.xz";
};
};
kcontacts = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kcontacts-19.04.1.tar.xz";
- sha256 = "1773a5ddcec46dbf72cef2bbcc8c3143a0ba18ce6fa462ba642011b36b9cc088";
- name = "kcontacts-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kcontacts-19.08.1.tar.xz";
+ sha256 = "020177eb155d3df44314e89da1824916d125aab48131fce76c2131b40eae8f39";
+ name = "kcontacts-19.08.1.tar.xz";
};
};
kcron = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kcron-19.04.1.tar.xz";
- sha256 = "a58e8c99072e10a0b0a6acfecbbadef822c6f2818202bbaccdbee6b2a5b7e951";
- name = "kcron-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kcron-19.08.1.tar.xz";
+ sha256 = "e60eb14cb2aef0b0398088930102d68817c96a83c54895af6626693fc18c7ed9";
+ name = "kcron-19.08.1.tar.xz";
};
};
kdav = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kdav-19.04.1.tar.xz";
- sha256 = "356e59f904f075521df60499b7f84d7868dbb78968b04fd15be6d359c154e737";
- name = "kdav-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kdav-19.08.1.tar.xz";
+ sha256 = "38f34f39e165ba3a843acbc9efc3296c111a6bfa8c5ba23e1f55f98860b84d41";
+ name = "kdav-19.08.1.tar.xz";
};
};
kdebugsettings = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kdebugsettings-19.04.1.tar.xz";
- sha256 = "f04334f954d48fbd5a7bf41327563081966fb31950c131a943cf0a1a86281aa2";
- name = "kdebugsettings-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kdebugsettings-19.08.1.tar.xz";
+ sha256 = "4195a000558b56d849eb6e79880c5140fc30cd8b0657d4a9932035434f4c2649";
+ name = "kdebugsettings-19.08.1.tar.xz";
};
};
kde-dev-scripts = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kde-dev-scripts-19.04.1.tar.xz";
- sha256 = "aa039d08b0e151703b6be0571d254d3656589d0b8422214110c460bd1f2aa6c2";
- name = "kde-dev-scripts-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kde-dev-scripts-19.08.1.tar.xz";
+ sha256 = "36af795eaa175f142556949fa4cc678a6d3fdad3607d169877d94bea785850d1";
+ name = "kde-dev-scripts-19.08.1.tar.xz";
};
};
kde-dev-utils = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kde-dev-utils-19.04.1.tar.xz";
- sha256 = "9bca818e44f80ece758c0430aebcaf56252bbdffed6c8f65d04ccb4d019f2d9b";
- name = "kde-dev-utils-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kde-dev-utils-19.08.1.tar.xz";
+ sha256 = "c529bb33dbd3b80e5c4737c3be0d17e88901ece48d3b19e61c8c14adab60177c";
+ name = "kde-dev-utils-19.08.1.tar.xz";
};
};
kdeedu-data = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kdeedu-data-19.04.1.tar.xz";
- sha256 = "751ec4df18d4ec3e7498a279bb891d6eb9a835fd786c8dd77ee883c9b55a0c30";
- name = "kdeedu-data-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kdeedu-data-19.08.1.tar.xz";
+ sha256 = "107dff744219210c732aa007d97c8c8d8e87cff5cd446d987b8ac2600ea1f1b7";
+ name = "kdeedu-data-19.08.1.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kdegraphics-mobipocket-19.04.1.tar.xz";
- sha256 = "345be42b0fb4f2040ce1430c872c0d20b0abaa266159a19beac1b067b2723821";
- name = "kdegraphics-mobipocket-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kdegraphics-mobipocket-19.08.1.tar.xz";
+ sha256 = "b1760e3a22869715881f571c0bc79c1b91876e41f508a5ba53659be774a6628c";
+ name = "kdegraphics-mobipocket-19.08.1.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kdegraphics-thumbnailers-19.04.1.tar.xz";
- sha256 = "e82515177c1c465c1d499095ff51d71caf286505a0fd3b9bfd2f1cdc1744706e";
- name = "kdegraphics-thumbnailers-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kdegraphics-thumbnailers-19.08.1.tar.xz";
+ sha256 = "86a81ff786168778cbe0ad7c185320dbf052b1df2e6269f14323df04b48ed2ff";
+ name = "kdegraphics-thumbnailers-19.08.1.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kdenetwork-filesharing-19.04.1.tar.xz";
- sha256 = "5f3ae681f58a9877c7133778ff44c7be2a96cf26afbff10465984dae033251bd";
- name = "kdenetwork-filesharing-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kdenetwork-filesharing-19.08.1.tar.xz";
+ sha256 = "b7d229d06926ad53dcffd4508fde70060260a03cdfc6b59551f5ea551274bdac";
+ name = "kdenetwork-filesharing-19.08.1.tar.xz";
};
};
kdenlive = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kdenlive-19.04.1.tar.xz";
- sha256 = "feb3202ee1aa0f47acc12ad7d6ca78977a4c9af0d705f8792ca2f8e3e6defbe5";
- name = "kdenlive-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kdenlive-19.08.1.tar.xz";
+ sha256 = "0d19c0d24e16518fd3b57eddffeb7d004723942889bd62e869749f02a1dcc036";
+ name = "kdenlive-19.08.1.tar.xz";
};
};
kdepim-addons = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kdepim-addons-19.04.1.tar.xz";
- sha256 = "d4e36a6d0043ad0ed5e3c427559bfaa29523578f99b613c82c3aaef16b2a7882";
- name = "kdepim-addons-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kdepim-addons-19.08.1.tar.xz";
+ sha256 = "eff8e21ae66bf99a33c946886e7d84f5d717b123b06f86e891c9528858b9ec32";
+ name = "kdepim-addons-19.08.1.tar.xz";
};
};
kdepim-apps-libs = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kdepim-apps-libs-19.04.1.tar.xz";
- sha256 = "c3530a810a1eddfa06a27f24b723f971e7e2e144bbb2dac7ff30e7dec948a15d";
- name = "kdepim-apps-libs-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kdepim-apps-libs-19.08.1.tar.xz";
+ sha256 = "40a265cde8770a3fd6181b656da49d460dc67ed06d175067da0092116cd9862e";
+ name = "kdepim-apps-libs-19.08.1.tar.xz";
};
};
kdepim-runtime = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kdepim-runtime-19.04.1.tar.xz";
- sha256 = "1587eca5a206768917443bd5274c03d8cbb2cbc6dcbe60449110c326b1aa0744";
- name = "kdepim-runtime-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kdepim-runtime-19.08.1.tar.xz";
+ sha256 = "d7dd6c0108f6c7a37dc1ac0d7b9449664c76ecd3ca4f303f3a1b214862a4b20e";
+ name = "kdepim-runtime-19.08.1.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kdesdk-kioslaves-19.04.1.tar.xz";
- sha256 = "80bbbdc91bc6a2b0c47a47044fdb2e107b89c63dd358b694c1c3f8e7cd1bbb16";
- name = "kdesdk-kioslaves-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kdesdk-kioslaves-19.08.1.tar.xz";
+ sha256 = "4bf6d32a33f53b7668313d0e5be81568934b8309f86c9554b25e9346344b2051";
+ name = "kdesdk-kioslaves-19.08.1.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kdesdk-thumbnailers-19.04.1.tar.xz";
- sha256 = "554d291605ac8827a2a4f6513a2230d9f9b0b8fcd6a37b0acd41c4db81fa3442";
- name = "kdesdk-thumbnailers-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kdesdk-thumbnailers-19.08.1.tar.xz";
+ sha256 = "3da4aa540435fbc848bfc4f1b39f37145072e0856da31b4f5ac3d89719308f03";
+ name = "kdesdk-thumbnailers-19.08.1.tar.xz";
};
};
kdf = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kdf-19.04.1.tar.xz";
- sha256 = "835881e8f829c3c64ca529019f599ce89b95139d502673d5e6fb560a98eedce5";
- name = "kdf-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kdf-19.08.1.tar.xz";
+ sha256 = "2aedb0a4f64d2417728b67e4a289488b59153683d5dd15bca259a64f9c51325e";
+ name = "kdf-19.08.1.tar.xz";
};
};
kdialog = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kdialog-19.04.1.tar.xz";
- sha256 = "48e77dc4827af2445f8ac583bef319b7fd274f9b84a19635bf673801e96b259a";
- name = "kdialog-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kdialog-19.08.1.tar.xz";
+ sha256 = "6b2ed8636d50d13104b0029f33b11943d6f7087297ad089d61c76a57d3b425a0";
+ name = "kdialog-19.08.1.tar.xz";
};
};
kdiamond = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kdiamond-19.04.1.tar.xz";
- sha256 = "a7588f21e7151c1053787f75a17c1062a9c0b43611b824632ed1b8689f4996f3";
- name = "kdiamond-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kdiamond-19.08.1.tar.xz";
+ sha256 = "20280e44742d57508b0a0c4a70f7545bdbacf913300ca35f427801b46c808f8e";
+ name = "kdiamond-19.08.1.tar.xz";
};
};
keditbookmarks = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/keditbookmarks-19.04.1.tar.xz";
- sha256 = "05788d55020f330b52bd8641e47990c90c7585871489993888ce0f40fa1686db";
- name = "keditbookmarks-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/keditbookmarks-19.08.1.tar.xz";
+ sha256 = "f023c7b3d362c19373e3f886300420488ef53835f753c318f9fd9c0bb7e53a8a";
+ name = "keditbookmarks-19.08.1.tar.xz";
};
};
kfind = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kfind-19.04.1.tar.xz";
- sha256 = "496dd642473bfaa881387d2fb3a3507a9bf8c84b8a6874525221b561a50ef9fd";
- name = "kfind-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kfind-19.08.1.tar.xz";
+ sha256 = "a4910d5a3f2b918090084c776ca16bf1e9ae47ced0c2e4eb2a3d0071204527de";
+ name = "kfind-19.08.1.tar.xz";
};
};
kfloppy = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kfloppy-19.04.1.tar.xz";
- sha256 = "bde5c16c679a34aa6c74844caeea5e1746629ac7d35dfac0493e9d8f7d78aa75";
- name = "kfloppy-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kfloppy-19.08.1.tar.xz";
+ sha256 = "c22864e0dfef37ccb9a5329467b9058a14880e88b54c448b5933b57aa98b021b";
+ name = "kfloppy-19.08.1.tar.xz";
};
};
kfourinline = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kfourinline-19.04.1.tar.xz";
- sha256 = "9ba39703ccf64b76a0b9a2705d65b7c6c2067db795cfed298f0e3a2eac48b973";
- name = "kfourinline-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kfourinline-19.08.1.tar.xz";
+ sha256 = "a138908ccb21ab16399edf6a0aa6f95d6197a77dfef9e4ed87c8914ceb8d5b84";
+ name = "kfourinline-19.08.1.tar.xz";
};
};
kgeography = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kgeography-19.04.1.tar.xz";
- sha256 = "44e7297243a2f5ebd6c8e18e3380b7c66b3d085f64952937abf1683ddcb9d502";
- name = "kgeography-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kgeography-19.08.1.tar.xz";
+ sha256 = "c0c04e902626d52118e81da9fc24fbd87d49d0bcf4ad229f83eef8e4f84fb551";
+ name = "kgeography-19.08.1.tar.xz";
};
};
kget = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kget-19.04.1.tar.xz";
- sha256 = "a7dff0134d0ce6643fbde1ddfb73ce7d3300b927373a0907aec510f29d0d1629";
- name = "kget-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kget-19.08.1.tar.xz";
+ sha256 = "ecc9cc31f23304baa8c909335db57460460db27fbffb97438c1ed12703c6b9b9";
+ name = "kget-19.08.1.tar.xz";
};
};
kgoldrunner = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kgoldrunner-19.04.1.tar.xz";
- sha256 = "11db3aecf77b7097b7d3d626dba4a3b4bcd3d5ab02a1e04cf7f6932b0b73a760";
- name = "kgoldrunner-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kgoldrunner-19.08.1.tar.xz";
+ sha256 = "78c284edc000ec3f3f64bcf0d6c92a50f79632804696de676ed149055de7a6f8";
+ name = "kgoldrunner-19.08.1.tar.xz";
};
};
kgpg = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kgpg-19.04.1.tar.xz";
- sha256 = "2c9c64491592db79397be3769413fae657ca991dd45d02690bbe533c1cba0ceb";
- name = "kgpg-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kgpg-19.08.1.tar.xz";
+ sha256 = "441a0bfa58df14bad87f5f446b89113dc20365424f6a87aec30125c9221815c5";
+ name = "kgpg-19.08.1.tar.xz";
};
};
khangman = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/khangman-19.04.1.tar.xz";
- sha256 = "5d35620bc048ecabd21b20cadfa8df07e72f195bdc5b9ad2c7e86e17d27afe27";
- name = "khangman-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/khangman-19.08.1.tar.xz";
+ sha256 = "eb95c48baa57475319f456ee1df11b715e7ceb5b1912e2657a2b1f4617bf2b26";
+ name = "khangman-19.08.1.tar.xz";
};
};
khelpcenter = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/khelpcenter-19.04.1.tar.xz";
- sha256 = "3436502f6fae659b930aa63e5ace088e0982804386cf1b24b042328796549114";
- name = "khelpcenter-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/khelpcenter-19.08.1.tar.xz";
+ sha256 = "ae3243fcdc1281937772a091d902adaba0681abe82c222bf7ef895df0899ab63";
+ name = "khelpcenter-19.08.1.tar.xz";
};
};
kidentitymanagement = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kidentitymanagement-19.04.1.tar.xz";
- sha256 = "5216d26aef0c483f3dff51564e8b1526821b25279d7c5e9c21c87a5d5e20822a";
- name = "kidentitymanagement-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kidentitymanagement-19.08.1.tar.xz";
+ sha256 = "3ff41eddf047fb1074473fd028b22ddd0fb467c062918148305f10c2fd74f42e";
+ name = "kidentitymanagement-19.08.1.tar.xz";
};
};
kig = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kig-19.04.1.tar.xz";
- sha256 = "37684e2d1893c2f3a412add1edd73047d3ae8ff501b035943a9793b94d468a79";
- name = "kig-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kig-19.08.1.tar.xz";
+ sha256 = "8b073fd0310e62483a548ada000b4230f2b70dec8ab11ac8303bd64961829675";
+ name = "kig-19.08.1.tar.xz";
};
};
kigo = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kigo-19.04.1.tar.xz";
- sha256 = "5b5cae565a79309dc23b26acf2f596d36fd62950af58405094e4fa9a38e5e4ad";
- name = "kigo-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kigo-19.08.1.tar.xz";
+ sha256 = "7afc2e08192d7e7bf17d67e00aebc498e37b40b47ce78cb7cf2d943a5563817b";
+ name = "kigo-19.08.1.tar.xz";
};
};
killbots = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/killbots-19.04.1.tar.xz";
- sha256 = "8829dba8a3af320b03e21cd356e53fef0e70c10831ffeb6a70b722dde9877938";
- name = "killbots-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/killbots-19.08.1.tar.xz";
+ sha256 = "16fb2338125d342166e630cf589a346a69874ea1da32c0a3c591d6e17241e05e";
+ name = "killbots-19.08.1.tar.xz";
};
};
kimagemapeditor = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kimagemapeditor-19.04.1.tar.xz";
- sha256 = "d85d2f3d043a29e56f4234ce24dd75545e06c2812d5fe45cafde4c3dbe280533";
- name = "kimagemapeditor-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kimagemapeditor-19.08.1.tar.xz";
+ sha256 = "0baa2f3fa5810ab63d08db2d0223af04407bb14e4bda20ad17dbfb6c63f33b3a";
+ name = "kimagemapeditor-19.08.1.tar.xz";
};
};
kimap = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kimap-19.04.1.tar.xz";
- sha256 = "ff933fba7ce8412fd64439e5f4c5a7be3a06fd39c79f520acfc648923819aa1f";
- name = "kimap-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kimap-19.08.1.tar.xz";
+ sha256 = "a4fde0c17fcdbc672b8e7ad6ed727e18b6bc2cc3c7f23857a6b1455d99999bbf";
+ name = "kimap-19.08.1.tar.xz";
};
};
kio-extras = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kio-extras-19.04.1.tar.xz";
- sha256 = "ddf389a50142211566124ba902bb9f6b2988b1b94fefed7620a6ec421e3ff0bd";
- name = "kio-extras-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kio-extras-19.08.1.tar.xz";
+ sha256 = "de0ba7f3ce73db34b878cb88e36711d6b31aad57a5a735744330f92920666c52";
+ name = "kio-extras-19.08.1.tar.xz";
+ };
+ };
+ kipi-plugins = {
+ version = "19.08.1";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/19.08.1/src/kipi-plugins-19.08.1.tar.xz";
+ sha256 = "6cc8fdc47fbfa5d8b4f9aeb4d82b5f1c9779a300cffbc17f8776dcb2ed61f0e4";
+ name = "kipi-plugins-19.08.1.tar.xz";
};
};
kirigami-gallery = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kirigami-gallery-19.04.1.tar.xz";
- sha256 = "ed7390a015a77f8285b4db4185533fa327a142a191c27afa7c2ce963ae6ad7e2";
- name = "kirigami-gallery-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kirigami-gallery-19.08.1.tar.xz";
+ sha256 = "b981b26fb268448f20077f3e69b3e12f45de91289f5b2026c618cdbff9ec5241";
+ name = "kirigami-gallery-19.08.1.tar.xz";
};
};
kiriki = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kiriki-19.04.1.tar.xz";
- sha256 = "131c6b5bd8f2b014a28bd5cb9985111f63991974b672dcfbc0266d32f069954b";
- name = "kiriki-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kiriki-19.08.1.tar.xz";
+ sha256 = "ca22215394b7ea172cd1c5eef301871df2526a321b4f3c6b1aa042d4f15abf7c";
+ name = "kiriki-19.08.1.tar.xz";
};
};
kiten = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kiten-19.04.1.tar.xz";
- sha256 = "be904abd0386a9ac6d622178f37e55d5a05f5eaa31c6a5cd661959ee4b03d2d4";
- name = "kiten-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kiten-19.08.1.tar.xz";
+ sha256 = "01e963fd76c87a631bb5a4f86bc8be624907571c60368e6bf5bdce55cff6b59a";
+ name = "kiten-19.08.1.tar.xz";
};
};
kitinerary = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kitinerary-19.04.1.tar.xz";
- sha256 = "4053e16e847f0e234ffba2bb0533e947eae7b315304677a784279d03f13c0318";
- name = "kitinerary-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kitinerary-19.08.1.tar.xz";
+ sha256 = "f84dafa874c958b335ee80dbe85dce3605b40b83ac9468e6555250da8f480967";
+ name = "kitinerary-19.08.1.tar.xz";
};
};
kjumpingcube = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kjumpingcube-19.04.1.tar.xz";
- sha256 = "13d6a138e09c9088ce38fe9a124bd600386dc097b929f6f85416bc1da0012ab1";
- name = "kjumpingcube-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kjumpingcube-19.08.1.tar.xz";
+ sha256 = "18c7bc9ab96308a4b874226f92f15da38cbb293372fdae8deec45029d6d31f20";
+ name = "kjumpingcube-19.08.1.tar.xz";
};
};
kldap = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kldap-19.04.1.tar.xz";
- sha256 = "638e62d39fbe935b1df3c03f9617acbe5ade4ad617245bc590ca07b7fd0b723b";
- name = "kldap-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kldap-19.08.1.tar.xz";
+ sha256 = "b6fb822df67449870fb5c0bfe1adb1bd3d44535e3f2186ef6be286e4a590bd54";
+ name = "kldap-19.08.1.tar.xz";
};
};
kleopatra = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kleopatra-19.04.1.tar.xz";
- sha256 = "bc8895a506164df0fa0f7fc317fe8b961cb75d8c67f04474e1c12e25be358c67";
- name = "kleopatra-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kleopatra-19.08.1.tar.xz";
+ sha256 = "ef63fbe1a24a24b8c6b491fe19e0bebd9518a2e1340a9dfee7215eb3740369c7";
+ name = "kleopatra-19.08.1.tar.xz";
};
};
klettres = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/klettres-19.04.1.tar.xz";
- sha256 = "d0db0773513fa35d1224e90cf5b09ac75b7b8f559d1080ee6026ba74df0f0847";
- name = "klettres-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/klettres-19.08.1.tar.xz";
+ sha256 = "9d9616e35f2b82e39916b89a049bee4faca5a4235eb22989c9e8485c7e75239b";
+ name = "klettres-19.08.1.tar.xz";
};
};
klickety = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/klickety-19.04.1.tar.xz";
- sha256 = "d4ae4d002f008200a6ce920f2aff6841d9ad58b22c392d7eefac7867b32340af";
- name = "klickety-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/klickety-19.08.1.tar.xz";
+ sha256 = "cb12f79123e96920b323e752b057f21942aba0844d79e310ad343bda0108b273";
+ name = "klickety-19.08.1.tar.xz";
};
};
klines = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/klines-19.04.1.tar.xz";
- sha256 = "2ca4ad74fefa87bbf3a38ea90b55025ab8554bfdc47d7e4323e0906e9e1c8962";
- name = "klines-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/klines-19.08.1.tar.xz";
+ sha256 = "e8ac5d344c6b9e6d8a9fa9a0fe7da5ebdceec049fbdc8ff476604a0760877aab";
+ name = "klines-19.08.1.tar.xz";
};
};
kmag = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kmag-19.04.1.tar.xz";
- sha256 = "aa5ec91dcffc1a2f1037332aeacb096ab55388624c844c7fa311ca38a5e40874";
- name = "kmag-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kmag-19.08.1.tar.xz";
+ sha256 = "28504935665df18246cc6db4288dc2b33f24ed7114007df008f4310ce8792ceb";
+ name = "kmag-19.08.1.tar.xz";
};
};
kmahjongg = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kmahjongg-19.04.1.tar.xz";
- sha256 = "75dbcfb5747530a3b69574fdc87b532067516415f962e7943feef97549237c99";
- name = "kmahjongg-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kmahjongg-19.08.1.tar.xz";
+ sha256 = "621e30ce5d76ab9f8736cfe13a076501c8822d7d1402d195bfe12c21ffa507c3";
+ name = "kmahjongg-19.08.1.tar.xz";
};
};
kmail = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kmail-19.04.1.tar.xz";
- sha256 = "62fcd78318d35848e5ae461f7ebd3b6f202c57c51008c71d7e2a1d1c3d58f2c5";
- name = "kmail-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kmail-19.08.1.tar.xz";
+ sha256 = "4deb5d7c5304c0856fbbafeb7bf09436e28782b96dc5ec342a09b2c26ea386c0";
+ name = "kmail-19.08.1.tar.xz";
};
};
kmail-account-wizard = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kmail-account-wizard-19.04.1.tar.xz";
- sha256 = "c6714c425daa3d79dfb47b5d18cff26b10b1b087e4472f627738494f06d04ab8";
- name = "kmail-account-wizard-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kmail-account-wizard-19.08.1.tar.xz";
+ sha256 = "b4f2f769b44845dd02632ce282fc740a35f7f784e9fb54091153365ee88fb864";
+ name = "kmail-account-wizard-19.08.1.tar.xz";
};
};
kmailtransport = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kmailtransport-19.04.1.tar.xz";
- sha256 = "b8c0cf5cb8f7ad93bb3d1b2adab68fbc2470bc14160650fb45d1c4d40e8549fa";
- name = "kmailtransport-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kmailtransport-19.08.1.tar.xz";
+ sha256 = "521bcfd334a0e7e4986e6cebff3bae4095175a11fd45f777da673f1460d733da";
+ name = "kmailtransport-19.08.1.tar.xz";
};
};
kmbox = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kmbox-19.04.1.tar.xz";
- sha256 = "701eda3a4831ed0daf9bd14a93ff845f42e4f93c6ca16d83ebda958c27021fc0";
- name = "kmbox-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kmbox-19.08.1.tar.xz";
+ sha256 = "5fa59ffd16df1ae28f7ebf026f67df708c5b84e54e1ab47fd5de957c5b8fc75e";
+ name = "kmbox-19.08.1.tar.xz";
};
};
kmime = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kmime-19.04.1.tar.xz";
- sha256 = "25ee2e49ea62d32fcd09a710f971c6fcdc5434c6fdf711e93c19fc4baa325775";
- name = "kmime-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kmime-19.08.1.tar.xz";
+ sha256 = "e8693458734f11a9d33a4d761f2b5ccae8f9ed87bb1e9dfc97f4bd0fa7089557";
+ name = "kmime-19.08.1.tar.xz";
};
};
kmines = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kmines-19.04.1.tar.xz";
- sha256 = "98a3860113a51e215a42791e3eb845978cda51fb5001b8e8bb41fe9182765d12";
- name = "kmines-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kmines-19.08.1.tar.xz";
+ sha256 = "8aedc9eeb3426a394a6e048508f700d466c18b262a9b98e01eff379a8d6003fb";
+ name = "kmines-19.08.1.tar.xz";
};
};
kmix = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kmix-19.04.1.tar.xz";
- sha256 = "ca02ed8db5e4a3a58622b10668efb4c4a828de584b9f57116fee802e136352ea";
- name = "kmix-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kmix-19.08.1.tar.xz";
+ sha256 = "a6006ab35bdfc2896188aa99ba50f1b28e8d5172ec8a1068efb15a50c43f87a7";
+ name = "kmix-19.08.1.tar.xz";
};
};
kmousetool = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kmousetool-19.04.1.tar.xz";
- sha256 = "fd0fcebda4d7303a9c6f1117c08e091d96bfddf92a64e1cde2dc6b555daa0624";
- name = "kmousetool-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kmousetool-19.08.1.tar.xz";
+ sha256 = "d9a3164a0709fa0d2fc3e30ade2bd42c86fb73c7cf4adc341dd7e11e686f7956";
+ name = "kmousetool-19.08.1.tar.xz";
};
};
kmouth = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kmouth-19.04.1.tar.xz";
- sha256 = "9a8d0f9b1f09f1363d38b2a942ffe515521ffc410f869ed1a875ff1059ef8068";
- name = "kmouth-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kmouth-19.08.1.tar.xz";
+ sha256 = "531b7b3716fea8c679c5c39c7c04214cb561430182747ce08a9854a76105821e";
+ name = "kmouth-19.08.1.tar.xz";
};
};
kmplot = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kmplot-19.04.1.tar.xz";
- sha256 = "c2e0855182d1ab0977b96669999976fb84c2f4b2645fcee0cb35b839bc1da206";
- name = "kmplot-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kmplot-19.08.1.tar.xz";
+ sha256 = "7797dc95f64738b918cb19481bc74cebd1f66b5a537592bb53e98e1715701fe2";
+ name = "kmplot-19.08.1.tar.xz";
};
};
knavalbattle = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/knavalbattle-19.04.1.tar.xz";
- sha256 = "f7b5ad956e4b1c06b04fec2d6f39331e81f2c44c716c2e666ef75b9d786982bc";
- name = "knavalbattle-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/knavalbattle-19.08.1.tar.xz";
+ sha256 = "6fa3cc1b7de95d22a6c356f411367399626a334ce648abc50ac724a860468915";
+ name = "knavalbattle-19.08.1.tar.xz";
};
};
knetwalk = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/knetwalk-19.04.1.tar.xz";
- sha256 = "e762415b6891c4098febc090bc80e5698cd3fb9ac2b8f4988aaf096816e3b62b";
- name = "knetwalk-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/knetwalk-19.08.1.tar.xz";
+ sha256 = "0c62b756d3375f0c51046e92904f380544ba77bcc0109607bb38055907579ccf";
+ name = "knetwalk-19.08.1.tar.xz";
};
};
knights = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/knights-19.04.1.tar.xz";
- sha256 = "d722fad8e835ea402337ffe1e6b8d1a5bda5a0e1c36ee3a89a6782b666a8534e";
- name = "knights-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/knights-19.08.1.tar.xz";
+ sha256 = "bdd99e6ba75e03f19eac5fe6e50c84496eb614725da021208db9119539cea132";
+ name = "knights-19.08.1.tar.xz";
};
};
knotes = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/knotes-19.04.1.tar.xz";
- sha256 = "b5cc805c657622e8cc4ab0ea07f30ea0258e767a87e525bc02fbc7d6ee9d7ec9";
- name = "knotes-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/knotes-19.08.1.tar.xz";
+ sha256 = "30b835c063e03d3d9047cbaacf389ee1e261368d2cf73fdfab71b4f9138b8bf7";
+ name = "knotes-19.08.1.tar.xz";
};
};
kolf = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kolf-19.04.1.tar.xz";
- sha256 = "92a56f5e5602a898537f87e12968e47cfe6f76d10daac6240e9f60e6751d06d7";
- name = "kolf-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kolf-19.08.1.tar.xz";
+ sha256 = "5199274d7ec557d396e74485debe4c7572050de6d31f128cca9ab737062f83bc";
+ name = "kolf-19.08.1.tar.xz";
};
};
kollision = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kollision-19.04.1.tar.xz";
- sha256 = "2c243790feb8d7a7760fcadff6b06b21aea930218d0915664b420dccdc1c7de9";
- name = "kollision-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kollision-19.08.1.tar.xz";
+ sha256 = "0f2bac3898ceb26bd17bdcc3481d76709b793a83ace75ba8f6f45fbf54428697";
+ name = "kollision-19.08.1.tar.xz";
};
};
kolourpaint = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kolourpaint-19.04.1.tar.xz";
- sha256 = "a2f78f1a2f99fa8176980ecd224ccfd8848ff8357e3434b463d4f83bcc7b5e46";
- name = "kolourpaint-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kolourpaint-19.08.1.tar.xz";
+ sha256 = "59c1a2a9d8f012ff1c483dae4f1019232ec667bd88e61c6c8fc07e47312ef23f";
+ name = "kolourpaint-19.08.1.tar.xz";
};
};
kompare = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kompare-19.04.1.tar.xz";
- sha256 = "ca270cde7c77fb44b40779ee22d556f14b9e0720e865ad6e3cf5cebbba4d7261";
- name = "kompare-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kompare-19.08.1.tar.xz";
+ sha256 = "325a14529c8e015fbae0231511ddd5c61dd3d78cbc6ad92eaccfd1c90a2f1afd";
+ name = "kompare-19.08.1.tar.xz";
};
};
konqueror = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/konqueror-19.04.1.tar.xz";
- sha256 = "b5f3c5a005b71886bfa2318bf13f14e6bab8fb84e1db54192409769bc3bf0e92";
- name = "konqueror-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/konqueror-19.08.1.tar.xz";
+ sha256 = "48a2847c7fcd5e30ae02d64523c3053b958ae9d3a7a649685660b1340aa644df";
+ name = "konqueror-19.08.1.tar.xz";
};
};
konquest = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/konquest-19.04.1.tar.xz";
- sha256 = "cac10983efbc026d5c8cd3330c94865b43b1a229ff9bb76077ab25d734133aab";
- name = "konquest-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/konquest-19.08.1.tar.xz";
+ sha256 = "114e76a10a992efb3fbd094bd1b66c3d6266c540c41289a0627ec04a8db52ec0";
+ name = "konquest-19.08.1.tar.xz";
};
};
konsole = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/konsole-19.04.1.tar.xz";
- sha256 = "711c67c5d43eb2c02be177e9d1157c142ab99ac5b808f951ab9a70e2397119d8";
- name = "konsole-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/konsole-19.08.1.tar.xz";
+ sha256 = "7530157a3fa01a9b21971e271a9d46addb5c71dce290db97265928803b57d37f";
+ name = "konsole-19.08.1.tar.xz";
};
};
kontact = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kontact-19.04.1.tar.xz";
- sha256 = "d60cc3165460a3e395778e4709ff55cbfbb80cc3536edb43d5d2335c70bd4714";
- name = "kontact-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kontact-19.08.1.tar.xz";
+ sha256 = "7b57b44ee72211b30fc743fae6580867100ede718909617b90cb926732ecbabb";
+ name = "kontact-19.08.1.tar.xz";
};
};
kontactinterface = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kontactinterface-19.04.1.tar.xz";
- sha256 = "034dcf0b2740273037a40ce2c1dd0d4eb17aac1eba608eca81f7e905a336cbc2";
- name = "kontactinterface-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kontactinterface-19.08.1.tar.xz";
+ sha256 = "adb5c380fd73102b84c72ea27975689dc289b0f5c8dd10f86bf0a857e00170be";
+ name = "kontactinterface-19.08.1.tar.xz";
};
};
kopete = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kopete-19.04.1.tar.xz";
- sha256 = "27586d90bd47abe6d8d6eddd7e41dbb6e3b3736984186cd24f84eee216e98b85";
- name = "kopete-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kopete-19.08.1.tar.xz";
+ sha256 = "c4943c5cbb384eb8697668be2a38dcc0dc16f26485a38c3657658c1cc4dbd2a8";
+ name = "kopete-19.08.1.tar.xz";
};
};
korganizer = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/korganizer-19.04.1.tar.xz";
- sha256 = "cb5c06d13f9f6eb4191ef6b86dab72ecde92fe6d9c8b6d9a4396645c94f83b67";
- name = "korganizer-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/korganizer-19.08.1.tar.xz";
+ sha256 = "d7e347df36986926d0e0d1af38130a089b581e400a90cc8bf199cecb29b78023";
+ name = "korganizer-19.08.1.tar.xz";
};
};
kpat = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kpat-19.04.1.tar.xz";
- sha256 = "2c0b29e5d372d55d77ceced098b8262b11a431518e818eec052d867c21ad6896";
- name = "kpat-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kpat-19.08.1.tar.xz";
+ sha256 = "65bf7299c59d3d7512ab39174fd0e5d044f307784c02895130399534e044831c";
+ name = "kpat-19.08.1.tar.xz";
};
};
kpimtextedit = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kpimtextedit-19.04.1.tar.xz";
- sha256 = "2fb2dc59a016dd70424c0fbad45ca1d750c2578f539e79d89bcace85bafd24d1";
- name = "kpimtextedit-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kpimtextedit-19.08.1.tar.xz";
+ sha256 = "f7e0dc9c706c94fa74a561d42d41246eae57f60c03da1ec52f2311172052d7fe";
+ name = "kpimtextedit-19.08.1.tar.xz";
};
};
kpkpass = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kpkpass-19.04.1.tar.xz";
- sha256 = "fb3554b04d00b326d5f5e14af9c0272c020092d3329808a6177fb0714f6a1cb7";
- name = "kpkpass-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kpkpass-19.08.1.tar.xz";
+ sha256 = "893ee1f127c2d0c7135fe77c5c2895d04f95c9a6ed3b162c30856f4e99d4afb3";
+ name = "kpkpass-19.08.1.tar.xz";
};
};
kqtquickcharts = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kqtquickcharts-19.04.1.tar.xz";
- sha256 = "7e05638f534257e901e02b6fa377747efa7881760dd66484b5a882c65e778e72";
- name = "kqtquickcharts-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kqtquickcharts-19.08.1.tar.xz";
+ sha256 = "af191d150a4777e53b27c39c86f32f80cec8b6eb2442d03425496902f78e79c8";
+ name = "kqtquickcharts-19.08.1.tar.xz";
};
};
krdc = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/krdc-19.04.1.tar.xz";
- sha256 = "8238b6969352d896751d28baeef770705feb5a0866e7b950e9eb0b377c098b19";
- name = "krdc-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/krdc-19.08.1.tar.xz";
+ sha256 = "319bccbc3c3274b89ae58679d063a303df4b95504b1bef97f925da70a0fbcbde";
+ name = "krdc-19.08.1.tar.xz";
};
};
kreversi = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kreversi-19.04.1.tar.xz";
- sha256 = "c8bce72bff0bd8b452335c158900d41a419ce3e62afd996f67a4b77abf38cdc9";
- name = "kreversi-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kreversi-19.08.1.tar.xz";
+ sha256 = "f4c691dcc5c7864c8201f7e06470e2856996c35c5317020e56822c48af0b810e";
+ name = "kreversi-19.08.1.tar.xz";
};
};
krfb = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/krfb-19.04.1.tar.xz";
- sha256 = "73dee235940cb0512cd218d88f90e6d2d62f232a6553f327b07e54c114c8480b";
- name = "krfb-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/krfb-19.08.1.tar.xz";
+ sha256 = "3abe42f6e648f171fa38652fe03184725d1abcccf16bf1c1039ebada1f3c64c3";
+ name = "krfb-19.08.1.tar.xz";
};
};
kross-interpreters = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kross-interpreters-19.04.1.tar.xz";
- sha256 = "d745f844ebe6ecefbf0d234e1e972cc7d7933a9ef75999839a709ba008ec55fe";
- name = "kross-interpreters-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kross-interpreters-19.08.1.tar.xz";
+ sha256 = "d6acb31bd4c97364aa4a77767e012af32ecd0f560da939901a81be5776f2de49";
+ name = "kross-interpreters-19.08.1.tar.xz";
};
};
kruler = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kruler-19.04.1.tar.xz";
- sha256 = "fdbff79128c8f4cb51f39dbb6f173726404d25c743aa68313651bb7a51addb53";
- name = "kruler-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kruler-19.08.1.tar.xz";
+ sha256 = "040eef3746a660798e1701af6d9d17f4d091c30db9321dd5d37b172f5b91d59c";
+ name = "kruler-19.08.1.tar.xz";
};
};
kshisen = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kshisen-19.04.1.tar.xz";
- sha256 = "a9e0e7324bb1bcad6c9427c0563236e557de85ad9724a52cfc917b43726b1aa6";
- name = "kshisen-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kshisen-19.08.1.tar.xz";
+ sha256 = "1631baaff368ca40a386c60998a9a491a2054a951f5b7311bea74f708d61d65f";
+ name = "kshisen-19.08.1.tar.xz";
};
};
ksirk = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ksirk-19.04.1.tar.xz";
- sha256 = "170cc0f9dea3f35e15de5d1090e8e3fa2b2ed16fa1722dfeaef47339667f322e";
- name = "ksirk-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ksirk-19.08.1.tar.xz";
+ sha256 = "42e00d3591fbfbe1db6de4caad963606a0ca5ee9a224b757157594bebb8c733c";
+ name = "ksirk-19.08.1.tar.xz";
};
};
ksmtp = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ksmtp-19.04.1.tar.xz";
- sha256 = "965f5f1c44cd64f9899ff5919372fe449e0f8b63e492f566017c9b8d5eb324bb";
- name = "ksmtp-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ksmtp-19.08.1.tar.xz";
+ sha256 = "71401abcbb6aedd2845c84bca65f77297722b3414f4d4caeaa6ac6b8f2edc46c";
+ name = "ksmtp-19.08.1.tar.xz";
};
};
ksnakeduel = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ksnakeduel-19.04.1.tar.xz";
- sha256 = "89de9e20e71ac8225e94d406cd3d25f057df35c96d4a3b7d418ffe5e6b0ef046";
- name = "ksnakeduel-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ksnakeduel-19.08.1.tar.xz";
+ sha256 = "130e6545102a4e39f284a409213e9d45066ed27c077ff881839f33db78f62dd5";
+ name = "ksnakeduel-19.08.1.tar.xz";
};
};
kspaceduel = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kspaceduel-19.04.1.tar.xz";
- sha256 = "388eaf152c996bd7326f0a4cd18fafb2600659513750d0aadd98b780eb6ec8b7";
- name = "kspaceduel-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kspaceduel-19.08.1.tar.xz";
+ sha256 = "47a6d9c78b1d24e80803b7e1765bb6de37157e9f1e733ef5ce50a54612c16bf9";
+ name = "kspaceduel-19.08.1.tar.xz";
};
};
ksquares = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ksquares-19.04.1.tar.xz";
- sha256 = "3c9b0cb0921d1c29c6c451a22b318151010a3321350292d0d5fc26cc16618773";
- name = "ksquares-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ksquares-19.08.1.tar.xz";
+ sha256 = "39fd1b73c3c13c3322a5658b8deed31261b0e68edc5cb9666ade374d5d9d8283";
+ name = "ksquares-19.08.1.tar.xz";
};
};
ksudoku = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ksudoku-19.04.1.tar.xz";
- sha256 = "4f95ccd1b162c7fb7cad2b04e08e3a29cfc98ad27b87e6e76e389418d09c0f7b";
- name = "ksudoku-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ksudoku-19.08.1.tar.xz";
+ sha256 = "cae801e0c595009e35aa11df370de421164f10d9840ae4dede2cd57f19cd6866";
+ name = "ksudoku-19.08.1.tar.xz";
};
};
ksystemlog = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ksystemlog-19.04.1.tar.xz";
- sha256 = "c8e6cb81803b8754d394d9365d3a6533706c742c822a5ef9d46bdc2def356db4";
- name = "ksystemlog-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ksystemlog-19.08.1.tar.xz";
+ sha256 = "7dde2a350b32011027d6ab9648859218a053c5509ad08bce8c2de875d2ae73db";
+ name = "ksystemlog-19.08.1.tar.xz";
};
};
kteatime = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kteatime-19.04.1.tar.xz";
- sha256 = "68a23aa6a8bc575586966388315f403e464b43e1b2f4b669689f3161db1669f0";
- name = "kteatime-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kteatime-19.08.1.tar.xz";
+ sha256 = "a4b80c5ca6f48c1d291a9502c43293cd0aa383f2e089b9435b02ff79b317c310";
+ name = "kteatime-19.08.1.tar.xz";
};
};
ktimer = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktimer-19.04.1.tar.xz";
- sha256 = "7ec4ebbdb8fc388763d832f8601bc7a32848836edc235f4c877bfb6d1726d809";
- name = "ktimer-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktimer-19.08.1.tar.xz";
+ sha256 = "f81af279e9e79bb3044718fa868973524e85df65dfaf654b8f45824b6f9d17cb";
+ name = "ktimer-19.08.1.tar.xz";
};
};
ktnef = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktnef-19.04.1.tar.xz";
- sha256 = "6f9449307d83a7bf0dc30022c36e3d854a06b370af18e44ca6e2eab684b97c93";
- name = "ktnef-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktnef-19.08.1.tar.xz";
+ sha256 = "bab23e40af2fe5ba2dd0be71687fbdd56d0868f2ef2a399721da88b12c65764f";
+ name = "ktnef-19.08.1.tar.xz";
};
};
ktouch = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktouch-19.04.1.tar.xz";
- sha256 = "09aa2ef862fffcdfc580b4aefff96a0591d99f470055365a90a41b25a3c6dcf2";
- name = "ktouch-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktouch-19.08.1.tar.xz";
+ sha256 = "d97ee5f253dd4e4d802bb8109c2e12d4d48bc7741686d07783e5687a499a2da7";
+ name = "ktouch-19.08.1.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktp-accounts-kcm-19.04.1.tar.xz";
- sha256 = "c4ecda8ca35438e45b48b9b86415bea1a44eeb2b2cd9af11ab1739f7ceeff045";
- name = "ktp-accounts-kcm-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktp-accounts-kcm-19.08.1.tar.xz";
+ sha256 = "2f76fc870bd7a96540aa91054b3cac38b917f90c129fada86c3639815dfa27a5";
+ name = "ktp-accounts-kcm-19.08.1.tar.xz";
};
};
ktp-approver = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktp-approver-19.04.1.tar.xz";
- sha256 = "e12421c0e79692532497dbd6db6b09faba010d99c57db1893eae3e59f7df47cd";
- name = "ktp-approver-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktp-approver-19.08.1.tar.xz";
+ sha256 = "a446c23836f6e38bb739246595cf1773f4909279cf1522b96ccd6626ba36430a";
+ name = "ktp-approver-19.08.1.tar.xz";
};
};
ktp-auth-handler = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktp-auth-handler-19.04.1.tar.xz";
- sha256 = "8d06e90a7e73b034c6087079b510e0ac1c27728c885e9aa2e8baef463a892d65";
- name = "ktp-auth-handler-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktp-auth-handler-19.08.1.tar.xz";
+ sha256 = "9a86ce184596cd54b914a7ff0424cadbee24b98f00b8736380e4153ee8596f64";
+ name = "ktp-auth-handler-19.08.1.tar.xz";
};
};
ktp-call-ui = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktp-call-ui-19.04.1.tar.xz";
- sha256 = "ad2efd84dc45cf55366dbc182d9301816129335ec4dc021dbbcc097c52656a0f";
- name = "ktp-call-ui-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktp-call-ui-19.08.1.tar.xz";
+ sha256 = "bab48fcdc4f4a7becfeca99dbe9061b9d08a510f94548c6ebdf720100ddb5a4c";
+ name = "ktp-call-ui-19.08.1.tar.xz";
};
};
ktp-common-internals = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktp-common-internals-19.04.1.tar.xz";
- sha256 = "041e5971071a060cef24abe68f699b5fcc657ba15a1e77feb227312fb1c13fd1";
- name = "ktp-common-internals-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktp-common-internals-19.08.1.tar.xz";
+ sha256 = "985d55a259df9cb0593db50ac88bd5d3ab155c6e26563386230fe66294c3dc63";
+ name = "ktp-common-internals-19.08.1.tar.xz";
};
};
ktp-contact-list = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktp-contact-list-19.04.1.tar.xz";
- sha256 = "7d8f7d841142d75036dc9dc4e31aefe8ff8906de6205b0e348b48e57da1400d9";
- name = "ktp-contact-list-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktp-contact-list-19.08.1.tar.xz";
+ sha256 = "a3ade7f7bacd53c90062923b488a7f60968a45d6d63890a618638f514dd3a5b2";
+ name = "ktp-contact-list-19.08.1.tar.xz";
};
};
ktp-contact-runner = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktp-contact-runner-19.04.1.tar.xz";
- sha256 = "68580e429fe0c9472a924af4f71df2da74684c5c11374464c110b9faca28c66f";
- name = "ktp-contact-runner-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktp-contact-runner-19.08.1.tar.xz";
+ sha256 = "385bc8bebb7847cefdd17738ecaf03b102794ac7f38dc58ebe10d100385b769f";
+ name = "ktp-contact-runner-19.08.1.tar.xz";
};
};
ktp-desktop-applets = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktp-desktop-applets-19.04.1.tar.xz";
- sha256 = "1114d5bcbc5a20c2d4822b1e2ad07d5d493ceace0a75b77575e978c30dc5fa75";
- name = "ktp-desktop-applets-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktp-desktop-applets-19.08.1.tar.xz";
+ sha256 = "ec26ba5893998f1e5c293d40e5410a7170ae4e0dea46f03bd5241c51c3240951";
+ name = "ktp-desktop-applets-19.08.1.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktp-filetransfer-handler-19.04.1.tar.xz";
- sha256 = "3e53fc28f4a1a8dd0dd2cb63b0a287061176a5c6e1db6480d50ebc70e2d8f189";
- name = "ktp-filetransfer-handler-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktp-filetransfer-handler-19.08.1.tar.xz";
+ sha256 = "34f7eed85709524efaa89924de85842c3532b1ade8572fe28dc2e8ce3f6026eb";
+ name = "ktp-filetransfer-handler-19.08.1.tar.xz";
};
};
ktp-kded-module = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktp-kded-module-19.04.1.tar.xz";
- sha256 = "fe5fc292618b28d11dddec435e86a89899c52b074b7c729aefe951b0b7697a66";
- name = "ktp-kded-module-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktp-kded-module-19.08.1.tar.xz";
+ sha256 = "323b538c08da82aaf66503463b4334bc603a37bb358fa6f1d5794562c05eed4f";
+ name = "ktp-kded-module-19.08.1.tar.xz";
};
};
ktp-send-file = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktp-send-file-19.04.1.tar.xz";
- sha256 = "8d3100de23666e3cb449663db376ed20e38647758371d37d721385af2b0d8d7a";
- name = "ktp-send-file-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktp-send-file-19.08.1.tar.xz";
+ sha256 = "1e4f9348dab9546d344d00783d6a5ad93b9b299b96d551dd09325c95932cbcd2";
+ name = "ktp-send-file-19.08.1.tar.xz";
};
};
ktp-text-ui = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktp-text-ui-19.04.1.tar.xz";
- sha256 = "dfc51070d1a25edde7c0f33d4eb83185738a70e6feb40a8b385403e833cca0b5";
- name = "ktp-text-ui-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktp-text-ui-19.08.1.tar.xz";
+ sha256 = "21c9c58bd498623a6bc9bbfa01c82548af29fdf7f690a359eb57ccd9a3de3105";
+ name = "ktp-text-ui-19.08.1.tar.xz";
};
};
ktuberling = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/ktuberling-19.04.1.tar.xz";
- sha256 = "f8146ecbe3a1005871a589054b996d059e5ff08b9d7fdeaa06591ae0ab05b8cb";
- name = "ktuberling-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/ktuberling-19.08.1.tar.xz";
+ sha256 = "b373c7552ff695e7d3428b7f2551315de00786177a5dc4bb96f777bdb84887cc";
+ name = "ktuberling-19.08.1.tar.xz";
};
};
kturtle = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kturtle-19.04.1.tar.xz";
- sha256 = "f932a56d8f380cc422215e580d8c4d51eabd189f2b4ca3b4205e617d52e6e10d";
- name = "kturtle-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kturtle-19.08.1.tar.xz";
+ sha256 = "5643434e861391471674e6cf86347c362b076e1d3fe1396022b5080b899bf934";
+ name = "kturtle-19.08.1.tar.xz";
};
};
kubrick = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kubrick-19.04.1.tar.xz";
- sha256 = "636080a8cac2f689f5af8de9aacef9e90029eafaaf7f1867b8a53a8a558e94c7";
- name = "kubrick-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kubrick-19.08.1.tar.xz";
+ sha256 = "51ff60a682c69f829af7f7e4748128d48e691aacd584379e099c437473a45c03";
+ name = "kubrick-19.08.1.tar.xz";
};
};
kwalletmanager = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kwalletmanager-19.04.1.tar.xz";
- sha256 = "793a3a335e53b6af36272398d7933ff0cc77918860799db2b5688ee249ce215d";
- name = "kwalletmanager-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kwalletmanager-19.08.1.tar.xz";
+ sha256 = "b6206da5001f79b67264f641210925b0400b41dc59562b978d402b9524835c14";
+ name = "kwalletmanager-19.08.1.tar.xz";
};
};
kwave = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kwave-19.04.1.tar.xz";
- sha256 = "1fd7e256a5d9b77ef691642891b2423357ef4aea7f40ae64304ec922e5930fd6";
- name = "kwave-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kwave-19.08.1.tar.xz";
+ sha256 = "6febc3d01c15f94fa0f75a731a375b76642c2cdce9afc373a5c1e92fb3753891";
+ name = "kwave-19.08.1.tar.xz";
};
};
kwordquiz = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/kwordquiz-19.04.1.tar.xz";
- sha256 = "970381004a7382f4f24dad61eda8a386e138735d78c2609c92603e14acbe0158";
- name = "kwordquiz-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/kwordquiz-19.08.1.tar.xz";
+ sha256 = "ead21c1caa1d1665a8ef685c4b46a442b7423aba63153617008985e84ff4c318";
+ name = "kwordquiz-19.08.1.tar.xz";
};
};
libgravatar = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libgravatar-19.04.1.tar.xz";
- sha256 = "7d4af799effc13af4f4b056d21b188bd67cd503d1528a7ff37e19d228619b522";
- name = "libgravatar-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libgravatar-19.08.1.tar.xz";
+ sha256 = "d39d6970b5113b2b805b048ca9b14770ab16d59c8ec755b0c5f6d4f7d6df73a2";
+ name = "libgravatar-19.08.1.tar.xz";
};
};
libkcddb = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libkcddb-19.04.1.tar.xz";
- sha256 = "6773266408c0a68c128b08aca2df594249c210ff9b8fb3553b2bb82c591a2f51";
- name = "libkcddb-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libkcddb-19.08.1.tar.xz";
+ sha256 = "f73d3f802e1ffec6b75246505cbec5a7baa328b808c23b42608e05fd8c7b30a5";
+ name = "libkcddb-19.08.1.tar.xz";
};
};
libkcompactdisc = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libkcompactdisc-19.04.1.tar.xz";
- sha256 = "146d842741c24a379a0e134b8c0cbef916f5bd94fb8c6102703e5c764bf9b0ee";
- name = "libkcompactdisc-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libkcompactdisc-19.08.1.tar.xz";
+ sha256 = "53d206967d98e9ee8254aca58d1ba34458761106c323deb449fa94bed1e24037";
+ name = "libkcompactdisc-19.08.1.tar.xz";
};
};
libkdcraw = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libkdcraw-19.04.1.tar.xz";
- sha256 = "54576a803929a0adb3d25e239395b541c0820fecd633f09ea40677882c82e42c";
- name = "libkdcraw-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libkdcraw-19.08.1.tar.xz";
+ sha256 = "b159a669cb4c01770c363b4dd53033248402d37b29acb416ec45e71ac12449e2";
+ name = "libkdcraw-19.08.1.tar.xz";
};
};
libkdegames = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libkdegames-19.04.1.tar.xz";
- sha256 = "a16baa2818ab6f553d9c2635b252530538812787c50f9fbc0d18781943150e5c";
- name = "libkdegames-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libkdegames-19.08.1.tar.xz";
+ sha256 = "1b365627bd0a3a42a32a0a8d401b53d2ac09f0f9cf040b4b0483c5574991b774";
+ name = "libkdegames-19.08.1.tar.xz";
};
};
libkdepim = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libkdepim-19.04.1.tar.xz";
- sha256 = "28217ce30663955168d39eaa4e0c7efb47a437f59df77971f3e98efea99adc45";
- name = "libkdepim-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libkdepim-19.08.1.tar.xz";
+ sha256 = "46966eaae2bc71a5bab0c22bcfff858e299d7f1cec2203c1d12cebbc084ee9ce";
+ name = "libkdepim-19.08.1.tar.xz";
};
};
libkeduvocdocument = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libkeduvocdocument-19.04.1.tar.xz";
- sha256 = "c0b5e23a677cea13a2e15989a5b2240ddab2948b00be67e6306cf916e7ca2e59";
- name = "libkeduvocdocument-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libkeduvocdocument-19.08.1.tar.xz";
+ sha256 = "9e7eb36b0c649231a792f618b28fd110b3782ea086cce81436191e9f73c6674e";
+ name = "libkeduvocdocument-19.08.1.tar.xz";
};
};
libkexiv2 = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libkexiv2-19.04.1.tar.xz";
- sha256 = "138e1bf75cbbf16c46b6ba35f25e700ad93fa8a2134d0ad4c344174c7701cbae";
- name = "libkexiv2-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libkexiv2-19.08.1.tar.xz";
+ sha256 = "bee9a16eda002146b42f358b0dc58c5db832719870761264cc6cf0a199ab0537";
+ name = "libkexiv2-19.08.1.tar.xz";
};
};
libkgapi = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libkgapi-19.04.1.tar.xz";
- sha256 = "a9d499fe1f5371112ceb94b3b03f8e2b1a1faa4ee69722b4c1c9ba28e8f9052e";
- name = "libkgapi-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libkgapi-19.08.1.tar.xz";
+ sha256 = "1ad2491348cc97f591aa681f7a649f2337c9a92e845980304c1110c69eecd579";
+ name = "libkgapi-19.08.1.tar.xz";
};
};
libkgeomap = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libkgeomap-19.04.1.tar.xz";
- sha256 = "519345f30e46fc95816d145177347547c9c9eb440eab017c5ee928fa0ef8cf5a";
- name = "libkgeomap-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libkgeomap-19.08.1.tar.xz";
+ sha256 = "aed369217007698beaa3230bf5b5360602d44ca6d333026158b15666f3670555";
+ name = "libkgeomap-19.08.1.tar.xz";
};
};
libkipi = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libkipi-19.04.1.tar.xz";
- sha256 = "1f1a8b881f61c9fc151a2f0b98c6ba07baa0fe1ca8a0f77d7502e81c08a84020";
- name = "libkipi-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libkipi-19.08.1.tar.xz";
+ sha256 = "ec2012821c90062e43ad7c77861ab519b24aea429ed9f0b7bdf6ef9c00e82ba4";
+ name = "libkipi-19.08.1.tar.xz";
};
};
libkleo = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libkleo-19.04.1.tar.xz";
- sha256 = "a75084129e44028ff3f7742cdcb1800df94845d8c6ace38389da317144fa0529";
- name = "libkleo-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libkleo-19.08.1.tar.xz";
+ sha256 = "5808a40d9c9358048d558a4c96f90e8c51b2dab3588ab3c678b02d5810020a31";
+ name = "libkleo-19.08.1.tar.xz";
};
};
libkmahjongg = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libkmahjongg-19.04.1.tar.xz";
- sha256 = "7a1df5a03e1da1b801ca4530be3b9008b92cb4872ce8ec0038f2686ac325efbb";
- name = "libkmahjongg-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libkmahjongg-19.08.1.tar.xz";
+ sha256 = "c4e3a29bb923ead76f1fb528fa62c677423ebb4ac07dd149a6fc3f6ae055eb39";
+ name = "libkmahjongg-19.08.1.tar.xz";
};
};
libkomparediff2 = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libkomparediff2-19.04.1.tar.xz";
- sha256 = "2ab1a9cb25996bd6fb80bf556ba4b91a07385e62688249e9415b1ead8b3ad1b3";
- name = "libkomparediff2-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libkomparediff2-19.08.1.tar.xz";
+ sha256 = "a020ba9287ee084a0f5a10896f1559f11aff1c97957405f47deeda32a0874b31";
+ name = "libkomparediff2-19.08.1.tar.xz";
};
};
libksane = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libksane-19.04.1.tar.xz";
- sha256 = "c89039afa641640cbc65b01ae735ee9b70bd3283095d6b034665ddb048d33417";
- name = "libksane-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libksane-19.08.1.tar.xz";
+ sha256 = "215fae62d8ea1f70908cafc5bc8667c02d4f0329669d056c99443a7b14a6e589";
+ name = "libksane-19.08.1.tar.xz";
};
};
libksieve = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/libksieve-19.04.1.tar.xz";
- sha256 = "23cca1dfc1d79242f24dd95e8817a9672629276bced3a9ee56067570ef69ccff";
- name = "libksieve-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/libksieve-19.08.1.tar.xz";
+ sha256 = "ab384877148710e7de92e88a192f52beaad667804bbc641b63c21cfdaa0aee31";
+ name = "libksieve-19.08.1.tar.xz";
};
};
lokalize = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/lokalize-19.04.1.tar.xz";
- sha256 = "1e68faa5af9079e691e5d207b0397c0250fb6e1209b370e9762bfa949c35dce1";
- name = "lokalize-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/lokalize-19.08.1.tar.xz";
+ sha256 = "fe1e1f8fb2f2ad3cde1830b2ddbcce0e41ffe5696c6e32b0639c8931967b3943";
+ name = "lokalize-19.08.1.tar.xz";
};
};
lskat = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/lskat-19.04.1.tar.xz";
- sha256 = "f83f9df9e4786a8d6d8d197defb8ac7f40b8bed8e88578673b2660c14c7a4edf";
- name = "lskat-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/lskat-19.08.1.tar.xz";
+ sha256 = "e4b073cc65be0f1e7e01b4b2aa28bed30480aef097f5185eb608b4e45b9352e9";
+ name = "lskat-19.08.1.tar.xz";
};
};
mailcommon = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/mailcommon-19.04.1.tar.xz";
- sha256 = "37b06e85e74d6ef1801485b8d99529fde5ca11bb446c231a6f5406e99f9c4d0f";
- name = "mailcommon-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/mailcommon-19.08.1.tar.xz";
+ sha256 = "3fb6f09ce8bc9ccddfa1420fa1a7c60a47065afdfbb5a30292179efbcebba833";
+ name = "mailcommon-19.08.1.tar.xz";
};
};
mailimporter = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/mailimporter-19.04.1.tar.xz";
- sha256 = "e77c5c43f20f821664a3a559b929eb2f97ba5105e000875b1642516a6f298696";
- name = "mailimporter-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/mailimporter-19.08.1.tar.xz";
+ sha256 = "4236938a2dca5ea0bc572afbe76ae28fc6ad1e65f383743de98a4e505f674962";
+ name = "mailimporter-19.08.1.tar.xz";
};
};
marble = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/marble-19.04.1.tar.xz";
- sha256 = "acd9c15c4758684f6eff6c2318fc4dd88fd68dd41336de9458cad4d5f6832c61";
- name = "marble-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/marble-19.08.1.tar.xz";
+ sha256 = "7e09e3037287be117e47de402d1f5ea7dd49f625ccf4a46d1d016a527d487e9e";
+ name = "marble-19.08.1.tar.xz";
};
};
mbox-importer = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/mbox-importer-19.04.1.tar.xz";
- sha256 = "3fcd5c6b3824dea9ff4145dde6bf7b472675e3927ce91258d89cbfe4d0ebb77a";
- name = "mbox-importer-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/mbox-importer-19.08.1.tar.xz";
+ sha256 = "3f4c96ee65ffa0488df09522e1bda2ea38c0adf420ae66fff11f670566c5536c";
+ name = "mbox-importer-19.08.1.tar.xz";
};
};
messagelib = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/messagelib-19.04.1.tar.xz";
- sha256 = "7e4d0e2f2d6dfcb235408af0e4af235ab10dc8a8c4f1e169a672f03b37b180ad";
- name = "messagelib-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/messagelib-19.08.1.tar.xz";
+ sha256 = "ec43d913028124a49eaa440e4b55dba23b6ab503728b897a3ad8e1fc5e446802";
+ name = "messagelib-19.08.1.tar.xz";
};
};
minuet = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/minuet-19.04.1.tar.xz";
- sha256 = "5f2e3692c0b7ae9496fa7952bfd02045aa87ba5ee10c6ef84fb4557abe83d0f0";
- name = "minuet-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/minuet-19.08.1.tar.xz";
+ sha256 = "524c389060c13b37a3df4662ca9ca5e2862d20ea71f47b1a5157a088d2d065d4";
+ name = "minuet-19.08.1.tar.xz";
};
};
okular = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/okular-19.04.1.tar.xz";
- sha256 = "7145b1eea61c56a5b413e960e5b24038c7af5d3cb583a524deca344dae3a0e0e";
- name = "okular-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/okular-19.08.1.tar.xz";
+ sha256 = "9e363b73febd5da1a17e53a8f89914784b555c1f0085ddc0f55ef56082b0bd54";
+ name = "okular-19.08.1.tar.xz";
};
};
palapeli = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/palapeli-19.04.1.tar.xz";
- sha256 = "dc661c88dcf6e3a17b9a2a403cac1ba9bd8f7144ff2c01ff3c286564159f796b";
- name = "palapeli-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/palapeli-19.08.1.tar.xz";
+ sha256 = "c9eeafe854529ea5a09e9ef6fd37b8be3d0d370322938c009c826bd936953adc";
+ name = "palapeli-19.08.1.tar.xz";
};
};
parley = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/parley-19.04.1.tar.xz";
- sha256 = "c52746417d32e31f66c1165fd08ab87696d5ef4b5a020a175fe00e60474bc73f";
- name = "parley-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/parley-19.08.1.tar.xz";
+ sha256 = "6ee4d538ddaecd5b6c3d855db62a4b5061240b2089b3dcc592712398fd1d066b";
+ name = "parley-19.08.1.tar.xz";
};
};
picmi = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/picmi-19.04.1.tar.xz";
- sha256 = "10abab6e48f48e1e1308fbd2a687bb4c5051c6ae2a670b737d6974432fdef30c";
- name = "picmi-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/picmi-19.08.1.tar.xz";
+ sha256 = "47e0dd79ee4ae86d8be6822f9328fac2f00ce68cf862202e889c0f77a88d0d91";
+ name = "picmi-19.08.1.tar.xz";
};
};
pimcommon = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/pimcommon-19.04.1.tar.xz";
- sha256 = "bc4612711775ea4665c0827c7935397503b5cf82f906bcf22a64b3ab1eaaaa72";
- name = "pimcommon-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/pimcommon-19.08.1.tar.xz";
+ sha256 = "5956e2767ea88efd73cbefef9cb80d16bb4cb5cb63857975fbb6ead1b984026c";
+ name = "pimcommon-19.08.1.tar.xz";
};
};
pim-data-exporter = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/pim-data-exporter-19.04.1.tar.xz";
- sha256 = "0fa9e20ef67f64d5a9c967f4ea32a476438b23ab8405774035cd4584e6100ebd";
- name = "pim-data-exporter-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/pim-data-exporter-19.08.1.tar.xz";
+ sha256 = "766e8b15f7853d84629bc49ad33aa59291d6d95cfd9db279e9e0ad70b0fab1fe";
+ name = "pim-data-exporter-19.08.1.tar.xz";
};
};
pim-sieve-editor = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/pim-sieve-editor-19.04.1.tar.xz";
- sha256 = "3a8ce54140233fa7ae618fc05ae9d882cab6e56835e9fdb29e2242885ce50e10";
- name = "pim-sieve-editor-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/pim-sieve-editor-19.08.1.tar.xz";
+ sha256 = "b49045d7326cf0ca7fabbf58d8508d61986701887871c4df53fad1f960a64438";
+ name = "pim-sieve-editor-19.08.1.tar.xz";
};
};
poxml = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/poxml-19.04.1.tar.xz";
- sha256 = "d8439996821ded53dea321f84619f3754cc677b5fa08b5fd37aabb09b8dac2f9";
- name = "poxml-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/poxml-19.08.1.tar.xz";
+ sha256 = "d38dce3114b01bc72163329dac629c4e5d36db15e09d52dd0ffbcaa645408d98";
+ name = "poxml-19.08.1.tar.xz";
};
};
print-manager = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/print-manager-19.04.1.tar.xz";
- sha256 = "33d553bb048959ecfc5e404f3a1e118b0ed78305d96b3a6042ffd576a164e9fa";
- name = "print-manager-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/print-manager-19.08.1.tar.xz";
+ sha256 = "b1fd9aa067329a4f5bb715e7db736160954bbec303be0ba5bc8f98852071e731";
+ name = "print-manager-19.08.1.tar.xz";
};
};
rocs = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/rocs-19.04.1.tar.xz";
- sha256 = "5c0740d68ed26f7291e114faa811a2ae104ee682181f5ebed381865dd7d8db61";
- name = "rocs-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/rocs-19.08.1.tar.xz";
+ sha256 = "eaa2fefae8123071e5802d0c13016d0b99608f91c75c7c6e4fbe6f2c6dc12adf";
+ name = "rocs-19.08.1.tar.xz";
};
};
signon-kwallet-extension = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/signon-kwallet-extension-19.04.1.tar.xz";
- sha256 = "658bbae2534896e13a7aced654f38164130ee3c748349d044000d0d7dcaa1c38";
- name = "signon-kwallet-extension-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/signon-kwallet-extension-19.08.1.tar.xz";
+ sha256 = "7d558509cf015641c76d4203c8dadc4e9720278fb39b4561eb2bce4e5412bb83";
+ name = "signon-kwallet-extension-19.08.1.tar.xz";
};
};
spectacle = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/spectacle-19.04.1.tar.xz";
- sha256 = "6f420fc6a660e25a08449cfb6d2795e07a37f8dca25f1862d857121b43f9262c";
- name = "spectacle-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/spectacle-19.08.1.tar.xz";
+ sha256 = "21057fd4990048df33f5d739fc98af2a555ca4b7db50688333fecabc12f24786";
+ name = "spectacle-19.08.1.tar.xz";
};
};
step = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/step-19.04.1.tar.xz";
- sha256 = "4fafff95339473e6449e9a45e273fe15758daf743e8697ff73f16129eb1dca05";
- name = "step-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/step-19.08.1.tar.xz";
+ sha256 = "533750dda4adcd0f3d8ec269103f35ee1ab4b4e9eae9721522b1b278660577a6";
+ name = "step-19.08.1.tar.xz";
};
};
svgpart = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/svgpart-19.04.1.tar.xz";
- sha256 = "3e30eb3b0f95073639697c73f1cc1d4689e53921cc87fe23cd0ec04ef6835624";
- name = "svgpart-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/svgpart-19.08.1.tar.xz";
+ sha256 = "4ed6277d3f2c12a4a53dd308911c613af5ae65f53819aeacf42e08dcd08dbd5b";
+ name = "svgpart-19.08.1.tar.xz";
};
};
sweeper = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/sweeper-19.04.1.tar.xz";
- sha256 = "70ccd7a1d8d81ee2a54df724a1ad908157672bb20e80c81aff8db946241b6637";
- name = "sweeper-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/sweeper-19.08.1.tar.xz";
+ sha256 = "cc539649fa4a2698ad07653f9427981381bf8b5344f05dab76acdf1704b4479a";
+ name = "sweeper-19.08.1.tar.xz";
};
};
umbrello = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/umbrello-19.04.1.tar.xz";
- sha256 = "42f9ba60320558439a1d5c68cc4d730c6b17e0b2b8a57b4686031bbecb3ab3c2";
- name = "umbrello-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/umbrello-19.08.1.tar.xz";
+ sha256 = "ce56fa6d96bbc78cf69246d6f45e9b098f8fcc75d7771875a8e638b01bbf6efa";
+ name = "umbrello-19.08.1.tar.xz";
+ };
+ };
+ yakuake = {
+ version = "19.08.1";
+ src = fetchurl {
+ url = "${mirror}/stable/applications/19.08.1/src/yakuake-19.08.1.tar.xz";
+ sha256 = "184fec9d07505faf820821e197582f7733694848cc17e71ee4f525772e78fc10";
+ name = "yakuake-19.08.1.tar.xz";
};
};
zeroconf-ioslave = {
- version = "19.04.1";
+ version = "19.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/19.04.1/src/zeroconf-ioslave-19.04.1.tar.xz";
- sha256 = "e59c8a4b6ff93ead29b322fb40c94a3584d5c463077d58575720fcba2c511d87";
- name = "zeroconf-ioslave-19.04.1.tar.xz";
+ url = "${mirror}/stable/applications/19.08.1/src/zeroconf-ioslave-19.08.1.tar.xz";
+ sha256 = "0c5f8931dd2997345fc6d3e8ef73c36615a73f8c906fb6be9c27432bc038000a";
+ name = "zeroconf-ioslave-19.08.1.tar.xz";
};
};
}
diff --git a/pkgs/applications/kde/yakuake.nix b/pkgs/applications/kde/yakuake.nix
new file mode 100644
index 000000000000..6f9c8df30012
--- /dev/null
+++ b/pkgs/applications/kde/yakuake.nix
@@ -0,0 +1,32 @@
+{
+ mkDerivation, lib, kdoctools, extra-cmake-modules,
+ karchive, kcrash, kdbusaddons, ki18n, kiconthemes, knewstuff, knotifications,
+ knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras
+}:
+
+mkDerivation {
+ name = "yakuake";
+
+ buildInputs = [
+ karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications
+ knotifyconfig kparts kwindowsystem qtx11extras
+ ];
+
+ propagatedBuildInputs = [
+ karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications
+ knotifyconfig kparts kwindowsystem
+ ];
+
+ propagatedUserEnvPkgs = [ konsole ];
+
+ nativeBuildInputs = [
+ extra-cmake-modules kdoctools
+ ];
+
+ meta = {
+ homepage = https://yakuake.kde.org;
+ description = "Quad-style terminal emulator for KDE";
+ maintainers = with lib.maintainers; [ fridh ];
+ license = lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix
index 50582d94ff4a..465c72d73f5c 100644
--- a/pkgs/applications/misc/airtame/default.nix
+++ b/pkgs/applications/misc/airtame/default.nix
@@ -14,7 +14,6 @@ let libPath = lib.makeLibraryPath [
in stdenv.mkDerivation rec {
pname = "airtame";
version = "3.3.0";
- name = "${pname}-${version}";
longName = "${pname}-application";
src = fetchurl {
diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix
index 8cb014bb0214..8c5aded5ed9b 100644
--- a/pkgs/applications/misc/aminal/default.nix
+++ b/pkgs/applications/misc/aminal/default.nix
@@ -10,7 +10,7 @@
}:
buildGoPackage rec {
- name = "aminal-${version}";
+ pname = "aminal";
version = "0.8.6";
goPackagePath = "github.com/liamg/aminal";
diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix
index f21438dfcec5..8108b9e4ddb4 100644
--- a/pkgs/applications/misc/antfs-cli/default.nix
+++ b/pkgs/applications/misc/antfs-cli/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3Packages }:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "antfs-cli";
version = "unstable-2017-02-11";
diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/applications/misc/ape/clex.nix
index 37d140e19ba3..c680ffe96783 100644
--- a/pkgs/applications/misc/ape/clex.nix
+++ b/pkgs/applications/misc/ape/clex.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "attempto-clex-${version}";
+ pname = "attempto-clex";
version = "5133afe";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
index 2da0de9ead8c..b5af1af91f36 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "0.1.5";
- name = "apvlv-${version}";
+ pname = "apvlv";
src = fetchFromGitHub {
owner = "naihe2010";
diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix
index 202c1669f858..b03d2aa208b5 100644
--- a/pkgs/applications/misc/artha/default.nix
+++ b/pkgs/applications/misc/artha/default.nix
@@ -1,7 +1,7 @@
{ stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }:
-stdenv.mkDerivation rec {
- name = "artha-${version}";
+stdenv.mkDerivation {
+ pname = "artha";
version = "1.0.3";
src = fetchurl {
diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/pkgs/applications/misc/asciiquarium/default.nix
index 3c18d70d6c26..0e524ede0912 100644
--- a/pkgs/applications/misc/asciiquarium/default.nix
+++ b/pkgs/applications/misc/asciiquarium/default.nix
@@ -2,7 +2,8 @@
let version = "1.1";
in stdenv.mkDerivation {
- name = "asciiquarium-${version}";
+ pname = "asciiquarium";
+ inherit version;
src = fetchurl {
url = "https://robobunny.com/projects/asciiquarium/asciiquarium_${version}.tar.gz";
sha256 = "0qfkr5b7sxzi973nh0h84blz2crvmf28jkkgaj3mxrr56mhwc20v";
diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix
index 2dd151c1a6c1..b00686fb24f6 100644
--- a/pkgs/applications/misc/autospotting/default.nix
+++ b/pkgs/applications/misc/autospotting/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
- name = "autospotting-${version}";
+buildGoPackage {
+ pname = "autospotting";
version = "unstable-2018-11-17";
goPackagePath = "github.com/AutoSpotting/AutoSpotting";
diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix
index 4227b4155acf..165bee76b69b 100644
--- a/pkgs/applications/misc/avrdudess/default.nix
+++ b/pkgs/applications/misc/avrdudess/default.nix
@@ -1,6 +1,6 @@
{ stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "avrdudess-2.2.20140102";
src = fetchurl {
diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix
index fc5fa4d03006..b0af34ec7606 100644
--- a/pkgs/applications/misc/bashSnippets/default.nix
+++ b/pkgs/applications/misc/bashSnippets/default.nix
@@ -12,7 +12,8 @@ let
];
in
stdenv.mkDerivation {
- name = "bashSnippets-${version}";
+ pname = "bashSnippets";
+ inherit version;
src = fetchFromGitHub {
owner = "alexanderepstein";
diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix
index abb3eb33536e..8b994c55de3f 100644
--- a/pkgs/applications/misc/batti/default.nix
+++ b/pkgs/applications/misc/batti/default.nix
@@ -7,11 +7,11 @@ let
inherit (pythonPackages) dbus-python pygtk python;
in stdenv.mkDerivation rec {
- name = "batti-${version}";
+ pname = "batti";
version = "0.3.8";
src = fetchurl {
- url = "https://batti-gtk.googlecode.com/files/${name}.tar.gz";
+ url = "https://batti-gtk.googlecode.com/files/${pname}-${version}.tar.gz";
sha256 = "072d92gpsiiin631589nj77i2w1425p6db0qxyml7myscfy9jgx6";
};
diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix
index f085e4bd7dd5..06df1df9f769 100644
--- a/pkgs/applications/misc/bb/default.nix
+++ b/pkgs/applications/misc/bb/default.nix
@@ -1,11 +1,11 @@
{ stdenv, lib, fetchurl, darwin, aalib, ncurses, xorg, libmikmod }:
stdenv.mkDerivation rec {
- name = "bb-${version}";
+ pname = "bb";
version = "1.3rc1";
src = fetchurl {
- url = "mirror://sourceforge/aa-project/bb/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/aa-project/bb/${version}/${pname}-${version}.tar.gz";
sha256 = "1i411glxh7g4pfg4gw826lpwngi89yrbmxac8jmnsfvrfb48hgbr";
};
diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix
index 89c32668be9c..8945ffbb384f 100644
--- a/pkgs/applications/misc/bemenu/default.nix
+++ b/pkgs/applications/misc/bemenu/default.nix
@@ -9,7 +9,7 @@ assert ncursesSupport -> ncurses != null;
assert waylandSupport -> wayland != null;
assert x11Support -> xlibs != null && xorg != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "bemenu";
version = "0.1.0";
diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix
index 41184d6e9492..a3f0a3b84f23 100644
--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/pkgs/applications/misc/bibletime/default.nix
@@ -4,10 +4,10 @@ stdenv.mkDerivation rec {
version = "2.10.1";
- name = "bibletime-${version}";
+ pname = "bibletime";
src = fetchurl {
- url = "mirror://sourceforge/bibletime/${name}.tar.xz";
+ url = "mirror://sourceforge/bibletime/${pname}-${version}.tar.xz";
sha256 = "14fayy5h1ffjxin669q56fflxn4ij1irgn60cygwx2y02cwxbll6";
};
diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix
index 9c99dcee2b3c..090cb2f519e1 100644
--- a/pkgs/applications/misc/bitcoinarmory/default.nix
+++ b/pkgs/applications/misc/bitcoinarmory/default.nix
@@ -10,7 +10,8 @@ let
in buildPythonApplication {
- name = "bitcoinarmory-${version}";
+ pname = "bitcoinarmory";
+ inherit version;
src = fetchFromGitHub {
owner = "goatpig";
diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix
index a15814082014..402198a97322 100644
--- a/pkgs/applications/misc/calcurse/default.nix
+++ b/pkgs/applications/misc/calcurse/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses, gettext, python3, python3Packages, makeWrapper }:
stdenv.mkDerivation rec {
- name = "calcurse-${version}";
+ pname = "calcurse";
version = "4.5.0";
src = fetchurl {
- url = "https://calcurse.org/files/${name}.tar.gz";
+ url = "https://calcurse.org/files/${pname}-${version}.tar.gz";
sha256 = "1vjwcmp51h7dsvwn0qx93w9chp3wp970v7d9mjhk7jyamcbfywn3";
};
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index c82b00e66e80..dd85156b3ef0 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
}:
mkDerivation rec {
- name = "calibre-${version}";
- version = "3.46.0";
+ pname = "calibre";
+ version = "3.47.1";
src = fetchurl {
- url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
- sha256 = "1dlss01kaz2qlg9ji8c9dn9rd73mmpm5yjg50zp49cwx9y2vjiz9";
+ url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
+ sha256 = "17lz6rawlv268vv8i5kj59rswsipq3c14066adaz1paw54zr62dk";
};
patches = [
@@ -105,7 +105,7 @@ mkDerivation rec {
disallowedReferences = [ podofo.dev ];
calibreDesktopItem = makeDesktopItem {
- name = "calibre";
+ name = "calibre-gui";
desktopName = "calibre";
exec = "@out@/bin/calibre --detach %F";
genericName = "E-book library management";
@@ -151,7 +151,7 @@ mkDerivation rec {
};
ebookEditDesktopItem = makeDesktopItem {
- name = "calibre-edit-ebook";
+ name = "calibre-edit-book";
desktopName = "Edit E-book";
genericName = "E-book Editor";
comment = "Edit e-books";
diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix
index 35aa681df4ba..77cabc409c74 100644
--- a/pkgs/applications/misc/candle/default.nix
+++ b/pkgs/applications/misc/candle/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }:
stdenv.mkDerivation rec {
- name = "candle-${version}";
+ pname = "candle";
version = "1.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix
index a0e5c8149968..40dbfea9801b 100644
--- a/pkgs/applications/misc/cardpeek/default.nix
+++ b/pkgs/applications/misc/cardpeek/default.nix
@@ -4,7 +4,8 @@ let
version = "0.8.4";
in
stdenv.mkDerivation {
- name = "cardpeek-${version}";
+ pname = "cardpeek";
+ inherit version;
src = fetchFromGitHub {
owner = "L1L1";
diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix
index e48b32a783d7..5f4e24f4d3cc 100644
--- a/pkgs/applications/misc/cataract/build.nix
+++ b/pkgs/applications/misc/cataract/build.nix
@@ -10,9 +10,9 @@
, sha256
, rev }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit version;
- name = "cataract-${version}";
+ pname = "cataract";
src = fetchgit {
url = "git://git.bzatek.net/cataract";
diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix
index 75f5ab406fe0..09c36f9eb2f1 100644
--- a/pkgs/applications/misc/catclock/default.nix
+++ b/pkgs/applications/misc/catclock/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, xlibsWrapper, motif }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "catclock-2015-10-04";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix
index 1bbb7d61b01f..20bfe727f6d3 100644
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/pkgs/applications/misc/cdrtools/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, acl, libcap, Carbon, IOKit }:
stdenv.mkDerivation rec {
- name = "cdrtools-${version}";
+ pname = "cdrtools";
version = "3.02a06";
src = fetchurl {
- url = "mirror://sourceforge/cdrtools/${name}.tar.bz2";
+ url = "mirror://sourceforge/cdrtools/${pname}-${version}.tar.bz2";
sha256 = "1cayhfbhj5g2vgmkmq5scr23k0ka5fsn0dhn0n9yllj386csnygd";
};
diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix
index 9d63b5aedcb7..c05c7423d9a5 100644
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/pkgs/applications/misc/cgminer/default.nix
@@ -1,9 +1,9 @@
{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake
, curl, ncurses, ocl-icd, opencl-headers, xorg, jansson }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "3.7.2";
- name = "cgminer-${version}";
+ pname = "cgminer";
src = fetchgit {
url = "https://github.com/ckolivas/cgminer.git";
diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index 41660bc7f2b0..357dd9bcb8a7 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -2,7 +2,6 @@
with python3.pkgs;
buildPythonApplication rec {
- name = "${pname}-${version}";
pname = "cheat";
version = "2.5.1";
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index 0578393dfca0..856853e3b1cb 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "cherrytree-${version}";
+ pname = "cherrytree";
version = "0.38.8";
src = fetchurl {
- url = "https://www.giuspen.com/software/${name}.tar.xz";
+ url = "https://www.giuspen.com/software/${pname}-${version}.tar.xz";
sha256 = "1ns87xl2sgrf3nha4xkhp0xcxlycqszlp6xdrn95lg6vzm0fa8dg";
};
diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
index 6602adb2f2ab..4986661e2f63 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.8";
- name = "cli-visualizer-${version}";
+ pname = "cli-visualizer";
src = fetchFromGitHub {
owner = "dpayne";
diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix
index 4477cbbcc06a..7a4e25560c7b 100644
--- a/pkgs/applications/misc/clipit/default.nix
+++ b/pkgs/applications/misc/clipit/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor-icon-theme }:
stdenv.mkDerivation rec {
- name = "clipit-${version}";
+ pname = "clipit";
version = "1.4.2";
src = fetchurl {
- url = "https://github.com/downloads/shantzu/ClipIt/${name}.tar.gz";
+ url = "https://github.com/downloads/shantzu/ClipIt/${pname}-${version}.tar.gz";
sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva";
};
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ intltool gtk2 xdotool hicolor-icon-theme ];
meta = with stdenv.lib; {
- description = "Lightweight GTK+ Clipboard Manager";
+ description = "Lightweight GTK Clipboard Manager";
homepage = "http://clipit.rspwn.com";
license = licenses.gpl3;
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix
index e6e4ede6ac14..7577c0a3db99 100644
--- a/pkgs/applications/misc/clipmenu/default.nix
+++ b/pkgs/applications/misc/clipmenu/default.nix
@@ -3,7 +3,7 @@ let
runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ];
in
stdenv.mkDerivation rec {
- name = "clipmenu-${version}";
+ pname = "clipmenu";
version = "5.6.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix
index 3851730c4596..b07e0fb8c520 100644
--- a/pkgs/applications/misc/confclerk/default.nix
+++ b/pkgs/applications/misc/confclerk/default.nix
@@ -2,7 +2,8 @@
let version = "0.6.4"; in
stdenv.mkDerivation {
- name = "confclerk-${version}";
+ pname = "confclerk";
+ inherit version;
src = fetchurl {
url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz";
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index bd49323b03f1..c9dcc97d5cd1 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -3,7 +3,7 @@
mkDerivation rec {
version = "1.1.1";
- name = "cool-retro-term-${version}";
+ pname = "cool-retro-term";
src = fetchFromGitHub {
owner = "Swordfish90";
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 3ee357ce151b..2aad4d352c97 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "CopyQ-${version}";
+ pname = "CopyQ";
version = "3.9.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix
index 4d9975192461..0e9ff40cffa4 100644
--- a/pkgs/applications/misc/cpp-ethereum/default.nix
+++ b/pkgs/applications/misc/cpp-ethereum/default.nix
@@ -17,7 +17,7 @@
, extraCmakeFlags ? []
}:
stdenv.mkDerivation rec {
- name = "cpp-ethereum-${version}";
+ pname = "cpp-ethereum";
version = "1.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix
index 0123e0c38d74..72918a40733b 100644
--- a/pkgs/applications/misc/ctodo/default.nix
+++ b/pkgs/applications/misc/ctodo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, cmake, fetchurl, ncurses, readline }:
stdenv.mkDerivation rec {
- name = "ctodo-${version}";
+ pname = "ctodo";
version = "1.3";
src = fetchurl {
diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine.nix b/pkgs/applications/misc/cura/lulzbot/curaengine.nix
index e44f43d22bfe..90f5f307d853 100644
--- a/pkgs/applications/misc/cura/lulzbot/curaengine.nix
+++ b/pkgs/applications/misc/cura/lulzbot/curaengine.nix
@@ -1,7 +1,7 @@
{ stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }:
stdenv.mkDerivation rec {
- name = "curaengine-lulzBot-${version}";
+ pname = "curaengine-lulzBot";
version = "3.6.18";
src = fetchgit {
diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix
index 589111df78b8..4d32328af8b2 100644
--- a/pkgs/applications/misc/cura/lulzbot/libarcus.nix
+++ b/pkgs/applications/misc/cura/lulzbot/libarcus.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "libarcus";
version = "3.6.18";
format = "other";
diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
index 7a1781f62ce7..f8ffbf041bda 100644
--- a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
+++ b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "libsavitar-lulzbot";
name = "libsavitar-lulzbot";
version = "3.6.18";
diff --git a/pkgs/applications/misc/cura/lulzbot/uranium.nix b/pkgs/applications/misc/cura/lulzbot/uranium.nix
index 43869a0edc62..1ad755cdfbdd 100644
--- a/pkgs/applications/misc/cura/lulzbot/uranium.nix
+++ b/pkgs/applications/misc/cura/lulzbot/uranium.nix
@@ -1,7 +1,7 @@
{ stdenv, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake
, pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }:
-buildPythonPackage rec {
+buildPythonPackage {
version = "3.6.18";
pname = "uranium";
name = "uraniumLulzbot";
diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix
index a53b001b0e98..1972042f805e 100644
--- a/pkgs/applications/misc/cura/stable.nix
+++ b/pkgs/applications/misc/cura/stable.nix
@@ -4,7 +4,8 @@ let
version = "15.04";
in
stdenv.mkDerivation rec {
- name = "cura-${version}";
+ pname = "cura";
+ inherit version;
src = fetchurl {
url = "https://github.com/daid/Cura/archive/${version}.tar.gz";
diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix
index 4e620425d5c3..a367efaaef38 100644
--- a/pkgs/applications/misc/curabydagoma/default.nix
+++ b/pkgs/applications/misc/curabydagoma/default.nix
@@ -14,7 +14,7 @@
# If, however, someone needs it, we certainly can find a solution.
stdenv.mkDerivation rec {
- name = "curabydagoma-${version}";
+ pname = "curabydagoma";
# Version is the date, UNIX format
version = "1520506579";
# Hash of the user's choice: os, arch, package type...
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 823e6d6e2e99..3e4c77aafc6a 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, libarcus, stb, protobuf }:
stdenv.mkDerivation rec {
- name = "curaengine-${version}";
+ pname = "curaengine";
version = "4.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix
index ce743a008798..41f110e9ee10 100644
--- a/pkgs/applications/misc/curaengine/stable.nix
+++ b/pkgs/applications/misc/curaengine/stable.nix
@@ -3,7 +3,8 @@ let
version = "15.04.6";
in
stdenv.mkDerivation {
- name = "curaengine-${version}";
+ pname = "curaengine";
+ inherit version;
src = fetchurl {
url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz";
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 82d77b65f668..2e8217012160 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -6,8 +6,8 @@
# See `pkgs/applications/editors/eclipse/*.nix`
stdenv.mkDerivation rec {
- name = "dbeaver-ce-${version}";
- version = "6.1.4";
+ pname = "dbeaver-ce";
+ version = "6.1.5";
desktopItem = makeDesktopItem {
name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "1l4skcannbzddhm773dm3hwv3a7b3xy569gydcfczgdlgzgmlfjq";
+ sha256 = "0lkycm1152wd56i1hjq7q3sd05h51fyz99qr2n65lwi33vz2qk9m";
};
installPhase = ''
@@ -65,6 +65,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.asl20;
platforms = [ "x86_64-linux" ];
- maintainers = [ maintainers.samueldr ];
+ maintainers = [ maintainers.jojosch ];
};
}
diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix
index b010e5401b80..3cbb091a4e21 100644
--- a/pkgs/applications/misc/ddgr/default.nix
+++ b/pkgs/applications/misc/ddgr/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.6";
- name = "ddgr-${version}";
+ pname = "ddgr";
src = fetchFromGitHub {
owner = "jarun";
diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/applications/misc/deco/default.nix
index 7f4629100d5d..a1fdabd8ccb1 100644
--- a/pkgs/applications/misc/deco/default.nix
+++ b/pkgs/applications/misc/deco/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "deco";
version = "0.0.2";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "ebzzry";
diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix
index 4fb9ca5fa713..5699396a0840 100644
--- a/pkgs/applications/misc/devilspie2/default.nix
+++ b/pkgs/applications/misc/devilspie2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, lua, libwnck3 }:
stdenv.mkDerivation rec {
- name = "devilspie2-${version}";
+ pname = "devilspie2";
version = "0.43";
src = fetchurl {
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
index eeb7a8ccf526..1bfb6bbfeaf3 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }:
+{ stdenv, mkDerivation, fetchgit, cmake, file, qtbase, qttools, solid }:
let
version = "git-2016-01-10";
in
-stdenv.mkDerivation {
- name = "dfilemanager-${version}";
+mkDerivation {
+ pname = "dfilemanager";
+ inherit version;
src = fetchgit {
url = "git://git.code.sf.net/p/dfilemanager/code";
rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4";
@@ -13,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ cmake qtbase qttools file solid ];
- cmakeFlags = "-DQT5BUILD=true";
+ cmakeFlags = [ "-DQT5BUILD=true" ];
meta = {
homepage = http://dfilemanager.sourceforge.net/;
diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix
index 467c2b3c2d59..0016f89746d6 100644
--- a/pkgs/applications/misc/diff-pdf/default.nix
+++ b/pkgs/applications/misc/diff-pdf/default.nix
@@ -7,8 +7,8 @@ let
else
[ wxGTK ];
in
-stdenv.mkDerivation rec {
- name = "diff-pdf-${version}";
+stdenv.mkDerivation {
+ pname = "diff-pdf";
version = "2017-12-30";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix
index daea20835c8a..37ed8eb23fb6 100644
--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/pkgs/applications/misc/diffpdf/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "2.1.3";
- name = "diffpdf-${version}";
+ pname = "diffpdf";
src = fetchurl {
- url = "http://www.qtrac.eu/${name}.tar.gz";
+ url = "http://www.qtrac.eu/${pname}-${version}.tar.gz";
sha256 = "0cr468fi0d512jjj23r5flfzx957vibc9c25gwwhi0d773h2w566";
};
@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
install -Dpm755 -D diffpdf $out/bin/diffpdf
install -Dpm644 -D diffpdf.1 $out/share/man/man1/diffpdf.1
- install -dpm755 $out/share/doc/${name} $out/share/licenses/${name} $out/share/icons $out/share/pixmaps $out/share/applications
- install -Dpm644 CHANGES README help.html $out/share/doc/${name}/
- install -Dpm644 gpl-2.0.txt $out/share/licenses/${name}/
+ install -dpm755 $out/share/doc/${pname}-${version} $out/share/licenses/${pname}-${version} $out/share/icons $out/share/pixmaps $out/share/applications
+ install -Dpm644 CHANGES README help.html $out/share/doc/${pname}-${version}/
+ install -Dpm644 gpl-2.0.txt $out/share/licenses/${pname}-${version}/
install -Dpm644 images/icon.png $out/share/icons/diffpdf.png
install -Dpm644 images/icon.png $out/share/pixmaps/diffpdf.png
diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix
index 58bc483d43f3..a4f6b1ce9881 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/applications/misc/digitalbitbox/default.nix
@@ -47,7 +47,7 @@ let
copyUdevRuleToOutput = name: rule:
"cp ${writeText name rule} $out/etc/udev/rules.d/${name}";
in stdenv.mkDerivation rec {
- name = "digitalbitbox-${version}";
+ pname = "digitalbitbox";
version = "2.2.2";
src = fetchFromGitHub {
@@ -81,7 +81,7 @@ in stdenv.mkDerivation rec {
LUPDATE="${qttools.dev}/bin/lupdate";
LRELEASE="${qttools.dev}/bin/lrelease";
MOC="${qtbase.dev}/bin/moc";
- QTDIR="${qtbase.dev}";
+ QTDIR=qtbase.dev;
RCC="${qtbase.dev}/bin/rcc";
UIC="${qtbase.dev}/bin/uic";
diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix
index f1e33ea53571..8f7dbd2d2eda 100644
--- a/pkgs/applications/misc/direwolf/default.nix
+++ b/pkgs/applications/misc/direwolf/default.nix
@@ -5,7 +5,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "direwolf-${version}";
+ pname = "direwolf";
version = "1.4";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/applications/misc/doing/default.nix
index 20c802a1cbdf..d72a5b848261 100644
--- a/pkgs/applications/misc/doing/default.nix
+++ b/pkgs/applications/misc/doing/default.nix
@@ -1,7 +1,7 @@
{ lib, bundlerEnv, ruby, bundlerUpdateScript
}:
-bundlerEnv rec {
+bundlerEnv {
pname = "doing";
version = (import ./gemset.nix).doing.version;
diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix
index fd08ed9c3916..1332b265d54c 100644
--- a/pkgs/applications/misc/doomseeker/default.nix
+++ b/pkgs/applications/misc/doomseeker/default.nix
@@ -1,7 +1,7 @@
{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }:
-stdenv.mkDerivation rec {
- name = "doomseeker-${version}";
+stdenv.mkDerivation {
+ pname = "doomseeker";
version = "2018-03-05";
src = fetchFromBitbucket {
diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix
index 1d3c405b7038..5150f13fb80c 100644
--- a/pkgs/applications/misc/dotfiles/default.nix
+++ b/pkgs/applications/misc/dotfiles/default.nix
@@ -2,7 +2,6 @@
pythonPackages.buildPythonApplication rec {
pname = "dotfiles";
- name = "${pname}-${version}";
version = "0.6.4";
src = pythonPackages.fetchPypi {
diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/applications/misc/dozenal/default.nix
index b5ae9fb567ca..226bdea03013 100644
--- a/pkgs/applications/misc/dozenal/default.nix
+++ b/pkgs/applications/misc/dozenal/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "12010904";
- name = "dozenal-${version}";
+ pname = "dozenal";
src = fetchFromGitHub {
owner = "dgoodmaniii";
repo = "dozenal";
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index 6c802e683ce9..ae83802a7b44 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -2,11 +2,11 @@
librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }:
stdenv.mkDerivation rec {
- name = "eaglemode-${version}";
+ pname = "eaglemode";
version = "0.94.1";
src = fetchurl {
- url = "mirror://sourceforge/eaglemode/${name}.tar.bz2";
+ url = "mirror://sourceforge/eaglemode/${pname}-${version}.tar.bz2";
sha256 = "0mpnk0fzy02jxbafipkdkj48m6k38h42j599gw4sdnag7ymlms89";
};
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 9607f428ab9e..913afd766d3d 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "electron-cash";
- version = "4.0.7";
+ version = "4.0.10";
src = fetchurl {
url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";
# Verified using official SHA-1 and signature from
# https://github.com/fyookball/keys-n-hashes
- sha256 = "d63ef2d52cff0b821b745067d752fd0c7f2902fa23eaf8e9392c54864cae5c77";
+ sha256 = "48270e12956a2f4ef4d2b0cb60611e47f136b734a3741dab176542a32ae59ee5";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix
index 98ed10b0c7cc..8ba562de1cb7 100644
--- a/pkgs/applications/misc/electrum/dash.nix
+++ b/pkgs/applications/misc/electrum/dash.nix
@@ -2,7 +2,7 @@
python2Packages.buildPythonApplication rec {
version = "2.9.3.1";
- name = "electrum-dash-${version}";
+ pname = "electrum-dash";
src = fetchurl {
url = "https://github.com/akhavr/electrum-dash/releases/download/${version}/Electrum-DASH-${version}.tar.gz";
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 5233aaf8fcdb..0ebeb1beffa1 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1
+{ stdenv, fetchurl, fetchFromGitHub, wrapQtAppsHook, python3, python3Packages, zbar, secp256k1
, enableQt ? !stdenv.isDarwin
@@ -40,7 +40,7 @@ let
};
in
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "electrum";
inherit version;
@@ -54,6 +54,8 @@ python3Packages.buildPythonApplication rec {
cp -ar ${tests} $sourceRoot/electrum/tests
'';
+ nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ];
+
propagatedBuildInputs = with python3Packages; [
aiorpcx
aiohttp
@@ -86,7 +88,7 @@ python3Packages.buildPythonApplication rec {
--replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}
'' + (if enableQt then ''
substituteInPlace ./electrum/qrscanner.py \
- --replace ${libzbar_name} ${zbar}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}
+ --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}
'' else ''
sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt
'');
@@ -102,6 +104,11 @@ python3Packages.buildPythonApplication rec {
"Exec=$out/bin/electrum %u" \
--replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \
"Exec=$out/bin/electrum --testnet %u"
+
+ '';
+
+ postFixup = stdenv.lib.optionalString enableQt ''
+ wrapQtApp $out/bin/electrum
'';
checkInputs = with python3Packages; [ pytest ];
diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index a5e4bd74a6eb..0a28efbc28cd 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -5,7 +5,7 @@
python3Packages.buildPythonApplication rec {
pname = "electrum-ltc";
- version = "3.1.3.1";
+ version = "3.3.8.1";
src = fetchurl {
url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz";
diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index d447e7f50d52..62358d41cc53 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "emem";
version = "0.2.50";
- name = "${pname}-${version}";
inherit jdk;
diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix
index b6c10dbebcad..de922bb39900 100644
--- a/pkgs/applications/misc/epdfview/default.nix
+++ b/pkgs/applications/misc/epdfview/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }:
stdenv.mkDerivation rec {
- name = "epdfview-${version}";
+ pname = "epdfview";
version = "0.1.8";
src = fetchurl {
@@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://packages.debian.org/wheezy/epdfview;
- description = "A lightweight PDF document viewer using Poppler and GTK+";
+ description = "A lightweight PDF document viewer using Poppler and GTK";
longDescription = ''
- ePDFView is a free lightweight PDF document viewer using Poppler and
- GTK+ libraries. The aim of ePDFView is to make a simple PDF document
- viewer, in the lines of Evince but without using the Gnome libraries.
+ ePDFView is a free lightweight PDF document viewer using Poppler and
+ GTK libraries. The aim of ePDFView is to make a simple PDF document
+ viewer, in the lines of Evince but without using the Gnome libraries.
'';
license = licenses.gpl2;
maintainers = [ maintainers.astsmtl ];
diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix
index bf1ae3037fc4..d8b355efe86d 100644
--- a/pkgs/applications/misc/et/default.nix
+++ b/pkgs/applications/misc/et/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk-pixbuf }:
stdenv.mkDerivation rec {
- name = "et-${version}";
+ pname = "et";
version = "0.1.1";
src = fetchFromGitHub {
owner = "geistesk";
repo = "et";
- rev = "${version}";
+ rev = version;
sha256 = "167w9qwfpd63rgy0xmkkkh5krmd91q42c3ijy3j099krgdfbb9bc";
};
diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/misc/eterm/default.nix
index 98b47990314d..56cac7ca9185 100644
--- a/pkgs/applications/misc/eterm/default.nix
+++ b/pkgs/applications/misc/eterm/default.nix
@@ -3,7 +3,7 @@
, pkgconfig, imlib2, libast }:
stdenv.mkDerivation rec {
- name = "eterm-${version}";
+ pname = "eterm";
version = "0.9.6";
srcName = "Eterm-${version}";
diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix
index b8bd0a59bea2..e9d1317390ed 100644
--- a/pkgs/applications/misc/eureka-editor/default.nix
+++ b/pkgs/applications/misc/eureka-editor/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, fltk, zlib, xdg_utils, xorg, libjpeg, libGL }:
stdenv.mkDerivation rec {
- name = "eureka-editor-${version}";
+ pname = "eureka-editor";
version = "1.21";
shortver = "121";
diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix
index 4746f4ead1bb..984ade077a8a 100644
--- a/pkgs/applications/misc/evilvte/default.nix
+++ b/pkgs/applications/misc/evilvte/default.nix
@@ -3,8 +3,8 @@
configH ? ""
}:
-stdenv.mkDerivation rec {
- name = "evilvte-${version}";
+stdenv.mkDerivation {
+ pname = "evilvte";
version = "0.5.2-20140827";
src = fetchgit {
diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix
index 3d715a1d16bd..d6d20367b060 100644
--- a/pkgs/applications/misc/evtest/default.nix
+++ b/pkgs/applications/misc/evtest/default.nix
@@ -1,14 +1,15 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }:
stdenv.mkDerivation rec {
- name = "evtest-1.33";
+ pname = "evtest";
+ version = "1.34";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libxml2 ];
src = fetchgit {
- url = "git://anongit.freedesktop.org/evtest";
- rev = "refs/tags/evtest-1.33";
+ url = "git://anongit.freedesktop.org/${pname}";
+ rev = "refs/tags/${pname}-${version}";
sha256 = "168gdhzj11f4nk94a6z696sm8v1njzwww69bn6wr97l17897913g";
};
diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
index 21fed2e28def..6d04cef76ce7 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "exercism-${version}";
+ pname = "exercism";
version = "3.0.11";
goPackagePath = "github.com/exercism/cli";
diff --git a/pkgs/applications/misc/extract_url/default.nix b/pkgs/applications/misc/extract_url/default.nix
index 2b7888c9cd04..f96d3f0f57c7 100644
--- a/pkgs/applications/misc/extract_url/default.nix
+++ b/pkgs/applications/misc/extract_url/default.nix
@@ -10,7 +10,7 @@ let
++ lib.optional uriFindSupport perlPackages.URIFind;
in stdenv.mkDerivation rec {
- name = "extract_url-${version}";
+ pname = "extract_url";
version = "1.6.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index e9d194666094..bbbf1a0aff9b 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -4,7 +4,8 @@ let
version = "6.3.26";
in
stdenv.mkDerivation {
- name="fetchmail-${version}";
+ pname = "fetchmail";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/fetchmail.berlios/fetchmail-${version}.tar.bz2";
diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix
index f70042884a8a..06cf3c06ffa6 100644
--- a/pkgs/applications/misc/flamerobin/default.nix
+++ b/pkgs/applications/misc/flamerobin/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.9.3.1";
- name = "flamerobin-${version}";
+ pname = "flamerobin";
src = fetchFromGitHub {
owner = "mariuz";
diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix
index 4e786bfb36f8..2ca059820ef0 100644
--- a/pkgs/applications/misc/fme/default.nix
+++ b/pkgs/applications/misc/fme/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec{
- name = "fme-${version}";
+ pname = "fme";
version = "1.1.3";
src = fetchurl {
diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index f0da4e883517..5df34c84f096 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -49,13 +49,13 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://fontmanager.github.io/;
- description = "Simple font management for GTK+ desktop environments";
+ description = "Simple font management for GTK desktop environments";
longDescription = ''
Font Manager is intended to provide a way for average users to
easily manage desktop fonts, without having to resort to command
line tools or editing configuration files by hand. While designed
primarily with the Gnome Desktop Environment in mind, it should
- work well with other Gtk+ desktop environments.
+ work well with other GTK desktop environments.
Font Manager is NOT a professional-grade font management solution.
'';
diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix
index 5152c8aa3f7c..aee3937689b3 100644
--- a/pkgs/applications/misc/freemind/default.nix
+++ b/pkgs/applications/misc/freemind/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jdk, jre, ant }:
stdenv.mkDerivation rec {
- name = "freemind-${version}";
+ pname = "freemind";
version = "1.0.1";
src = fetchurl {
diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix
index 9a34694e2f25..67d4bd65a9f9 100644
--- a/pkgs/applications/misc/gImageReader/default.nix
+++ b/pkgs/applications/misc/gImageReader/default.nix
@@ -15,7 +15,7 @@ let
pythonEnv = python3.withPackages( ps: with ps;[ pygobject3 ] );
in
stdenv.mkDerivation rec {
- name = "gImageReader-${version}";
+ pname = "gImageReader";
version = "3.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix
index 44071b328758..ecf8ae9da8d4 100644
--- a/pkgs/applications/misc/galculator/default.nix
+++ b/pkgs/applications/misc/galculator/default.nix
@@ -3,7 +3,7 @@
, gtk, pkgconfig, flex }:
stdenv.mkDerivation rec {
- name = "galculator-${version}";
+ pname = "galculator";
version = "2.1.4";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index 6b57c74c1234..169c5c11b8ce 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "gallery_dl";
- version = "1.10.2";
+ version = "1.10.3";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "09q9l747vv6nrkscj08dv970qs6nm2azjcm015xf3bd5ab91l44r";
+ sha256 = "1ippn0zbjy69n178vh4wgyzy6723ynvj2w23mzqw7v2mzcvkhmdz";
};
doCheck = false;
diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index 739df59b31c5..fb6902634da8 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -7,7 +7,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "gammu-${version}";
+ pname = "gammu";
version = "1.40.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix
index dd0a5c9a4f60..96d3d34046e1 100644
--- a/pkgs/applications/misc/ganttproject-bin/default.nix
+++ b/pkgs/applications/misc/ganttproject-bin/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "ganttproject-bin-${version}";
+ pname = "ganttproject-bin";
version = "2.8.10";
src = let build = "r2364"; in fetchzip {
diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix
index a3aebf227339..f5eb6e188b7a 100644
--- a/pkgs/applications/misc/gcal/default.nix
+++ b/pkgs/applications/misc/gcal/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "gcal-${version}";
+ pname = "gcal";
version = "4.1";
src = fetchurl {
- url = "mirror://gnu/gcal/${name}.tar.xz";
+ url = "mirror://gnu/gcal/${pname}-${version}.tar.xz";
sha256 = "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci";
};
diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix
index 2fadc89c48d9..b2a992b850e1 100644
--- a/pkgs/applications/misc/getxbook/default.nix
+++ b/pkgs/applications/misc/getxbook/default.nix
@@ -1,20 +1,20 @@
{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation rec {
- name = "getxbook-${version}";
+ pname = "getxbook";
version = "1.2";
src = fetchurl {
- url = "https://njw.me.uk/getxbook/${name}.tar.xz";
+ url = "https://njw.me.uk/getxbook/${pname}-${version}.tar.xz";
sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs";
};
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=deprecated-declarations" ];
+
buildInputs = [ openssl ];
makeFlags = [ "PREFIX=$(out)" ];
- NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
-
meta = with stdenv.lib; {
description = "A collection of tools to download books from Google Books";
homepage = https://njw.me.uk/getxbook/;
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 4d990c69b4a3..c2b7487cd72f 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
homepage = https://pwmt.org/projects/girara/;
description = "User interface library";
longDescription = ''
- girara is a library that implements a GTK+ based VIM-like user interface
+ girara is a library that implements a GTK based VIM-like user interface
that focuses on simplicity and minimalism.
'';
license = licenses.zlib;
diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix
index 4af776674e63..4a806cbb183d 100644
--- a/pkgs/applications/misc/gksu/default.nix
+++ b/pkgs/applications/misc/gksu/default.nix
@@ -5,10 +5,9 @@
stdenv.mkDerivation rec {
version = "2.0.2";
pname = "gksu";
- name = "${pname}-${version}";
src = fetchurl {
- url = "http://people.debian.org/~kov/gksu/${name}.tar.gz";
+ url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz";
sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1";
};
@@ -40,7 +39,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A graphical frontend for libgksu";
longDescription = ''
- GKSu is a library that provides a Gtk+ frontend to su and sudo.
+ GKSu is a library that provides a GTK frontend to su and sudo.
It supports login shells and preserving environment when acting as
a su frontend. It is useful to menu items or other graphical
programs that need to ask a user's password to run another program
diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix
index 3831780c7919..6f5146161a6d 100644
--- a/pkgs/applications/misc/glava/default.nix
+++ b/pkgs/applications/misc/glava/default.nix
@@ -21,7 +21,7 @@ let
'';
in
stdenv.mkDerivation rec {
- name = "glava-${version}";
+ pname = "glava";
version = "1.6.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
index 47fb50242c1d..50dda9510b91 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@@ -5,10 +5,11 @@ let
in
stdenv.mkDerivation rec {
- name = "gmrun-${version}";
+ pname = "gmrun";
+ inherit version;
src = fetchurl {
- url = "mirror://sourceforge/gmrun/${name}.tar.gz";
+ url = "mirror://sourceforge/gmrun/${pname}-${version}.tar.gz";
sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p";
};
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
description = "Gnome Completion-Run Utility";
longDescription = ''
A simple program which provides a "run program" window, featuring a bash-like TAB completion.
- It uses GTK+ interface.
+ It uses GTK interface.
Also, supports CTRL-R / CTRL-S / "!" for searching through history.
Running commands in a terminal with CTRL-Enter. URL handlers.
'';
diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix
index bb1556c7c4dc..c8bbcf2aa7f3 100644
--- a/pkgs/applications/misc/gmtp/default.nix
+++ b/pkgs/applications/misc/gmtp/default.nix
@@ -5,7 +5,8 @@
let version = "1.3.11"; in
stdenv.mkDerivation {
- name = "gmtp-${version}";
+ pname = "gmtp";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz";
diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix
new file mode 100644
index 000000000000..11bfbaaacd07
--- /dev/null
+++ b/pkgs/applications/misc/gnome-multi-writer/default.nix
@@ -0,0 +1,62 @@
+{ stdenv
+, fetchurl
+, appstream-glib
+, desktop-file-utils
+, gettext
+, glib
+, gnome3
+, gtk3
+, gusb
+, libcanberra-gtk3
+, libgudev
+, meson
+, ninja
+, pkgconfig
+, wrapGAppsHook
+, polkit
+, udisks
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gnome-multi-writer";
+ version = "3.32.1";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "1apdd8yi12zagf82k376a9wmdm27wzwdxpm2wf2pnwkaf786rmdw";
+ };
+
+ nativeBuildInputs = [
+ appstream-glib
+ desktop-file-utils
+ gettext
+ meson
+ ninja
+ pkgconfig
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ gtk3
+ gusb
+ libcanberra-gtk3
+ libgudev
+ polkit
+ udisks
+ ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
+ meta = with stdenv.lib; {
+ description = "Tool for writing an ISO file to multiple USB devices at once";
+ homepage = https://wiki.gnome.org/Apps/MultiWriter;
+ license = licenses.gpl2Plus;
+ maintainers = gnome3.maintainers;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix
index e2cf8245ce67..7a918d961f63 100644
--- a/pkgs/applications/misc/gnome15/default.nix
+++ b/pkgs/applications/misc/gnome15/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, gnome_python, gnome_python_desktop }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "gnome15-2016-06-10";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix
index b80ddb8f303f..f8da250dbc79 100644
--- a/pkgs/applications/misc/go-jira/default.nix
+++ b/pkgs/applications/misc/go-jira/default.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "go-jira-${version}";
+ pname = "go-jira";
version = "1.0.17";
goPackagePath = "gopkg.in/Netflix-Skunkworks/go-jira.v1";
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 0af84365158e..7fba1d49d747 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -15,7 +15,7 @@ let
categories = "Application;Utility;";
};
in mkDerivation rec {
- name = "golden-cheetah-${version}";
+ pname = "golden-cheetah";
version = "3.5-DEV1903";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 6a5f4c9ce034..e917cc024d5b 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -1,7 +1,7 @@
{ mkDerivation, lib, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell
, libao, ffmpeg, libeb, lzo, xz, libtiff, opencc
, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }:
-mkDerivation rec {
+mkDerivation {
name = "goldendict-2019-08-01";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix
index 62f2d7a069d9..e9a177ee1937 100644
--- a/pkgs/applications/misc/gollum/default.nix
+++ b/pkgs/applications/misc/gollum/default.nix
@@ -2,7 +2,6 @@
, git }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "gollum";
# nix-shell -p bundix icu zlib
version = (import ./gemset.nix).gollum.version;
@@ -10,7 +9,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
env = bundlerEnv {
- name = "${name}-gems";
+ name = "${pname}-${version}-gems";
inherit pname ruby;
gemdir = ./.;
};
diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
index 0fccf83acf76..961efe4b0576 100644
--- a/pkgs/applications/misc/googleearth/default.nix
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -40,7 +40,8 @@ let
];
in
stdenv.mkDerivation rec {
- name = "googleearth-${version}";
+ pname = "googleearth";
+ inherit version;
src = fetchurl {
url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_${version}-r0_${arch}.deb";
inherit sha256;
diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
index 3dcbcaf38b87..12eb8839b8a8 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/pkgs/applications/misc/googler/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "3.9";
- name = "googler-${version}";
+ pname = "googler";
src = fetchFromGitHub {
owner = "jarun";
diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix
index 464e0ba53346..41cdf267f5de 100644
--- a/pkgs/applications/misc/gosmore/default.nix
+++ b/pkgs/applications/misc/gosmore/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
src = fetchsvn {
url = http://svn.openstreetmap.org/applications/rendering/gosmore;
sha256 = "0qsckpqx7i7f8gkqhkzdamr65250afk1rpnh3nbman35kdv3dsxi";
- rev = "${version}";
+ rev = version;
ignoreExternals = true;
};
diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix
index 4143f6fde559..9954ff660adc 100644
--- a/pkgs/applications/misc/gpg-mdp/default.nix
+++ b/pkgs/applications/misc/gpg-mdp/default.nix
@@ -3,7 +3,8 @@
let version = "0.7.4";
in stdenv.mkDerivation {
# mdp renamed to gpg-mdp because there is a mdp package already.
- name = "gpg-mdp-${version}";
+ pname = "gpg-mdp";
+ inherit version;
meta = {
homepage = https://tamentis.com/projects/mdp/;
license = [stdenv.lib.licenses.isc];
diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix
index 7b23fca2121e..c1c2a44bd7f2 100644
--- a/pkgs/applications/misc/gphoto2/gphotofs.nix
+++ b/pkgs/applications/misc/gphoto2/gphotofs.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libtool, pkgconfig, libgphoto2, fuse, glib }:
stdenv.mkDerivation rec {
- name = "gphoto2fs-${version}";
+ pname = "gphoto2fs";
version = "0.5.0";
src = fetchurl {
url="mirror://sourceforge/gphoto/gphotofs/${version}/gphotofs-0.5.tar.bz2";
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index aa0ed5f64632..9d244ca18f32 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }:
stdenv.mkDerivation rec {
- name = "gpsbabel-${version}";
+ pname = "gpsbabel";
version = "1.6.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix
index 5bcaccb43bcf..d10507b10449 100644
--- a/pkgs/applications/misc/gpscorrelate/default.nix
+++ b/pkgs/applications/misc/gpscorrelate/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
];
makeFlags = [
- "prefix=${placeholder ''out''}"
+ "prefix=${placeholder "out"}"
"GTK=3"
"CC=cc"
"CXX=c++"
diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index 4f0c1864677c..9c0dc48d42ee 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre8 }:
stdenv.mkDerivation rec {
- name = "gpsprune-${version}";
+ pname = "gpsprune";
version = "19.2";
src = fetchurl {
diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix
index 735818171e80..04ab062c1a1b 100644
--- a/pkgs/applications/misc/gpx-viewer/default.nix
+++ b/pkgs/applications/misc/gpx-viewer/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, intltool, libxml2, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "gpx-viewer-${version}";
+ pname = "gpx-viewer";
version = "0.4.0";
src = fetchurl {
- url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${name}.tar.gz";
+ url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80";
};
diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/applications/misc/gpx/default.nix
index 9fef93819492..a341a212a37f 100644
--- a/pkgs/applications/misc/gpx/default.nix
+++ b/pkgs/applications/misc/gpx/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "gpx-${version}";
+ pname = "gpx";
version = "2.5.2";
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index e9026ded4702..84be50ccb5e5 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -10,7 +10,7 @@ let
inherit (pythonPackages) python buildPythonApplication;
in buildPythonApplication rec {
version = "5.0.1";
- name = "gramps-${version}";
+ pname = "gramps";
nativeBuildInputs = [ wrapGAppsHook gettext ];
buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ]
@@ -48,7 +48,7 @@ in buildPythonApplication rec {
eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth
if [ -e "$eapth" ]; then
# move colliding easy_install.pth to specifically named one
- mv "$eapth" $(dirname "$eapth")/${name}.pth
+ mv "$eapth" $(dirname "$eapth")/${pname}-${version}.pth
fi
rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix
index cb4f4748eec1..d86db7adb9d0 100644
--- a/pkgs/applications/misc/green-pdfviewer/default.nix
+++ b/pkgs/applications/misc/green-pdfviewer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }:
-stdenv.mkDerivation rec {
- name = "green-pdfviewer-${version}";
+stdenv.mkDerivation {
+ pname = "green-pdfviewer";
version = "nightly-2014-04-22";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix
index 9274c2d05216..87e636b9c030 100644
--- a/pkgs/applications/misc/gremlin-console/default.nix
+++ b/pkgs/applications/misc/gremlin-console/default.nix
@@ -1,7 +1,7 @@
{ fetchzip, stdenv, makeWrapper, openjdk }:
stdenv.mkDerivation rec {
- name = "gremlin-console-${version}";
+ pname = "gremlin-console";
version = "3.3.4";
src = fetchzip {
url = "http://www-eu.apache.org/dist/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";
diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index cb407fca66cb..7f2057b2947a 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
meta = {
- description = "GTK+-based audio CD player/ripper";
+ description = "GTK-based audio CD player/ripper";
homepage = http://nostatic.org/grip;
license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix
index 7f3b3a8d6dc5..ea78331e4764 100644
--- a/pkgs/applications/misc/gsimplecal/default.nix
+++ b/pkgs/applications/misc/gsimplecal/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }:
stdenv.mkDerivation rec {
- name = "gsimplecal-${version}";
+ pname = "gsimplecal";
version = "2.1";
src = fetchurl {
diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix
index 8f683272e120..9b8d6a7f976b 100644
--- a/pkgs/applications/misc/gtk2fontsel/default.nix
+++ b/pkgs/applications/misc/gtk2fontsel/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.1";
- name = "gtk2fontsel-${version}";
+ pname = "gtk2fontsel";
src = fetchurl {
- url = "mirror://sourceforge/gtk2fontsel/${name}.tar.gz";
+ url = "mirror://sourceforge/gtk2fontsel/${pname}-${version}.tar.gz";
sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw";
};
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
preferLocalBuild = true;
meta = with stdenv.lib; {
- description = "A font selection program for X11 using the GTK2 toolkit";
+ description = "A font selection program for X11 using the GTK 2 toolkit";
longDescription = ''
- Font selection tool similar to xfontsel implemented using GTK+ 2.
+ Font selection tool similar to xfontsel implemented using GTK 2.
Trivial, but useful nonetheless.
'';
homepage = http://gtk2fontsel.sourceforge.net/;
diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix
index 37352915cb84..97303c43fb1a 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/misc/guake/default.nix
@@ -3,7 +3,7 @@
let
version = "3.6.3";
-in python3.pkgs.buildPythonApplication rec {
+in python3.pkgs.buildPythonApplication {
name = "guake-${version}";
format = "other";
diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix
index 1e237923d054..273be11ac63a 100644
--- a/pkgs/applications/misc/gummi/default.nix
+++ b/pkgs/applications/misc/gummi/default.nix
@@ -5,12 +5,12 @@
stdenv.mkDerivation rec {
version = "0.6.6";
- name = "gummi-${version}";
+ pname = "gummi";
src = pkgs.fetchFromGitHub {
owner = "alexandervdm";
repo = "gummi";
- rev = "${version}";
+ rev = version;
sha256 = "1vw8rhv8qj82l6l22kpysgm9mxilnki2kjmvxsnajbqcagr6s7cn";
};
diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix
index a9e6d905c284..a7313e7c969b 100644
--- a/pkgs/applications/misc/gxmessage/default.nix
+++ b/pkgs/applications/misc/gxmessage/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo, hicolor-icon-theme }:
stdenv.mkDerivation rec {
- name = "gxmessage-${version}";
+ pname = "gxmessage";
version = "3.4.3";
src = fetchurl {
- url = "http://homepages.ihug.co.nz/~trmusson/stuff/${name}.tar.gz";
+ url = "http://homepages.ihug.co.nz/~trmusson/stuff/${pname}-${version}.tar.gz";
sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05";
};
diff --git a/pkgs/applications/misc/hdate/default.nix b/pkgs/applications/misc/hdate/default.nix
index e2f5f653d47c..989dfb886ec3 100644
--- a/pkgs/applications/misc/hdate/default.nix
+++ b/pkgs/applications/misc/hdate/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.6.02";
- name = "hdate-${version}";
+ pname = "hdate";
src = fetchurl {
url = "https://sourceforge.net/projects/libhdate/files/libhdate/libhdate-${version}/libhdate-${version}.tar.bz2";
sha256 = "3c930a8deb57c01896dc37f0d7804e5a330ee8e88c4ff610b71f9d2b02c17762";
diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix
index 1647a09edfd6..a5a9187ab0f2 100644
--- a/pkgs/applications/misc/hello-unfree/default.nix
+++ b/pkgs/applications/misc/hello-unfree/default.nix
@@ -1,7 +1,7 @@
{ stdenv, runtimeShell }:
-stdenv.mkDerivation rec {
- name = "example-unfree-package-${version}";
+stdenv.mkDerivation {
+ pname = "example-unfree-package";
version = "1.0";
phases = [ "installPhase" "fixupPhase" ];
diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix
index 63a8af99f7cf..8bae8ce373c7 100644
--- a/pkgs/applications/misc/hello/default.nix
+++ b/pkgs/applications/misc/hello/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "hello-${version}";
+ pname = "hello";
version = "2.10";
src = fetchurl {
- url = "mirror://gnu/hello/${name}.tar.gz";
+ url = "mirror://gnu/hello/${pname}-${version}.tar.gz";
sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
};
diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix
index 0431f35057be..84f5bad24d21 100644
--- a/pkgs/applications/misc/hivemind/default.nix
+++ b/pkgs/applications/misc/hivemind/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "hivemind-${version}";
+ pname = "hivemind";
version = "1.0.4";
goPackagePath = "github.com/DarthSim/hivemind";
diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix
index 607dff293189..ce35e91d9278 100644
--- a/pkgs/applications/misc/houdini/default.nix
+++ b/pkgs/applications/misc/houdini/default.nix
@@ -2,7 +2,7 @@
let
houdini-runtime = callPackage ./runtime.nix { };
-in buildFHSUserEnv rec {
+in buildFHSUserEnv {
name = "houdini-${houdini-runtime.version}";
extraBuildCommands = ''
diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index 500f1df36a0c..88c87eaca871 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -30,7 +30,7 @@ let
in
stdenv.mkDerivation rec {
version = "17.0.352";
- name = "houdini-runtime-${version}";
+ pname = "houdini-runtime";
src = requireFile rec {
name = "houdini-${version}-linux_x86_64_gcc6.3.tar.gz";
sha256 = "0cl5fkgaplb0cvv7mli06ffc9j4ngpy8hl5zqabj3d645gcgafjg";
diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix
index 2fd56e3c5552..437c42b03317 100644
--- a/pkgs/applications/misc/hr/default.nix
+++ b/pkgs/applications/misc/hr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "hr-${version}";
+ pname = "hr";
version = "1.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index 7cdf1a319f69..0d25d3d686c9 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -2,7 +2,7 @@
, autoreconfHook, pkgconfig, gettext }:
stdenv.mkDerivation rec {
- name = "hstr-${version}";
+ pname = "hstr";
version = "2.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix
index acdeec10d300..b2997ece5d56 100644
--- a/pkgs/applications/misc/hubstaff/default.nix
+++ b/pkgs/applications/misc/hubstaff/default.nix
@@ -17,7 +17,8 @@ let
in
stdenv.mkDerivation {
- name = "hubstaff-${version}";
+ pname = "hubstaff";
+ inherit version;
src = fetchurl { inherit sha256 url; };
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 2b49a5ae9a97..720445be9bea 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -1,8 +1,8 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
- name = "hugo-${version}";
- version = "0.57.2";
+ pname = "hugo";
+ version = "0.58.0";
goPackagePath = "github.com/gohugoio/hugo";
@@ -10,10 +10,10 @@ buildGoModule rec {
owner = "gohugoio";
repo = "hugo";
rev = "v${version}";
- sha256 = "1cqvm2fj6hh2n9iv67vamhn23fbxmmwciks0r4h4y0hapzlzpyd8";
+ sha256 = "0971li0777c1s67w72wl1y0b58ky93dw05hbk3s4kqys0acanc2d";
};
- modSha256 = "09r7r1s5b2fvnzpzjarpv2lnvp6bxdfschiq6352hw631n7kkyz1";
+ modSha256 = "14ylbh2hx14swcqvawprbx5gynkwyb0nlp5acr4fjy1zl0ifc790";
buildFlags = "-tags extended";
diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index f8d808a49c29..f21675e60b2d 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -12,7 +12,7 @@ let
in
stdenv.mkDerivation rec {
version = "2.1.2";
- name = "hyper-${version}";
+ pname = "hyper";
src = fetchurl {
url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb";
sha256 = "1n4qlbk7q9zkhhg72mdks95g15xgyrc6ixf882ghvrqghd4zxplm";
diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix
index c0c1faef09d2..c197e1a8fd38 100644
--- a/pkgs/applications/misc/icesl/default.nix
+++ b/pkgs/applications/misc/icesl/default.nix
@@ -3,7 +3,7 @@ let
lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ];
in
stdenv.mkDerivation rec {
- name = "iceSL-${version}";
+ pname = "iceSL";
version = "2.1.10";
src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip {
diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix
index d9bccee889ab..7daa2704e22b 100644
--- a/pkgs/applications/misc/ipmicfg/default.nix
+++ b/pkgs/applications/misc/ipmicfg/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
- name = "ipmicfg-${version}";
+ pname = "ipmicfg";
version = "1.29.0";
buildVersion = "181029";
diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index b5fa9143ddbb..64e0f0d325b5 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }:
stdenv.mkDerivation rec {
- name = "IPMIView-${version}";
+ pname = "IPMIView";
version = "2.14.0";
buildVersion = "180213";
diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix
index e493226be60a..d63576d5cbd0 100644
--- a/pkgs/applications/misc/iterm2/default.nix
+++ b/pkgs/applications/misc/iterm2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "iterm2-${version}";
+ pname = "iterm2";
version = "3.0.14";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
index 5939d7789b4e..c8951059d4c8 100644
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ b/pkgs/applications/misc/jbidwatcher/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
pname = "jbidwatcher";
version = "2.5.6";
- name = "${pname}-${version}";
-
src = fetchurl {
url = "http://www.jbidwatcher.com/download/JBidwatcher-${version}.jar";
sha256 = "1cw59wh72w1zzibs8x64dma3jc4hry64wjksqs52nc3vpnf0fzfr";
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index 9ae9ab254e80..4d4dd248bc53 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -21,7 +21,7 @@ let
# Else: Don't modify the arguments:
exec ${ruby}/bin/ruby "$@"
'';
-in bundlerApp rec {
+in bundlerApp {
pname = "jekyll";
exes = [ "jekyll" ];
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 8838de9ac961..4b70530987f1 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,12 +1,12 @@
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11, libXxf86vm }:
stdenv.mkDerivation rec {
- name = "josm-${version}";
- version = "15238";
+ pname = "josm";
+ version = "15322";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "0zh84glb4545av0s1qnccqqp8nrnfsr7rnwgbqpwwzvc2ngk91gv";
+ sha256 = "1i6cxs6rvqjwh7yfji5701xdzpnaxcv97gsd692fjrwasnsx1f1i";
};
buildInputs = [ jdk11 makeWrapper ];
diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix
index 138ee397d3fd..2a9e162e7ea9 100644
--- a/pkgs/applications/misc/jp2a/default.nix
+++ b/pkgs/applications/misc/jp2a/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.0.7";
- name = "jp2a-${version}";
+ pname = "jp2a";
src = fetchFromGitHub {
owner = "cslarsen";
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 7c5845b35419..9391fe88c5ea 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -12,7 +12,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "k2pdfopt-${version}";
+ pname = "k2pdfopt";
version = "2.51a";
src = (fetchzip {
diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index ecfcc7717281..0a42d5e4f289 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "kanboard-${version}";
+ pname = "kanboard";
version = "1.2.9";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix
index b518481e29ad..4c4b461303fb 100644
--- a/pkgs/applications/misc/kdbplus/default.nix
+++ b/pkgs/applications/misc/kdbplus/default.nix
@@ -1,31 +1,31 @@
-{ stdenv, requireFile, unzip, rlwrap, bash }:
+{ stdenv, requireFile, unzip, rlwrap, bash, zlib }:
assert (stdenv.hostPlatform.system == "i686-linux");
let
libPath = stdenv.lib.makeLibraryPath
- [ stdenv.cc.libc stdenv.cc.cc ];
+ [ stdenv.cc.libc stdenv.cc.cc zlib ];
in
stdenv.mkDerivation rec {
- name = "kdbplus-${version}";
- version = "3.3";
+ pname = "kdbplus";
+ version = "3.6";
- src = requireFile {
+ src = requireFile rec {
message = ''
Nix can't download kdb+ for you automatically. Go to
http://kx.com and download the free, 32-bit version for
- Linux. Then run "nix-prefetch-url file://\$PWD/linux.zip" in
- the directory where you saved it. Note you need version 3.3.
+ Linux. Then run "nix-prefetch-url file://\$PWD/${name}" in
+ the directory where you saved it. Note you need version ${version}.
'';
- name = "linux.zip";
- sha256 = "5fd0837599e24f0f437a8314510888a86ab0787684120a8fcf592299800aa940";
+ name = "linuxx86.zip";
+ sha256 = "0w6znd9warcqx28vf648n0vgmxyyy9kvsfpsfw37d1kp5finap4p";
};
dontStrip = true;
buildInputs = [ unzip ];
phases = "unpackPhase installPhase";
- unpackPhase = "mkdir ${name} && cd ${name} && unzip -qq ${src}";
+ unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}";
installPhase = ''
mkdir -p $out/bin $out/libexec
diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
index 80bf5deceb16..c3d260774435 100644
--- a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
@@ -3,7 +3,8 @@
let
version = "0.10.1";
drv = stdenv.mkDerivation {
- name = "keeagent-${version}";
+ pname = "keeagent";
+ inherit version;
src = fetchzip {
url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip";
diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
index e64632d529b1..76ea9df78c25 100644
--- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
@@ -3,7 +3,8 @@
let
version = "1.8.4.2";
drv = stdenv.mkDerivation {
- name = "keepasshttp-${version}";
+ pname = "keepasshttp";
+ inherit version;
src = fetchFromGitHub {
owner = "pfn";
repo = "keepasshttp";
diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
index b45cb24b1b51..562835159eb3 100644
--- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
@@ -3,7 +3,8 @@
let
version = "1.8.0";
drv = stdenv.mkDerivation {
- name = "keepassrpc-${version}";
+ pname = "keepassrpc";
+ inherit version;
src = fetchurl {
url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx";
sha256 = "1dclfpia559cqf78qw29zz235h1df5md4kgjv3bbi8y41wwmx7cd";
diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
index 8a3aaf202a70..36734a97516b 100644
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ b/pkgs/applications/misc/keepassx/2.0.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }:
stdenv.mkDerivation rec {
- name = "keepassx2-${version}";
+ pname = "keepassx2";
version = "2.0.3";
src = fetchurl {
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 594bf1eb75ae..22e6cd2f6667 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -31,13 +31,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "keepassxc-${version}";
+ pname = "keepassxc";
version = "2.4.3";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
- rev = "${version}";
+ rev = version;
sha256 = "1r63bl0cam04rps1bjr107qvwsmay4254nv00gwhh9n45s6cslac";
};
diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix
index 05ad9b05abb0..7adbcb86c501 100644
--- a/pkgs/applications/misc/keepassx/default.nix
+++ b/pkgs/applications/misc/keepassx/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }:
stdenv.mkDerivation rec {
- name = "keepassx-${version}";
+ pname = "keepassx";
version = "0.4.4";
src = fetchurl {
- url = "https://www.keepassx.org/releases/${version}/${name}.tar.gz";
+ url = "https://www.keepassx.org/releases/${version}/${pname}-${version}.tar.gz";
sha256 = "1i5dq10x28mg7m4c0yacm32xfj4j7imir4ph8x9p0s2ym260c9ry";
};
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 4fb2227ee202..99b9c38d53f8 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -18,7 +18,7 @@ let
in with python.pkgs; buildPythonApplication rec {
version = "0.14.0";
- name = "khard-${version}";
+ pname = "khard";
namePrefix = "";
src = fetchurl {
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 01aef93e5e5f..898186b714b6 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -31,10 +31,10 @@ let
pugixml = stdenv.mkDerivation rec {
version = "1.2";
- name = "pugixml-${version}";
+ pname = "pugixml";
src = fetchurl {
- url = "http://download.kiwix.org/dev/${name}.tar.gz";
+ url = "http://download.kiwix.org/dev/${pname}-${version}.tar.gz";
sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg";
};
@@ -42,8 +42,8 @@ let
unpackPhase = ''
# not a nice src archive: all the files are in the root :(
- mkdir ${name}
- cd ${name}
+ mkdir ${pname}-${version}
+ cd ${pname}-${version}
tar -xf ${src}
# and the build scripts are in there :'(
@@ -54,7 +54,7 @@ let
in
stdenv.mkDerivation rec {
- name = "kiwix-${version}";
+ pname = "kiwix";
version = "0.9";
src = fetchurl {
@@ -82,7 +82,6 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
- "--disable-static"
"--disable-staticbins"
];
diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix
index 79f0b8dc6df2..7868e74d010c 100644
--- a/pkgs/applications/misc/kjv/default.nix
+++ b/pkgs/applications/misc/kjv/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
patches = [ add-apocrypha add-install-target ];
makeFlags = [
- "PREFIX=${placeholder ''out''}"
+ "PREFIX=${placeholder "out"}"
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index 70915ca87073..cf81d572c611 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -8,10 +8,11 @@ let
pname = "krusader";
version = "2.7.1";
in mkDerivation rec {
- name = "krusader-${version}";
+ pname = "krusader";
+ inherit version;
src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
+ url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "1svxj1qygyr3a4dkx0nh2d6r4q7pfj00brzghl94mf4q0rz4vhfm";
};
diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index bdbdef45fe7b..0bd919944185 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -4,12 +4,11 @@
mkDerivation rec {
pname = "latte-dock";
version = "0.8.9";
- name = "${pname}-${version}";
src = fetchurl {
- url = "https://download.kde.org/stable/${pname}/${name}.tar.xz";
+ url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
sha256 = "1kkpxa39crjpqgamrcpgp1mrcdg0aq9850yb6cf7lw7d3x2fdrxj";
- name = "${name}.tar.xz";
+ name = "${pname}-${version}.tar.xz";
};
buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ];
diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix
index 9018a5926424..76abe7c9b4b3 100644
--- a/pkgs/applications/misc/lenmus/default.nix
+++ b/pkgs/applications/misc/lenmus/default.nix
@@ -6,7 +6,7 @@
}:
stdenv.mkDerivation rec {
- name = "lenmus-${version}";
+ pname = "lenmus";
version = "5.4.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix
index 999665bf6bb5..846ce3098425 100644
--- a/pkgs/applications/misc/libosmocore/default.nix
+++ b/pkgs/applications/misc/libosmocore/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "libosmocore-${version}";
+ pname = "libosmocore";
version = "1.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index c049ed2374fd..09089a072b3c 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
version = "2.1.3";
- name = "librecad-${version}";
+ pname = "librecad";
src = fetchurl {
url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}";
- name = name + ".tar.gz";
+ name = "${pname}-${version}" + ".tar.gz";
sha256 = "1czp8bja61hfav2m7184cq1np1n76w3w6vn0hlkp81hhz9zc62sx";
};
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
index 948ae7b14a11..e9dba4bcf469 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -29,8 +29,8 @@ let
};
in
-stdenv.mkDerivation rec {
- name = "lilyterm-${version}";
+stdenv.mkDerivation {
+ pname = "lilyterm";
inherit (stuff) src version;
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index 5ae652d750d1..c66ef21416be 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -4,7 +4,7 @@ libGLU_combined, freetype, xclip, inotify-tools, procps }:
assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";
stdenv.mkDerivation rec {
- name = "llpp-${version}";
+ pname = "llpp";
version = "30";
src = fetchgit {
diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix
index 291e225d6c4f..f84ac6d600a6 100644
--- a/pkgs/applications/misc/loxodo/default.nix
+++ b/pkgs/applications/misc/loxodo/default.nix
@@ -3,7 +3,7 @@ let
py = python27Packages;
python = py.python;
in
-py.buildPythonApplication rec {
+py.buildPythonApplication {
name = "loxodo-0.20150124";
src = fetchgit {
diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix
index 4972aa28e589..61151cb15506 100644
--- a/pkgs/applications/misc/ltwheelconf/default.nix
+++ b/pkgs/applications/misc/ltwheelconf/default.nix
@@ -1,9 +1,8 @@
{ stdenv, libusb1, pkgconfig, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ltwheelconf";
version = "0.2.7";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "thk";
diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix
index ab40dfc8131b..2334221f926d 100644
--- a/pkgs/applications/misc/lutris/chrootenv.nix
+++ b/pkgs/applications/misc/lutris/chrootenv.nix
@@ -104,6 +104,9 @@ in buildFHSUserEnv {
# WINE
cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap
ocl-icd utillinux
+
+ # Winetricks
+ fribidi
] ++ xorgDeps pkgs;
extraInstallCommands = ''
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
index 7ccd4d6e5e90..c9ea146f063b 100644
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@@ -30,14 +30,14 @@ let
];
in buildPythonApplication rec {
- name = "lutris-original-${version}";
- version = "0.5.2.1";
+ pname = "lutris-original";
+ version = "0.5.3";
src = fetchFromGitHub {
owner = "lutris";
repo = "lutris";
rev = "v${version}";
- sha256 = "023yqnzmnkfpq21r6ky6jzwbjxjcw1a5zqrrdl6fwwlr78fdhgpv";
+ sha256 = "0n6xa3pnwvsvfipinrkbhxwjzfbw2cjpc9igv97nffcmpydmn5xv";
};
buildInputs = [
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix
index 4fd86a5a4f52..0802a32d92b1 100644
--- a/pkgs/applications/misc/lxterminal/default.nix
+++ b/pkgs/applications/misc/lxterminal/default.nix
@@ -4,8 +4,9 @@
let version = "0.3.2"; in
-stdenv.mkDerivation rec {
- name = "lxterminal-${version}";
+stdenv.mkDerivation {
+ pname = "lxterminal";
+ inherit version;
src = fetchurl {
url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz";
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index ad3bd499cde9..f7964e4e5c6d 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -1,13 +1,13 @@
-{ fetchurl, stdenv, pkgconfig, python, file, bc, fetchpatch
+{ fetchurl, lib, mkDerivation, pkgconfig, python, file, bc, fetchpatch
, qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
version = "2.3.0";
- name = "lyx-${version}";
+ pname = "lyx";
src = fetchurl {
- url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${name}.tar.xz";
+ url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
sha256 = "0axri2h8xkna4mkfchfyyysbjl7s486vx80p5hzj9zgsvdm5a3ri";
};
@@ -30,10 +30,9 @@ stdenv.mkDerivation rec {
doCheck = true;
# python is run during runtime to do various tasks
- postFixup = ''
- wrapProgram "$out/bin/lyx" \
- --prefix PATH : '${python}/bin'
- '';
+ qtWrapperArgs = [
+ " --prefix PATH : ${python}/bin"
+ ];
patches = [
(fetchpatch {
@@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
})
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "WYSIWYM frontend for LaTeX, DocBook";
homepage = http://www.lyx.org;
license = licenses.gpl2Plus;
diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix
index f2dacb7890f0..9a134343d296 100644
--- a/pkgs/applications/misc/madonctl/default.nix
+++ b/pkgs/applications/misc/madonctl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "madonctl-${version}";
+ pname = "madonctl";
version = "1.1.0";
goPackagePath = "github.com/McKael/madonctl";
diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index a6af1762e289..f2585f781465 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.4.0";
- name = "makeself-${version}";
+ pname = "makeself";
src = fetchFromGitHub {
owner = "megastep";
@@ -15,15 +15,15 @@ stdenv.mkDerivation rec {
patches = [ ./Use-rm-from-PATH.patch ];
postPatch = ''
- sed -e "s|^HEADER=.*|HEADER=$out/share/${name}/makeself-header.sh|" -i makeself.sh
+ sed -e "s|^HEADER=.*|HEADER=$out/share/${pname}-${version}/makeself-header.sh|" -i makeself.sh
'';
installPhase = ''
- mkdir -p $out/{bin,share/{${name},man/man1}}
- cp makeself.lsm README.md $out/share/${name}
+ mkdir -p $out/{bin,share/{${pname}-${version},man/man1}}
+ cp makeself.lsm README.md $out/share/${pname}-${version}
cp makeself.sh $out/bin/makeself
cp makeself.1 $out/share/man/man1/
- cp makeself-header.sh $out/share/${name}
+ cp makeself-header.sh $out/share/${pname}-${version}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index eb0e61ba6d73..1474ea2fc4f2 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -4,7 +4,8 @@ let
version = "5.4.10";
in stdenv.mkDerivation {
- name = "masterpdfeditor-${version}";
+ pname = "masterpdfeditor";
+ inherit version;
src = fetchurl {
url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index 6c58dde00d36..03f30d64fb2d 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.0.15";
- name = "mdp-${version}";
+ pname = "mdp";
src = fetchFromGitHub {
owner = "visit1985";
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 8e6965bfc4fe..9eb4a0897d4f 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "19.07";
- name = "mediainfo-gui-${version}";
+ pname = "mediainfo-gui";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44";
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 601e8c611e4b..98d5ef72b224 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "19.07";
- name = "mediainfo-${version}";
+ pname = "mediainfo";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44";
diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index bcfd1adb4b44..bc753c5a7a9a 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -26,7 +26,7 @@
}:
mkDerivation rec {
- name = "megasync-${version}";
+ pname = "megasync";
version = "4.2.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix
index 0b802bedf8d7..3749f568aef2 100644
--- a/pkgs/applications/misc/memo/default.nix
+++ b/pkgs/applications/misc/memo/default.nix
@@ -7,14 +7,14 @@ assert pandocSupport -> pandoc != null;
stdenv.mkDerivation rec {
- name = "memo-${version}";
+ pname = "memo";
version = "0.8";
src = fetchFromGitHub {
owner = "mrVanDalo";
repo = "memo";
- rev = "${version}";
+ rev = version;
sha256 = "0azx2bx6y7j0637fg3m8zigcw09zfm2mw9wjfg218sx88cm1wdkp";
};
diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix
index 718f2e46fa00..e06f2a88ade4 100644
--- a/pkgs/applications/misc/menumaker/default.nix
+++ b/pkgs/applications/misc/menumaker/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "menumaker-${version}";
+ pname = "menumaker";
version = "0.99.11";
src = fetchurl {
- url = "mirror://sourceforge/menumaker/${name}.tar.gz";
+ url = "mirror://sourceforge/menumaker/${pname}-${version}.tar.gz";
sha256 = "0dprndnhwm7b803zkp4pisiq06ic9iv8vr42in5is47jmvdim0wx";
};
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index dec55e9c1e5c..3023a5b5930c 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -2,7 +2,7 @@
, qtbase, qtsvg, qtwebkit }:
stdenv.mkDerivation rec {
- name = "merkaartor-${version}";
+ pname = "merkaartor";
version = "0.18.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix
index 602d4a032efd..a81aec9d0364 100644
--- a/pkgs/applications/misc/metamorphose2/default.nix
+++ b/pkgs/applications/misc/metamorphose2/default.nix
@@ -2,8 +2,8 @@
, python27, python2Packages
}:
-stdenv.mkDerivation rec {
- name = "metamorphose2-${version}";
+stdenv.mkDerivation {
+ pname = "metamorphose2";
version = "0.9.0beta";
# exif-py vendored via submodule
diff --git a/pkgs/applications/misc/michabo/default.nix b/pkgs/applications/misc/michabo/default.nix
new file mode 100644
index 000000000000..015a326fdc9b
--- /dev/null
+++ b/pkgs/applications/misc/michabo/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, mkDerivation
+, makeDesktopItem
+, fetchFromGitLab
+, qmake
+# qt
+, qtbase
+, qtwebsockets
+}:
+
+let
+ desktopItem = makeDesktopItem {
+ type = "Application";
+ name = "Michabo";
+ desktopName = "Michabo";
+ exec = "Michabo";
+ };
+
+in mkDerivation rec {
+ pname = "michabo";
+ version = "0.1";
+
+ src = fetchFromGitLab {
+ domain = "git.pleroma.social";
+ owner = "kaniini";
+ repo = "michabo";
+ rev = "v${version}";
+ sha256 = "0pl4ymdb36r0kwlclfjjp6b1qml3fm9ql7ag5inprny5y8vcjpzn";
+ };
+
+ nativeBuildInputs = [
+ qmake
+ ];
+ buildInputs = [
+ qtbase
+ qtwebsockets
+ ];
+
+ qmakeFlags = [ "michabo.pro" "DESTDIR=${placeholder "out"}/bin" ];
+
+ postInstall = ''
+ ln -s ${desktopItem}/share $out/share
+ '';
+
+ meta = with lib; {
+ description = "A native desktop app for Pleroma and Mastodon servers";
+ homepage = "https://git.pleroma.social/kaniini/michabo";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ fgaz ];
+ platforms = platforms.all;
+ };
+}
+
diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix
index 09c4d1db2904..2eee9ad40c16 100644
--- a/pkgs/applications/misc/milu/default.nix
+++ b/pkgs/applications/misc/milu/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }:
-stdenv.mkDerivation rec {
- name = "milu-nightly-${version}";
+stdenv.mkDerivation {
+ pname = "milu-nightly";
version = "2016-05-09";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix
index 6aa7eea3d7e9..eff93c8e99c1 100644
--- a/pkgs/applications/misc/minergate-cli/default.nix
+++ b/pkgs/applications/misc/minergate-cli/default.nix
@@ -1,8 +1,8 @@
{ fetchurl, stdenv, dpkg, makeWrapper, openssl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "8.2";
- name = "minergate-cli-${version}";
+ pname = "minergate-cli";
src = fetchurl {
url = "https://minergate.com/download/ubuntu-cli";
sha256 = "393c5ba236f6f92c449496fcda9509f4bfd3887422df98ffa59b3072124a99d8";
diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix
index d11e889e932c..a8402d975931 100644
--- a/pkgs/applications/misc/minergate/default.nix
+++ b/pkgs/applications/misc/minergate/default.nix
@@ -1,8 +1,8 @@
{ fetchurl, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "8.1";
- name = "minergate-${version}";
+ pname = "minergate";
src = fetchurl {
url = "https://minergate.com/download/ubuntu";
sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13";
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index 46ba9d450c8f..303b9fe5e8bc 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
- name = "mlterm-${version}";
+ pname = "mlterm";
version = "3.8.8";
src = fetchurl {
- url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "1jq3fv2wqhszfipkzj8d0lykr6g0zzksn7xy4d3kwincmzfskv7k";
};
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
install -D -t $out/share/applications $desktopItem/share/applications/*
'';
- desktopItem = makeDesktopItem rec {
+ desktopItem = makeDesktopItem {
name = "mlterm";
exec = "mlterm %U";
icon = "mlterm";
diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix
index 0f4e72502bba..e734e44a2e04 100644
--- a/pkgs/applications/misc/moolticute/default.nix
+++ b/pkgs/applications/misc/moolticute/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "moolticute-${version}";
+ pname = "moolticute";
version = "0.30.8";
src = fetchurl {
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix
index 920c1c3f095b..08f510a2840e 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "moonlight-embedded-${version}";
+ pname = "moonlight-embedded";
version = "2.4.10";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix
index b9179bbe5463..c0d41cda02dd 100644
--- a/pkgs/applications/misc/mop/default.nix
+++ b/pkgs/applications/misc/mop/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "mop-${version}";
+ pname = "mop";
version = "0.2.0";
rev = "bc666ec165d08b43134f7ec0bf29083ad5466243";
diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix
index fffa95952622..35de284c0baa 100644
--- a/pkgs/applications/misc/mpvc/default.nix
+++ b/pkgs/applications/misc/mpvc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, socat, fetchFromGitHub, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "mpvc-unstable-2017-03-18";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/mqtt-bench/default.nix b/pkgs/applications/misc/mqtt-bench/default.nix
index eea166d8df75..0e8cc2ebcea9 100644
--- a/pkgs/applications/misc/mqtt-bench/default.nix
+++ b/pkgs/applications/misc/mqtt-bench/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
buildGoPackage rec {
- name = "mqtt-bench-${version}";
+ pname = "mqtt-bench";
version = "0.3.0";
rev = "v${version}";
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 38f5075d10f2..9219c4e2e423 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -15,10 +15,10 @@ let
in stdenv.mkDerivation rec {
version = "1.14.0";
- name = "mupdf-${version}";
+ pname = "mupdf";
src = fetchurl {
- url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz";
+ url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
sha256 = "093p7lv6pgyymagn28n58fs0np928r0i5p2az9cc4gwccwx4hhy4";
};
diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix
index c08a21e87978..249d9ff1d400 100644
--- a/pkgs/applications/misc/mwic/default.nix
+++ b/pkgs/applications/misc/mwic/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.7.7";
- name = "mwic-${version}";
+ pname = "mwic";
src = fetchurl {
- url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz";
+ url = "https://github.com/jwilk/mwic/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "0l4anwiiqclymx0awwn4hzaj8n26ycg8nz76wjphsyscn7z2awad";
};
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index cccd36d7ead8..172f999223a8 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -14,7 +14,6 @@ let
in stdenv.mkDerivation rec {
pname = "mysql-workbench";
version = "8.0.15";
- name = "${pname}-${version}";
src = fetchurl {
url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix
index 45b83b727485..deecc92d9934 100644
--- a/pkgs/applications/misc/mystem/default.nix
+++ b/pkgs/applications/misc/mystem/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "mystem-${version}";
+ pname = "mystem";
version = "3.1";
src = fetchurl {
- url = "http://download.cdn.yandex.net/mystem/${name}-linux-64bit.tar.gz";
+ url = "http://download.cdn.yandex.net/mystem/${pname}-${version}-linux-64bit.tar.gz";
sha256 = "0q3vxvyj5bqllqnlivy5llss39z7j0bgpn6kv8mrc54vjdhppx10";
};
diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix
index 022829040b81..b4d97c368ea2 100644
--- a/pkgs/applications/misc/nanoblogger/default.nix
+++ b/pkgs/applications/misc/nanoblogger/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "3.5-rc1";
- name = "nanoblogger-${version}";
+ pname = "nanoblogger";
src = fetchurl {
- url = "mirror://sourceforge/nanoblogger/${name}.tar.gz";
+ url = "mirror://sourceforge/nanoblogger/${pname}-${version}.tar.gz";
sha256 = "09mv52a5f0h3das8x96irqyznm69arfskx472b7w3b9q4a2ipxbq";
};
diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix
index e8497dbc7bda..4d95f0b52388 100644
--- a/pkgs/applications/misc/navit/default.nix
+++ b/pkgs/applications/misc/navit/default.nix
@@ -17,7 +17,7 @@ assert speechdSupport -> speechd != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "navit-${version}";
+ pname = "navit";
version = "0.5.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/neap/default.nix b/pkgs/applications/misc/neap/default.nix
index 21a5ab0cd0f6..4104d35cf10c 100644
--- a/pkgs/applications/misc/neap/default.nix
+++ b/pkgs/applications/misc/neap/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages }:
stdenv.mkDerivation rec {
- name = "neap-${version}";
+ pname = "neap";
version = "0.7.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix
index 0bb86fdca955..c1ba5ba23b1e 100644
--- a/pkgs/applications/misc/netsurf/browser/default.nix
+++ b/pkgs/applications/misc/netsurf/browser/default.nix
@@ -30,7 +30,7 @@ let
in
stdenv.mkDerivation rec {
- name = "netsurf-${version}";
+ pname = "netsurf";
version = "3.9";
src = fetchurl {
diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix
index adba36329359..36d5a70735a7 100644
--- a/pkgs/applications/misc/netsurf/buildsystem/default.nix
+++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "netsurf-buildsystem-${version}";
+ pname = "netsurf-buildsystem";
version = "1.8";
src = fetchurl {
diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
index a234af740f3c..ad59b1be10e0 100644
--- a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
+++ b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
];
+ NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
+
meta = with stdenv.lib; {
homepage = http://www.netsurf-browser.org/;
description = "String internment library for netsurf browser";
diff --git a/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/pkgs/applications/misc/netsurf/nsgenbind/default.nix
index f343a886283b..88ac4f0c3eb9 100644
--- a/pkgs/applications/misc/netsurf/nsgenbind/default.nix
+++ b/pkgs/applications/misc/netsurf/nsgenbind/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
- name = "netsurf-nsgenbind-${version}";
+ pname = "netsurf-nsgenbind";
version = "0.7";
src = fetchurl {
diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix
index 1cc7f419aa2e..31afed3061a3 100644
--- a/pkgs/applications/misc/nix-tour/default.nix
+++ b/pkgs/applications/misc/nix-tour/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, electron, runtimeShell } :
stdenv.mkDerivation rec {
- name = "nix-tour-${version}";
+ pname = "nix-tour";
version = "0.0.1";
buildInputs = [ electron ];
diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix
index 145abfba5d5c..dec8b4ba0a7c 100644
--- a/pkgs/applications/misc/nixnote2/default.nix
+++ b/pkgs/applications/misc/nixnote2/default.nix
@@ -2,7 +2,7 @@
, qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}:
mkDerivation rec {
- name = "nixnote2-${version}";
+ pname = "nixnote2";
version = "2.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/noice/default.nix b/pkgs/applications/misc/noice/default.nix
index bcf2edd8f2f6..db8139122bab 100644
--- a/pkgs/applications/misc/noice/default.nix
+++ b/pkgs/applications/misc/noice/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "noice-${version}";
+ pname = "noice";
version = "0.6";
src = fetchgit {
diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix
index d4f3db4ca6f9..4568c3e8acc1 100644
--- a/pkgs/applications/misc/notify-osd-customizable/default.nix
+++ b/pkgs/applications/misc/notify-osd-customizable/default.nix
@@ -13,7 +13,7 @@
let baseURI = "https://launchpad.net/~leolik/+archive/leolik";
in stdenv.mkDerivation rec {
- name = "notify-osd-${version}";
+ pname = "notify-osd";
version = "0.9.35+16.04.20160415";
src = fetchurl {
diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix
index 5c60c7412c4a..484ff62e9e68 100644
--- a/pkgs/applications/misc/notify-osd/default.nix
+++ b/pkgs/applications/misc/notify-osd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
- name = "notify-osd-${version}";
+ pname = "notify-osd";
version = "0.9.34";
src = fetchurl {
diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix
index 69f74d66dd01..3ad837768421 100644
--- a/pkgs/applications/misc/nrsc5/default.nix
+++ b/pkgs/applications/misc/nrsc5/default.nix
@@ -13,7 +13,8 @@ let
version = "1.0";
in stdenv.mkDerivation {
- name = "nrsc5-${version}";
+ pname = "nrsc5";
+ inherit version;
src = fetchFromGitHub {
owner = "theori-io";
diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix
index e16d9354bb43..b9529981c7ca 100644
--- a/pkgs/applications/misc/ola/default.nix
+++ b/pkgs/applications/misc/ola/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "ola-${version}";
+ pname = "ola";
version = "0.10.7";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix
index 411b318a3925..27d7ad8730b6 100644
--- a/pkgs/applications/misc/omegat.nix
+++ b/pkgs/applications/misc/omegat.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip, jdk, makeWrapper}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "4.3.0";
pname = "omegat";
diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix
index de2f86e9f9a2..79e3317e64da 100644
--- a/pkgs/applications/misc/onboard/default.nix
+++ b/pkgs/applications/misc/onboard/default.nix
@@ -29,14 +29,22 @@
}:
let
- customHunspell = hunspellWithDicts [hunspellDicts.en-us];
+
+ customHunspell = hunspellWithDicts [
+ hunspellDicts.en-us
+ ];
+
majorVersion = "1.4";
+
+in
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "onboard";
version = "${majorVersion}.1";
-in python3.pkgs.buildPythonApplication rec {
- name = "onboard-${version}";
+
src = fetchurl {
- url = "https://launchpad.net/onboard/${majorVersion}/${version}/+download/${name}.tar.gz";
- sha256 = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865";
+ url = "https://launchpad.net/onboard/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz";
+ sha256 = "0r9q38ikmr4in4dwqd8m9gh9xjbgxnfxglnjbfcapw8ybfnf3jh1";
};
patches = [
@@ -48,9 +56,42 @@ in python3.pkgs.buildPythonApplication rec {
./hunspell-use-xdg-datadirs.patch
];
- # For tests
- LC_ALL = "en_US.UTF-8";
- doCheck = false;
+ nativeBuildInputs = [
+ gobject-introspection
+ intltool
+ pkgconfig
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ bash
+ glib
+ gnome3.dconf
+ gsettings-desktop-schemas
+ gtk3
+ hunspell
+ isocodes
+ libcanberra-gtk3
+ libxkbcommon
+ mousetweaks
+ udev
+ xorg.libXtst
+ xorg.libxkbfile
+ ] ++ stdenv.lib.optional atspiSupport at-spi2-core;
+
+ propagatedBuildInputs = with python3.pkgs; [
+ dbus-python
+ distutils_extra
+ pyatspi
+ pycairo
+ pygobject3
+ systemd
+ ];
+
+ propagatedUserEnvPkgs = [
+ gnome3.dconf
+ ];
+
checkInputs = [
# for Onboard.SpellChecker.aspell_cmd doctests
(aspellWithDicts (dicts: with dicts; [ en ]))
@@ -66,43 +107,10 @@ in python3.pkgs.buildPythonApplication rec {
python3.pkgs.nose
];
- propagatedBuildInputs = [
- glib
- python3
- python3.pkgs.dbus-python
- python3.pkgs.distutils_extra
- python3.pkgs.pyatspi
- python3.pkgs.pycairo
- python3.pkgs.pygobject3
- python3.pkgs.systemd
- ];
+ # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
+ strictDeps = false;
- buildInputs = [
- bash
- gnome3.dconf
- gsettings-desktop-schemas
- gtk3
- hunspell
- isocodes
- libcanberra-gtk3
- mousetweaks
- udev
- libxkbcommon
- wrapGAppsHook
- xorg.libXtst
- xorg.libxkbfile
- ] ++ stdenv.lib.optional atspiSupport at-spi2-core;
-
- nativeBuildInputs = [
- glibcLocales
- gobject-introspection # populate GI_TYPELIB_PATH
- intltool
- pkgconfig
- ];
-
- propagatedUserEnvPkgs = [
- gnome3.dconf
- ];
+ doCheck = false;
preBuild = ''
# Unnecessary file, has been removed upstream
@@ -118,6 +126,9 @@ in python3.pkgs.buildPythonApplication rec {
patchShebangs .
+ substituteInPlace setup.py \
+ --replace "/etc" "$out/etc"
+
substituteInPlace ./Onboard/LanguageSupport.py \
--replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" \
--replace "/usr/bin/yelp" "${yelp}/bin/yelp"
@@ -149,16 +160,22 @@ in python3.pkgs.buildPythonApplication rec {
--replace '"killall",' '"${procps}/bin/pkill", "-x",'
'';
- postInstall = ''
- cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override
+ installPhase = ''
+ ${python3.interpreter} setup.py install --prefix="$out"
+ cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override
glib-compile-schemas $out/share/glib-2.0/schemas/
'';
- meta = {
+ # Remove ubuntu icons.
+ postFixup = ''
+ rm -rf $out/share/icons/ubuntu-mono-*
+ '';
+
+ meta = with stdenv.lib; {
homepage = https://launchpad.net/onboard;
- description = "An onscreen keyboard useful for tablet PC users and for mobility impaired users.";
- maintainers = with stdenv.lib.maintainers; [ johnramsden ];
- license = stdenv.lib.licenses.gpl3;
+ description = "Onscreen keyboard useful for tablet PC users and for mobility impaired users";
+ maintainers = with maintainers; [ johnramsden ];
+ license = licenses.gpl3;
};
}
diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix
index b87f11d7b05d..3a0a548be0b9 100644
--- a/pkgs/applications/misc/oneko/default.nix
+++ b/pkgs/applications/misc/oneko/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version_name = "1.2.sakura.5";
version = "1.2.5";
- name = "oneko-${version}";
+ pname = "oneko";
src = fetchurl {
url = "http://www.daidouji.com/oneko/distfiles/oneko-${version_name}.tar.gz";
sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f";
diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix
index 8ff9a2f44d55..8f7f74f71232 100644
--- a/pkgs/applications/misc/openbox-menu/default.nix
+++ b/pkgs/applications/misc/openbox-menu/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk2, menu-cache }:
stdenv.mkDerivation rec {
- name = "openbox-menu-${version}";
+ pname = "openbox-menu";
version = "0.8.0";
src = fetchurl {
- url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${name}.tar.bz2";
+ url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${pname}-${version}.tar.bz2";
sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l";
};
diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix
index e4f2fd7ce8b9..5c7e7355c662 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -2,7 +2,7 @@
gettext, glib, portaudio }:
stdenv.mkDerivation rec {
- name = "opencpn-${version}";
+ pname = "opencpn";
version = "5.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index cd9a86e7fac7..585c85cbd2c5 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -10,7 +10,8 @@ let
in stdenv.mkDerivation {
- name = "opentx-${version}";
+ pname = "opentx";
+ inherit version;
src = fetchFromGitHub {
owner = "opentx";
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 332c696d8da2..1a8d5b76fe3d 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -64,7 +64,7 @@ buildPythonApplication rec {
access to the graphical desktop via speech and refreshable braille.
It works with applications and toolkits that support the Assistive
Technology Service Provider Interface (AT-SPI). That includes the GNOME
- Gtk+ toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and
+ GTK toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and
WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued.
Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`.
diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix
index bc6aa242f338..e404da974c46 100644
--- a/pkgs/applications/misc/orpie/default.nix
+++ b/pkgs/applications/misc/orpie/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ocamlPackages, ncurses, gsl }:
stdenv.mkDerivation rec {
- name = "orpie-${version}";
+ pname = "orpie";
version = "1.5.2";
src = fetchurl {
- url = "http://pessimization.com/software/orpie/${name}.tar.gz";
+ url = "http://pessimization.com/software/orpie/${pname}-${version}.tar.gz";
sha256 = "0v9xgpcf186ni55rkmx008msyszw0ypd6rd98hgwpih8yv3pymfy";
};
diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix
index 9d0fb3fdeb7c..8ffc8ec69fec 100644
--- a/pkgs/applications/misc/osm2xmap/default.nix
+++ b/pkgs/applications/misc/osm2xmap/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } :
stdenv.mkDerivation rec {
- name = "osm2xmap-${version}";
+ pname = "osm2xmap";
version = "2.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix
index bb53782fb7d2..2dfbb7a23705 100644
--- a/pkgs/applications/misc/osmctools/default.nix
+++ b/pkgs/applications/misc/osmctools/default.nix
@@ -16,8 +16,8 @@ let
in
-stdenv.mkDerivation rec {
- name = "osmctools-${version}";
+stdenv.mkDerivation {
+ pname = "osmctools";
version = "0.8.5plus1.4.0";
buildInputs = [ zlib ];
diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix
index 2b35cb770389..616949af8836 100644
--- a/pkgs/applications/misc/osmium-tool/default.nix
+++ b/pkgs/applications/misc/osmium-tool/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, libosmium, protozero, boost, bzip2, zlib, expat }:
stdenv.mkDerivation rec {
- name = "osmium-tool-${version}";
+ pname = "osmium-tool";
version = "1.10.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix
index 633c1d82159a..c6cd118aea80 100644
--- a/pkgs/applications/misc/pcmanfm/default.nix
+++ b/pkgs/applications/misc/pcmanfm/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://blog.lxde.org/category/pcmanfm/;
license = licenses.gpl2Plus;
- description = "File manager with GTK+ interface";
+ description = "File manager with GTK interface";
maintainers = [ maintainers.ttuegel ];
platforms = platforms.linux;
};
diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix
index 7fdfbd84d2f6..17253173a5e4 100644
--- a/pkgs/applications/misc/pcmanx-gtk2/default.nix
+++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }:
stdenv.mkDerivation rec {
- name = "pcmanx-gtk2-${version}";
+ pname = "pcmanx-gtk2";
version = "1.3";
src = fetchFromGitHub {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://pcman.ptt.cc;
license = licenses.gpl2;
- description = "Telnet BBS browser with GTK+ interface";
+ description = "Telnet BBS browser with GTK interface";
maintainers = [ maintainers.sifmelcara ];
platforms = platforms.linux;
};
diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
index f604684b19a1..9756d9b42b0a 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}:
-pythonPackages.buildPythonApplication rec {
- name = "pdf-quench-${version}";
+pythonPackages.buildPythonApplication {
+ pname = "pdf-quench";
version = "1.0.5";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix
index d55c7a2af12b..fc4e5229c9c0 100644
--- a/pkgs/applications/misc/pell/default.nix
+++ b/pkgs/applications/misc/pell/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "pell";
version = "0.0.4";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "ebzzry";
diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix
index 8804e438b7e8..ae81ef3c9f6c 100644
--- a/pkgs/applications/misc/perkeep/default.nix
+++ b/pkgs/applications/misc/perkeep/default.nix
@@ -1,18 +1,37 @@
-{ buildGo110Package, fetchzip, lib }:
+{ buildGoPackage, fetchurl, fetchFromGitHub, lib }:
-buildGo110Package rec {
+let
+ gouiJS = fetchurl {
+ url = "https://storage.googleapis.com/perkeep-release/gopherjs/goui.js";
+ sha256 = "0xbkdpd900gnmzj8p0x38dn4sv170pdvgzcvzsq70s80p6ykkh6g";
+ };
+
+ publisherJS = fetchurl {
+ url = "https://storage.googleapis.com/perkeep-release/gopherjs/publisher.js";
+ sha256 = "09hd7p0xscqnh612jbrjvh3njmlm4292zd5sbqx2lg0aw688q8p2";
+ };
+
+in buildGoPackage rec {
name = "perkeep-${version}";
- version = "0.10.1";
+ version = "unstable-2019-07-29";
- src = fetchzip {
- url = "https://perkeep.org/dl/perkeep-${version}-src.zip";
- sha256 = "0rqibc6w4m1r50i2pjcgz1k9dxh18v7jwj4s29y470bc526wv422";
+ src = fetchFromGitHub {
+ owner = "perkeep";
+ repo = "perkeep";
+ rev = "c9f78d02adf9740f3b8d403a1418554293cc9f41";
+ sha256 = "11rin94pjzg0kvizrq9ss42fjw7wfwx3g1pk8zdlhyfkiwwh2rmg";
};
goPackagePath = "perkeep.org";
buildPhase = ''
cd "$NIX_BUILD_TOP/go/src/$goPackagePath"
+
+ # Skip network fetches
+ sed -i '/fetchAllJS/a if true { return nil }' make.go
+ cp ${publisherJS} app/publisher/publisher.js
+ cp ${gouiJS} server/perkeepd/ui/goui.js
+
go run make.go
'';
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 7e7850668b84..86e10ae0943e 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }:
stdenv.mkDerivation rec {
- name = "pgadmin3-${version}";
+ pname = "pgadmin3";
version = "1.22.2";
src = fetchurl {
diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index 113a63f7fe18..241d5786468e 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, postgresql, openssl } :
stdenv.mkDerivation rec {
- name = "pgmanage-${version}";
+ pname = "pgmanage";
version = "11.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix
index 0cee74522ab2..6fb70f1c9a26 100644
--- a/pkgs/applications/misc/phwmon/default.nix
+++ b/pkgs/applications/misc/phwmon/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, pythonPackages }:
-stdenv.mkDerivation rec {
- name = "phwmon-${version}";
+stdenv.mkDerivation {
+ pname = "phwmon";
version = "2017-04-10";
src = fetchFromGitLab {
diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix
index 10c8a03fa0a2..dfc92e38f63c 100644
--- a/pkgs/applications/misc/plank/default.nix
+++ b/pkgs/applications/misc/plank/default.nix
@@ -64,8 +64,8 @@ stdenv.mkDerivation rec {
# fix paths
makeFlags = [
- "INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/"
- "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0"
+ "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0/"
+ "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
];
# Make plank's application launcher hidden in Pantheon
diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
index b44169adea8d..3ecace18f924 100644
--- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
+++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, cmake, extra-cmake-modules, plasma-framework, kwindowsystem, plasma-pa, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "plasma-applet-volumewin7mixer-${version}";
+ pname = "plasma-applet-volumewin7mixer";
version = "24";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index e5c096fd2ae5..48188574ad4b 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -55,7 +55,8 @@ let
libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ];
in stdenv.mkDerivation {
- name = "playonlinux-${version}";
+ pname = "playonlinux";
+ inherit version;
src = fetchurl {
url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 0bd28811d55b..8021ffdc8f51 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -2,7 +2,7 @@
{
stable = with python27Packages; buildPythonPackage rec {
- name = "plover-${version}";
+ pname = "plover";
version = "3.1.1";
meta = with stdenv.lib; {
@@ -24,7 +24,7 @@
};
dev = with python36Packages; buildPythonPackage rec {
- name = "plover-${version}";
+ pname = "plover";
version = "4.0.0.dev8";
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix
index 4b39e9291a8a..bd3796a572b0 100644
--- a/pkgs/applications/misc/pmenu/default.nix
+++ b/pkgs/applications/misc/pmenu/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, python2Packages, gnome-menus }:
-stdenv.mkDerivation rec {
- name = "pmenu-${version}";
+stdenv.mkDerivation {
+ pname = "pmenu";
version = "2018-01-01";
src = fetchFromGitLab {
diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix
index 81e3d80f5167..8413f8c8f102 100644
--- a/pkgs/applications/misc/polar-bookshelf/default.nix
+++ b/pkgs/applications/misc/polar-bookshelf/default.nix
@@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
- name = "polar-bookshelf-${version}";
+ pname = "polar-bookshelf";
version = "1.13.10";
# fetching a .deb because there's no easy way to package this Electron app
diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix
index 45db856dbb9e..7209ee3e4009 100644
--- a/pkgs/applications/misc/posterazor/default.nix
+++ b/pkgs/applications/misc/posterazor/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, unzip, pkgconfig, libXpm, fltk13, freeimage }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "posterazor-1.5.1";
src = fetchurl {
diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix
index 5ba8e1b6e313..344c3d7168ac 100644
--- a/pkgs/applications/misc/projectlibre/default.nix
+++ b/pkgs/applications/misc/projectlibre/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, ant, jdk, makeWrapper, jre, coreutils, which }:
stdenv.mkDerivation rec {
- name = "projectlibre-${version}";
+ pname = "projectlibre";
version = "1.7.0";
src = fetchgit {
diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
index cc6f63c0960b..a795c4485160 100644
--- a/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -8,7 +8,7 @@ let
else "2.4";
in
stdenv.mkDerivation rec {
- name = "prusa-slicer-${version}";
+ pname = "prusa-slicer";
version = "2.0.0";
enableParallelBuilding = true;
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
# xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source -
# for finding the nlopt library, which doesn't pick up the package in the nix store.
# We need to set the path via the NLOPT environment variable instead.
- NLOPT = "${nlopt}";
+ NLOPT = nlopt;
prePatch = ''
# In nix ioctls.h isn't available from the standard kernel-headers package
diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
index 4d2040212472..1f35643dd761 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/pkgs/applications/misc/qdirstat/default.nix
@@ -5,12 +5,13 @@
let
version = "1.6";
in mkDerivation rec {
- name = "qdirstat-${version}";
+ pname = "qdirstat";
+ inherit version;
src = fetchFromGitHub {
owner = "shundhammer";
repo = "qdirstat";
- rev = "${version}";
+ rev = version;
sha256 = "0q4ccjmlbqifg251kyxwys8wspdskr8scqhacyfrs9cmnjxcjqan";
};
diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix
index ae0fd61c33dd..aae38f7d0f17 100644
--- a/pkgs/applications/misc/qlandkartegt/default.nix
+++ b/pkgs/applications/misc/qlandkartegt/default.nix
@@ -3,11 +3,11 @@
, garmindev, gdal, gpsd, libdmtx, libexif, libGLU, proj }:
mkDerivation rec {
- name = "qlandkartegt-${version}";
+ pname = "qlandkartegt";
version = "1.8.1";
src = fetchurl {
- url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${name}.tar.gz";
+ url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${pname}-${version}.tar.gz";
sha256 = "1rwv5ar5jv15g1cc6pp0lk69q3ip10pjazsh3ds2ggaciymha1ly";
};
diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix
index f12a3021a19a..a679a4f1112f 100644
--- a/pkgs/applications/misc/qlandkartegt/garmindev.nix
+++ b/pkgs/applications/misc/qlandkartegt/garmindev.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, libusb }:
stdenv.mkDerivation rec {
- name = "garmindev-${version}";
+ pname = "garmindev";
version = "0.3.4";
src = fetchurl {
- url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${name}.tar.gz";
+ url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${pname}-${version}.tar.gz";
sha256 = "1mc7rxdn9790pgbvz02xzipxp2dp9h4hfq87xgawa18sp9jqzhw6";
};
diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix
index df5f35102e01..8fc890f42439 100644
--- a/pkgs/applications/misc/qlcplus/default.nix
+++ b/pkgs/applications/misc/qlcplus/default.nix
@@ -4,7 +4,7 @@
}:
mkDerivation rec {
- name = "qlcplus-${version}";
+ pname = "qlcplus";
version = "4.12.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index 99a0acbcc8c6..335c583998fc 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -1,11 +1,11 @@
{ mkDerivation, lib, fetchurl, fetchpatch, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:
mkDerivation rec {
- name = "qmapshack-${version}";
+ pname = "qmapshack";
version = "1.13.1";
src = fetchurl {
- url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
+ url = "https://bitbucket.org/maproom/qmapshack/downloads/${pname}-${version}.tar.gz";
sha256 = "15x1b2q0hr1vx006f9hjc4cvfjvxvfdwybw32qvczdyc3crq0mc9";
};
diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix
index e395ae9c070d..b7c137258fd9 100644
--- a/pkgs/applications/misc/qolibri/default.nix
+++ b/pkgs/applications/misc/qolibri/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, libeb, lzo, qtbase
-, qtmultimedia, qttools, qtwebengine }:
+{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, libeb, lzo
+, qtbase, qtmultimedia, qttools, qtwebengine }:
-stdenv.mkDerivation rec {
- name = "qolibri-${version}";
- version = "2018-11-14";
+mkDerivation {
+ pname = "qolibri";
+ version = "2019-07-22";
src = fetchFromGitHub {
owner = "ludios";
repo = "qolibri";
- rev = "133a1c33e74d931ad54407f70d84a0016d96981f";
- sha256 = "16ifix0q8ww4l3xflgxr9j81c0lzlnkjr8fj961x3nxz7288pdg2";
+ rev = "b58f9838d39300cba444eba725a369181c5d746b";
+ sha256 = "0kcc6dvbcmq9y7hk8mp23pydiaqz6f0clg64d1f2y04ppphmah42";
};
nativeBuildInputs = [ pkgconfig cmake ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/ludios/qolibri;
description = "EPWING reader for viewing Japanese dictionaries";
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index 6ae8f380fe28..46b446b429bf 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -7,12 +7,12 @@
mkDerivation rec {
version = "0.5.8";
- name = "qsyncthingtray-${version}";
+ pname = "qsyncthingtray";
src = fetchFromGitHub {
owner = "sieren";
repo = "QSyncthingTray";
- rev = "${version}";
+ rev = version;
sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w";
};
diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix
index 47b4641234f3..702cadfdaa91 100644
--- a/pkgs/applications/misc/qt-box-editor/default.nix
+++ b/pkgs/applications/misc/qt-box-editor/default.nix
@@ -7,7 +7,7 @@
, tesseract
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "qt-box-editor";
version = "unstable-2019-07-12";
diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix
index 7586669218da..d942f999f697 100644
--- a/pkgs/applications/misc/qtbitcointrader/default.nix
+++ b/pkgs/applications/misc/qtbitcointrader/default.nix
@@ -4,7 +4,8 @@ let
version = "1.40.41";
in
stdenv.mkDerivation {
- name = "qtbitcointrader-${version}";
+ pname = "qtbitcointrader";
+ inherit version;
src = fetchzip {
url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix
index b2616bf7b778..948bcf33d378 100644
--- a/pkgs/applications/misc/quicksynergy/default.nix
+++ b/pkgs/applications/misc/quicksynergy/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, pkgconfig, gtk2, synergy}:
stdenv.mkDerivation rec {
- name = "quicksynergy-${version}";
+ pname = "quicksynergy";
version = "0.9.0";
src = fetchurl {
url = "mirror://sourceforge/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz";
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index bf4559e91178..25f9c6ed4c7a 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -14,7 +14,7 @@ let
in
stdenv.mkDerivation rec {
- name = "redis-desktop-manager-${version}";
+ pname = "redis-desktop-manager";
version = "0.9.1";
src = fetchgit {
diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix
index 03b8d709fce2..2eebe67c46da 100644
--- a/pkgs/applications/misc/redshift-plasma-applet/default.nix
+++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix
@@ -3,7 +3,8 @@
let version = "1.0.18"; in
stdenv.mkDerivation {
- name = "redshift-plasma-applet-${version}";
+ pname = "redshift-plasma-applet";
+ inherit version;
src = fetchFromGitHub {
owner = "kotelnik";
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 3a288a81c37f..ad27c9b13a61 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -12,7 +12,7 @@
}:
stdenv.mkDerivation rec {
- name = "redshift-${version}";
+ pname = "redshift";
version = "1.12";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix
index 703d78621249..ca362bab2ec9 100644
--- a/pkgs/applications/misc/regextester/default.nix
+++ b/pkgs/applications/misc/regextester/default.nix
@@ -14,7 +14,7 @@
, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "regextester-${version}";
+ pname = "regextester";
version = "1.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix
index cfafd239b603..00640be6c74a 100644
--- a/pkgs/applications/misc/robo3t/default.nix
+++ b/pkgs/applications/misc/robo3t/default.nix
@@ -2,7 +2,7 @@
freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
stdenv.mkDerivation rec {
- name = "robo3t-${version}";
+ pname = "robo3t";
version = "1.3.1";
rev = "7419c406";
diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix
index 76593eba5fc4..8df4e960c180 100644
--- a/pkgs/applications/misc/robomongo/default.nix
+++ b/pkgs/applications/misc/robomongo/default.nix
@@ -2,7 +2,7 @@
freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
stdenv.mkDerivation rec {
- name = "robomongo-${version}";
+ pname = "robomongo";
version = "0.9.0";
src = fetchurl {
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 94381d4f6f96..eabf77f0e951 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl
+{ stdenv, lib, fetchurl, makeWrapper
, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git
, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
, bison, flex, librsvg, check
@@ -19,11 +19,16 @@ stdenv.mkDerivation rec {
sed -i 's/~root/~nobody/g' test/helper-expand.c
'';
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check
libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which
];
+ postInstall = ''
+ wrapProgram $out/bin/rofi-theme-selector \
+ --prefix XDG_DATA_DIRS : $out/share
+ '';
+
doCheck = false;
meta = with lib; {
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index aa0ebc29a557..3dbe7790d185 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -1,54 +1,40 @@
-{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat
-, gsettings-desktop-schemas, gdk-pixbuf, gtk3, hicolor-icon-theme
-, imagemagick, itstool, librsvg, libtool, libxslt, makeWrapper
-, pkgconfig, python, pythonPackages, vte
-, wrapGAppsHook}:
+{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub
+, glib, gtk3, harfbuzz, hicolor-icon-theme, libXdmcp, libXtst, libpthreadstubs
+, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre
+, pkgconfig, stdenv, utillinuxMinimal, vte, wrapGAppsHook, xmlto
+}:
-# TODO: Still getting following warning.
-# WARNING **: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files
-# Seems related to this:
-# https://forums.gentoo.org/viewtopic-t-947210-start-0.html
+stdenv.mkDerivation rec {
+ pname = "roxterm";
+ version = "3.7.5";
-let version = "3.3.2";
-in stdenv.mkDerivation rec {
- name = "roxterm-${version}";
-
- src = fetchurl {
- url = "mirror://sourceforge/roxterm/${name}.tar.xz";
- sha256 = "0vjh7k4jm4bd01j88w9bmvq27zqsajjzy131fpi81zkii5lisl1k";
+ src = fetchFromGitHub {
+ owner = "realh";
+ repo = "roxterm";
+ rev = version;
+ sha256 = "042hchvgk9jzz035zsgnfhh8105zvspbzz6b78waylsdlgqn0pp1";
};
- nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
- buildInputs =
- [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
- makeWrapper python pythonPackages.lockfile dbus dbus-glib
- gdk-pixbuf gsettings-desktop-schemas gtk3
- hicolor-icon-theme vte ];
-
- NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0"
- "-I${dbus.dev}/include/dbus-1.0"
- "-I${dbus.lib}/lib/dbus-1.0/include" ];
-
- # Fix up python path so the lockfile library is on it.
- PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" python.sitePackages [
- pythonPackages.lockfile
+ patches = [
+ # This is the commit directly after v3.7.5. It is needed to get roxterm to
+ # build correctly. It can be removed when v3.7.6 (or v3.8.0) has been
+ # released.
+ (fetchpatch {
+ url = "https://github.com/realh/roxterm/commit/f7c38fd48bd1810e16d82794bdfb61a9760a2fe1.patch";
+ sha256 = "1v77b7ilgf8zy1npxxcyc06mq6lck6bi6lw4aksnq3mi61n5znmx";
+ })
];
- buildPhase = ''
- # Fix up the LD_LIBRARY_PATH so that expat is on it
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat.out}/lib"
+ nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook libxslt ];
- python mscript.py configure --prefix="$out" --disable-nls --disable-translations
- python mscript.py build
- '';
-
- installPhase = ''
- python mscript.py install
- '';
+ buildInputs =
+ [ gtk3 dbus dbus-glib vte pcre harfbuzz libpthreadstubs libXdmcp
+ utillinuxMinimal glib hicolor-icon-theme docbook_xsl xmlto libselinux
+ libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit
+ ];
meta = with stdenv.lib; {
- homepage = http://roxterm.sourceforge.net/;
+ homepage = "https://github.com/realh/roxterm";
license = licenses.gpl3;
description = "Tabbed, VTE-based terminal emulator";
longDescription = ''
diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix
index 8e63cdb6d16c..acdd21a1c219 100644
--- a/pkgs/applications/misc/rxvt/default.nix
+++ b/pkgs/applications/misc/rxvt/default.nix
@@ -3,11 +3,11 @@
, libX11, libXt, libXpm }:
stdenv.mkDerivation rec {
- name = "rxvt-${version}";
+ pname = "rxvt";
version = "2.7.10";
src = fetchurl {
- url = "mirror://sourceforge/rxvt/${name}.tar.gz";
+ url = "mirror://sourceforge/rxvt/${pname}-${version}.tar.gz";
sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1";
};
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
index f872e8008363..a4e03fa347f0 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "urxvt-autocomplete-all-the-things-${version}";
+ pname = "urxvt-autocomplete-all-the-things";
version = "1.6.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
index 544789e865b5..b976388ae2c4 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "urxvt-perls-${version}";
+ pname = "urxvt-perls";
version = "2.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
index e8e5c524a35c..2982c02cce9a 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, perl }:
stdenv.mkDerivation rec {
- name = "urxvt-tabbedex-${version}";
+ pname = "urxvt-tabbedex";
version = "19.21";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 17cea90ac27c..7c239a9b7543 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -8,17 +8,17 @@ let
description = "A clone of the well-known terminal emulator rxvt";
desktopItem = makeDesktopItem {
- name = "${pname}";
+ name = pname;
exec = "urxvt";
icon = "utilities-terminal";
comment = description;
desktopName = "URxvt";
- genericName = "${pname}";
+ genericName = pname;
categories = "System;TerminalEmulator;";
};
in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
name = "${pname}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}-${version}";
diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix
index 30f54cdee7e9..125170d36c27 100644
--- a/pkgs/applications/misc/safeeyes/default.nix
+++ b/pkgs/applications/misc/safeeyes/default.nix
@@ -4,7 +4,6 @@
let inherit (python3Packages) python buildPythonApplication fetchPypi;
in buildPythonApplication rec {
- name = "${pname}-${version}";
pname = "safeeyes";
version = "2.0.9";
namePrefix = "";
diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix
index 33df8e8f0a27..8510d5019424 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib , makeWrapper }:
stdenv.mkDerivation rec {
- name = "sakura-${version}";
+ pname = "sakura";
version = "3.6.0";
src = fetchurl {
- url = "https://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2";
+ url = "https://launchpad.net/sakura/trunk/${version}/+download/${pname}-${version}.tar.bz2";
sha256 = "1q463qm41ym7jb3kbzjz7b6x549vmgkb70arpkhsf86yxly1y5m1";
};
diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index 280a42fde14c..c95eba48bdfb 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.7.0";
- name = "sc-im-${version}";
+ pname = "sc-im";
src = fetchFromGitHub {
owner = "andmarti1424";
diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix
index cc8c30043b29..3cebcc0101f8 100644
--- a/pkgs/applications/misc/sdcv/default.nix
+++ b/pkgs/applications/misc/sdcv/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, glib, gettext, readline }:
stdenv.mkDerivation rec {
- name = "sdcv-${version}";
+ pname = "sdcv";
version = "0.5.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix
index fc63745ebb84..e81c0b99264e 100644
--- a/pkgs/applications/misc/sequelpro/default.nix
+++ b/pkgs/applications/misc/sequelpro/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, undmg }:
-stdenv.mkDerivation rec {
- name = "sequel-pro-${version}";
+stdenv.mkDerivation {
+ pname = "sequel-pro";
version = "1.1.2";
src = fetchurl {
diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix
index fc6be074a079..d2d5e9548a0c 100644
--- a/pkgs/applications/misc/slade/default.nix
+++ b/pkgs/applications/misc/slade/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }:
stdenv.mkDerivation rec {
- name = "slade-${version}";
+ pname = "slade";
version = "3.1.1.5";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
index e012c3763b34..cf9e93b87b39 100644
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "1.3.0";
- name = "slic3r-${version}";
+ pname = "slic3r";
src = fetchgit {
url = "git://github.com/alexrj/Slic3r";
diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix
index f4a2e889cd43..bfb3d010a3c7 100644
--- a/pkgs/applications/misc/slstatus/default.nix
+++ b/pkgs/applications/misc/slstatus/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "slstatus-${version}";
+ pname = "slstatus";
version = "unstable-2018-04-16";
src = fetchgit {
diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index cb2cd3f1e62f..f2e1aa6bdb68 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -3,7 +3,7 @@
# Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of
# adding this to services.udev.packages on NixOS
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "solaar-unstable";
version = "2019-01-30";
diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index 9f20b20f7f3a..9550a8d4fd7b 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -3,13 +3,13 @@
, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }:
stdenv.mkDerivation rec {
- name = "spacefm-${version}";
+ pname = "spacefm";
version = "1.0.6";
src = fetchFromGitHub {
owner = "IgnorantGuru";
repo = "spacefm";
- rev = "${version}";
+ rev = version;
sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx";
};
diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix
index a1d5ef153bbd..103075024dd5 100644
--- a/pkgs/applications/misc/sqliteman/default.nix
+++ b/pkgs/applications/misc/sqliteman/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, qt4, qscintilla }:
stdenv.mkDerivation rec {
- name = "sqliteman-${version}";
+ pname = "sqliteman";
version = "1.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix
index aee486ddf0c2..bb1655b44632 100644
--- a/pkgs/applications/misc/ssocr/default.nix
+++ b/pkgs/applications/misc/ssocr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, imlib2, libX11 }:
-stdenv.mkDerivation rec {
- name = "ssocr-${version}";
+stdenv.mkDerivation {
+ pname = "ssocr";
version = "unstable-2018-08-11";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix
index d3cd81f7f13a..8c47de3afac0 100644
--- a/pkgs/applications/misc/stog/default.nix
+++ b/pkgs/applications/misc/stog/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "stog-${version}";
+ pname = "stog";
version = "0.18.0";
src = fetchFromGitLab {
domain = "framagit.org";
diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix
index 1fc96e551ac7..ecaf9d5a34a2 100644
--- a/pkgs/applications/misc/stupidterm/default.nix
+++ b/pkgs/applications/misc/stupidterm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "stupidterm";
version = "2019-03-26";
@@ -27,10 +27,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Simple wrapper around the VTE terminal emulator widget for GTK+";
- longDescription = ''
- Simple wrapper around the VTE terminal emulator widget for GTK+
- '';
+ description = "Simple wrapper around the VTE terminal emulator widget for GTK";
homepage = https://github.com/esmil/stupidterm;
license = licenses.lgpl3Plus;
maintainers = [ maintainers.etu ];
diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix
index d545447cb130..340b59d5ff23 100644
--- a/pkgs/applications/misc/styx/default.nix
+++ b/pkgs/applications/misc/styx/default.nix
@@ -3,7 +3,7 @@
, perlPackages, python27 }:
stdenv.mkDerivation rec {
- name = "styx-${version}";
+ pname = "styx";
version = "0.7.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 7bac1db813f4..960b7b9eeef5 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -6,8 +6,9 @@
let
version = "4.8.2";
- libdc = stdenv.mkDerivation rec {
- name = "libdivecomputer-ssrf-${version}";
+ libdc = stdenv.mkDerivation {
+ pname = "libdivecomputer-ssrf";
+ inherit version;
src = fetchurl {
url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz";
@@ -30,7 +31,7 @@ let
};
googlemaps = stdenv.mkDerivation rec {
- name = "googlemaps-${version}";
+ pname = "googlemaps";
version = "2017-12-18";
@@ -65,8 +66,9 @@ let
};
};
-in stdenv.mkDerivation rec {
- name = "subsurface-${version}";
+in stdenv.mkDerivation {
+ pname = "subsurface";
+ inherit version;
src = fetchurl {
url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz";
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index ee42c1389fcd..9dcdf8fd2b0e 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -71,7 +71,7 @@ let
d2u = stdenv.lib.replaceChars ["."] ["_"];
-in rec {
+in {
application = mkSweetHome3D rec {
version = "6.2";
diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix
index 3e7983c667f2..c314e8ffe5ac 100644
--- a/pkgs/applications/misc/synapse/default.nix
+++ b/pkgs/applications/misc/synapse/default.nix
@@ -5,10 +5,11 @@
let
version = "0.2.99.4";
in stdenv.mkDerivation rec {
- name = "synapse-${version}";
+ pname = "synapse";
+ inherit version;
src = fetchurl {
- url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz";
+ url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${pname}-${version}.tar.xz";
sha256 = "1g6x9knb4jy1d8zgssjhzkgac583137pibisy9whjs8mckaj4k1j";
};
diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix
index f16a0d29c40d..a07fe0c75103 100644
--- a/pkgs/applications/misc/syncthing-tray/default.nix
+++ b/pkgs/applications/misc/syncthing-tray/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildGoPackage, pkgconfig, libappindicator-gtk3 }:
buildGoPackage rec {
- name = "syncthing-tray-${version}";
+ pname = "syncthing-tray";
version = "0.7";
goPackagePath = "github.com/alex2108/syncthing-tray";
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 5f12bdb4dfcd..377d83e59627 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -3,7 +3,7 @@
, libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }:
stdenv.mkDerivation rec {
- name = "synergy-${version}";
+ pname = "synergy";
version = "1.8.8";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix
index 52e39b98a3b6..fbb1832735be 100644
--- a/pkgs/applications/misc/tabula/default.nix
+++ b/pkgs/applications/misc/tabula/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "tabula-${version}";
+ pname = "tabula";
version = "1.2.1";
diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix
index 00b96f459cb7..702c3124d8ab 100644
--- a/pkgs/applications/misc/taskell/default.nix
+++ b/pkgs/applications/misc/taskell/default.nix
@@ -1,8 +1,8 @@
{ lib, haskellPackages, fetchFromGitHub }:
let
- version = "1.6.0";
- sha256 = "1yq7lbqg759i3hyxcskx3924b7xmw6i4ny6n8yq80k4hikw2k6mf";
+ version = "1.6.1";
+ sha256 = "047gvpq52pif9sfb4qcfdiwz50x3wlnjvsnnjzypm1qlwyl2rbz1";
in (haskellPackages.mkDerivation {
pname = "taskell";
diff --git a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/pkgs/applications/misc/taskjuggler/3.x/gemset.nix
index e65ab3451a62..deeeac106943 100644
--- a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix
+++ b/pkgs/applications/misc/taskjuggler/3.x/gemset.nix
@@ -1,5 +1,5 @@
{
- "mail" = {
+ mail = {
version = "2.6.3";
source = {
type = "gem";
@@ -9,14 +9,14 @@
"mime-types"
];
};
- "mime-types" = {
+ mime-types = {
version = "2.6.1";
source = {
type = "gem";
sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv";
};
};
- "taskjuggler" = {
+ taskjuggler = {
version = "3.5.0";
source = {
type = "gem";
@@ -27,7 +27,7 @@
"term-ansicolor"
];
};
- "term-ansicolor" = {
+ term-ansicolor = {
version = "1.3.2";
source = {
type = "gem";
@@ -37,7 +37,7 @@
"tins"
];
};
- "tins" = {
+ tins = {
version = "1.6.0";
source = {
type = "gem";
diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix
index 7ca421b49a35..0450cb40a555 100644
--- a/pkgs/applications/misc/tasknc/default.nix
+++ b/pkgs/applications/misc/tasknc/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2017-05-15";
- name = "tasknc-${version}";
+ pname = "tasknc";
src = fetchFromGitHub {
owner = "lharding";
diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix
index 9f1773b191d2..847092356d28 100644
--- a/pkgs/applications/misc/taskopen/default.nix
+++ b/pkgs/applications/misc/taskopen/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, makeWrapper, which, perl, perlPackages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "taskopen-1.1.4";
src = fetchurl {
url = "https://github.com/ValiValpas/taskopen/archive/v1.1.4.tar.gz";
diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix
index 6a30adb23da2..feb06368de41 100644
--- a/pkgs/applications/misc/tasksh/default.nix
+++ b/pkgs/applications/misc/tasksh/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, cmake, readline }:
stdenv.mkDerivation rec {
- name = "tasksh-${version}";
+ pname = "tasksh";
version = "1.2.0";
enableParallelBuilding = true;
src = fetchurl {
- url = "https://taskwarrior.org/download/${name}.tar.gz";
+ url = "https://taskwarrior.org/download/${pname}-${version}.tar.gz";
sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf";
};
diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index dc632f3ed757..ba919fbc6267 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, libuuid, gnutls }:
stdenv.mkDerivation rec {
- name = "taskwarrior-${version}";
+ pname = "taskwarrior";
version = "2.5.1";
src = fetchurl {
diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix
index 15ee275c0e19..547eea4f2d23 100644
--- a/pkgs/applications/misc/tdrop/default.nix
+++ b/pkgs/applications/misc/tdrop/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
, xwininfo, xdotool, xprop }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "tdrop";
version = "unstable-2018-11-13";
diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix
index 7edb8dd5d1ef..94eacb1fe067 100644
--- a/pkgs/applications/misc/termdown/default.nix
+++ b/pkgs/applications/misc/termdown/default.nix
@@ -5,7 +5,7 @@ with stdenv.lib;
buildPythonApplication rec {
- name = "termdown-${version}";
+ pname = "termdown";
version = "1.16.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix
index 3599bd0030b9..00300e65abb4 100644
--- a/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/pkgs/applications/misc/terminal-notifier/default.nix
@@ -1,7 +1,7 @@
{ stdenv, runtimeShell, lib, fetchzip }:
stdenv.mkDerivation rec {
- name = "terminal-notifier-${version}";
+ pname = "terminal-notifier";
version = "2.0.0";
diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix
index bdbea571790e..ba898932f06c 100644
--- a/pkgs/applications/misc/terminal-parrot/default.nix
+++ b/pkgs/applications/misc/terminal-parrot/default.nix
@@ -1,13 +1,13 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
- name = "terminal-parrot-${version}";
+ pname = "terminal-parrot";
version = "1.1.1";
src = fetchFromGitHub {
owner = "jmhobbs";
repo = "terminal-parrot";
- rev = "${version}";
+ rev = version;
sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722";
};
diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix
index 8518b72bc95f..fce46d120de5 100644
--- a/pkgs/applications/misc/terminus/default.nix
+++ b/pkgs/applications/misc/terminus/default.nix
@@ -13,7 +13,7 @@ let
in
stdenv.mkDerivation rec {
version = "1.0.0-alpha.42";
- name = "terminus-${version}";
+ pname = "terminus";
src = fetchurl {
url = "https://github.com/Eugeny/terminus/releases/download/v${version}/terminus_${version}_amd64.deb";
sha256 = "1r5n75n71zwahg4rxlnf9qzrb0651gxv0987m6bykqmfpnw91nmb";
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index d4191a875bdd..6a9de3644469 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "termite-${version}";
+ pname = "termite";
version = "15";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/teseq/default.nix b/pkgs/applications/misc/teseq/default.nix
index 9502b3a0abe7..b17645919824 100644
--- a/pkgs/applications/misc/teseq/default.nix
+++ b/pkgs/applications/misc/teseq/default.nix
@@ -4,7 +4,8 @@ let
version = "1.1.1";
in
stdenv.mkDerivation {
- name = "teseq-${version}";
+ pname = "teseq";
+ inherit version;
src = fetchurl {
url = "mirror://gnu/teseq/teseq-${version}.tar.gz";
diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
index 4172660182df..39f54156fef8 100644
--- a/pkgs/applications/misc/tilda/default.nix
+++ b/pkgs/applications/misc/tilda/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
- name = "tilda-${version}";
+ pname = "tilda";
version = "1.4.1";
src = fetchzip {
- url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz";
+ url = "https://github.com/lanoxx/tilda/archive/${pname}-${version}.tar.gz";
sha256 = "154rsldqjv2m1bddisb930qicb0y35kx7bxq392n2hn68jr2pxkj";
};
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index 095681d136d8..aae17905cb71 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -19,7 +19,7 @@
, hicolor-icon-theme
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "tilix";
version = "unstable-2019-08-03";
diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix
index ca049ba04c91..d0419c414d7a 100644
--- a/pkgs/applications/misc/timewarrior/default.nix
+++ b/pkgs/applications/misc/timewarrior/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
- name = "timewarrior-${version}";
+ pname = "timewarrior";
version = "1.1.1";
enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 63bb7f4bb4a4..e612fb10ff8c 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "tint2-${version}";
+ pname = "tint2";
version = "16.7";
src = fetchFromGitLab {
diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix
new file mode 100644
index 000000000000..8d84ab59d479
--- /dev/null
+++ b/pkgs/applications/misc/tippecanoe/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, sqlite, zlib, perl }:
+
+stdenv.mkDerivation rec {
+ pname = "tippecanoe";
+ version = "1.34.3";
+
+ src = fetchFromGitHub {
+ owner = "mapbox";
+ repo = pname;
+ rev = version;
+ sha256 = "08pkxzwp4w5phrk9b0vszxnx8yymp50v0bcw96pz8qwk48z4xm0i";
+ };
+
+ buildInputs = [ sqlite zlib ];
+ checkInputs = [ perl ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ enableParallelBuilding = true;
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "Build vector tilesets from large collections of GeoJSON features";
+ homepage = https://github.com/mapbox/tippecanoe;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ sikmir ];
+ platforms = platforms.linux ++ platforms.darwin;
+ };
+}
diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix
index 6cf1f27a104b..cb70d57869c0 100644
--- a/pkgs/applications/misc/tnef/default.nix
+++ b/pkgs/applications/misc/tnef/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.4.17";
- name = "tnef-${version}";
+ pname = "tnef";
src = fetchFromGitHub {
owner = "verdammelt";
diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix
index 5bb2b5b94616..93f233a4f925 100644
--- a/pkgs/applications/misc/todiff/default.nix
+++ b/pkgs/applications/misc/todiff/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
- name = "todiff-${version}";
+ pname = "todiff";
version = "0.6.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix
index d4735c0baf5f..d9dcee762cf3 100644
--- a/pkgs/applications/misc/todoist/default.nix
+++ b/pkgs/applications/misc/todoist/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
- name = "todoist-${version}";
+ pname = "todoist";
version = "0.13.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/todolist/default.nix b/pkgs/applications/misc/todolist/default.nix
index 122567de2e1e..669c06a9480e 100644
--- a/pkgs/applications/misc/todolist/default.nix
+++ b/pkgs/applications/misc/todolist/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "todolist-${version}";
+ pname = "todolist";
version = "v0.8.1";
goPackagePath = "github.com/gammons/todolist";
@@ -9,7 +9,7 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "gammons";
repo = "todolist";
- rev = "${version}";
+ rev = version;
sha256 = "0dazfymby5xm4482p9cyj23djmkz5q7g79cqm2d85mczvz7vks8p";
};
diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix
index b268bdd0962e..bf22cb0181da 100644
--- a/pkgs/applications/misc/toggldesktop/default.nix
+++ b/pkgs/applications/misc/toggldesktop/default.nix
@@ -12,7 +12,7 @@ let
};
bugsnag-qt = stdenv.mkDerivation rec {
- name = "bugsnag-qt-${version}";
+ pname = "bugsnag-qt";
version = "20180522.005732";
src = fetchzip {
@@ -25,7 +25,7 @@ let
};
qxtglobalshortcut = stdenv.mkDerivation rec {
- name = "qxtglobalshortcut-${version}";
+ pname = "qxtglobalshortcut";
version = "f584471dada2099ba06c574bdfdd8b078c2e3550";
src = fetchzip {
@@ -38,7 +38,7 @@ let
};
qt-oauth-lib = stdenv.mkDerivation rec {
- name = "qt-oauth-lib-${version}";
+ pname = "qt-oauth-lib";
version = "20190125.190943";
src = fetchzip {
diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix
index ba6e97d61fb3..d8a6f86f104b 100644
--- a/pkgs/applications/misc/tomboy/default.nix
+++ b/pkgs/applications/misc/tomboy/default.nix
@@ -8,7 +8,8 @@ let
in
stdenv.mkDerivation {
- name = "tomboy-${version}";
+ pname = "tomboy";
+ inherit version;
src = fetchurl {
url = "https://github.com/tomboy-notes/tomboy/releases/download/${version}/tomboy-${version}.tar.xz";
diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix
index df9ed8973702..425ea8d237b3 100644
--- a/pkgs/applications/misc/toot/default.nix
+++ b/pkgs/applications/misc/toot/default.nix
@@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "ihabunek";
repo = "toot";
- rev = "${version}";
+ rev = version;
sha256 = "11dgz082shxpbsxr4i41as040cfqinm5lbcg3bmsxqvc4hsz2nr5";
};
diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix
index 413f082fb22a..4ccf204357ca 100644
--- a/pkgs/applications/misc/tootle/default.nix
+++ b/pkgs/applications/misc/tootle/default.nix
@@ -7,7 +7,7 @@
let
pname = "tootle";
version = "0.2.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix
index 34952b9c0f4d..eb3894c7b47d 100644
--- a/pkgs/applications/misc/topydo/default.nix
+++ b/pkgs/applications/misc/topydo/default.nix
@@ -5,7 +5,6 @@ with python3Packages;
buildPythonApplication rec {
pname = "topydo";
version = "0.13";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "bram85";
diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix
index 09322b47506b..b955711d0030 100644
--- a/pkgs/applications/misc/tpmmanager/default.nix
+++ b/pkgs/applications/misc/tpmmanager/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.8.1";
- name = "tpmmanager-${version}";
+ pname = "tpmmanager";
src = fetchgit {
url = "https://github.com/Sirrix-AG/TPMManager";
diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/applications/misc/tthsum/default.nix
index dbac56abaa1d..76ac3f75b266 100644
--- a/pkgs/applications/misc/tthsum/default.nix
+++ b/pkgs/applications/misc/tthsum/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "tthsum-${version}";
+ pname = "tthsum";
version = "1.3.2";
src = fetchurl {
diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index 04c6cc3606e3..2aef45748cac 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "twmn-git-2018-10-01";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix
index 8764c41c8a4c..ad29c8f94d8b 100644
--- a/pkgs/applications/misc/urlview/default.nix
+++ b/pkgs/applications/misc/urlview/default.nix
@@ -31,10 +31,21 @@ stdenv.mkDerivation rec {
patches = debianPatches;
- meta = {
+ postPatch = ''
+ substituteInPlace urlview.c \
+ --replace '/etc/urlview/url_handler.sh' "$out/etc/urlview/url_handler.sh"
+ '';
+
+ postInstall = ''
+ install -Dm755 url_handler.sh $out/etc/urlview/url_handler.sh
+ patchShebangs $out/etc/urlview
+ '';
+
+ meta = with stdenv.lib; {
description = "Extract URLs from text";
homepage = https://packages.qa.debian.org/u/urlview.html;
- license = stdenv.lib.licenses.gpl2;
- platforms = with stdenv.lib.platforms; linux ++ darwin;
+ license = licenses.gpl2;
+ platforms = with platforms; linux ++ darwin;
+ maintainers = with maintainers; [ ma27 ];
};
}
diff --git a/pkgs/applications/misc/usync/default.nix b/pkgs/applications/misc/usync/default.nix
index d12120ca2f11..344c07d845be 100644
--- a/pkgs/applications/misc/usync/default.nix
+++ b/pkgs/applications/misc/usync/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "usync";
version = "0.0.3";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "ebzzry";
diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix
index 6752b0182fea..5a12465c4c49 100644
--- a/pkgs/applications/misc/valentina/default.nix
+++ b/pkgs/applications/misc/valentina/default.nix
@@ -7,7 +7,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "valentina-${version}";
+ pname = "valentina";
version = "0.6.1";
src = fetchhg {
diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix
index 5cd8de43729b..b25e7f76cefe 100644
--- a/pkgs/applications/misc/vcal/default.nix
+++ b/pkgs/applications/misc/vcal/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, perl }:
stdenv.mkDerivation rec {
- name = "vcal-${version}";
+ pname = "vcal";
version = "2.8";
src = fetchurl {
diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix
index 8b64bcca667d..9639cee2d8c7 100644
--- a/pkgs/applications/misc/veracrypt/default.nix
+++ b/pkgs/applications/misc/veracrypt/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }:
+{ stdenv, fetchurl, pkgconfig, makeself, yasm, fuse, unzip, wxGTK, lvm2 }:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "veracrypt";
- name = "${pname}-${version}";
version = "1.23";
+ minorVersion = "-Hotfix-2";
src = fetchurl {
- url = "https://launchpad.net/${pname}/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2";
- sha256 = "009lqi43n2w272sxv7y7dz9sqx15qkx6lszkswr8mwmkpgkm0px1";
+ url = "https://launchpad.net/${pname}/trunk/${version}/+download/VeraCrypt_${version}${minorVersion}_Source.zip";
+ sha256 = "229de81b2478cfa5fa73e74e60798a298cd616e9852b9f47b484c80bc2a2c259";
};
sourceRoot = "src";
nativeBuildInputs = [ makeself pkgconfig yasm ];
- buildInputs = [ fuse lvm2 wxGTK ];
+ buildInputs = [ fuse lvm2 unzip wxGTK ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix
index 058624445561..b6a8b567a503 100644
--- a/pkgs/applications/misc/verbiste/default.nix
+++ b/pkgs/applications/misc/verbiste/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, libgnomeui, libxml2 }:
stdenv.mkDerivation rec {
- name = "verbiste-${version}";
+ pname = "verbiste";
version = "0.1.46";
src = fetchurl {
- url = "https://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz";
+ url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz";
sha256 = "13l8b8mbkdds955sn42hzrjzj48lg1drpd7vhpcjxadckbvlh1p0";
};
diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index 50f2012d34ab..2d8a860e7e86 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/pkgs/applications/misc/viking/default.nix
@@ -1,10 +1,10 @@
{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl
, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper
, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme
-, geoclue2, liboauth }:
+, geoclue2, liboauth, nettle }:
stdenv.mkDerivation rec {
- name = "viking-${version}";
+ pname = "viking";
version = "1.7";
src = fetchurl {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite hicolor-icon-theme
- geoclue2 liboauth
+ geoclue2 liboauth nettle
];
configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ];
diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
index 5ebc98b57123..64645e00bd85 100644
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/applications/misc/visidata/default.nix
@@ -2,7 +2,6 @@
, dateutil, pyyaml, openpyxl, xlrd, h5py, fonttools, lxml, pandas, pyshp
}:
buildPythonApplication rec {
- name = "${pname}-${version}";
pname = "visidata";
version = "1.5.2";
diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix
index 47b0385be687..3561135ce618 100644
--- a/pkgs/applications/misc/volnoti/default.nix
+++ b/pkgs/applications/misc/volnoti/default.nix
@@ -2,8 +2,8 @@
, pkgconfig, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg
, dbus-glib, autoreconfHook, wrapGAppsHook }:
-stdenv.mkDerivation rec {
- name = "volnoti-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "volnoti-unstable";
version = "2013-09-23";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/vp/default.nix b/pkgs/applications/misc/vp/default.nix
index e794b82e2f6e..a59a25a144e9 100644
--- a/pkgs/applications/misc/vp/default.nix
+++ b/pkgs/applications/misc/vp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, SDL, SDL_image }:
stdenv.mkDerivation rec {
- name = "vp-${version}";
+ pname = "vp";
version = "1.8";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix
index 1feec9e45509..d6404ca65965 100644
--- a/pkgs/applications/misc/vue/default.nix
+++ b/pkgs/applications/misc/vue/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre, runtimeShell }:
stdenv.mkDerivation rec {
- name = "vue-${version}";
+ pname = "vue";
version = "3.3.0";
src = fetchurl {
url = "http://releases.atech.tufts.edu/jenkins/job/VUE/116/deployedArtifacts/download/artifact.1";
diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index 48818ca3b8b1..6dfe8e713c63 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, qmake, qtsvg }:
stdenv.mkDerivation rec {
- name = "vym-${version}";
+ pname = "vym";
version = "2.6.11";
src = fetchurl {
- url = "mirror://sourceforge/project/vym/2.6.0/${name}.tar.bz2";
+ url = "mirror://sourceforge/project/vym/2.6.0/${pname}-${version}.tar.bz2";
sha256 = "1yznlb47jahd662a2blgh1ccwpl5dp5rjz9chsxjzhj3vbkzx3nl";
};
diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/applications/misc/wcalc/default.nix
index 1c6dc8f63c23..ff770f516bc5 100644
--- a/pkgs/applications/misc/wcalc/default.nix
+++ b/pkgs/applications/misc/wcalc/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, mpfr, readline }:
stdenv.mkDerivation rec {
- name = "wcalc-${version}";
+ pname = "wcalc";
version = "2.5";
src = fetchurl {
- url = "mirror://sourceforge/w-calc/${name}.tar.bz2";
+ url = "mirror://sourceforge/w-calc/${pname}-${version}.tar.bz2";
sha256 = "1vi8dl6rccqiq1apmpwawyg2ywx6a1ic1d3cvkf2hlwk1z11fb0f";
};
diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix
index 90fa01661543..2748d576c692 100644
--- a/pkgs/applications/misc/weather/default.nix
+++ b/pkgs/applications/misc/weather/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "2.3";
- name = "weather-${version}";
+ pname = "weather";
src = fetchurl {
- url = "http://fungi.yuggoth.org/weather/src/${name}.tar.xz";
+ url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz";
sha256 = "0inij30prqqcmzjwcmfzjjn0ya5klv18qmajgxipz1jr3lpqs546";
};
diff --git a/pkgs/applications/misc/web-media-controller/default.nix b/pkgs/applications/misc/web-media-controller/default.nix
index 6ed2ff10aaa7..e381af4f403e 100644
--- a/pkgs/applications/misc/web-media-controller/default.nix
+++ b/pkgs/applications/misc/web-media-controller/default.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ glib pcre json-glib ];
cmakeFlags = [
- "-DCHROMIUM_MANIFEST_DESTINATION=${placeholder ''out''}/etc/chromium/native-messaging-hosts"
- "-DCHROME_MANIFEST_DESTINATION=${placeholder ''out''}/etc/opt/chrome/native-messaging-hosts"
- "-DFIREFOX_MANIFEST_DESTINATION=${placeholder ''out''}/lib/mozilla/native-messaging-hosts"
+ "-DCHROMIUM_MANIFEST_DESTINATION=${placeholder "out"}/etc/chromium/native-messaging-hosts"
+ "-DCHROME_MANIFEST_DESTINATION=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts"
+ "-DFIREFOX_MANIFEST_DESTINATION=${placeholder "out"}/lib/mozilla/native-messaging-hosts"
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix
index a3d3ace009e1..03f3caa4c151 100644
--- a/pkgs/applications/misc/wego/default.nix
+++ b/pkgs/applications/misc/wego/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "wego-${version}";
+ pname = "wego";
version = "20170403-${stdenv.lib.strings.substring 0 7 rev}";
rev = "415efdfab5d5ee68300bf261a0c6f630c6c2584c";
diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix
index d8628b794d71..d38383c30ecb 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/pkgs/applications/misc/wikicurses/default.nix
@@ -2,7 +2,7 @@
pythonPackages.buildPythonApplication rec {
version = "1.4";
- name = "wikicurses-${version}";
+ pname = "wikicurses";
src = fetchFromGitHub {
owner = "ids1024";
diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix
index 5d153a0e417f..5a1093b47797 100644
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/pkgs/applications/misc/wordnet/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "3.0";
- name = "wordnet-${version}";
+ pname = "wordnet";
src = fetchurl {
url = "http://wordnetcode.princeton.edu/${version}/WordNet-${version}.tar.bz2";
sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc";
diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index daae279ccc79..e5b89ff43b5b 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -1,11 +1,11 @@
{ stdenv, libX11, fetchurl }:
stdenv.mkDerivation rec {
- name = "worker-${version}";
+ pname = "worker";
version = "4.0.1";
src = fetchurl {
- url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz";
+ url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";
sha256 = "1mwkyak68bsxgff399xmr7bb3hxl0r976b90zi7jrzznwlvxx7vh";
};
diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index 1547d2962116..a3c9d735ff8d 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -6,7 +6,7 @@
, gst-plugins-good, libsigcxx }:
stdenv.mkDerivation rec {
- name = "workrave-${version}";
+ pname = "workrave";
version = "1.10.31";
src = let
diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index 52462d1c1f34..60ff84ffe593 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -1,30 +1,33 @@
{ buildGoModule
, fetchFromGitHub
, lib
+, makeWrapper
+, ncurses
}:
buildGoModule rec {
pname = "wtf";
- version = "0.20.0";
+ version = "0.21.0";
+
+ overrideModAttrs = _oldAttrs : _oldAttrs // {
+ preBuild = ''export GOPROXY="https://gocenter.io"'';
+ };
src = fetchFromGitHub {
owner = "wtfutil";
repo = pname;
rev = "v${version}";
- sha256 = "03k3x3fnxz23b75n5x8mlr6srr063q3dwq05wh55b4bgqsf7lgzd";
+ sha256 = "0sd8vrx7nak0by4whdmd9jzr66zm48knv1w1aqi90709fv98brm9";
};
- modSha256 = "1nqnjpkrjbb75yfbzh3v3vc4xy5a2aqm9jr40hwq589a4l9p5pw2";
+ modSha256 = "0jgq9ql27x0kdp59l5drisl5v7v7sx2wy3zqjbr3bqyh3vdx19ic";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
- # As per https://github.com/wtfutil/wtf/issues/501, one of the
- # dependencies can't be fetched, so vendored dependencies should
- # be used instead
- modBuildPhase = ''
- runHook preBuild
- make build -mod=vendor
- runHook postBuild
+ nativeBuildInputs = [ makeWrapper ];
+
+ postInstall = ''
+ wrapProgram "$out/bin/wtf" --prefix PATH : "${ncurses.dev}/bin"
'';
meta = with lib; {
diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix
index bf3d9b737a9e..295d721d3c5f 100644
--- a/pkgs/applications/misc/xautoclick/default.nix
+++ b/pkgs/applications/misc/xautoclick/default.nix
@@ -3,9 +3,9 @@
, qtSupport ? true, qt4
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.31";
- name = "xautoclick-${version}";
+ pname = "xautoclick";
src = fetchurl {
url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz";
sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm";
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 280b30128727..8c5a2e3d2db9 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -2,7 +2,7 @@
, libtool, openssl, qtbase, qttools }:
mkDerivation rec {
- name = "xca-${version}";
+ pname = "xca";
version = "2.1.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index a7a6500fd22a..6a5e62f54e1e 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -1,22 +1,30 @@
-{stdenv, fetchurl, wxGTK, chmlib}:
+{ stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, chmlib }:
-stdenv.mkDerivation {
- name = "xchm-1.23";
- src = fetchurl {
- url = mirror://sourceforge/xchm/xchm-1.23.tar.gz;
- sha256 = "0qn0fyxcrn30ndq2asx31k0qkx3grbm16fb1y580wd2gjmh5r3wg";
+stdenv.mkDerivation rec {
+ pname = "xchm";
+ version = "1.30";
+
+ src = fetchFromGitHub {
+ owner = "rzvncj";
+ repo = "xCHM";
+ rev = version;
+ sha256 = "1sjvh06m8jbb28k6y3knas3nkh1dfvff4mlwjs33x12ilhddhr8v";
};
- buildInputs = [wxGTK chmlib];
- postConfigure = ''
- export NIX_LDFLAGS="$NIX_LDFLAGS $(${wxGTK}/lib/wx/config/* --libs | sed -e s@-pthread@@)"
- echo $NIX_LDFLAGS
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ wxGTK30 chmlib ];
+
+ configureFlags = [ "--with-wx-prefix=${wxGTK30}" ];
+
+ preConfigure = ''
+ export LDFLAGS="$LDFLAGS $(${wxGTK30}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk2u_aui-3.0"
'';
meta = with stdenv.lib; {
description = "A viewer for Microsoft HTML Help files";
- homepage = http://xchm.sourceforge.net;
+ homepage = "https://github.com/rzvncj/xCHM";
license = licenses.gpl2;
+ maintainers = with maintainers; [ sikmir ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix
index ed7f2b27c381..b7f8cfce2fb6 100644
--- a/pkgs/applications/misc/xdgmenumaker/default.nix
+++ b/pkgs/applications/misc/xdgmenumaker/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, txt2tags, python2Packages }:
stdenv.mkDerivation rec {
- name = "xdgmenumaker-${version}";
+ pname = "xdgmenumaker";
version = "1.5";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
index 88ab52313b06..2e81e9b05d34 100644
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/pkgs/applications/misc/xiphos/default.nix
@@ -13,13 +13,13 @@
}:
stdenv.mkDerivation rec {
- name = "xiphos-${version}";
+ pname = "xiphos";
version = "4.0.7";
src = fetchFromGitHub {
owner = "crosswire";
repo = "xiphos";
- rev = "${version}";
+ rev = version;
sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g";
};
diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix
index 3023e830dc79..d6709ecc1a62 100644
--- a/pkgs/applications/misc/xkbd/default.nix
+++ b/pkgs/applications/misc/xkbd/default.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
- name = "xkbd-${version}";
+ pname = "xkbd";
version = "0.8.18";
src = fetchFromGitHub {
owner = "mahatma-kaganovich";
repo = "xkbd";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "05ry6q75jq545kf6p20nhfywaqf2wdkfiyp6iwdpv9jh238hf7m9";
};
diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix
index 3f3865d7688a..abc808477a39 100644
--- a/pkgs/applications/misc/xkblayout-state/default.nix
+++ b/pkgs/applications/misc/xkblayout-state/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchurl, qt4 }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "xkblayout-state";
version = "1b";
diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/applications/misc/xkbmon/default.nix
index 4fa1c833df53..dc618e4561e6 100644
--- a/pkgs/applications/misc/xkbmon/default.nix
+++ b/pkgs/applications/misc/xkbmon/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libX11 }:
stdenv.mkDerivation rec {
- name = "xkbmon-${version}";
+ pname = "xkbmon";
version = "0.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix
index 433f6c614774..c673002fb511 100644
--- a/pkgs/applications/misc/xmind/default.nix
+++ b/pkgs/applications/misc/xmind/default.nix
@@ -1,11 +1,11 @@
{ stdenv, lib, fetchzip, fetchurl, gtk2, jre, libXtst, makeWrapper, makeDesktopItem, runtimeShell }:
stdenv.mkDerivation rec {
- name = "xmind-${version}";
+ pname = "xmind";
version = "8-update8";
src = fetchzip {
- url = "https://xmind.net/xmind/downloads/${name}-linux.zip";
+ url = "https://xmind.net/xmind/downloads/${pname}-${version}-linux.zip";
stripRoot = false;
sha256 = "1p68z0b4brgiyybz190alqv716ncql49vsksm41y90mcjd8s4jhn";
};
diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index be42127e2548..4d7b54536e4a 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -17,7 +17,7 @@ stdenv'.mkDerivation rec {
src = fetchFromGitHub {
owner = "fireice-uk";
repo = "xmr-stak";
- rev = "${version}";
+ rev = version;
sha256 = "1p8hx8gwnv7a49pffq1xmzmrfi3gs6dyra9dn2xi7cl75yn9kfhm";
};
diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 6e421be93022..8a46336c9de2 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "xmrig-${version}";
+ pname = "xmrig";
version = "3.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix
index 18eb2189f2c0..7d9ebca0086c 100644
--- a/pkgs/applications/misc/xmrig/proxy.nix
+++ b/pkgs/applications/misc/xmrig/proxy.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "xmrig-proxy-${version}";
+ pname = "xmrig-proxy";
version = "3.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index 1cce7b155fde..f3bbbf42d5bc 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib
, xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }:
-stdenv.mkDerivation rec {
- name = "xneur-${version}";
+stdenv.mkDerivation {
+ pname = "xneur";
version = "0.20.0";
src = fetchurl {
diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix
index 5db4a2508399..bc91083892db 100644
--- a/pkgs/applications/misc/xpad/default.nix
+++ b/pkgs/applications/misc/xpad/default.nix
@@ -3,7 +3,7 @@
, glib, intltool, gtk3, gtksourceview, hicolor-icon-theme }:
stdenv.mkDerivation rec {
- name = "xpad-${version}";
+ pname = "xpad";
version = "5.4.0";
src = fetchurl {
diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix
index bb3385ad016a..41071012ae9f 100644
--- a/pkgs/applications/misc/xrandr-invert-colors/default.nix
+++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.01";
- name = "xrandr-invert-colors-${version}";
+ pname = "xrandr-invert-colors";
src = fetchurl {
url = "https://github.com/zoltanp/xrandr-invert-colors/archive/v${version}.tar.gz";
sha256 = "1z4hxn56rlflvqanb8ncqa1xqawnda85b1b37w6r2iqs8rw52d75";
diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix
index fe65004b32ae..244a2c43a155 100644
--- a/pkgs/applications/misc/xrq/default.nix
+++ b/pkgs/applications/misc/xrq/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libX11}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "xrq-unstable-2016-01-15";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix
index 28ce4a0d500d..517105d7e1fd 100644
--- a/pkgs/applications/misc/xscope/default.nix
+++ b/pkgs/applications/misc/xscope/default.nix
@@ -1,12 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libXt }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "xscope";
version = "1.4.1";
src = fetchurl {
- url = "mirror://xorg/individual/app/${name}.tar.bz2";
+ url = "mirror://xorg/individual/app/${pname}-${version}.tar.bz2";
sha256 = "08zl3zghvbcqy0r5dn54dim84lp52s0ygrr87jr3a942a6ypz01k";
};
diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix
index ef9ce3393619..55ecd358c6cd 100644
--- a/pkgs/applications/misc/xsuspender/default.nix
+++ b/pkgs/applications/misc/xsuspender/default.nix
@@ -4,7 +4,7 @@
with lib;
stdenv.mkDerivation rec {
- name = "xsuspender-${version}";
+ pname = "xsuspender";
version = "1.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix
index 3e8acff00f89..aa851e14ab5f 100644
--- a/pkgs/applications/misc/xsw/default.nix
+++ b/pkgs/applications/misc/xsw/default.nix
@@ -4,7 +4,7 @@ let
makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL");
in stdenv.mkDerivation rec {
- name = "xsw-${version}";
+ pname = "xsw";
version = "0.1.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/xteddy/default.nix b/pkgs/applications/misc/xteddy/default.nix
index 6bc492833cc1..856ddb8ff50c 100644
--- a/pkgs/applications/misc/xteddy/default.nix
+++ b/pkgs/applications/misc/xteddy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, pkg-config, xorg, imlib2, makeWrapper }:
stdenv.mkDerivation rec {
- name = "xteddy-${version}";
+ pname = "xteddy";
version = "2.2-5";
src = fetchFromGitLab {
domain = "salsa.debian.org";
diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix
index 21f95c65fa56..51575d62ed50 100644
--- a/pkgs/applications/misc/xtermcontrol/default.nix
+++ b/pkgs/applications/misc/xtermcontrol/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "3.7";
- name = "xtermcontrol-${version}";
+ pname = "xtermcontrol";
src = fetchurl {
url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz";
diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix
index d273d27944a8..2135c7fd6174 100644
--- a/pkgs/applications/misc/yaft/default.nix
+++ b/pkgs/applications/misc/yaft/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.2.9";
- name = "yaft-${version}";
+ pname = "yaft";
src = fetchFromGitHub {
owner = "uobikiemukot";
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
deleted file mode 100644
index 8f8494ac45b5..000000000000
--- a/pkgs/applications/misc/yakuake/default.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ mkDerivation
-, lib
-, fetchurl
-, kdoctools
-, wrapGAppsHook
-, extra-cmake-modules
-, karchive
-, kcrash
-, kdbusaddons
-, ki18n
-, kiconthemes
-, knewstuff
-, knotifications
-, knotifyconfig
-, konsole
-, kparts
-, kwindowsystem
-, qtx11extras
-}:
-
-mkDerivation rec {
- pname = "yakuake";
- version = "3.0.5";
- name = "${pname}-${version}";
-
- src = fetchurl {
- url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
- sha256 = "021a9mnghffv2mrdl987mn7wbg8bk6bnf6xz8kn2nwsqxp9kpqh8";
- };
-
- buildInputs = [
- karchive
- kcrash
- kdbusaddons
- ki18n
- kiconthemes
- knewstuff
- knotifications
- knotifyconfig
- kparts
- kwindowsystem
- qtx11extras
- ];
-
- propagatedBuildInputs = [
- karchive
- kcrash
- kdbusaddons
- ki18n
- kiconthemes
- knewstuff
- knotifications
- knotifyconfig
- kparts
- kwindowsystem
- ];
-
- propagatedUserEnvPkgs = [ konsole ];
-
- nativeBuildInputs = [
- extra-cmake-modules kdoctools wrapGAppsHook
- ];
-
- meta = {
- homepage = https://yakuake.kde.org;
- description = "Quad-style terminal emulator for KDE";
- maintainers = with lib.maintainers; [ fridh ];
- license = lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix
index a47fb93512db..f2da2957bd3e 100644
--- a/pkgs/applications/misc/yarssr/default.nix
+++ b/pkgs/applications/misc/yarssr/default.nix
@@ -23,9 +23,9 @@ let
gtk2
];
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "git-2017-12-01";
- name = "yarssr-${version}";
+ pname = "yarssr";
src = fetchFromGitHub {
owner = "JGRennison";
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index 294229d08a93..09a6cc4a3c0a 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, lib, qt4, openssl, pkgconfig }:
stdenv.mkDerivation rec {
- name = "yate-${version}";
+ pname = "yate";
version = "6.1.0-1";
src = fetchurl {
- url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${name}.tar.gz";
+ url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${pname}-${version}.tar.gz";
sha256 = "0xx3i997nsf2wzbv6m5n6adsym0qhgc6xg4rsv0fwqrgisf5327d";
};
diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix
index eb2a0f1c1e14..7c2c8fb31cab 100644
--- a/pkgs/applications/misc/zathura/cb/default.nix
+++ b/pkgs/applications/misc/zathura/cb/default.nix
@@ -2,11 +2,11 @@
, girara, gettext, libarchive }:
stdenv.mkDerivation rec {
- name = "zathura-cb-${version}";
+ pname = "zathura-cb";
version = "0.1.8";
src = fetchurl {
- url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz";
+ url = "https://pwmt.org/projects/zathura/plugins/download/${pname}-${version}.tar.xz";
sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5";
};
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index fe4ecf225aae..8afba9353ce1 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -9,7 +9,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "zathura-core-${version}";
+ pname = "zathura-core";
version = "0.4.3";
src = fetchurl {
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index f3cacd21236e..2ebc640d683d 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "0.3.4";
- name = "zathura-pdf-mupdf-${version}";
+ pname = "zathura-pdf-mupdf";
# pwmt.org server was down at the time of last update
# src = fetchurl {
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 30ab053f923d..5b38555eda1a 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.2.9";
- name = "zathura-pdf-poppler-${version}";
+ pname = "zathura-pdf-poppler";
src = fetchurl {
- url = "https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/${version}/${name}.tar.gz";
+ url = "https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/${version}/${pname}-${version}.tar.gz";
sha256 = "0c15rnwh42m3ybrhax01bl36w0iynaq8xg6l08riml3cyljypi9l";
};
diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix
index 975c6e4a4680..88e4a9043931 100644
--- a/pkgs/applications/misc/zathura/wrapper.nix
+++ b/pkgs/applications/misc/zathura/wrapper.nix
@@ -21,7 +21,7 @@ in symlinkJoin {
description = "A highly customizable and functional PDF viewer";
longDescription = ''
Zathura is a highly customizable and functional PDF viewer based on the
- poppler rendering library and the gtk+ toolkit. The idea behind zathura
+ poppler rendering library and the GTK toolkit. The idea behind zathura
is an application that provides a minimalistic and space saving interface
as well as an easy usage that mainly focuses on keyboard interaction.
'';
diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix
index 05dee5b6154c..ce5c7fb41f1f 100644
--- a/pkgs/applications/networking/apache-directory-studio/default.nix
+++ b/pkgs/applications/networking/apache-directory-studio/default.nix
@@ -17,7 +17,7 @@ let
in
stdenv.mkDerivation rec {
- name = "apache-directory-studio-${version}";
+ pname = "apache-directory-studio";
version = "2.0.0.v20170904-M13";
src =
diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix
index 8b7bc0bb899a..31eb4dd7378a 100644
--- a/pkgs/applications/networking/brig/default.nix
+++ b/pkgs/applications/networking/brig/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "brig-${version}";
+ pname = "brig";
version = "0.4.1";
rev = "v${version}";
diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix
index 32de4871186f..57db827169ec 100644
--- a/pkgs/applications/networking/browsers/arora/default.nix
+++ b/pkgs/applications/networking/browsers/arora/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qt4, qmake4Hook }:
stdenv.mkDerivation rec {
- name = "arora-${version}";
+ pname = "arora";
version = "0.11.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix
index 0797eea6f3b5..c3f5cb131645 100644
--- a/pkgs/applications/networking/browsers/browsh/default.nix
+++ b/pkgs/applications/networking/browsers/browsh/default.nix
@@ -14,7 +14,7 @@ let
in buildGoPackage rec {
inherit version;
- name = "browsh-${version}";
+ pname = "browsh";
goPackagePath = "browsh";
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 45c125985120..a3645e97e255 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -150,21 +150,11 @@ let
] ++ optionals (useVaapi) [
# source: https://aur.archlinux.org/cgit/aur.git/plain/chromium-vaapi.patch?h=chromium-vaapi
./patches/chromium-vaapi.patch
- ] ++ optionals (!stdenv.cc.isClang && (versionRange "71" "72")) [
- ( githubPatch "65be571f6ac2f7942b4df9e50b24da517f829eec" "1sqv0aba0mpdi4x4f21zdkxz2cf8ji55ffgbfcr88c5gcg0qn2jh" )
- ] ++ optional stdenv.isAarch64
- (if (versionOlder version "71") then
- fetchpatch {
- url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
- sha256 = "0dkchqair8cy2f5a5p5vi24r9b4d28pgn2bfvm1568lypbjw6iab";
- }
- else
- fetchpatch {
- url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
- postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64";
- sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s";
- }
- );
+ ] ++ optional stdenv.isAarch64 (fetchpatch {
+ url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
+ postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64";
+ sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s";
+ });
postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 664f9343eabd..b356f809f03c 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -99,12 +99,12 @@ let
};
flash = stdenv.mkDerivation rec {
- name = "flashplayer-ppapi-${version}";
- version = "32.0.0.238";
+ pname = "flashplayer-ppapi";
+ version = "32.0.0.255";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "0jqx68lfqjpy6wbxdi0giclvh9mc9rha92hqdj1nx42v95k3gc65";
+ sha256 = "1rqb54kqxq66vvqk5yrr3rsy3wcj9r9wnkngk27c7jayzm6bwgvv";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix
index 2334dc6a71e4..6dff17c69ddb 100644
--- a/pkgs/applications/networking/browsers/chromium/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/update.nix
@@ -35,7 +35,7 @@ let
"http://repo.fdzh.org/chrome/deb/pool/main/g"
];
-in rec {
+in {
getChannel = channel: let
chanAttrs = builtins.getAttr channel sources;
in {
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index f8e56937021a..14799e9f96cc 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "1521vh38mfgy7aj1lw1vpbdm8m6wyh52d5p7bz4x6kvvxsnacp11";
- sha256bin64 = "0rbc0ld655szg42mqjdby8749d2jg34nlpp4cpq66qb4zi6vvb04";
- version = "76.0.3809.87";
+ sha256 = "0m7xdpi1f2a33csd7bsp91g5klz0hmr83ksfwsd2fki3iipvfs4w";
+ sha256bin64 = "1b4cyf4v55sy52mxxl8d70abg5ck5k45jaqdjsjw7dvh3s2x4bwp";
+ version = "77.0.3865.42";
};
dev = {
- sha256 = "15v25nwcdxqgw6n0ym7fz5qaq0a74p0wiwcq155xy6zvr3q8q1nw";
- sha256bin64 = "1qawl0hsl6qpc10avli8raw4nzwcpmp6dyada5pga7i4k5jpsr95";
- version = "77.0.3860.5";
+ sha256 = "0x5r6xqwiggwyzbinm252xc1n3f9r7cmmzj6assi4v1nsispdh2k";
+ sha256bin64 = "03yymhbpd1snycmcv7wkg5j6zbydvyc365gy5myp7wgas7cd0mb6";
+ version = "78.0.3887.7";
};
stable = {
- sha256 = "0vfjfxsqf8jrmd7y08ln1lpbilwi150875zn2bawwdq87vd3mncc";
- sha256bin64 = "1c5rlqgshv5295wg5cji12z2b38l6a81l94spmzr46h5z9nn1gqx";
- version = "76.0.3809.100";
+ sha256 = "0hajwjf7swlgh1flpf8ljfrb2zhmcpzvrigvvxqd36g3nm04cknm";
+ sha256bin64 = "0hdsla8i3q0zbczia64ghqsf420alcc31xdishx1sv48x3rlrxkk";
+ version = "76.0.3809.132";
};
}
diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix
index 671ab03a2e29..8d6c99d2468c 100644
--- a/pkgs/applications/networking/browsers/dillo/default.nix
+++ b/pkgs/applications/networking/browsers/dillo/default.nix
@@ -7,10 +7,10 @@
stdenv.mkDerivation rec {
version = "3.0.5";
- name = "dillo-${version}";
+ pname = "dillo";
src = fetchurl {
- url = "https://www.dillo.org/download/${name}.tar.bz2";
+ url = "https://www.dillo.org/download/${pname}-${version}.tar.bz2";
sha256 = "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv";
};
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index 4f4741ce0bdf..da6a7bc47155 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -10,7 +10,7 @@
assert enableGuile -> guile != null;
assert enablePython -> python != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "elinks-0.12pre6";
src = fetchurl {
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index dea752874ddb..537a30c01a2e 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -58,8 +58,8 @@ let
inherit (generated) version sources;
mozillaPlatforms = {
- "i686-linux" = "linux-i686";
- "x86_64-linux" = "linux-x86_64";
+ i686-linux = "linux-i686";
+ x86_64-linux = "linux-x86_64";
};
arch = mozillaPlatforms.${stdenv.hostPlatform.system};
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index cd9d3bd88a09..386707351108 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,935 +1,935 @@
{
- version = "68.0.2";
+ version = "69.0";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ach/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ach/firefox-69.0.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "f4ef9741a880475331f3cfd6aa9315d64c6cabc68fcea85e9f04f6a4f6cf9df952c05ef810b1eeaa5afbbc4001735840849c2dc180694bc76b5a3812f83ee50b";
+ sha512 = "300639491b6ca69d7f594df35fbaae3f0e452f8c5280aee71f64ebfdb2592f3948ea2b936f04f01660e3b296e07650b72c583771a90902e62ca3efaea67d291e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/af/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/af/firefox-69.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "891d435d29154ebff8caa7942196c593ae350f490a411d05de1af247ca371f8f531d9a90e52c666f530ae5a4145ff99f686629921f908712c7931bf43d21b9c1";
+ sha512 = "5da9dee3ec659045f282dd76c821cc62ac20fda014ce04fdd756ad0ebbba73f054f520f89e227c5b6590255e275d0cdece2c2c16e42733c7395ecde18f42f2f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/an/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/an/firefox-69.0.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "d7f587357777b7bf70add4162cd62364d8c2be0bf7219e4c1b25335b66645ae4c1e5581a7d0a03e30d4eab5c5664cf05b1b85ce0dd13827a29c0ce227549c9e6";
+ sha512 = "7ef4a311136988c57194e9388862f68b30cc4e5f9c4303da4105389188abb4453f592e9d0819b337e7ef9b482a76df19a9d84a06eeb287f93dbc7e43a41bda15";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ar/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ar/firefox-69.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "2b04ba04cdfb1ad488fd5a183a862c2f6d0166d73ee637a25d64a7e9ff962d0fe7ab8970afa83cf28c5976f16257c42f6a26499b49b2d01f4e655499ec85cb0d";
+ sha512 = "a16636cfced17bccf2932e14c6b4c2260c713c538d774802c1dc8598bc47635238549a4332c4cf69b3d3946397bc8f2ba5b330be5716dbb8a81570bea1acc5e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ast/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ast/firefox-69.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "2267f7a3a8a27816e550e567d5b9a9639df31b86e24c17216e9843bf5211e520d3303200f5c15b9a342e90754db9a9646ad87615b6b490d6058f26fd21db6ffe";
+ sha512 = "2239a47cd8869cb7cd50820e1faef0eae66245f04cab81e36250b4be1ae3e7619a994b68c2256777636f8da8fb10aee781715b11bbd7ea857300b7a5afcb085f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/az/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/az/firefox-69.0.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "69f2e026ddc3c26f7f8a6ee2d239289c1e154a9147a20dcfb07be571bd57ed3492c2b770c768dd0b6ace979410649af5193140757b1d5131391706ce156746d3";
+ sha512 = "d79ad1be25e9eb3123ba89a5589abfdc58e161bf3ab0c90ff3306639f1a43bd80b9175695f7d5a24aad7c3fb16a616bb90eeb67d2f3f820db5b5b5556e774cf8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/be/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/be/firefox-69.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "11efb3f3a123d29814be1e4f72e2a0424f05d5c2d5da67fd0ae4f23909d8da910e2b9efde472c85fc3c0b2d51492eae2b41575e6a84954073842d210cbc4de5c";
+ sha512 = "38b340353be185502214945665b846ca73f1ace1528f0426ae702d8dda88a104f79a879e99873bc9f418a753572ab3bd597a9f820f0e0e94daeb21e05793b90a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/bg/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bg/firefox-69.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "75b57ec04a5a56691e31d4d10acca2e28d1d8975f4cd277c4e1e523e9ab0860789c83f63ce2a7c41f8b3308c7f75539d3c833c2cd62bcecf8677114b053322ec";
+ sha512 = "addf46d8ac6a823d9f1a00e55bd814abb27732484560399aacc7f704fcfbc7d239380c0857df7a4d445fac8724caada49981c2dd4ee288f47c63a7613aefed9a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/bn/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bn/firefox-69.0.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha512 = "6942ef38de37525233bc24aa993fb9ef3e723fb21a4627f0edd53412b2129c1326b85f3c828383080d7fbff3fecaca63d69e765b61b1d45a2edebc0c037f710f";
+ sha512 = "3d0e90b85b5d91f01ae4e84182d071f9b07436a3d9f088ca9178a72140a7d3fcd6c1506b7899ec7bc6ef82a6dd132ea5345c2c8b41c1e2977a5d1aa95f916453";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/br/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/br/firefox-69.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "d34947348a7e6ebdfc6d4f91f2b567e6623175dc61a774bc79d137e4bc9679dff381d3e454029d35028ee1019fc806b26e7c85ce4fe36868f01978e4540480e5";
+ sha512 = "aae8493b79569b0e096193c05de56197e01c9f8f7e89b8db2d021bed6ab6e553af4e44c36ad66d427e80840e631d7b85f8c9d1c5ca17fd0bb94a0bfdaab94d7d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/bs/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bs/firefox-69.0.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "ee1c6343ea3aef7852ca240608f80dc9279469422e6730f0eb2cc8c532ffb5c6eba01bc3f1f2f759724661c53d329be619593d741771187057fdb903100f1153";
+ sha512 = "19efd698f911401b32b3affa6e5a371566eca8aaafde96e38704e48871f69d4e6c4c3a8f189519f8b8022ad2782ea5076e53e75db9c1c12e504eb31c827c243a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ca/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ca/firefox-69.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "f22b424240fb8858a9960f96384e81f8609deca0adda0deb29e18328b4f4dd71048c4b450121f53c29d6a4b3d63a4cba8a72a7194da3e93645bbcc00d7d7951a";
+ sha512 = "527d672c469bbea18d727e276fd53ca26d65a169f665b32190c6db47c549e7e3155dd04c65fb2720e1d45658a3c8c1f2567f62fc807a8993bf00a2cf280db548";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/cak/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cak/firefox-69.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "5b4332b617917f5aaeb315f51262cd444e09bf8c0ba6c147c11ffd23a3eadf4a27bc67067baf17424138b3d26760780a0e8a482701dc9ee8b12a1de229fb8026";
+ sha512 = "def5f01b180c354ecf2248d36f12778a2dbb5df8e376bc1eff4eefe3cb3b383cdb1b03b7a83784325ecbef330e5449687b36cbd239090973f1bb3098717bc2ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/cs/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cs/firefox-69.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "a9037bd4feceaa7db14d342ba6bcb07526f847650bafbf40615b1f209a8992739ce82729c3b02230a295638292d219c327fc752fa206945261c3897a888ec4f5";
+ sha512 = "5490aff5d9c693e22104607dd8ef342fb3ed79905995854930c7eee876cb2da3f940bf339570b68f008557ea16312af614ef65895a6831c22849e9818ea91b52";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/cy/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cy/firefox-69.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "0eef12e6d28dd7b0adeea318eb17fed6325c4417d3b05e72fc106118d43d6d152e2b858888164344dfbced5708adb88615490c8e7f784707b6f9e30f52d877c7";
+ sha512 = "9b5e9518f89a9777150fecb25951ca02c232b526784161a8b55aa09b4cab9ed23743dbf62c5f365802beffab4c62d5991da83b138889d7894e5f1b1dc2edcb17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/da/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/da/firefox-69.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "d3f1ee58db717a3b04d1cdda1790243d776bc8c0670501ad74b1871c61fa788f143ac3c43a9b5c6635f4e5d7f2daf15e293994ba0fd6d5d4dc70b3a39c9f872f";
+ sha512 = "9482ccaa5e3ab92522f60a28571c020c3acce55acbd7c38d7d4f7559396cb71ea96a47210213d1ff15a0d97fbb1a3b6e07453d09ace9cdbee13381fb68829bed";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/de/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/de/firefox-69.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "86c38b2a5c8507de6949c153ffc98a2451cc3fb4d35aa534c36ff1b723a0153ccc5c5a92ccdd470826edbd844b02476c58800c2a7c6472a4cfec860e13a7e270";
+ sha512 = "055948aa2b9ef551d0348b4a24437648cf7613446cabf1290ce429c0ed70c7f2b81ca82f0dbbe9359a0bdb6cce673f9472a3fe74e1ef8359ff3fb8903763a7a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/dsb/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/dsb/firefox-69.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "2c8bcafe89dbbf2361af22789a3743ecd2c12fea2b457d75bb24b3ba2b7fbd9638c418158ee70961a25b4a273ab07894ca166dbc783199ab406699c42828fbbf";
+ sha512 = "a19cc34132f07635eebfc0d521c0177cd24f8c800f9be2750e2e653e8732fb93b39343eceefffacfbebed5656ad4ba0fb05557bd55e993f27c3327b171020f81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/el/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/el/firefox-69.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "4dd8368090c6af5995d63f84bc2a3fb612fa57acb0c38bea48a7371b4c8fbec22017b665b3801f5419ebfceabca5a7b5eb2fc6d21cbf287d6c2427c89457e7ee";
+ sha512 = "f70a195f748c546fd76f5f2e73a379eda8a079475b3e03e67af41c8b0da1ddeb70c335ffa3f6019b406e49944c329eee1ac600d8fcd2daf393d0348d8bbb8048";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/en-CA/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-CA/firefox-69.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha512 = "22badc05493fc477984190c5e839b44e8991f4b43592e84eab093fae3b4720de41965d389ab3dd6425a7ea8a44038222c474be57cddfbd5b30e34b49e3aabdd8";
+ sha512 = "eac808b225a6ef8162ddf82d8f975d8c0c77a4f8aec110fec017dad38ee4070d4a754f74566cbfe4d8dbbd65a022e1f168c2ffbac3f8ce84f10fb3eafcd114e8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/en-GB/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-GB/firefox-69.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "7fd1739f7da9aebb19c698b45cae649fd63ae0d573956ce1289c1dc51bd5964d1419f90f4d7c29abf344cf523b8f1ac4063678e70568468db35752ccfd5dfe13";
+ sha512 = "ba5d57b5596aef987b07354db04bd930fee66a58672c246c9769b2205f96f8d80360d1d212e560a7897ecca95f0b10385eb9d947c4b71126cae5d4893a2a7a47";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/en-US/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-US/firefox-69.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "8742f7831dbb888554532583c0dae319c1e30424901bbfeab62011088755067df63f360e5aed8fe3675706c4a64dbfaafbf832e66f559dd3c1f58afe8468bff0";
+ sha512 = "f4f57ec920bed699a986512dac01adff30fa446ffc35b50039f9b321d4c5a1ede9ccd311f81aa3b7a0ed844a5ba4de1e676ce50bfe138f69f786e6d86afa790f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/eo/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/eo/firefox-69.0.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "93a7d92b10d3927edf5870cc46091933b88372c8ebb55d6a60831671f3501b62557037e38d25e18ee61f4e65c14c057d24a3453083adb9383eb3f21b16550f3f";
+ sha512 = "0697adf7b3b68b1b11018c690868a28389c2579f96886d5e2d70c7a66abd14778291e2f7efacb3467022dfcb0368bd2d04814aadc7356a536791e0613026db2e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-AR/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-AR/firefox-69.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "4b775586020624d238d7ab0c09a420a9328fc46f6238f397b569fd60bf56cf424c70e016c2f5814c0e9fe42fecb703f68a366ec7de1c68b11e4b43565b3a3929";
+ sha512 = "0adc717397ddac8b49e5d86bbd702d122ce0f09add74b2246a98d2b686cdebfecef1011dfca5b54752671c7019b153ef9994e983cdcb78023b35e166177bd6c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-CL/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-CL/firefox-69.0.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "172daa90a8062c4d7884aa0d2df32d8a9219ef04bedcbb270f785dbf6a9d3d5369f69f9dee589d95593ef464e4dee84384c39462a81eb87ec7c0679cf415bbd7";
+ sha512 = "fa5fbee9d58121faeb0d3a2d17375410e7eea9e7a92b0f803c7b922c936b78cb8db55f9dc6745d9fbe12474a5baba5e7c11e2a83426b19c29bad0262cd046fd3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-ES/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-ES/firefox-69.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "96ef9f02a019947e9502abc583389b0f06fff8e8bb00149108c0dc15799bb556326c4d79905348d02860efd3a090af93998206c17dda6e88819f531837c97f27";
+ sha512 = "40d61b149da156b3008b131a9a4cb46a00c05a700e72a84575ce33f0b6dcf0bf317f64f54c1b0a0e6b03e817afdead048c530ff068da3cf8cb4ef53d60e57ea9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-MX/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-MX/firefox-69.0.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "8f120aef18b76259f84e43c1a2c82fca04c56bed10891381e875758c53334cc2987e7ad78a3f9d9aa34edc79352dcd1bf4a7d2b1bc03099dce59b5423de9687e";
+ sha512 = "518bec00e953c8adb7f5c7a0ea460b9d92b0b001f960e31ca5ef1771e74309782056760593f7f976795acfe020498b67d94f80f87fab37469b0c219e86c0158e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/et/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/et/firefox-69.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "227f0bf21042f11ebf33988803274fe6dddc73f9fb357335e24c1c82cb396bd74fcb913fd9c9c848f34de57f518c924a0c1b8952ad9bb3be18f20ad4328cf629";
+ sha512 = "7a5fd6b36dee306446d94d33150004115da55002ee11ba1daebc6cef7d1485e023dc08d9cfdc419d76b7c1335bd7e0f24f3cf197a31003c71569111f5edcc316";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/eu/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/eu/firefox-69.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "733f75308c4991f73e6c2dd673d380af1d1c6ad25643aa4994424763df1d25df3df3a9a77dcca5e00176d1dae248373aeac914528d5aaff79f73eddb740dacae";
+ sha512 = "5ac8e602ee20afaba5b7501ecb3af0cc4358d61a729299eb6189a932af19d86f409b66853576ae4c259bb14df43003b395dae7f713572babce62bc549b7ef0e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fa/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fa/firefox-69.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "5b863546dddb8c5fa4c59d53cf2f5b622dc4296378290c85926d49685e06231f0cbcc6030257f356af71ccbc6ff32359f387ef70eed9ae3c72a9acd34eb58350";
+ sha512 = "7e0e98538caae2345b88e9e9921b1eb3e8d4e226950aebe6a9b6d927aab47d40e59ef93fa33b0b175460db44e906e64e3f4974706ec0b3d85a3e6ed1adc99a52";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ff/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ff/firefox-69.0.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "5995cca653238629bc6a1930d40550f957b1e3176ccdfad5e65b16584214858fabbe92ad2a4b1aaa3a3fe920b66aab4e0f74646d42174af82d59c0bcdccf8867";
+ sha512 = "02cfea4fe949c4105d5cf2836de867c21c9ca8fb73cf0b3702493d409cb36a70f9f195c53d755840d7696500ea7e1a03f4bdeeafaa67833ff60aa96d854b14c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fi/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fi/firefox-69.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "32188abe02e4fe36312835a19ab3f76c8e67cfaf0857f98aed4435840acc432a411b8b06727175a8d3d3a1ece6a5baa9ce5249de7019d02d43ef6dd2aaa69e9d";
+ sha512 = "470e499c26f9120d68904775e9ec2396020b91dfae504bdd6219d2932e5588240f9f25458425895c2d74fd6aa4c9c525f117f0a0f69adf98703af2570cec40b5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fr/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fr/firefox-69.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "2035d9a5a078e8fac32604aad679a9f01db60cf872ed3b546fdaeeb7031a8d38db19bd8556fca7377eb10768a53dbc1f70c7e812561cbf0cf926d352a6ccbf8d";
+ sha512 = "44f4df351b0a34bd3126753a785f9a36856686d9df9648c9a3a1f678dcbca9585c19b576d6deb31967aa9448ef45aaf602558e87040ef19d1cb812d42c5894d1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fy-NL/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fy-NL/firefox-69.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "5539c97e6b8a4f51113434df7a75937dcdeaf3ac8acef1ef8b4bf7b500d387051969d13356dd6663c8c0e7a429748160721fb4f864db29fe77087c4f15a652f3";
+ sha512 = "1f336759e304747cfb6932dd433c31123b153a04b4600952d0dc622b442901e1642acba220508373b915caff68e87e026ef54e24eb5c001a1e6e3f4d1b9736d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ga-IE/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ga-IE/firefox-69.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "4c60bc16af21fc552f62cf6e9057871e220f9ad718844e28f8ea60a5122dbd941dbe1b9e4e0a2bc6b7c62798b178134cba15095e31dee6e25341de5e832a791a";
+ sha512 = "dc0109a75094fe53caa78bb5c02257118aa9c992b4633cecf8a6e60a5daf4fdf488aa5e5309233aa1882bf69e3c8a01a527c2e2878ab9655c4810b3e54244ba9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gd/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gd/firefox-69.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "1851d0bc3a21828c4d89a8c2338205a7e7a9aad14f60a33061dd229d96d8681008ead1651f7d5a501868b29fb3b50bce0587c142e9bfc4423e398fbf5dc7fb6f";
+ sha512 = "69362cd2b58066646dc62ad0022d82ce6b010ade0abbf779d7d3ed7b9bf6ee808c848a9404c3beb966751d3aed0d3a5da2be3f2b262580e8b6211a3f8444727d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gl/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gl/firefox-69.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "a728a158992d2fbcd292c13df36c2b4599d0972dfcdd84d3885d0146e8435808cb92afec7823388906d46d80431b14aebd7e831eb1d80a6995b4c81a933896c0";
+ sha512 = "787a3a454d59daabd81cc734f15232622f3e2cd0253c98c10fcfc5eb47b8d329f89740474f7f754ab6f17bcb50e1fee38012df9183e061629490582c677da68f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gn/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gn/firefox-69.0.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "5ccfa691379cfba11e4f11854ebc3eeea7eb6ccd58b4f73b48a631279a99d0848972cbf924335db7b65ecba47605220df53b847eb361d721e1fddde30b1dac49";
+ sha512 = "cf05696e4b0e3ba6c9316166f56e99505d4419062d77cc0438d0fbb66729d354c59026018828ec7d46db4f99e6367dea9911d4bdf7e80ba68fe32f8e0d5c09c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gu-IN/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gu-IN/firefox-69.0.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "a5d5fc55935a4e9f66d6a549ac4f64649bb3efb335129f04c0e72e2849fb69153e312987233dd81bd58e23aa610b46af35fcd091a566e604c799d83dbdabd703";
+ sha512 = "0b38a698358012e0cc3ff1091b82d1eb82673f124b34ee4156cc36bb49d5d69efc32874de2a2050339e73d6f386f6d4a468e6d906be0b22567b867dde7e0ff9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/he/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/he/firefox-69.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "483850929a93239d40871aae236f698afa4a195d1c42b4f07db1b72c2bf9e7e5ac9a24745c56cdfd2d52e725585be7feed1a3ee9aa4b1516fed85ca33d3874f2";
+ sha512 = "8250cf4c8b18edb35e8c601cb6df8bc7825a96064064b6d46a6dfb77e297c64dcc7a2f7937750d4734ab56f843a65b6174b4c9d523f9b5877e0e26ce9fecae01";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hi-IN/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hi-IN/firefox-69.0.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "6d4c3269fd2216c7e9f258fdf0c3ccf01a4fcf1af6113bc91e68f65f0e0a060bb13bcc5f5db24a47870906ae5ae7a3cfc0a5c2e2068308eca6dd1926a7a4936e";
+ sha512 = "a0262214be3ebae877300b54720b4b74defe46bb641b989a1d65df02c62d78d51274386b0997a45189fa86d5974e56670a852d24d76a655baebd3c5aad8149db";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hr/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hr/firefox-69.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "cb4dbda71d92af15873e849b7c6291132cc1bca6f108f89d07132b1b34d00cc9d3f887c9af593eff4163accb4e645626fa4ca0725d3b81a19f5a52ab944fcca9";
+ sha512 = "a5254f81f1ae432b50ac9b0a1732134b32bd460502baf51eef7242c37b37f2a6f0cfb6ce9c10bc3ce6ce509287fde824bede15534b010ab2f55721e43d85a8f0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hsb/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hsb/firefox-69.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "156b1c20d452edef51a816dc18c57d0baa84add78ea7e507e037d2a78f433351001d85e4da9ec9e70bb93ee439458d23be93438db98f786fe0efa4f6b031dd78";
+ sha512 = "7081a889a6689e2d6fb4550474840085724cb4a583a9618a03a88ebca706ebdd32ccadd64ec8491332e342293634903ee52122ec9a5e49efb0f3cc8c09ac891c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hu/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hu/firefox-69.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "0a5bf1362575ca38a69e790ad34029ae587c8e59b122c86adb3e10762e0633246bd73617a9a7475eca86b30b433c6e958c53206a6c2c9dae37c635ffd8364f00";
+ sha512 = "0a6bd225ee22562da294a0a6753949f6e627d1076579c514b4c93719cd0acfab90ce28c241d05cfa58a9b723610169f7e3a8b65dcf3bce7615e56cede10f0064";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hy-AM/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hy-AM/firefox-69.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "86b8411a12d6d20f85eca026fff9dac6de8c2680708906f551d28bff4adb93a48d6a82db864a609904e9aa73fd3449a38cf1ac74a8c074393f89d9f64aa1e771";
+ sha512 = "dc21bc95a2ef7e66b04fe9900458754db5fe51047b3e166a48bfc1c6c7d8048846049356778515556be0184b5f40a08b29bffb27eca2d85cf90e47c42a9ff086";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ia/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ia/firefox-69.0.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "a323485c9780d46087a9e698d958ac9e8348b00b14b4761dcb86d5f2fb1f9b23ab812a9ef9bfd0a7e7612ee40b505e50569afc3c16b2813065495f0b3e12dae7";
+ sha512 = "b2ab4096778dab01ec722c90daabdd8b0a892de1cd01ffc2bf5b6c403a74bbb6ab1180b1331635861c29b05db9662ec1d973d8506170c7227d574848a6281678";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/id/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/id/firefox-69.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "76767d2e032973adffa08e0b0e49e233373ce95c94aaf61d0911cf0be45cdd0daa092f5b722cf396956f0f3f2abbf7ff063c76524f8b1e3761afeff6ee02ba80";
+ sha512 = "a416e7ff14facaf80a8edec2b1100f65bd4ca13b6ba10ebd8ca181c65683deba962c276b4b32372f9d8aca33213ffdc882ede3c8bf6dac883c819b85ae84789a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/is/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/is/firefox-69.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "ce9a41ffb2482e0c3049cd3d9984b5094310ed2ee15c60e0bd102f98d9511b3e139ebdd4607c37fcce1c23407fb5c1f969d6ae53816838c32d2ed2b399b710a3";
+ sha512 = "f5b0e2b1bf63db7a3e4bb14b0332d5b365be87f7c256c7c4a34dc4d4107a139bbe0415c757d7274209e82a1219863db3862426621cd2453d24864776c0ffbd83";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/it/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/it/firefox-69.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "babc698b40f4d84a6c8f4cb159b676893724a5b1cea2f1b004d74699f8dfc1a7cd3137bbf9ebcc90f89c59c4e9980be95eae25ed152977fa652d5e8a35418742";
+ sha512 = "655def933c7a17d5417fd319158a3a8f21a0263bb7aa539641b1f3d3eb0087148198975a9961a789b3e944c812c857a35afd5e973018a82e409ae438c160aead";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ja/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ja/firefox-69.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "1073dea454de8796d7094d99805f05db293a41d871111fb4495745dc6bc9d2199587abd53c7d3bbd09768104d51408dde8e1fc56e85197f5f035e9cbd314e222";
+ sha512 = "19b9a42561727da209614222f618512a8ff714f0edb21baae1efab69fc384d3ba0766475fa76e0f1fb4cf298cfec01c0e3bf3879e1b730cd0254d6174f764df4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ka/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ka/firefox-69.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "77ea45eb051b34f136f8b295ad05cb14d43e526120c30ad028eb94c28531272563a1db80b164a19de28b3304d364558297be9a1305a1407e1aa644a003722202";
+ sha512 = "4949b620ef6ca2e23472d721bded35091028048633f8393ef9a68b780928e11e779527b8b62f02e27288456fd939a5d273dd3dc6096ead80107b3c4266deee2a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/kab/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kab/firefox-69.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "8e44bb0dd05028c8a3e689ce273360f24bfbba157a9e5d7562b08d8e4f448b7324a5bcc3c0fc878f8783754ba104206ce82efa84d767fd9cabb0f4c25d75513d";
+ sha512 = "a1e9f7afe4c09a1056ad0f9f81dd30af5c6a62582a19c5ab437e42281b312f8cbf9f3ddc5e4e9e6553d4c68ac268f5cfd6080d8aeeef51032387b8bf1915382d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/kk/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kk/firefox-69.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "aa3ce16fb30d08ff1e2d0b27518aa281d559735edf07dbd1471e148bb1fc2d85d9f812870d891e67f96cead4e49be25f66e07e4f52fd1bf08a877da602fa1b27";
+ sha512 = "47b2963dbc9333b30627ef1583a87adb23962dbbd71e01be2b58f6ff7a6d226076f9193310038884000c6ff7a4f96bd1eaa33767bf96bea3ecbd0715ccdcfd37";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/km/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/km/firefox-69.0.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "6e1ad54977f61330d80f310317f1d97d9563e92637c91bdf7a0292e2abceb8f3f1cf3831627ebfa5967061b79ad565d37d2891aa83685ca599d782a4554e586a";
+ sha512 = "758c7dd7eb7a91e09bc7f921e0506a4e719ae818b5794abe7a090e9af230c6d5240ab7077a9ca4636599566faab83dac92c64e1f97bcd3515e27a2ccf4e9f6ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/kn/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kn/firefox-69.0.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "798a1d1b5d3a4f7057d5ad05e5d93f08255ebb302170dc80a8b86238823c8a19a15cfa1368b81187ce389ee3992634ab9be58713e1097bdafdde96bc48dc4036";
+ sha512 = "fe0c88f827e0b4581e3f72367c19ddf2396cb654eaf2d5457babcc1be8761ca6fd7a7cedc79c580abd7e9a336439ce24d84ad37a6f1d0907bbd548232a9c3d81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ko/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ko/firefox-69.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "8ce6490378cc3499155d26db216da44eb51f7b5d0220168882fdd16be63073927eb14fdc4c586c603b049a1be06837290417626f17c17b4620484ebf3e0a0d1a";
+ sha512 = "52d0cf33a3a6d083f63c03c5076be9e68829560ece3c5729c5694c989a1179df8ba6f9c5ad4c3d720394cae351ff078af13e07d194b175a364e3f529dd7983f3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/lij/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lij/firefox-69.0.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "ead703e84f5b7d2dcebe84c86c49f9aa751fcdfcd30d2c9646288a7ec50d8807160e84333743cb4f97ee6f6e45909ee4678cfccc6ff9729461826d228dd1de0c";
+ sha512 = "7acba227856b3bb015745f5239bbdd06a88e30ae7f17129e8b104ff800fe7b60f24646962348177e7efef71144a7cdf2415b6daebd2eb75574cd6ca6b708c892";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/lt/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lt/firefox-69.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "0fac4c345e3d543d0cf1b986c5a81d9fbbeb4617f88c679a2230a6f0605e24eda60a4133f38f496d2df0d027fe029cd9f53f17efb60512263d6fbdd55369d239";
+ sha512 = "0829cd18857660588330c306ec7db6e64d52346ead593ffc7e4022c25d8ea5451329e7bb70667645b0bc4894f20d8d6251111449dd3f48362165e9f583f89e92";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/lv/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lv/firefox-69.0.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "fd172b285d01771aca741f584e101d66190c29df5dda5e6ef120d41a9488a2e5679339c93478d1e86b869d67d54c226f4e1b7756e5040ab71ba415e5319965bc";
+ sha512 = "3c19e724d31b20bbec4a9a4267c5cb9ce1e4aa5ff522beefdf35b468d220964eb547ed1b3a4354624cc653764f62d41a294eac10d90bdafacd290e192786a73a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/mk/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/mk/firefox-69.0.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "370dc43f9bc1b33f3e1babadd16d8fb63850b8e68be13a22843bb09db530dfbdb22218507b04c406f3b386ef683572ba262a3a16b62c4273ff3fa2c014b4ef54";
+ sha512 = "1223ff81d9162d87db9d71948d34b677eae86d3ea06953a939cd18836c8b820c0fcbc468d124a3b0ab37346716db06fec7a4510806b7f2f98caaa0a30642746b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/mr/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/mr/firefox-69.0.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "533b32b98deedfa31a62c80663b4aa0805c3b2eeb0da8267918f377183b40058a229f6dd357f9226f0149526c0c37e90c4f13b1041496054d662ab805f8d1d88";
+ sha512 = "202bf4f9b7250a73f70f0503e53f1f55b9466d4daa13092d9674b21edfc61a0dc6af3daee4cc229372eb2e3e3d97e13f686d9f6d8d702f4dfdad19ff52792eb8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ms/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ms/firefox-69.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "9092ed4ac8ec60b55c4b5324ebbd9f7b5940ca66dcaa66eaf9bfd808e3755db931568e4f788b3e2bcdd574de0655af16260a86065394536f916254b366188a42";
+ sha512 = "7c1e2b00ead7cb7b2a3ef516c0137f1cb2fcdc4fddd44c5b5887e949797b42218ae66fd58a4b207ec9519704ad8b26a71edd2fe3a36ae152e589fad48a4e2754";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/my/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/my/firefox-69.0.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "64759c70abd171c374cc73485a4ce8e4cec21222a4fbd707d03fdac79b983af9d928b516c926a1558cbee1af374171272c04597d0523839befc8bd7659f24c42";
+ sha512 = "bd92ec45173af70a10715f16e8043e7d41900607bbf2acbef566002f8ae8855cb604963d2cf2a1e5a9c610120c24b6d192c0e32c7ba29c635c2d92d1fe4b73bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/nb-NO/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nb-NO/firefox-69.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "940c9dcd597dd135fc351c09a6c1c1aaf20ef1305c4c9dafd90915a8ef040bdd02321dae130469985faaf871f24e7ab0b164e2cc1a0e661da886b16687cc4951";
+ sha512 = "c032c4d91c67d11ced6b47caad8ed04554e08fa78e7bb49c2ee1176ca192131b9372e35c121d5747f59672d1c9f8f1fd7f2d29ab24ce3b6e681eafae7a821e02";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ne-NP/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ne-NP/firefox-69.0.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "094b0a3b2a38cf9a21698ece463517efdecd9784711220701815b472ca27b6fcd3358e982aba6fd579cd5b256d52cfdfb6cddbae17d08d1ca2818bcd8eba7f07";
+ sha512 = "5c6a5e7cd3555bef6de3f02e566349a5e4797efed99c0b161e0de38f8391657c963446ab7e9b57a3728a81350bd98a7de66029bc0fcbe611b39f93e804cb1302";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/nl/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nl/firefox-69.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "eff62b73a52a649a4072da79dc0cb5bae23f81360c2727bdad2925514c6f9de861b00f2c7310246da8037f1305da1ad6326023e06fb032ae636169ecfc9a33e1";
+ sha512 = "a1ae9b567eb05c28443886b49351532c92d5e29d65386e3c3d0d842574be355f49544de1302a485d71b9962483eeba4d7f8c855089b5fb8fc3dd1b86e47f70c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/nn-NO/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nn-NO/firefox-69.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "b1351dac5e08a6bbf2ba50baedfe5a6ca6b98de40cf89ebbe0672c98b8c900021b9bae2e8391b3cf55b433bd9c655d2a3be2422a7a0ad2067d4a465a9695fbdf";
+ sha512 = "3926a8efcbe5cf785cf687e10b5d7a846cafcc5e9a09fb77f517ec071c5b2afec954fa6f870c3688d07ecc17d64fd71080201b4646d8547cb3446201ffc30944";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/oc/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/oc/firefox-69.0.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "8dcb8884541f272cdc97ebb9fbc0ac7cc98c3f3d252ad53cd94aee3c5d9768fd123d87a4b8c111ed92239e90f6d54daf67c5efa3823f8b1b6682eb8ad2c3876a";
+ sha512 = "05ce37349d320e94547531cabd995d21107c64b87d52b0e08c465abc709526e4504019657ee2c49079fd8bef012f1ea7c55f595828602ca1d74f8a18940eee2a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pa-IN/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pa-IN/firefox-69.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "6f8ac6668fc556f051cd735325cfa3b3c16c43298828171b89c17ce22a66a788ec219b7bdad9f9b1d3d0a425778b373962033468f196e999a2ddf8b6ca86233c";
+ sha512 = "48f6a34384b79b6a0104b33073c32589a9a66da64c83c0f205f7cdbf940ff75a162c9612ab7f457377f018c4508ff398c2410239efe0a22862d36aecc7b409af";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pl/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pl/firefox-69.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "8518a8eff1920aec34cd0ffdb66b4242d55b805e3b489fb0d5c29986b3d7efc62ee6a014ab3fbbe9b40a54aec9c6c76e052d0982f72a4ea4bed82814ae6ba2f1";
+ sha512 = "912149f85fd055d5e9ee3ec9f40ce9308bef4580a265f6ff8a782b5db1dbc8e82bc6ab6cb40df14968b3d00e11aeb539c6768d755acc3e5a96bf2bb952b86f1a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pt-BR/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pt-BR/firefox-69.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "693d6b6227deb670bd3608cd873eccc3848c76a930c3e8922cf80c18350bdb5429b52e7d7551350a8b565d859adf067ebbd553531e00c6da95c480cf932de03e";
+ sha512 = "e167770aa356ab88af89d1ff8de492ff0e31c9e45b64bcdbc3ed76749bf2027b70085c34b95490047f3a71f72fb29da5d771dddb7b445b70a2986d22088c7964";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pt-PT/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pt-PT/firefox-69.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "c77e539aa7d2175d793c8ae4dca548332d98efb6cad62ba2ca9f3b94982b7a4d180179ad65b89a460e04462210ee201bc2226105ecff27b5a4b78cf1fb0a5b97";
+ sha512 = "a06e26bc1285a39ccc4399e98ba523c39b9f7573444f5793bc5278908454c717dc3198be5f3985280af4869bd68987f5cc0d4c4a4000eb65d6eff4c7d3e61a15";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/rm/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/rm/firefox-69.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "22ec2647ede04fe74dd7e6c99801c15d4ea131f010a75c0a9e5c8b568179f9230208616147e78179b81a7441f720d9f41dc4d784b9dc6c40e00e886612bd68ac";
+ sha512 = "41e9519e6e10cbdf20eec17ccdcf7120417c477a3358a0fd0f6b770dce64b5528a51271b9257cf981ac21dd0e118e8193c0885c5039955b84d331d29e881455c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ro/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ro/firefox-69.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "b9e3811280859103e202f0dbaa1c278c8a9cdb451a3cb63a35967bb43625d5f6f6ad2e15871dd727546532edff3f6373013e8bb0eccd83e7f80a31dcbf8e3643";
+ sha512 = "63845db9011089101b6350e5b13c3e614a198ba24343d386e46b4219f0e006c346b6ef103791dbd5013a89138c1facfbd81b3e144e04cb8690c996969af6afe7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ru/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ru/firefox-69.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "a7383beae7ab2514b0e2f5d86d0317ed0c33b5695eed1526457f14b545a63d036dfcab907fb7090055e6ca29144f5f11c7fc2c00bb389d83074a20eda6173df2";
+ sha512 = "ba844bebc9469c2372815821d751fe3146d8f7d0c4c18002ae617f1d42a03369a13eb3a2cbe2087135164a30784bd476a4512867145a57613a8611f1af47227b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/si/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/si/firefox-69.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "5d9bee0a705d1250dd07636a0e8bb3dc3e0150607d58f7eee28c5050270e8786fee2f843e4b801e7de6de56f284025bb13f5dbaa131676796f69973ca45a209e";
+ sha512 = "67df7f6a6d32c37db778237b2cde1418d8b4d19360f752960129c94dc3ed4736a8b1eeef73966b54a531e3e3c6ddceb5cab33d758124ba375a2a46a7768b99e8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sk/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sk/firefox-69.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "de0eb221142cce4cf6272be9323b2a851385d539a739b0b2ccbd7b98926673cea695fd7debf11aded37a57b551309a7c93cba244b64128e074c93e23b68942c0";
+ sha512 = "5d748ec7f889e8465cfdf6304db6403a346ed6b9c433fa482365b82bdf39cd600a9926b5e3355e4e8cb911bfb03bb9ed14df83ac0b4cfc2019b71b2006e1ef51";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sl/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sl/firefox-69.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "09d4936cd5e3f0592751699bda3b4164004e7e2651cd0b28f5eb191677352a61901725357bcdf5f2744b6090d47b6754b910a7c34e611f813b12fc7566bbaa92";
+ sha512 = "f870acdda0da2fb373718d2218d0db79de90c6153d7dcab4163102b220c265d502691f525f9db77ab2403e528e578b9e45d839c2296f16665179c838703aef23";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/son/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/son/firefox-69.0.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "564306bc98a0a0a9e54d2f315cbb1414107f49deb4bf25cb729e10ede60620df0a1abdadcc675e531e364d1338c746cd9cb6d4afdf6e46a420b12920db1e304d";
+ sha512 = "f8c702a54be2f9b15ffc183de2853b8da7d7809d2c02e3a7a2a2d001878236102c35383879c0f66ceeaefcd6a676adf23d766a80682af4122c82561fe7eaf36d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sq/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sq/firefox-69.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "28c300db3616e510733133f0868cd42e7b05a15fb066575dd7386ac4e53b4526e86ae7d24907e3f7e98b3a9c189ccf2004c958d122b47e476eb3e411f17c29ac";
+ sha512 = "4da3b8e0c0a012e5f78ef1c10f9f462b9e5a716c95e9d8134da274dc1461d60d094af2de314987c6a68c1a50c17f09dc00ce9cd039553b406efc2306968b38a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sr/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sr/firefox-69.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "0ca1a926600075e7e8348ee2ad55c435b3775c8aa6d1f27717ce1c35fd1e108c7600547302f072213e7c54903e6c0faa6ad299a9af991c8234ecff454d336427";
+ sha512 = "1a41de2409ecf00fd94690c0f452395c3318590e9b9f2164f2d82112e51057680d2c758d1e0b9d9a372e3080afdb611d30a2c74b9bb6377da63352cdddcd1099";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sv-SE/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sv-SE/firefox-69.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "ef4fe5ba87db3dfba62490022f1b91ddca96fff6035328b07608e56a3247b4021f6fdc007d65e5adbd52cd0adaea9f0b59dbb5f01d71535655d0bc5e0800202f";
+ sha512 = "f09d3024b2f9032512aa10ce9b5c72b44a673f324190e1e971ad3c09837545b79a784e6a10e5cd9997f701903c4445284f64a9eec7d40b857a8386b2b72eaeb1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ta/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ta/firefox-69.0.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "6fb48f0c09d74228317eed041b4f8d2670dca7ed043c133e8bd6a01a0d7bb310144434960be9b9916bfdfc3139de2cdcd3b8282d1568e67d29cec425420b1e06";
+ sha512 = "60666bb1ec53979b6b614a4c31a04085b1542deec9908bd485db2e0f09ad833a2dbd81f84f483f24d73689cde5fdad2554079b3a54e4b98e148d3f6f144b8de0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/te/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/te/firefox-69.0.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "bea99c4f34bfb5860bb5885d4697f18bd45de423943c5d15952bb99c7e4cccf125f041f1378b693b805ef4d623fed52ba8b13a76b87bb383da95d06a4032f8db";
+ sha512 = "03fb5b9cb18402657b77cee2f7bfff3474a84c32204ce5163e028680cff75ad0faefc398975fb98378fbaaa86ad247cb43970cf86bfb383512fc4e890a928842";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/th/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/th/firefox-69.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "4a03397a288a7414ee5ad9f42a7333d30b7a6448321e4507cdff71a2e3b0933292e6ae937ca96c1f6a5ba906e54013b6d6d8501c4a9be4741fd3505dd24b0424";
+ sha512 = "53d525b0309e5f0d02314c0ceb568f067e858588befa64047a3163fc0623d0afbc05167df34fffbcf97b1f5fb127dcb8fb45c05ef117de42d42e8e7d37a04a6e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/tr/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/tr/firefox-69.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "85378409bb2ae8953c1f90736cfc3e00551d77e3aaa6a7fb76a157291e99be18d55f5d07b1171a7137d982442f55ed70ccb3f6f6dfd73869e9cb37019e976590";
+ sha512 = "ef3c0a7f2ef67b92cf22bd6a69b237db8b9d1d85a018cc7c33f767fe71f483ab479bead36af874f4c6bdf99f7eb58b86b564825de897abbf8809aef41d95ff4a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/uk/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/uk/firefox-69.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "5ba9df05480e7852d894925248c7550a36db59c8a4c37792de325aca02b8e5feac0c20719077d718292eb262794668bcfe810dde7229faad6f2370a97c05e973";
+ sha512 = "bece51aaa6fa0131f55364b3a8079382db4d8415e19f3b5ee7333b4111ecd282012f55343b44df95cfe3006f3226c7ec6b6d4bc71d1f30aefbf203e24c282b5d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ur/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ur/firefox-69.0.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "bef12893d73b1c9583302562781907d0fb121003dd1714ccc4c3b2a27160384795ac8d85cec4858849004b020e0ff5e73f512925b9d5561948ef16bb26e0ceb7";
+ sha512 = "1f5373231283004843f8d87a53ee5eb92c7c79d4c15cdd611baaa5ec56ea6ba6eefc5ed63ad66e0a3b66b4748eb21af201fd98dea645754bcca3731e8643dec6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/uz/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/uz/firefox-69.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "5961e478d0cfee99edb3a7ec20a0368f8b6604b4449dad835decff54c8a9f3add6bed22a131024682779922686dac0ea6d489ff111dfcdd476f7641e293b40fe";
+ sha512 = "31708d41970b7184bca2686b8ee048afa732e24f05ed84bc7dfee1fa18c86ca8f3bfc27002f306bfd71423331567be2c952addd1af50ed85ca7377a87b1c91cd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/vi/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/vi/firefox-69.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "31efeb8ee3ec4614f0e116e615db97f9836026c0c94f5452cd3c5ce338fb9b35f19c0a15fb6bf17ed945a37832a628e7fc16381d5e6393475d8b9053596a5c4e";
+ sha512 = "f1abfcf9142310c6362b429d8d58f370c3fa9af20d7261e0e3328b37d4cc33b88d764d108167ae9b3aea6dde7593bf92591d41e71eaa233cd01d8583e1d8542f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/xh/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/xh/firefox-69.0.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "bf23c18c5a8c13c115e8ceea382eee8e5c7af24552c3feb92a5ffac0d2aa34effb7dffb0b41890d1af23f75b9581ee05451785c5ab2538af9082b13ceba04ed6";
+ sha512 = "cbc4ec3f78d47276b1cc67948645b92fc891a0089bb81151d1b4ff8ec20b5ea7db714c7a386ef094a05040fb399d8de7a98d3c7ae7dc212c64955004474c4466";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/zh-CN/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/zh-CN/firefox-69.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "ff490ea8b3b847343b3b7262154ec8815fe3c38d91c2fa0e92625db793f7d24bfcf3985ba07a5f5724b2463d00934925641bbade9f65f5c55627c15f1eefdb5c";
+ sha512 = "5ca30257e96e8e7770fe8a7d626433932a06e56789cf6d84a09b633348570c59cf904707a2c6737267d111929830df8b1556d84c6dbccd62e4146926a87e68d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/zh-TW/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/zh-TW/firefox-69.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "f3de7f3d53a47532dfded82ce25db7d7d0f89b2026bf3052c42f9b51087ff5905ff487f9dbc7e19b76a5816b9c2d8c1d350d5e9742244adf1c9d0818c6b048e3";
+ sha512 = "bd3ddc2e9da6f1e47648ac4054c6568e48e3c01422623947f745016bd624350885a194b7dad600fcdeb0fc64cebf10b8f694764da0575332618cc948dad33cce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ach/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ach/firefox-69.0.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "515921cf97afec94b5853a7b6a7ed426cb1ba6b875ed1ceb8f6611cf052dddce40e519c4927ea50a02d23c7ed40d6ee882fbddff4293971b1c832e5a38b6573c";
+ sha512 = "9f5876b495e56d195c01a278fa602c7686c52c662145d46dd4e7a9ab143801a26822c5a084683b74819fec15d66b21644ab6adcf160deb1d48fcb381fb395187";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/af/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/af/firefox-69.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "1a9b041ddeab4a06257d9313761f288acfb4ca75e0a50edeaeeb7670f4b3fc7719b480a5d673d90ee9478cb1dc9e14ed07c47e2160527874c134db8a85908408";
+ sha512 = "13516530c77ddd90e9a5380817acedd7d1843908f4cca8cbe523f2390236c7f37b50a5ea6286ed9a944a4de141d911af0ce425d557af338e8f7be20581717077";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/an/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/an/firefox-69.0.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "8d56691644124b6038c2a61cb74332f38c4648163745d37d37ae07bbf868b0ab6dacafb6c2f1f6d0991a6bf7cb8ffac498f36afad067756b1b8fabcc634c2624";
+ sha512 = "f947a2e74a8a1afcdfa64d4d70f123efc490403879037ac31bf082874a90cf4a40e143539bfdc5fed10a406cc1b446dfaa99e7c4c3c805ae37d23ebb420bbcfa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ar/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ar/firefox-69.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "f443355a1778e087e14a214524cea2c66a58166c1832a5bff89a783c4ef1e3fcd614fedc00ca7b78a0595d29370da82de6f53c8b58c0fda15c79227ebe317f0a";
+ sha512 = "d050acc7f518b00c231112364bc9a678c64905175c111380488adea3633945b3acd285195b10f6c7a0b624effb7006f742451df5ae95583e3e20990b9639145a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ast/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ast/firefox-69.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "50c4ab65a5c85822355fc6c1dfb57aea54f68c9e578784101d233c8d1f2ae678f32646bf36be5c21e0e32bf1ce0c7635be4482aff422100e55e6fd813d0c6343";
+ sha512 = "33b64ed51cbf24703433087bf869a3ecbf16591ea4d870b902bc775c0a9d027b91d3d161e11be075072363da178f7ed02103fd57915ba43c2f21904f32709f4f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/az/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/az/firefox-69.0.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "070840441591f942491f64cf793f2e12d4a5038fef2804d0143c726f33874a06ecae36bc4f2bb3cc04aa6e46791a7f5148900f9aeb1954eb0e0717a5f8a7577f";
+ sha512 = "5f281e9f1bcddf149c30266ebd80199c2c6c6645f5ac46c118f6aae13c87e61f34d84077f44bcc93fdf03d9c02fdf1e3e8c34fa124260e0b3da3cba7b02021f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/be/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/be/firefox-69.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "4338a55b80c9e9a21570fb49dbf9595d6c0d51390d370cb8dbf541bd4c14605b1daf118193d2ba3f20d2b2f79e2f40f276e079046d8db65ea524f3bcea88d826";
+ sha512 = "e912b6e121cfc3702585a68e8140c0a9ccfccd2f2a614f3b72bba2ba0794d665c0cc2596bacd2ac64e30b87837551e1b7758554b379301af650df1929003dfa3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/bg/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bg/firefox-69.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "0a473653d6ff4b6c604e269243f781704c8fbf9f99b18e3fce83680793622b58de5aa655e5301dca2765d6526fb5aa88ee2caf7d35557047c4329994610d9502";
+ sha512 = "9f7c3afbda97498d2377ebcfd6417801054018a7752b7c0e4bc03fd349d80779d43202139423f48adc3af14d71fe8203a144d567bf5b051484847321ba223fea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/bn/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bn/firefox-69.0.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha512 = "fbaa81947143836f54f84e4e376ce31a21cf59a46debdb61c8a9db2f92703da3ac06218c560a639b5d6076e81d74dffd291f9d773b6b7ae5d65dcd0e77b5d1de";
+ sha512 = "97f1e4bec660cd573717524b42490d84bbbc93976a973fba5dfe4ccf3a745b76a494f6386ffb3060e8bc0ede9a32e69a87fd28b9fef33bfae0294a4d8e08069a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/br/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/br/firefox-69.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "a5c69e995213a6f3066e685077b911093db15859e6dafdc2a385d012d0815520fa2e64c7b89deb279e307fa702c9bb57961a3147ff450f91ee8b3b31a2efee90";
+ sha512 = "99e8bd11f12189b66e9f79c7b197b7b149d274e813a090e118e1823b159e87a335c890f3f257d39bc7ceab7089cf64d4665d2732919cd1ad29c7365ca2f5ca8e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/bs/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bs/firefox-69.0.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "82d585cdd034016265c43f0e70f09ba8cba1429a551491f6e8ef4c8f333a40179c4817ace39cbb4a2376b03c88c54849eb45904e148dbbb4f47f8fa32048d3fa";
+ sha512 = "5b3947dafa7e7c1d0c7c47a1ee09de3b9cafb47bf39d4ffe536a9f35f56c7ca2a265289f1729b760f09cd3befef2fdedc1e5f7afbdabf03f3c3c0e553da8d925";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ca/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ca/firefox-69.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "9c884ea535c3192fec754dd891ddb2743afa400453d9299f26bac710ad5bd7c7d8cd0ebdce3f1ce88995c13e381701312fd9247b029c73f12ce7940297034e8b";
+ sha512 = "3d83e71c9f3acfe3ac2838eaeba4134ba8cf9ddd6c7be2218e5200ab2507228f3af5ab7930a6a08f368c1c3a31a22b9816803e9ee66f67c1dc0280a0f5f5e98b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/cak/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cak/firefox-69.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "367755d495f3b583a8f09d200f5828c10d8723017d691d6380515d3a4be65e6edcbd1318909c1652dfcc1cacecbe80d6b4e399e2192b335701e17764fe5598eb";
+ sha512 = "97b0761c67aca6f6ea89e88154ffea95651f98aa5341f155d8f7a25c40f109e5f5ecc4aa7242b8291cd5b28d5df676503cbb52da25f58de4e1274996b412213b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/cs/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cs/firefox-69.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "427ff1470de34928ec660d539fb6977145540608b36ac36fa0f7b98af0f814373105d9912681bd70fed069e94f58aa48f441818a3f4cd67dd7a65342133f2d62";
+ sha512 = "6404cb3cbf6b5850c08fa1e222101f340550a30398413ac49c1a498ffe8a73172a65da20d4c71bc66bad840ce5cbab12d93f9a5e47a2969024981b3e3a6c3594";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/cy/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cy/firefox-69.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "8ec2ee32b5dcbe1d9dc80ff8d518c640e9bf8b21b2a8ed2ef215193216b22e17de4d8c102c59eec4c773f0e3dd0eaad6b1502c91367f1bc1b1860e13a2b70151";
+ sha512 = "2e2f45ab86409368d00af0e8684a2de8f779ae5ed21c4b7bfbbd9b1b6dd2c0cb89ef00ca0d678e2c2f8f0a946ee9576ae3a657e63188b357511da4e512ee0b15";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/da/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/da/firefox-69.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "72bb5e0719382aa518b9a427f06946a85e7f8c8c0176a66720d47cd7fed6a85aad370888899553a029db1d841bdecdf55316fc8b4f67fccfd227bb48ac655126";
+ sha512 = "f39a37f55d49e00074bafd58a1afff2b2fd2284eb14f43b78c1f0a63fede72458c61a34058a453bda0d537109914bf94ab3912d04cff91286bdddf76d0df9534";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/de/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/de/firefox-69.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "39add77c78c64d77e052565fe058256fe9ec44886844b664bd9055b940fa0af89a60d4cae5f32523f62eb7909b18dfe2f521dc43b4a24a5d0fb67e0d543de28d";
+ sha512 = "4db0be46edbd3443bbaf6d19f115a0dfd751dc08d55f22c905518f7e30fbdc9d765f905505a1908ab96baf16ac4a2f03b50230c565e278e75533c4379e39a0bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/dsb/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/dsb/firefox-69.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "1a0fdd365df8b034a4e05741d450209f685c22e6ef6b2d030f1981c711f46a9d561963c57a4da49c01dc2b92f6867b6296a013560501939788bf2b62ff622d71";
+ sha512 = "2901e1d382dcc9f67217e15ca2d2575c96be02af1d853e61d4885c3c546171f8da067223a73b53c1176eaa03cf7cdfa80fbe2c74ff20860a8d31642f79ed93de";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/el/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/el/firefox-69.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "3bff3c718c77af76bc10b13b7a816eeb37e6c2756249fdf441894350834e69ffe8868ba119f473d1cf07e8569fed6c604bbb1cbf1a1a51d5dccfe3f5018df2b7";
+ sha512 = "a31c178ac0003f93ef62091bc1468f30814fd8919ac645b84e6ec5977d13ad983389d04ae7e986ddd0c31325e550c5f8593d64d48450fc50a2d37e32b785165a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/en-CA/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-CA/firefox-69.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha512 = "8400867a50bb1f677b41d2b030a66857697a95d155c50e0c57711a96ac13f6d236df86ae889d442df805eb56cee80050370df2210503d61c5a3d3a5f0f3a3c84";
+ sha512 = "4ff8b109121ef8fd4f0a817a3d273e3a28ffb952faa072ed3d8822d48691de54035d45abf7fb84a7dfa6a0543c30281896a3eb840f64a658894b477918ecd902";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/en-GB/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-GB/firefox-69.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "b03559560ab0afa718a15bb0ca1e4d9b97eaedfd4b4ca42e3910425bf6bb6a0bf251208b7fc4848eba0285becb5509569bfb7ea609df3f60972e625addd20396";
+ sha512 = "c514432dcbc3529ae58b1896621765da05c8a0511461bf6a09015d5b8e7eb14f8873029947d4d7f17b975ed73982746de8d92b651db70f7c6f97530028c7bc7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/en-US/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-US/firefox-69.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "d6acd7725858a512805676f6fa215b949e631f4493bdb060921bc51c2f2526bd0e69641b41168ce756556510e354cd98fe1d1bced42a1e0a7100ee797c2eec00";
+ sha512 = "da231783ed7ef640d02fa7bea95191af2081f694594e08160b682bd2725a49db56b54eed868ce11aac6f664d81d588243987ac80adc71bf11f0d03d85e90e14b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/eo/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/eo/firefox-69.0.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "25ba775be4e0329fce2a927174923c69e3dc38b61af4f29ec6e1d0dc74706b8becc6f6d139ca3007f7893f9bfb66cc71d9426cf420695f2494696902d5247d8e";
+ sha512 = "599d9177a80ab92dcb0ed637f5b344d0e7c180985a04bfa213b5254dbaa932af7f920b8dc95a2a9ff2e276cc4ee8d22ac8ee84d9ae012ae085b59cbb6cc15ea8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-AR/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-AR/firefox-69.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "a3616f6c7d9d7005ca8f76560bebf63b3a49f86d58d6c8c145400bb12e1574c1a3986347660c6da2700402c26441754991335bb199eee5a43292644fe935083b";
+ sha512 = "01222211b16a3339bc56ead44cd8f9ef8035230c7f154d078ea444e07520d06add00ee100dc1b37af04ee444745cc9b514c90a8d18ff0af2a84276091c90bf0e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-CL/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-CL/firefox-69.0.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "9dd4f16594d3d53a9c6ab2c24a373dafa1c3d02cf1d2aff5725bdfaf7bdec7c0df254b133f1e1e63f235a69fae687fa261f36b08fa0d09d6bd141d01e4f10c74";
+ sha512 = "16652520468f1a58798cb1ab6580114449cd7116e9f5564f3c886cbce6bfcc21ae93e5f559f45faa6c273ac9e07b584eec7d3c940c50a84f9c02d6ba9d17f192";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-ES/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-ES/firefox-69.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "a560d1c5b2142590d086bb645b76c91c664bb6b849d5a1e90a32feb87691615b7d943612048fc4c248e0c65a7532861a751f9b3a1537eaece9e6604df8388778";
+ sha512 = "cf96ec9a0f40d4178f0724ca62c9da5208bded775ff0a2ebdf9ff6f0ec7fc919f1450a221050706bb0490347ace75b7bc0e6652f6ff2ca9c5565e06c2b6d4706";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-MX/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-MX/firefox-69.0.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "481db1dfc9cdd02963235d5ae74a3fd9bfea1d4d4e2dfff8a15e621e2ed2027ebc4dc14095e1ce0013f1350ee73717393e8db4126e3ac707218eee3f4f7a247e";
+ sha512 = "771da7d61622787543371266527ba41a24022a278788ff585f76208beb9936a6aa9449adf1cced85952aaf2c04f8c6f2a08883071378c66f297d3cb73a53ee9d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/et/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/et/firefox-69.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "7286f28029838e9b0ce5070afb9001fe01dcbac24dc85c5c2f93c5b9e5f6635daec7d42f0788c1ea2c03cfa8c03b190200be21bdf44acc2ea2bf9ba9aed62231";
+ sha512 = "babfb53e1f5a805013eb149bbabc9e9968423c138bed3f8d6146983928210d44c57565a6abaf1f97fd741fd328a3df60d502b1357ccadde79ec1a228147b9334";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/eu/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/eu/firefox-69.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "472a773ebb672bbe0e523dd08cdd45d310f0ba599dbd2ef720ec9a2b199c77596c746cd1378d2853ab82c289b5b3a2001ef407aa3e250b082dd82072e858a5fc";
+ sha512 = "d88809fb0dae2034f36080bd117bec9d2192c3ddea337ca0012391ed6a17d8f09894d0a3799e712fb3c0fe1f6f88074b265366fff92ade0a5f2db8cb96ab0afe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fa/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fa/firefox-69.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "037df8470545afc445f30f269efa4cf981a20593ee3ab180a92dfa7f33affd03a6dcefba47d252275ceae2c9291a743f5cc1060253854d0ff94c5ebfcd81f464";
+ sha512 = "acef056f215e333a29bbf8c13e17036e50e7763cad2a0e46324326f25de38b0c0060cd1c313cc7c3fdd43ed537e913a0885c6fe1e474ab7746c82531d3e27b39";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ff/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ff/firefox-69.0.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "e1293b2b8501bd30344ad54a8fe1ad0fb27292baca43ad791917d06441837004c8591bf54858852a8ca9de52048fd126937c81b2faa822f2140f73bdd8a4838b";
+ sha512 = "dd13224227e1dd82b0b5e153ec4e43e66308fc38e1c8b68402b0a931eccf0e23afd67215832cd01428d975a3dcb72a5e6f876ec3fec2c1641c2058a93e623d83";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fi/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fi/firefox-69.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "f9acc483d78fa9e3a97d0d70dedd152f433106fe718198fdaf020bd4184595e0661d8086b2c680bb345165a57ea573a00e7484aaba99ad416c0fe4c08ce7ded7";
+ sha512 = "3681a99b3ffa8294a81683395ca158a93ec87484d1490ec55c24b34f24437b6e6ab89b3aaf0430c49cf29dbed5a92e605b4a5dc7cf3d2868eb8bb935b61ecad1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fr/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fr/firefox-69.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "bb28397f39be4e61dcb8cf783bdccb2fc0126e006d4fe8a8da7e15985335d5740cb3d41384f0592f0b7b4daa898066bc634397a680555dc720aec08ae0b8c989";
+ sha512 = "3bf864381286094a373ed77df37d116424f2297c9efcdaf8fd73190253b77701afdda32ee692292bb4889eeb87bba8c1d6aed3c961a58f717c3ecbddc8fe098c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fy-NL/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fy-NL/firefox-69.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "edbb404ebdb71a2c6b1b66a2fff776ec467b0fd42a0710d1b796388674e62e70679b9490d70b92797bcdb5e32ace3691da88c50acd7e681d89bb9d166ca771cd";
+ sha512 = "9468187b6afed9e2fe02cc72e1bb88e06c312af13de59ef97b54f135853ba47916f65dee7543578e01d18352367f4d4ff9c035e4c43666c9510c23f7977fa6f5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ga-IE/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ga-IE/firefox-69.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "7f16cd4796525f77fb2faf3ebdc08c61d14c35780107049a4ac2c00c208cdd1c36543933e64ae51c1cc65bf3896ccb2fb546735762762e25dd22c5bed71251ce";
+ sha512 = "5135e19b3043ca9891af4035583f228d9a628f6b8717c124bbc9ffb6cb19866182521719e544555257a6921cdfd1619a67d21af8be327fe3f5582e39b9cd389a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gd/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gd/firefox-69.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "5c875835f2c1a2cbcc97cf623f4a2d57a252d2741707847cdaf4a2fa21cf4a2ad0bbe9c0a075f29306580499a9d9420d77bc8db2da88551e36af006f946e21da";
+ sha512 = "a7d079d791fbde00d83981080694fe813bb2abcd03a014abca9fb9a9df5af9e1daaf4cc6b35b1eaa2359aa9caa317a4352db6ed40a3adbe6021ac76fc48529ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gl/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gl/firefox-69.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "6a0e069836ee596e9e7c6b08a39ce15b073bff8ceb676f957285d26978d8768d7b60fec011d941b05644474add0ea00e37ced01eb43512037839c010ecd5b637";
+ sha512 = "020c63d6ace98c964588040c15d0e8ecc6a74c63cfaf3e0e64b0bd42bcd2a4e7bf762ac93fc510beb1689203d56812e87be743886ca5eb6d1bafbbbc0fe56216";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gn/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gn/firefox-69.0.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "6811327bd3d952ec59ec04cd21567ce347fd53fb401a5017558dee0f89ef0cc5437f9edb8a8e21626a7c379dcdb118fa8a27d5ee7d1bbb14eaf7daad5b08391b";
+ sha512 = "0681b4cc593d63f4244bbdd6009287d89acb3709741281c6604c5de57593e53876e9448da46a718d2fdfe369feffba1d5b115f5372b68433d5b05ce2d06c3647";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gu-IN/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gu-IN/firefox-69.0.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "5d8e5d339d350f151c8834d16fd26979b42d3ca32e5c7f72e280923252cea294eb4857725035eb40c282848b38efaaa79b974e795211d3d59598c6a53a6babc2";
+ sha512 = "1e4afa88d7f153f2e653d754c71cfd960b51ecd016a533f868a96d3a4c076d5f0063d7aa169740c5f3c6e91c6c10f54edf1a4ad1829cda2fa83a462856d1f981";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/he/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/he/firefox-69.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "e9e9bdd9698d7288dc89fa03a5461668dd67ba305a2d822a50b1325e797ad233dc727cbecece58da43e104fccf319ae2d884c39bdf4abdb3b5bfc88f989d1f52";
+ sha512 = "3ea8ff7b1397ca2e2c15cd1fbfa63542d5d31fbea6fe9fe0c11b8bea0d953c2c2e35afe336714bf76baf2f38ed3894d869e9b467fa98fcc38796f1a31c6a0d00";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hi-IN/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hi-IN/firefox-69.0.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "5b650fbefccd3768918a8203687e39fac96f3530236a40f1d73ef24ab2a25a58f901ba5cea0dddc9b9623ec84015eb6392182b1f02a14c46d382eb07a2078ced";
+ sha512 = "eed63dbb1d8a702cd755383f967d859015040db231b464c3691376b3cd6e8ba5b23bec3460bc0c7dd6b0798735a196525530a533caf68e4056d54d54bc4ae50c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hr/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hr/firefox-69.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "6cd3ab0dfe19ee2bc3725af08dbe54f12f214bf4b41047435f6fa8ff986bfcf45772626c7392858987e01e1fefcd5ba1b28872cf7774ca90413993343367705d";
+ sha512 = "e79b0398e4a57751c87f11574b9bf6d7b92cd578b41cb80cfceb2f515e01c58bc17426fd7b3668b4d5b48d17abc60009ce1539b2a57355a90a1394f742c8916d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hsb/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hsb/firefox-69.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "ce300da3c7e1787fc205d904694ac84bf4fe4f271d95cadd9539b18c2b0fe8f35d12ba331ac098f56a56786f36e1cc2b2fbb62ae7fac25cd6368d8a66ea8efdf";
+ sha512 = "704dce04396b78070853cb2ea8a0d6c4bf1da489864f4575a5d98c953b765fd7660e5c75bd3506bb05d94f5eca12d37a50be351fdd189592315e32c3fc361dc1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hu/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hu/firefox-69.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "64d30bf6122ff4598603bca84d4d1ac30c2e84f106e4c68f6a0dc24dceabe67e34e514dcf58acdd8b6d3c4412a5e1a912e184ec13e8ddb5867943b2965a3f1be";
+ sha512 = "613b525e8abc06e54dd985984b690c25e5c9ad8aa072cf5e48b20298b91853a8019696f7d7101d74efe200119a4a9d1196b71fc286bed7916d712dbf6c6b5686";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hy-AM/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hy-AM/firefox-69.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "799faf34055822487b442da86ceecc7dbe36574a76a8e04e4fd76852182bd75d773b69c0ed19fb33c5dc23bc4ac6c0c21a6694256398629a984a1d2ebd63a63d";
+ sha512 = "5d4088682997b0490ac49606dc8ad56158b3b7585ed4b89507a2596d119eae098d82fdf224eb047b6090572fd5b00cb95dfc5027afd6cea11b0f05e6d93ad439";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ia/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ia/firefox-69.0.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "ebf9d05baf6b4963b0b5ff25b2747b3a90e4b664bca1c865638190dae85891499e3b1c5b3b656f83896117b430556efee039bd58a5728573e3be47e1da4b77bc";
+ sha512 = "7ddcddfe7e3baf0bae0bac901b503fca8c344bd02d6b52d90face8b8575318c8805db618e8591372c4c4c60e1092a842f2bb17a920d96e0f15a1491ac847305b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/id/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/id/firefox-69.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "0268c27fac89400ac179778f9e17b8b1e5d1f1e6bb9817576e03f4985f0aa7a57444eecdde69c1f7800e5128cdcb5829f62a4ebdce6124e3f4832a9fd44022cd";
+ sha512 = "90cf509c70963750a4bbe5029e5e0512e98c8c7286d80120e39e299920d9331cb72dc7f39f2906e9a5b331b54d2f282b46c4b7f69dde51ce2b06c39e2601d335";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/is/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/is/firefox-69.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "818f4173ff8e9bc01576c0d416b39519bcaf33d83760e91d1b4f8ba8e28389b81816c15f5d19f3fcaf6a8140b2bd8fb92e29a844e2da05f9d6344542c7b5f615";
+ sha512 = "ad4c03603a8a81dbdd968ce4831ea40effe90b4cb044315a3c0566b647854fd4e95cdf6c085da8a4f4d901ef671392237aee70e4604552381959b65ea6d32089";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/it/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/it/firefox-69.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "6710ac5a6c98dd9010712acc29239f9f102bda2458d16fa3394ff0ef6128486b759c3e68d568614f793eb0959fae908f3fc519dd52fb27a7495956d1e66c6f53";
+ sha512 = "04dcf6f3b9b3f22a44b74a2e9e20d6fa74a75707c3b3145d048fd9bc10eb4859127cff525367d0e7fdb8ba6d997a7ac1506e3611ddcb80256aa0cfb7d472d407";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ja/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ja/firefox-69.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "481206f6a36704b06d207f6b4eda96c307f61a2700a3da6fcf659c6b12c7880ca5ed69f1c3ae9da42d774e84e2e9c621095cfe3fd4c8e175304945272d51bbdf";
+ sha512 = "d9d017a9279bafc6d7b440ea7b11ff945bd647601e85b395e0ac086684f58dfb15bfa18688748e934bd76ddb3729804e10a55ec3428f2e03413f9bce8921936f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ka/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ka/firefox-69.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "ea1bbb5f759060a45a62b605d82db9b560a05ce9f0f92b907bc92da1a30229e312bdaca3e78560ed698100099f1bf261b71abccb353930a77b9908d0b0862ee7";
+ sha512 = "513d865cbda546448b77e7adbc236d24dc1d379fd5c74ada7a8fe6667c61237428f0751e1a9c0e067c9ec5684ddb8b0fe8041b8eaa04e98c4690ca1486c20281";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/kab/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kab/firefox-69.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "4855f086d6d4028d18a6dfcb3da366c667e16a84e3b81d6e58408a2dcbeba77fc01668b90290e4ed49334d2afa5454b866dbc2ea3f4b446d5eef861bbb5b03cd";
+ sha512 = "7747666dffb5a8836ee88669dfa7e5c848e27821911499c1b4d896172bc8f696dbb998c701b043177fe0370000529d8ef807cbebf9457e013ddd822faf4b7a19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/kk/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kk/firefox-69.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "e48bb95cdb2361cd274e064e879ffef3d4cf25c15712c716c278a16b31636b3ffe3585999f7477e58b26ec5fa4ba0a3d5c5e80f7af97b305aec3e899867e66ba";
+ sha512 = "badeb493bbcd591359a283e930d9f042c2c81af24b2824cc4559f1a10a5372dba3eff457121744f0e5a8bc78394215535524f440cfe7435853f4b97db03a05a9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/km/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/km/firefox-69.0.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "3a987d55f2b113fe7ca2f47457d786b5d851605edc94e3a6467a2ce127075be4a2aa924892e053da6b9f854de60555941a875e0b94c8a8d736d84c791d5d7803";
+ sha512 = "2e33e07d9a35eaff182ad012dbd2f59cfc70170cba518d066bb05bc4873867dc24dcd0dece4fabfc045cda6313d5aa86a31e4c5d42579eecd6a11596a8d806bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/kn/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kn/firefox-69.0.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "36331d0774b85403d294b1240e1348a1aea9ea52df8ff8013a69f0b82cb5e8c799c87e3fbc9fdf0fc20f3537d0124d7dc291cd8fbc34063e4bd3b17c6810ea7c";
+ sha512 = "9ba5560db5f127018b3c365da5c18942da60ce609fbd5ea24c2eac75bb683a0853f212d8c46d7ddbd6190b6158d733d9f9dcd146188940e2705e9ca84caf1c33";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ko/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ko/firefox-69.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "7534ba3a9df96088180efd8a9c1df50e674f1749edb9103c6efc6db8c72d8e82aee09081ad3a956b07e0ab6c57e8c8194317d39a933da977dc0afdd1142d1c2e";
+ sha512 = "7f1ac38d2c303fa4d6ba628b3c57f5fbfde1b29e6830f5a2fc657f85d94f37d7474dd590e6b2933103cbabeefc5a51d6e59b434db7c8b422b8071b09a81e73fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/lij/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lij/firefox-69.0.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "affa07c2eb1590fddf0c30c670b6c7b6f9f6969dd43858e277a750ac524063f5da5166d7d8326e1823e0258ec5f214d241a08dbe338a3cb979de8b19a9799009";
+ sha512 = "9e8023da48c91b1e1eb5cd67ff661413a346fdd9a5062f71df712a4dd237c8b54ead00c49d03342eb32a614b85e55f6cc263a4968c8c6b09e307876483ce39ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/lt/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lt/firefox-69.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "416a8a66b087dea18c577d839c151f958c084e8ee95fb0fd7f17a45015baed961de0ca138fcc12f58154f480df15d294d822dcf1f218f4c8082c9193ad57710d";
+ sha512 = "1d422bfdb4fcdaf791541a778bacd27753e154e6093e0f8e76146f0eda6cbaa40346c519590fc78954d6d88c7fb0bd1c23b0ac5e359dd7a052ec124072a63c1c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/lv/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lv/firefox-69.0.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "1c5359efb53b0d4f0d9f33a321cac45ed112ede997c06b2279546183dd005c186f107701c895ced27a76086ca71374a49a067f5599a0d2ff166432b7eb7629df";
+ sha512 = "5168aef4edacf147f4f26f8f6c9f9b051339bf8b3910d8cda527321c0a6bb410a4cccc016c939de7d99a2db3b096ca2a14bd9eb5889f468d8aea27d2d96db1a8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/mk/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/mk/firefox-69.0.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "db44f22e19d505a590749ac98d7b84354106d421e4a45eff70986af2c9d2ac581a0bd84cfa103196ae4cdc17dd1fe5d9f0cf0c710ee0fb5a0ff7701f6de5253f";
+ sha512 = "af4d3216ac877e1fed003056ccb9ef502ee8ed9984df609043190946d7017f0e94838a00c1bbdaae9ff0078a8779bb3e0cef668e9f38dc94f546ef9cb4691e1b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/mr/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/mr/firefox-69.0.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "db73d7706ec4b87e76f5d174f22f9b032d75d9aebe6001ecdaa7c2c8fe5db897efd57f0f2ec482a5ef22e629a6233f5ef7c5df19566a3df0f0ce58ce008a22fb";
+ sha512 = "744196bffb399181b66ae4c192febdf595906809985807a596d2e482c2e1d519c0e3500ad98d04518b6f71dbdcbacfc481972bf2cf7802ad81f6627fe3b59877";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ms/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ms/firefox-69.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "23dad70a4757bf8e9c67328bf43b9be2a9d6e7f88ecc9c2980314e68eff269f996535f43f9fb93419d81a2e7c922327e5642c191e15582cdfcd3e420433e4270";
+ sha512 = "5d79b3b383d4163a4ae5ee84c28d8578b27e4fb42d09691fa7cd6fdf77e3a74e5e83c9bac581fa59e74b2aaaf8713f9f3b6b1d5ad778579f274d6f08fb4fc36c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/my/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/my/firefox-69.0.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "ba595429b7c637d06f703ae6bb1cb5ec6095a7f6fed7ea64a0b39825921f49f5f827c33a5cf3cd0bccc4b6398acbf4119a147014f1d2db1d8bd4b3e72b7733d2";
+ sha512 = "60b128b6d0cc632667b496f8b61e39fd14ad4c1544b4d0041cf739622c5c1b1cae539e848fd5944d0c3286f0b03dc2de46a156457ec6e2efa155e13cf7ce279d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/nb-NO/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nb-NO/firefox-69.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "8af331ca56c43c43b42061de4a7686bd2f944de845f9d94d088a4c1c913e1d7376abfd175dcebbb3ee78fac7fbea407cbdb2b81382919d12fca021dfccf59feb";
+ sha512 = "32e52dc1b1221862c0e3243e29234b330d73cc99c4500faf785aa911c92019e655beaab6f79911a8661a5efbd1dc8784aa328216653c2a206e52f703057f15c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ne-NP/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ne-NP/firefox-69.0.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "497001fbf28df53edf13aec04de313a1353ce0eae894905d6a33b0c182ef589160eca2f0a8fc18d8e1644f573cd74de3e96dbf43141b05b6884be04fde28be76";
+ sha512 = "04802130d9f08cfef7d0f5d29e0ed0b9757c3b7fbac001bd35431ea4851edd8c2e4837518fa893381f6c0c976684ffedeaa96b2bcdec3849cd2cca6bf170bdd3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/nl/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nl/firefox-69.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "6c0836da50f14accbf536570bfea5fe4e587e87fe2e4203b2c94052476994949058ee2418f862312a95627730d648832f6a0ca39690513c6d96070108630e43d";
+ sha512 = "fc02ea317fa90caf203608a31f2a188971bf5d6a900c8f03a422ffa76adb1eefd32c55f317c7c89c8443d11a79f0041a6a111a78519b441eaa7ec4832bd8ad38";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/nn-NO/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nn-NO/firefox-69.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "89be8b53fdc39bb39431584ea25cd6e5d660f75756d6c45f0157c1eb387cc625e927931c1cf0d1587c0819fef9635cb3ac2319af6a6f35825a6170518070cbd4";
+ sha512 = "f7f1274605b79541ec6f93cc7f023fe437c93e969d3644c6867a7c2c448f5504f9a6fc29f47c4267f13187ff6eb1b240e32e17dd2e5d66afc96e0a3bbecd9922";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/oc/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/oc/firefox-69.0.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "6b34edad11c141398d329d07e126eddf03bfd395bacd6856e947771ea65e274e78f96784f695542280f4530c395ebd0011946f1bdc95c1bf5c0f96ae8d7ea707";
+ sha512 = "ce1c1a35de6ac933192cbdd49370d5cbf90dfb993dcc8e3c739f2e3ff2023cc793f7ffeec40b3ba4093449dcd37e221932a6c3771f8f70ec074bf79e50320f69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pa-IN/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pa-IN/firefox-69.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "025cdbfa14ae385fd87e71296b67f9b0313c60ac56cb3d0f2734bd803e990b846383d64f65ca9a3d643fe0f2fd678d54a2b2000c7dca1cff73e5ec47acf1e53d";
+ sha512 = "50b4826d83cf08ebccae048c4dd3760f3ec639427d6354de398b77501e73df5062b8090590fcd74be54005a7df61a8cd7c2f4207142bdcd6468b1fbc126801a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pl/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pl/firefox-69.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "569b0dabacb30f8ed02cb1118a062c1e212c4b688a104d9afce8d846572a92723ca1ebbc495dd0e97c3365ab3e5010b9d812e88b111f40a6e87b14c646794dfb";
+ sha512 = "ae77877e1eb03174a1899b2b5d0820b367553d56febea14df4f1545a7f10de16c9f4401efad4334ae04a4a5c8abe49b2e24c09263bc002937576ad5ce622ed17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pt-BR/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pt-BR/firefox-69.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "36e7914fee752f7cbddce0ec5e48ffc0f45a20dc4b62a825488ddb0b49c36f91d2df257ffe2b551bba2261d7786291a2a7fb3f518cef5c6f9b449205eaa733be";
+ sha512 = "92cd33b35927dddc22e8a3ff3833ce2bb4913ae9ea12d4220d88861f7badcd69d1dd97be22cb6546a8f09b0e7620e17eedddee3d159660c9128c288e49a47dbf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pt-PT/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pt-PT/firefox-69.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "fc6dcdec3e6d53111929a70f3cd22948006d9a5bc2c6e4cb305a07c4bc8ee0469297be01d85b68017a026e011c35252c25032156ff383cc708c470fabcbc7198";
+ sha512 = "fb8d011fca706e6337e0b0b13b2e1ec619565b954c887c71720240905ec5c085aa7037b54e8b3df316c253483a3d3c7ad2182b27d8591d4e2840c6a4f9e39382";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/rm/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/rm/firefox-69.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "d5b2631fc3076cc251cb82e6c0930f7890750a73902480033ad0b5ec91aecc6f15c01e1e79b88ee4b2e74588a76cd0017fa520175559e1e68a6edd4149cd556d";
+ sha512 = "fbf0e34fbae7da291cc132697b6505f3213ad07c78a47171827a9bd6c22b674629cd21a9f47187173cf21f1b168baad0f058365a9ab24e274a2d3aff5acd0e38";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ro/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ro/firefox-69.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "d88ea2b05b262e010b0e447f4480149ddc79874dcce3925d3768211d7016cff99a9a0aef594c7185eb81988edfa46497dc442a4d825358c821461cc0f689c593";
+ sha512 = "cb712f917e0b70936ba1222f03c8874134e1cac6c901d94792aada224d894a607829b64993535f0cf61d8a2a050f488452c35404400587222418c8312e2b22f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ru/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ru/firefox-69.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "cc28f64e1ba7aa4771667a09e3ef9a2dfbe1af3c3ba552f14d16bf338eaa178c32eaafa39b6c0592e690fc10325b88966f555283669d241fe05bef113e533c02";
+ sha512 = "7ba048f533655e5802347a6d409ed6db4441b421cb81d66269eb610336f3fe2077a5bea405f235c167390f745762ef29863e83e6e704bdec17404d26a97f8ab1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/si/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/si/firefox-69.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "9119703b2edc30023b0bf81fdf6083a46544273a5b0dbe0f1d76c00020f1a093ea1df2592375bff9e81af1190f7fbd269f0387e311211a8d806e7519164b24af";
+ sha512 = "ea59ce14e80132d96f0419981dda30184809542978d158b8894c77cb4622c3f0bfb9bbbc4d456b386a023d9856ff6b02e5388ddfb0aced2ca764991ba8bab48e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sk/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sk/firefox-69.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "fababc6cd6644be1404ee1b6ab6f0c01c161b13539702a932e67062bc6d7ca350d0b7c88957d0617b404d892b93fff1b736d93a4061ca0b154e2cf3fbd0972ba";
+ sha512 = "4665b3b4b96a07ea0530acf4063dacfa48ff39a65d2e1da0f6d3f65703c3916ed65a8881d8a9d92109e252993f63edfec899d00a3559149a282b615624267431";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sl/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sl/firefox-69.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "5e16fd5446f742f259fcaaab1bf15e7d56cfd412065c268d625d87fb812312e6caffbdf0502d8d20bd9478bb4b2b3444604d8a1aea7a006c0dfe3d8120b2c1fe";
+ sha512 = "f3d6486a3dfc435933871cc8abcd3a428d724dfccca26be63df29d9f5b34fec115bb6e185b2aaf839f428d0ab44d33583610bf9d1c7f02de442506d1fc06192d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/son/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/son/firefox-69.0.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "0a36b7350d7cff22bd583bf7d811fac358046ddb0b85da52750e1687d7b82487ccac8575472683302c9a814abd07f81b227db3f2ecc8562f5d069d95045ba7d5";
+ sha512 = "6486e2f291deb1fb241df996e7898a9d487889815195d01d77d6bfcab6e2cb4bdc24c7694b6b05a95758ef130cb3332842e36446ffc2a926940ded5031cfa13c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sq/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sq/firefox-69.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "b18398395e0ea078117987704c962399a385e0ea2e4568291d8449d9fcf5f1784e4074b990e0e5e8a5b6b9dbd789772eeed689e722f4179e3f451064fb08ac92";
+ sha512 = "b111d30e2cb7fd5edadc68b9d25fd8970db62d721e903d9874afe6b875b313d039dc7c4e98e3de07a09fe84ca7d0ed10da2e74cf3cd4953b2c25252e16e01516";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sr/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sr/firefox-69.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "469ea3344ef2893333b7c967a72a08a86c24ce511f8d45f95ad159def204e2d5a2665829ddcf6783cb0602f0013f3924045410609b9e2a921f43c79750435648";
+ sha512 = "14c98d156bcae234c12f28166ee5ffc7d034529efb76536ffb29ee8baf850cb3c934ba177956ceba9c4cde2481064c3a906515328d1d8b6f5d9258cc1d30da94";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sv-SE/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sv-SE/firefox-69.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "4d9080b2bb8d3dbabd2ba6a14d0db8e5a983f5ab077d80dc7ddf892a82c1508b1b9bfe9b346d009b95a1ae89f300e72e37479c905b70ad924fc9d1c34f1317d4";
+ sha512 = "a196eb9ec6b667d04dd787aae47a1dd22a99f01fdcbf6b36e9946038dad52ddc3d215e2307641c3f539e476c9b8e3f9470d78b914a243b51595f7d75cad2e114";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ta/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ta/firefox-69.0.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "347edc360548f3a254c1eeaec47f1ece912fc79a0c19d3d9a1e455ec847749d8d531aef8bb44e2875afc4618a1eabfb77aaf581788138bb0a8607a443699da91";
+ sha512 = "d76c3797cd752a2b8021694421c224c2e2afa2d1350cb86263b01a8efd84b49cbda40a5c6b64f981833865944798148508fd6ae3532e82b773d650b41980893f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/te/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/te/firefox-69.0.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "806a97bdf4030dd8de57f3e2af8e06d71ea17891f4cd08df3cb3e71bfef372f1029b78ec6a16bb6ec96dc5113a0e96616e2fb907e11c98b6f33c9b83f67d9c37";
+ sha512 = "8bf86410d1d73cf355ecc4c2ef3308c35a31d55f90bba1c942f915e8cedee919c80729271c2d9e3aecbf499ca711f36bcf74c8b41c50024161e567d395485477";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/th/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/th/firefox-69.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "a453c97807c46eae98a1fef4184dfe06c3101240e5d20c389b9cfdaf4dfb4c2c3c38758d0451789d326c2d76249651c2d1a7aa4134e514b9de3ef966e4bed60c";
+ sha512 = "c757659188b17cfad880e70eab772517128bfa7d1dcdb86f313a63fb46c3f3d3504d66bf3ac99d1058848264ee4458bc5b77bf78009e9a7216c1fa359714a3d6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/tr/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/tr/firefox-69.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "79fc0d00870d27ea7485c5807c5e4753b036364f68f71b3a66e11b23e8a6f5498af35411d5baf1dcebbc8959b3ec1870faed90b136aec6a71ee2ccc59832cd3d";
+ sha512 = "635ad19f913a2d6dc46df50589229658dcea0bc570f45b7c5ff8eb6878b852ebde3a490512d679a6257c39b16fb986f40ea2894c08caed8c485a91e95f4addc3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/uk/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/uk/firefox-69.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "87176598ed9df72c6b05a2469ff404520f8e4171ee42cfdecd4dd461c761bddaaf8735ec9a9d9e651299951a656dc9189c2bf91f2ad896ff387706aaf31614b9";
+ sha512 = "99a3410ea2caf11911e7613568f7522230b13dcef48ffe6b95206a6a6d9f43f396b37bda1fad62dc4db097da55f96b30683626031491d88d116797b605d3cd2c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ur/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ur/firefox-69.0.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "761089a4b9a9df1e8aeb61567db383cc7f1068a56a857f9ddd9f306ae0eadd0f1fd0d911243b86dbd7cf755a1d0d9e2728f710d5e4855286c897fbf1bae3621c";
+ sha512 = "aeb60017d6ff2deb1675880c2358eb2a8561196e6148e8f796bc6964d26c303355339d7e6e4526be0814190a3bc4a98b48228457d6709a762e0e36bc83f6fb52";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/uz/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/uz/firefox-69.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "16838912099255e703f45537810f9a125f162da46654356da5d7284cf5976af0ba47e77b5658f7a95ff63287379411356521fca2250daef3f8ec299231c561c4";
+ sha512 = "99d025db18d86f75818354abfa56bb13041832605f25e0b91c87e18bda06d059ba62aec8be7141c8c6cc5f34edfeb83bfcff9234222ec88121b51fafdeab7ca1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/vi/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/vi/firefox-69.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "26c8651de12544aff98d6657bcd3dfce453d394dd0f4e6045d8a29d8ffeded020335bfc958984e1b79dcc4b8bf4c3b3a29c1b20fb62c0df7a6dc76478f72dc65";
+ sha512 = "5e5a586ed274f112ca20d729c89b949c46eefdf2d993e4bc27ecc4a40530f89ab68838dc458e510cb5d862e63c1b7b6188657650599dea920070092f091d6a2e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xh/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xh/firefox-69.0.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "222a0a22c6e41a6f755ba881097c2c354924bfb809f3a04b588853da667444f8c922fda9bea0f3c7bc82f46938f86810d2cbd5900960180a2a25f9cffaac9088";
+ sha512 = "fbcf97c7235c0a765fa083893dbd1e82e6b9befd8266bc86c1b1ca7a5d1674af2cdd8c86d6f2087683823eac2774e0b8983c4da93c72115ea4d53e6b73815140";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/zh-CN/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/zh-CN/firefox-69.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "3a3eea1dbb9c42c1740ee67b68e71ce84ef1f3f14a52c069a17956911464570429b3576e29ec7370a857dbcaec143bc4ae65e3f01e319b7ca065899e8f864eee";
+ sha512 = "93cce943be38357705ce7d1d4c5d88e5256c34280479216a4f739b60665ba832ef7b18b23730256871ce3bbfcae744ec421ebd56aaa73acb6cee91de03d0abe9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/zh-TW/firefox-68.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/zh-TW/firefox-69.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "a8d53ff606b7bc82dfbec77b299b8f69985472486706f79c960da988063a0e86d232eefb4734b8a624e97e9849fad3e36a483190b8cbc6c3210b2c2d79bd2b25";
+ sha512 = "407014668d7fd6802c1966cb8ac8571c151877ae3a9841e581784987a0337cff5c5ff191d13f305c371c7880a269b8483ac96b08bfd9f04b8ee4747adca5715d";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index f464972a9df2..1c6ddfc99eb6 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -255,7 +255,7 @@ stdenv.mkDerivation rec {
"--with-libclang-path=${llvmPackages.libclang}/lib"
"--with-clang-path=${llvmPackages.clang}/bin/clang"
]
- ++ lib.optionals (lib.versionAtLeast ffversion "57") [
+ ++ lib.optionals (lib.versionAtLeast ffversion "57" && lib.versionOlder ffversion "69") [
"--enable-webrender=build"
]
@@ -314,6 +314,9 @@ stdenv.mkDerivation rec {
]
++ extraMakeFlags;
+ RUSTFLAGS = if (lib.versionAtLeast ffversion "67"/*somewhere betwween ESRs*/)
+ then null else "--cap-lints warn";
+
enableParallelBuilding = true;
doCheck = false; # "--disable-tests" above
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 20509439d2fb..e1d4014c83bb 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -17,10 +17,10 @@ rec {
firefox = common rec {
pname = "firefox";
- ffversion = "68.0.2";
+ ffversion = "69.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "2xzakpb6mp9hjqkim353afv059i4zfpmhflhv3l3qzajgjz36cacbmp4bkn4cghinm8krhp8z02264ww0bcraryjjwn5q0dzljrha2w";
+ sha512 = "2q0gky7a6ayb6mw8bw3s35q3ggibf7vfyrxgggz1l4lpcv6dwjj01x45071h106jkvnh71hycvp1cywf98lkybjbfp8c9kd8sivkd43";
};
patches = [
@@ -99,10 +99,10 @@ rec {
firefox-esr-68 = common rec {
pname = "firefox-esr";
- ffversion = "68.0.2esr";
+ ffversion = "68.1.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "0dyjayrbcq6dg8vmzbf7303aixnhpd6r777chxpdvqq892rgvw5q4f8yfb6pr8j978hahn4dz968vzmi6sp40y3hf62hnzdqpzd2bx1";
+ sha512 = "0n8iy9xwf8wldkknq3y3nlm0cmb48baamvz4wmmbpfb2kfrxbsj3wnnd9ayk9zxhrsdq0na9gvkc374mv06nyqijrahd67wljv08fx5";
};
patches = [
@@ -159,7 +159,7 @@ rec {
};
});
-in rec {
+in {
icecat = iccommon rec {
ffversion = "60.3.0";
@@ -249,7 +249,7 @@ in rec {
in rec {
- tor-browser-7-5 = (tbcommon rec {
+ tor-browser-7-5 = (tbcommon {
ffversion = "52.9.0esr";
tbversion = "7.5.6";
@@ -265,7 +265,7 @@ in rec {
gtk3Support = false;
};
- tor-browser-8-5 = tbcommon rec {
+ tor-browser-8-5 = tbcommon {
ffversion = "60.8.0esr";
tbversion = "8.5.4";
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 2a4db14b2c6d..3ed06717f6a2 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -129,6 +129,8 @@ let
--set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
--set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
--set SNAP_NAME "firefox" \
+ --set MOZ_LEGACY_PROFILES 1 \
+ --set MOZ_ALLOW_DOWNGRADE 1 \
${lib.optionalString gdkWayland ''
--set GDK_BACKEND "wayland" \
''}${lib.optionalString (browser ? gtk3)
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 977b40e4a7e3..9f49925b2672 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -64,7 +64,7 @@ let
suffix = if channel != "stable" then "-" + channel else "";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit version;
name = "google-chrome${suffix}-${version}";
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index 59ba69c1c4da..7bb443e22c33 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
}:
stdenv.mkDerivation rec {
- version = "2.19";
- name = "links2-${version}";
+ version = "2.20";
+ pname = "links2";
src = fetchurl {
url = "${meta.homepage}/download/links-${version}.tar.bz2";
- sha256 = "02ls11c02p7xvsdjyb43rrzr850i1yly003r812z0w5vv5yqqxbh";
+ sha256 = "0bchwqa87dc8cb55spyybkqpc456pp4x2n9aw587wr7pn96cvp9v";
};
buildInputs = with stdenv.lib;
diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix
index 69beeb167590..d679eb56f5bd 100644
--- a/pkgs/applications/networking/browsers/luakit/default.nix
+++ b/pkgs/applications/networking/browsers/luakit/default.nix
@@ -31,8 +31,7 @@ stdenv.mkDerivation rec {
# TODO: why is not this the default? The test runner adds
# ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils
# scripts don't add an equivalent
- export LUA_PATH="$NIX_LUA_PATH;./?.lua;./?/init.lua"
- export LUA_CPATH="$NIX_LUA_CPATH"
+ export LUA_PATH="$LUA_PATH;./?.lua;./?/init.lua"
'';
makeFlags = [
@@ -49,8 +48,8 @@ stdenv.mkDerivation rec {
in ''
gappsWrapperArgs+=(
--prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
- --prefix LUA_PATH ';' "${luaKitPath};$NIX_LUA_PATH"
- --prefix LUA_CPATH ';' "$NIX_LUA_CPATH"
+ --prefix LUA_PATH ';' "${luaKitPath};$LUA_PATH"
+ --prefix LUA_CPATH ';' "$LUA_CPATH"
)
'';
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index d6b775107d06..3f4f96d33efb 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -7,7 +7,7 @@
assert sslSupport -> openssl != null;
stdenv.mkDerivation rec {
- name = "lynx-${version}";
+ pname = "lynx";
version = "2.8.9rel.1";
src = fetchurl {
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index fd21d9222d3d..a0bc0c743e46 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- description = "Lightweight WebKitGTK+ web browser";
+ description = "Lightweight WebKitGTK web browser";
homepage = https://www.midori-browser.org/;
license = with licenses; [ lgpl21Plus ];
platforms = with platforms; linux;
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index 32e4366a4e46..e8841a0ab6fb 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -15,7 +15,7 @@ let
in
stdenv.mkDerivation rec {
- name = "bluejeans-${version}";
+ pname = "bluejeans";
version = "2.180.71.8";
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index e8ffa7144684..fb3a6723817b 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,8 +73,8 @@ let
"";
in
stdenv.mkDerivation rec {
- name = "flashplayer-${version}";
- version = "32.0.0.238";
+ pname = "flashplayer";
+ version = "32.0.0.255";
src = fetchurl {
url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
- "1f5i64nzkvxy20vi7kldaamwp6pi2zgmjiw061cgqrwf7hj45wkg"
+ "1hd5z8qmki36k2wdwgg3v4sj32g8590r5563gdrjrk7bmrqfjnji"
else
- "09jvxqp83hpk89ak8flq14s3s3nhy3ary91jc6k47v325axh1cl9"
+ "0y13bxdgkxaqsyab09skiqj8dfjw76n2lr7p525ba8lbfbc8xj52"
else
if arch == "x86_64" then
- "05gvssjdz43pvgivdngrf8qr5b30p45hr2sr97cyl6b87581qw9s"
+ "0qkslkaiw3c9xk1rjcl4x9d0fi6i91k7g01mf0gq28wgzcyz4cw7"
else
- "06l7zhgh5rfxxw46b500zdgcqsk2h7kivng5b0b74s3vy7f0g270";
+ "0qblmaa3nq1g7825yhvz98pvd1591q3q7bsrhv5bbhdbmb9c1qd5";
};
nativeBuildInputs = [ unzip ];
@@ -141,7 +141,7 @@ stdenv.mkDerivation rec {
description = "Adobe Flash Player browser plugin";
homepage = http://www.adobe.com/products/flashplayer/;
license = stdenv.lib.licenses.unfree;
- maintainers = [];
+ maintainers = with stdenv.lib.maintainers; [ taku0 ];
platforms = [ "x86_64-linux" "i686-linux" ];
};
}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 29a01840555d..527eb2610067 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -48,9 +48,9 @@
, debug ? false
}:
-stdenv.mkDerivation rec {
- name = "flashplayer-standalone-${version}";
- version = "32.0.0.238";
+stdenv.mkDerivation {
+ pname = "flashplayer-standalone";
+ version = "32.0.0.255";
src = fetchurl {
url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
- "1vhfjpwsmg96irfvz81ldzn2m4qcjnql5psg4cifjay423yxabvy"
+ "1igc23mljmw1bw6fwx3rwpz7kxiy8n5znkng20w3yin2zh8qw8sy"
else
- "0am95xi2jasvxj5b2i12wzpvl3bvxli537k1i04698cg0na6x0y0";
+ "0rfvgx1g0s8wswwpmfjx6p59yh1cxya3x3bczbissrq4rcb1v315";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
index 30bae8792c2e..101ae99d6659 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk2, gettext, intltool }:
stdenv.mkDerivation rec {
- name = "fribid-${version}";
+ pname = "fribid";
version = "1.0.4";
builder = ./builder.sh;
src = fetchurl {
- url = "https://fribid.se/releases/source/${name}.tar.bz2";
+ url = "https://fribid.se/releases/source/${pname}-${version}.tar.bz2";
sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649";
};
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 8a25036c70a3..bde4ce15d7c0 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -46,7 +46,7 @@ let
in
stdenv.mkDerivation rec {
- name = "google-talk-plugin-${version}";
+ pname = "google-talk-plugin";
# You can get the upstream version and SHA-1 hash from the following URLs:
# curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA1'
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
index c6c1d6a334cd..fd956f62327e 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, firefox, libX11, xorgproto }:
stdenv.mkDerivation rec {
- name = "mozplugger-${version}";
+ pname = "mozplugger";
version = "2.1.6";
src = fetchurl {
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
cp mozplugger.so "$out/lib/mozilla/plugins"
cp mozplugger.7 "$out/share/man/man7"
- mkdir -p "$out/share/${name}/plugin"
- ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${name}/plugin"
+ mkdir -p "$out/share/${pname}-${version}/plugin"
+ ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${pname}-${version}/plugin"
'';
meta = {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
index fa455eb0b7a4..10ae0eb1da60 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
@@ -9,7 +9,7 @@ let
url="http://nspluginwrapper.org/download/nspluginwrapper-1.4.4.tar.gz";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (srcData) name version;
src = fetchurl{
diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix
index b7118b49dae6..d41f84404201 100644
--- a/pkgs/applications/networking/browsers/otter/default.nix
+++ b/pkgs/applications/networking/browsers/otter/default.nix
@@ -4,7 +4,8 @@
, sourceSha ? "1jw8bj3lcqngr0mqwvz1gf47qjxbwiyda7x4sm96a6ckga7pcwyb"
}:
stdenv.mkDerivation {
- name = "otter-browser-${version}";
+ pname = "otter-browser";
+ inherit version;
src = fetchFromGitHub {
owner = "OtterBrowser";
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index c4182785e829..66b947946cdc 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -13,14 +13,13 @@ let
in stdenv.mkDerivation rec {
pname = "palemoon";
- version = "28.6.0.1";
+ version = "28.7.0";
src = fetchFromGitHub {
- name = "${pname}-${version}";
owner = "MoonchildProductions";
repo = "UXP";
rev = "PM${version}_Release";
- sha256 = "1adgajy5vsghvjlv2nqyrbp6mnv3k6slqxxi8r949xlb5h6d210b";
+ sha256 = "0i6fy1mvjy6vpqnvhh516mxbv4d2z73yghk3frln4ql8zavba7qq";
};
desktopItem = makeDesktopItem {
@@ -91,8 +90,6 @@ in stdenv.mkDerivation rec {
"
'';
- hardeningDisable = [ "format" ];
-
buildPhase = ''
$src/mach build
'';
@@ -129,7 +126,7 @@ in stdenv.mkDerivation rec {
'';
homepage = "https://www.palemoon.org/";
license = licenses.mpl20;
- maintainers = with maintainers; [ rnhmjoj AndersonTorres OPNA2608 ];
+ maintainers = with maintainers; [ AndersonTorres OPNA2608 ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 05eafb48e721..1f441b4e9615 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -47,7 +47,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
pyyaml pyqt5 pyqtwebengine jinja2 pygments
- pypeg2 cssutils pyopengl attrs
+ pypeg2 cssutils pyopengl attrs setuptools
# scripts and userscripts libs
tldextract beautifulsoup4
pyreadability pykeepass stem
diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
index 3a7612bb0fbc..d9d4fda1aedd 100644
--- a/pkgs/applications/networking/browsers/surf/default.nix
+++ b/pkgs/applications/networking/browsers/surf/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "surf-${version}";
+ pname = "surf";
version = "2.0";
src = fetchurl {
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
installFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
- description = "A simple web browser based on WebKit/GTK+";
+ description = "A simple web browser based on WebKit/GTK";
longDescription = ''
- Surf is a simple web browser based on WebKit/GTK+. It is able to display
+ Surf is a simple web browser based on WebKit/GTK. It is able to display
websites and follow links. It supports the XEmbed protocol which makes it
possible to embed it in another application. Furthermore, one can point
surf to another URI by setting its XProperties.
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 1afe4dcea02e..739315917d43 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -89,34 +89,34 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "8.5.4";
+ version = "8.5.5";
lang = "en-US";
srcs = {
- "x86_64-linux" = fetchurl {
+ x86_64-linux = fetchurl {
urls = [
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
- sha256 = "0nnzynk3nlnd847c8jjghs9anmr5a2hv7nk1qxigigxqa5vqy96z";
+ sha256 = "00r5k9bbfpv3s6shxqypl13psr1zz51xiyz3vmm4flhr2qa4ycsz";
};
- "i686-linux" = fetchurl {
+ i686-linux = fetchurl {
urls = [
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
- sha256 = "1b34skl3hwvpy0r4l5ykgnnwhbz7cvly2gi9ib4h7lijjfafiys1";
+ sha256 = "1nxvw5kiggfr4n5an436ass84cvwjviaa894kfm72yf2ls149f29";
};
};
in
stdenv.mkDerivation rec {
- name = "tor-browser-bundle-bin-${version}";
+ pname = "tor-browser-bundle-bin";
inherit version;
- src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+ src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
preferLocalBuild = true;
allowSubstitutes = false;
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
index dbe4ddca10f4..7ff099853e29 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
@@ -71,8 +71,8 @@ let
ffmpeg
];
in
-stdenv.mkDerivation rec {
- name = "tor-browser-bundle-${version}";
+stdenv.mkDerivation {
+ pname = "tor-browser-bundle";
version = tor-browser-unwrapped.version;
buildInputs = [ tor-browser-unwrapped tor ];
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
index bddac77d1d69..7356768f3973 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
@@ -15,7 +15,7 @@
{
https-everywhere = stdenv.mkDerivation rec {
- name = "https-everywhere-${version}";
+ pname = "https-everywhere";
version = "2017.10.4";
extid = "https-everywhere-eff@eff.org";
@@ -46,7 +46,7 @@
};
noscript = stdenv.mkDerivation rec {
- name = "noscript-${version}";
+ pname = "noscript";
version = "5.1.2";
extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}";
@@ -64,7 +64,7 @@
};
torbutton = stdenv.mkDerivation rec {
- name = "torbutton-${version}";
+ pname = "torbutton";
version = "1.9.8.1";
extid = "torbutton@torproject.org";
@@ -87,7 +87,7 @@
};
tor-launcher = stdenv.mkDerivation rec {
- name = "tor-launcher-${version}";
+ pname = "tor-launcher";
version = "0.2.13";
extid = "tor-launcher@torproject.org";
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index 1d08895f1b01..f86c4a84e58c 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -5,7 +5,7 @@
# but Python 2 + packages during runtime.
stdenv.mkDerivation rec {
- name = "uzbl-${version}";
+ pname = "uzbl";
version = "0.9.0";
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index 1deaa33ee840..0a72099e653c 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "vimb-${version}";
+ pname = "vimb";
version = "3.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 678f226816a8..8a2e164b3639 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "1.4.2";
- name = "vimprobable2-${version}";
+ pname = "vimprobable2";
src = fetchurl {
url = "mirror://sourceforge/vimprobable/vimprobable2_${version}.tar.bz2";
sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr";
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 246c5e7e60dc..6483b6d03e30 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,11 +17,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
- version = "2.7.1628.30-1";
+ version = "2.7.1628.33-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
- sha256 = "1lz8adwiwll8g246s5pa0ipfraph51s9f4lcfysdrp1s3s1qhw8x";
+ sha256 = "1km5ccxqyd5xgmzm42zca670jf7wd4j7c726fhyj4wjni71zar34";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index 136c14d34d48..373fa43c72c3 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -15,7 +15,7 @@ assert mouseSupport -> gpm-ncurses != null;
with stdenv.lib;
let
- mktable = buildPackages.stdenv.mkDerivation rec {
+ mktable = buildPackages.stdenv.mkDerivation {
name = "w3m-mktable";
inherit (w3m) src;
nativeBuildInputs = [ pkgconfig boehmgc ];
diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix
index 242abc2ece79..3383d6838f7b 100644
--- a/pkgs/applications/networking/c14/default.nix
+++ b/pkgs/applications/networking/c14/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "c14-cli-${version}";
+ pname = "c14-cli";
version = "0.3";
goPackagePath = "github.com/online-net/c14-cli";
@@ -9,7 +9,7 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "online-net";
repo = "c14-cli";
- rev = "${version}";
+ rev = version;
sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf";
};
diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix
index 3946bf886250..4c1f7ea77492 100644
--- a/pkgs/applications/networking/charles/default.nix
+++ b/pkgs/applications/networking/charles/default.nix
@@ -20,8 +20,8 @@ let
startupNotify = "true";
};
- in stdenv.mkDerivation rec {
- name = "charles-${version}";
+ in stdenv.mkDerivation {
+ pname = "charles";
inherit version;
src = fetchurl {
@@ -54,7 +54,7 @@ let
};
};
-in rec {
+in {
charles4 = (generic {
version = "4.2.8";
sha256 = "1jzjdhzxgrq7pdfryfkg0hsjpyni14ma4x8jbdk1rqll78ccr080";
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 1bc7cea54eba..6712dcd486bc 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "cloudflared-${version}";
+ pname = "cloudflared";
version = "2019.7.0";
goPackagePath = "github.com/cloudflare/cloudflared";
diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index 647261a138f2..92db34417f47 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "argo-${version}";
+ pname = "argo";
version = "2.2.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/pkgs/applications/networking/cluster/chronos/default.nix
index bc9023a222f6..78be19cd81e5 100644
--- a/pkgs/applications/networking/cluster/chronos/default.nix
+++ b/pkgs/applications/networking/cluster/chronos/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, makeWrapper, fetchgit, curl, jdk, maven, nodejs, mesos }:
stdenv.mkDerivation rec {
- name = "chronos-${version}";
+ pname = "chronos";
version = "286b2ccb8e4695f8e413406ceca85b60d3a87e22";
src = fetchgit {
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/{bin,libexec/chronos}
- cp target/chronos*.jar $out/libexec/chronos/${name}.jar
+ cp target/chronos*.jar $out/libexec/chronos/${pname}-${version}.jar
makeWrapper ${jdk.jre}/bin/java $out/bin/chronos \
- --add-flags "-Xmx384m -Xms384m -cp $out/libexec/chronos/${name}.jar com.airbnb.scheduler.Main" \
+ --add-flags "-Xmx384m -Xms384m -cp $out/libexec/chronos/${pname}-${version}.jar com.airbnb.scheduler.Main" \
--prefix "MESOS_NATIVE_LIBRARY" : "$MESOS_NATIVE_LIBRARY"
'';
diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix
index bd8eb5451526..f4d6fce3545e 100644
--- a/pkgs/applications/networking/cluster/click/default.nix
+++ b/pkgs/applications/networking/cluster/click/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "click-${version}";
+ pname = "click";
version = "0.4.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index 876630c559a5..115dc3835fc5 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "machine-${version}";
+ pname = "machine";
version = "0.16.1";
goPackagePath = "github.com/docker/machine";
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
index 181663513d3e..de122dd2a5a2 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }:
buildGoPackage rec {
- name = "docker-machine-kvm-${version}";
+ pname = "docker-machine-kvm";
version = "0.10.0";
goPackagePath = "github.com/dhiltgen/docker-machine-kvm";
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
index b8b9fa035d18..eb2946cec771 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
@@ -2,7 +2,6 @@
buildGoModule rec {
pname = "docker-machine-kvm2";
- name = "${pname}-${version}";
version = minikube.version;
goPackagePath = "k8s.io/minikube";
diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
index 6b0440eb84ae..1c2caff50d53 100644
--- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, Hypervisor, vmnet }:
buildGoPackage rec {
- name = "docker-machine-xhyve-${version}";
+ pname = "docker-machine-xhyve";
version = "0.3.3";
goPackagePath = "github.com/zchee/docker-machine-driver-xhyve";
diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix
index 0c210dcc535b..9bf801ee93d7 100644
--- a/pkgs/applications/networking/cluster/habitat/default.nix
+++ b/pkgs/applications/networking/cluster/habitat/default.nix
@@ -4,7 +4,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "habitat-${version}";
+ pname = "habitat";
version = "0.30.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index 376f8113b23a..5fc35e6a0af1 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -65,8 +65,9 @@ let
installPhase = "mv hadoop-dist/target/hadoop-${version} $out";
};
in
- stdenv.mkDerivation rec {
- name = "hadoop-${version}";
+ stdenv.mkDerivation {
+ pname = "hadoop";
+ inherit version;
src = binary-distributon;
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index c116e46684cd..f0edbdf3ed68 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -1,14 +1,14 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- version = "2.14.2";
- name = "helm-${version}";
+ version = "2.14.3";
+ pname = "helm";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
- sha256 = "0hxfyfpmhgr5jilp2xm9d5vxiq5fcgqm2hh4g4izcgiz9bz7b6k0";
+ sha256 = "18ly31db2kxybjlisz8dfz3cdxs7j2wsh4rx5lwhbm5hpp42h17d";
};
goPackagePath = "k8s.io/helm";
diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix
index cd0ef728f83e..b9413577b104 100644
--- a/pkgs/applications/networking/cluster/heptio-ark/default.nix
+++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "heptio-ark-${version}";
+ pname = "heptio-ark";
version = "0.10.0";
goPackagePath = "github.com/heptio/ark";
diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
index 5eaf1d13d618..4de0c3fbd7b6 100644
--- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix
+++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
@@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
- name = "hetzner-kube-${version}";
+ pname = "hetzner-kube";
version = "0.4.1";
src = fetchFromGitHub {
owner = "xetys";
repo = "hetzner-kube";
- rev = "${version}";
+ rev = version;
sha256 = "11202i3340vaz8xh59gwj5x0djcgbzq9jfy2214lcpml71qc85f0";
};
diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix
index 6274168b3da7..52abc3189903 100644
--- a/pkgs/applications/networking/cluster/kanif/default.nix
+++ b/pkgs/applications/networking/cluster/kanif/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.2.2";
- name = "kanif-${version}";
+ pname = "kanif";
src = fetchurl {
- url = "https://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz";
+ url = "https://gforge.inria.fr/frs/download.php/26773/${pname}-${version}.tar.gz";
sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879";
};
diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix
index 19194c2d0873..1a14e1ed273e 100644
--- a/pkgs/applications/networking/cluster/kompose/default.nix
+++ b/pkgs/applications/networking/cluster/kompose/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "kompose-${version}";
+ pname = "kompose";
version = "1.18.0";
goPackagePath = "github.com/kubernetes/kompose";
diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix
index 1e03efddc062..359b289dbbcd 100644
--- a/pkgs/applications/networking/cluster/kontemplate/default.nix
+++ b/pkgs/applications/networking/cluster/kontemplate/default.nix
@@ -1,8 +1,8 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "kontemplate-${version}";
- version = "1.7.0";
+ pname = "kontemplate";
+ version = "1.8.0";
goPackagePath = "github.com/tazjin/kontemplate";
goDeps = ./deps.nix;
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "tazjin";
repo = "kontemplate";
rev = "v${version}";
- sha256 = "0vzircajhrfq1nykwpl52cqgzyhy51w4ff7ldpgi95w3a4fz1hzz";
+ sha256 = "123mjmmm4hynraq1fpn3j5i0a1i87l265kkjraxxxbl0zacv74i1";
};
meta = with lib; {
diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/applications/networking/cluster/kontemplate/deps.nix
index f0a52f5266ef..7693968bd550 100644
--- a/pkgs/applications/networking/cluster/kontemplate/deps.nix
+++ b/pkgs/applications/networking/cluster/kontemplate/deps.nix
@@ -1,111 +1,111 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
+ {
+ goPackagePath = "github.com/Masterminds/goutils";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Masterminds/goutils";
+ rev = "41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0";
+ sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq";
+ };
+ }
{
goPackagePath = "github.com/Masterminds/semver";
fetch = {
- type = "git";
- url = "https://github.com/Masterminds/semver";
- rev = "c84ddcca87bf5a941b138dde832a7e20b0159ad8";
- sha256 = "1dcfdr018a0yszjpvr3wshvq9cc3kvy95l55si556p617wsn1wan";
+ type = "git";
+ url = "https://github.com/Masterminds/semver";
+ rev = "5bc3b9184d48f1412b300b87a200cf020d9254cf";
+ sha256 = "1vdfm653v50jf63cw0kg2hslx50cn4mk6lj3p51bi11jrg48kfng";
};
}
{
goPackagePath = "github.com/Masterminds/sprig";
fetch = {
- type = "git";
- url = "https://github.com/Masterminds/sprig";
- rev = "77bb58b7f5e10889a1195c21b9e7a96ee166f199";
- sha256 = "0q4g12f3nvda1skz33qzbbdd2vj3gjfwf361hyzlx20s71brk3bk";
+ type = "git";
+ url = "https://github.com/Masterminds/sprig";
+ rev = "6f509977777c33eae63b2136d97f7b976cb971cc";
+ sha256 = "05h9k6fhjxnpwlihj3z02q9kvqvnq53jix0ab84sx0666bci3cdh";
};
}
{
goPackagePath = "github.com/alecthomas/template";
fetch = {
- type = "git";
- url = "https://github.com/alecthomas/template";
- rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
- sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+ type = "git";
+ url = "https://github.com/alecthomas/template";
+ rev = "fb15b899a75114aa79cc930e33c46b577cc664b1";
+ sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26";
};
}
{
goPackagePath = "github.com/alecthomas/units";
fetch = {
- type = "git";
- url = "https://github.com/alecthomas/units";
- rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
- sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
- };
- }
- {
- goPackagePath = "github.com/aokoli/goutils";
- fetch = {
- type = "git";
- url = "https://github.com/aokoli/goutils";
- rev = "3391d3790d23d03408670993e957e8f408993c34";
- sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n";
+ type = "git";
+ url = "https://github.com/alecthomas/units";
+ rev = "c3de453c63f4bdb4dadffab9805ec00426c505f7";
+ sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my";
};
}
{
goPackagePath = "github.com/ghodss/yaml";
fetch = {
- type = "git";
- url = "https://github.com/ghodss/yaml";
- rev = "e9ed3c6dfb39bb1a32197cb10d527906fe4da4b6";
- sha256 = "07cf0j3wbsl1gmn175mdgljcarfz4xbqd6pgc7b08a5lcn7zwhjz";
+ type = "git";
+ url = "https://github.com/ghodss/yaml";
+ rev = "25d852aebe32c875e9c044af3eef9c7dc6bc777f";
+ sha256 = "1w9yq0bxzygc4qwkwwiy7k1k1yviaspcqqv18255k2xkjv5ipccz";
};
}
{
goPackagePath = "github.com/google/uuid";
fetch = {
- type = "git";
- url = "https://github.com/google/uuid";
- rev = "dec09d789f3dba190787f8b4454c7d3c936fed9e";
- sha256 = "1hc4w67p6zkh2qk7wm1yrl69jjrjjk615mly5ll4iidn1m4mzi4i";
+ type = "git";
+ url = "https://github.com/google/uuid";
+ rev = "c2e93f3ae59f2904160ceaab466009f965df46d6";
+ sha256 = "0zw8fvl6jqg0fmv6kmvhss0g4gkrbvgyvl2zgy5wdbdlgp4fja0h";
};
}
{
goPackagePath = "github.com/huandu/xstrings";
fetch = {
- type = "git";
- url = "https://github.com/huandu/xstrings";
- rev = "7bb0250b58e5c15670406e6f93ffda43281305b1";
- sha256 = "1fc8q65xvsxpa12p8hcjqap2pf72zqlwpm165js9kwbgm2sf977c";
+ type = "git";
+ url = "https://github.com/huandu/xstrings";
+ rev = "8bbcf2f9ccb55755e748b7644164cd4bdce94c1d";
+ sha256 = "1ivvc95514z63k7cpz71l0dwlanffmsh1pijhaqmp41kfiby8rsx";
};
}
{
goPackagePath = "github.com/imdario/mergo";
fetch = {
- type = "git";
- url = "https://github.com/imdario/mergo";
- rev = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4";
- sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7";
+ type = "git";
+ url = "https://github.com/imdario/mergo";
+ rev = "4c317f2286be3bd0c4f1a0e622edc6398ec4656d";
+ sha256 = "0bihha1qsgfjk14yv1hwddv3d8dzxpbjlaxwwyys6lhgxz1cr9h9";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "de0752318171da717af4ce24d0a2e8626afaeb11";
- sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i";
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "9756ffdc24725223350eb3266ffb92590d28f278";
+ sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8";
};
}
{
goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
fetch = {
- type = "git";
- url = "https://gopkg.in/alecthomas/kingpin.v2";
- rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
+ type = "git";
+ url = "https://gopkg.in/alecthomas/kingpin.v2";
+ rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
};
}
]
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 6a721ef14c1f..c8b95baf2f39 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -6,7 +6,8 @@ let
generic = { version, sha256, ...}@attrs:
let attrs' = builtins.removeAttrs attrs ["version" "sha256"] ; in
buildGoPackage {
- name = "kops-${version}";
+ pname = "kops";
+ inherit version;
inherit goPackagePath;
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
index cf0116ba8569..e1b5a4425d51 100644
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -3,7 +3,8 @@
let version = "0.12.0"; in
buildGoPackage {
- name = "kubecfg-${version}";
+ pname = "kubecfg";
+ inherit version;
src = fetchFromGitHub {
owner = "bitnami";
diff --git a/pkgs/applications/networking/cluster/kubectl/default.nix b/pkgs/applications/networking/cluster/kubectl/default.nix
index 40d42408679e..fed40523a9b7 100644
--- a/pkgs/applications/networking/cluster/kubectl/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl/default.nix
@@ -9,8 +9,6 @@ stdenv.mkDerivation {
outputs = [ "out" "man" ];
- doBuild = false;
-
installPhase = ''
mkdir -p \
"$out/bin" \
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 190711e3096b..cbe32e57f20d 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -14,14 +14,14 @@
with lib;
stdenv.mkDerivation rec {
- name = "kubernetes-${version}";
- version = "1.14.3";
+ pname = "kubernetes";
+ version = "1.15.3";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "1r31ssf8bdbz8fdsprhkc34jqhz5rcs3ixlf0mbjcbq0xr7y651z";
+ sha256 = "0vamr7m8i5svmvb0z01cngv3sffdfjj0bky2zalm7cfnapib8vz1";
};
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
@@ -29,7 +29,10 @@ stdenv.mkDerivation rec {
outputs = ["out" "man" "pause"];
postPatch = ''
- substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
+ # go env breaks the sandbox
+ substituteInPlace "hack/lib/golang.sh" \
+ --replace 'echo "$(go env GOHOSTOS)/$(go env GOHOSTARCH)"' 'echo "${go.GOOS}/${go.GOARCH}"'
+
substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"
# hack/update-munge-docs.sh only performs some tests on the documentation.
# They broke building k8s; disabled for now.
@@ -38,7 +41,7 @@ stdenv.mkDerivation rec {
patchShebangs ./hack
'';
- WHAT="${concatStringsSep " " components}";
+ WHAT=concatStringsSep " " components;
postBuild = ''
./hack/update-generated-docs.sh
@@ -52,13 +55,12 @@ stdenv.mkDerivation rec {
cp build/pause/pause "$pause/bin/pause"
cp -R docs/man/man1 "$man/share/man"
- cp cluster/addons/addon-manager/namespace.yaml $out/share
cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons
patchShebangs $out/bin/kube-addons
- substituteInPlace $out/bin/kube-addons \
- --replace /opt/namespace.yaml $out/share/namespace.yaml
wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl"
+ cp ${./mk-docker-opts.sh} $out/bin/mk-docker-opts.sh
+
$out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl
$out/bin/kubectl completion zsh > $out/share/zsh/site-functions/_kubectl
'';
diff --git a/pkgs/applications/networking/cluster/kubernetes/mk-docker-opts.sh b/pkgs/applications/networking/cluster/kubernetes/mk-docker-opts.sh
new file mode 100755
index 000000000000..22a459f51349
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubernetes/mk-docker-opts.sh
@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+
+# Copyright 2014 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generate Docker daemon options based on flannel env file.
+
+# exit on any error
+set -e
+
+usage() {
+ echo "$0 [-f FLANNEL-ENV-FILE] [-d DOCKER-ENV-FILE] [-i] [-c] [-m] [-k COMBINED-KEY]
+
+Generate Docker daemon options based on flannel env file
+OPTIONS:
+ -f Path to flannel env file. Defaults to /run/flannel/subnet.env
+ -d Path to Docker env file to write to. Defaults to /run/docker_opts.env
+ -i Output each Docker option as individual var. e.g. DOCKER_OPT_MTU=1500
+ -c Output combined Docker options into DOCKER_OPTS var
+ -k Set the combined options key to this value (default DOCKER_OPTS=)
+ -m Do not output --ip-masq (useful for older Docker version)
+" >/dev/stderr
+ exit 1
+}
+
+flannel_env="/run/flannel/subnet.env"
+docker_env="/run/docker_opts.env"
+combined_opts_key="DOCKER_OPTS"
+indiv_opts=false
+combined_opts=false
+ipmasq=true
+val=""
+
+while getopts "f:d:icmk:" opt; do
+ case $opt in
+ f)
+ flannel_env=$OPTARG
+ ;;
+ d)
+ docker_env=$OPTARG
+ ;;
+ i)
+ indiv_opts=true
+ ;;
+ c)
+ combined_opts=true
+ ;;
+ m)
+ ipmasq=false
+ ;;
+ k)
+ combined_opts_key=$OPTARG
+ ;;
+ \?)
+ usage
+ ;;
+ esac
+done
+
+if [[ $indiv_opts = false ]] && [[ $combined_opts = false ]]; then
+ indiv_opts=true
+ combined_opts=true
+fi
+
+if [[ -f "${flannel_env}" ]]; then
+ source "${flannel_env}"
+fi
+
+if [[ -n "$FLANNEL_SUBNET" ]]; then
+ # shellcheck disable=SC2034 # Variable name referenced in OPT_LOOP below
+ DOCKER_OPT_BIP="--bip=$FLANNEL_SUBNET"
+fi
+
+if [[ -n "$FLANNEL_MTU" ]]; then
+ # shellcheck disable=SC2034 # Variable name referenced in OPT_LOOP below
+ DOCKER_OPT_MTU="--mtu=$FLANNEL_MTU"
+fi
+
+if [[ "$FLANNEL_IPMASQ" = true ]] && [[ $ipmasq = true ]]; then
+ # shellcheck disable=SC2034 # Variable name referenced in OPT_LOOP below
+ DOCKER_OPT_IPMASQ="--ip-masq=false"
+fi
+
+eval docker_opts="\$${combined_opts_key}"
+docker_opts+=" "
+
+echo -n "" >"${docker_env}"
+
+# OPT_LOOP
+for opt in $(compgen -v DOCKER_OPT_); do
+ eval val=\$"${opt}"
+
+ if [[ "$indiv_opts" = true ]]; then
+ echo "$opt=\"$val\"" >>"${docker_env}"
+ fi
+
+ docker_opts+="$val "
+done
+
+if [[ "$combined_opts" = true ]]; then
+ echo "${combined_opts_key}=\"${docker_opts}\"" >>"${docker_env}"
+fi
diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix
index 171ce3d3a54d..dcda18f18be6 100644
--- a/pkgs/applications/networking/cluster/kubetail/default.nix
+++ b/pkgs/applications/networking/cluster/kubetail/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, lib, ... }:
stdenv.mkDerivation rec {
- name = "kubetail-${version}";
+ pname = "kubetail";
version = "1.6.9";
src = fetchFromGitHub {
owner = "johanhaleby";
repo = "kubetail";
- rev = "${version}";
+ rev = version;
sha256 = "0mcv23p0h1ww9gvax8b4b4x5hmg02shrbgms0v0c72cmw0zf2phr";
};
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index 55a827f9cf92..89d06474509f 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -4,7 +4,7 @@ let
# Cache schema as a package so network calls are not
# necessary at runtime, allowing use in package builds
- schema = stdenv.mkDerivation rec {
+ schema = stdenv.mkDerivation {
name = "kubeval-schema";
src = fetchFromGitHub {
owner = "garethr";
@@ -22,7 +22,7 @@ let
in
buildGoPackage rec {
- name = "kubeval-${version}";
+ pname = "kubeval";
version = "0.7.3";
goPackagePath = "github.com/garethr/kubeval";
diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix
index 256bce9b6ec2..8c0265d14914 100644
--- a/pkgs/applications/networking/cluster/linkerd/default.nix
+++ b/pkgs/applications/networking/cluster/linkerd/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildGoModule }:
-buildGoModule rec {
+buildGoModule {
pname = "linkerd-unstablle";
version = "2019-07-26";
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 49cac6d50635..72bd82be6c16 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -1,7 +1,7 @@
{ stdenv, makeWrapper, jdk, mesos, fetchurl }:
stdenv.mkDerivation rec {
- name = "marathon-${version}";
+ pname = "marathon";
version = "1.4.2";
src = fetchurl {
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/{bin,libexec/marathon}
- cp target/scala-*/marathon*.jar $out/libexec/marathon/${name}.jar
+ cp target/scala-*/marathon*.jar $out/libexec/marathon/${pname}-${version}.jar
makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \
- --add-flags "-Xmx512m -jar $out/libexec/marathon/${name}.jar" \
+ --add-flags "-Xmx512m -jar $out/libexec/marathon/${pname}-${version}.jar" \
--set "MESOS_NATIVE_JAVA_LIBRARY" "$MESOS_NATIVE_JAVA_LIBRARY"
'';
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 8cff2494bf8f..1ad30335b94d 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -26,13 +26,13 @@ let
in stdenv.mkDerivation rec {
version = "1.4.1";
- name = "mesos-${version}";
+ pname = "mesos";
enableParallelBuilding = true;
dontDisableStatic = true;
src = fetchurl {
- url = "mirror://apache/mesos/${version}/${name}.tar.gz";
+ url = "mirror://apache/mesos/${version}/${pname}-${version}.tar.gz";
sha256 = "1c7l0rim9ija913gpppz2mcms08ywyqhlzbbspqsi7wwfdd7jwsr";
};
@@ -61,6 +61,9 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [
pythonProtobuf
];
+
+ NIX_CFLAGS_COMPILE = "-Wno-error=format-overflow -Wno-error=class-memaccess";
+
preConfigure = ''
# https://issues.apache.org/jira/browse/MESOS-6616
configureFlagsArray+=(
diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix
index 5551f635bc36..43e960d9403e 100644
--- a/pkgs/applications/networking/cluster/minishift/default.nix
+++ b/pkgs/applications/networking/cluster/minishift/default.nix
@@ -11,7 +11,7 @@ let
openshiftVersion = "v3.11.0";
in buildGoPackage rec {
- name = "minishift-${version}";
+ pname = "minishift";
inherit version;
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index fec737ddb2ae..a4236a9408cc 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "nomad-${version}";
- version = "0.9.4";
+ pname = "nomad";
+ version = "0.9.5";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/nomad";
@@ -10,14 +10,26 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "hashicorp";
- repo = "nomad";
+ repo = pname;
inherit rev;
- sha256 = "1jgvnmmrz7ffpm6aamdrvklj94n7b43swk9cycqhlfbnzijianpn";
+ sha256 = "01491470idb11z0ab4anb5caw46vy9s94a17l92j0z2f3f4k6xfl";
};
- # We disable Nvidia GPU scheduling on Linux, as it doesn't work there:
- # Ref: https://github.com/hashicorp/nomad/issues/5535
- buildFlags = stdenv.lib.optionalString (stdenv.isLinux) "-tags nonvidia";
+ # ui:
+ # Nomad release commits include the compiled version of the UI, but the file
+ # is only included if we build with the ui tag.
+ # nonvidia:
+ # We disable Nvidia GPU scheduling on Linux, as it doesn't work there:
+ # Ref: https://github.com/hashicorp/nomad/issues/5535
+ preBuild = let
+ tags = ["ui"]
+ ++ stdenv.lib.optional stdenv.isLinux "nonvidia";
+ tagsString = stdenv.lib.concatStringsSep " " tags;
+ in ''
+ export buildFlagsArray=(
+ -tags="${tagsString}"
+ )
+ '';
meta = with stdenv.lib; {
homepage = https://www.nomadproject.io/;
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index dd57add14af9..758786f586a6 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -21,7 +21,7 @@ let
k8sgitMajor = "0";
k8sgitMinor = "1";
in buildGoPackage rec {
- name = "openshift-origin-${version}";
+ pname = "openshift-origin";
inherit version;
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix
index 618bea36de86..de0bb015852c 100644
--- a/pkgs/applications/networking/cluster/pachyderm/default.nix
+++ b/pkgs/applications/networking/cluster/pachyderm/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "pachyderm-${version}";
+ pname = "pachyderm";
version = "1.8.5";
rev = "v${version}";
diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix
index de683b26484c..ce6c5424fba1 100644
--- a/pkgs/applications/networking/cluster/sonobuoy/default.nix
+++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix
@@ -10,7 +10,7 @@ buildGoPackage rec {
goPackagePath = "github.com/heptio/sonobuoy";
buildFlagsArray =
- let t = "${goPackagePath}";
+ let t = goPackagePath;
in ''
-ldflags=
-s -X ${t}/pkg/buildinfo.Version=${version}
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 3572bfe7f5ba..e675d17491af 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -15,18 +15,19 @@ with stdenv.lib;
stdenv.mkDerivation rec {
- name = "spark-${version}";
+ pname = "spark";
+ inherit version;
src = fetchzip {
inherit sha256;
- url = "mirror://apache/spark/${name}/${name}-bin-without-hadoop.tgz";
+ url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
};
buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
++ optional RSupport R
++ optional mesosSupport mesos;
- untarDir = "${name}-bin-without-hadoop";
+ untarDir = "${pname}-${version}-bin-without-hadoop";
installPhase = ''
mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java}
mv * $out/lib/${untarDir}
diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix
index 052797db2f3f..0835d268cd79 100644
--- a/pkgs/applications/networking/cluster/ssm-agent/default.nix
+++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "${pname}-${version}";
pname = "amazon-ssm-agent";
version = "2.0.633.0";
diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix
index 3218e6a25b39..144d46043ffe 100644
--- a/pkgs/applications/networking/cluster/stern/default.nix
+++ b/pkgs/applications/networking/cluster/stern/default.nix
@@ -3,7 +3,7 @@
let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in
buildGoPackage rec {
- name = "stern-${version}";
+ pname = "stern";
version = "1.11.0";
goPackagePath = "github.com/wercker/stern";
@@ -11,7 +11,7 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "wercker";
repo = "stern";
- rev = "${version}";
+ rev = version;
sha256 = "0xndlq0ks8flzx6rdd4lnkxpkbvdy9sj1jwys5yj7p989ls8by3n";
};
diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix
index c61896d89218..3423163f5902 100644
--- a/pkgs/applications/networking/cluster/taktuk/default.nix
+++ b/pkgs/applications/networking/cluster/taktuk/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "3.7.7";
- name = "taktuk-${version}";
+ pname = "taktuk";
buildInputs = [ perl ];
src = fetchurl {
- url = "https://gforge.inria.fr/frs/download.php/33412/${name}.tar.gz";
+ url = "https://gforge.inria.fr/frs/download.php/33412/${pname}-${version}.tar.gz";
sha256 = "0w0h3ynlcxvq2nzm8hkj20g0805ww3vkw53g0qwj7wvp7p3gcvnr";
};
diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix
index 2b39cebbbeb0..606cd0370aa2 100644
--- a/pkgs/applications/networking/cluster/terraform-docs/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix
@@ -1,6 +1,5 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "${pname}-${version}";
pname = "terraform-docs";
version = "0.6.0";
diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix
index dd4a36807ea1..1bb8df88d010 100644
--- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub}:
buildGoPackage rec {
- name = "terraform-inventory-${version}";
+ pname = "terraform-inventory";
version = "0.7-pre";
rev = "v${version}";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
index 2b2c3caba862..bb634a78e23c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/ansible/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "terraform-provider-ansible-${version}";
+ pname = "terraform-provider-ansible";
version = "1.0.3";
goPackagePath = "github.com/nbering/terraform-provider-ansible";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
index ae456185a80d..1aadbbc5ccd3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
- name = "terraform-provider-elasticsearch-${version}";
+ pname = "terraform-provider-elasticsearch";
version = "0.7.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
index 291698f3065f..4571d368991f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "terraform-provider-gandi-${version}";
+ pname = "terraform-provider-gandi";
version = "1.0.0";
goPackagePath = "github.com/tiramiseb/terraform-provider-gandi";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
index fddf13795f3e..06d7b8a9f073 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
@@ -11,7 +11,7 @@
#
buildGoPackage rec {
- name = "terraform-provider-ibm-${version}";
+ pname = "terraform-provider-ibm";
version = "0.11.1";
goPackagePath = "github.com/terraform-providers/terraform-provider-ibm";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
index 96b5c8a0fa1f..23c4f4bfa8b3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
@@ -18,7 +18,7 @@
# https://github.com/dmacvicar/terraform-provider-libvirt/tree/master/examples
buildGoPackage rec {
- name = "terraform-provider-libvirt-${version}";
+ pname = "terraform-provider-libvirt";
version = "0.5.1";
goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt";
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index de1e86fa0736..9c07760355ca 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -97,8 +97,8 @@ in rec {
terraform_0_11-full = terraform_0_11.full;
terraform_0_12 = pluggable (generic {
- version = "0.12.7";
- sha256 = "09zsak1a9z2mk88vb6xs9jaxfpazhs0p7x68mw62c9mm13m8kq02";
+ version = "0.12.8";
+ sha256 = "1qlhbn6xj2nd8gwr6aiyjsb62qmj4j9jnxab006xgdr1avvl2p67";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 56c30df37c5b..ddeb5851037b 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
buildGoPackage rec {
- name = "terragrunt-${version}";
+ pname = "terragrunt";
version = "0.17.4";
goPackagePath = "github.com/gruntwork-io/terragrunt";
diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 1ee2c694e0b4..73c0e234945e 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "1.7.4";
- name = "corebird-${version}";
+ pname = "corebird";
src = fetchFromGitHub {
owner = "baedert";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "Native Gtk+ Twitter client for the Linux desktop";
+ description = "Native GTK Twitter client for the Linux desktop";
longDescription = "Corebird is a modern, easy and fun Twitter client.";
homepage = https://corebird.baedert.org/;
license = stdenv.lib.licenses.gpl3;
diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
index 34ebc84cea28..0967fd95dc0b 100644
--- a/pkgs/applications/networking/drive/default.nix
+++ b/pkgs/applications/networking/drive/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "drive-${version}";
+ pname = "drive";
version = "0.3.8.1";
goPackagePath = "github.com/odeke-em/drive";
diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix
index 62fe4e2e662e..d71b863f881f 100644
--- a/pkgs/applications/networking/droopy/default.nix
+++ b/pkgs/applications/networking/droopy/default.nix
@@ -2,8 +2,8 @@
with lib;
-stdenv.mkDerivation rec {
- name = "droopy-${version}";
+stdenv.mkDerivation {
+ pname = "droopy";
version = "20160830";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix
index ae0643669dc0..9b3b99708dfc 100644
--- a/pkgs/applications/networking/dropbox/cli.nix
+++ b/pkgs/applications/networking/dropbox/cli.nix
@@ -15,7 +15,8 @@ let
dropboxd = "${dropbox}/bin/dropbox";
in
stdenv.mkDerivation {
- name = "dropbox-cli-${version}";
+ pname = "dropbox-cli";
+ inherit version;
outputs = [ "out" "nautilusExtension" ];
@@ -52,11 +53,11 @@ stdenv.mkDerivation {
];
configureFlags = [
- "--with-nautilus-extension-dir=${placeholder ''nautilusExtension''}/lib/nautilus/extensions-3.0"
+ "--with-nautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-3.0"
];
makeFlags = [
- "EMBLEM_DIR=${placeholder ''nautilusExtension''}/share/nautilus-dropbox/emblems"
+ "EMBLEM_DIR=${placeholder "nautilusExtension"}/share/nautilus-dropbox/emblems"
];
meta = {
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index d820d40f7a34..9a05a92cfb31 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -10,8 +10,8 @@ let
version = "73.4.118";
arch = {
- "x86_64-linux" = "x86_64";
- "i686-linux" = "x86";
+ x86_64-linux = "x86_64";
+ i686-linux = "x86";
}.${stdenv.hostPlatform.system};
installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz";
diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
index a5b4c577b4cb..640421bef8f5 100644
--- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix
+++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "cfdyndns-${version}";
+ pname = "cfdyndns";
version = "0.0.1";
src = fetchFromGitHub {
owner = "colemickens";
diff --git a/pkgs/applications/networking/enhanced-ctorrent/default.nix b/pkgs/applications/networking/enhanced-ctorrent/default.nix
index bb3ab98d1a4c..59b48df1cd03 100644
--- a/pkgs/applications/networking/enhanced-ctorrent/default.nix
+++ b/pkgs/applications/networking/enhanced-ctorrent/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "3.3.2";
pname = "enhanced-ctorrent-dhn";
diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index f89b8206dbe6..5b1ab692abd2 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pythonPackages, glibcLocales }:
pythonPackages.buildPythonApplication rec {
- name = "errbot-${version}";
+ pname = "errbot";
version = "5.2.0";
src = fetchurl {
- url = "mirror://pypi/e/errbot/${name}.tar.gz";
+ url = "mirror://pypi/e/errbot/${pname}-${version}.tar.gz";
sha256 = "0q5fg113s3gnym38d4y5mlnxw6vrm388zw5mlapf7b2zgx34r053";
};
diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index 708d3c1ed800..2535d0dc31db 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "esniper-2.35.0-15-g91d2665";
src = fetchgit {
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index 2795ac4e46e4..f7a9521c9937 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -2,11 +2,11 @@
, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }:
rustPlatform.buildRustPackage rec {
- name = "newsboat-${version}";
+ pname = "newsboat";
version = "2.16.1";
src = fetchurl {
- url = "https://newsboat.org/releases/${version}/${name}.tar.xz";
+ url = "https://newsboat.org/releases/${version}/${pname}-${version}.tar.xz";
sha256 = "0lxdsfcwa4byhfnn0gv34w3rr531f4nfqgi8j4qqmh3gncbwh8s0";
};
diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index 6bdaf2ffaf48..7304fd2f654b 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "rawdog-${version}";
+ pname = "rawdog";
version = "2.23";
src = fetchurl {
- url = "https://offog.org/files/${name}.tar.gz";
+ url = "https://offog.org/files/${pname}-${version}.tar.gz";
sha256 = "18nyg19mwxyqdnykplkqmzb4n27vvrhvp639zai8f81gg9vdbsjp";
};
diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix
index 4d17cc8bddd1..89eef9cae4c4 100644
--- a/pkgs/applications/networking/feedreaders/rss2email/default.nix
+++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix
@@ -3,17 +3,14 @@
with pythonPackages;
buildPythonApplication rec {
- name = "${pname}-${version}";
pname = "rss2email";
- version = "3.9"; # TODO: on next bump, the manpage will be updated.
- # Update nixos/modules/services/mail/rss2email.nix to point to it instead of
- # to the online r2e.1
+ version = "3.10";
propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ];
src = fetchurl {
- url = "mirror://pypi/r/rss2email/${name}.tar.gz";
- sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5";
+ url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz";
+ sha256 = "1yjgbgpq9jjmpywwk6n4lzb2k7mqgdgfgm4jckv4zy0fn595pih1";
};
outputs = [ "out" "man" "doc" ];
@@ -31,14 +28,12 @@ buildPythonApplication rec {
# copy documentation
mkdir -p $doc/share/doc/rss2email
- cp AUTHORS COPYING CHANGELOG README $doc/share/doc/rss2email/
+ cp AUTHORS COPYING CHANGELOG README.rst $doc/share/doc/rss2email/
'';
- # The tests currently fail, see
- # https://github.com/rss2email/rss2email/issues/14
- # postCheck = ''
- # env PYTHONPATH=.:$PYTHONPATH python ./test/test.py
- # '';
+ postCheck = ''
+ env PATH=$out/bin:$PATH python ./test/test.py
+ '';
meta = with lib; {
description = "A tool that converts RSS/Atom newsfeeds to email.";
diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index c1a9fddb3c21..169b88f27185 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "rssguard";
version = "3.5.9";
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index 459aee01f43f..3e7909c91c05 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cppcheck, libmrss }:
-stdenv.mkDerivation rec {
- name = "rsstail-${version}";
+stdenv.mkDerivation {
+ pname = "rsstail";
version = "2.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix
index 335f393bc077..ab2ca1601520 100644
--- a/pkgs/applications/networking/firehol/default.nix
+++ b/pkgs/applications/networking/firehol/default.nix
@@ -7,7 +7,7 @@
}:
stdenv.mkDerivation rec {
- name = "firehol-${version}";
+ pname = "firehol";
version = "3.1.6";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/applications/networking/firehol/iprange.nix
index bb245928f07c..194dfc25ebaa 100644
--- a/pkgs/applications/networking/firehol/iprange.nix
+++ b/pkgs/applications/networking/firehol/iprange.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "iprange-${version}";
+ pname = "iprange";
version = "1.0.4";
src = fetchurl {
diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix
index bc0a519a0eee..bbd9a7601acd 100644
--- a/pkgs/applications/networking/flent/default.nix
+++ b/pkgs/applications/networking/flent/default.nix
@@ -1,30 +1,39 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, procps, pyqt5
-, sphinx
-}:
+{ stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python
+, pythonPackages, qt5, sphinx, xvfb_run }:
buildPythonApplication rec {
pname = "flent";
- version = "1.2.2";
- src = fetchFromGitHub {
- owner = "tohojo";
- repo = "flent";
- rev = "v${version}";
- sha256 = "1llcdakk0nk9xlpjjz7mv4a80yq4sjnbqhaqvyj9m6lbcxgssh2r";
+ version = "1.3.0";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "099779i0ghjd9ikq77z6m6scnlmk946lw9issrgz8zm7babiw4d7";
};
buildInputs = [ sphinx ];
+ nativeBuildInputs = [ qt5.wrapQtAppsHook ];
+ propagatedBuildInputs = [ matplotlib procps pyqt5 ];
+ checkInputs = [ procps pythonPackages.mock pyqt5 xvfb_run ];
- checkInputs = [ procps ];
+ checkPhase = ''
+ cat >test-runner < libsignal-protocol-c != null && libgcrypt != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "profanity-${version}";
+ pname = "profanity";
version = "0.7.0";
src = fetchFromGitHub {
owner = "profanity-im";
repo = "profanity";
- rev = "${version}";
+ rev = version;
sha256 = "15adg7ndjkzy04lizjmnvv0pf0snhzp6a8x74mndcm0zma0dia0z";
};
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index e1a2fb40c5ae..16fb1bbab1ed 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -4,13 +4,13 @@
}:
stdenv.mkDerivation rec {
- name = "psi-plus-${version}";
+ pname = "psi-plus";
version = "1.4.504";
src = fetchFromGitHub {
owner = "psi-plus";
repo = "psi-plus-snapshots";
- rev = "${version}";
+ rev = version;
sha256 = "1nv1ynad2gcn7r8mm2w3kixmahaql7xax1lccsqyxqmj1r0klk8q";
};
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 4ab3c64d16d8..a78e5d1c2d12 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -10,8 +10,9 @@ let
version = "1.16.3";
rev = "v${version}";
-in mkDerivation rec {
- name = "qtox-${version}";
+in mkDerivation {
+ pname = "qtox";
+ inherit version;
src = fetchFromGitHub {
owner = "qTox";
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 655628308971..569c7b68edc6 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -3,7 +3,7 @@
, libqmatrixclient_0_5 }:
let
- generic = version: sha256: prefix: library: mkDerivation rec {
+ generic = version: sha256: prefix: library: mkDerivation {
pname = "quaternion";
inherit version;
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index 60a4dd39fb0e..a23dbda6cb2a 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -2,7 +2,7 @@
, auth0ClientID, auth0Domain }:
stdenv.mkDerivation rec {
- name = "rambox-bare-${version}";
+ pname = "rambox-bare";
version = "0.6.9";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
index efecebe169e9..30b12963b337 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
@@ -14,10 +14,10 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit version;
- name = "sencha-bare-${version}";
+ pname = "sencha-bare";
src = srcs.${stdenv.hostPlatform.system};
nativeBuildInputs = [ gzip which unzip ];
diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix
index add337d3f085..3768ecd137fb 100644
--- a/pkgs/applications/networking/instant-messengers/ratox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
let
configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "ratox-0.4.20180303";
src = fetchgit {
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index a6aef5e6a2fb..96ce9c32a7d6 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "ricochet-${version}";
+ pname = "ricochet";
version = "1.1.4";
src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
index 168719bf0e4c..97c00924d6cf 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
@@ -78,8 +78,8 @@ let
CFLAGS = "-g -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000";
});
in
-stdenv.mkDerivation rec {
- name = "ring-daemon-${version}";
+stdenv.mkDerivation {
+ pname = "ring-daemon";
version = "2017-07-11";
inherit src;
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
index 0546d2dae472..d4298a3d32f3 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
@@ -6,8 +6,8 @@
, patches
}:
-stdenv.mkDerivation rec {
- name = "restbed-${version}";
+stdenv.mkDerivation {
+ pname = "restbed";
version = "2016-09-15";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 383952f2a893..2755d181da2b 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -4,7 +4,7 @@
# Versions of `riot-web` and `riot-desktop` should be kept in sync.
stdenv.mkDerivation rec {
- name= "riot-web-${version}";
+ pname = "riot-web";
version = "1.3.3";
src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index 3336c05aae74..010ea1bff7c3 100644
--- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, makeWrapper, jre_headless }:
stdenv.mkDerivation rec {
- name = "signal-cli-${version}";
+ pname = "signal-cli";
version = "0.6.2";
# Building from source would be preferred, but is much more involved.
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 0b4c3aade87d..f217084585a2 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -2,7 +2,7 @@
, gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig
, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
-, cups, expat, udev, libnotify, libuuid
+, cups, expat, udev, libnotify, libuuid, at-spi2-core
# Unfortunately this also overwrites the UI language (not just the spell
# checking language!):
, hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE"
@@ -25,6 +25,7 @@ let
alsaLib
atk
at-spi2-atk
+ at-spi2-core
cairo
cups
dbus
@@ -56,12 +57,18 @@ let
];
in stdenv.mkDerivation rec {
- name = "signal-desktop-${version}";
- version = "1.26.2";
+ pname = "signal-desktop";
+ version = "1.27.2"; # Please backport all updates to the stable channel.
+ # All releases have a limited lifetime and "expire" 90 days after the release.
+ # When releases "expire" the application becomes unusable until an update is
+ # applied. The expiration date for the current release can be extracted with:
+ # $ grep -a "^{\"buildExpiration" "${signal-desktop}/libexec/resources/app.asar"
+ # (Alternatively we could try to patch the asar archive, but that requires a
+ # few additional steps and might not be the best idea.)
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "08qx7k82x6ybqi3lln6ixzmdz4sr8yz8vfx0y408b85wjfc7ncjk";
+ sha256 = "08qh7867bc6z6mdbdilqdacx67n0kaxl3m4m97k0jxhd093a8xfz";
};
phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix
index cf6031aa05b5..cdc176be65b0 100644
--- a/pkgs/applications/networking/instant-messengers/sky/default.nix
+++ b/pkgs/applications/networking/instant-messengers/sky/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
version_major = "2.1.7369";
version_minor = "1";
version = version_major + "." + version_minor;
- name = "sky-${version}";
+ pname = "sky";
unpackCmd = "ar x $curSrc; tar -xf data.tar.xz";
src = fetchurl {
url = "https://tel.red/repos/ubuntu/pool/non-free/sky_${version_major + "-" + version_minor}ubuntu+xenial_amd64.deb";
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 96eef843d5b9..cbab67e5e1a5 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -66,7 +66,8 @@ let
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
in stdenv.mkDerivation {
- name = "skypeforlinux-${version}";
+ pname = "skypeforlinux";
+ inherit version;
system = "x86_64-linux";
diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
index 79464f54232c..6271e338a964 100644
--- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
# https://github.com/erroneousboat/slack-term
- name = "slack-term-${version}";
+ pname = "slack-term";
version = "0.4.1";
goPackagePath = "github.com/erroneousboat/slack-term";
diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
index c24e2c4301e0..903d8e60d6d5 100644
--- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- rev = "e2a6a9cd9da70175881ab991220c86aa87179509";
- version = "2019-07-26";
- name = "slack-theme-black-${version}";
+ rev = "f760176c6e133667ce73aeecba8b0c0eb8822941";
+ version = "2019-09-11";
+ pname = "slack-theme-black";
src = fetchgit { inherit rev;
url = "https://github.com/laCour/slack-night-mode";
- sha256 = "1jwxy63qzgvr83idsgcg7yhm9kn0ybfji1m964c5c6ypzcm7j10v";
+ sha256 = "1kx8nx7mhrabs5wxqgvy86s5smy5hw49gv6yc95yxwx6ymwpgbzj";
};
dontUnpack = true;
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 27b8aaf887a3..d3aa302d601a 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -57,7 +57,8 @@ let
throw "Slack is not supported on ${stdenv.hostPlatform.system}";
in stdenv.mkDerivation {
- name = "slack-${version}";
+ pname = "slack";
+ inherit version;
inherit src;
diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix
index 72069ec81c1a..29b314417c76 100644
--- a/pkgs/applications/networking/instant-messengers/spectral/default.nix
+++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix
@@ -18,7 +18,7 @@ let
qtbase.bin qtdeclarative.bin qtquickcontrols2.bin qtgraphicaleffects qtmultimedia
];
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "spectral";
version = "2019-03-03";
diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix
index 17a38479f82e..7a9ab4d127c4 100644
--- a/pkgs/applications/networking/instant-messengers/stride/default.nix
+++ b/pkgs/applications/networking/instant-messengers/stride/default.nix
@@ -34,7 +34,7 @@ let
in
stdenv.mkDerivation rec {
version = "1.17.82";
- name = "stride-${version}";
+ pname = "stride";
src = fetchurl {
url = "https://packages.atlassian.com/stride-apt-client/pool/stride_${version}_amd64.deb";
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
index 51e7f081d1e0..db1d0a54dce0 100644
--- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix
+++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "swift-im-${version}";
+ pname = "swift-im";
version = "4.0.2";
src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 21b9510a6057..3c532fa506a5 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -29,7 +29,7 @@ let
in
stdenv.mkDerivation rec {
- name = "teamspeak-client-${version}";
+ pname = "teamspeak-client";
version = "3.3.0";
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 3d88e50221d6..26b858aa3b86 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -8,7 +8,7 @@ with lib;
mkDerivation rec {
pname = "telegram-desktop";
- version = "1.8.2";
+ version = "1.8.8";
# Note: Due to our strong dependency on the Arch patches it's probably best
# to also wait for the Arch update (especially if the patches don't apply).
@@ -17,7 +17,7 @@ mkDerivation rec {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
- sha256 = "0dls6s8721zjm8351fcgfbsifr9d7wsxbf5dra5cbk8r555ibf3j";
+ sha256 = "1aj1pnzc6bz8jbdrfwdj2r54jhw9z7b5fd1095r007zmlnzs51lv";
fetchSubmodules = true;
};
@@ -25,8 +25,8 @@ mkDerivation rec {
archPatches = fetchsvn {
url = "svn://svn.archlinux.org/community/telegram-desktop/trunk";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
- rev = "498563";
- sha256 = "0g2y6impygqhfiqnyxc1ivxwl8j82q9qcnkqcjn6mwj3cisyxwnl";
+ rev = "509240";
+ sha256 = "1sf4mspbsqsnjzp9ys9l0asrx1bhj273d163i2bv1zhl4mmgpl3k";
};
privateHeadersPatch = fetchpatch {
url = "https://github.com/telegramdesktop/tdesktop/commit/b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.patch";
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
index 4607961cdf08..3368ec1124eb 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
@@ -3,10 +3,9 @@
stdenv.mkDerivation rec {
pname = "telepathy-idle";
version = "0.2.0";
- name = "${pname}-${version}";
src = fetchurl {
- url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
+ url = "http://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz";
sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh";
};
diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix
index c6b930fc590f..11845ecfb26c 100644
--- a/pkgs/applications/networking/instant-messengers/tensor/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix
@@ -4,7 +4,7 @@
# should use that
stdenv.mkDerivation rec {
- name = "tensor-git-${version}";
+ pname = "tensor-git";
version = "2017-02-21";
src = fetchgit {
diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix
index 06bcd7a0400e..edfec97edf8a 100644
--- a/pkgs/applications/networking/instant-messengers/torchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, python, unzip, wxPython, wrapPython, tor }:
stdenv.mkDerivation rec {
- name = "torchat-${version}";
+ pname = "torchat";
version = "0.9.9.553";
src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index 95879fef05ad..540aa3fcea4d 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -3,7 +3,7 @@
, qrencode, gdk-pixbuf, libnotify }:
stdenv.mkDerivation rec {
- name = "toxic-${version}";
+ pname = "toxic";
version = "0.8.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 349a1363259c..5ef0d9162429 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -3,7 +3,7 @@
, libXrender, fontconfig, libXext, libXft, libsodium, libopus }:
stdenv.mkDerivation rec {
- name = "utox-${version}";
+ pname = "utox";
version = "0.17.0";
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index 109566b5d079..923ce3737532 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -3,8 +3,8 @@
, xorgproto, libX11, libXScrnSaver
, xz, zlib
}:
-stdenv.mkDerivation rec {
- name = "vacuum-im-${version}";
+stdenv.mkDerivation {
+ pname = "vacuum-im";
version = "1.3.0.20160104";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix
index a4bf26a0b1af..1b3e1c8ad81a 100644
--- a/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -3,8 +3,8 @@
libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
}:
-stdenv.mkDerivation rec {
- name = "viber-${version}";
+stdenv.mkDerivation {
+ pname = "viber";
version = "7.0.0.1035";
src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
index b992263e215b..03bf3b3bbdd2 100644
--- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
@@ -4,7 +4,8 @@
let
version = "4.0.1";
in stdenv.mkDerivation {
- name = "vk-messenger-${version}";
+ pname = "vk-messenger";
+ inherit version;
src = {
i686-linux = fetchurl {
url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm";
diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
index 9f704e52721d..9dbff13aca6c 100644
--- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
@@ -21,8 +21,9 @@ let
tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz";
-in stdenv.mkDerivation rec {
- name = "wavebox-${version}";
+in stdenv.mkDerivation {
+ pname = "wavebox";
+ inherit version;
src = fetchurl {
url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}";
sha256 = "1yg2lib4h5illz0ss4hvr78s4v1cjbxlczjzaw6bqigyk95smm23";
diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 36bd10781dc5..869dcb9d29bd 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -18,13 +18,13 @@ let
pname = "wire-desktop";
version = {
- "x86_64-linux" = "3.10.2904";
- "x86_64-darwin" = "3.10.3133";
+ x86_64-linux = "3.10.2904";
+ x86_64-darwin = "3.10.3133";
}.${system} or throwSystem;
sha256 = {
- "x86_64-linux" = "1vrz4568mlhylx17jw4z452f0vrd8yd8qkbpkcvnsbhs6k066xcn";
- "x86_64-darwin" = "0d8g9fl3yciqp3aic374rzcywb5d5yipgni992khsfdfqhcvm3x9";
+ x86_64-linux = "1vrz4568mlhylx17jw4z452f0vrd8yd8qkbpkcvnsbhs6k066xcn";
+ x86_64-darwin = "0d8g9fl3yciqp3aic374rzcywb5d5yipgni992khsfdfqhcvm3x9";
}.${system} or throwSystem;
meta = with stdenv.lib; {
@@ -102,7 +102,7 @@ let
'';
};
- darwin = stdenv.mkDerivation rec {
+ darwin = stdenv.mkDerivation {
inherit pname version meta;
src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
index 980d21572cc0..4047eba1fbb5 100644
--- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
+++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "xmpp-client-${version}";
+ pname = "xmpp-client";
version = "20160916-${stdenv.lib.strings.substring 0 7 rev}";
rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e";
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index f62317666594..933badccf631 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
let
inherit (stdenv.lib) concatStringsSep makeBinPath optional;
- version = "3.0.287250.0828";
+ version = "3.0.291715.0908";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
- sha256 = "0k4h43wydbcyx7b7gwxkmvbph8qc6kjpcypd7vwz8rph1l7kl1y1";
+ sha256 = "1f2fcwf0p86bxcnfdhij6hvgizd7n7gjcccwzdm2jv0dbqskad2f";
};
};
@@ -31,7 +31,8 @@ let
};
in mkDerivation {
- name = "zoom-us-${version}";
+ pname = "zoom-us";
+ inherit version;
src = srcs.${stdenv.hostPlatform.system};
diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix
index 3719a69138c6..3a2b32f01175 100644
--- a/pkgs/applications/networking/insync/default.nix
+++ b/pkgs/applications/networking/insync/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper }:
stdenv.mkDerivation rec {
- name = "insync-${version}";
+ pname = "insync";
version = "1.5.7.37371";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1cm3q6y2crw6pcsvh21sbkmh1hin7xl4fyslc96nbyql8rxsky5n";
}
else
- throw "${name} is not supported on ${stdenv.hostPlatform.system}";
+ throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix
index 870e40d81282..426619908d65 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx, gx-go }:
buildGoPackage rec {
- name = "ipfs-cluster-${version}";
+ pname = "ipfs-cluster";
version = "0.9.0";
rev = "v${version}";
@@ -9,7 +9,7 @@ buildGoPackage rec {
extraSrcPaths = [
(fetchgx {
- inherit name src;
+ inherit src;name = "${pname}-${version}";
sha256 = "1k7xcirvi07p5g9gr9jcx5h39wk7jxfsyjrn5yraa8xdqhn6b6nx";
})
];
diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix
index f070c5109376..dc646f9471e1 100644
--- a/pkgs/applications/networking/ipfs-migrator/default.nix
+++ b/pkgs/applications/networking/ipfs-migrator/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
- name = "ipfs-migrator-${version}";
+buildGoPackage {
+ pname = "ipfs-migrator";
version = "7";
goPackagePath = "github.com/ipfs/fs-repo-migrations";
diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index 54943533b85f..db325cf13877 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -2,19 +2,17 @@
buildGoModule rec {
pname = "ipfs";
- version = "0.4.21";
+ version = "0.4.22";
rev = "v${version}";
- goPackagePath = "github.com/ipfs/go-ipfs";
-
src = fetchFromGitHub {
owner = "ipfs";
repo = "go-ipfs";
inherit rev;
- sha256 = "0jlj89vjy4nw3x3j45r16y8bph5ss5lp907pjgqvad0naxbf99b0";
+ sha256 = "1drwkam2m1qdny51l7ja9vd33jffy8w0z0wbp28ajx4glp0kyra2";
};
- modSha256 = "0d9rq0hig9jwv9jfajfyj2111arikqzdnyhf5aqkwahcblpx54iy";
+ modSha256 = "0jbzkifn88myk2vpd390clyl835978vpcfz912y8cnl26s6q677n";
meta = with stdenv.lib; {
description = "A global, versioned, peer-to-peer filesystem";
diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix
index 45835248d0d8..9f206a8f48f3 100644
--- a/pkgs/applications/networking/ipget/default.nix
+++ b/pkgs/applications/networking/ipget/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }:
buildGoPackage rec {
- name = "ipget-${version}";
+ pname = "ipget";
version = "0.3.2";
rev = "v${version}";
@@ -9,7 +9,7 @@ buildGoPackage rec {
extraSrcPaths = [
(fetchgx {
- inherit name src;
+ inherit src;name = "${pname}-${version}";
sha256 = "07l9hpkhk5phr95zp1l5wd3ii38bw91hy4dlw2rsfbzcsc8bq4s8";
})
];
diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/pkgs/applications/networking/iptraf-ng/default.nix
index 746d79805f5c..cdece4eb644f 100644
--- a/pkgs/applications/networking/iptraf-ng/default.nix
+++ b/pkgs/applications/networking/iptraf-ng/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.1.4";
- name = "iptraf-ng-${version}";
+ pname = "iptraf-ng";
src = fetchurl {
- url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${name}.tar.gz";
+ url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${pname}-${version}.tar.gz";
sha256 = "02gb8z9h2s6s1ybyikywz7jgb1mafdx88hijfasv3khcgkq0q53r";
};
diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix
index d1a0b2d4b029..d2d9a67fb4d9 100644
--- a/pkgs/applications/networking/iptraf/default.nix
+++ b/pkgs/applications/networking/iptraf/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, ncurses}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "iptraf-3.0.1";
src = fetchurl {
diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix
index 7c40a4e12a66..249fdc958c80 100644
--- a/pkgs/applications/networking/irc/bip/default.nix
+++ b/pkgs/applications/networking/irc/bip/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch, bison, flex, autoconf, automake, openssl }:
stdenv.mkDerivation rec {
- name = "bip-${version}";
+ pname = "bip";
version = "0.8.9";
# fetch sources from debian, because the creator's website provides
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
})
];
- NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" ];
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" "-Wno-error=format-truncation" ];
meta = {
description = "An IRC proxy (bouncer)";
diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index 917de745d277..8278f90d321c 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -1,7 +1,7 @@
{ fetchgit, libcommuni, qtbase, qmake, stdenv }:
stdenv.mkDerivation rec {
- name = "communi-${version}";
+ pname = "communi";
version = "3.5.0";
src = fetchgit {
diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix
index 0b52515228b9..a90446a87fa9 100644
--- a/pkgs/applications/networking/irc/epic5/default.nix
+++ b/pkgs/applications/networking/irc/epic5/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch }:
stdenv.mkDerivation rec {
- name = "epic5-${version}";
+ pname = "epic5";
version = "2.0.1";
src = fetchurl {
- url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${name}.tar.xz";
+ url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${pname}-${version}.tar.xz";
sha256 = "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm";
};
diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/applications/networking/irc/glowing-bear/default.nix
index 8c5d2ffa35ea..8bdb23d50dd3 100644
--- a/pkgs/applications/networking/irc/glowing-bear/default.nix
+++ b/pkgs/applications/networking/irc/glowing-bear/default.nix
@@ -1,7 +1,7 @@
{ fetchFromGitHub, stdenv }:
stdenv.mkDerivation rec {
- name = "glowing-bear-${version}";
+ pname = "glowing-bear";
version = "0.7.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index 815b74f85c97..331be19abc4c 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -6,8 +6,8 @@
}:
stdenv.mkDerivation rec {
- version = "2.14.2";
pname = "hexchat";
+ version = "2.14.2";
src = fetchFromGitHub {
owner = "hexchat";
diff --git a/pkgs/applications/networking/irc/irccloud/default.nix b/pkgs/applications/networking/irc/irccloud/default.nix
index 5648d027d9e2..93ab9f828f64 100644
--- a/pkgs/applications/networking/irc/irccloud/default.nix
+++ b/pkgs/applications/networking/irc/irccloud/default.nix
@@ -14,7 +14,7 @@ let
inherit name src;
};
-in appimageTools.wrapType2 rec {
+in appimageTools.wrapType2 {
inherit name src;
extraPkgs = pkgs: with pkgs; [ at-spi2-core ];
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 0994fa049dd7..1751812d67e8 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }:
stdenv.mkDerivation rec {
+ pname = "irssi";
version = "1.2.2";
- name = "irssi-${version}";
src = fetchurl {
- url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
+ url = "https://github.com/irssi/irssi/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "0g2nxazn4lszmd6mf1s36x5ablk4999g1qx7byrnvgnjsihjh62k";
};
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 27297b01dce1..6a58241b89aa 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -1,6 +1,7 @@
{ mkDerivation
, lib
, fetchurl
+, fetchpatch
, extra-cmake-modules
, kdoctools
, kbookmarks
@@ -38,6 +39,14 @@ in mkDerivation rec {
sha256 = "0h098yhlp36ls6pdvs2r93ig8dv4fys62m0h6wxccprb0qrpbgv0";
};
+ patches = [
+ # Delete this patch for konversation > 1.7.5
+ (fetchpatch {
+ url = "https://cgit.kde.org/konversation.git/patch/?id=4d0036617becc26a76fd021138c98aceec4c7b53";
+ sha256 = "17hdj6zyln3n93b71by26mrwbgyh4k052ck5iw1drysx5dyd5l6y";
+ })
+ ];
+
buildInputs = [
kbookmarks
karchive
diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix
index cf72bef62b17..b081a6b3672d 100644
--- a/pkgs/applications/networking/irc/sic/default.nix
+++ b/pkgs/applications/networking/irc/sic/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "sic-${version}";
+ pname = "sic";
version = "1.2";
makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 5ae96d03f7c6..ec806c86ebd2 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -6,33 +6,33 @@
, guileSupport ? true, guile
, luaSupport ? true, lua5
, perlSupport ? true, perl
-, pythonSupport ? true, pythonPackages
+, pythonSupport ? true, python3Packages
, rubySupport ? true, ruby
, tclSupport ? true, tcl
, extraBuildInputs ? []
}:
let
- inherit (pythonPackages) python;
+ inherit (python3Packages) python;
plugins = [
{ name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; }
{ name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; }
{ name = "ruby"; enabled = rubySupport; cmakeFlag = "ENABLE_RUBY"; buildInputs = [ ruby ]; }
{ name = "guile"; enabled = guileSupport; cmakeFlag = "ENABLE_GUILE"; buildInputs = [ guile ]; }
{ name = "lua"; enabled = luaSupport; cmakeFlag = "ENABLE_LUA"; buildInputs = [ lua5 ]; }
- { name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON"; buildInputs = [ python ]; }
+ { name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON3"; buildInputs = [ python ]; }
];
enabledPlugins = builtins.filter (p: p.enabled) plugins;
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
- version = "2.5";
- name = "weechat-${version}";
+ version = "2.6";
+ pname = "weechat";
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
- sha256 = "14giv8j1phmpg3i9whx45nmskan501lwcq352ps9z52rkja2qxsc";
+ sha256 = "1narazk28m7lmn1vqi7bhyvnr8apjrmaa4w1hbadn64hwr8ya1hb";
};
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix
index cd9ecbf43370..81ee484f3b30 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix
@@ -1,17 +1,13 @@
-{ callPackage, luaPackages, pythonPackages }:
+{ callPackage, luaPackages }:
{
- weechat-xmpp = callPackage ./weechat-xmpp {
- inherit (pythonPackages) pydns;
- };
-
weechat-matrix-bridge = callPackage ./weechat-matrix-bridge {
inherit (luaPackages) cjson luaffi;
};
- wee-slack = callPackage ./wee-slack {
- inherit pythonPackages;
- };
+ wee-slack = callPackage ./wee-slack { };
weechat-autosort = callPackage ./weechat-autosort { };
+
+ weechat-otr = callPackage ./weechat-otr { };
}
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
index de7974d4cbe3..6811cb164e0e 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, substituteAll, buildEnv, fetchFromGitHub, pythonPackages }:
+{ stdenv, substituteAll, buildEnv, fetchFromGitHub, python3Packages }:
stdenv.mkDerivation rec {
- name = "wee-slack-${version}";
+ pname = "wee-slack";
version = "2.3.0";
src = fetchFromGitHub {
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
src = ./libpath.patch;
env = "${buildEnv {
name = "wee-slack-env";
- paths = with pythonPackages; [ websocket_client six ];
- }}/${pythonPackages.python.sitePackages}";
+ paths = with python3Packages; [ websocket_client six ];
+ }}/${python3Packages.python.sitePackages}";
})
];
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
new file mode 100644
index 000000000000..9682aa3169ac
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, substituteAll, buildEnv, fetchgit, fetchFromGitHub, python3Packages, gmp }:
+
+let
+ # pure-python-otr (potr) requires an older version of pycrypto, which is
+ # not compatible with pycryptodome. Therefore, the latest patched version
+ # of pycrypto will be fetched from the Debian project.
+ # https://security-tracker.debian.org/tracker/source-package/python-crypto
+
+ pycrypto = python3Packages.buildPythonPackage rec {
+ pname = "pycrypto";
+ version = "2.6.1-10";
+
+ src = fetchgit {
+ url = "https://salsa.debian.org/sramacher/python-crypto.git";
+ rev = "debian/${version}";
+ sha256 = "10rgq8bmjfpiqqa1g1p1hh7pxlxs7x0nawvk6zip0pd6x2vsr661";
+ };
+
+ buildInputs = [ gmp ];
+
+ preConfigure = ''
+ sed -i 's,/usr/include,/no-such-dir,' configure
+ sed -i "s!,'/usr/include/'!!" setup.py
+ '';
+ };
+
+ potr = python3Packages.potr.overridePythonAttrs (oldAttrs: {
+ propagatedBuildInputs = [ pycrypto ];
+ });
+in stdenv.mkDerivation rec {
+ pname = "weechat-otr";
+ version = "1.9.2";
+
+ src = fetchFromGitHub {
+ repo = pname;
+ owner = "mmb";
+ rev = "v${version}";
+ sha256 = "1lngv98y6883vk8z2628cl4d5y8jxy39w8245gjdvshl8g18k5s2";
+ };
+
+ patches = [
+ (substituteAll {
+ src = ./libpath.patch;
+ env = "${buildEnv {
+ name = "weechat-otr-env";
+ paths = [ potr pycrypto ];
+ }}/${python3Packages.python.sitePackages}";
+ })
+ ];
+
+ passthru.scripts = [ "weechat_otr.py" ];
+
+ installPhase = ''
+ mkdir -p $out/share
+ cp weechat_otr.py $out/share/weechat_otr.py
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/mmb/weechat-otr";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ geistesk ];
+ description = "WeeChat script for Off-the-Record messaging";
+ };
+}
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/libpath.patch b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/libpath.patch
new file mode 100644
index 000000000000..a7b77ed9b602
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/libpath.patch
@@ -0,0 +1,13 @@
+diff --git a/weechat_otr.py b/weechat_otr.py
+index 0ccfb35..c42bebf 100644
+--- a/weechat_otr.py
++++ b/weechat_otr.py
+@@ -41,6 +41,8 @@ import shlex
+ import shutil
+ import sys
+
++sys.path.append('@env@')
++
+ import potr
+ import weechat
+
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
deleted file mode 100644
index dad5b9c5e02a..000000000000
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchFromGitHub, xmpppy, pydns, substituteAll, buildEnv }:
-
-stdenv.mkDerivation {
- name = "weechat-jabber-2017-08-30";
-
- src = fetchFromGitHub {
- repo = "weechat-xmpp";
- owner = "sleduc";
- sha256 = "0s02xs0ynld9cxxzj07al364sfglyc5ir1i82133mq0s8cpphnxv";
- rev = "8f6c21f5a160c9318c7a2d8fd5dcac7ab2e0d843";
- };
-
- installPhase = ''
- mkdir -p $out/share
- cp jabber.py $out/share/jabber.py
- '';
-
- patches = [
- (substituteAll {
- src = ./libpath.patch;
- env = "${buildEnv {
- name = "weechat-xmpp-env";
- paths = [ pydns xmpppy ];
- }}/lib/python2.7/site-packages";
- })
- ];
-
- passthru.scripts = [ "jabber.py" ];
-
- meta = with stdenv.lib; {
- description = "A fork of the jabber plugin for weechat";
- homepage = "https://github.com/sleduc/weechat-xmpp";
- maintainers = with maintainers; [ ma27 ];
- license = licenses.gpl3Plus;
- };
-}
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch
deleted file mode 100644
index 372c83944a27..000000000000
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/jabber.py b/jabber.py
-index 27006a3..e53c2c0 100644
---- a/jabber.py
-+++ b/jabber.py
-@@ -95,6 +95,11 @@ SCRIPT_COMMAND = SCRIPT_NAME
- import re
- import warnings
-
-+import sys
-+
-+sys.path.append('@env@')
-+
-+
- import_ok = True
-
- try:
diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix
index e6fa95488e10..5c06bb8517a2 100644
--- a/pkgs/applications/networking/irc/weechat/wrapper.nix
+++ b/pkgs/applications/networking/irc/weechat/wrapper.nix
@@ -1,5 +1,5 @@
{ lib, runCommand, writeScriptBin, buildEnv
-, pythonPackages, perlPackages, runtimeShell
+, python3Packages, perlPackages, runtimeShell
}:
weechat:
@@ -17,11 +17,11 @@ let
in rec {
python = (simplePlugin "python") // {
extraEnv = ''
- export PATH="${pythonPackages.python}/bin:$PATH"
+ export PATH="${python3Packages.python}/bin:$PATH"
'';
withPackages = pkgsFun: (python // {
extraEnv = ''
- export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
+ export PYTHONHOME="${python3Packages.python.withPackages pkgsFun}"
'';
});
};
diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix
index add52d85d8b4..6d9acdb68e52 100644
--- a/pkgs/applications/networking/irc/wraith/default.nix
+++ b/pkgs/applications/networking/irc/wraith/default.nix
@@ -4,7 +4,7 @@ with stdenv;
with stdenv.lib;
mkDerivation rec {
- name = "wraith-${version}";
+ pname = "wraith";
version = "1.4.7";
src = fetchurl {
url = "mirror://sourceforge/wraithbotpack/wraith-v${version}.tar.gz";
diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix
index 34f332b003cf..3f626a6ac483 100644
--- a/pkgs/applications/networking/jmeter/default.nix
+++ b/pkgs/applications/networking/jmeter/default.nix
@@ -1,10 +1,10 @@
{ fetchurl, stdenv, jre, makeWrapper, coreutils }:
stdenv.mkDerivation rec {
- name = "jmeter-${version}";
+ pname = "jmeter";
version = "5.1.1";
src = fetchurl {
- url = "https://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz";
+ url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz";
sha256 = "1bmlxnlcias781mwf3wzpd4935awswbq3w8ijck65bsaw07m2kc4";
};
diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix
index 8967a5d824aa..e2a8a2d56bd1 100644
--- a/pkgs/applications/networking/jnetmap/default.nix
+++ b/pkgs/applications/networking/jnetmap/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
- name = "jnetmap-${version}";
+ pname = "jnetmap";
version = "0.5.4";
src = fetchurl {
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index 14ee8095247e..daddf6adf7e4 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, wrapQtAppsHook }:
stdenv.mkDerivation rec {
- name = "linssid-${version}";
+ pname = "linssid";
version = "2.7";
src = fetchurl {
diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix
index 17a3b92e2f97..cfaa7dcd4af6 100644
--- a/pkgs/applications/networking/mailreaders/alpine/default.nix
+++ b/pkgs/applications/networking/mailreaders/alpine/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "alpine-${version}";
+ pname = "alpine";
version = "2.21";
src = fetchurl {
- url = "http://alpine.freeiz.com/alpine/release/src/${name}.tar.xz";
+ url = "http://alpine.x10host.com/alpine/release/src/${pname}-${version}.tar.xz";
sha256 = "0f3llxrmaxw7w9w6aixh752md3cdc91mwfmbarkm8s413f4bcc30";
};
@@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
"--with-passfile=.pine-passfile"
];
- meta = {
+ meta = with stdenv.lib; {
description = "Console mail reader";
- license = stdenv.lib.licenses.asl20;
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
- homepage = https://www.washington.edu/alpine/;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ raskin ];
+ platforms = platforms.linux;
+ homepage = "http://alpine.x10host.com/";
};
}
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 23bed01907e1..7d62aa43888e 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://astroidmail.github.io/;
- description = "GTK+ frontend to the notmuch mail system";
+ description = "GTK frontend to the notmuch mail system";
maintainers = with maintainers; [ bdimcheff SuprDewd ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index db3cd7782e8f..15f707e06a2d 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "balsa-${version}";
+ pname = "balsa";
version = "2.5.7";
src = fetchurl {
- url = "https://pawsa.fedorapeople.org/balsa/${name}.tar.bz2";
+ url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.bz2";
sha256 = "0yfqhfpwm1qnwmbpr6dfn2f5w8a8xxq51pn8ypgg0fw973l1c1nx";
};
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index bb4c6c54f161..d7df94f7e673 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -30,7 +30,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "claws-mail-${version}";
+ pname = "claws-mail";
version = "3.17.4";
src = fetchurl {
diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index e5a919af2e6f..78b1aad03fbf 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, openssl, lua, pcre }:
stdenv.mkDerivation rec {
- name = "imapfilter-${version}";
+ pname = "imapfilter";
version = "2.6.12";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index 4139b650fb78..189ac1e6aaed 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -3,7 +3,7 @@
, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
stdenv.mkDerivation rec {
- name = "inboxer-${version}";
+ pname = "inboxer";
version = "1.2.1";
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix
index bc0918737dd5..0a670b2b9a6a 100644
--- a/pkgs/applications/networking/mailreaders/lumail/default.nix
+++ b/pkgs/applications/networking/mailreaders/lumail/default.nix
@@ -25,7 +25,8 @@ let
luaCPath = getPath "so";
in
stdenv.mkDerivation {
- name = "lumail-${version}";
+ pname = "lumail";
+ inherit version;
src = fetchurl {
url = "https://lumail.org/download/lumail-${version}.tar.gz";
diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/applications/networking/mailreaders/mailcheck/default.nix
index 05e784856554..ffa3e92d390c 100644
--- a/pkgs/applications/networking/mailreaders/mailcheck/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailcheck/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "mailcheck-${version}";
+ pname = "mailcheck";
version = "1.91.2";
patches = [ ./mailcheck-Makefile.patch ];
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index d81513406624..4cbaee4488b1 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -9,7 +9,7 @@
let
inherit (pythonPackages) python;
in pythonPackages.buildPythonApplication rec {
- name = "mailnag-${version}";
+ pname = "mailnag";
version = "1.3.0";
src = fetchurl {
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 0f11d9a6df05..89231939bfbc 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }:
python2Packages.buildPythonApplication rec {
- name = "mailpile-${version}";
+ pname = "mailpile";
version = "1.0.0rc2";
src = fetchFromGitHub {
owner = "mailpile";
repo = "Mailpile";
- rev = "${version}";
+ rev = version;
sha256 = "1z5psh00fjr8gnl4yjcl4m9ywfj24y1ffa2rfb5q8hq4ksjblbdj";
};
diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix
index f00ec6e6566f..6c3b3a69b1d6 100644
--- a/pkgs/applications/networking/mailreaders/mblaze/default.nix
+++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, libiconv }:
stdenv.mkDerivation rec {
- name = "mblaze-${version}";
+ pname = "mblaze";
version = "0.5.1";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
index 88e573f6cf42..fc8c167e9849 100644
--- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix
+++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
@@ -5,7 +5,7 @@ let
name = "msgviewer-${version}";
uname = "MSGViewer-${version}";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit name;
src = fetchurl {
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index f259fdebf228..c694398bd7d2 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -26,11 +26,11 @@ assert gpgmeSupport -> gpgme != null && openssl != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "mutt-${version}";
+ pname = "mutt";
version = "1.12.1";
src = fetchurl {
- url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
+ url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
sha256 = "0311sip2q90aqaxn7h3cck1zl98b4vifqi8bp5fsizy4dr06bi81";
};
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index f4b0846b98f0..615b810d0029 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
version = "20180716";
- name = "neomutt-${version}";
+ pname = "neomutt";
src = fetchFromGitHub {
owner = "neomutt";
diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix
index 3e235400498f..fcf1464ba239 100644
--- a/pkgs/applications/networking/mailreaders/notbit/default.nix
+++ b/pkgs/applications/networking/mailreaders/notbit/default.nix
@@ -4,8 +4,8 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
- name = "notbit-${version}";
+stdenv.mkDerivation {
+ pname = "notbit";
version = "2018-01-09";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
index 126e2854574e..86aef5011342 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
@@ -3,8 +3,9 @@
let
version = "9";
in
-stdenv.mkDerivation rec {
- name = "notmuch-addrlookup-${version}";
+stdenv.mkDerivation {
+ pname = "notmuch-addrlookup";
+ inherit version;
src = fetchFromGitHub {
owner = "aperezdc";
diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
index 90c8590d52d1..d9eae3c9c503 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }:
stdenv.mkDerivation rec {
- name = "notmuch-bower-${version}";
+ pname = "notmuch-bower";
version = "0.11";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 9ddedac09747..01081ebfb3e2 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -12,17 +12,17 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "0.28.4"; # not really, git
- name = "notmuch-${version}";
+ version = "0.29.1";
+ pname = "notmuch";
passthru = {
- pythonSourceRoot = "${name}/bindings/python";
+ pythonSourceRoot = "${pname}-${version}/bindings/python";
inherit version;
};
src = fetchurl {
- url = "https://notmuchmail.org/releases/${name}.tar.gz";
- sha256 = "1jjnhs4xs4gksvg0a9qn68rxrj41im5bh58snka2pkj20nxwmcds";
+ url = "https://notmuchmail.org/releases/${pname}-${version}.tar.xz";
+ sha256 = "0rg3rwghd3wivf3bmqcqpkkd5c779ld5hi363zjcw5fl6a7gqilq";
};
nativeBuildInputs = [ pkgconfig ];
@@ -40,16 +40,12 @@ stdenv.mkDerivation rec {
patchShebangs configure
patchShebangs test/
- for src in \
- util/crypto.c \
- notmuch-config.c
- do
- substituteInPlace "$src" \
- --replace \"gpg\" \"${gnupg}/bin/gpg\"
- done
-
substituteInPlace lib/Makefile.local \
--replace '-install_name $(libdir)' "-install_name $out/lib"
+
+ substituteInPlace emacs/notmuch-emacs-mua \
+ --replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \
+ --replace 'EMACSCLIENT:-emacsclient' 'EMACSCLIENT:-${emacs}/bin/emacsclient'
'';
configureFlags = [ "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" ];
@@ -68,7 +64,7 @@ stdenv.mkDerivation rec {
in ''
ln -s ${test-database} test/test-databases/database-v1.tar.xz
'';
- doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0");
+ doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0.3");
checkTarget = "test";
checkInputs = [
which dtach openssl bash
@@ -83,7 +79,7 @@ stdenv.mkDerivation rec {
description = "Mail indexer";
homepage = https://notmuchmail.org/;
license = licenses.gpl3;
- maintainers = with maintainers; [ flokli the-kenny ];
+ maintainers = with maintainers; [ flokli puckipedia the-kenny ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
index e25dfe834f65..a0dbf98f2763 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
@@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
version = "5";
- name = "muchsync-${version}";
+ pname = "muchsync";
passthru = {
inherit version;
};
src = fetchurl {
- url = "http://www.muchsync.org/src/${name}.tar.gz";
+ url = "http://www.muchsync.org/src/${pname}-${version}.tar.gz";
sha256 = "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
index 410e5e10ceb6..7382b97ba811 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, perl, perlPackages, makeWrapper, coreutils, notmuch }:
stdenv.mkDerivation rec {
- name = "notmuch-mutt-${version}";
+ pname = "notmuch-mutt";
version = notmuch.version;
outputs = [ "out" ];
diff --git a/pkgs/applications/networking/mailreaders/sup/.bundix/cache b/pkgs/applications/networking/mailreaders/sup/.bundix/cache
deleted file mode 100644
index 5894e96022c8..000000000000
--- a/pkgs/applications/networking/mailreaders/sup/.bundix/cache
+++ /dev/null
@@ -1,4 +0,0 @@
----
-gem:
- https://rubygems.org/downloads/mini_portile-0.6.0.gem: 09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn
- https://rubygems.org/downloads/gpgme-2.0.7.gem: 1p84zhiri2ihcld7py9mwc2kg5xs5da8fk11zhndrhmw05yvf5mr
diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile b/pkgs/applications/networking/mailreaders/sup/Gemfile
deleted file mode 100644
index bc37456ae58e..000000000000
--- a/pkgs/applications/networking/mailreaders/sup/Gemfile
+++ /dev/null
@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-gem 'rake'
-gem 'sup'
-gem 'gpgme'
-
-# Sup tries to `xapian-ruby` in its extconf instead of listing it as a
-# dependency.
-gem 'xapian-ruby', "~> 1.2.22"
diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock b/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
deleted file mode 100644
index bd0f051c104d..000000000000
--- a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
+++ /dev/null
@@ -1,41 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- chronic (0.9.1)
- gpgme (2.0.18)
- mini_portile2 (~> 2.3)
- highline (2.0.2)
- locale (2.1.2)
- lockfile (2.1.3)
- mime-types (3.2.2)
- mime-types-data (~> 3.2015)
- mime-types-data (3.2019.0331)
- mini_portile2 (2.4.0)
- ncursesw (1.4.10)
- rake (12.3.2)
- rmail-sup (1.0.1)
- sup (0.22.1)
- chronic (~> 0.9.1)
- highline
- locale (~> 2.0)
- lockfile
- mime-types (> 2.0)
- ncursesw (~> 1.4.0)
- rmail-sup (~> 1.0.1)
- trollop (>= 1.12)
- unicode (~> 0.4.4)
- trollop (2.9.9)
- unicode (0.4.4.4)
- xapian-ruby (1.2.22)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- gpgme
- rake
- sup
- xapian-ruby (~> 1.2.22)
-
-BUNDLED WITH
- 1.17.2
diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
deleted file mode 100644
index ccd092ba63cc..000000000000
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, bundlerApp, bundlerUpdateScript }:
-
-bundlerApp {
- pname = "sup";
- gemdir = ./.;
- exes = [
- "sup"
- "sup-add"
- "sup-config"
- "sup-dump"
- "sup-import-dump"
- "sup-psych-ify-config-files"
- "sup-recover-sources"
- "sup-sync"
- "sup-sync-back-maildir"
- "sup-tweak-labels"
- ];
-
- passthru.updateScript = bundlerUpdateScript "sup";
-
- meta = with lib; {
- description = "A curses threads-with-tags style email client";
- homepage = http://sup-heliotrope.github.io;
- license = licenses.gpl2;
- maintainers = with maintainers; [ cstrahan lovek323 manveru nicknovitski ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/networking/mailreaders/sup/gemset.nix b/pkgs/applications/networking/mailreaders/sup/gemset.nix
deleted file mode 100644
index 023374932cb2..000000000000
--- a/pkgs/applications/networking/mailreaders/sup/gemset.nix
+++ /dev/null
@@ -1,155 +0,0 @@
-{
- chronic = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk";
- type = "gem";
- };
- version = "0.9.1";
- };
- gpgme = {
- dependencies = ["mini_portile2"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m";
- type = "gem";
- };
- version = "2.0.18";
- };
- highline = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1g0zpalfj8wvca86hcnirir5py2zyqrhkgdgv9f87fxkjaw815wr";
- type = "gem";
- };
- version = "2.0.2";
- };
- locale = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
- type = "gem";
- };
- version = "2.1.2";
- };
- lockfile = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr";
- type = "gem";
- };
- version = "2.1.3";
- };
- mime-types = {
- dependencies = ["mime-types-data"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
- type = "gem";
- };
- version = "3.2.2";
- };
- mime-types-data = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
- type = "gem";
- };
- version = "3.2019.0331";
- };
- mini_portile2 = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
- type = "gem";
- };
- version = "2.4.0";
- };
- ncursesw = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1nc14wls1yiigz593vw7580hb99lf4n485axapiz6sqpg1jnlhcr";
- type = "gem";
- };
- version = "1.4.10";
- };
- rake = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn";
- type = "gem";
- };
- version = "12.3.2";
- };
- rmail-sup = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g";
- type = "gem";
- };
- version = "1.0.1";
- };
- sup = {
- dependencies = ["chronic" "highline" "locale" "lockfile" "mime-types" "ncursesw" "rmail-sup" "trollop" "unicode"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "17s2sxismf46zdhgr6g2v53fw9f3sp1ijx7xdw3wx8qpcsgazcgi";
- type = "gem";
- };
- version = "0.22.1";
- };
- trollop = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "074h7lns72kg1dl5gvz5apl3xz1i0axbnbc01pf2kbw4q0lkpnp4";
- type = "gem";
- };
- version = "2.9.9";
- };
- unicode = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1v8kxmq9i85agjpl7pnl72688901xhs8wxhmj6lpy16a8xz3nzxk";
- type = "gem";
- };
- version = "0.4.4.4";
- };
- xapian-ruby = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1xbarnxmhy6r0rxpspn4wk85j183w6b18nah73djcs06b3gfas15";
- type = "gem";
- };
- version = "1.2.22";
- };
-}
\ No newline at end of file
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index 70f74dff3097..986ee5fe3c9e 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -7,11 +7,11 @@ assert sslSupport -> openssl != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "sylpheed-${version}";
+ pname = "sylpheed";
version = "3.7.0";
src = fetchurl {
- url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${name}.tar.xz";
+ url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${pname}-${version}.tar.xz";
sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd";
};
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 5e005cd6669d..680d7652b5a0 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -21,12 +21,15 @@
, libX11
, libXScrnSaver
, libXcomposite
+, libXcursor
, libXdamage
, libXext
, libXfixes
+, libXi
, libXinerama
, libXrender
, libXt
+, libxcb
, libcanberra-gtk2
, libgnome
, libgnomeui
@@ -101,12 +104,15 @@ stdenv.mkDerivation {
libX11
libXScrnSaver
libXcomposite
+ libXcursor
libXdamage
libXext
libXfixes
+ libXi
libXinerama
libXrender
libXt
+ libxcb
libcanberra-gtk2
libgnome
libgnomeui
@@ -153,10 +159,12 @@ stdenv.mkDerivation {
Categories=Application;Network;
EOF
+ # SNAP_NAME: https://github.com/NixOS/nixpkgs/pull/61980
wrapProgram "$out/bin/thunderbird" \
--argv0 "$out/bin/.thunderbird-wrapped" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \
- --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
+ --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \
+ --set SNAP_NAME "thunderbird"
'';
passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 8e1f2a0f65f8..d8f5e58d9fe5 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,585 +1,615 @@
{
- version = "60.8.0";
+ version = "68.0";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ar/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ar/thunderbird-68.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "a10386c0c55e52571c5b922a1531a891a98caa9a1b118ffa6e5e0655b838c207ba2638988d6fdeeb62135bbd19b071f9c2dfd2c52379e4f8ca2012c17aa5a065";
+ sha512 = "4fad3c7c4099f70253bfee450bcefe458bec61430720fcadde1fe8a1cbb2e62a18d9c55943f850c57f8d788c973774e24590823086cfacbbb2ccd8a99ce4faae";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ast/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ast/thunderbird-68.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "fecf4367234a794e22ccc6665622bf083bbaf8ecb1f8e03bf64c2bfa91028ff6a02497ae5ebdf474b4073fff121b23a55d8373ce16e282b9630bf6bd6223b555";
+ sha512 = "aac850773381d7fdb4d50fafe670449301f073f7388f92a1ca38d9b7256ffcd244b63e9fc0ff2f8ef5ccd853b97016b7e05eb751be1bdc8df9623481f15d55e6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/be/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/be/thunderbird-68.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "3ffc3ab21f3a070d8f465591db242b5cc0485cb2655373fc697298825f46a5f2f93301684ff69510ea2d74743a8e00e23e7f56e2a29638484bed40089714b7ad";
+ sha512 = "6521d818984bbfba195e847735c1228ff637d3079cff1f5a461ac20a079d325adfc1d7b2eca54f63e584a5cbd2007cef42a625597276a1810158931335f09cd9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/bg/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/bg/thunderbird-68.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "e789ca25f887bc9b228fd29796b38cb061ba931ebb0e2d2b15b290771b2312d4051d248dd467c64acc5cbdc1d5c1ae23e0d5b5dba4a35983ffa44062c7632bbe";
+ sha512 = "a0a738b6877225a5b98691d53a8f4a4bf575472a0d5feb8b77a67cd1fc9951772f1ab507b7ba460c0b62b87ab476c5c94130cbe7275692e3a99e5d2ef0bd89bd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/br/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/br/thunderbird-68.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "5088057f31b2ff77f89b25e9c1638b2080981a489a392d928f259cce38916b9b7da89132d931363fc652c1711250e1e77fc56b0427674f0648229688ba3285dd";
+ sha512 = "58d21d9e55abed644eb16ba98a5fb3277e0a31b935d279b09745262952895c2c2aed31817e6157410137ff82fc5d242b64268f646c3b7b691c55c5f3ea36e0e6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ca/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ca/thunderbird-68.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "3eb939b9a811254487eca4920ae84d33773d0963c77dfd84df7cf02a98b975d13d9088a70c2e8863f3290c6c7bfe6c7a240eda8e3bfdf3de28883c5d1e842e5f";
+ sha512 = "cd401259f2cc4ec71ff9d936a1f2f64a064afafed2e305bb359f79eddf1159cd6a7c84ce54cde6be94f6acd295dbedf54017d9f4592ee3637eea00496c7cfbf1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/cs/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/cak/thunderbird-68.0.tar.bz2";
+ locale = "cak";
+ arch = "linux-x86_64";
+ sha512 = "45ea4af30ff93500d1671c6a0eeda993692b7204a7504a91ad30bfd5155add5af902205240fd62f80abe339224e686473f2d13f466ba96269347207ed3f628b5";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/cs/thunderbird-68.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "867706fc4e459d0e7723e9ef0e86176822623ca85f446f1ab9935f7f7a95292da637d57ab6046a8ef4d8a40bd5fc37451a32cad71a2d45bf4e4cf7adccd44775";
+ sha512 = "9f81f92a3b1710d006cda79f1b92923c1ea637a24654bd622af9be1f53a0024c5daa77619443514c9e607cb62f96403f5b7f426b3692227c0b56d1b14f51ca97";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/cy/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/cy/thunderbird-68.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "56d6485c397984b3394831169efe8bc2d7078d958358a37f1c9775b17bef0a4a347429838f122291f10e3dbc289865aaa475d3d3f4e7deaa2d22205690110c05";
+ sha512 = "c90467a78bc82667d974b1e94227b7d4185878654188967d97c11e419ec7a03e4e5e3636466a0b6d35beaa98b717a26341e3a652c3b21083ad8ad0b23f063ed1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/da/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/da/thunderbird-68.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "6d35e77a03b0a44e8629baa80eb1889892a0dcd7a1a7ef5f016a6133fd8c5555474fa3bae79e3c5c25b0618832e680ea505cdf82de268bb4cecad7187830ff4a";
+ sha512 = "f49bd5689d2a4dd311b22a23da9f26559685f1c4663eb1e482b45b79544ab4401a17701f33b6ad083e7a8983185fcb16fca4c8026138f24be495c6cbb6401488";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/de/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/de/thunderbird-68.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "7b6f65c2146eccd91db9f2a050722c28ff3c9ed8a9e7a822fc1558c6b56761ba68ee5fdbbf1324c35dc98b0b33e8e54709664b972ad2318dcdf4472251ef1d1f";
+ sha512 = "579d979cfa0bbe50fd0bbf0d15b38d90579bc065b488a2e9d4e3f18f505e71c50225d92185559578146097110760ed3807e1aefad4862d99e247447478d6bc42";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/dsb/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/dsb/thunderbird-68.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "fef020d88b4560b8eae5b81d9d36179719389c742a462682ca0afff942474158b1cdedeca6f348598ca89268bae3d953ac63debd972f7349ed8a7cb56e96cdd7";
+ sha512 = "8d16bf47d368a670cadb6a2655933d5b49a796272f7dafd948cac95a2ae541561a38fa418cd4ed0c4aa79ef63a441ee769eeb2a071734abf2cc1ba243d4f3ba5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/el/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/el/thunderbird-68.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "fae21025f07a7d0be663d6dda4cb43cdc2b4b488a76e4ab0bae304284b17598689ed32554066e1d00097479e1ca4f163473cee854b853acedc46887256a45d02";
+ sha512 = "579b9114af9fda86e79e6812946da858945e2034ed2f00e4244724ecdd680b7db5601a4d573b530dc15207caac9245f6883343684eb43f3ae2abb64853c0b54f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/en-GB/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/en-GB/thunderbird-68.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "cfb8f7770d1fa2ad12ac19a2f069840a37f13c352d4271c4dc479cf4cc1d3ac381053ef9046b4b0fe891b67097f5db674ed6281853b2ebab1fe9744bd113bb08";
+ sha512 = "f7caed8c3b49714e4449ef971ed1a21e40f28625c84e9342f63e5f73743689ee2c0e9ed4845f6667bd22732c62bd707db425f22a5c074dff8622cc4536ba9c29";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/en-US/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/en-US/thunderbird-68.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "c0eeec28c235be86760dca83941a202475846153a1b186ad948eb673e0c6b1e870cb1c485f5a1dd9ed885eaac52f36cdde4417ba86dca388c43c03299b0adcea";
+ sha512 = "257528761f0eca38528ded4b31329886093418f562aa2fac73b3a5bedda51fe80b34758c10afae1735cf37b37a86413dcf08642aecb1e8bea1fb6b0b94ade5c7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/es-AR/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/es-AR/thunderbird-68.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "151e9ecb12ee13dc9cf87040c5f90d9dfeb528e25889fb48d7bd5a9a47f7a6166402c1c4ebf96c9a4184d27e89cc13ff31079151f7ca2860ac91100d2dc7f6a2";
+ sha512 = "70a10e329b1031a2fd2ffb2b60459f0238ff3f5e5d80533f4be6cb22ae77692ec079ca3e146bd9a59edd09c266cec92d922a18ba45f8626a4bd44e290d3c0927";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/es-ES/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/es-ES/thunderbird-68.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "0209584bf7d1396d3d3f754e4f6cf3a6cfee2f7aeea9869edb60bdc832e87b9437f4962fe59a19df78ecd53681981e68bb6efc98e05f7ef50883a59983ddbb66";
+ sha512 = "a03098ad7d83b86cd316c56b69589370fb8bad041b93f90f61514b04e3d0e78385f779ed715c6e22e45597d1bf03676046cbc1eae7896bb2a309af3683c8bd1e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/et/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/et/thunderbird-68.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "766656029454d89be4fa8ac8ebfc61f25d86c6f8974abe1426cd96dd5b7492bbdf4f8568ac18a69fa4ac3acf4a28486f1184c0852d4ee29416d6dbf3ddee097f";
+ sha512 = "44efeaf030580dd7b55770627678808e34d689e85191852c2e5fcb223a0fdd0e5386f21f03524d0983aeded7f8ed99382ff2c372c8c5a1fdfe218bd5b10ccd80";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/eu/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/eu/thunderbird-68.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "db312b24b48677e47fa9ade4f04e219ec6a1aefb03239b60ba63c46659e86eadbec32513c494d48c90e303a87bcdd7280d7c4ae5be4df1a2c30159516bca5abd";
+ sha512 = "c670be5932d7e8bea28cffda7c119cfdfd5823f76b2c97251ec23ec16e420a8b7feb5f2251d89750b956d3bf3baff5d17393c05d8c265d0a98cc3faea8f85735";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/fi/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/fi/thunderbird-68.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "003a0ca468ed7a7ab19065ef4a45504c9e95724112c6bb277c6e1964f8f642d5d1a7a4b135e412c81db5896eb00a831b089104563a9237c0594c2ad5c31c4814";
+ sha512 = "36aa0b47e9b5d91fbc812a3d63503924a8ca227d7b7084c1159419092b17da9c1b6e89fa046c636dbcff7776f9a1d8465e660b47f1753505f0d2eb85da9c3a7a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/fr/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/fr/thunderbird-68.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "5097831b1d77046583bd86dd124c48f2389a676a902cbdd4e408508452400f9d981c14475e43276ba31efa70bd3fe1bce5193bc9624de40e34a57319d6ede80f";
+ sha512 = "b1e7d345d3dd38725227b5e09c4f3cfcf29ed3a98b0580fbf6ae1ecab4414d09e307423495b75769a8d2ee3ab4700cd6eba3d95ce05612e1d8290d3f5a3ba988";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/fy-NL/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/fy-NL/thunderbird-68.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "bb1170342797ccb3cada48fe654cbba2c02391f30666f3c14891d813692c21400c24f0f1e02d6cf975b88b8e92943feff8da5daf05b9535ae4730272b104d43e";
+ sha512 = "4065a083f49006dacf64f084c1bf26c4c1b8d53bca7eba7a56d66bb035eaae2c4528687c5c1e2213f92adbba17ff92eb54f897d3b0ef6d27b8effbee66ca555b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ga-IE/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ga-IE/thunderbird-68.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "a65089b76bb09f78bdd7c8c63e0fe4e68468a210a18069621d4b9fb3ef7cd54abe849fae983dd3e8f05bc5f7dfc3a03a64051587a9e65439fc5cb2c15836f13b";
+ sha512 = "2ae9a0860513e90d1742e5c17220b2367e61273eba04738cd29e9ab497b86f9a1d78b38b21da84b1f214f3368ee114d376b05eabe0aac9a1ec07ca6a4b399070";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/gd/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/gd/thunderbird-68.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "bca1e964554eccf2c69968380954dedd9e76fe2952becd06b0cd56ddf0e3936d6c40f7cfa5d9c8719cdb4b5181d47048d10a47e6c549e74b2ab72a0d7b89d1ad";
+ sha512 = "d2315aca9d8e5bb35b21cab46a48e51f09200b056da2682201c32eb4fd3d0379a24a6926ebcf11e9c70d70fd20152fc24d5197a78cdb3c8ea3cc2399d784b463";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/gl/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/gl/thunderbird-68.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "d8ec696e056b44059ce713dfb86980da72441d9c53e17f30d0ce43408a16d3e4b2c8700e595639f7bbe3b59082fbdca49a1ecc47bdfa7704ba189198efeb1909";
+ sha512 = "52d9210e857c1b6cb665a2ffa71cfa5e67c3718b210e2b4b42839d8f25987170f1603fa55d324003a4be821ba74093ff92d632e688e44b87ebf51dafd02f69a2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/he/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/he/thunderbird-68.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "bf9d9db17930dae863bc8803d7f8e39fad79c74712d16d3912968b8605372521cd1ec23f2cb4c8d05e67341176749c97e85072cef40a899570811b594a5d994c";
+ sha512 = "e7b5a16950be233fe8a49152184270a901bdb4bcc14769401d4b5a21fd2a3ab9d395ed8f6b61081330386723725252fceff09bf9fdde3a71135a98d8ae45089b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hr/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hr/thunderbird-68.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "62c626a6dbc65e69443e0e33bbcca131f2b0c3ab521ad74c9de355328fef0e26689e99f7e41111cee688400ffeb2f749f1fc73cf35dff8908f3661218e5df29c";
+ sha512 = "1ed224dc0864009edc6389f9b3b063f56b15be982c2e2915f1a2f773bfc78e6b81ec0ab02e03f7ade08f47260be597003f8119116576f4fe5dd490e85cd3d4ab";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hsb/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hsb/thunderbird-68.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "72a7c2356748b59103457fdb22ebe471b68bbdb4c8e61b53c83e14a64f25bfc781070242f2bb04dccbacb52387ee3b7a2b5a66c2bb01d653b4d78ee5a4d3aa86";
+ sha512 = "f4bcd8a199bafd544687b1e890694dac2b598d4fd79818ab19441ae9be579a9928fd8c7fbae43e322fced15ff39314fbc88be94ce2fe12b5d2ec2ba003a219a3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hu/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hu/thunderbird-68.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "b6e9b086b065555b2fdf3c243e72a37c1f7d1708b130ca060fc72cc4715514aed5a40ac19b497fdfc7b6d067d8a065ad16e077e8f1b6aa4f2f7204b47699c2a8";
+ sha512 = "28223aec237fce2f07b0c3b454a8339bbd2f195d6e263c5a5723e04bd5df1128d58a6bc6c7275cdbeefd5161a405a2d6340303faa79d9330abd0e70de9facbfb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hy-AM/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hy-AM/thunderbird-68.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "7b4690527883906a6a6e2d2b6347b8d2bc1b6a16576b6970c2b7dd0a04b6f046337e191aeaae4b07e37b29a9e24db3848a2683c6f0d10923c1c7ccf4bc8a38f6";
+ sha512 = "d7dea23905f8bc8dfde92082f90278b76477eb3036c7fc4abe656e37af9d389d37f3b166492df210eeab03750d85cbcaf1340aaa26ab723ca1b70299b4a64ab6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/id/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/id/thunderbird-68.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "d6446e829d5126386535463e4b44551529108c22c1f5ea054cbced5d6ecae56c31d8a6af99620edfad62acf54844a3a0484b8892ee85fe7cf8676aa2010bc0f1";
+ sha512 = "f55ad81a1dc80838a9ab045899e0f16bb077d05d73119705f820f6fe8c8c7a550e05cc68cb7ca0aa8861cbd70bc9f061ba51a4749db6c37d90e7e7bda5dcccdf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/is/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/is/thunderbird-68.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "8527f8adbce559195b3487ac11b9ff7a716d4efbe4139289093b49e07b0767b99d90560695773433ccd838affe2e34f488e1051059213d79ef2c604aa5c239e5";
+ sha512 = "503c236102a15428e41a21b458ecc29986abff4e434f4e26ec9741b2facf39a8fc2ae9dff5aeb32fe3c9ca0dcb6e914a2acf229ae9caecdc4f064380f126ecf7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/it/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/it/thunderbird-68.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "3d376e4f8efeffae16c2a39fba40cf29433af35ffbcfc5d0a7491355a211ca25fd5157f64a4d9f4611ac0cfc7659cb7118f0e4db15f594767d0e8a7fca9bfa03";
+ sha512 = "51a736932baa5c810a29de46eba64b0fcd2703da38ba9449b6b06a9412562e80853367416c5b4d6c6834eb7a2186f434e426099ede56d9342860e4f3561455eb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ja/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ja/thunderbird-68.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "b9623d6902ad5f5d77b67b490d8df6f312c895257965580cf1108a4d9c3da78f3d021551f9e48ab56b92eb691c3c4007a7584b4681683b261bab7b6b7139ead3";
+ sha512 = "7a00080835155d301f65a35684d81f8e3a3be23d927d939da84a2a887057bca0b75d5b580a004b4f797af504a6812f71951bc3c75ccb24dad60b6cca770cc7a1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/kab/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ka/thunderbird-68.0.tar.bz2";
+ locale = "ka";
+ arch = "linux-x86_64";
+ sha512 = "eaf67c64275495fcb08aca63953406cd7815ec356ee0a1edca8a5e8dacd924a9c11e35dbe4ad17a1617199a5f66489bb553a7a5177eb629223b49a9adccff803";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/kab/thunderbird-68.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "33417e6604f706ff3bfab521c5bd890fcffd0f524e11d29fedafaf89ad5a7f6284598ef994059c00aed70ef921a08dfa763f57694976b365d3317aeab8209c6e";
+ sha512 = "9432bbba0965b6da04495b79ef4db3bdbe69476b20650b4d6407d921cf07d09950368f0c13211ea6743b621d486bf71dce0e60d8ceefd82b48a8f2581a3fd7ee";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/kk/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/kk/thunderbird-68.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "05910b83e3c65b2be6c6382bb27f819f9d02e3a1f89c00afa22eb1e68ff04d6f39edf31468be245be1756f20e09cf9982ff0175017e91ff1fe08b62b2edea4f0";
+ sha512 = "9bfb99694bcf1227162607e2b674abb00343e4da3876999430d6014cbd4f4aa6c6e9ddca7c7f3b144d101c1a5a6d38772e3750f5feb41d1f304b89a8c1e6ec15";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ko/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ko/thunderbird-68.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "f12a92b58c02dba4cb2fc8e8a9f90025d23c3849590bb149a50416aac3e3c15e0c2817e7a4bc518f24e796ea851bb5746b7611e2faeea2767e0f63dc67f2cb37";
+ sha512 = "fd260740ccd74afae7af664775954acfd176b47176f48b5300f11bd77bc31205d0bbc2d06a701486e9742ffb38ad4aa2b253041b9d9518a4b9c7dbbe41aca264";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/lt/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/lt/thunderbird-68.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "06d12d4dffaaf863d77ab1fcc59517bec26732db4b81f6114602b9ad06a77d86d52a0b21066d93854459fc3087dce8d8087df635151f672194edf55d7903bacd";
+ sha512 = "fb7a7b6d0c7d58d13b3ec20c8176ee793cac5c53bf849e3b3c4aaeff0f3e897cc35e61a9dfa4055c691fd56f280f7b31e04999922c29ecc89294ea6eeac16cd3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ms/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ms/thunderbird-68.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "021f1843a788cd6285e4d56559b7042e161f0279b9b64234bb7cc39847f7f2011265e86a738b5926413f2e98e293fbb478d36322c9071b0f7346dbd07eb05a7b";
+ sha512 = "7490a8169079569143c63f85e7da299d28ea423fb95265e2e86ec724ff0da641e24a2e9ea612d180d523973522f40c250bfd56e66ee39b28cb9acf57f6be6831";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/nb-NO/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/nb-NO/thunderbird-68.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "9913898a8b6ae8745f76aae51f82aa1fc9f71e410f458c3deaef5879521bbf1e25067709999a4c7722b42ae152eeed7016e5aa0437b8b3fc81d246b297f92f22";
+ sha512 = "7256820ea97851319e51616f6eb45617983e76e74b46ae62a02e22d13e2dd6abd590fd265aa6c88ac14b2f0276219580b6b9fbd956f1eaa38e6a93329b9c9621";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/nl/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/nl/thunderbird-68.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "006e2332079d8a837c42b44df7b7af01bf9363109a47158357438140a068a9a17b2eb1ecba351b49b3300dae5a8e3abb0938fa1222012a886e6a123f7612dfa7";
+ sha512 = "00f32145c861abd8f151d7840d0f01eb9d4190df65e5a179f999f3149477f2de7f796782eb7ef912fcbec005d65c76974185d1c0105dea862cbc22c821bc906d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/nn-NO/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/nn-NO/thunderbird-68.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "022fb45fd0305cad23853277f2b18d22879a4d0523cbbb73a65209ac3d2a87782667e71c6903a6b944aa824ebe8d30421d511f346df7a511ae1f7c325d53de41";
+ sha512 = "3ac255b5bb4b352833fd56d5aceaba6d0ada571630a993729970ae99d5067f05ba22e6ef50fa7dd099c0eb5874f11aeed32718c56a80538e28b401ee6b7900a2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/pl/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/pl/thunderbird-68.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "ecbad62e54f5b49fa89d0f8d00ccc3315cae71e0a46b25e3bb72b117ef4a8271d9374d82352a7ed75bb93fed9504ac883165911cb6423c5c993d75ee620e27c2";
+ sha512 = "19ab4bde9314dbed1bca7565698a7b1231767ef9cc792a49e7e9d679453ae8209e6f68c63ea0a24bd9e3a97328dceeedd109bfe28038108b52b9dad366f28787";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/pt-BR/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/pt-BR/thunderbird-68.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "e9f2180eef290f0d0fb3b91eafafa7ea0a8cbbb7acc01758fafb56d6c56caa0ac5455b728013ac88d50757830a7f65a3e77423417abd3ee77238657c94461381";
+ sha512 = "68e28b657b885e7823dca0d091f2609556d560a50b5e6c285cdf467ae2b09743406baa2e544f17997519c219e0d4e8911115d30e7b0c35f09b956e28b311f8d8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/pt-PT/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/pt-PT/thunderbird-68.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "20e448cdc26b9a27b2c42b7baa09d299ea9ea834bb3bfba284d5f907bdfe0170ba7ef611e0e7ddc1ccdf296781401fe32b80f5e909b68c12a23652c06b3c93c1";
+ sha512 = "41623568d2e78b821a89480836f8d8c739f6983b80ce26017d12fd9363016158fa6c629e030f63aba6e730e554b7717fd2ee58e0246aa82b46fe55d5d6be9933";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/rm/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/rm/thunderbird-68.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "62d71bc39dc895514eb2cb957205ad7379ce95bacf6d75e193e0d9eca34df300dbbbb9df3e4cf200a5c1266b1747949df54a969edae62b720b10d0d756ff4c08";
+ sha512 = "a2cabac0ff5e3bb4a8dde4e884ba4647792e0935ef0a61b56470c67d3ba9c2310a07c2d2da51f7b4cb5fc3e841dd385a2c64ff29d263333a91e2044a4ad3190e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ro/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ro/thunderbird-68.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "2a506e9c7d1f752452201ff78c0a2d678115404294200ad07317672220674eb32227dd7b1f8af65ee91ffb4051beadbdbf2da2dbc243d14d22ecb81dd004549e";
+ sha512 = "2e9da10d1f88352687175fa48fb70f8a73cf3ab1d84958a79c4a46526b3640e264d98611806bb234f579d616fe7d1dbb2d4c6ba55a389363034f85a97283bb64";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ru/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ru/thunderbird-68.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "c76e85ae89f1d6f878f5ff745f76860a18d053d13c4deb6774de9e653e841273c09fd7297ade76ea390a30ab0d2af280a0e6b2d929a50ada2ea37c32c2d68d7d";
+ sha512 = "5f4bd3d3657479446ff070cfdb33e16a527c6f1615f37fb4c4e32c12b89c62d5649fa5c3d826723be47fa9795575bd33ccf37c2aebb555c218aba8f9d68ec3a9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/si/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/si/thunderbird-68.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "92617456dd89e933130992a15247bffc9c8ebabbec41b061320ae6be8d86ef1af38c1469e633ef9dd312da8f8bcac99545077fb23665add9c82c0a38f538e56d";
+ sha512 = "b47d2aea81327089445c9f57a1508406c534907c7b574006886828846e6deaab04e35de2781d55d882f05c0a89f65fa7c386547d6581064af4fc3bf4e879e379";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sk/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sk/thunderbird-68.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "8ab573b0cf04ae24f0ce5f1b8e79024fac5e33da2e80ef28837b7bb941512d01396759b34ba4fe87bef74a9385d5b7fb8d656429c110a38e0ec30ba21c01dd48";
+ sha512 = "4295204bb89789704da6830d33e92a77df165737c291c74a94fa532309c89505fb796151e0855b4e0bad8658fecaadc9978580ac72e2a2f24a4022909bb64aa2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sl/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sl/thunderbird-68.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "4ca6019ec3420487ac141bed30efe310d4c01aa2d7adf16fd97ad543cc90d14611d270074c5ab1c52b90c6ac9cfde5f5957c323189965ea60c2f1110abf4bca8";
+ sha512 = "598fe5bd04e04a73db04eb630e02dd7cc7af34d0381e6877626c8885bc4b879e1f35362afb8cfeb1bbafffc5b7ea14c8efe9b35b5e30056d04fa0126b8663679";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sq/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sq/thunderbird-68.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "1a47ea68a8435099883a502e65e31aa0e7c14564f86e6b4e4937362fbad3b9771efc74df4ef92994c1ac77130fef228a1c131d0eb4508a5c655e2a4b3800d1ec";
+ sha512 = "0b657daedc98db51179cebf547d5f278d2d632bdb552878b4af29427ab8fad62f8d6c1ab2c3a38cbd8e67b670d6d613bdb1d4f535a0c69d0d1ca607d0b10bd43";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sr/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sr/thunderbird-68.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "dbcf13d0333d1ea714b85e542f5bdcbc83bdb2b3f8c3dca829d4b224a0741fee36ac9d2df9bd12cd5505fc972454b990ccf830d71926f65a4f460be2fb7ca937";
+ sha512 = "10efa11b9c9ba56142c8a321a25a7e875f3d02fd17f73bd3061ffc71823aeb1269f9a864aae88a4fc434d1c4a01d227c0be605ffa7f4ef6421db98c0141c839e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sv-SE/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sv-SE/thunderbird-68.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "7602c9dab1202e84822d537c0aec36d1705c259e3d5f34ce6212363450e1e0dda508ed36ea999467be2f39b991cd21a6f8a153b0aca87aa70ba62f01f078bbb8";
+ sha512 = "c77d10b35edef7e59f4e6c48cd4352c4fb7d05b0140aba12be42b3e3a3df609ebc86f2f5a3993fa172ec0ac118726314bc9042335101241637481a2e1a4d1c00";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/tr/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/tr/thunderbird-68.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "0fbec00596ccd59e54aaf23058e96abc6ae672ab55d2a7ebd0bb20c37c03f47daa70acfb981d9edf48c45a75d0b0a02328025e100dc4b344c03e3540089b1cbb";
+ sha512 = "3d52693efb05379802d62fb9e40c4b1856b45ee948032634d4c4bde7bbae67327f963e0f1096fd5d7a15d4341af1ecf3d9ee96eed45146859d8e8e5d403d660a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/uk/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/uk/thunderbird-68.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "4f1b0608f55f945552bfb3ff28fb93b52ba8a180426e6a101c7c849a48a65c13c78cdd707c8bcd6bc02f55942750c3d34151a4f674bbf53d5e1aeb4fa5d8b974";
+ sha512 = "c09734ab8e6428c6ed270887a0add934a7058d5e9c895864b1128e0fd39d57e13789bab38cafaf7cdbac1a71c8884407698c4bdfcf48aeec6604a457ed57c48d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/vi/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/uz/thunderbird-68.0.tar.bz2";
+ locale = "uz";
+ arch = "linux-x86_64";
+ sha512 = "083a83ae3c6083934fbe49f1e65ceadc5b5459f0f29ae0df9901b6d9b29d0a105cbde94357c1ee0a9677ec923fd1d419c618db0e843cdf320c087108990b89ec";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/vi/thunderbird-68.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "e3fbe83460505e135427c773650151e8d7d4d14df5a432392625871c561f6cb0c4eacbeb73d1078f4e3b195014373735a1383a472f6a85d9adf76d4b98929689";
+ sha512 = "6ba1573c9a170d1d827b6d17941c25e3852f7b66be2eaf7a3e9ab02278f19a38b801d7b9b0c266dc4f38f1190f9c83990eaa51f4734ddb38f43ea3e1bd23b72b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/zh-CN/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/zh-CN/thunderbird-68.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "050cf6cddd3a4f7f56af9f271114d6aa10e032644a958e62f3957d0df61e6f6d92e2a21fcd203a1f45dab7127a652a0dc192993477570ed82726fc9765372dce";
+ sha512 = "74ee429901cb520d07361a4b621c9be06253cf93300f0f91e3633d3b375e4e9a6a58823d4bbfed60519734ca5705f2cd0da4bdc7db0f578ec300f1d705e9b7b1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/zh-TW/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/zh-TW/thunderbird-68.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "566a7288a7819ac3bf72ae97fc10470530656c2c4bd75f9b06b4e4c1c07e0e80534fd3dc14081c828a7aff3319d83ca482e4d8d15aa6e3dd02201ce0038a1de2";
+ sha512 = "d720029e0720fa972d694712a85bdae94b1ff51213c4e56b84dff6d293a2a9831f5cd4efeb44070010eba1486b9358929f64546ce7ebb7cee29a7bcd4a1cd650";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ar/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ar/thunderbird-68.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "fa10e2e513050f8c62a0e53530a3ce99cc74aecb0b93090207531556a394d41308c599c469380b39daf178e775c61cf5c279b8fb26429652368ab0468dee4ad8";
+ sha512 = "823b3cf50f8d23d1d0ba8583d2b10146e2eb0ff4a9401527557fae8e8db997ecc66d0bf5a091323bbd37dd6222bacb73fb9818de8740963b929a8893e4ec9391";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ast/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ast/thunderbird-68.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "a88c415580fe8b5a1f83468afdcc55714abc13eb53c6b4a8b6b4779837b0668934c58ce40928b8a215a099fa06cce957754ac714a941172ded5087f09b8b2abc";
+ sha512 = "f0087ab3189e8fd194d2ef6d5d2f9c3e14d592d5217a8fea19ba5189e806f9d484332f9d342a15549651a75bcfa673f21cd7666265fc185ec58c814814902ec4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/be/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/be/thunderbird-68.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "d0c7edde8c6d2b2daa4d2389781962ebbb8b11e2b6ff4f0c79a15052cb65e869711cc18c5ed86310800dd5fdacb4d594347663a440ad7caf874599bf9aa696d1";
+ sha512 = "edb358214e93142d73c92ab3dcf6240cd08614c2d0e9ea506492023be46d7b7f6273dc767ae034762c052db3b0a093dd027187afb272b2a55fc3126b06ffb78a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/bg/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/bg/thunderbird-68.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "f5fa777606c529b5d5d85af9ea1bc9d7bae55571d11cb02fd46903643bd2fb9bde0dba0eb9e3b8a0276b004e40a12bcfc8b35f0a5d0445b1d6989caaffca2ed4";
+ sha512 = "f3268fced7a81b5046332f975906ac79b8ab5ac888dc1c81085dd7cd1b1a414988208d426bd305f67cbd913c58de857c844809ae6e6ab5a2a520d7d6b149b731";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/br/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/br/thunderbird-68.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "673478f9995d4b43c3a67abfe876004e71871a45b9b13fa89b5266fca48d1edd69b601d34ce4d007080346f99d8a6ad61a47bc891b61364b239b24a1066da75e";
+ sha512 = "c1be2ec4d4e64a2a9b32b974eecd182ad9d1fa23b775769e8535e742479ed6be2a222272d7c5b141393f0c752d4af704758912bbac1c17f445b3bf277c12eb9a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ca/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ca/thunderbird-68.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "336e500bad4e173a675f24ea05a2507c8729a30c9bbea2659135808bc04fa31b0306ade3073c70de22c76827f0494d517d9ad95fbe03a5526d14bf3e492001ac";
+ sha512 = "ac0c2508b89812ba63d0bb770adc2292127243fe31bf140a4ab88c953750fc2f699c5ed2afb9a400cec48dc14d927b08dc96d5b110e2f2d90e81d1532ba9d916";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/cs/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/cak/thunderbird-68.0.tar.bz2";
+ locale = "cak";
+ arch = "linux-i686";
+ sha512 = "4d73beb37469131b7e7747c85a73027e1eaf008100eee21e27d36b4736ffdb4cc3ca3606726e36033de64504f058ec9d4193797a09c2a591675636a5c00fc890";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/cs/thunderbird-68.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "abb309d772ba27eaea1cbf79436d21cb18eca0733f2ecbaab18778daa7ad55ead8471e76c46ef0e86cc0c95d4877fed61553a8d195c8ab835be24cd55af0e923";
+ sha512 = "635ec13ec9fd688ccb9c690ccb4d64228f1f47755ce24c4806f5f47655af1279b9ee758fe15c0fcbd43c830edf66383bfa3d84d35137209a4af41aa59565f554";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/cy/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/cy/thunderbird-68.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "cd1ad0258585f14ee8c5243f18841f80b1cfab41934efdc92871ad4c3d71708f1397836bc2f3843f769f2232c05ea9e8f3cc25c1b76f86b7658934e4a331a6e4";
+ sha512 = "afb546562f92c93639a407598d9c6654b64776cb68db7ddb07c0d17f83d122d9e7bb974238ee5cdb90876bca3ea30356cc5eef28b11ccf082ef72c0343dc42d0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/da/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/da/thunderbird-68.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "7d9fb57f9681934f8e564c92d80acf3ffc8df1341346adfb5c4fc13738a5068aba7cdf6ecaea2937bff076b66a6103cff95fea27e2a6a7b4b545b78b2c423a4e";
+ sha512 = "f7b7d183312d11d02200890afe4e81c793b658729119d9f81ac2ca58714244ece9d64d1b9d9f34c79f1d00b574e24192ce066debf873c4b740c35208cfaec16e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/de/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/de/thunderbird-68.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "f5c1c01677f4605f9e4731681d1e9e1395d2fee6fc32f88ae8f207750859887e0a49b2d95bc27e4311b05c6af2a390866662f79094e9c3a55e4f2bcbb92f60cc";
+ sha512 = "e6b3ba227c8e84273e6dadcb59d6691187512666efcb63244740a56273c5b765c65d21607e4f07a508e5e63ed0812162ad767fcb1140b89b2c155da945586179";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/dsb/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/dsb/thunderbird-68.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "92171f0c8140b360953c6b5310f260503d17d1da71e795c91a4ec80fc4cc15ac43405db8f345c0675233dde4d89f57a1db3177c3699f241fc2d4d6f43cde71eb";
+ sha512 = "84d39965568de9c87c280beb43330aec4ba6cdebf59a9c4f566b6bc01fbe15cc3987e87d9c24a9e746283cc54ec1ebaaff99952de7ff0aa9b6f05f36b1295d09";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/el/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/el/thunderbird-68.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "1062d28a437aa854dc213e632afc0e41edbe00d4398601db671d14e39fa2ee832c1fe6d263e7fab3d8347b4b2cacd541cb9f4b1fd640aa4bf97c3bd1fe23a2ff";
+ sha512 = "0942b5c8c7ee792d264824c6837d5857679feae9073fd2451b92dc0f31290360a24f7cd708e550955e798d2decb9f0c3a21dc8ba7bb5f226ba8ba9f502ef870f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/en-GB/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/en-GB/thunderbird-68.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "61dd1c410b5c87ca41eaf303f85a5c90b5c65fcba5a75d93654b3a5ff898991fd59b89ae772876c707dd7d5a2767fa607b3ea0c2f2c57ccb73a7a75720157f43";
+ sha512 = "12fb5086fd012d85f35a41125b7e5ebf37ec34e9215db9b2a4c67f924d3bfa738698ba15bfa2e51f8cbe0d81cdfe5de4bfecd54b0fe6cc7163c753444e56bb9e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/en-US/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/en-US/thunderbird-68.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "5f989316cfe29ff75adae5feb34e6914f25e6e7980c17fe902d70deede44ebe54052d2540cfbe3d4629e927d9f2129edf19f659bb2cae9f09ab984be7d47aaaa";
+ sha512 = "6004186b0b27165a4d54191a9c2daef34b580c2d97b1e0472e8d8d863e3df51ed56ef17abb7c6944f4da214772780b5c69785b9ad22ca26ba1a8f0390beedc19";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/es-AR/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/es-AR/thunderbird-68.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "45e0eb7e51110bc892cab458286e5c37f0aca4bfc88b01801c184521eb3bde33bdfc78758a67e7337be157b7507891874def8e7456fde8483054fd9671f068b5";
+ sha512 = "6a547a1d0450de1089df18baae81100d3fb9934c963459ec83ae81504e7a1ec7abf595766c84fe8d321f901150a68b7e172888028f3b992b4b6b74ba98ca4efe";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/es-ES/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/es-ES/thunderbird-68.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "a8dca85c7ecc2678cf48de000fa4e46432a28a02ec200447789da0213d01841f142de45c0c93b52c8952248eed7e0afb12c1f84026dcbaa0b47ce8b907bee779";
+ sha512 = "e1256da3c8938776b11444790f20a68f056f7407f444f0884dfa1c52260309d4adfc64fe95168dd8263e4aea650362ab9fa08930559c7f0e97b3489c172c81fd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/et/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/et/thunderbird-68.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "d212bf0d4881094835f156c277015e37f1de4d1927d2f89bc993071f50eaeb604913022c3db948baabb1d76b17a982bfd1911050c46bab54fd3ffd4f374ce378";
+ sha512 = "a5d7cd5e3171d44dbf91f067231301940e8a622a6729333512b49bc037022bc2058fa548c044a40b7ebea5d3199402276a34eeec5cb21b2070d7cfd96737def1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/eu/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/eu/thunderbird-68.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "14602ea4b22210049756484646fe538cece02d7a23e6079e7020ff30d08868d353f9d59fc831e1b600c061faf18f5af93a67ac95cc2f2f64a137c430d6ea6bd0";
+ sha512 = "08047c83e28397d265712dbd5a533799b2bba97d90f83b93be8377a544226ea0dff22f5b5e2cd5314c24608825048f3e59c6fc348959d63e1acb81d10d687f46";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/fi/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/fi/thunderbird-68.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "aaf723df2d042c7fca5457b0646998c7ed799d0d24021fb6de3b66d35519a7c189844bbd4a2840b884915995be4ec191455bbdbda7f5711831fc7702232a5d12";
+ sha512 = "ae407ee0dde2be8a8f89979b5dcacebd13fcfa42fddce48773e8f26ffbb503acc6b17a90170a0d72d550400397c17a725f9bf6f65d842f0f281fc58eaf9dbc53";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/fr/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/fr/thunderbird-68.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "9dd7e8c61049f4de1d03c73e1b7a1b38e244ad67be84dc6e4a53b94dc810d98b35e49b199662672f0954cf87cba7e3df75ba11fada1b74e8096d866131b08550";
+ sha512 = "a776215a9ba91de0500cc7fda245afa19a49b51b60089c55444aa452c5aca06cf3b95e66448147cdbc3df063348c28bbde3f3c2a6e19deed26e1b33dec565b25";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/fy-NL/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/fy-NL/thunderbird-68.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "aba1031a349f835577a06cbb8452760c4ab65fb1c8a7183e92556b6d140814f16e794f4a5305e789aba3b0c10703006641546751460fa5fe2a822835881d8e6c";
+ sha512 = "5302a5709fc4485eff607fd0b5e75f15bb600a14d20661cc4f7280b0bf5c156a40a51045182ff0d31c89d4009c5a516015843ec9fef1fb1134cfa80c511c05ad";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ga-IE/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ga-IE/thunderbird-68.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "9172d99e57d02a676f9bfe3373fef7448a2d6f70f3de8139205c55a37c73c5b70133373763daf8c58adf2acf4916cfb34aee60a431d55aa94cbe95e8e58430f3";
+ sha512 = "4b9cfa317f8ae5accb2c96731bd7fcbaf2eebaaee76bc7383d247cac9db6708b7c4c03d2faf3a6e7e6620b3eb696e9bb3fd18c3dfd1f3ce12e4bc65bb86955ed";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/gd/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/gd/thunderbird-68.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "f8449e20680cf02220e009f19b2cb66d1354941c0deda60086ae80f1d3bdf2159a8b5bb45a45c480528437e78d8c71c00a8ee42827b3254e37c83cb8af1d3de1";
+ sha512 = "8738b93fd18972456158c28d4146ec8548e97339d7b4ff044ace814213d27940b02f9b889b5809525d5bba46a5b3ff4a570c14b3b9a5fe276b4aec515b62055b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/gl/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/gl/thunderbird-68.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "04d8babded176785625add5bc9c457a0ff380c293579a18146924e57fb3782017c12d5569d10d2a3f1fa872fa8eaa87bbe5f1ac5f44f05cf5d5f3936fb12706e";
+ sha512 = "c556343f99d39f6ff41f0b05af606ada89e6b95938886f8d0b1ccd7b77f336ae40a8debb003d2bfc865548c5e9e055859d6d353e169a4f2ee7ada7cb8687cc47";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/he/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/he/thunderbird-68.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "2b77c7c4044c73257f24f1961d431ae50cc9dd0b0f2a58464a745ed3888e957467e6f35dba904a47c3d8d84aba81827184070ac6c12ecccf02760202b831b578";
+ sha512 = "b6eed03bdebfc334c8852a15989c024883b99f600b9aa58f8344976b63f1f9590aa9b78a2a27b081a1e5256443801f01c1f638f1e4f8c0c2a78e695a5e2f590a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hr/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hr/thunderbird-68.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "17d68b938531b89eb8972fa315fb6951821a1a55478a801b5697afe5b84450841ac66c8aef49a43c4aa6acec4f81652a1de32a3acbbb41ee6cf0a4ed9f03acd1";
+ sha512 = "aa4527614db13978d03cf07444109dbc63b7788a2cff924b5566c98d9316031f1c0fb74839b5be78030959f85147c1c1e50edca5605b5cbe2ad3bbbb257c24ad";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hsb/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hsb/thunderbird-68.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "556b441cbd6e9a34e101385484fc292e3a2edefd39dc8286b5880c66ad558beecc9206084ed0ee35aced87ba0325fe737f6595cf3ddbe4d3842b10bfb535ed36";
+ sha512 = "92b1e17c825a60da17bc9942b689337246f301843637fe420284fe89aad4ab2f30101201330d5319a7e6a2bd87567bf7aa7b35bfbc13b1399ed54973afacf4ec";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hu/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hu/thunderbird-68.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "7a355c9ab063d6b6d8c17d1df4e30a3c2511c4f9d78be578a1a0b73e4728bb08d917190249baff08e30fe76eda16bc889d64ddba673f51067dc3b1957f8ebba3";
+ sha512 = "5e0c03de66a9098e290fb93545cb46be41d7e91c865cb3fcff9dee7d141fa113cf7bfc14cbbf1e8f9e3979e6602116081958c22a83ea043015cc5adfb738e5ea";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hy-AM/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hy-AM/thunderbird-68.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "b5a94db363d6a16507e71fa0d6d8928b4c8d14b7b6a35e287232fca511caaf9f7852db37502ed9ac0fcba65cfc9d3185db8f08d7dd3941df660e083f0bc6c6a6";
+ sha512 = "3df1da5c3d18ee3705e5d5013a752920863fdcee8a1c021bfde28603862a7c56e60a65b46b98af5d66fc5066c1580ab5484d86dd278d64d5d800b3840361b812";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/id/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/id/thunderbird-68.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "6a94778d20665c901005150fab16c4fbcf86bba10b7a1833b7d89d3e76a7b90a0c1e755617ade294fb3c86611a0f2bb0e812d1b282e66d2a63e11a2f25b9da1a";
+ sha512 = "786a5839f311df656fd4a0687819a47589f5a6ebac6f76e1f643136286d43b2f27744dfcc116341a8905b5e1da4ec0ad1f1eb4998e188d2e87ea487c6826fb32";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/is/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/is/thunderbird-68.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "c6f89a98f956ab17bddc6250af88b1422a347733c15d12a720a8d84ffbd00142afd09b80bbac39dd14907558dc97f33890a091203c1f907dbe0df5f5f12a87f6";
+ sha512 = "53e4f76d41e1f8af240ecec249bd3ef3c787c6ff69320694bc682a876a76be22ed59abf0bc83691c7ea96d1e16f5a4c859e2b62528c99261f562012dbd035a9f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/it/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/it/thunderbird-68.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "38bcd03bf02276feef2321503bedbd7b8e8c609f48a038e660e522af5cad603ac642622f8b08b7aa870c1bf50b136d09034995941d14fa574ff9ca4f11d3cc66";
+ sha512 = "8ecb5594e5252be84f97a55b37f5089220a3e5c1565686fe02f00d94a1418a9460e4c1f25724243c82b3c9442eb8cfbff3c3c9470971921469f2fd71aec66860";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ja/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ja/thunderbird-68.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "e91f0e3ee53575d9e3fd02be22c46a8aebfe2e12998db77f3bf73c4756d4d615341c20fed031ee0b146aa1e9200bae3bb92c02da18bbca6e99574c46e2049f01";
+ sha512 = "7f9ed4fbdc0549c6ab704f80676218980a4b2609086437f57e22e9750e5a34d7506c1ee43ec48031a28322cdf4dcde6bd14c05fd032244acf33310fb6aa8e9a2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/kab/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ka/thunderbird-68.0.tar.bz2";
+ locale = "ka";
+ arch = "linux-i686";
+ sha512 = "bab15aa28fc92850d374f76ae9898c9408176db9b9e19cbdb49f7b586172c20eed0cb358f3cd4b5fcc2a4740188c0f041cf617a63743a42648c7e33dd0fb79e8";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/kab/thunderbird-68.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "a858c81c5fc9110757328df3705cfd8ca1bc61ca173448f411a849bc3799b586e7119e6c4ecafd12d0522ba37463092271b76744bc0a7fe603702627f598ad36";
+ sha512 = "26b1055333e508666dd24706da824c5cf9d5f87d1d1cb1c4d42894b836412205a7cc7ff73f764d8f2a1852138923bb02a6b2a2c3c92d1fe9307529533b6360e9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/kk/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/kk/thunderbird-68.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "1bf45fa38562308f4285c5bea746bafee65f498e5b4f4d1971e7ff68cbc5b8d3e6c7a32a4318100f1fa6bb203a12e3dde14df25a70aa1aad5d6279766b398c2b";
+ sha512 = "d946c82a8c35d82147812ef16e4573ae559dbfe65f4a6e5fc7dd107fb57fc6ba2a47f8a3655344e9e6172628692ad7815045830ee27bb10aab0d71483936d6ac";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ko/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ko/thunderbird-68.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "56e59aeb1286ec53ee558ab029476b72ed4094504123bb93abb3e3425f60065d66c9de83190d6f00528045f934d4775dfa555243f13fcdd540ca522e9f825740";
+ sha512 = "3b9d9e70c097a1b7958c6854bc2da121f44921962d873e7f90fee85ce2214725223482aebcd503205e32501648c774199eced7ff34effb428dbc738f1ba4b963";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/lt/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/lt/thunderbird-68.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "4572fe9803b28c6f94ac4e1fc5283d2569723698c4295279099bd33358a33cf50c1a49bec70c001dad65d19d30bcb215d50f2084b458143d338b8ecbcea1ebe5";
+ sha512 = "0cf99a6aec58d2f56f6a52fc5fee17b9e1d5abd0ece53073cc392c71452e1415c94ad0af003dd0a97fc5c6744a1a2243aef69dc44b831be51108b769e5bff87d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ms/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ms/thunderbird-68.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "fd1a58ebb66a39fc00ba20eaf555cfaa6124cc2e2fa7b44e1d4d7f1e914d86a0617f1be8d461f952196fa6dd8d29ae622769e5e6f8e4c0eb30b757da62d3864d";
+ sha512 = "8b4697a312aafdd88a5ecdf898a796bddb91e80b4c8c9c342fce765ee0f4dd494114324a51d6379468756a44bc71cb6f46b8fabc7ca733d9d85d08069f18526d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/nb-NO/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/nb-NO/thunderbird-68.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "bf4663ffe717d07b37e4f6741c9d6a804420f0104ac9adf152f73900d89818dddd67b1d047bf3f095d1a6ca7ac9da8e2132567e11caf486588f262e84e87905b";
+ sha512 = "ad6275f8343dd36ed039524875b41ab9c8bafd2a1e54291b98c16b0ab35f9bea1bfee3fce86070317fad2f25d46d0aa9ef0824e4ad88e0879a33ae753c61ab2d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/nl/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/nl/thunderbird-68.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "b7f7a989fe70860eec8349cbf85a943c0a5e7e4c9f7ae2010309adf96778797b036847e6860c0d89213c51c3c01ee1e9e4dfc6ba4a45d31c6ec4b6e9cc7e76bf";
+ sha512 = "49f586a62969e6ea5638eb95f812e7d4a891ef55f381633792ed0820ad098cc527dc9490c3a1ce52246526f0a8cf00eb16666c6a7f932a68c6d440e151b452cd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/nn-NO/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/nn-NO/thunderbird-68.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "b2a8a72ce49d15c0629e038deaa8fef4b93893da9198e712daaddaadd2169c4781fe6c2544f33954d28e4be30048716a80c20063a13ea78f0ff3c466ee814cce";
+ sha512 = "1f04f2bf7a60472eff1b546608cfb26e41f31a273d1037e0d73530029a757dfcd95e2c1b85a6990b6f7eec28138835fe096266a00dd094b4db74007cd59ef00d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/pl/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/pl/thunderbird-68.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "e6d0f12754182f5bcfaead0bce7183a7f6527983f8a4ece9b9f7968d87d9c55b06257c20e1dd4bcd82be56961a08f6e20d7140cd8239531e2f346bd4c6aaba1c";
+ sha512 = "f232e4b6cfcea81ed70e56e9812b8e0783205f49b846d29338ad09457db9a18e4fbb35738bf5e9abce42855c13c1839605aa343cb7d33d0110b68d634183e697";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/pt-BR/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/pt-BR/thunderbird-68.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "bf1fa8c66264ef98b4d192e794cb789ea0f062f342bc3aa664fd8e228acae045dbff4673e31b5b65754eb80e6af2581b3b540b3fbd3e1042439caad9177f7499";
+ sha512 = "2527ec08fc23d01712574e3c8419273ac82111c5f2b4b6040cd8f3292aeadb36021029b01bc319d8ca52177db39f1a446acd5537a6e8f42800eb22c3e2d7cb30";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/pt-PT/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/pt-PT/thunderbird-68.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "2b503e6b87230e4939c09774d9e7b70130e42ef4bdc0e3500563fc0848f138b7b569d37ba09eb676efa6e0d9b245d49acca8c740ec44abbe25b57a8546095871";
+ sha512 = "c91d9d0becade1508a3212693f5fcdeb917fe5df5d63b54de125b76786dc3787a7f5f220eb48add1dd1eee95f7eb120b1c1dc85dc0bd91688c883be9219f3d7d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/rm/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/rm/thunderbird-68.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "fbb4192fa466549313d874d5b48258d3d133040449f96c55270a5ad25798067b921d0336e577081985e1e0cff28aa17d8b1890e77aa3cdc9c369e5e416ac20dc";
+ sha512 = "45a4f608eb5e64f24ee385328a3a568aa2ad3284169019423c8b414790779cd079c2d73b290716f18227210ab5eff50625bd6688498bc027228b8fff51fda5b6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ro/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ro/thunderbird-68.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "5e6ca640f36f44b8d6594aa13847acf16b7f5d96d21761fc43b38b16d39deebf6dd30cc2eae778ec1f8f37408451acb19485f52ae3e701833103e59b6e0615e4";
+ sha512 = "e344d838e2f79dd8ff79cf2e7ff2a1d8f6c7e64f29cf870d8a6fad9b3dee31de6c0a80d3007dd498dffb816c00dc8429150bc6b49a5b6eb10b633a4e942ca725";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ru/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ru/thunderbird-68.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "4bdaf5e71f18d75554a4d954a802390ca6689d07b3ba16de8654b6557c874622ad2b2d587d8306edecfad47c1bf89550378d478377fe49b0e87b5d4417d05840";
+ sha512 = "8dbfd4f8969703623388a55e790b722933f2c1faf702ff5c7fdfe3cdab8f62fc4ea69f9303edf94a41a71be1b8c5a2ddfa5509d4c8abe260c91b7075349afe64";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/si/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/si/thunderbird-68.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "096ca4b2efe21c92d041b5fbcb5ac19351d39b339b0686fbefd1b127f7fe1da8b31dcd9135149006a71b664eb9f98d729a48da4f138af250330b60f80ea07f11";
+ sha512 = "f1808e9648caa00afab0609dac1cb564dbf6e5bef75446071997cc9913da8470e54cb254282fc6e8b839e88b003ef18426609a97cd1affb93659fcb519913a5c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sk/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sk/thunderbird-68.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "101363485e58e8a733523f103994c0abaa520ffe758a0ca39db9d5cebea273bde9a93be489d49db67a37130191a3e54ab9454e74cc392c5e0a163020a740149a";
+ sha512 = "7d5b480a44dae0d2f5348261ecad04348ebb7943a757fe83c0fb154da251b423ba21840c5d1fbf8d7979dd30c2d5e7b18e90d0ad033a1e96d6f6587407a24cc9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sl/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sl/thunderbird-68.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "7060e6918d9818be407fe568caedf7e65738ce6335e287ca9ecee9d7f7be9d00599364b8d7b1033c7943d3a417fef32cd2e6912e832ce0e5eefe6e04db3a7dcf";
+ sha512 = "f76e1f01b8da8a2ba344dd3bedfa4301df03fabf9848fa189d522995cd48d81f8d00f11e01722868acb1993d4e79977122e04e3d208629b2e398c715777194e1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sq/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sq/thunderbird-68.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "56c297aa61bb50517a5cf126e506cd7fbedda6250434a21423581b2a2cd79352f21c51265f7e3fa9b60636c8e3bd6dfedbf81c058daa8545f5da0f02837e0719";
+ sha512 = "cff32ee84324724dea5612e5b48b22adc63d8b9428c5937f84c94da83bcf5f2aadda6ab81c5f9bced6d693689bc38bf15c764d4ab4809cacec3bb54cd82745f7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sr/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sr/thunderbird-68.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "95f8bb13b4ecc9774452b799a8ec06dc6abbb585471f5f2f9ce38e4af733fcc99132b66df73df96159872ca6e6285a62c86e61e4d389c2c96da547f875cb9841";
+ sha512 = "96d25f7d952e204751cd601932713418cd495d11364430a37ecfa36333113a6132209b8e8f0ec337799ed02b71b388f43e22a53fa168f17e4d15e7594170299a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sv-SE/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sv-SE/thunderbird-68.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "fc48493a7873299d4c284c806fe2ba856ff197e5f50bb57d3fdbc95eda062b035f98318c0f5bb4d1bec63dedae486b9872e3f1718b922a1ec8da311796794121";
+ sha512 = "8bc790d7951469e2dfa2499622464cf55427a6bc93dec50b18f014ac079ec0579b91a11680e4104f7d6a38f60d467e9fb3c9ee7ab83b64f8dae2c1e979150bd3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/tr/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/tr/thunderbird-68.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "649527a4c603798b0f726eec995d721156c36279b1aa5afb956fe64ef40298956e1abf6eee2d15eb3f5e4c9c5d48ed804eb425483456adf068084114b6d5cae5";
+ sha512 = "2c40fa3e6ecfb68507897e669bed229ed98e1b4a3998b55b59523d3cec1fc5553cfacbd9be3d55f7a32b612ee662dfda7c8a21a4c26c750d48b87d31368a9942";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/uk/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/uk/thunderbird-68.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "2b4ae669b99ac9a7b20eef71b7dd6d5ad2b20ddb516ba1b3fce7dfbc783f0aa945e8f319b71e8912b2d72b78025fbdcb355ff96be43ffe828d2ba1ac4fa00d41";
+ sha512 = "5eee26a500c1d4bf71222987523cc3e5f144aca02c17c88a01d4b68f9ac5e1298407460c69504d0a7b1e5727755cb32e2ae523cd97766419848c1b6dc0a30bf0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/vi/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/uz/thunderbird-68.0.tar.bz2";
+ locale = "uz";
+ arch = "linux-i686";
+ sha512 = "51a0fc8dc30cc82f7d3b222167aaa8ea0225b4136ebacee38687cdc1235c0720da14cd2a3e1875a4c4bfa3bb8fd9045541ca6df736115312ac49a2db2ef83639";
+ }
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/vi/thunderbird-68.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "5808e5e2a75cf63366b190dc67177c8f1b2998b2001972412a760eac3c6a370aaf7e60d3fc7978783469163c55f69756637b4436593530d518dab27dddb6c295";
+ sha512 = "bb02dd69a8c8d514666fedb9d7de520f6ea89740956ddcd9d7f90175bca6f7bcf79b573c6e5ecd6fdfcdd15aa2a35881e8877074fbb795019eccff52cb943a91";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/zh-CN/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/zh-CN/thunderbird-68.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "95cf6871aacf5d36ca04673fe23277dcc4674dd5b2d215c1f453fb6e5f82d64774efee4a0538e7c451b8807bf930912a31eaada65248416c24e8e1382923d09f";
+ sha512 = "408599229da40b2ce1a23ec1e5b12c7f4a24fb63524d792d50764cdfbcc6774dd7f651ba2dce46bccd94937e24b4b08d8bf37b6fb839c61540dfbf36f6d3e6b2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/zh-TW/thunderbird-60.8.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/zh-TW/thunderbird-68.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "8429305258abecd306e01417bff356a536ad7f6982705a51b4c35b26a83c18f661ae743029597d69466e3618f99ed71070071743c5821264143f78cad2b7aeed";
+ sha512 = "d75c9bfc6234fa0ddc56b7c1dace76b789e29c0cb03ff17395eeba020a82431e457271e95117731963f2666295b94746d0370bf0e85f9c3646836830684bca45";
}
];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 6921279b27f2..f2b4cfb4befc 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -1,12 +1,13 @@
-{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip
+{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python2, python3, nodejs
, libIDL, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify
-, yasm, libGLU_combined, sqlite, unzip
-, hunspell, libevent, libstartup_notification
+, yasm, libGLU_combined, sqlite, zip, unzip
+, libevent, libstartup_notification
, icu, libpng, jemalloc
-, autoconf213, which, m4
-, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl, runtimeShell
-, cargo, rustc, llvmPackages
+, autoconf213, which, m4, fetchpatch
+, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
+, runtimeShell
+, cargo, rustc, rust-cbindgen, llvmPackages, nasm
, enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper
, enableCalendar ? true
, debugBuild ? false
@@ -23,12 +24,12 @@ let
wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation rec {
- name = "thunderbird-${version}";
- version = "60.8.0";
+ pname = "thunderbird";
+ version = "68.0";
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
- sha512 = "1cd1ps4r70bnxn9kydljsp776dazfzfsghc5zwp1xz6p3cwb9g0gybj677sac7y3ma2wsq1xbqk20q35n7gjz3k1zzhmpxyii558rdl";
+ sha512 = "2cz583rwfpj4z5cwg2vfy4ha0pz4xs9g7li078rmk6x19haiv8s9fwijd82xgxax0afn8wk80bq5kd8yz38l9432f6bar8xnwb21y4i";
};
# from firefox, but without sound libraries
@@ -39,26 +40,25 @@ in stdenv.mkDerivation rec {
nspr nss libnotify xorg.pixman yasm libGLU_combined
xorg.libXScrnSaver xorg.xorgproto
xorg.libXext sqlite unzip
- hunspell libevent libstartup_notification /* cairo */
- icu libpng jemalloc
+ libevent libstartup_notification /* cairo */
+ icu libpng jemalloc nasm
]
++ lib.optionals enableGTK3 [ gtk3 gnome3.adwaita-icon-theme ];
# from firefox + m4 + wrapperTool
- nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ];
+ # llvm is for llvm-objdump
+ nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python2 python3 nodejs wrapperTool cargo rustc rust-cbindgen llvmPackages.llvm ];
patches = [
# Remove buildconfig.html to prevent a dependency on clang etc.
./no-buildconfig.patch
-
- # Needed on older branches since rustc: 1.32.0 -> 1.33.0
- (fetchurl {
- name = "missing-documentation.patch";
- url = "https://aur.archlinux.org/cgit/aur.git/plain/deny_missing_docs.patch"
- + "?h=firefox-esr&id=03bdd01f9cf";
- sha256 = "1i33n3fgwc8d0v7j4qn7lbdax0an6swar12gay3q2nwrhg3ic4fb";
- })
- ];
+ ]
+ ++ lib.optional (lib.versionOlder version "69")
+ (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29
+ name = "write_error-parallel_make.diff";
+ url = "https://hg.mozilla.org/mozilla-central/raw-diff/562655fe/python/mozbuild/mozbuild/action/node.py";
+ sha256 = "11d7rgzinb4mwl7yzhidjkajynmxgmffr4l9isgskfapyax9p88y";
+ });
configureFlags =
[ # from firefox, but without sound libraries (alsa, libvpx, pulseaudio)
@@ -76,7 +76,6 @@ in stdenv.mkDerivation rec {
"--with-system-icu"
#"--enable-rust-simd" # not supported since rustc 1.32.0 -> 1.33.0; TODO: probably OK since 68.0.0
"--enable-system-ffi"
- "--enable-system-hunspell"
"--enable-system-pixman"
"--enable-system-sqlite"
#"--enable-system-cairo"
@@ -114,6 +113,9 @@ in stdenv.mkDerivation rec {
configureScript="$(realpath ./configure)"
mkdir ../objdir
cd ../objdir
+
+ # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
+ unset AS
'';
dontWrapGApps = true; # we do it ourselves
@@ -134,6 +136,8 @@ in stdenv.mkDerivation rec {
gappsWrapperArgs+=(
--argv0 "$target"
--set MOZ_APP_LAUNCHER thunderbird
+ # https://github.com/NixOS/nixpkgs/pull/61980
+ --set SNAP_NAME "thunderbird"
)
${
# We wrap manually because wrapGAppsHook does not detect the symlink
diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix
index 2d96d0336132..7f7296cd7006 100644
--- a/pkgs/applications/networking/mailreaders/trojita/default.nix
+++ b/pkgs/applications/networking/mailreaders/trojita/default.nix
@@ -8,11 +8,11 @@
}:
mkDerivation rec {
- name = "trojita-${version}";
+ pname = "trojita";
version = "0.7";
src = fetchurl {
- url = "mirror://sourceforge/trojita/trojita/${name}.tar.xz";
+ url = "mirror://sourceforge/trojita/trojita/${pname}-${version}.tar.xz";
sha256 = "1n9n07md23ny6asyw0xpih37vlwzp7vawbkprl7a1bqwfa0si3g0";
};
diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix
index 6dcc35f44d33..bfd177cda7a1 100644
--- a/pkgs/applications/networking/modem-manager-gui/default.nix
+++ b/pkgs/applications/networking/modem-manager-gui/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An app to send/receive SMS, make USSD requests, control mobile data usage and more";
longDescription = ''
- A simple GTK+ based GUI compatible with Modem manager, Wader and oFono
+ A simple GTK based GUI compatible with Modem manager, Wader and oFono
system services able to control EDGE/3G/4G broadband modem specific
functions. You can check balance of your SIM card, send or receive SMS
messages, control mobile traffic consumption and more.
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 9f641061bd86..6439991920d9 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -4,13 +4,13 @@
, jackSupport ? false, libjack2 ? null
, speechdSupport ? false, speechd ? null
, pulseSupport ? false, libpulseaudio ? null
-, iceSupport ? false, zeroc_ice ? null
+, iceSupport ? false, zeroc-ice ? null, zeroc-ice-36 ? null
}:
assert jackSupport -> libjack2 != null;
assert speechdSupport -> speechd != null;
assert pulseSupport -> libpulseaudio != null;
-assert iceSupport -> zeroc_ice != null;
+assert iceSupport -> zeroc-ice != null && zeroc-ice-36 != null;
with stdenv.lib;
let
@@ -41,7 +41,6 @@ let
"CONFIG+=no-bundled-speex"
] ++ optional (!speechdSupport) "CONFIG+=no-speechd"
++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"
- ++ optional (!iceSupport) "CONFIG+=no-ice"
++ (overrides.configureFlags or [ ]);
preConfigure = ''
@@ -108,24 +107,24 @@ let
'';
} source;
- server = generic {
+ server = source: let ice = if source.qtVersion == 4 then zeroc-ice-36 else zeroc-ice; in generic {
type = "murmur";
postPatch = optional iceSupport ''
- grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g'
+ grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${ice.dev}/share/ice/,g'
'';
configureFlags = [
"CONFIG+=no-client"
- ];
+ ] ++ optional (!iceSupport) "CONFIG+=no-ice";
- buildInputs = [ libcap ] ++ optional iceSupport zeroc_ice;
+ buildInputs = [ libcap ] ++ optional iceSupport ice;
installPhase = ''
# bin stuff
install -Dm755 release/murmurd $out/bin/murmurd
'';
- };
+ } source;
stableSource = rec {
version = "1.2.19";
@@ -170,7 +169,5 @@ in {
mumble = client stableSource;
mumble_rc = client rcSource;
murmur = server stableSource;
- murmur_rc = (server rcSource).overrideAttrs (old: {
- meta = old.meta // { broken = iceSupport; };
- });
+ murmur_rc = server rcSource;
}
diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix
index 6d7a8bd6c430..42950f23a843 100644
--- a/pkgs/applications/networking/ndppd/default.nix
+++ b/pkgs/applications/networking/ndppd/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, gzip }:
stdenv.mkDerivation rec {
- name = "ndppd-${version}";
+ pname = "ndppd";
version = "0.2.5";
src = fetchFromGitHub {
owner = "DanielAdolfsson";
repo = "ndppd";
- rev = "${version}";
+ rev = version;
sha256 = "0niri5q9qyyyw5lmjpxk19pv3v4srjvmvyd5k6ks99mvqczjx9c0";
};
diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix
index b89173820ee8..c2a84971bc29 100644
--- a/pkgs/applications/networking/netperf/default.nix
+++ b/pkgs/applications/networking/netperf/default.nix
@@ -1,7 +1,7 @@
{ libsmbios, stdenv, autoreconfHook, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "netperf-${version}";
+stdenv.mkDerivation {
+ pname = "netperf";
version = "20180613";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index e88936dc072b..3f90f65476e4 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -10,7 +10,8 @@ assert spellChecking -> gtkspell3 != null;
let version = "0.145"; in
stdenv.mkDerivation {
- name = "pan-${version}";
+ pname = "pan";
+ inherit version;
src = fetchurl {
url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
@@ -37,7 +38,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
meta = {
- description = "A GTK+-based Usenet newsreader good at both text and binaries";
+ description = "A GTK-based Usenet newsreader good at both text and binaries";
homepage = http://pan.rebelbase.com/;
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 898b7706bd61..3a72ae8ce5f9 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
- name = "quiterss-${version}";
+ pname = "quiterss";
version = "0.18.12";
src = fetchFromGitHub {
owner = "QuiteRSS";
repo = "quiterss";
- rev = "${version}";
+ rev = version;
sha256 = "0xav9qr8n6310636nfbgx4iix65fs3ya5rz2isxsf38bkjm7r3pa";
};
diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/applications/networking/nload/default.nix
index 2c16fabc5c41..16cc0e3d50a2 100644
--- a/pkgs/applications/networking/nload/default.nix
+++ b/pkgs/applications/networking/nload/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.7.4";
- name = "nload-${version}";
+ pname = "nload";
src = fetchurl {
- url = "http://www.roland-riegel.de/nload/${name}.tar.gz";
+ url = "http://www.roland-riegel.de/nload/${pname}-${version}.tar.gz";
sha256 = "1rb9skch2kgqzigf19x8bzk211jdfjfdkrcvaqyj89jy2pkm3h61";
};
diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix
index 8795f32e829d..96bdc0b1dfa4 100644
--- a/pkgs/applications/networking/nntp-proxy/default.nix
+++ b/pkgs/applications/networking/nntp-proxy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }:
-stdenv.mkDerivation rec {
- name = "nntp-proxy-${version}";
+stdenv.mkDerivation {
+ pname = "nntp-proxy";
version = "2014-01-06";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/omping/default.nix b/pkgs/applications/networking/omping/default.nix
index 1e127c1b1ec2..dc52d767438b 100644
--- a/pkgs/applications/networking/omping/default.nix
+++ b/pkgs/applications/networking/omping/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec {
- name = "omping-${version}";
+ pname = "omping";
version = "0.0.5";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index 962f10a99c01..3f48601d96f5 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "ostinato-${version}";
+ pname = "ostinato";
version = "0.9";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix
index 9ed532acfe1a..4dad5f4d6bdf 100644
--- a/pkgs/applications/networking/owamp/default.nix
+++ b/pkgs/applications/networking/owamp/default.nix
@@ -2,7 +2,7 @@
, autoconf, automake, mandoc }:
stdenv.mkDerivation rec {
- name = "owamp-${version}";
+ pname = "owamp";
version = "3.5.6";
buildInputs = [ autoconf automake mandoc ];
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 8ced53c972b5..7907365a6a39 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }:
stdenv.mkDerivation rec {
- name = "owncloud-client-${version}";
+ pname = "owncloud-client";
version = "2.5.4.11654";
src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix
index f58f7e04e00b..63218f1c2ffc 100644
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }:
pythonPackages.buildPythonPackage rec {
- name = "deluge-${version}";
+ pname = "deluge";
version = "1.3.15";
src = fetchurl {
- url = "http://download.deluge-torrent.org/source/${name}.tar.bz2";
+ url = "http://download.deluge-torrent.org/source/${pname}-${version}.tar.bz2";
sha256 = "1467b9hmgw59gf398mhbf40ggaka948yz3afh6022v753c9j7y6w";
};
@@ -19,7 +19,7 @@ pythonPackages.buildPythonPackage rec {
propagatedBuildInputs = with pythonPackages; [
pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity
- libtorrentRasterbar.dev libtorrentRasterbar.python
+ libtorrentRasterbar.dev libtorrentRasterbar.python setuptools
];
nativeBuildInputs = [ intltool ];
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index db30da82bdb2..77aee30d38b2 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -2,7 +2,7 @@
, fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }:
stdenv.mkDerivation rec {
- name = "eiskaltdcpp-${version}";
+ pname = "eiskaltdcpp";
version = "2.2.10";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix
index d674c70e4c2f..244352884883 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@@ -18,7 +18,8 @@ let
version = "build01475";
freenet-jars = stdenv.mkDerivation {
- name = "freenet-jars-${version}";
+ pname = "freenet-jars";
+ inherit version;
src = fetchFromGitHub {
owner = "freenet";
diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
index 1d98bf776755..5488baddef4a 100644
--- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
+++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
@@ -4,7 +4,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "6.7.4";
- name = "frostwire-${version}";
+ pname = "frostwire";
src = fetchurl {
url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix
index 9428b2764585..c9e2f8f67140 100644
--- a/pkgs/applications/networking/p2p/gnunet/git.nix
+++ b/pkgs/applications/networking/p2p/gnunet/git.nix
@@ -7,7 +7,7 @@
let
rev = "ce2864cfaa27e55096b480bf35db5f8cee2a5e7e";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "gnunet-git-${rev}";
src = fetchgit {
diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix
index c66c3ca05a4e..535991312f1d 100644
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@@ -6,12 +6,12 @@
}:
stdenv.mkDerivation rec {
- name = "ktorrent-${version}";
- version = "${libktorrent.mainVersion}.0";
+ pname = "ktorrent";
+ version = "${libktorrent.mainVersion}";
src = fetchurl {
- url = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${name}.tar.xz";
- sha256 = "18w6qh09k84qpzaxxb76a4g59k4mx5wk897vqp1wwv80g0pqhmrw";
+ url = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${pname}-${version}.tar.xz";
+ sha256 = "0kwd0npxfg4mdh7f3xadd2zjlqalpb1jxk61505qpcgcssijf534";
};
nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ];
@@ -22,24 +22,6 @@ stdenv.mkDerivation rec {
libktorrent taglib libgcrypt kplotting
];
- patches = [
- # Fix build with CMake 3.11
- (fetchpatch {
- url = "https://cgit.kde.org/ktorrent.git/patch/?id=672c5076de7e3a526d9bdbb484a69e9386bc49f8";
- sha256 = "1cn4rnbhadrsxqx50fawpd747azskavbjraygr6s11rh1wbfrxid";
- })
-
- # Fix build against Qt 5.11
- (fetchpatch {
- url = "https://cgit.kde.org/ktorrent.git/patch/?id=7876857d204188016a135a25938d9f8530fba4e8";
- sha256 = "1wnmfzkhf6y7fd0z2djwphs6i9lsg7fcrj8fqmbyi0j57dvl9gxl";
- })
- (fetchpatch {
- url = "https://cgit.kde.org/ktorrent.git/patch/?id=36d112e56e56541d439326a267eb906da8b3ee60";
- sha256 = "1d41pqniljhwqs6awa644s6ks0zwm9sr0hpfygc63wyxnpcrsw2y";
- })
- ];
-
enableParallelBuilding = true;
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix
index 629e748fcacf..0ead4b7e3ec4 100644
--- a/pkgs/applications/networking/p2p/mldonkey/default.nix
+++ b/pkgs/applications/networking/p2p/mldonkey/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ocamlPackages, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }:
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
name = "mldonkey-3.1.6";
src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix
index 7f229be1b543..b28074a2fd6e 100644
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ b/pkgs/applications/networking/p2p/ncdc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }:
stdenv.mkDerivation rec {
- name = "ncdc-${version}";
+ pname = "ncdc";
version = "1.22.1";
src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 7ffd79edba43..a579ae15181d 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -9,7 +9,7 @@ assert guiSupport -> (dbus != null);
with lib;
mkDerivation rec {
- name = "qbittorrent-${version}";
+ pname = "qbittorrent";
version = "4.1.7";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index 2d523cc07dd9..f10714031ff0 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -3,7 +3,7 @@
, qtmultimedia, qtx11extras, qttools }:
stdenv.mkDerivation rec {
- name = "retroshare-${version}";
+ pname = "retroshare";
version = "0.6.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
index 104131e47752..704c439bb27d 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -17,7 +17,7 @@ let
mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit");
srcs = {
- "x86_64-linux" = fetchurl {
+ x86_64-linux = fetchurl {
url = "https://www.dropbox.com/s/0vi87eef3ooh7iy/${mainbin}.tgz";
sha256 = "0d1cayxr1a4j19bc5a3qp9pg22ggzmd55b6f5av3lc6lvwqqg4w6";
};
@@ -25,9 +25,9 @@ let
in stdenv.mkDerivation rec {
- name = "soulseekqt-${version}";
+ pname = "soulseekqt";
inherit version;
- src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+ src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
dontBuild = true;
diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
index 87b331adf2d3..850fc488bf3c 100644
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk-pixbuf, cairo, pango }:
stdenv.mkDerivation rec {
- name = "tixati-${version}";
+ pname = "tixati";
version = "2.62";
src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
index fc803fa2745c..e05ca43eb507 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pythonPackages }:
stdenv.mkDerivation rec {
- name = "transmission-remote-cli-${version}";
+ pname = "transmission-remote-cli";
version = "1.7.1";
src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index 7d2f34c591e9..bec0507e4a58 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
- name = "transmission-remote-gtk-${version}";
+ pname = "transmission-remote-gtk";
version = "1.4.1";
src = fetchFromGitHub {
owner = "transmission-remote-gtk";
repo = "transmission-remote-gtk";
- rev = "${version}";
+ rev = version;
sha256 = "1pipc1f94jdppv597mqmcj2kw2rdvaqcbl512v7z8vir76p1a7gk";
};
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index b94864a0b40f..8af94b2609ff 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
on top of a cross-platform back-end.
Feature spotlight:
* Uses fewer resources than other clients
- * Native Mac, GTK+ and Qt GUI clients
+ * Native Mac, GTK and Qt GUI clients
* Daemon ideal for servers, embedded systems, and headless use
* All these can be remote controlled by Web and Terminal clients
* Bluetack (PeerGuardian) blocklists with automatic updates
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 29ec8158099c..65abcf35a352 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -2,7 +2,7 @@
, enablePlayer ? true, vlc ? null, qt5 }:
stdenv.mkDerivation rec {
- name = "tribler-${version}";
+ pname = "tribler";
version = "7.1.2";
src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index cce44521a620..647b708e1021 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -16,7 +16,7 @@ let
boostPython = boost.override { enablePython = true; };
in stdenv.mkDerivation rec {
- name = "twister-${version}";
+ pname = "twister";
version = "0.9.34";
src = fetchurl {
diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix
index 8725d5263fe3..b1d3c73129aa 100644
--- a/pkgs/applications/networking/p2p/vuze/default.nix
+++ b/pkgs/applications/networking/p2p/vuze/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchsvn, jdk, jre, ant, swt, makeWrapper }:
stdenv.mkDerivation rec {
- name = "vuze-${version}";
+ pname = "vuze";
version = "5750";
src = fetchsvn {
diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 8a66c039b5a7..c9df5d3fbe37 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, openssl, libsamplerate, alsaLib }:
stdenv.mkDerivation rec {
- name = "pjsip-${version}";
+ pname = "pjsip";
version = "2.9";
src = fetchurl {
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/bin
cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
- mkdir -p $out/share/${name}/samples
- cp pjsip-apps/bin/samples/*/* $out/share/${name}/samples
+ mkdir -p $out/share/${pname}-${version}/samples
+ cp pjsip-apps/bin/samples/*/* $out/share/${pname}-${version}/samples
'';
# We need the libgcc_s.so.1 loadable (for pthread_cancel to work)
diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix
index 305aceec62b5..7fdb062ef805 100644
--- a/pkgs/applications/networking/protocol/default.nix
+++ b/pkgs/applications/networking/protocol/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonApplication, fetchFromGitHub }:
-buildPythonApplication rec {
+buildPythonApplication {
pname = "protocol";
version = "20171226";
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index c685a2705862..60ea01ae4512 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -21,8 +21,9 @@ let
categories = "Utility;Security;Network;Email";
};
-in mkDerivation rec {
- name = "protonmail-bridge-${version}";
+in mkDerivation {
+ pname = "protonmail-bridge";
+ inherit version;
src = fetchurl {
url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix
index 5b292fe7bec5..d75f92cb25c7 100644
--- a/pkgs/applications/networking/ps2client/default.nix
+++ b/pkgs/applications/networking/ps2client/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "unstable-2018-10-18";
- name = "ps2client-${version}";
+ pname = "ps2client";
src = fetchFromGitHub {
owner = "ps2dev";
diff --git a/pkgs/applications/networking/pyload/beautifulsoup.nix b/pkgs/applications/networking/pyload/beautifulsoup.nix
index 571df924e1f8..66470bf8f314 100644
--- a/pkgs/applications/networking/pyload/beautifulsoup.nix
+++ b/pkgs/applications/networking/pyload/beautifulsoup.nix
@@ -1,6 +1,6 @@
{ pythonPackages, isPy3k, pkgs }:
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonPackage {
name = "beautifulsoup-3.2.1";
disabled = isPy3k;
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 66edc2032762..30130f60028c 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -4,18 +4,18 @@
let
sha256 = {
- "x86_64-linux" = "08kdxsg9npb1nmlr2jyq7p238735kqkp7c5xckxn6rc4cp12n2y2";
- "i686-linux" = "11r5d4234zbkkgyrd7q9x3w7s7lailnq7z4x8cnhpr8vipzrg7h2";
- }."${stdenv.hostPlatform.system}" or (throw "system ${stdenv.hostPlatform.system} not supported");
+ x86_64-linux = "08kdxsg9npb1nmlr2jyq7p238735kqkp7c5xckxn6rc4cp12n2y2";
+ i686-linux = "11r5d4234zbkkgyrd7q9x3w7s7lailnq7z4x8cnhpr8vipzrg7h2";
+ }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");
arch = {
- "x86_64-linux" = "amd64";
- "i686-linux" = "i686";
- }."${stdenv.hostPlatform.system}" or (throw "system ${stdenv.hostPlatform.system} not supported");
+ x86_64-linux = "amd64";
+ i686-linux = "i686";
+ }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");
description = "Desktop sharing application, providing remote support and online meetings";
- desktopItem = makeDesktopItem rec {
+ desktopItem = makeDesktopItem {
name = "anydesk";
exec = "@out@/bin/anydesk";
icon = "anydesk";
@@ -26,11 +26,11 @@ let
};
in stdenv.mkDerivation rec {
- name = "anydesk-${version}";
+ pname = "anydesk";
version = "4.0.1";
src = fetchurl {
- url = "https://download.anydesk.com/linux/${name}-${arch}.tar.gz";
+ url = "https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz";
inherit sha256;
};
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index bf5f5df934d1..8d21f64765dc 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -65,7 +65,7 @@ let
citrixReceiverForVersion = { major, minor, patch, x86hash, x64hash, x86suffix, x64suffix, homepage }:
stdenv.mkDerivation rec {
- name = "citrix-receiver-${version}";
+ pname = "citrix-receiver";
version = "${major}.${minor}.${patch}";
inherit homepage;
diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix
index 33f1f06e0b30..4936b0ce0b50 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/default.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix
@@ -80,7 +80,7 @@ let
citrixWorkspaceForVersion = { major, minor, patch, x64hash, x86hash, x64suffix, x86suffix, homepage }:
stdenv.mkDerivation rec {
- name = "citrix-workspace-${version}";
+ pname = "citrix-workspace";
version = "${major}.${minor}.${patch}";
inherit homepage;
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 0653686c650d..5963c6b6c950 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -13,7 +13,7 @@
}:
stdenv.mkDerivation rec {
- name = "freerdp-${version}";
+ pname = "freerdp";
version = "2.0.0-rc4";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix
index fdd367f97c03..3b7db7075bb5 100644
--- a/pkgs/applications/networking/remote/putty/default.nix
+++ b/pkgs/applications/networking/remote/putty/default.nix
@@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
version = "0.71";
- name = "putty-${version}";
+ pname = "putty";
src = fetchurl {
urls = [
- "https://the.earth.li/~sgtatham/putty/${version}/${name}.tar.gz"
- "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${name}.tar.gz"
+ "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz"
+ "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz"
];
sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg";
};
diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix
index 5f737cacb465..9c9abe55daa6 100644
--- a/pkgs/applications/networking/remote/rdesktop/default.nix
+++ b/pkgs/applications/networking/remote/rdesktop/default.nix
@@ -5,7 +5,6 @@
stdenv.mkDerivation (rec {
pname = "rdesktop";
version = "1.8.6";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = pname;
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index fb577f09120b..f60d43f36166 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
meta = {
license = licenses.gpl2;
homepage = https://gitlab.com/Remmina/Remmina;
- description = "Remote desktop client written in GTK+";
+ description = "Remote desktop client written in GTK";
maintainers = with maintainers; [ melsigl ryantm ];
platforms = platforms.linux;
};
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 9227cad52496..f9b17b42bdee 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -5,7 +5,7 @@
}:
mkDerivation rec {
- name = "teamviewer-${version}";
+ pname = "teamviewer";
version = "14.5.1691";
src = fetchurl {
diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix
new file mode 100644
index 000000000000..d253e766284f
--- /dev/null
+++ b/pkgs/applications/networking/remote/waypipe/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitLab
+, meson, ninja, pkgconfig, scdoc
+, wayland, wayland-protocols, openssh
+, mesa, lz4, zstd, ffmpeg_4, libva
+}:
+
+stdenv.mkDerivation rec {
+ pname = "waypipe-unstable";
+ version = "0.6.1";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.freedesktop.org";
+ owner = "mstoeckl";
+ repo = "waypipe";
+ rev = "v${version}";
+ sha256 = "13kp5snkksli0sj5ldkgybcs1s865f0qdak2w8796xvy8dg9jda8";
+ };
+
+ postPatch = ''
+ substituteInPlace src/waypipe.c \
+ --replace "/usr/bin/ssh" "${openssh}/bin/ssh"
+ '';
+
+ nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
+
+ buildInputs = [
+ wayland wayland-protocols
+ # Optional dependencies:
+ mesa lz4 zstd ffmpeg_4 libva
+ ];
+
+ enableParallelBuilding = true;
+
+ mesonFlags = [ "-Dwerror=false" ]; # TODO: Report warnings upstream
+
+ meta = with stdenv.lib; {
+ description = "A network proxy for Wayland clients (applications)";
+ longDescription = ''
+ waypipe is a proxy for Wayland clients. It forwards Wayland messages and
+ serializes changes to shared memory buffers over a single socket. This
+ makes application forwarding similar to ssh -X feasible.
+ '';
+ homepage = https://mstoeckl.com/notes/gsoc/blog.html;
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ primeos ];
+ };
+}
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 2cfbfb1b201e..13bcbf9b57e1 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh
, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }:
-mkDerivation rec {
+mkDerivation {
pname = "x2goclient";
version = "unstable-2019-07-24";
diff --git a/pkgs/applications/networking/remote/x2goserver/default.nix b/pkgs/applications/networking/remote/x2goserver/default.nix
new file mode 100644
index 000000000000..f69d2326217d
--- /dev/null
+++ b/pkgs/applications/networking/remote/x2goserver/default.nix
@@ -0,0 +1,93 @@
+{ stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs
+, utillinux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg
+, nettools, iproute, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash
+}:
+
+let
+ pname = "x2goserver";
+ version = "4.1.0.3";
+
+ src = fetchurl {
+ url = "http://code.x2go.org/releases/source/x2goserver/${pname}-${version}.tar.gz";
+ sha256 = "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7";
+ };
+
+ x2go-perl = perlPackages.buildPerlPackage rec {
+ pname = "X2Go";
+ inherit version src;
+ makeFlags = [ "-f" "Makefile.perl" ];
+ patchPhase = ''
+ substituteInPlace X2Go/Config.pm --replace '/etc/x2go' '/var/lib/x2go/conf'
+ substituteInPlace X2Go/Server/DB.pm \
+ --replace '$x2go_lib_path/libx2go-server-db-sqlite3-wrapper' \
+ '/run/wrappers/bin/x2gosqliteWrapper'
+ substituteInPlace X2Go/Server/DB/SQLite3.pm --replace "user='x2gouser'" "user='x2go'"
+ '';
+ };
+
+ perlEnv = perl.withPackages (p: with p; [
+ x2go-perl DBI DBDSQLite FileBaseDir TryTiny CaptureTiny ConfigSimple Switch
+ ]);
+
+ binaryDeps = [
+ perlEnv which nx-libs utillinux coreutils glibc.bin gawk gnused gnugrep
+ findutils nettools iproute bc procps psmisc lsof pwgen openssh sshfs
+ xorg.xauth xorg.xinit xorg.xrandr xorg.xmodmap xorg.xwininfo xorg.fontutil
+ xorg.xkbcomp xorg.setxkbmap
+ ];
+in
+stdenv.mkDerivation rec {
+ inherit pname version src;
+
+ buildInputs = [ perlEnv bash ];
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ prePatch = ''
+ patchShebangs .
+ sed -i '/Makefile.PL\|Makefile.perl/d' Makefile
+ for i in */Makefile; do
+ substituteInPlace "$i" --replace "-o root -g root " ""
+ done
+ substituteInPlace libx2go-server-db-perl/Makefile --replace "chmod 2755" "chmod 755"
+ for i in x2goserver/sbin/x2godbadmin x2goserver/bin/x2go*
+ do
+ substituteInPlace $i --replace '/etc/x2go' '/var/lib/x2go/conf'
+ done
+ substituteInPlace x2goserver/sbin/x2gocleansessions \
+ --replace '/var/run/x2goserver.pid' '/var/run/x2go/x2goserver.pid'
+ substituteInPlace x2goserver/sbin/x2godbadmin --replace 'user="x2gouser"' 'user="x2go"'
+ substituteInPlace x2goserver-xsession/etc/Xsession \
+ --replace "SSH_AGENT /bin/bash -c" "SSH_AGENT ${bash}/bin/bash -c" \
+ --replace "[ -f /etc/redhat-release ]" "[ -d /etc/nix ] || [ -f /etc/redhat-release ]"
+ '';
+
+ makeFlags = [ "PREFIX=/" "NXLIBDIR=${nx-libs}/lib/nx" ];
+
+ installFlags = [ "DESTDIR=$(out)" ];
+
+ postInstall = ''
+ mv $out/etc/x2go/x2goserver.conf{,.example}
+ mv $out/etc/x2go/x2goagent.options{,.example}
+ ln -sf ${nx-libs}/bin/nxagent $out/bin/x2goagent
+ for i in $out/sbin/x2go* $(find $out/bin -type f) \
+ $(ls $out/lib/x2go/x2go* | grep -v x2gocheckport)
+ do
+ wrapProgram $i --prefix PATH : ${lib.makeBinPath binaryDeps}:$out
+ done
+ # We're patching @INC of the setgid wrapper, because we can't mix
+ # the perl wrapper (for PERL5LIB) with security.wrappers (for setgid)
+ sed -ie "s,.\+bin/perl,#!${perl}/bin/perl -I ${perlEnv}/lib/perl5/site_perl," \
+ $out/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Remote desktop application, server component";
+ homepage = "http://x2go.org/";
+ platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.averelld ];
+ };
+}
diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix
index 442881398f63..5d33f186df7b 100644
--- a/pkgs/applications/networking/remote/xrdp/default.nix
+++ b/pkgs/applications/networking/remote/xrdp/default.nix
@@ -2,7 +2,7 @@
let
xorgxrdp = stdenv.mkDerivation rec {
- name = "xorgxrdp-${version}";
+ pname = "xorgxrdp";
version = "0.2.9";
src = fetchFromGitHub {
@@ -35,7 +35,7 @@ let
xrdp = stdenv.mkDerivation rec {
version = "0.9.9";
- name = "xrdp-${version}";
+ pname = "xrdp";
src = fetchFromGitHub {
owner = "volth";
diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index 1844711066b0..e9d0727d31cf 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -2,20 +2,20 @@
let
arch = {
- "x86_64-linux" = "x64";
- "i686-linux" = "i386";
+ x86_64-linux = "x64";
+ i686-linux = "i386";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
in stdenv.mkDerivation rec {
- name = "resilio-sync-${version}";
+ pname = "resilio-sync";
version = "2.6.3";
src = fetchurl {
url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
sha256 = {
- "x86_64-linux" = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz";
- "i686-linux" = "1dh0hxbd33bs51xib3qwxw58h9j30v0dc10b4x4rwkbgsj11nc83";
+ x86_64-linux = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz";
+ i686-linux = "1dh0hxbd33bs51xib3qwxw58h9j30v0dc10b4x4rwkbgsj11nc83";
}.${stdenv.hostPlatform.system};
};
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index e93410d2669c..16430d31e835 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
mkDerivation rec {
version = "6.2.11";
- name = "seafile-client-${version}";
+ pname = "seafile-client";
src = fetchFromGitHub {
owner = "haiwen";
diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix
index 69ae40b76180..dc578dccd19d 100644
--- a/pkgs/applications/networking/sieve-connect/default.nix
+++ b/pkgs/applications/networking/sieve-connect/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
stdenv.mkDerivation rec {
- name = "sieve-connect-${version}";
+ pname = "sieve-connect";
version = "0.90";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix
index 10c8c4235e54..dbff491fa807 100644
--- a/pkgs/applications/networking/sniffers/ettercap/default.nix
+++ b/pkgs/applications/networking/sniffers/ettercap/default.nix
@@ -3,7 +3,7 @@
, pkgconfig }:
stdenv.mkDerivation rec {
- name = "ettercap-${version}";
+ pname = "ettercap";
version = "0.8.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix
index 0c793c41c55a..0005a5d230d7 100644
--- a/pkgs/applications/networking/sniffers/kismet/default.nix
+++ b/pkgs/applications/networking/sniffers/kismet/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpcap, ncurses, expat, pcre, libnl }:
stdenv.mkDerivation rec {
- name = "kismet-${version}";
+ pname = "kismet";
version = "2016-07-R1";
src = fetchurl {
- url = "https://www.kismetwireless.net/code/${name}.tar.xz";
+ url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz";
sha256 = "0dz28y4ay4lskhl0lawqy2dkcrhgfkbg06v22qxzzw8i6caizcmx";
};
diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix
index 10bb465b8a1b..301802d322bd 100644
--- a/pkgs/applications/networking/sniproxy/default.nix
+++ b/pkgs/applications/networking/sniproxy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }:
stdenv.mkDerivation rec {
- name = "sniproxy-${version}";
+ pname = "sniproxy";
version = "0.6.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix
index 1034acf0b90f..9de525d93245 100644
--- a/pkgs/applications/networking/soapui/default.nix
+++ b/pkgs/applications/networking/soapui/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, writeText, jdk, maven, makeWrapper }:
stdenv.mkDerivation rec {
- name = "soapui-${version}";
+ pname = "soapui";
version = "5.5.0";
src = fetchurl {
diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
index a38a9140b490..158e6c5dad15 100644
--- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
+++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
@@ -2,7 +2,7 @@
with stdenv.lib;
-python27Packages.buildPythonApplication rec {
+python27Packages.buildPythonApplication {
pname = "nicotine-plus";
version = "1.4.1";
diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix
index d96a810ee05a..11c8af368b95 100644
--- a/pkgs/applications/networking/spideroak/default.nix
+++ b/pkgs/applications/networking/spideroak/default.nix
@@ -14,7 +14,8 @@ let
version = "7.5.0";
in stdenv.mkDerivation {
- name = "spideroak-${version}";
+ pname = "spideroak";
+ inherit version;
src = fetchurl {
name = "SpiderOakONE-${version}-slack_tar_x64.tgz";
diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
index 706dd6703248..74a02f47c3bf 100644
--- a/pkgs/applications/networking/ssb/patchwork-classic/default.nix
+++ b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
@@ -5,11 +5,11 @@
glibc, systemd
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2.12.0";
- name = "patchwork-classic-${version}";
+ pname = "patchwork-classic";
src = fetchurl {
url = "https://github.com/ssbc/patchwork-classic-electron/releases/download/v2.12.0/ssb-patchwork-electron_2.12.0_linux-amd64.deb";
diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix
index 8d6d5e2a4f94..349c4f5e799e 100644
--- a/pkgs/applications/networking/ssb/patchwork/default.nix
+++ b/pkgs/applications/networking/ssb/patchwork/default.nix
@@ -11,7 +11,7 @@ let
};
binary = appimageTools.wrapType2 {
- name = "${pname}";
+ name = pname;
inherit src;
};
# we only use this to extract the icon
diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix
index 3f87c8558e1f..c5ff090a8076 100644
--- a/pkgs/applications/networking/super-productivity/default.nix
+++ b/pkgs/applications/networking/super-productivity/default.nix
@@ -53,7 +53,8 @@ let
throw "super-productivity is not supported on ${stdenv.hostPlatform.system}";
in stdenv.mkDerivation {
- name = "super-productivity-${version}";
+ pname = "super-productivity";
+ inherit version;
inherit src;
diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix
index e4ba29d3a9f8..669ab4d1e3e5 100644
--- a/pkgs/applications/networking/sync/acd_cli/default.nix
+++ b/pkgs/applications/networking/sync/acd_cli/default.nix
@@ -3,7 +3,6 @@
, fusepy, sqlalchemy }:
buildPythonApplication rec {
- name = pname + "-" + version;
pname = "acd_cli";
version = "0.3.2";
diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
index fae838a7d5f8..36c4dd46222e 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -5,7 +5,7 @@ let
in stdenv.mkDerivation rec {
version = "1.1.24";
- name = "backintime-common-${version}";
+ pname = "backintime-common";
src = fetchFromGitHub {
owner = "bit-team";
diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix
index 26288f9f6e65..b72ddc8bae63 100644
--- a/pkgs/applications/networking/sync/backintime/qt4.nix
+++ b/pkgs/applications/networking/sync/backintime/qt4.nix
@@ -1,9 +1,9 @@
{stdenv, makeWrapper, gettext, backintime-common, python3, python3Packages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (backintime-common) version src installFlags;
- name = "backintime-qt4-${version}";
+ pname = "backintime-qt4";
buildInputs = [ makeWrapper gettext python3 python3Packages.pyqt4 backintime-common python3 ];
diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix
index 8d9b941e26e4..cdec695d90f2 100644
--- a/pkgs/applications/networking/sync/casync/default.nix
+++ b/pkgs/applications/networking/sync/casync/default.nix
@@ -7,8 +7,8 @@
, glibcLocales, rsync
}:
-stdenv.mkDerivation rec {
- name = "casync-${version}";
+stdenv.mkDerivation {
+ pname = "casync";
version = "2-152-ge4a3c5e";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix
index 6dcd451533ae..d38f8b53dbbf 100644
--- a/pkgs/applications/networking/sync/desync/default.nix
+++ b/pkgs/applications/networking/sync/desync/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "desync-${version}";
+ pname = "desync";
version = "0.4.0";
rev = "v${version}";
diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix
index b0315ee3477d..832f7c63f275 100644
--- a/pkgs/applications/networking/sync/lsyncd/default.nix
+++ b/pkgs/applications/networking/sync/lsyncd/default.nix
@@ -2,7 +2,7 @@
asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }:
stdenv.mkDerivation rec {
- name = "lsyncd-${version}";
+ pname = "lsyncd";
version = "2.2.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/applications/networking/sync/rclone/browser.nix
index 4325c8ea88ae..00edcd411fd5 100644
--- a/pkgs/applications/networking/sync/rclone/browser.nix
+++ b/pkgs/applications/networking/sync/rclone/browser.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, qtbase }:
stdenv.mkDerivation rec {
- name = "rclone-browser-${version}";
+ pname = "rclone-browser";
version = "1.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 52527f79303f..3e93dcc44405 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "rclone";
- version = "1.49.1";
+ version = "1.49.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "0mjwp1j70dqa8k3zxhcnw85ddhagkpr7c59mv8kradv6mqqzmq9c";
+ sha256 = "1a90fr7cw78qhwdgkjwshap345jk1ipm3nnk7xf3nayiyibvk5dg";
};
modSha256 = "158mpmy8q67dk1ks9p926n1670gsk7rhd0vpjh44f4g64ddnhk03";
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index 12f992d44a5a..19e2eaa5fa23 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -3,7 +3,7 @@
let
base = import ./base.nix { inherit stdenv fetchurl; };
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "rrsync-${base.version}";
src = base.src;
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index ad5a35eb251f..bc93b743f8b1 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation (rec {
- name = "unison-${version}";
+ pname = "unison";
version = "2.51.2";
src = fetchFromGitHub {
owner = "bcpierce00";
diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
index 763c740c8175..3e5d3187e9b2 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildPythonApplication, pyside, twisted, certifi }:
buildPythonApplication rec {
- name = "syncplay-${version}";
+ pname = "syncplay";
version = "1.6.4";
format = "other";
diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
index 328561529ce5..9317ccab4eab 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -6,7 +6,7 @@
buildPythonApplication rec {
version = "0.9.4";
- name = "syncthing-gtk-${version}";
+ pname = "syncthing-gtk";
src = fetchFromGitHub {
owner = "syncthing";
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 5b847163a2a7..7bfe697105eb 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -3,19 +3,19 @@
let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
- version = "1.2.1";
+ version = "1.2.2";
name = "${stname}-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
- sha256 = "0q1x6kd5kaij8mvs6yll2vqfzrbb31y5hpg6g5kjc8gngwv4rl6v";
+ sha256 = "0zkyjnjrla0vpvidwwr4z4kxc9cyjcfbjdzsr34xz7rw3jswswm9";
};
goPackagePath = "github.com/syncthing/syncthing";
- modSha256 = "1daixrpdj97ck02853hwp8l158sja5a7a37h0gdbwb1lgf5hsn05";
+ modSha256 = "0pp2gjx227crggph924q7sg6ak8nyl8nlsffpmawq4zl1908lsrd";
patches = [
./add-stcli-target.patch
diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix
index 8a056e21692b..a71425422383 100644
--- a/pkgs/applications/networking/tcpkali/default.nix
+++ b/pkgs/applications/networking/tcpkali/default.nix
@@ -3,7 +3,8 @@
let version = "1.1.1"; in
stdenv.mkDerivation rec {
- name = "tcpkali-${version}";
+ pname = "tcpkali";
+ inherit version;
src = fetchFromGitHub {
owner = "machinezone";
repo = "tcpkali";
diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix
index 46649c069111..a3cde14f34c0 100644
--- a/pkgs/applications/networking/transporter/default.nix
+++ b/pkgs/applications/networking/transporter/default.nix
@@ -18,7 +18,7 @@
let
pname = "Transporter";
version = "1.3.3";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/tsung/default.nix b/pkgs/applications/networking/tsung/default.nix
index 050c8502e077..6f5a3f3ec16f 100644
--- a/pkgs/applications/networking/tsung/default.nix
+++ b/pkgs/applications/networking/tsung/default.nix
@@ -5,7 +5,7 @@
gnuplot }:
stdenv.mkDerivation rec {
- name = "tsung-${version}";
+ pname = "tsung";
version = "1.7.0";
src = fetchurl {
url = "http://tsung.erlang-projects.org/dist/tsung-${version}.tar.gz";
diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix
index a1fe790b1190..1a19c8c96b33 100644
--- a/pkgs/applications/networking/umurmur/default.nix
+++ b/pkgs/applications/networking/umurmur/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, openssl, protobufc, libconfig }:
stdenv.mkDerivation rec {
- name = "umurmur-${version}";
+ pname = "umurmur";
version = "0.2.17";
src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index 8a210c1af681..acda73b0f091 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "vnstat";
- version = "2.3";
+ version = "2.4";
src = fetchurl {
- sha256 = "138s79dqxrm59xc2s2xch16qkzzjks580sac4ppq8jy5lxrzj2i8";
+ sha256 = "1amb8l97y6acp9j1xs2da3mdk6hykg6drzsps9im8vfmmfcmk5d0";
url = "https://humdi.net/${pname}/${pname}-${version}.tar.gz";
};
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index 08fa53a6e388..238864311ef0 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -12,11 +12,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "znc-${version}";
+ pname = "znc";
version = "1.7.4";
src = fetchurl {
- url = "https://znc.in/releases/archive/${name}.tar.gz";
+ url = "https://znc.in/releases/archive/${pname}-${version}.tar.gz";
sha256 = "0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi";
};
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index fce885a25941..54e148f0833e 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -15,7 +15,7 @@ let
passthru.module_name = module_name;
});
-in rec {
+in {
backlog = zncDerivation rec {
name = "znc-backlog-${version}";
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index 6808a81bec1d..a2b14443c1a9 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "abiword-${version}";
+ pname = "abiword";
version = "3.0.2";
src = fetchurl {
- url = "https://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz";
+ url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz";
sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg";
};
diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix
index 91b12d8a33c3..6ef6e51527e2 100644
--- a/pkgs/applications/office/atlassian-cli/default.nix
+++ b/pkgs/applications/office/atlassian-cli/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchzip, jre }:
stdenv.mkDerivation rec {
- name = "atlassian-cli-${version}";
+ pname = "atlassian-cli";
version = "8.5.0";
src = fetchzip {
- url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip";
+ url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip";
sha256 = "0c9jq7q0bx0db0zhdh89bv1ijfg7cddbx04v451vl8caqcyhkfgz";
extraPostFetch = "chmod go-w $out";
};
diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix
index 9eec315217cb..aefd696ae4e3 100644
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/pkgs/applications/office/beancount/bean-add.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3Packages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "bean-add-2018-01-08";
src = fetchFromGitHub {
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 4a050eb5d749..4855fbc63c3e 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -16,10 +16,9 @@
mkDerivation rec {
pname = "calligra";
version = "3.1.0";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
+ url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638";
};
diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix
index 461d428787b9..0043648146f5 100644
--- a/pkgs/applications/office/cb2bib/default.nix
+++ b/pkgs/applications/office/cb2bib/default.nix
@@ -1,11 +1,10 @@
{ stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }:
stdenv.mkDerivation rec {
- name = pname + "-" + version;
pname = "cb2bib";
version = "2.0.0";
src = fetchurl {
- url = "https://www.molspaces.com/dl/progs/${name}.tar.gz";
+ url = "https://www.molspaces.com/dl/progs/${pname}-${version}.tar.gz";
sha256 = "0gv7cnxi84lr6d5y71pd67h0ilmf5c88j1jxgyn9dvj19smrv99h";
};
buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ];
diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/applications/office/docear/default.nix
index 0d2341113b48..fb9578c909df 100644
--- a/pkgs/applications/office/docear/default.nix
+++ b/pkgs/applications/office/docear/default.nix
@@ -3,7 +3,7 @@
, antialiasFont ? true
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "docear";
version = "1.2";
diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index e33a0b202da0..a5de74a6f165 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -5,15 +5,14 @@ let
in
buildPythonApplication rec {
pname = "fava";
- version = "1.10";
+ version = "1.11";
src = fetchPypi {
inherit pname version;
- sha256 = "145995nzgr06qsn619zap0xqa8ckfrp5azga41smyszq97pd01sj";
+ sha256 = "0gyrxqmfr8igfjnp9lcsl4km17yakj556xns3jp4m9l2407b5zhc";
};
- doCheck = false;
-
+ checkInputs = [ python3.pkgs.pytest ];
propagatedBuildInputs = with python3.pkgs;
[
Babel
@@ -28,6 +27,11 @@ buildPythonApplication rec {
simplejson
];
+ # CLI test expects fava on $PATH. Not sure why static_url fails.
+ checkPhase = ''
+ py.test tests -k 'not cli and not static_url'
+ '';
+
meta = {
homepage = https://beancount.github.io/fava;
description = "Web interface for beancount";
diff --git a/pkgs/applications/office/gnucash/cmake_check_symbol_exists.patch b/pkgs/applications/office/gnucash/cmake_check_symbol_exists.patch
new file mode 100644
index 000000000000..5e0ae68e17c6
--- /dev/null
+++ b/pkgs/applications/office/gnucash/cmake_check_symbol_exists.patch
@@ -0,0 +1,12 @@
+Index: gnucash-3.6/gnucash/register/register-gnome/CMakeLists.txt
+===================================================================
+--- gnucash-3.6.orig/gnucash/register/register-gnome/CMakeLists.txt
++++ gnucash-3.6/gnucash/register/register-gnome/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ add_subdirectory(test)
+
+ #GTK before 3.14 didn't have GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK
++include(CheckSymbolExists)
+ check_symbol_exists(GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK gdk/gdktypes.h have_mod_mask)
+ if (NOT have_mod_mask)
+ if (MAC_INTEGRATION)
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index e4a89b513e9c..3abc447f6e9f 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
- name = "gnucash-${version}";
+ pname = "gnucash";
version = "3.6";
src = fetchurl {
- url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
+ url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
sha256 = "09azp17ghn7i8kwk0ci3gq0qkn5pvbknhf1cbk7v43mvc3g8djzi";
};
@@ -47,6 +47,8 @@ stdenv.mkDerivation rec {
# Should probably be removed next version bump
CXXFLAGS = [ "-Wno-deprecated-declarations" ];
+ patches = [ ./cmake_check_symbol_exists.patch ];
+
postPatch = ''
patchShebangs .
'';
@@ -61,7 +63,7 @@ stdenv.mkDerivation rec {
rm $out/bin/gnucash-valgrind
wrapProgram "$out/bin/gnucash" \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \
+ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" \
--prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \
--prefix PERL5LIB ":" "$PERL5LIB" \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix
index 338cdc170656..752ad70cd094 100644
--- a/pkgs/applications/office/grisbi/default.nix
+++ b/pkgs/applications/office/grisbi/default.nix
@@ -2,11 +2,11 @@
, hicolor-icon-theme, libsoup, gnome3 }:
stdenv.mkDerivation rec {
- name = "grisbi-${version}";
+ pname = "grisbi";
version = "1.2.1";
src = fetchurl {
- url = "mirror://sourceforge/grisbi/${name}.tar.bz2";
+ url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2";
sha1 = "1159c5491967fa7afd251783013579ffb45b891b";
};
diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix
index b39617e02db2..372414c1a76d 100644
--- a/pkgs/applications/office/ib/controller/default.nix
+++ b/pkgs/applications/office/ib/controller/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.14.0";
- name = "ib-controller-${version}";
+ pname = "ib-controller";
src = fetchurl {
url = "https://github.com/ib-controller/ib-controller/archive/${version}.tar.gz";
diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix
index 59ecb5a5c3b7..a88f1af02c65 100644
--- a/pkgs/applications/office/ib/tws/default.nix
+++ b/pkgs/applications/office/ib/tws/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "9542";
- name = "ib-tws-${version}";
+ pname = "ib-tws";
src = requireFile rec {
name = "ibtws_${version}.jar";
diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix
index 8946bbab9316..5065a1cb9bc9 100644
--- a/pkgs/applications/office/impressive/default.nix
+++ b/pkgs/applications/office/impressive/default.nix
@@ -8,7 +8,8 @@ in stdenv.mkDerivation {
# This project was formerly known as KeyJNote.
# See http://keyj.emphy.de/apple-lawsuit/ for details.
- name = "impressive-${version}";
+ pname = "impressive";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz";
diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index ebd5a14ad047..b249186c2f17 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "3.8.1";
- name = "jabref-${version}";
+ pname = "jabref";
src = fetchurl {
url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}.jar";
diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix
index e28a2d0852b6..adad5c8680fc 100644
--- a/pkgs/applications/office/kexi/default.nix
+++ b/pkgs/applications/office/kexi/default.nix
@@ -10,10 +10,9 @@
mkDerivation rec {
pname = "kexi";
version = "3.2.0";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+ url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz";
sha256 = "1zy1q7q9rfdaws3rwf3my22ywkn6g747s3ixfcg9r80mm2g3z0bs";
};
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 363c484fa28d..0cb23abea66a 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -15,11 +15,11 @@
}:
stdenv.mkDerivation rec {
- name = "kmymoney-${version}";
+ pname = "kmymoney";
version = "5.0.5";
src = fetchurl {
- url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz";
+ url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz";
sha256 = "1hghs4676kn2giwpwz1y7p6djpmi41x64idf3ybiz8ky14a5s977";
};
diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix
index df8298579e8f..0a8f68bc0961 100644
--- a/pkgs/applications/office/ledger-web/default.nix
+++ b/pkgs/applications/office/ledger-web/default.nix
@@ -3,7 +3,7 @@
, withSqlite ? false, sqlite
}:
-bundlerApp rec {
+bundlerApp {
pname = "ledger_web";
gemdir = ./.;
exes = [ "ledger_web" ];
diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index 276134efd73d..99e09a8f36f2 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -2,7 +2,7 @@
, texinfo, gnused, usePython ? true }:
stdenv.mkDerivation rec {
- name = "ledger-${version}";
+ pname = "ledger";
version = "3.1.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index fe33d72a2167..f5f53e10496b 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -60,7 +60,8 @@ let
};
in stdenv.mkDerivation rec {
- name = "libreoffice-${version}";
+ pname = "libreoffice";
+ inherit version;
inherit (primary-src) src;
@@ -278,7 +279,7 @@ in stdenv.mkDerivation rec {
'';
configureFlags = [
- "${if withHelp then "" else "--without-help"}"
+ (if withHelp then "" else "--without-help")
"--with-boost=${boost.dev}"
"--with-boost-libdir=${boost.out}/lib"
"--with-beanshell-jar=${bsh}"
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 969325b00006..eb774a309416 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -60,7 +60,8 @@ let
};
in stdenv.mkDerivation rec {
- name = "libreoffice-${version}";
+ pname = "libreoffice";
+ inherit version;
inherit (primary-src) src;
@@ -278,7 +279,7 @@ in stdenv.mkDerivation rec {
'';
configureFlags = [
- "${if withHelp then "" else "--without-help"}"
+ (if withHelp then "" else "--without-help")
"--with-boost=${boost.dev}"
"--with-boost-libdir=${boost.out}/lib"
"--with-beanshell-jar=${bsh}"
diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix
index ce8910d76d45..08b01a4a051b 100644
--- a/pkgs/applications/office/libreoffice/wrapper.nix
+++ b/pkgs/applications/office/libreoffice/wrapper.nix
@@ -2,7 +2,7 @@
let
jdk = libreoffice.jdk;
in
-(runCommand "${libreoffice.name}" {
+(runCommand libreoffice.name {
inherit dbus libreoffice jdk bash;
} ''
mkdir -p "$out/bin"
diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix
index cdda46d4837f..7c054ba52047 100644
--- a/pkgs/applications/office/marp/default.nix
+++ b/pkgs/applications/office/marp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, atomEnv, libXScrnSaver, gtk2 }:
stdenv.mkDerivation rec {
- name = "marp-${version}";
+ pname = "marp";
version = "0.0.14";
src = fetchurl {
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 3c4434f0098c..a7b0afe0754c 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -91,7 +91,8 @@ let
in
stdenv.mkDerivation {
- name = "mendeley-${version}";
+ pname = "mendeley";
+ inherit version;
src = fetchurl {
url = url;
@@ -129,7 +130,7 @@ stdenv.mkDerivation {
'';
dontStrip = true;
- dontPatchElf = true;
+ dontPatchELF = true;
updateScript = import ./update.nix { inherit writeScript runtimeShell; };
diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix
index 3ddca8fe7620..99824cd19ec0 100644
--- a/pkgs/applications/office/mmex/default.nix
+++ b/pkgs/applications/office/mmex/default.nix
@@ -5,7 +5,8 @@ let
version = "1.3.3";
in
stdenv.mkDerivation {
- name = "money-manager-ex-${version}";
+ pname = "money-manager-ex";
+ inherit version;
src = fetchgit {
url = "https://github.com/moneymanagerex/moneymanagerex.git";
diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix
index 3e666b0f6272..103288c03c62 100644
--- a/pkgs/applications/office/moneyplex/default.nix
+++ b/pkgs/applications/office/moneyplex/default.nix
@@ -18,8 +18,8 @@ let
};
in
-stdenv.mkDerivation rec {
- name = "moneyplex-${version}";
+stdenv.mkDerivation {
+ pname = "moneyplex";
version = "16.0.22424";
src = fetchurl (if stdenv.hostPlatform.system == "i686-linux" then src_i686
diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
index afe8ba2f9178..050222451cf6 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/pkgs/applications/office/mytetra/default.nix
@@ -2,8 +2,9 @@
let
version = "1.44.55";
-in mkDerivation rec {
- name = "mytetra-${version}";
+in mkDerivation {
+ pname = "mytetra";
+ inherit version;
src = fetchurl {
url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz";
sha256 = "13lmfvschm1xwr0ys2ykhs0bb83m2f39rk1jdd7zf8yxlqki4i6l";
diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix
index 20f8b428f0db..b1311428c61d 100644
--- a/pkgs/applications/office/osmo/default.nix
+++ b/pkgs/applications/office/osmo/default.nix
@@ -2,11 +2,11 @@
, libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "osmo-${version}";
+ pname = "osmo";
version = "0.4.2";
src = fetchurl {
- url = "mirror://sourceforge/osmo-pim/${name}.tar.gz";
+ url = "mirror://sourceforge/osmo-pim/${pname}-${version}.tar.gz";
sha256 = "1gjd4w9jckfpqr9n0bw0w25h3qhfyzw1xvilh3hqdadfinwyal2v";
};
diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix
index f1dd10e9420f..af2fd82ddb03 100644
--- a/pkgs/applications/office/paperless/default.nix
+++ b/pkgs/applications/office/paperless/default.nix
@@ -33,7 +33,7 @@
let
paperless = stdenv.mkDerivation rec {
- name = "paperless-${version}";
+ pname = "paperless";
version = "2.7.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix
index d3668d057ee4..c1e0f7da30f6 100644
--- a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix
+++ b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix
@@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchFromGitHub
, pytest, pytest-django, django }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "django-crispy-forms";
version = "2019.04.21";
diff --git a/pkgs/applications/office/paperless/withConfig.nix b/pkgs/applications/office/paperless/withConfig.nix
index aafdfe67adb4..652d1478c0ca 100644
--- a/pkgs/applications/office/paperless/withConfig.nix
+++ b/pkgs/applications/office/paperless/withConfig.nix
@@ -39,7 +39,7 @@ let
PAPERLESS_CONSUMPTION_DIR = "${dataDir}/consume";
PAPERLESS_MEDIADIR = "${dataDir}/media";
PAPERLESS_STATICDIR = "${dataDir}/static";
- PAPERLESS_DBDIR = "${dataDir}";
+ PAPERLESS_DBDIR = dataDir;
}) // config;
envVarDefs = mapAttrsToList (n: v: ''export ${n}="${toString v}"'') envVars;
diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix
index 7e6da96db808..14756c3557f4 100644
--- a/pkgs/applications/office/pinpoint/default.nix
+++ b/pkgs/applications/office/pinpoint/default.nix
@@ -2,10 +2,10 @@
, gdk-pixbuf, cairo, clutter-gtk }:
stdenv.mkDerivation rec {
- name = "pinpoint-${version}";
+ pname = "pinpoint";
version = "0.1.8";
src = fetchurl {
- url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.xz";
+ url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${pname}-${version}.tar.xz";
sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix
index d8765d2fa61a..687b83948cd1 100644
--- a/pkgs/applications/office/planner/default.nix
+++ b/pkgs/applications/office/planner/default.nix
@@ -13,7 +13,8 @@
let version = "unstable-2019-02-13";
in stdenv.mkDerivation {
- name = "planner-${version}";
+ pname = "planner";
+ inherit version;
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@@ -60,7 +61,7 @@ in stdenv.mkDerivation {
Its goal is to be an easy-to-use no-nonsense cross-platform
project management application.
- Planner is a GTK+ application written in C and licensed under the
+ Planner is a GTK application written in C and licensed under the
GPLv2 or any later version. It can store its data in either xml
files or in a postgresql database. Projects can also be printed
to PDF or exported to HTML for easy viewing from any web browser.
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index ecd38627ac5f..42fddb972c9f 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -6,11 +6,11 @@
}:
mkDerivation rec {
- name = "skrooge-${version}";
+ pname = "skrooge";
version = "2.20.0";
src = fetchurl {
- url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
+ url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz";
sha256 = "0rakfngp7j2x7h1isg6lbc5kva6k1kg99dz0zl43dc28s15can1w";
};
diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix
index bbf252d28923..fa2d59392180 100644
--- a/pkgs/applications/office/timetable/default.nix
+++ b/pkgs/applications/office/timetable/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "timetable";
- version = "1.0.6";
+ version = "1.0.8";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
- sha256 = "080xgp917v6j40qxy0y1iycz01yylbcr8pahx6zd6mpi022ccfv0";
+ sha256 = "0s825al10s0hwfzl90bplwwasx89wx28n41sg2md71l9hfqy296q";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix
index 77a602954438..edb2c778a0a5 100644
--- a/pkgs/applications/office/todo.txt-cli/default.nix
+++ b/pkgs/applications/office/todo.txt-cli/default.nix
@@ -2,7 +2,8 @@
let
version = "2.11.0";
in stdenv.mkDerivation {
- name = "todo.txt-cli-${version}";
+ pname = "todo.txt-cli";
+ inherit version;
src = fetchurl {
url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz";
diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index a69fb7a1c6c7..450ee34262b9 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -6,7 +6,6 @@ in
buildPythonApplication rec {
pname = "todoman";
version = "3.5.0";
- name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix
index 951b61e43ef4..000fa7ff1015 100644
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/pkgs/applications/office/treesheets/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, wxGTK, makeWrapper }:
stdenv.mkDerivation rec {
- name = "treesheets-${version}";
+ pname = "treesheets";
version = "1.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix
index c1e2fdcc7dfa..877dfba88c06 100644
--- a/pkgs/applications/office/trilium/default.nix
+++ b/pkgs/applications/office/trilium/default.nix
@@ -12,7 +12,7 @@ let
};
in stdenv.mkDerivation rec {
- name = "trilium-${version}";
+ pname = "trilium";
version = "0.33.6";
src = fetchurl {
diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix
index 89a3d1287964..a4734f454605 100644
--- a/pkgs/applications/office/tudu/default.nix
+++ b/pkgs/applications/office/tudu/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "tudu-${version}";
+ pname = "tudu";
version = "0.10.3";
src = fetchurl {
- url = "https://code.meskio.net/tudu/${name}.tar.gz";
+ url = "https://code.meskio.net/tudu/${pname}-${version}.tar.gz";
sha256 = "0140pw457cd05ysws998yhd3b087j98q8m0g3s4br942l65b8n2y";
};
diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix
index 4271e3d17aa2..199f17afda79 100644
--- a/pkgs/applications/office/wordgrinder/default.nix
+++ b/pkgs/applications/office/wordgrinder/default.nix
@@ -2,13 +2,13 @@
, lua52Packages, libXft, ncurses, ninja, readline, zlib }:
stdenv.mkDerivation rec {
- name = "wordgrinder-${version}";
+ pname = "wordgrinder";
version = "0.7.2";
src = fetchFromGitHub {
repo = "wordgrinder";
owner = "davidgiven";
- rev = "${version}";
+ rev = version;
sha256 = "08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal";
};
diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix
index 4c83d67f7cda..1f21ec60ae2b 100644
--- a/pkgs/applications/office/wpsoffice/default.nix
+++ b/pkgs/applications/office/wpsoffice/default.nix
@@ -8,10 +8,11 @@ let
version = "10.1.0.5672";
in stdenv.mkDerivation rec{
- name = "wpsoffice-${version}";
+ pname = "wpsoffice";
+ inherit version;
src = fetchurl {
- name = "${name}.tar.xz";
+ name = "${pname}-${version}.tar.xz";
url = "http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_${version}~a21_${bits}.tar.xz";
sha256 = if bits == "x86_64" then
"0mi3n9kplf82gd0g2m0np957agy53p4g1qh81pbban49r4n0ajcz" else
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
index f8785616c5e6..b76e09d4d1d6 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@@ -7,16 +7,15 @@
krunner, kwallet
}:
-mkDerivation rec {
+mkDerivation {
pname = "zanshin";
- version = "2017-11-25";
- name = "${pname}-${version}";
+ version = "2019-07-28";
src = fetchFromGitHub {
owner = "KDE";
repo = "zanshin";
- rev = "3df91dd81682d2ccfe542c4582dc1d5f98537c89";
- sha256 = "18wx7bdqzp81xmwi266gphh2lfbcp5s0fzyp654gki40yhkqph6m";
+ rev = "a8c223e745ed7e6aa3dd3cb0786a625a5c54e378";
+ sha256 = "0jglwh30x7qrl41n3dhawn4c25dmrzscpvcajhgb6fwcl4w8cgfm";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index f4c5e604ec49..334a380d9147 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -33,7 +33,7 @@
}:
stdenv.mkDerivation rec {
- name = "zotero-${version}";
+ pname = "zotero";
version = "5.0.73";
src = fetchurl {
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js
'';
- desktopItem = makeDesktopItem rec {
+ desktopItem = makeDesktopItem {
name = "zotero-${version}";
exec = "zotero -url %U";
icon = "zotero";
diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/applications/radio/airspy/default.nix
index 2042f1047b22..0a313c35a182 100644
--- a/pkgs/applications/radio/airspy/default.nix
+++ b/pkgs/applications/radio/airspy/default.nix
@@ -6,7 +6,8 @@ let
version = "1.0.9";
in
stdenv.mkDerivation {
- name = "airspy-${version}";
+ pname = "airspy";
+ inherit version;
src = fetchFromGitHub {
owner = "airspy";
diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix
index 07bf0a542fa3..14badd6c55c5 100644
--- a/pkgs/applications/radio/cubicsdr/default.nix
+++ b/pkgs/applications/radio/cubicsdr/default.nix
@@ -2,7 +2,7 @@
pkgconfig, soapysdr-with-plugins, wxGTK, enableDigitalLab ? false }:
stdenv.mkDerivation rec {
- name = "cubicsdr-${version}";
+ pname = "cubicsdr";
version = "0.2.5";
src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix
index 9b475b04511d..5f25402c3eb6 100644
--- a/pkgs/applications/radio/dablin/default.nix
+++ b/pkgs/applications/radio/dablin/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "Opendigitalradio";
repo = "dablin";
- rev = "${version}";
+ rev = version;
sha256 = "04ir7yg7psnnb48s1qfppvvx6lak4s8f6fqdg721y2kd9129jm82";
};
diff --git a/pkgs/applications/radio/dabtools/default.nix b/pkgs/applications/radio/dabtools/default.nix
index c9dbc59323ef..401e207ba4f6 100644
--- a/pkgs/applications/radio/dabtools/default.nix
+++ b/pkgs/applications/radio/dabtools/default.nix
@@ -2,7 +2,7 @@
, libusb1, rtl-sdr, fftw
} :
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "dabtools";
version = "20180405";
diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/applications/radio/dmrconfig/default.nix
index 7125e37f7f95..f718854224ce 100644
--- a/pkgs/applications/radio/dmrconfig/default.nix
+++ b/pkgs/applications/radio/dmrconfig/default.nix
@@ -2,7 +2,7 @@
, libusb1, systemd }:
stdenv.mkDerivation rec {
- name = "dmrconfig-${version}";
+ pname = "dmrconfig";
version = "1.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/fllog/default.nix b/pkgs/applications/radio/fllog/default.nix
index 713755d8a654..49149a2d82a6 100644
--- a/pkgs/applications/radio/fllog/default.nix
+++ b/pkgs/applications/radio/fllog/default.nix
@@ -8,10 +8,9 @@
stdenv.mkDerivation rec {
version = "1.2.6";
pname = "fllog";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/fldigi/${name}.tar.gz";
+ url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
sha256 = "18nwqbbg5khpkwlr7dn41g6zf7ms2wzxykd42fwdsj4m4z0ysyyg";
};
diff --git a/pkgs/applications/radio/flwrap/default.nix b/pkgs/applications/radio/flwrap/default.nix
index b96f3c2b3278..6bdab0a925d3 100644
--- a/pkgs/applications/radio/flwrap/default.nix
+++ b/pkgs/applications/radio/flwrap/default.nix
@@ -8,10 +8,9 @@
stdenv.mkDerivation rec {
version = "1.3.5";
pname = "flwrap";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/fldigi/${name}.tar.gz";
+ url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
sha256 = "0qqivqkkravcg7j45740xfky2q3k7czqpkj6y364qff424q2pppg";
};
diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix
index 747015d80eeb..ba37b7ecad22 100644
--- a/pkgs/applications/radio/gnss-sdr/default.nix
+++ b/pkgs/applications/radio/gnss-sdr/default.nix
@@ -19,7 +19,7 @@
}:
stdenv.mkDerivation rec {
- name = "gnss-sdr-${version}";
+ pname = "gnss-sdr";
version = "0.0.11";
src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix
index 7c6db61b5291..c26d3e77c70d 100644
--- a/pkgs/applications/radio/gnuradio/ais.nix
+++ b/pkgs/applications/radio/gnuradio/ais.nix
@@ -5,16 +5,16 @@
assert pythonSupport -> python != null && swig != null;
-stdenv.mkDerivation rec {
- name = "gr-ais-${version}";
+stdenv.mkDerivation {
+ pname = "gr-ais";
version = "2015-12-20";
src = fetchFromGitHub {
owner = "bistromath";
repo = "gr-ais";
# Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054
- "rev" = "8502d0252a2a1a9b8d1a71795eaeb5d820684054";
- "sha256" = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh";
+ rev = "8502d0252a2a1a9b8d1a71795eaeb5d820684054";
+ sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix
index f9a50313c472..016540c1e67a 100644
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@@ -25,7 +25,7 @@
}:
stdenv.mkDerivation rec {
- name = "gnuradio-${version}";
+ pname = "gnuradio";
version = "3.7.13.4";
src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix
index 119b7f7600f9..27cdfc74aab3 100644
--- a/pkgs/applications/radio/gnuradio/gsm.nix
+++ b/pkgs/applications/radio/gnuradio/gsm.nix
@@ -5,8 +5,8 @@
assert pythonSupport -> python != null && swig != null;
-stdenv.mkDerivation rec {
- name = "gr-gsm-${version}";
+stdenv.mkDerivation {
+ pname = "gr-gsm";
version = "2016-08-25";
src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix
index af3cabac9ef7..ec1b802c659b 100644
--- a/pkgs/applications/radio/gnuradio/limesdr.nix
+++ b/pkgs/applications/radio/gnuradio/limesdr.nix
@@ -7,8 +7,9 @@ assert pythonSupport -> python != null && swig != null;
let
version = "2.0.0";
-in stdenv.mkDerivation rec {
- name = "gr-limesdr-${version}";
+in stdenv.mkDerivation {
+ pname = "gr-limesdr";
+ inherit version;
src = fetchFromGitHub {
owner = "myriadrf";
diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix
index c3c8721be258..3026c81e8eff 100644
--- a/pkgs/applications/radio/gnuradio/nacl.nix
+++ b/pkgs/applications/radio/gnuradio/nacl.nix
@@ -5,8 +5,8 @@
assert pythonSupport -> python != null && swig != null;
-stdenv.mkDerivation rec {
- name = "gr-nacl-${version}";
+stdenv.mkDerivation {
+ pname = "gr-nacl";
version = "2017-04-10";
src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix
index df2a88033c46..3bb632a819c5 100644
--- a/pkgs/applications/radio/gnuradio/osmosdr.nix
+++ b/pkgs/applications/radio/gnuradio/osmosdr.nix
@@ -12,8 +12,8 @@
assert pythonSupport -> python != null && swig != null;
-stdenv.mkDerivation rec {
- name = "gr-osmosdr-${version}";
+stdenv.mkDerivation {
+ pname = "gr-osmosdr";
version = "2018-08-15";
src = fetchgit {
diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix
index b56e0d226871..e4a55fe50987 100644
--- a/pkgs/applications/radio/gnuradio/rds.nix
+++ b/pkgs/applications/radio/gnuradio/rds.nix
@@ -5,7 +5,7 @@
assert pythonSupport -> python != null && swig != null;
stdenv.mkDerivation rec {
- name = "gr-rds-${version}";
+ pname = "gr-rds";
version = "1.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix
index cd5f8b0db9e6..03acf9e11350 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/applications/radio/gqrx/default.nix
@@ -8,7 +8,7 @@
assert pulseaudioSupport -> libpulseaudio != null;
mkDerivation rec {
- name = "gqrx-${version}";
+ pname = "gqrx";
version = "2.11.5";
src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix
index 81a66bf503c0..09b4c84c1314 100644
--- a/pkgs/applications/radio/hackrf/default.nix
+++ b/pkgs/applications/radio/hackrf/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libusb, fftwSinglePrec }:
stdenv.mkDerivation rec {
- name = "hackrf-${version}";
+ pname = "hackrf";
version = "2018.01.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/inspectrum/default.nix b/pkgs/applications/radio/inspectrum/default.nix
index e2232c4b2ec8..ef4bd6129a84 100644
--- a/pkgs/applications/radio/inspectrum/default.nix
+++ b/pkgs/applications/radio/inspectrum/default.nix
@@ -9,7 +9,7 @@
, liquid-dsp
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "inspectrum-unstable-2017-05-31";
src = fetchFromGitHub {
diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/applications/radio/kalibrate-hackrf/default.nix
index 0bd6f573ead0..3964a8c37370 100644
--- a/pkgs/applications/radio/kalibrate-hackrf/default.nix
+++ b/pkgs/applications/radio/kalibrate-hackrf/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fftw, hackrf, libusb1 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "kalibrate-hackrf-unstable-20160827";
# There are no tags/releases, so use the latest commit from git master.
diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix
index 19ebd05e23c1..879cd6e3aac9 100644
--- a/pkgs/applications/radio/kalibrate-rtl/default.nix
+++ b/pkgs/applications/radio/kalibrate-rtl/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, fftw, rtl-sdr, libusb1 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "kalibrate-rtl-20131214";
# There are no tags/releases, so use the latest commit from git master.
diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix
index 3ff73c4ef2ab..4e69b11efbf7 100644
--- a/pkgs/applications/radio/limesuite/default.nix
+++ b/pkgs/applications/radio/limesuite/default.nix
@@ -7,7 +7,8 @@ let
version = "19.04.0";
in stdenv.mkDerivation {
- name = "limesuite-${version}";
+ pname = "limesuite";
+ inherit version;
src = fetchFromGitHub {
owner = "myriadrf";
diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/applications/radio/minimodem/default.nix
index 8d179e8eed11..55cd14cf70da 100644
--- a/pkgs/applications/radio/minimodem/default.nix
+++ b/pkgs/applications/radio/minimodem/default.nix
@@ -5,7 +5,6 @@
stdenv.mkDerivation rec {
version = "0.24-1";
pname = "minimodem";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "kamalmostafa";
diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix
index 13755b88c658..c0f189686ac9 100644
--- a/pkgs/applications/radio/multimon-ng/default.nix
+++ b/pkgs/applications/radio/multimon-ng/default.nix
@@ -3,12 +3,13 @@ let
version = "1.1.8";
in
stdenv.mkDerivation {
- name = "multimon-ng-${version}";
+ pname = "multimon-ng";
+ inherit version;
src = fetchFromGitHub {
owner = "EliasOenal";
repo = "multimon-ng";
- rev = "${version}";
+ rev = version;
sha256 = "1973xfyvzl1viz19zr83cgqlx5laxbjrca35rqabn6dlb6xb5xk8";
};
diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix
index 40a168675f67..a00ec6c47eb8 100644
--- a/pkgs/applications/radio/qradiolink/default.nix
+++ b/pkgs/applications/radio/qradiolink/default.nix
@@ -8,12 +8,13 @@ let
version = "0.5.0";
in stdenv.mkDerivation {
- name = "qradiolink-${version}";
+ pname = "qradiolink";
+ inherit version;
src = fetchFromGitHub {
owner = "kantooon";
repo = "qradiolink";
- rev = "${version}";
+ rev = version;
sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi";
};
diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix
index c8401cdbf49e..db1bfbb3f89e 100644
--- a/pkgs/applications/radio/qsstv/default.nix
+++ b/pkgs/applications/radio/qsstv/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "9.2.6";
- name = "qsstv-${version}";
+ pname = "qsstv";
src = fetchurl {
url = "http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz";
diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix
index a4d5b2cad1e9..4e9badaa6c51 100644
--- a/pkgs/applications/radio/rtl-sdr/default.nix
+++ b/pkgs/applications/radio/rtl-sdr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, cmake, pkgconfig, libusb1 }:
stdenv.mkDerivation rec {
- name = "rtl-sdr-${version}";
+ pname = "rtl-sdr";
version = "0.6.0";
src = fetchgit {
diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix
index 88dc64471ec7..3d519255ab48 100644
--- a/pkgs/applications/radio/rtl_433/default.nix
+++ b/pkgs/applications/radio/rtl_433/default.nix
@@ -2,10 +2,10 @@
, libusb1, rtl-sdr, soapysdr-with-plugins
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "18.12";
- name = "rtl_433-${version}";
+ pname = "rtl_433";
src = fetchFromGitHub {
owner = "merbanan";
diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix
index 1d8056ca1e81..eacbe66e5e5a 100644
--- a/pkgs/applications/radio/soapyairspy/default.nix
+++ b/pkgs/applications/radio/soapyairspy/default.nix
@@ -6,7 +6,8 @@ let
version = "0.1.2";
in stdenv.mkDerivation {
- name = "soapyairspy-${version}";
+ pname = "soapyairspy";
+ inherit version;
src = fetchFromGitHub {
owner = "pothosware";
diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix
index 5472254b19dc..0bb05a204da7 100644
--- a/pkgs/applications/radio/soapybladerf/default.nix
+++ b/pkgs/applications/radio/soapybladerf/default.nix
@@ -6,7 +6,8 @@ let
version = "0.4.1";
in stdenv.mkDerivation {
- name = "soapybladerf-${version}";
+ pname = "soapybladerf";
+ inherit version;
src = fetchFromGitHub {
owner = "pothosware";
diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix
index 2c5dd058ced3..5ab4c3363f48 100644
--- a/pkgs/applications/radio/soapyhackrf/default.nix
+++ b/pkgs/applications/radio/soapyhackrf/default.nix
@@ -6,7 +6,8 @@ let
version = "0.3.3";
in stdenv.mkDerivation {
- name = "soapyhackrf-${version}";
+ pname = "soapyhackrf";
+ inherit version;
src = fetchFromGitHub {
owner = "pothosware";
diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix
index a0057978ea33..2f73403a168b 100644
--- a/pkgs/applications/radio/soapyremote/default.nix
+++ b/pkgs/applications/radio/soapyremote/default.nix
@@ -4,7 +4,8 @@ let
version = "0.5.1";
in stdenv.mkDerivation {
- name = "soapyremote-${version}";
+ pname = "soapyremote";
+ inherit version;
src = fetchFromGitHub {
owner = "pothosware";
diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix
index d85fe347cd74..8bf473cb36a3 100644
--- a/pkgs/applications/radio/soapyrtlsdr/default.nix
+++ b/pkgs/applications/radio/soapyrtlsdr/default.nix
@@ -6,7 +6,8 @@ let
version = "0.3.0";
in stdenv.mkDerivation {
- name = "soapyrtlsdr-${version}";
+ pname = "soapyrtlsdr";
+ inherit version;
src = fetchFromGitHub {
owner = "pothosware";
diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix
index 6754e8f2a55c..5e4a78cfbd22 100644
--- a/pkgs/applications/radio/soapysdr/default.nix
+++ b/pkgs/applications/radio/soapysdr/default.nix
@@ -13,7 +13,8 @@ let
extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages;
in stdenv.mkDerivation {
- name = "soapysdr-${version}";
+ pname = "soapysdr";
+ inherit version;
src = fetchFromGitHub {
owner = "pothosware";
diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix
index 6ed88e0431e3..9e910584158d 100644
--- a/pkgs/applications/radio/soapyuhd/default.nix
+++ b/pkgs/applications/radio/soapyuhd/default.nix
@@ -6,7 +6,8 @@ let
version = "0.3.6";
in stdenv.mkDerivation {
- name = "soapyuhd-${version}";
+ pname = "soapyuhd";
+ inherit version;
src = fetchFromGitHub {
owner = "pothosware";
diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix
index fd0bd8d5d75f..4b5c2c683444 100644
--- a/pkgs/applications/radio/uhd/default.nix
+++ b/pkgs/applications/radio/uhd/default.nix
@@ -21,12 +21,13 @@ let
};
in stdenv.mkDerivation {
- name = "uhd-${version}";
+ pname = "uhd";
+ inherit version;
src = fetchFromGitHub {
owner = "EttusResearch";
repo = "uhd";
- rev = "${uhdVer}";
+ rev = uhdVer;
sha256 = "0y1hff4vslfv36vxgvjqajg4862a11d4wgr0vcb0visgh1bi8qgy";
};
diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix
index 2aeba5fb5f4a..fe31fd133e79 100644
--- a/pkgs/applications/radio/unixcw/default.nix
+++ b/pkgs/applications/radio/unixcw/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, libpulseaudio, alsaLib , pkgconfig, qt5}:
stdenv.mkDerivation rec {
- name = "unixcw-${version}";
+ pname = "unixcw";
version = "3.5.1";
src = fetchurl {
url = "mirror://sourceforge/unixcw/unixcw_${version}.orig.tar.gz";
diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix
index acf0226c0db5..c6b09595c202 100644
--- a/pkgs/applications/radio/welle-io/default.nix
+++ b/pkgs/applications/radio/welle-io/default.nix
@@ -7,7 +7,8 @@ let
in stdenv.mkDerivation {
- name = "welle-io-${version}";
+ pname = "welle-io";
+ inherit version;
src = fetchFromGitHub {
owner = "AlbrechtL";
diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
index 3150d41ca9f6..32d89866b5ae 100644
--- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
+++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre, makeWrapper, unzip }:
stdenv.mkDerivation rec {
- name = "astrolabe-generator-${version}";
+ pname = "astrolabe-generator";
version = "3.3";
src = fetchurl {
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index 9f65c63f7a6f..a21c9f328f40 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, gtk2-x11 , pkgconfig , python27 , gfortran , lesstif
-, cfitsio , getopt , perl , groff , which
+, cfitsio , getopt , perl , groff , which, darwin
}:
let
@@ -7,28 +7,31 @@ let
in
stdenv.mkDerivation rec {
- srcVersion = "jul19a";
- version = "20190701_a";
- name = "gildas-${version}";
+ srcVersion = "sep19a";
+ version = "20190901_a";
+ pname = "gildas";
src = fetchurl {
# For each new release, the upstream developers of Gildas move the
# source code of the previous release to a different directory
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
- sha256 = "97eaa0d0a0f53f0616462642a9bfaddb0305a8a0948e60531d8a524a13a370b6";
+ sha256 = "0l4jfzzxp1ab70a920qfbxiphgnc06m46wfwv0jlsq2mfk7cxac1";
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ];
- buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ];
+ buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]
+ ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]);
patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
+ NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks");
+
configurePhase=''
substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out
substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env}
diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix
index 9bacf6d90417..f36431beac13 100644
--- a/pkgs/applications/science/astronomy/gpredict/default.nix
+++ b/pkgs/applications/science/astronomy/gpredict/default.nix
@@ -6,7 +6,8 @@
let
version = "2.2.1";
in stdenv.mkDerivation {
- name = "gpredict-${version}";
+ pname = "gpredict";
+ inherit version;
src = fetchurl {
url = "https://github.com/csete/gpredict/releases/download/v${version}/gpredict-${version}.tar.bz2";
@@ -20,7 +21,7 @@ in stdenv.mkDerivation {
description = "Real time satellite tracking and orbit prediction";
longDescription = ''
Gpredict is a real time satellite tracking and orbit prediction program
- written using the Gtk+ widgets. Gpredict is targetted mainly towards ham radio
+ written using the GTK widgets. Gpredict is targetted mainly towards ham radio
operators but others interested in satellite tracking may find it useful as
well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the
NORAD Keplerian elements.
diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix
index dc7c7c920a17..cfdd320d201c 100644
--- a/pkgs/applications/science/astronomy/openspace/default.nix
+++ b/pkgs/applications/science/astronomy/openspace/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "0.11.1";
- name = "openspace-${version}";
+ pname = "openspace";
src = fetchFromGitHub {
owner = "OpenSpace";
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index e3c66199f11c..ecca9141d9fb 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -5,7 +5,7 @@
}:
mkDerivation rec {
- name = "stellarium-${version}";
+ pname = "stellarium";
version = "0.19.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix
index fef4ca1907fd..e9fc06079981 100644
--- a/pkgs/applications/science/astronomy/xearth/default.nix
+++ b/pkgs/applications/science/astronomy/xearth/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, imake, gccmakedep, libXt, libXext }:
stdenv.mkDerivation rec {
- name = "xearth-${version}";
+ pname = "xearth";
version = "1.1";
src = fetchurl {
- url = "http://xearth.org/${name}.tar.gz";
+ url = "http://xearth.org/${pname}-${version}.tar.gz";
sha256 = "bcb1407cc35b3f6dd3606b2c6072273b6a912cbd9ed1ae22fb2d26694541309c";
};
diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix
index d1a990a5eb28..6e1a2a3407ee 100644
--- a/pkgs/applications/science/biology/ants/default.nix
+++ b/pkgs/applications/science/biology/ants/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk }:
stdenv.mkDerivation rec {
- _name = "ANTs";
- _version = "2.2.0";
- name = "${_name}-${_version}";
+ pname = "ANTs";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "ANTsX";
@@ -12,8 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "1hrdwv3m9xh3yf7l0rm2ggxc2xzckfb8srs88g485ibfszx7i03q";
};
+ patches = [
+ # Fix build with gcc8
+ (fetchpatch {
+ url = "https://github.com/ANTsX/ANTs/commit/89af9b2694715bf8204993e032fa132f80cf37bd.patch";
+ sha256 = "1glkrwa1jmxxbmzihycxr576azjqby31jwpj165qc54c91pn0ams";
+ })
+ ];
+
nativeBuildInputs = [ cmake makeWrapper ];
- buildInputs = [ itk vtk ];
+ buildInputs = [ itk4 vtk ];
cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];
@@ -26,7 +33,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = https://github.com/ANTxS/ANTs;
+ homepage = https://github.com/ANTsX/ANTs;
description = "Advanced normalization toolkit for medical image registration and other processing";
maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.unix;
diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix
index 539d7c224463..d8ffbb74e6b0 100644
--- a/pkgs/applications/science/biology/bcftools/default.nix
+++ b/pkgs/applications/science/biology/bcftools/default.nix
@@ -1,12 +1,11 @@
{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python, bash }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "bcftools";
version = "1.9";
src = fetchurl {
- url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2";
+ url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2";
sha256 = "1j3h638i8kgihzyrlnpj82xg1b23sijibys9hvwari3fy7kd0dkg";
};
diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix
index 2cdd7fda38ef..4e4c093ad7f7 100644
--- a/pkgs/applications/science/biology/bedtools/default.nix
+++ b/pkgs/applications/science/biology/bedtools/default.nix
@@ -1,14 +1,14 @@
{stdenv, fetchFromGitHub, zlib, python, bzip2, lzma}:
stdenv.mkDerivation rec {
- name = "bedtools-${version}";
- version = "2.28.0";
+ pname = "bedtools";
+ version = "2.29.0";
src = fetchFromGitHub {
owner = "arq5x";
repo = "bedtools2";
rev = "v${version}";
- sha256 = "1266bcn5hgbvysfi6nr4cqxlbxcx7vn7ng8kb0v3gz37qh2zxxw9";
+ sha256 = "0d6i985qqxp92ddq4n6558m70qi5rqhl724wrfys0hm0p6a9h56x";
};
buildInputs = [ zlib python bzip2 lzma ];
diff --git a/pkgs/applications/science/biology/bftools/default.nix b/pkgs/applications/science/biology/bftools/default.nix
index 24a6e052df9e..158291049347 100644
--- a/pkgs/applications/science/biology/bftools/default.nix
+++ b/pkgs/applications/science/biology/bftools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, makeWrapper, fetchzip, jre }:
stdenv.mkDerivation rec {
- name = "bftools-${version}";
+ pname = "bftools";
version = "5.9.2";
src = fetchzip {
diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix
index 21e2f56bdf97..962428d67cf9 100644
--- a/pkgs/applications/science/biology/bowtie2/default.nix
+++ b/pkgs/applications/science/biology/bowtie2/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "bowtie2";
version = "2.3.5.1";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "BenLangmead";
diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix
index d1dbacf053fb..5e39320bf835 100644
--- a/pkgs/applications/science/biology/bwa/default.nix
+++ b/pkgs/applications/science/biology/bwa/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
- name = "bwa-${version}";
+ pname = "bwa";
version = "0.7.17";
src = fetchurl {
- url = "mirror://sourceforge/bio-bwa/${name}.tar.bz2";
+ url = "mirror://sourceforge/bio-bwa/${pname}-${version}.tar.bz2";
sha256 = "1zfhv2zg9v1icdlq4p9ssc8k01mca5d1bd87w71py2swfi74s6yy";
};
diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/pkgs/applications/science/biology/clustal-omega/default.nix
index 3464e134ee85..00acc25028c0 100644
--- a/pkgs/applications/science/biology/clustal-omega/default.nix
+++ b/pkgs/applications/science/biology/clustal-omega/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.2.4";
- name = "clustal-omega-${version}";
+ pname = "clustal-omega";
src = fetchurl {
- url = "http://www.clustal.org/omega/${name}.tar.gz";
+ url = "http://www.clustal.org/omega/${pname}-${version}.tar.gz";
sha256 = "1vm30mzncwdv881vrcwg11vzvrsmwy4wg80j5i0lcfk6dlld50w6";
};
diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix
index 56de61da1c5a..1ebfa2fca57a 100644
--- a/pkgs/applications/science/biology/cmtk/default.nix
+++ b/pkgs/applications/science/biology/cmtk/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, cmake}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "cmtk-3.3.1";
src = fetchurl {
diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix
index 0e2b5d8b25fe..63d51de9930f 100644
--- a/pkgs/applications/science/biology/dcm2niix/default.nix
+++ b/pkgs/applications/science/biology/dcm2niix/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
version = "1.0.20190410";
- name = "dcm2niix-${version}";
+ pname = "dcm2niix";
src = fetchFromGitHub {
owner = "rordenlab";
diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix
index 854e91b2fcbb..c1d20a11ca96 100644
--- a/pkgs/applications/science/biology/diamond/default.nix
+++ b/pkgs/applications/science/biology/diamond/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "diamond-0.8.36";
src = fetchurl {
diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix
index c9a9b55c31e6..e11f4ebf77c5 100644
--- a/pkgs/applications/science/biology/eggnog-mapper/default.nix
+++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix
@@ -7,7 +7,7 @@ python27Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "eggnogdb";
repo = "eggnog-mapper";
- rev = "${version}";
+ rev = version;
sha256 = "1aaaflppy84bhkh2hb5gnzm4xgrz0rz0cgfpadr9w8cva8p0sqdv";
};
diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix
index 1a15dcf6197d..e1e84c9423bb 100644
--- a/pkgs/applications/science/biology/freebayes/default.nix
+++ b/pkgs/applications/science/biology/freebayes/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, zlib, bzip2, lzma }:
stdenv.mkDerivation rec {
- name = "freebayes-${version}";
+ pname = "freebayes";
version = "2017-08-23";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix
index 9d41fed06911..824856301145 100644
--- a/pkgs/applications/science/biology/hisat2/default.nix
+++ b/pkgs/applications/science/biology/hisat2/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, unzip, which, python, perl}:
stdenv.mkDerivation rec {
- name = "hisat2-${version}";
+ pname = "hisat2";
version = "2.1.0";
src = fetchurl {
diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix
index e43d48db55f3..3adbaf0079ef 100644
--- a/pkgs/applications/science/biology/hmmer/default.nix
+++ b/pkgs/applications/science/biology/hmmer/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "3.2.1";
- name = "hmmer-${version}";
+ pname = "hmmer";
src = fetchurl {
- url = "http://eddylab.org/software/hmmer/${name}.tar.gz";
+ url = "http://eddylab.org/software/hmmer/${pname}-${version}.tar.gz";
sha256 = "171bivy6xhgjsz5nv53n81pc3frnwz29ylblawk2bv46szwjjqd5";
};
diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix
index 95dc2b612e22..412b55f59163 100644
--- a/pkgs/applications/science/biology/igv/default.nix
+++ b/pkgs/applications/science/biology/igv/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip, jre }:
stdenv.mkDerivation rec {
- name = "igv-${version}";
+ pname = "igv";
version = "2.4.19";
src = fetchurl {
diff --git a/pkgs/applications/science/biology/itsx/default.nix b/pkgs/applications/science/biology/itsx/default.nix
index 0c8c7313bf2a..1ba8cdf22ba0 100644
--- a/pkgs/applications/science/biology/itsx/default.nix
+++ b/pkgs/applications/science/biology/itsx/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.1.1";
- name = "itsx-${version}";
+ pname = "itsx";
src = fetchurl {
url = "http://microbiology.se/sw/ITSx_${version}.tar.gz";
diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix
index d80ffea9a780..de93ae5d7829 100644
--- a/pkgs/applications/science/biology/kallisto/default.nix
+++ b/pkgs/applications/science/biology/kallisto/default.nix
@@ -1,25 +1,28 @@
-{ stdenv, fetchFromGitHub, cmake, hdf5, zlib }:
+{ stdenv, fetchFromGitHub, autoconf, cmake, hdf5, zlib }:
stdenv.mkDerivation rec {
- name = "kallisto-${version}";
- version = "0.43.1";
+ pname = "kallisto";
+ version = "0.46.0";
src = fetchFromGitHub {
repo = "kallisto";
owner = "pachterlab";
rev = "v${version}";
- sha256 = "04697pf7jvy7vw126s1rn09q4iab9223jvb1nb0jn7ilwkq7pgwz";
+ sha256 = "09vgdqwpigl4x3sdw5vjfyknsllkli339mh8xapbf7ldm0jldfn9";
};
- nativeBuildInputs = [ cmake ];
-
+ nativeBuildInputs = [ autoconf cmake ];
+
buildInputs = [ hdf5 zlib ];
+ # Parallel build fails in some cases: https://github.com/pachterlab/kallisto/issues/160
+ enableParallelBuilding = false;
+
meta = with stdenv.lib; {
- description = "kallisto is a program for quantifying abundances of transcripts from RNA-Seq data";
- homepage = https://pachterlab.github.io/kallisto;
+ description = "Kallisto is a program for quantifying abundances of transcripts from RNA-Seq data";
+ homepage = "https://pachterlab.github.io/kallisto";
license = licenses.bsd2;
platforms = platforms.linux;
- maintainers = [ maintainers.arcadio ];
+ maintainers = with maintainers; [ arcadio ];
};
}
diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix
index dbbf8d39a93c..d485666f3931 100644
--- a/pkgs/applications/science/biology/messer-slim/default.nix
+++ b/pkgs/applications/science/biology/messer-slim/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "3.2.1";
- name = "messer-slim-${version}";
+ pname = "messer-slim";
src = fetchurl {
url = "https://github.com/MesserLab/SLiM/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix
index 84c65feb0937..bff2bcf428b5 100644
--- a/pkgs/applications/science/biology/minimap2/default.nix
+++ b/pkgs/applications/science/biology/minimap2/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, zlib }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "minimap2";
version = "2.17";
diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix
index 1bdb31616e4d..717b8c3ab2f3 100644
--- a/pkgs/applications/science/biology/mosdepth/default.nix
+++ b/pkgs/applications/science/biology/mosdepth/default.nix
@@ -16,7 +16,7 @@ let
};
in stdenv.mkDerivation rec {
- name = "mosdepth-${version}";
+ pname = "mosdepth";
version = "0.2.6";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix
index 875e98499f53..4e6d3494c721 100644
--- a/pkgs/applications/science/biology/neuron/default.nix
+++ b/pkgs/applications/science/biology/neuron/default.nix
@@ -13,7 +13,7 @@
}:
stdenv.mkDerivation rec {
- name = "neuron-${version}";
+ pname = "neuron";
version = "7.5";
nativeBuildInputs = [ which pkgconfig automake autoconf libtool ];
diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/applications/science/biology/niftyreg/default.nix
index 9f1cb8db43d5..6379f2c32826 100644
--- a/pkgs/applications/science/biology/niftyreg/default.nix
+++ b/pkgs/applications/science/biology/niftyreg/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "niftyreg";
version = "1.3.9";
- name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/nifty_reg-${version}/nifty_reg-${version}.tar.gz";
diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/applications/science/biology/niftyseg/default.nix
index e7221855503c..689d3e42c979 100644
--- a/pkgs/applications/science/biology/niftyseg/default.nix
+++ b/pkgs/applications/science/biology/niftyseg/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "niftyseg";
version = "1.0";
- name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/KCL-BMEIS/NiftySeg/archive/v${version}.tar.gz";
sha256 = "11q6yldsxp3k6gfp94c0xhcan2y3finzv8lzizmrc79yps3wjkn0";
diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/applications/science/biology/octopus/default.nix
index 0a2074a06e97..9d81e08d7293 100644
--- a/pkgs/applications/science/biology/octopus/default.nix
+++ b/pkgs/applications/science/biology/octopus/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "octopus";
version = "0.6.3-beta";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "luntergroup";
diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix
index 68efc2030e53..161188f7ef16 100644
--- a/pkgs/applications/science/biology/paml/default.nix
+++ b/pkgs/applications/science/biology/paml/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "4.9i";
- name = "paml-${version}";
+ pname = "paml";
src = fetchurl {
url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz";
sha256 = "1k5lcyls6c33ppp5fxl8ply2fy7i2k0gcqaifsl7gnc81d8ay4dw";
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index e6a5ab741d94..2a57febe8f5d 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, jre, makeWrapper}:
stdenv.mkDerivation rec {
- name = "picard-tools-${version}";
+ pname = "picard-tools";
version = "2.20.5";
src = fetchurl {
diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix
index 323ca90f0a2a..6907c6e3ec82 100644
--- a/pkgs/applications/science/biology/platypus/default.nix
+++ b/pkgs/applications/science/biology/platypus/default.nix
@@ -2,8 +2,8 @@
let python = python27.withPackages (ps: with ps; [ cython ]);
-in stdenv.mkDerivation rec {
- name = "platypus-unstable-${version}";
+in stdenv.mkDerivation {
+ pname = "platypus-unstable";
version = "2018-07-22";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix
index 2efb59f536f6..52f8f70b7796 100644
--- a/pkgs/applications/science/biology/plink-ng/default.nix
+++ b/pkgs/applications/science/biology/plink-ng/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, zlib, openblas, darwin}:
stdenv.mkDerivation rec {
- name = "plink-ng-${version}";
+ pname = "plink-ng";
version = "1.90b3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix
index 3bb9ea06fd46..8a19ae135e87 100755
--- a/pkgs/applications/science/biology/poretools/default.nix
+++ b/pkgs/applications/science/biology/poretools/default.nix
@@ -3,7 +3,6 @@
pythonPackages.buildPythonPackage rec {
pname = "poretools";
version = "unstable-2016-07-10";
- name = "${pname}-${version}";
src = fetchFromGitHub {
repo = pname;
diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix
index 140f70323194..d7ee54bfbcf0 100644
--- a/pkgs/applications/science/biology/raxml/default.nix
+++ b/pkgs/applications/science/biology/raxml/default.nix
@@ -7,7 +7,6 @@
stdenv.mkDerivation rec {
pname = "RAxML";
version = "8.2.12";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "stamatak";
diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix
index c4b4bb522c40..dd1a53472dbc 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@@ -1,12 +1,11 @@
{ stdenv, fetchurl, zlib, htslib, perl, ncurses ? null }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "samtools";
version = "1.9";
src = fetchurl {
- url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2";
+ url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2";
sha256 = "10ilqbmm7ri8z431sn90lvbjwizd0hhkf9rcqw8j823hf26nhgq8";
};
diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix
index a811bc4412f2..72d125ef8b6f 100644
--- a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix
+++ b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix
@@ -1,12 +1,11 @@
{ stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "samtools";
version = "0.1.19";
src = fetchurl {
- url = "mirror://sourceforge/samtools/${name}.tar.bz2";
+ url = "mirror://sourceforge/samtools/${pname}-${version}.tar.bz2";
sha256 = "d080c9d356e5f0ad334007e4461cbcee3c4ca97b8a7a5a48c44883cf9dee63d4";
};
diff --git a/pkgs/applications/science/biology/seaview/default.nix b/pkgs/applications/science/biology/seaview/default.nix
index 17cf903ae49c..69dece88c276 100644
--- a/pkgs/applications/science/biology/seaview/default.nix
+++ b/pkgs/applications/science/biology/seaview/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "4.7";
- name = "seaview-${version}";
+ pname = "seaview";
src = fetchurl {
url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz";
diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix
index dc2246903349..d700ee50a9c6 100644
--- a/pkgs/applications/science/biology/snpeff/default.nix
+++ b/pkgs/applications/science/biology/snpeff/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, jre, unzip, makeWrapper}:
stdenv.mkDerivation rec {
- name = "snpeff-${version}";
+ pname = "snpeff";
version = "4.3t";
src = fetchurl {
diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/applications/science/biology/somatic-sniper/default.nix
index 4bbd6a320035..1961c71f43bb 100644
--- a/pkgs/applications/science/biology/somatic-sniper/default.nix
+++ b/pkgs/applications/science/biology/somatic-sniper/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, cmake, zlib, ncurses}:
stdenv.mkDerivation rec {
- name = "somatic-sniper-${version}";
+ pname = "somatic-sniper";
version = "1.0.5.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix
index e7f5eab8bfaf..84c90d895566 100644
--- a/pkgs/applications/science/biology/strelka/default.nix
+++ b/pkgs/applications/science/biology/strelka/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, cmake, zlib, python2}:
stdenv.mkDerivation rec {
- name = "strelka-${version}";
+ pname = "strelka";
version = "2.9.10";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix
index f685031e87e4..697a444193b1 100644
--- a/pkgs/applications/science/biology/varscan/default.nix
+++ b/pkgs/applications/science/biology/varscan/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, jre, makeWrapper}:
stdenv.mkDerivation rec {
- name = "varscan-${version}";
+ pname = "varscan";
version = "2.4.2";
src = fetchurl {
diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix
index a6f52ae97b59..f6c9ad029c13 100755
--- a/pkgs/applications/science/biology/vcftools/default.nix
+++ b/pkgs/applications/science/biology/vcftools/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, zlib, autoreconfHook, pkgconfig, perl }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "vcftools";
version = "0.1.16";
diff --git a/pkgs/applications/science/biology/xenomapper/default.nix b/pkgs/applications/science/biology/xenomapper/default.nix
new file mode 100644
index 000000000000..cc235c4ca996
--- /dev/null
+++ b/pkgs/applications/science/biology/xenomapper/default.nix
@@ -0,0 +1,23 @@
+{buildPythonPackage, lib, fetchFromGitHub, statistics}:
+
+buildPythonPackage rec {
+ pname = "xenomapper";
+ version = "1.0.2";
+
+ src = fetchFromGitHub {
+ owner = "genomematt";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0mnmfzlq5mhih6z8dq5bkx95vb8whjycz9mdlqwbmlqjb3gb3zhr";
+ };
+
+ propagatedBuildInputs = [ statistics ];
+
+ meta = with lib; {
+ homepage = "http://github.com/genomematt/xenomapper";
+ description = "A utility for post processing mapped reads that have been aligned to a primary genome and a secondary genome and binning reads into species specific, multimapping in each species, unmapped and unassigned bins";
+ license = licenses.gpl3;
+ platforms = platforms.all;
+ maintainers = [ maintainers.jbedo ];
+ };
+}
diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix
index 92f997900d53..12007c940b3d 100644
--- a/pkgs/applications/science/chemistry/gwyddion/default.nix
+++ b/pkgs/applications/science/chemistry/gwyddion/default.nix
@@ -4,7 +4,8 @@ with stdenv.lib;
let version = "2.48"; in
stdenv.mkDerivation {
- name = "gwyddion-${version}";
+ pname = "gwyddion";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/gwyddion/files/gwyddion/${version}/gwyddion-${version}.tar.xz";
sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx";
diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix
index 948aed03fe5e..391ed54dfcb4 100644
--- a/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/pkgs/applications/science/chemistry/marvin/default.nix
@@ -3,7 +3,6 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "marvin";
version = "19.1.0";
diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix
index 46a1d96d8d0f..87dae3b14d9e 100644
--- a/pkgs/applications/science/chemistry/molden/default.nix
+++ b/pkgs/applications/science/chemistry/molden/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "6.2";
- name = "molden-${version}";
+ pname = "molden";
src = fetchurl {
url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz";
diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix
index bc6301e1fd42..487558a23c19 100644
--- a/pkgs/applications/science/chemistry/openmolcas/default.nix
+++ b/pkgs/applications/science/chemistry/openmolcas/default.nix
@@ -11,7 +11,8 @@ let
python = python3.withPackages (ps : with ps; [ six pyparsing ]);
in stdenv.mkDerivation {
- name = "openmolcas-${version}";
+ pname = "openmolcas";
+ inherit version;
src = fetchFromGitLab {
owner = "Molcas";
diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index 7b482d82e2fa..1fc387fcc66d 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -13,8 +13,8 @@ let
description = "A Python-enhanced molecular graphics tool";
desktopItem = makeDesktopItem {
- name = "${pname}";
- exec = "${pname}";
+ name = pname;
+ exec = pname;
desktopName = "PyMol Molecular Graphics System";
genericName = "Molecular Modeler";
comment = description;
diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
index 5e1c77e24751..ea80e9fd5ca7 100644
--- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix
+++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
version = "6.4.1";
- name = "quantum-espresso-${version}";
+ pname = "quantum-espresso";
src = fetchurl {
url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz";
diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix
index eb17a68b8aae..9d7880f57df5 100644
--- a/pkgs/applications/science/chemistry/siesta/default.nix
+++ b/pkgs/applications/science/chemistry/siesta/default.nix
@@ -3,9 +3,9 @@
, mpi ? null, scalapack
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "4.1-b3";
- name = "siesta-${version}";
+ pname = "siesta";
src = fetchurl {
url = "https://launchpad.net/siesta/4.1/4.1-b3/+download/siesta-4.1-b3.tar.gz";
diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix
index 236225959f7a..8b95e73b8913 100644
--- a/pkgs/applications/science/electronics/adms/default.nix
+++ b/pkgs/applications/science/electronics/adms/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "2.3.6";
- name = "adms-${version}";
+ pname = "adms";
src = fetchFromGitHub {
owner = "Qucs";
diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix
index 63bc0911d251..c863fe6aea85 100644
--- a/pkgs/applications/science/electronics/alliance/default.nix
+++ b/pkgs/applications/science/electronics/alliance/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "alliance-${version}";
+ pname = "alliance";
version = "5.1.1";
src = fetchurl {
- url = "http://www-asim.lip6.fr/pub/alliance/distribution/5.0/${name}.tar.bz2";
+ url = "http://www-asim.lip6.fr/pub/alliance/distribution/5.0/${pname}-${version}.tar.bz2";
sha256 = "046c9qwl1vbww0ljm4xyxf5jpz9nq62b2q0wdz9xjimgh4c207w1";
};
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
configureFlags = [
"--prefix=$(out)"
- "--disable-static"
];
preConfigure = ''
diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix
index 58e01f4f9f49..11e1ed524ed2 100644
--- a/pkgs/applications/science/electronics/bitscope/packages.nix
+++ b/pkgs/applications/science/electronics/bitscope/packages.nix
@@ -110,7 +110,7 @@ in {
proto = let
toolName = "bitscope-proto";
version = "0.9.FG13B";
- in mkBitscope rec {
+ in mkBitscope {
inherit toolName version;
# NOTE: this is meant as a demo by BitScope
# NOTE: clicking on logo produces error
diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix
index 8f81a03044be..ff41a498ae71 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/applications/science/electronics/caneda/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }:
stdenv.mkDerivation rec {
- name = "caneda-${version}";
+ pname = "caneda";
version = "0.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix
index 55e8a7b4ffe9..d188365db1dc 100644
--- a/pkgs/applications/science/electronics/dsview/default.nix
+++ b/pkgs/applications/science/electronics/dsview/default.nix
@@ -4,7 +4,7 @@ libusb, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl
}:
stdenv.mkDerivation rec {
- name = "dsview-${version}";
+ pname = "dsview";
version = "0.99";
diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
index c42b70c041af..c2cfc69c50c8 100644
--- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
+++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
@@ -3,10 +3,10 @@ glib, libzip, libserialport, check, libusb, libftdi,
systemd, alsaLib, dsview
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (dsview) version src;
- name = "libsigrok4dsl-${version}";
+ pname = "libsigrok4dsl";
postUnpack = ''
export sourceRoot=$sourceRoot/libsigrok4DSL
diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
index 214f77663434..b7fe5140864c 100644
--- a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
+++ b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix
@@ -2,10 +2,10 @@
glib, check, python3, dsview
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (dsview) version src;
- name = "libsigrokdecode4dsl-${version}";
+ pname = "libsigrokdecode4dsl";
postUnpack = ''
export sourceRoot=$sourceRoot/libsigrokdecode4DSL
diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix
index ba1b9e174bea..2b28f2c06db5 100644
--- a/pkgs/applications/science/electronics/eagle/eagle.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle.nix
@@ -12,7 +12,7 @@ let
];
in
stdenv.mkDerivation rec {
- name = "eagle-${version}";
+ pname = "eagle";
version = "9.4.2";
src = fetchurl {
@@ -36,9 +36,6 @@ let
qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine
];
- doConfigure = false;
- doBuild = false;
-
installPhase = ''
# Extract eagle tarball
mkdir "$out"
diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix
index 69b111562ab2..a9528b05a311 100644
--- a/pkgs/applications/science/electronics/eagle/eagle7.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle7.nix
@@ -13,7 +13,7 @@ let
in
stdenv.mkDerivation rec {
- name = "eagle-${version}";
+ pname = "eagle";
version = "7.7.0";
src =
diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix
index e6e7219ff871..4eb666ada7ce 100644
--- a/pkgs/applications/science/electronics/fped/default.nix
+++ b/pkgs/applications/science/electronics/fped/default.nix
@@ -4,8 +4,8 @@
}:
with lib;
-stdenv.mkDerivation rec {
- name = "fped-${version}";
+stdenv.mkDerivation {
+ pname = "fped";
version = "unstable-2017-05-11";
src = fetchgit {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# This uses '/bin/bash', '/usr/local' and 'lex' by default
makeFlags = [
- "PREFIX=${placeholder ''out''}"
+ "PREFIX=${placeholder "out"}"
"LEX=flex"
"RGBDEF=${netpbm}/share/netpbm/misc/rgb.txt"
];
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index ab5088543102..127e9c05624d 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "fritzing-${version}";
+ pname = "fritzing";
version = "0.9.3b";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix
index 93fe7b6ba77a..1aaa5496ff37 100644
--- a/pkgs/applications/science/electronics/geda/default.nix
+++ b/pkgs/applications/science/electronics/geda/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }:
-stdenv.mkDerivation rec {
- name = "geda-${version}";
+stdenv.mkDerivation {
+ pname = "geda";
version = "1.8.2-20130925";
src = fetchurl {
diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix
index c0821c8a9ab9..fa5bdbbebdb6 100644
--- a/pkgs/applications/science/electronics/gerbv/default.nix
+++ b/pkgs/applications/science/electronics/gerbv/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }:
-stdenv.mkDerivation rec {
- name = "gerbv-${version}";
+stdenv.mkDerivation {
+ pname = "gerbv";
version = "2015-10-08";
src = fetchgit {
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 4830e2a032a9..8dffe580cc65 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, gtk2, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}:
stdenv.mkDerivation rec {
- name = "gtkwave-${version}";
+ pname = "gtkwave";
version = "3.3.101";
src = fetchurl {
- url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
+ url = "mirror://sourceforge/gtkwave/${pname}-${version}.tar.gz";
sha256 = "1j6capxwgi8aj3sgqg1r7161icni9y8y93g1rl3bzd3s40jcyhsz";
};
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 6608661364a0..3d169f501043 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -17,7 +17,7 @@ let
src = fetchFromGitHub {
owner = "KiCad";
repo = "kicad-${name}";
- rev = "${version}";
+ rev = version;
inherit sha256 name;
};
nativeBuildInputs = [
@@ -26,7 +26,7 @@ let
} // attrs);
in stdenv.mkDerivation rec {
- name = "kicad-${version}";
+ pname = "kicad";
series = "5.0";
version = "5.1.2";
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix
index a9a4c32a0b45..7475170d6a72 100644
--- a/pkgs/applications/science/electronics/kicad/unstable.nix
+++ b/pkgs/applications/science/electronics/kicad/unstable.nix
@@ -11,7 +11,7 @@ assert ngspiceSupport -> libngspice != null;
with lib;
stdenv.mkDerivation rec {
- name = "kicad-unstable-${version}";
+ pname = "kicad-unstable";
version = "2018-06-12";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index 277574ce2f17..fb931ec91622 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qtbase, qttools, qmake }:
-stdenv.mkDerivation rec {
- name = "librepcb-${version}";
+stdenv.mkDerivation {
+ pname = "librepcb";
version = "0.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index 194804a21a67..78240a40baca 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -2,7 +2,7 @@
, readline, libX11, libICE, libXaw, libXmu, libXext, libXt, fftw }:
stdenv.mkDerivation rec {
- name = "ngspice-${version}";
+ pname = "ngspice";
version = "30";
src = fetchurl {
diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix
index b9bbcd695f17..7514aed9f243 100644
--- a/pkgs/applications/science/electronics/pcb/default.nix
+++ b/pkgs/applications/science/electronics/pcb/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "pcb-${version}";
+ pname = "pcb";
version = "20140316";
src = fetchurl {
- url = "http://ftp.geda-project.org/pcb/pcb-20140316/${name}.tar.gz";
+ url = "http://ftp.geda-project.org/pcb/pcb-20140316/${pname}-${version}.tar.gz";
sha256 = "0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42";
};
diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix
index 1a5fbf90d10b..1bfe6df5ff53 100644
--- a/pkgs/applications/science/electronics/qucs/default.nix
+++ b/pkgs/applications/science/electronics/qucs/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.0.19";
- name = "qucs-${version}";
+ pname = "qucs";
src = fetchFromGitHub {
owner = "Qucs";
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index b531563c5c1c..9a9899192505 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, flex, bison }:
stdenv.mkDerivation rec {
- name = "verilator-${version}";
+ pname = "verilator";
version = "4.016";
src = fetchurl {
- url = "https://www.veripool.org/ftp/${name}.tgz";
+ url = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
sha256 = "18fqm6pgscy504ql27i150fdsd2j91hw5qsnpymws3pvqj2qz2ij";
};
diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix
index e233b91bbc91..e8ae4d01a6d6 100644
--- a/pkgs/applications/science/geometry/drgeo/default.nix
+++ b/pkgs/applications/science/geometry/drgeo/default.nix
@@ -2,13 +2,13 @@
, intltool, libtool, pkgconfig }:
stdenv.mkDerivation rec {
- name = "drgeo-${version}";
+ pname = "drgeo";
version = "1.1.0";
hardeningDisable = [ "format" ];
src = fetchurl {
- url = "mirror://sourceforge/ofset/${name}.tar.gz";
+ url = "mirror://sourceforge/ofset/${pname}-${version}.tar.gz";
sha256 = "05i2czgzhpzi80xxghinvkyqx4ym0gm9f38fz53idjhigiivp4wc";
};
patches = [ ./struct.patch ];
diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix
index b655cc48c731..7be0103304a4 100644
--- a/pkgs/applications/science/geometry/tetgen/default.nix
+++ b/pkgs/applications/science/geometry/tetgen/default.nix
@@ -2,7 +2,8 @@
let version = "1.5.0"; in
stdenv.mkDerivation {
- name = "tetgen-${version}";
+ pname = "tetgen";
+ inherit version;
src = fetchurl {
url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz";
diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix
index 6e7a3cfc88ac..c832d12627a0 100644
--- a/pkgs/applications/science/logic/abc/default.nix
+++ b/pkgs/applications/science/logic/abc/default.nix
@@ -1,7 +1,7 @@
{ fetchFromGitHub, stdenv, readline, cmake }:
-stdenv.mkDerivation rec {
- name = "abc-verifier-${version}";
+stdenv.mkDerivation {
+ pname = "abc-verifier";
version = "2018-07-08";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix
index bc23454edfc7..7078fd454a0a 100644
--- a/pkgs/applications/science/logic/abella/default.nix
+++ b/pkgs/applications/science/logic/abella/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, rsync, ocamlPackages }:
stdenv.mkDerivation rec {
- name = "abella-${version}";
+ pname = "abella";
version = "2.0.6";
src = fetchurl {
- url = "http://abella-prover.org/distributions/${name}.tar.gz";
+ url = "http://abella-prover.org/distributions/${pname}-${version}.tar.gz";
sha256 = "164q9gngckg6q69k13lwx2pq3cnc9ckw1qi8dnpxqfjgwfqr7xyi";
};
diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix
index 03524fc6b222..10d94e2bb8c7 100644
--- a/pkgs/applications/science/logic/aiger/default.nix
+++ b/pkgs/applications/science/logic/aiger/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, picosat }:
stdenv.mkDerivation rec {
- name = "aiger-${version}";
+ pname = "aiger";
version = "1.9.9";
src = fetchurl {
- url = "http://fmv.jku.at/aiger/${name}.tar.gz";
+ url = "http://fmv.jku.at/aiger/${pname}-${version}.tar.gz";
sha256 = "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y";
};
diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix
index 234b74749977..f83480cfbafc 100644
--- a/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -1,12 +1,12 @@
{ fetchurl, stdenv, which, dune, ocamlPackages }:
stdenv.mkDerivation rec {
- name = "alt-ergo-${version}";
+ pname = "alt-ergo";
version = "2.3.0";
src = fetchurl {
- url = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz";
- name = "${name}.tar.gz";
+ url = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${pname}-${version}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
sha256 = "1ycr3ff0gacq1aqzs16n6swgfniwpim0m7rvhcam64kj0a80c6bz";
};
diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix
index bf8d3cf03b83..d6190942efab 100644
--- a/pkgs/applications/science/logic/aspino/default.nix
+++ b/pkgs/applications/science/logic/aspino/default.nix
@@ -7,7 +7,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "aspino-unstable-2017-03-09";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix
index 6c2d2f0a062f..9b59828ddab7 100644
--- a/pkgs/applications/science/logic/avy/default.nix
+++ b/pkgs/applications/science/logic/avy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, cmake, zlib, boost }:
-stdenv.mkDerivation rec {
- name = "avy-${version}";
+stdenv.mkDerivation {
+ pname = "avy";
version = "2017.10.16";
src = fetchgit {
diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix
index 8e0ad22bba18..f1f74bcb5810 100644
--- a/pkgs/applications/science/logic/boolector/default.nix
+++ b/pkgs/applications/science/logic/boolector/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "boolector-${version}";
+ pname = "boolector";
version = "3.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix
index ed3d9e638121..2d00e9f30464 100644
--- a/pkgs/applications/science/logic/btor2tools/default.nix
+++ b/pkgs/applications/science/logic/btor2tools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "btor2tools-${version}";
+stdenv.mkDerivation {
+ pname = "btor2tools";
version = "pre55_8c150b39";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix
index ae57724e4f88..0319069660ed 100644
--- a/pkgs/applications/science/logic/clprover/clprover.nix
+++ b/pkgs/applications/science/logic/clprover/clprover.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
-stdenv.mkDerivation rec {
- name = "clprover-${version}";
+stdenv.mkDerivation {
+ pname = "clprover";
version = "1.0.3";
src = fetchzip {
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 10fe722d7e9a..a04ec0bb16ce 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -29,7 +29,7 @@ let
"8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh";
"8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2";
"8.10+beta2" = "0jk7pwydhd17ab7ii69zvi4sgrr630q2lsxhckaj3sz55cpjlhal";
- }."${version}";
+ }.${version};
coq-version = stdenv.lib.versions.majorMinor version;
versionAtLeast = stdenv.lib.versionAtLeast coq-version;
ideFlags = stdenv.lib.optionalString (buildIde && !versionAtLeast "8.10")
@@ -39,7 +39,8 @@ let
substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
'' else "";
self = stdenv.mkDerivation {
- name = "coq-${version}";
+ pname = "coq";
+ inherit version;
passthru = {
inherit coq-version;
diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix
index d76462ca9380..bebf81b030d6 100644
--- a/pkgs/applications/science/logic/coq2html/default.nix
+++ b/pkgs/applications/science/logic/coq2html/default.nix
@@ -5,7 +5,8 @@ let
in
stdenv.mkDerivation {
- name = "coq2html-${version}";
+ pname = "coq2html";
+ inherit version;
src = fetchgit {
url = "https://github.com/xavierleroy/coq2html";
diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix
index c9516a135c06..b4c4cb7c047d 100644
--- a/pkgs/applications/science/logic/cryptominisat/default.nix
+++ b/pkgs/applications/science/logic/cryptominisat/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, python3, xxd, boost }:
stdenv.mkDerivation rec {
- name = "cryptominisat-${version}";
+ pname = "cryptominisat";
version = "5.6.8";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix
index 09801f54e7ee..6877060d36d6 100644
--- a/pkgs/applications/science/logic/cryptoverif/default.nix
+++ b/pkgs/applications/science/logic/cryptoverif/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ocaml }:
stdenv.mkDerivation rec {
- name = "cryptoverif-${version}";
+ pname = "cryptoverif";
version = "2.01pl1";
src = fetchurl {
diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix
index 91eaaeeb0e40..cd41e1ca64b9 100644
--- a/pkgs/applications/science/logic/cubicle/default.nix
+++ b/pkgs/applications/science/logic/cubicle/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ocamlPackages }:
stdenv.mkDerivation rec {
- name = "cubicle-${version}";
+ pname = "cubicle";
version = "1.1.2";
src = fetchurl {
url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz";
diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix
index 703ce6fd5086..dfb04ad90e92 100644
--- a/pkgs/applications/science/logic/cvc3/default.nix
+++ b/pkgs/applications/science/logic/cvc3/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, flex, bison, gmp, perl }:
stdenv.mkDerivation rec {
- name = "cvc3-${version}";
+ pname = "cvc3";
version = "2.4.1";
src = fetchurl {
- url = "http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${name}.tar.gz";
+ url = "http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${pname}-${version}.tar.gz";
sha256 = "1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym";
};
diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix
index cddcbef7a035..c0c7a53ebd44 100644
--- a/pkgs/applications/science/logic/cvc4/default.nix
+++ b/pkgs/applications/science/logic/cvc4/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "cvc4-${version}";
+ pname = "cvc4";
version = "1.6";
src = fetchurl {
diff --git a/pkgs/applications/science/logic/drat-trim/default.nix b/pkgs/applications/science/logic/drat-trim/default.nix
index 50454847baf1..4c4ea0f14ce1 100644
--- a/pkgs/applications/science/logic/drat-trim/default.nix
+++ b/pkgs/applications/science/logic/drat-trim/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "drat-trim-2017-08-31";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index bc4f526bb3a4..f9a911d82108 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -1,7 +1,7 @@
{ stdenv, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "elan-${version}";
+ pname = "elan";
version = "0.7.5";
cargoSha256 = "0lc320m3vw76d6pa5wp6c9jblac6lmyf9qqnxmsnkn4ixdhnghsd";
diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index dab509706a82..1f6fced22335 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, which }:
stdenv.mkDerivation rec {
- name = "eprover-${version}";
+ pname = "eprover";
version = "2.3";
src = fetchurl {
diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix
index 21ce6be3e6c1..ed757e444b7c 100644
--- a/pkgs/applications/science/logic/fast-downward/default.nix
+++ b/pkgs/applications/science/logic/fast-downward/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchhg, cmake, which, python3, osi, cplex }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "fast-downward-2019-05-13";
src = fetchhg {
diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix
index bc8d372ce42c..0a8fad484da7 100644
--- a/pkgs/applications/science/logic/glucose/default.nix
+++ b/pkgs/applications/science/logic/glucose/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
- name = "glucose-${version}";
+ pname = "glucose";
version = "4.1";
src = fetchurl {
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
makeFlags = [ "r" ];
installPhase = ''
install -Dm0755 glucose_release $out/bin/glucose
- mkdir -p "$out/share/doc/${name}/"
- install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/"
+ mkdir -p "$out/share/doc/${pname}-${version}/"
+ install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/logic/glucose/syrup.nix b/pkgs/applications/science/logic/glucose/syrup.nix
index 30af3216737c..816f8504a52e 100644
--- a/pkgs/applications/science/logic/glucose/syrup.nix
+++ b/pkgs/applications/science/logic/glucose/syrup.nix
@@ -1,6 +1,6 @@
{ stdenv, zlib, glucose }:
stdenv.mkDerivation rec {
- name = "glucose-syrup-${version}";
+ pname = "glucose-syrup";
version = glucose.version;
src = glucose.src;
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
makeFlags = [ "r" ];
installPhase = ''
install -Dm0755 glucose-syrup_release $out/bin/glucose-syrup
- mkdir -p "$out/share/doc/${name}/"
- install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/"
+ mkdir -p "$out/share/doc/${pname}-${version}/"
+ install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix
index 46b29e3dd271..85fe52239ad9 100644
--- a/pkgs/applications/science/logic/iprover/default.nix
+++ b/pkgs/applications/science/logic/iprover/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ocaml, eprover, zlib }:
stdenv.mkDerivation rec {
- name = "iprover-${version}";
+ pname = "iprover";
version = "2018_Jul_24_11h";
src = fetchurl {
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
mkdir -p "$out/bin"
cp iproveropt "$out/bin"
- mkdir -p "$out/share/${name}"
- cp *.p "$out/share/${name}"
+ mkdir -p "$out/share/${pname}-${version}"
+ cp *.p "$out/share/${pname}-${version}"
echo -e "#! ${stdenv.shell}\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover
chmod a+x "$out"/bin/iprover
'';
diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix
index a95d1201cbd6..61ca78d85ed1 100644
--- a/pkgs/applications/science/logic/jonprl/default.nix
+++ b/pkgs/applications/science/logic/jonprl/default.nix
@@ -1,7 +1,7 @@
{ fetchgit, stdenv, smlnj, which }:
stdenv.mkDerivation rec {
- name = "jonprl-${version}";
+ pname = "jonprl";
version = "0.1.0";
src = fetchgit {
diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/applications/science/logic/lci/default.nix
index d7f047b84e0f..4775384a3ddc 100644
--- a/pkgs/applications/science/logic/lci/default.nix
+++ b/pkgs/applications/science/logic/lci/default.nix
@@ -1,9 +1,9 @@
{stdenv, fetchurl, readline}:
stdenv.mkDerivation rec {
version = "0.6";
- name = "lci-${version}";
+ pname = "lci";
src = fetchurl {
- url = "mirror://sourceforge/lci/${name}.tar.gz";
+ url = "mirror://sourceforge/lci/${pname}-${version}.tar.gz";
sha256="204f1ca5e2f56247d71ab320246811c220ed511bf08c9cb7f305cf180a93948e";
};
buildInputs = [readline];
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 407244ef1830..9bf54a5f0940 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, gmp }:
stdenv.mkDerivation rec {
- name = "lean-${version}";
+ pname = "lean";
version = "3.4.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix
index 4e1415d3961d..8cc50bb5e295 100644
--- a/pkgs/applications/science/logic/lean2/default.nix
+++ b/pkgs/applications/science/logic/lean2/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, python
, gperftools, ninja, makeWrapper }:
-stdenv.mkDerivation rec {
- name = "lean2-${version}";
+stdenv.mkDerivation {
+ pname = "lean2";
version = "2017-07-22";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix
index be337a1c258e..b50848a18205 100644
--- a/pkgs/applications/science/logic/leo2/default.nix
+++ b/pkgs/applications/science/logic/leo2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, eprover, ocaml, perl, zlib }:
stdenv.mkDerivation rec {
- name = "leo2-${version}";
+ pname = "leo2";
version = "1.6.2";
src = fetchurl {
diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/applications/science/logic/lingeling/default.nix
index 000587a22e67..287dbd36eabf 100644
--- a/pkgs/applications/science/logic/lingeling/default.nix
+++ b/pkgs/applications/science/logic/lingeling/default.nix
@@ -2,8 +2,8 @@
, aiger
}:
-stdenv.mkDerivation rec {
- name = "lingeling-${version}";
+stdenv.mkDerivation {
+ pname = "lingeling";
# This is the version used in satcomp2018, which was
# relicensed, and also known as version 'bcj'
version = "pre1_03b4860d";
diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix
index db784237ea91..d6a1207b5d60 100644
--- a/pkgs/applications/science/logic/logisim/default.nix
+++ b/pkgs/applications/science/logic/logisim/default.nix
@@ -3,7 +3,8 @@
let version = "2.7.1"; in
stdenv.mkDerivation {
- name = "logisim-${version}";
+ pname = "logisim";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar";
diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix
index c77e0327fb6b..02e9844115ef 100644
--- a/pkgs/applications/science/logic/ltl2ba/default.nix
+++ b/pkgs/applications/science/logic/ltl2ba/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
- name = "ltl2ba-${version}";
+ pname = "ltl2ba";
version = "1.2";
src = fetchurl {
- url = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${name}.tar.gz";
+ url = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${pname}-${version}.tar.gz";
sha256 = "0vzv5g7v87r41cvdafxi6yqnk7glzxrzgavy8213k59f6v11dzlx";
};
diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix
index dc32e84279a8..93212c5b8546 100644
--- a/pkgs/applications/science/logic/mcrl2/default.nix
+++ b/pkgs/applications/science/logic/mcrl2/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "201707";
build_nr = "1";
- name = "mcrl2-${version}";
+ pname = "mcrl2";
src = fetchurl {
url = "https://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz";
diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix
index 1601a74e1899..ed1218c401b3 100644
--- a/pkgs/applications/science/logic/metis-prover/default.nix
+++ b/pkgs/applications/science/logic/metis-prover/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, perl, mlton }:
-stdenv.mkDerivation rec {
- name = "metis-prover-${version}";
+stdenv.mkDerivation {
+ pname = "metis-prover";
version = "2.3.20160713";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix
index 4b2116680d50..34051a1da404 100644
--- a/pkgs/applications/science/logic/minisat/default.nix
+++ b/pkgs/applications/science/logic/minisat/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
- name = "minisat-${version}";
+ pname = "minisat";
version = "2.2.0";
src = fetchurl {
- url = "http://minisat.se/downloads/${name}.tar.gz";
+ url = "http://minisat.se/downloads/${pname}-${version}.tar.gz";
sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj";
};
diff --git a/pkgs/applications/science/logic/minisat/unstable.nix b/pkgs/applications/science/logic/minisat/unstable.nix
index f1a42f8215e3..ef46c694acb7 100644
--- a/pkgs/applications/science/logic/minisat/unstable.nix
+++ b/pkgs/applications/science/logic/minisat/unstable.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, zlib, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "minisat-unstable-2013-09-25";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix
index 54bedc7c5e97..30d47687a3eb 100644
--- a/pkgs/applications/science/logic/monosat/default.nix
+++ b/pkgs/applications/science/logic/monosat/default.nix
@@ -20,7 +20,7 @@ let
inherit rev sha256;
};
- core = stdenv.mkDerivation rec {
+ core = stdenv.mkDerivation {
name = "${pname}-${version}";
inherit src;
buildInputs = [ cmake zlib gmp jdk8 ];
diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/applications/science/logic/open-wbo/default.nix
index 48546a86112b..32ce9fde0c31 100644
--- a/pkgs/applications/science/logic/open-wbo/default.nix
+++ b/pkgs/applications/science/logic/open-wbo/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, zlib, gmp }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "open-wbo-2.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix
index f9f021b15f07..9e5ebe008b8f 100644
--- a/pkgs/applications/science/logic/opensmt/default.nix
+++ b/pkgs/applications/science/logic/opensmt/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "opensmt-${version}";
+ pname = "opensmt";
version = "20101017";
src = fetchurl {
diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix
index d21487ef92fa..40c66dd699d8 100644
--- a/pkgs/applications/science/logic/ott/default.nix
+++ b/pkgs/applications/science/logic/ott/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, ocaml }:
stdenv.mkDerivation rec {
- name = "ott-${version}";
+ pname = "ott";
version = "0.28";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/pkgs/applications/science/logic/petrinizer/default.nix
index cb35b9f27d52..d277e0e1521a 100644
--- a/pkgs/applications/science/logic/petrinizer/default.nix
+++ b/pkgs/applications/science/logic/petrinizer/default.nix
@@ -1,6 +1,12 @@
-{ mkDerivation, async, base, bytestring, containers, fetchFromGitLab, mtl
-, parallel-io, parsec, sbv, stdenv, stm, transformers
+{ mkDerivation, callPackage, buildPackages
+, async, base, bytestring, containers, fetchFromGitLab, mtl
+, parallel-io, parsec, stdenv, stm, transformers
}:
+let
+ z3 = callPackage ./z3.nix { gomp = null; z3 = buildPackages.z3; };
+in let
+ sbv = callPackage ./sbv-7.13.nix { inherit z3; };
+in
mkDerivation rec {
pname = "petrinizer";
version = "0.9.1.1";
diff --git a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix b/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix
new file mode 100644
index 000000000000..ed10e9f3db19
--- /dev/null
+++ b/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix
@@ -0,0 +1,26 @@
+{ mkDerivation, array, async, base, bytestring, containers
+, crackNum, deepseq, directory, doctest, filepath, generic-deriving
+, ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random
+, stdenv, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
+, template-haskell, time, z3
+}:
+mkDerivation {
+ pname = "sbv";
+ version = "7.13";
+ sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ array async base containers crackNum deepseq directory filepath
+ generic-deriving ghc mtl pretty process QuickCheck random syb
+ template-haskell time
+ ];
+ testHaskellDepends = [
+ base bytestring containers crackNum directory doctest filepath Glob
+ hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit
+ tasty-quickcheck template-haskell
+ ];
+ testSystemDepends = [ z3 ];
+ homepage = "http://leventerkok.github.com/sbv/";
+ description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
+ license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/applications/science/logic/petrinizer/z3.nix b/pkgs/applications/science/logic/petrinizer/z3.nix
new file mode 100644
index 000000000000..4d868054c09b
--- /dev/null
+++ b/pkgs/applications/science/logic/petrinizer/z3.nix
@@ -0,0 +1,24 @@
+{ mkDerivation, fetchpatch
+, base, containers, gomp, hspec, QuickCheck, stdenv
+, transformers, z3
+}:
+mkDerivation {
+ pname = "z3";
+ version = "408.0";
+ sha256 = "13qkzy9wc17rm60i24fa9sx15ywbxq4a80g33w20887gvqyc0q53";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers transformers ];
+ librarySystemDepends = [ gomp z3 ];
+ testHaskellDepends = [ base hspec QuickCheck ];
+ homepage = "https://github.com/IagoAbal/haskell-z3";
+ description = "Bindings for the Z3 Theorem Prover";
+ license = stdenv.lib.licenses.bsd3;
+ doCheck = false;
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/IagoAbal/haskell-z3/commit/b10e09b8a809fb5bbbb1ef86aeb62109ece99cae.patch";
+ sha256 = "13fnrs27mg3985r3lwks8fxfxr5inrayy2cyx2867d92pnl3yry4";
+ })
+ ];
+}
diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix
index 638996e853b8..547bd31e8b42 100644
--- a/pkgs/applications/science/logic/picosat/default.nix
+++ b/pkgs/applications/science/logic/picosat/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "picosat-${version}";
+ pname = "picosat";
version = "965";
src = fetchurl {
- url = "http://fmv.jku.at/picosat/${name}.tar.gz";
+ url = "http://fmv.jku.at/picosat/${pname}-${version}.tar.gz";
sha256 = "0m578rpa5rdn08d10kr4lbsdwp4402hpavrz6n7n53xs517rn5hm";
};
diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix
index 2f765572f9ad..c833b22e49b6 100644
--- a/pkgs/applications/science/logic/poly/default.nix
+++ b/pkgs/applications/science/logic/poly/default.nix
@@ -1,7 +1,6 @@
{stdenv, fetchFromGitHub, gmp, cmake, python}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "libpoly";
version = "0.1.7";
diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix
index 4abfdf9162c0..2b368a0e6730 100644
--- a/pkgs/applications/science/logic/potassco/clingo.nix
+++ b/pkgs/applications/science/logic/potassco/clingo.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchzip, cmake }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "clingo";
version = "5.3.0";
diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix
index 1f6620a2872d..d4feb5c9e285 100644
--- a/pkgs/applications/science/logic/prooftree/default.nix
+++ b/pkgs/applications/science/logic/prooftree/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, ncurses, ocamlPackages }:
stdenv.mkDerivation rec {
- name = "prooftree-${version}";
+ pname = "prooftree";
version = "0.13";
src = fetchurl {
diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix
index aca06ffbfb76..931ad2fc4f39 100644
--- a/pkgs/applications/science/logic/proverif/default.nix
+++ b/pkgs/applications/science/logic/proverif/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ocamlPackages }:
stdenv.mkDerivation rec {
- name = "proverif-${version}";
+ pname = "proverif";
version = "2.00";
src = fetchurl {
diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix
index b9dd90f601f5..7249eb991d38 100644
--- a/pkgs/applications/science/logic/satallax/default.nix
+++ b/pkgs/applications/science/logic/satallax/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}:
stdenv.mkDerivation rec {
- name = "satallax-${version}";
+ pname = "satallax";
version = "2.7";
buildInputs = [ocaml zlib which eprover makeWrapper coq];
src = fetchurl {
- url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz";
+ url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz";
sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";
};
diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix
index 32ebdad51d94..d357bef2c7a0 100644
--- a/pkgs/applications/science/logic/saw-tools/default.nix
+++ b/pkgs/applications/science/logic/saw-tools/default.nix
@@ -22,8 +22,8 @@ let
sha256 = "07gyf319v6ama6n1aj96403as04bixi8mbisfy7f7va689zklflr";
};
in
-stdenv.mkDerivation rec {
- name = "saw-tools-${version}";
+stdenv.mkDerivation {
+ pname = "saw-tools";
version = "0.1.1-20150731";
src = saw-bin;
diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/applications/science/logic/spass/default.nix
index 2bb2b911d491..ece6f0b9f6a8 100644
--- a/pkgs/applications/science/logic/spass/default.nix
+++ b/pkgs/applications/science/logic/spass/default.nix
@@ -8,8 +8,8 @@ let
+ " dfg2ascii dfg2dfg tptp2dfg dimacs2dfg pgen rescmp";
in
-stdenv.mkDerivation rec {
- name = "spass-${version}";
+stdenv.mkDerivation {
+ pname = "spass";
version = "${baseVersion}.${minorVersion}";
src = fetchurl {
diff --git a/pkgs/applications/science/logic/statverif/default.nix b/pkgs/applications/science/logic/statverif/default.nix
index 9676b991679c..e0efb28819d2 100644
--- a/pkgs/applications/science/logic/statverif/default.nix
+++ b/pkgs/applications/science/logic/statverif/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ocaml }:
stdenv.mkDerivation rec {
- name = "statverif-${version}";
+ pname = "statverif";
version = "1.86pl4";
src = fetchurl {
diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 58674a4cacf2..ed66c77dcabf 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, yosys, bash, python3 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "symbiyosys";
version = "2019.08.13";
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/sby \
--replace "##yosys-sys-path##" \
"sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]"
+ substituteInPlace $out/share/yosys/python3/sby_core.py \
+ --replace '"/usr/bin/env", "bash"' '"${bash}/bin/bash"'
'';
meta = {
description = "Tooling for Yosys-based verification flows";
diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix
index b1eb171b20b1..b1c72d7c5ee7 100644
--- a/pkgs/applications/science/logic/tlaplus/default.nix
+++ b/pkgs/applications/science/logic/tlaplus/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "tlaplus-${version}";
+ pname = "tlaplus";
version = "1.5.6";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix
index 7d35f5f91df3..7c8389688d95 100644
--- a/pkgs/applications/science/logic/tlaplus/tlaps.nix
+++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "tlaps-${version}";
+ pname = "tlaps";
version = "1.4.3";
src = fetchurl {
url = "https://tla.msr-inria.inria.fr/tlaps/dist/current/tlaps-${version}.tar.gz";
diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix
index 7d39aae6e3ce..91666e85d923 100644
--- a/pkgs/applications/science/logic/tlaplus/toolbox.nix
+++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix
@@ -21,7 +21,8 @@ let
in stdenv.mkDerivation {
- name = "tla-toolbox-${version}";
+ pname = "tla-toolbox";
+ inherit version;
src = fetchzip {
url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip";
sha256 = "1mgx4p5qykf9q0p4cp6kcpc7fx8g5f2w1g40kdgas24hqwrgs3cm";
diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index 7f68a8e647e9..4c63f8e72a36 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, yap, tcsh, perl, patchelf }:
stdenv.mkDerivation rec {
- name = "TPTP-${version}";
+ pname = "TPTP";
version = "7.2.0";
src = fetchurl {
diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix
index 74f8875fcebe..161da6e4b235 100644
--- a/pkgs/applications/science/logic/twelf/default.nix
+++ b/pkgs/applications/science/logic/twelf/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, smlnj, rsync }:
stdenv.mkDerivation rec {
- name = "twelf-${version}";
+ pname = "twelf";
version = "1.7.1";
src = fetchurl {
diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix
index 360f75cc6f07..3e3e26708618 100644
--- a/pkgs/applications/science/logic/verifast/default.nix
+++ b/pkgs/applications/science/logic/verifast/default.nix
@@ -19,11 +19,11 @@ let
in
stdenv.mkDerivation rec {
- name = "verifast-${version}";
+ pname = "verifast";
version = "18.02";
src = fetchurl {
- url = "https://github.com/verifast/verifast/releases/download/${version}/${name}-linux.tar.gz";
+ url = "https://github.com/verifast/verifast/releases/download/${version}/${pname}-${version}-linux.tar.gz";
sha256 = "19050be23b6d5e471690421fee59f84c58b29e38379fb86b8f3713a206a4423e";
};
diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix
index ca3673d7bf97..2c68191b800e 100644
--- a/pkgs/applications/science/logic/verit/default.nix
+++ b/pkgs/applications/science/logic/verit/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, gmp, flex, bison }:
-stdenv.mkDerivation rec {
- name = "veriT-${version}";
+stdenv.mkDerivation {
+ pname = "veriT";
version = "2016";
src = fetchurl {
diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index bd538dc6c757..6f338f214783 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -1,8 +1,8 @@
{ callPackage, fetchurl, stdenv
, ocamlPackages, coqPackages, rubber, hevea, emacs }:
-stdenv.mkDerivation rec {
- name = "why3-${version}";
+stdenv.mkDerivation {
+ pname = "why3";
version = "1.2.0";
src = fetchurl {
diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix
index 313fe5a9f1dd..2f972c92b521 100644
--- a/pkgs/applications/science/logic/workcraft/default.nix
+++ b/pkgs/applications/science/logic/workcraft/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
- name = "workcraft-${version}";
+ pname = "workcraft";
version = "3.1.9";
src = fetchurl {
diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index 40a4c391e1d5..76ed934fb39e 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gmp-static, gperf, autoreconfHook, libpoly }:
stdenv.mkDerivation rec {
- name = "yices-${version}";
+ pname = "yices";
version = "2.6.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix
index 340073b016e3..4469e7f06e03 100644
--- a/pkgs/applications/science/machine-learning/labelimg/default.nix
+++ b/pkgs/applications/science/machine-learning/labelimg/default.nix
@@ -1,6 +1,6 @@
{ stdenv, python2Packages, fetchurl }:
python2Packages.buildPythonApplication rec {
- name = "labelImg-${version}";
+ pname = "labelImg";
version = "1.6.0";
src = fetchurl {
url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
index c0536b36cfe3..7bcc915daec9 100644
--- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix
+++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
@@ -15,7 +15,7 @@ else assert licenseAccepted;
let maps = callPackage ./maps.nix {};
in stdenv.mkDerivation rec {
version = "4.7.1";
- name = "sc2-headless-${version}";
+ pname = "sc2-headless";
src = fetchurl {
url = "https://blzdistsc2-a.akamaihd.net/Linux/SC2.${version}.zip";
diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix
index 8de78092bd84..be15bba979ff 100644
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -16,7 +16,6 @@ assert opencvSupport -> opencv != null;
stdenv.mkDerivation rec {
pname = "shogun";
version = "6.0.0";
- name = pname + "-" + version;
src = fetchFromGitHub {
owner = pname + "-toolbox";
diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
index 9c4f24021430..73272df99221 100644
--- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix
+++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
@@ -94,7 +94,7 @@ let
# rockspec = "lua-cjson-2.1devel-1.rockspec";
# };
- lua-cjson = stdenv.mkDerivation rec {
+ lua-cjson = stdenv.mkDerivation {
name = "lua-cjson";
src = "${distro_src}/extra/lua-cjson";
@@ -179,7 +179,7 @@ let
rockspec = "rocks/${name}-scm-1.rockspec";
};
- sys = buildLuaRocks rec {
+ sys = buildLuaRocks {
name = "sys";
luadeps = [torch];
buildInputs = [readline cmake];
@@ -190,14 +190,14 @@ let
'';
};
- xlua = buildLuaRocks rec {
+ xlua = buildLuaRocks {
name = "xlua";
luadeps = [torch sys];
src = "${distro_src}/pkg/xlua";
rockspec = "xlua-1.0-0.rockspec";
};
- nn = buildLuaRocks rec {
+ nn = buildLuaRocks {
name = "nn";
luadeps = [torch luaffifb];
buildInputs = [cmake];
@@ -208,7 +208,7 @@ let
'';
};
- graph = buildLuaRocks rec {
+ graph = buildLuaRocks {
name = "graph";
luadeps = [ torch ];
buildInputs = [cmake];
@@ -219,7 +219,7 @@ let
'';
};
- nngraph = buildLuaRocks rec {
+ nngraph = buildLuaRocks {
name = "nngraph";
luadeps = [ torch nn graph ];
buildInputs = [cmake];
@@ -229,7 +229,7 @@ let
'';
};
- image = buildLuaRocks rec {
+ image = buildLuaRocks {
name = "image";
luadeps = [ torch dok sys xlua ];
buildInputs = [cmake libjpeg libpng];
@@ -240,7 +240,7 @@ let
'';
};
- optim = buildLuaRocks rec {
+ optim = buildLuaRocks {
name = "optim";
luadeps = [ torch ];
buildInputs = [cmake];
@@ -251,7 +251,7 @@ let
'';
};
- gnuplot = buildLuaRocks rec {
+ gnuplot = buildLuaRocks {
name = "gnuplot";
luadeps = [ torch paths ];
runtimeDeps = [ pkgs_gnuplot less ];
@@ -259,7 +259,7 @@ let
rockspec = "rocks/gnuplot-scm-1.rockspec";
};
- unsup = buildLuaRocks rec {
+ unsup = buildLuaRocks {
name = "unsup";
luadeps = [ torch xlua optim ];
buildInputs = [ cmake ];
@@ -275,7 +275,7 @@ let
meta.broken = true;
};
- trepl = buildLuaRocks rec {
+ trepl = buildLuaRocks {
name = "trepl";
luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot optim sys dok unsup];
runtimeDeps = [ ncurses readline ];
@@ -285,7 +285,7 @@ let
};
};
- lbase64 = buildLuaRocks rec {
+ lbase64 = buildLuaRocks {
name = "lbase64";
src = fetchgit {
url = "https://github.com/LuaDist2/lbase64";
@@ -295,7 +295,7 @@ let
meta.broken = true; # 2018-04-11
};
- luuid = stdenv.mkDerivation rec {
+ luuid = stdenv.mkDerivation {
name = "luuid";
src = fetchgit {
url = "https://github.com/LuaDist/luuid";
@@ -314,7 +314,7 @@ let
};
# Doesn't work due to missing deps (according to luarocs).
- itorch = buildLuaRocks rec {
+ itorch = buildLuaRocks {
name = "itorch";
luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot
optim sys dok lbase64 lua-cjson luuid];
diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix
index e0b0bc11f05f..d59ec57c1a85 100644
--- a/pkgs/applications/science/math/LiE/default.nix
+++ b/pkgs/applications/science/math/LiE/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl
, bison, readline }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2.2.2";
# The current version of LiE is 2.2.2, which is more or less unchanged
# since about the year 2000. Minor bugfixes do get applied now and then.
- name = "lie-${version}";
+ pname = "lie";
meta = {
description = "A Computer algebra package for Lie group computations";
diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix
index 61eb1fd3ce4e..74adcab4e705 100644
--- a/pkgs/applications/science/math/bcal/default.nix
+++ b/pkgs/applications/science/math/bcal/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "bcal-${version}";
+ pname = "bcal";
version = "1.9";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/applications/science/math/bliss/default.nix
index 1b7a97360079..37504fceb141 100644
--- a/pkgs/applications/science/math/bliss/default.nix
+++ b/pkgs/applications/science/math/bliss/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip, doxygen }:
stdenv.mkDerivation rec {
- name = "bliss-${version}";
+ pname = "bliss";
version = "0.73";
src = fetchurl {
- url = "http://www.tcs.hut.fi/Software/bliss/${name}.zip";
+ url = "http://www.tcs.hut.fi/Software/bliss/${pname}-${version}.zip";
sha256 = "f57bf32804140cad58b1240b804e0dbd68f7e6bf67eba8e0c0fa3a62fd7f0f84";
};
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index e8171bcb256a..5068abbf3076 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -36,7 +36,7 @@ let
in
stdenv.mkDerivation rec {
- name = "caffe-${version}";
+ pname = "caffe";
version = "1.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix
index 348c1e750867..0d149eca3b63 100644
--- a/pkgs/applications/science/math/calc/default.nix
+++ b/pkgs/applications/science/math/calc/default.nix
@@ -2,13 +2,13 @@
, enableReadline ? true, readline, ncurses }:
stdenv.mkDerivation rec {
- name = "calc-${version}";
+ pname = "calc";
version = "2.12.7.2";
src = fetchurl {
urls = [
- "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2"
- "http://www.isthe.com/chongo/src/calc/${name}.tar.bz2"
+ "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
+ "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
];
sha256 = "147wmbajcxv6wp92j6pizq4plrr1sb7jirifr1477bx33hc49bsp";
};
diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix
index 0beee1eb2915..0eb57c756927 100644
--- a/pkgs/applications/science/math/clp/default.nix
+++ b/pkgs/applications/science/math/clp/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.17.2";
- name = "clp-${version}";
+ pname = "clp";
src = fetchurl {
url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz";
sha256 = "1fkmgpn0zaraymi6s3isrrscgjxggcs2yjrx7jfy4hb1jacx71zz";
diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix
index 465c7318c0e3..c20a6954c3cb 100644
--- a/pkgs/applications/science/math/cntk/default.nix
+++ b/pkgs/applications/science/math/cntk/default.nix
@@ -17,7 +17,7 @@ let
};
in stdenv.mkDerivation rec {
- name = "CNTK-${version}";
+ pname = "CNTK";
version = "2.7";
# Submodules
diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix
index 94e0a44226d4..13a75ce4db2d 100644
--- a/pkgs/applications/science/math/colpack/default.nix
+++ b/pkgs/applications/science/math/colpack/default.nix
@@ -4,7 +4,6 @@ stdenv.mkDerivation rec {
pname = "ColPack";
version = "1.0.10";
- name = pname + "-" + version;
src = fetchFromGitHub {
owner = "CSCsw";
diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix
index a14839d3eccc..ec13f5252f13 100644
--- a/pkgs/applications/science/math/cplex/default.nix
+++ b/pkgs/applications/science/math/cplex/default.nix
@@ -8,7 +8,7 @@
# different for every user.
stdenv.mkDerivation rec {
- name = "cplex-${version}";
+ pname = "cplex";
version = "128";
src =
diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/applications/science/math/form/default.nix
index 23ab2184266a..0dbafebf2c06 100644
--- a/pkgs/applications/science/math/form/default.nix
+++ b/pkgs/applications/science/math/form/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, gmp, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "4.2.1";
- name = "form-${version}";
+ pname = "form";
# This tarball is released by author, it is not downloaded from tag, so can't use fetchFromGitHub
src = fetchurl {
diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index 3232d08aa339..8f38a24f40d1 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, language ? "en_US" }:
stdenv.mkDerivation rec {
- name = "geogebra-${version}";
+ pname = "geogebra";
version = "5-0-535-0";
preferLocalBuild = true;
diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix
index 74e4b052fdb5..3ccd89cf2c13 100644
--- a/pkgs/applications/science/math/getdp/default.nix
+++ b/pkgs/applications/science/math/getdp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, gfortran, openblas, openmpi, python3 }:
stdenv.mkDerivation rec {
- name = "getdp-${version}";
+ pname = "getdp";
version = "3.0.4";
src = fetchurl {
url = "http://getdp.info/src/getdp-${version}-source.tgz";
diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix
index d2d1ddb65846..33b003b2b562 100644
--- a/pkgs/applications/science/math/gfan/default.nix
+++ b/pkgs/applications/science/math/gfan/default.nix
@@ -1,6 +1,5 @@
{stdenv, fetchurl, gmp, mpir, cddlib}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "gfan";
version = "0.6.2";
diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix
index ee9bdcc6f1b0..4ac7c411c2dc 100644
--- a/pkgs/applications/science/math/gurobi/default.nix
+++ b/pkgs/applications/science/math/gurobi/default.nix
@@ -3,7 +3,7 @@
let
majorVersion = "8.1";
in stdenv.mkDerivation rec {
- name = "gurobi-${version}";
+ pname = "gurobi";
version = "${majorVersion}.0";
src = with stdenv.lib; fetchurl {
diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix
index 9eab9ca39992..45a13d028894 100644
--- a/pkgs/applications/science/math/hmetis/default.nix
+++ b/pkgs/applications/science/math/hmetis/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ghostscript }:
stdenv.mkDerivation rec {
- name = "hmetis-${version}";
+ pname = "hmetis";
version = "1.5";
src = fetchurl {
diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix
index 0cf834c8cdea..f39c6a04d190 100644
--- a/pkgs/applications/science/math/lp_solve/default.nix
+++ b/pkgs/applications/science/math/lp_solve/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "lp_solve-${version}";
+ pname = "lp_solve";
version = "5.5.2.5";
src = fetchurl {
diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix
index 9e02b08c8ad0..eecb37dd743f 100644
--- a/pkgs/applications/science/math/lrcalc/default.nix
+++ b/pkgs/applications/science/math/lrcalc/default.nix
@@ -7,7 +7,6 @@
stdenv.mkDerivation rec {
version = "1.2";
pname = "lrcalc";
- name = "${pname}-${version}";
src = fetchFromBitbucket {
owner = "asbuch";
diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix
index c6802c3719e9..4204b1399137 100644
--- a/pkgs/applications/science/math/mathematica/10.nix
+++ b/pkgs/applications/science/math/mathematica/10.nix
@@ -26,7 +26,7 @@ in
stdenv.mkDerivation rec {
version = "10.0.2";
- name = "mathematica-${version}";
+ pname = "mathematica";
src = requireFile rec {
name = "Mathematica_${version}_LINUX.sh";
diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix
index 1023e7ca3d5c..aaa1c02ec0a0 100644
--- a/pkgs/applications/science/math/mathematica/9.nix
+++ b/pkgs/applications/science/math/mathematica/9.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
name = "mathematica-9.0.0";
- src = requireFile rec {
+ src = requireFile {
name = "Mathematica_9.0.0_LINUX.sh";
message = ''
This nix expression requires that Mathematica_9.0.0_LINUX.sh is
diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix
index e2e4ba63b07e..bd4725ce73c6 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@@ -7,7 +7,7 @@
assert cudnnSupport -> cudaSupport;
stdenv.mkDerivation rec {
- name = "mxnet-${version}";
+ pname = "mxnet";
version = "1.4.1";
src = fetchurl {
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index 226e13c004d7..bd116b02e29e 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -3,7 +3,7 @@
, fetchurl
}:
stdenv.mkDerivation rec {
- name = "nauty-${version}";
+ pname = "nauty";
version = "26r11";
src = fetchurl {
url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
# Prevent nauty from sniffing some cpu features. While those are very
# widely available, it can lead to nasty bugs when they are not available:
# https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA
- "default" = [ "--disable-clz" "--disable-popcnt" ];
- "westmere" = [ "--disable-clz" ];
- "sandybridge" = [ "--disable-clz" ];
- "ivybridge" = [ "--disable-clz" ];
+ default = [ "--disable-clz" "--disable-popcnt" ];
+ westmere = [ "--disable-clz" ];
+ sandybridge = [ "--disable-clz" ];
+ ivybridge = [ "--disable-clz" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"} or [];
buildInputs = [];
installPhase = ''
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 72827112c50c..89ae354e7c76 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,6 +1,5 @@
{ stdenv
, fetchurl
-, fetchpatch
, gmp
, readline
, libX11
@@ -13,25 +12,13 @@ assert withThread -> libpthreadstubs != null;
stdenv.mkDerivation rec {
pname = "pari";
- version = "2.11.1";
+ version = "2.11.2";
src = fetchurl {
url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz";
- sha256 = "1jfax92jpydjd02fwl30r6b8kfzqqd6sm4yx94gidyz9lqjb7a94";
+ sha256 = "0fck8ssmirl8fy7s4mspgrxjs5sag76xbshqlqzkcl3kqyrk4raa";
};
- patches = [
- # Fix a off-by-one bug that can potentially lead to segfaults (accepted upstream)
- # https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2117
- # https://trac.sagemath.org/ticket/27335
- (fetchpatch {
- name = "fix-off-by-one-error.patch";
- # only relevant parts of https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=patch;h=aa1ee6e0898d177e6bcf49237d82c804bc410985
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pari/patches/red_montgomery.patch?id=bbea55c96e1f05302b3c7f593cf64492497047c5";
- sha256 = "0vqkmhgv9splsdswp6zjnkj50z76rc1m6k9iy3cf9dxwqw3h3nr6";
- })
- ];
-
buildInputs = [
gmp
readline
diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix
index 86bd2e843678..e743c8ae95b6 100644
--- a/pkgs/applications/science/math/pari/gp2c.nix
+++ b/pkgs/applications/science/math/pari/gp2c.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
- name = "gp2c-${version}";
+ pname = "gp2c";
version = "0.0.11pl2";
src = fetchurl {
- url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz";
+ url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz";
sha256 = "0wqsf05wgkqvmmsx7jinvzdqav6rl56sr8haibgs31nzz4x9xz9g";
};
diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix
index 3e7d9898a656..167ab9275faf 100644
--- a/pkgs/applications/science/math/pcalc/default.nix
+++ b/pkgs/applications/science/math/pcalc/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "pcalc-${version}";
+ pname = "pcalc";
version = "20141224";
src = fetchgit {
diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix
index 4fba231f094d..fdc4de7b0286 100644
--- a/pkgs/applications/science/math/polymake/default.nix
+++ b/pkgs/applications/science/math/polymake/default.nix
@@ -7,7 +7,6 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "polymake";
version = "3.2.rc4";
diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix
index 2dd4778234df..71d16fb626cd 100644
--- a/pkgs/applications/science/math/ratpoints/default.nix
+++ b/pkgs/applications/science/math/ratpoints/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, gmp }:
stdenv.mkDerivation rec {
- name = "ratpoints-${version}";
+ pname = "ratpoints";
version = "2.1.3.p4";
src = fetchurl {
diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix
index 5e0b7fc300ba..a42a5b710ce0 100644
--- a/pkgs/applications/science/math/ripser/default.nix
+++ b/pkgs/applications/science/math/ripser/default.nix
@@ -17,7 +17,8 @@ let
version = "1.0";
in
stdenv.mkDerivation {
- name = "ripser-${version}";
+ pname = "ripser";
+ inherit version;
src = fetchFromGitHub {
owner = "Ripser";
diff --git a/pkgs/applications/science/math/sage/flask-oldsessions.nix b/pkgs/applications/science/math/sage/flask-oldsessions.nix
index 85e35736d030..0899c93602b9 100644
--- a/pkgs/applications/science/math/sage/flask-oldsessions.nix
+++ b/pkgs/applications/science/math/sage/flask-oldsessions.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "mitsuhiko";
repo = "flask-oldsessions";
- rev = "${version}";
+ rev = version;
sha256 = "04b5m8njjiwld9a0zw55iqwvyjgwcpdbhz1cic8nyhgcmypbicqn";
};
diff --git a/pkgs/applications/science/math/sage/pybrial.nix b/pkgs/applications/science/math/sage/pybrial.nix
index f5cb39603c32..092a340bb5b5 100644
--- a/pkgs/applications/science/math/sage/pybrial.nix
+++ b/pkgs/applications/science/math/sage/pybrial.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "BRiAl";
repo = "BRiAl";
- rev = "${version}";
+ rev = version;
sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg";
};
diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix
index 0cd5b5d976a1..93ec1e33cf69 100644
--- a/pkgs/applications/science/math/sage/sage-tests.nix
+++ b/pkgs/applications/science/math/sage/sage-tests.nix
@@ -23,9 +23,9 @@ let
relpathToArg = relpath: lib.escapeShellArg "${src}/${relpath}"; # paths need to be absolute
testFileList = lib.concatStringsSep " " (map relpathToArg files);
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = src.version;
- name = "sage-tests-${version}";
+ pname = "sage-tests";
inherit src;
buildInputs = [
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix
index e4b1aeae016a..524085e8c012 100644
--- a/pkgs/applications/science/math/sage/sage-with-env.nix
+++ b/pkgs/applications/science/math/sage/sage-with-env.nix
@@ -87,7 +87,7 @@ let
in
stdenv.mkDerivation rec {
version = src.version;
- name = "sage-with-env-${version}";
+ pname = "sage-with-env";
src = sage-env.lib.src;
inherit buildInputs;
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix
index f6dc21d00184..4fa8ae6270ba 100644
--- a/pkgs/applications/science/math/sage/sage.nix
+++ b/pkgs/applications/science/math/sage/sage.nix
@@ -21,7 +21,7 @@ let
in
stdenv.mkDerivation rec {
version = src.version;
- name = "sage-${version}";
+ pname = "sage";
src = sage-with-env.env.lib.src;
buildInputs = [
diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix
index 91c880673a12..bf618fe64f45 100644
--- a/pkgs/applications/science/math/sage/sagedoc.nix
+++ b/pkgs/applications/science/math/sage/sagedoc.nix
@@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
version = src.version;
- name = "sagedoc-${version}";
+ pname = "sagedoc";
src = sage-with-env.env.lib.src;
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index 1040d6d4ba15..6eac84aaa865 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -60,7 +60,7 @@
buildPythonPackage rec {
format = "other";
version = src.version;
- name = "sagelib-${version}";
+ pname = "sagelib";
src = sage-src;
nativeBuildInputs = [
diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix
index 21ce53e70c51..8e85cece9b28 100644
--- a/pkgs/applications/science/math/scilab-bin/default.nix
+++ b/pkgs/applications/science/math/scilab-bin/default.nix
@@ -15,7 +15,7 @@ let
else
badArch;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit name;
src = fetchurl {
diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix
index 01fb58403cad..432280a18fb2 100644
--- a/pkgs/applications/science/math/scilab/default.nix
+++ b/pkgs/applications/science/math/scilab/default.nix
@@ -13,9 +13,9 @@
stdenv.mkDerivation rec {
version = "4.1.2";
- name = "scilab-${version}";
+ pname = "scilab";
src = fetchurl {
- url = "https://www.scilab.org/download/${version}/${name}-src.tar.gz";
+ url = "https://www.scilab.org/download/${version}/${pname}-${version}-src.tar.gz";
sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc";
};
diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix
index 8fa020ba07c9..610f1ef05c0f 100644
--- a/pkgs/applications/science/math/scotch/default.nix
+++ b/pkgs/applications/science/math/scotch/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "6.0.4";
- name = "scotch-${version}";
+ pname = "scotch";
src_name = "scotch_${version}";
buildInputs = [ bison openmpi flex zlib ];
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index 24063216db04..ccb139203acb 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -11,7 +11,7 @@
}:
stdenv.mkDerivation rec {
- name = "singular-${version}";
+ pname = "singular";
version = "4.1.1p2";
src = let
diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index d36b135531c2..67561658eb25 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -1,7 +1,7 @@
{ mkDerivation, lib, fetchgit, cmake, qtbase, qttools }:
mkDerivation rec {
- name = "speedcrunch-${version}";
+ pname = "speedcrunch";
version = "0.12.0";
src = fetchgit {
diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix
index bc971606cd08..18daabb9e7e2 100644
--- a/pkgs/applications/science/math/symmetrica/default.nix
+++ b/pkgs/applications/science/math/symmetrica/default.nix
@@ -3,7 +3,7 @@
, fetchpatch
}:
stdenv.mkDerivation rec {
- name = "symmetrica-${version}";
+ pname = "symmetrica";
version = "2.0";
src = fetchurl {
diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix
index 3bfb22dad936..90278a744f15 100644
--- a/pkgs/applications/science/math/weka/default.nix
+++ b/pkgs/applications/science/math/weka/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, jre, unzip, makeWrapper }:
stdenv.mkDerivation rec {
- name = "weka-${version}";
+ pname = "weka";
version = "3.9.2";
src = fetchurl {
- url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] name}.zip";
+ url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] "${pname}-${version}"}.zip";
sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31";
};
diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 13ccd70c83f9..406d74c4cd34 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -3,7 +3,7 @@
, maxima, wxGTK, gnome3 }:
stdenv.mkDerivation rec {
- name = "wxmaxima-${version}";
+ pname = "wxmaxima";
version = "19.03.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix
index c02ef73df119..bae0d9a18c67 100644
--- a/pkgs/applications/science/math/yacas/default.nix
+++ b/pkgs/applications/science/math/yacas/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "yacas-${version}";
+ pname = "yacas";
version = "1.6.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index d1da5a74e858..c806b558da0e 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -9,10 +9,10 @@ in
stdenv.mkDerivation rec {
version = "${majorVersion}.${minorVersion}";
- name = "boinc-${version}";
+ pname = "boinc";
src = fetchFromGitHub {
- name = "${name}-src";
+ name = "${pname}-${version}-src";
owner = "BOINC";
repo = "boinc";
rev = "client_release/${majorVersion}/${version}";
diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix
index 2262e342fc95..2e19012af874 100644
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/pkgs/applications/science/misc/cytoscape/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
- name = "cytoscape-${version}";
+ pname = "cytoscape";
version = "3.7.1";
src = fetchurl {
- url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${name}.tar.gz";
+ url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "1mhsngbwbgdwl70wj7850zg94534lasihwv2ryifardm35mkh48k";
};
diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix
index b81f188a91bf..577c8ecfa058 100644
--- a/pkgs/applications/science/misc/gephi/default.nix
+++ b/pkgs/applications/science/misc/gephi/default.nix
@@ -27,8 +27,9 @@ let
outputHash = "1p7yf97dn0nvr005cbs6vdk3i341s8fya4kfccj8qqad2qgxflif";
};
in
-stdenv.mkDerivation rec {
- name = "gephi-${version}";
+stdenv.mkDerivation {
+ pname = "gephi";
+ inherit version;
inherit src;
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index 8b6c7497e547..b394639fd0cc 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -2,11 +2,11 @@
, proj, boost, cmake, python2, doxygen, graphviz, gmp }:
stdenv.mkDerivation rec {
- name = "gplates-${version}";
+ pname = "gplates";
version = "2.0.0";
src = fetchurl {
- url = "mirror://sourceforge/gplates/${name}-unixsrc.tar.bz2";
+ url = "mirror://sourceforge/gplates/${pname}-${version}-unixsrc.tar.bz2";
sha256 = "02scnjj5nlc2d2c8lbx0xvj8gg1bgkjliv3wxsx564c55a9x69qw";
};
diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix
index 8cd119c7b7b0..f86bed854a2b 100644
--- a/pkgs/applications/science/misc/megam/default.nix
+++ b/pkgs/applications/science/misc/megam/default.nix
@@ -1,8 +1,9 @@
{ fetchurl, stdenv, ocaml, makeWrapper, ncurses }:
let version = "0.92"; in
-stdenv.mkDerivation rec {
- name = "megam-${version}";
+stdenv.mkDerivation {
+ pname = "megam";
+ inherit version;
src = fetchurl {
url = "http://hal3.name/megam/megam_src.tgz";
diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/applications/science/misc/netlogo/default.nix
index 76f958cc3a81..b412c4ef81a7 100644
--- a/pkgs/applications/science/misc/netlogo/default.nix
+++ b/pkgs/applications/science/misc/netlogo/default.nix
@@ -14,7 +14,7 @@ let
in
stdenv.mkDerivation rec {
- name = "netlogo-${version}";
+ pname = "netlogo";
version = "6.0.4";
src = fetchurl {
diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix
index 4139c88ffb02..121e953f43af 100644
--- a/pkgs/applications/science/misc/openmvg/default.nix
+++ b/pkgs/applications/science/misc/openmvg/default.nix
@@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
version = "1.3";
- name = "openmvg-${version}";
+ pname = "openmvg";
src = fetchgit {
url = "https://www.github.com/openmvg/openmvg.git";
diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix
index 43d57feab71b..bb067fbca7a9 100644
--- a/pkgs/applications/science/misc/openmvs/default.nix
+++ b/pkgs/applications/science/misc/openmvs/default.nix
@@ -2,7 +2,7 @@
, eigen, opencv, ceres-solver, cgal, boost, vcg
, gmp, mpfr, glog, gflags, libjpeg_turbo }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "openmvs-unstable-2018-05-26";
src = fetchFromGitHub {
diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix
index daa8b4943227..0dfcbfda0024 100644
--- a/pkgs/applications/science/misc/rink/default.nix
+++ b/pkgs/applications/science/misc/rink/default.nix
@@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
version = "0.4.4";
- name = "rink-${version}";
+ pname = "rink";
src = fetchFromGitHub {
owner = "tiffany352";
diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix
index 0199373b082c..2145d7e71d33 100644
--- a/pkgs/applications/science/misc/root/5.nix
+++ b/pkgs/applications/science/misc/root/5.nix
@@ -3,7 +3,7 @@
, Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec {
- name = "root-${version}";
+ pname = "root";
version = "5.34.36";
src = fetchurl {
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 2ec1ded68a26..690dc920d5c8 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -3,7 +3,7 @@
, Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec {
- name = "root-${version}";
+ pname = "root";
version = "6.12.06";
src = fetchurl {
diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
index d6e3f05e0e13..610d7494ed80 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -13,7 +13,7 @@
with stdenv.lib;
let
- optionOnOff = option: "${if option then "on" else "off"}";
+ optionOnOff = option: if option then "on" else "off";
in
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix
index 1f644ad0f20f..509cdeaee611 100644
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/pkgs/applications/science/misc/tulip/default.nix
@@ -3,10 +3,11 @@
let version = "5.2.1"; in
stdenv.mkDerivation rec {
- name = "tulip-${version}";
+ pname = "tulip";
+ inherit version;
src = fetchurl {
- url = "mirror://sourceforge/auber/${name}_src.tar.gz";
+ url = "mirror://sourceforge/auber/${pname}-${version}_src.tar.gz";
sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky";
};
diff --git a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
index 1986f3b75ec1..b0ed5e946379 100644
--- a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
@@ -2,9 +2,9 @@
, gfortran, mpi
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.10";
- name = "DL_POLY_Classic-${version}";
+ pname = "DL_POLY_Classic";
src = fetchurl {
url = "https://ccpforge.cse.rl.ac.uk/gf/download/frsrelease/574/8924/dl_class_1.10.tar.gz";
diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
index f4491053e4c8..234bbdab3158 100644
--- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
@@ -13,12 +13,12 @@ in
stdenv.mkDerivation rec {
# LAMMPS has weird versioning converted to ISO 8601 format
version = "stable_22Aug2018";
- name = "lammps-${version}";
+ pname = "lammps";
src = fetchFromGitHub {
owner = "lammps";
repo = "lammps";
- rev = "${version}";
+ rev = version;
sha256 = "1dlifm9wm1jcw2zwal3fnzzl41ng08c7v48w6hx2mz84zljg1nsj";
};
diff --git a/pkgs/applications/science/physics/quantomatic/default.nix b/pkgs/applications/science/physics/quantomatic/default.nix
index ad86ff61471c..b22b9d412fdc 100644
--- a/pkgs/applications/science/physics/quantomatic/default.nix
+++ b/pkgs/applications/science/physics/quantomatic/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
- name = "quantomatic-${version}";
+ pname = "quantomatic";
version = "0.7";
src = fetchurl {
diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix
index d43a05f1c616..80417f0fcc18 100644
--- a/pkgs/applications/science/physics/sacrifice/default.nix
+++ b/pkgs/applications/science/physics/sacrifice/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }:
-stdenv.mkDerivation rec {
- name = "sacrifice-${version}";
+stdenv.mkDerivation {
+ pname = "sacrifice";
version = "1.0.0";
src = fetchurl {
diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix
index 1d61c612563f..045a77cea27f 100644
--- a/pkgs/applications/science/physics/sherpa/default.nix
+++ b/pkgs/applications/science/physics/sherpa/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }:
stdenv.mkDerivation rec {
- name = "sherpa-${version}";
+ pname = "sherpa";
version = "2.2.6";
src = fetchurl {
diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix
index ae5307f155bd..2af93961e02b 100644
--- a/pkgs/applications/science/physics/xfitter/default.nix
+++ b/pkgs/applications/science/physics/xfitter/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, liblapack, libyaml, lynx, mela, root5, qcdnum, which }:
stdenv.mkDerivation rec {
- name = "xfitter-${version}";
+ pname = "xfitter";
version = "2.0.0";
src = fetchurl {
- name = "${name}.tgz";
- url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${name}.tgz";
+ name = "${pname}-${version}.tgz";
+ url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${pname}-${version}.tgz";
sha256 = "0j47s8laq3aqjlgp769yicvgyzqjb738a3rqss51d9fjrihi2515";
};
diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix
index c454ad377686..ebfb6471c632 100644
--- a/pkgs/applications/science/programming/plm/default.nix
+++ b/pkgs/applications/science/programming/plm/default.nix
@@ -6,12 +6,12 @@ stdenv.mkDerivation rec {
major = "2";
minor = "5";
version = "${major}-${minor}";
- name = "plm-${version}";
+ pname = "plm";
src = fetchurl {
url = "http://webloria.loria.fr/~quinson/Teaching/PLM/plm-${major}_${minor}.jar";
sha256 = "0m17cxa3nxi2cbswqvlfzp0mlfi3wrkw8ry2xhkxy6aqzm2mlgcc";
- name = "${name}.jar";
+ name = "${pname}-${version}.jar";
};
buildInputs = [ makeWrapper jre gcc valgrind ];
diff --git a/pkgs/applications/science/programming/scyther/cli.nix b/pkgs/applications/science/programming/scyther/cli.nix
index 152b71217743..6623f5def4cb 100644
--- a/pkgs/applications/science/programming/scyther/cli.nix
+++ b/pkgs/applications/science/programming/scyther/cli.nix
@@ -1,7 +1,8 @@
{ stdenv, glibc, flex, bison, cmake
, version, src, meta }:
stdenv.mkDerivation {
- name = "scyther-cli-${version}";
+ pname = "scyther-cli";
+ inherit version;
inherit src meta;
diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix
index e0993a580193..b4daae1afc04 100644
--- a/pkgs/applications/science/programming/scyther/default.nix
+++ b/pkgs/applications/science/programming/scyther/default.nix
@@ -25,7 +25,8 @@ let
};
gui = stdenv.mkDerivation {
- name = "scyther-gui-${version}";
+ pname = "scyther-gui";
+ inherit version;
inherit src meta;
buildInputs = [
python27Packages.wrapPython
diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix
index ecbf0c703f19..fe5f8790f38f 100644
--- a/pkgs/applications/science/robotics/apmplanner2/default.nix
+++ b/pkgs/applications/science/robotics/apmplanner2/default.nix
@@ -10,7 +10,7 @@ mkDerivation rec {
src = fetchFromGitHub {
owner = "ArduPilot";
repo = "apm_planner";
- rev = "${version}";
+ rev = version;
sha256 = "1k0786mjzi49nb6yw4chh9l4dmkf9gybpxg9zqkr5yg019nyzcvd";
};
diff --git a/pkgs/applications/science/robotics/gazebo/6.nix b/pkgs/applications/science/robotics/gazebo/6.nix
index 0d1aa4a9085f..80c52b49e47f 100644
--- a/pkgs/applications/science/robotics/gazebo/6.nix
+++ b/pkgs/applications/science/robotics/gazebo/6.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, callPackage, ignition, gazeboSimulator, ... } @ args:
-callPackage ./default.nix (args // rec {
+callPackage ./default.nix (args // {
version = "6.5.1";
src-sha256 = "96260aa23f1a1f24bc116f8e359d31f3bc65011033977cb7fb2c64d574321908";
sdformat = gazeboSimulator.sdformat3;
diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix
index 98ccd92c4ee5..a3ebda463b91 100644
--- a/pkgs/applications/science/robotics/gazebo/default.nix
+++ b/pkgs/applications/science/robotics/gazebo/default.nix
@@ -24,10 +24,10 @@
stdenv.mkDerivation rec {
inherit version;
- name = "gazebo-${version}";
+ pname = "gazebo";
src = fetchurl {
- url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${name}.tar.bz2";
+ url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${pname}-${version}.tar.bz2";
sha256 = src-sha256;
};
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index eae5d3766d6d..1863757adbcf 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -6,7 +6,7 @@
}:
stdenv.mkDerivation rec {
- name = "qgroundcontrol-${version}";
+ pname = "qgroundcontrol";
version = "3.3.0";
qtInputs = [
diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix
index 507481cddab2..d14c0bb0fe81 100644
--- a/pkgs/applications/science/robotics/yarp/default.nix
+++ b/pkgs/applications/science/robotics/yarp/default.nix
@@ -2,7 +2,7 @@
}:
stdenv.mkDerivation rec {
- name = "yarp-${version}";
+ pname = "yarp";
version = "2.3.70.2";
src = fetchFromGitHub {
owner = "robotology";
diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix
index a0917d03ce11..983a5153ee2f 100644
--- a/pkgs/applications/search/catfish/default.nix
+++ b/pkgs/applications/search/catfish/default.nix
@@ -56,7 +56,7 @@ pythonPackages.buildPythonApplication rec {
description = "A handy file search tool";
longDescription = ''
Catfish is a handy file searching tool. The interface is
- intentionally lightweight and simple, using only GTK+3.
+ intentionally lightweight and simple, using only GTK 3.
You can configure it to your needs by using several command line
options.
'';
diff --git a/pkgs/applications/search/grepcidr/default.nix b/pkgs/applications/search/grepcidr/default.nix
index 69fc0e76932c..06b2aee03920 100644
--- a/pkgs/applications/search/grepcidr/default.nix
+++ b/pkgs/applications/search/grepcidr/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "grepcidr-${version}";
+ pname = "grepcidr";
version = "2.0";
src = fetchurl {
- url = "http://www.pc-tools.net/files/unix/${name}.tar.gz";
+ url = "http://www.pc-tools.net/files/unix/${pname}-${version}.tar.gz";
sha256 = "1yzpa1nigmmp4hir6377hrkpp0z6jnxgccaw2jbqgydbglvnm231";
};
diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix
index 99c149b79d9d..bad8d35623c0 100644
--- a/pkgs/applications/search/grepm/default.nix
+++ b/pkgs/applications/search/grepm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, perlPackages, mutt }:
-stdenv.mkDerivation rec {
- name = "grepm-${version}";
+stdenv.mkDerivation {
+ pname = "grepm";
version = "0.6";
src = fetchurl {
diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix
index d16ea2710503..0dfa19882028 100644
--- a/pkgs/applications/version-management/bazaar/tools.nix
+++ b/pkgs/applications/version-management/bazaar/tools.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "bzr-tools-${version}";
+ pname = "bzr-tools";
version = "2.6.0";
src = fetchurl {
diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix
index 26397380d57f..e092a604142c 100644
--- a/pkgs/applications/version-management/bitkeeper/default.nix
+++ b/pkgs/applications/version-management/bitkeeper/default.nix
@@ -3,7 +3,7 @@
, libtomcrypt, libtommath, lz4 }:
stdenv.mkDerivation rec {
- name = "bitkeeper-${version}";
+ pname = "bitkeeper";
version = "7.3.1ce";
src = fetchurl {
diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix
index 5bcc3f991a1c..8c28a6789624 100644
--- a/pkgs/applications/version-management/blackbox/default.nix
+++ b/pkgs/applications/version-management/blackbox/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
version = "1.20181219";
pname = "blackbox";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "stackexchange";
diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix
index 6301acdf1342..7d1de378f53d 100644
--- a/pkgs/applications/version-management/bugseverywhere/default.nix
+++ b/pkgs/applications/version-management/bugseverywhere/default.nix
@@ -7,7 +7,7 @@
#
pythonPackages.buildPythonApplication rec {
version = "1.1.1";
- name = "bugseverywhere-${version}";
+ pname = "bugseverywhere";
src = fetchurl {
url =
diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix
index a2ebb8195db4..4c818060d220 100644
--- a/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/pkgs/applications/version-management/cvs2svn/default.nix
@@ -4,11 +4,11 @@
}:
python2Packages.buildPythonApplication rec {
- name = "cvs2svn-${version}";
+ pname = "cvs2svn";
version = "2.5.0";
src = fetchurl {
- url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${name}.tar.gz";
+ url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${pname}-${version}.tar.gz";
sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4";
};
diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix
index aa3bcb273949..71130a2e2830 100644
--- a/pkgs/applications/version-management/cvsps/default.nix
+++ b/pkgs/applications/version-management/cvsps/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch, cvs, zlib }:
stdenv.mkDerivation rec {
- name = "cvsps-${version}";
+ pname = "cvsps";
version = "2.1";
src = fetchurl {
diff --git a/pkgs/applications/version-management/diffuse/default.nix b/pkgs/applications/version-management/diffuse/default.nix
index fa6d4fe1890d..fc591dd710ee 100644
--- a/pkgs/applications/version-management/diffuse/default.nix
+++ b/pkgs/applications/version-management/diffuse/default.nix
@@ -4,10 +4,10 @@ let
inherit (python27Packages) pygtk python;
in stdenv.mkDerivation rec {
version = "0.4.8";
- name = "diffuse-${version}";
+ pname = "diffuse";
src = fetchurl {
- url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${name}.tar.bz2";
+ url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${pname}-${version}.tar.bz2";
sha256 = "0ayz8bywmk1z3zicb0a7hbxliqpc7xym60s0mawzqllkpadvgly1";
};
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index d4b60a4f5386..cc0298811333 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "fossil-${version}";
+ pname = "fossil";
version = "2.9";
src = fetchurl {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
[
"https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
];
- name = "${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
sha256 = "0kwb7pkp7y2my916rhyl6kmcf0fk8gkzaxzy13hfgqs35nlsvchw";
};
diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix
index 0475a8ae76ca..fe0c1a508d0a 100644
--- a/pkgs/applications/version-management/gerrit/default.nix
+++ b/pkgs/applications/version-management/gerrit/default.nix
@@ -1,25 +1,21 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "gerrit-${version}";
- version = "2.14.6";
+ pname = "gerrit";
+ version = "3.0.2";
src = fetchurl {
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
- sha256 = "0fsqwfsnyb4nbxgb1i1mp0vshl0mk8bwqlddzqr9x2v99mbca28q";
+ sha256 = "16zh2dczjnzwzrzg0xkqs7bfd6bzk7s42gyb59z3206zpvh5kq9k";
};
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "1qrmvqqnlbabqz4yx06vi030ci12v0063iq2palxmbj3whrzv9la";
-
buildCommand = ''
mkdir -p "$out"/webapps/
ln -s ${src} "$out"/webapps/gerrit-${version}.war
'';
meta = with stdenv.lib; {
- homepage = https://www.gerritcodereview.com/index.md;
+ homepage = "https://www.gerritcodereview.com/index.md";
license = licenses.asl20;
description = "A web based code review and repository management for the git version control system";
maintainers = with maintainers; [ jammerful ];
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 6b25ef8518c9..203926550628 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
- name = "cgit-${version}";
+ pname = "cgit";
version = "1.2.1";
src = fetchurl {
- url = "https://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
+ url = "https://git.zx2c4.com/cgit/snapshot/${pname}-${version}.tar.xz";
sha256 = "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w";
};
diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
index 1af1870928ba..454458cdec66 100644
--- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }:
-stdenv.mkDerivation rec {
- name = "darcs-to-git-${version}";
+stdenv.mkDerivation {
+ pname = "darcs-to-git";
version = "2015-06-04";
src = fetchgit {
diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
index 599c6bb4308e..1bbbbe22d9a8 100644
--- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
@@ -1,7 +1,7 @@
{stdenv, git, perl, ncurses, coreutils, fetchFromGitHub, makeWrapper, ...}:
stdenv.mkDerivation rec {
- name = "diff-so-fancy-${version}";
+ pname = "diff-so-fancy";
version = "1.2.6";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
index 52494d4ab7ed..477b628c4d7b 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
-buildGoPackage rec {
- name = "ghq-${version}";
- version = "0.10.2";
-
- goPackagePath = "github.com/motemen/ghq";
+buildGoModule rec {
+ pname = "ghq";
+ version = "0.12.6";
src = fetchFromGitHub {
owner = "motemen";
repo = "ghq";
rev = "v${version}";
- sha256 = "1i7zmgv7760nrw8sayag90b8vvmbsiifgiqki5s3gs3ldnvlki5w";
+ sha256 = "14rm7fvphr7r9x0ys10vhzjwhfhhscgr574n1i1z4lzw551lrnp4";
};
- goDeps = ./deps.nix;
+ modSha256 = "1y2v8ir7kc2avgri06nagfyaxqr3xrg4g5pxl9rwzq9dyzm6ci5z";
buildFlagsArray = ''
-ldflags=
@@ -21,9 +19,17 @@ buildGoPackage rec {
'';
postInstall = ''
- install -m 444 -D ${src}/zsh/_ghq $bin/share/zsh/site-functions/_ghq
+ install -m 444 -D ${src}/zsh/_ghq $out/share/zsh/site-functions/_ghq
'';
+ patches = [
+ (fetchpatch {
+ # remove once the commit lands in a release.
+ url = "https://github.com/motemen/ghq/commit/38ac89e60e60182b5870108f9753c9fe8d00e4a6.patch";
+ sha256 = "1z8yvzmka3sh44my6jnwc39p8zs7mczxgvwc9z0pkqk4vgvaj8gj";
+ })
+ ];
+
meta = {
description = "Remote repository management made easy";
homepage = https://github.com/motemen/ghq;
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
deleted file mode 100644
index be99aee64a5e..000000000000
--- a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix
+++ /dev/null
@@ -1,192 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
- {
- goPackagePath = "github.com/blang/semver";
- fetch = {
- type = "git";
- url = "https://github.com/blang/semver";
- rev = "v3.5.1";
- sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
- };
- }
- {
- goPackagePath = "github.com/daviddengcn/go-colortext";
- fetch = {
- type = "git";
- url = "https://github.com/daviddengcn/go-colortext";
- rev = "186a3d44e920";
- sha256 = "18piv4zzcb8abbc7fllz9p6rd4zhsy1gc6iygym381caggmmgxgk";
- };
- }
- {
- goPackagePath = "github.com/fsnotify/fsnotify";
- fetch = {
- type = "git";
- url = "https://github.com/fsnotify/fsnotify";
- rev = "v1.4.7";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "v1.2.0";
- sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
- };
- }
- {
- goPackagePath = "github.com/golangplus/bytes";
- fetch = {
- type = "git";
- url = "https://github.com/golangplus/bytes";
- rev = "45c989fe5450";
- sha256 = "1fpwg1idakpbvkmk8j8yyhv9g7mhr9c922kvff6kj4br4k05zyzr";
- };
- }
- {
- goPackagePath = "github.com/golangplus/fmt";
- fetch = {
- type = "git";
- url = "https://github.com/golangplus/fmt";
- rev = "2a5d6d7d2995";
- sha256 = "1242q05qnawhv0klzy1pbq63q8jxkms5hc7421992hzq2m40k5yn";
- };
- }
- {
- goPackagePath = "github.com/golangplus/testing";
- fetch = {
- type = "git";
- url = "https://github.com/golangplus/testing";
- rev = "af21d9c3145e";
- sha256 = "1g83sjvcavqbh92vyirc48mrqd18yfci08zya0hrgk840cr94czc";
- };
- }
- {
- goPackagePath = "github.com/hpcloud/tail";
- fetch = {
- type = "git";
- url = "https://github.com/hpcloud/tail";
- rev = "v1.0.0";
- sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
- };
- }
- {
- goPackagePath = "github.com/motemen/go-colorine";
- fetch = {
- type = "git";
- url = "https://github.com/motemen/go-colorine";
- rev = "45d19169413a";
- sha256 = "1mdy6q0926s1frj027nlzlvm2qssmkpjis7ic3l2smajkzh07118";
- };
- }
- {
- goPackagePath = "github.com/onsi/ginkgo";
- fetch = {
- type = "git";
- url = "https://github.com/onsi/ginkgo";
- rev = "v1.6.0";
- sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25";
- };
- }
- {
- goPackagePath = "github.com/onsi/gomega";
- fetch = {
- type = "git";
- url = "https://github.com/onsi/gomega";
- rev = "v1.5.0";
- sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9";
- };
- }
- {
- goPackagePath = "github.com/urfave/cli";
- fetch = {
- type = "git";
- url = "https://github.com/urfave/cli";
- rev = "v1.20.0";
- sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "c2843e01d9a2";
- sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "4829fb13d2c6";
- sha256 = "05nwpw41d7xsdln5rj381n8j9dsbq5ng1wp52bxslqc4x0l5s9fj";
- };
- }
- {
- goPackagePath = "golang.org/x/sync";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sync";
- rev = "1d60e4601c6f";
- sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "d0b11bdaac8a";
- sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "v0.3.0";
- sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
- };
- }
- {
- goPackagePath = "gopkg.in/check.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/check.v1";
- rev = "20d25e280405";
- sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
- };
- }
- {
- goPackagePath = "gopkg.in/fsnotify.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/fsnotify.v1";
- rev = "v1.4.7";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- };
- }
- {
- goPackagePath = "gopkg.in/tomb.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/tomb.v1";
- rev = "dd632973f1e7";
- sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "v2.2.1";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
- };
- }
-]
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
index ba64a065d281..3118eaab19b4 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, git-annex-adapter }:
buildPythonApplication rec {
- name = "git-annex-metadata-gui-${version}";
+ pname = "git-annex-metadata-gui";
version = "0.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
index 4d0f33730e45..55a9dd18f720 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "git-annex-remote-b2-${version}";
+ pname = "git-annex-remote-b2";
version = "20151212-${stdenv.lib.strings.substring 0 7 rev}";
rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba";
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
index c368dcd487e8..5d4d9b86d83f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rclone, makeWrapper }:
stdenv.mkDerivation rec {
- name = "git-annex-remote-rclone-${version}";
+ pname = "git-annex-remote-rclone";
version = "0.6";
rev = "v${version}";
diff --git a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
index 185ed38b5db0..daa0af43879d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "git-appraise-unstable-${version}";
+ pname = "git-appraise-unstable";
version = "2018-02-26";
rev = "2414523905939525559e4b2498c5597f86193b61";
diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
index 2d171df8bf24..32b9c8a980dc 100644
--- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
@@ -4,8 +4,6 @@ python2Packages.buildPythonApplication rec {
pname = "git-big-picture";
version = "0.10.1";
- name = "${pname}-${version}";
-
src = fetchFromGitHub {
owner = "esc";
repo = pname;
diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
index 0baf09918d44..edc5f9d7bfb0 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "git-bug-${version}";
+ pname = "git-bug";
version = "0.5.0";
rev = "8d7a2c076a38c89085fd3191a2998efb659650c2";
goPackagePath = "github.com/MichaelMure/git-bug";
diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
index c14a027b4abe..5edf9a7b5a53 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
@@ -2,8 +2,8 @@
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto
, pythonPackages }:
-stdenv.mkDerivation rec {
- name = "git-bz-${version}";
+stdenv.mkDerivation {
+ pname = "git-bz";
version = "3.2015-09-08";
src = fetchgit {
diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
index fbbb2d952422..418cf2e5866f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
@@ -1,6 +1,6 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
- name = "git-codeowners-${version}";
+ pname = "git-codeowners";
version = "0.1.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 316b664c0705..545fc77168e9 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -4,7 +4,7 @@ let
inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify;
in buildPythonApplication rec {
- name = "git-cola-${version}";
+ pname = "git-cola";
version = "3.4";
src = fetchFromGitHub {
@@ -21,8 +21,8 @@ in buildPythonApplication rec {
doCheck = false;
postFixup = ''
- wrapQtApp bin/git-cola
- wrapQtApp bin/git-dag
+ wrapQtApp $out/bin/git-cola
+ wrapQtApp $out/bin/git-dag
'';
diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
index abb09ff9a45e..df0b1e78d274 100644
--- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
makeFlags = [
- "PREFIX=${placeholder ''out''}"
+ "PREFIX=${placeholder "out"}"
"ENABLE_MAN=yes"
"DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl"
];
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index 90b8b54434bd..77fc04281153 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -16,7 +16,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "git-dit-${version}";
+ pname = "git-dit";
version = "0.4.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
index c036a0ffe4b1..09c9169e434e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "git-extras-${version}";
+ pname = "git-extras";
version = "4.7.0";
src = fetchurl {
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
index 2d6de24167bd..f4aa4878f62f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
@@ -1,6 +1,6 @@
{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }:
-bundlerEnv rec {
+bundlerEnv {
inherit ruby;
pname = "git_fame";
diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index ded9bcc2ffdf..193133d6d3e6 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gitMinimal, python2Packages }:
stdenv.mkDerivation rec {
- name = "git-hub-${version}";
+ pname = "git-hub";
version = "1.0.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
index 10e786222710..76b29135f66c 100644
--- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
stdenv.mkDerivation rec {
- name = "git-imerge-${version}";
+ pname = "git-imerge";
version = "1.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
index f8d871bdcf30..a7abd1eeaf46 100644
--- a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "git-octopus-${version}";
+ pname = "git-octopus";
version = "1.4";
installFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix
index dc3fbbed1995..1cc3f365ea88 100644
--- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix
@@ -1,7 +1,7 @@
{stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}:
stdenv.mkDerivation rec {
- name = "git-open-${version}";
+ pname = "git-open";
version = "2.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
index d72df8028759..9fb9d4de6e3d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub}:
stdenv.mkDerivation rec {
- name = "git-radar-${version}";
+ pname = "git-radar";
version = "0.6";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
index d1dce0469793..ff0f702269c2 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "git-remote-gcrypt-${version}";
+ pname = "git-remote-gcrypt";
version = "1.2";
rev = version;
diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
index 03435ec834ab..c0de46264d05 100644
--- a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, git, gnused }:
stdenv.mkDerivation rec {
- name = "git-reparent-${version}";
+ pname = "git-reparent";
version = "unstable-2017-09-03";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
index 211685c8edb4..1da8f2a4a5ed 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, makeWrapper, git, coreutils }:
stdenv.mkDerivation rec {
- name = "git-secrets-${version}";
+ pname = "git-secrets";
version = "1.3.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "git-secrets";
- rev = "${version}";
+ rev = version;
sha256 = "10lnxg0q855zi3d6804ivlrn6dc817kilzdh05mmz8a0ccvm2qc7";
};
diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
index 6a52983e83ce..ae40e011f858 100644
--- a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, ... }:
-stdenv.mkDerivation rec {
- name = "git-stree-${version}";
+stdenv.mkDerivation {
+ pname = "git-stree";
version = "0.4.5";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix
index 24a1e1ac937e..b196d39b46f6 100644
--- a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
];
makeFlags = [
- "PREFIX=${placeholder ''out''}"
- "INSTALL_LIB=${placeholder ''out''}/bin"
- "INSTALL_MAN=${placeholder ''out''}/share/man/man1"
+ "PREFIX=${placeholder "out"}"
+ "INSTALL_LIB=${placeholder "out"}/bin"
+ "INSTALL_MAN=${placeholder "out"}/share/man/man1"
];
patches = [
diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
index 7ba7d8ec2434..7fa15c668099 100644
--- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
@@ -2,7 +2,7 @@
}:
stdenv.mkDerivation rec {
- name = "git-sync-${version}";
+ pname = "git-sync";
version = "20151024";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git-test/default.nix b/pkgs/applications/version-management/git-and-tools/git-test/default.nix
index 1150f008299c..e55799c27521 100644
--- a/pkgs/applications/version-management/git-and-tools/git-test/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-test/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, git }:
stdenv.mkDerivation rec {
- name = "git-test-${version}";
+ pname = "git-test";
version = "1.0.4";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 83e65bc17171..47da7f7a1d7f 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -21,18 +21,19 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
- version = "2.22.0";
+ version = "2.23.0";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
in
stdenv.mkDerivation {
- name = "git-${version}";
+ pname = "git";
+ inherit version;
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "17zj6jwx3s6bybd290f1mj5iym1r64560rmnf0p63x4akxclp7hm";
+ sha256 = "0rv0y45gcd3h191isppn77acih695v4pipdj031jvs9rd1ds0kr3";
};
outputs = [ "out" ];
diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
index 26f9f8c756ee..57af13f597a7 100644
--- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
@@ -5,7 +5,6 @@ with pkgs.lib;
stdenv.mkDerivation rec {
pname = "gitflow";
version = "1.12.2";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "petervanderdoes";
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
index 1de631e8b6ad..8cf9662d8f94 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
@@ -1,6 +1,6 @@
{callPackage, stdenv, fetchFromGitHub, ...}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gitstatus";
version = "unstable-2019-05-06";
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
index 22f35e22fb54..0ff7fae2878f 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
@@ -1,6 +1,6 @@
{fetchFromGitHub, libgit2, ...}:
-libgit2.overrideAttrs (oldAttrs: rec {
+libgit2.overrideAttrs (oldAttrs: {
cmakeFlags = oldAttrs.cmakeFlags ++ [
"-DUSE_BUNDLED_ZLIB=ON"
"-DUSE_ICONV=OFF"
diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
index afd90ba49690..b6659b5f539f 100644
--- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
@@ -18,7 +18,7 @@ in buildEnv {
name = "gitweb-${stdenv.lib.getVersion git}";
ignoreCollisions = true;
- paths = stdenv.lib.optional gitwebTheme "${gitwebThemeSrc}"
+ paths = stdenv.lib.optional gitwebTheme gitwebThemeSrc
++ [ "${git}/share/gitweb" ];
meta = git.meta // {
diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index b7828418db07..e6b746233fe1 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -3,7 +3,8 @@ let
version = "0.3.1";
in
buildGoPackage {
- name = "grv-${version}";
+ pname = "grv";
+ inherit version;
buildInputs = [ ncurses readline curl libgit2 ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index f1950923415f..cd38be2b977a 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "hub";
- version = "2.12.3";
+ version = "2.12.4";
goPackagePath = "github.com/github/hub";
@@ -13,7 +13,7 @@ buildGoPackage rec {
owner = "github";
repo = pname;
rev = "v${version}";
- sha256 = "13l4nc3k6vl9x1x0153mwi351j3z266wx0fp7xw2851avrgkk9zg";
+ sha256 = "1d4cn4pgx520psrfac92h3m7azxnpj1plrrqmxryar85f3y363bq";
};
nativeBuildInputs = [ groff utillinux ];
diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
index d0d60b193437..5c4ece7c9e51 100644
--- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
@@ -7,7 +7,7 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "languitar";
repo = "pass-git-helper";
- rev = "${version}";
+ rev = version;
sha256 = "1zccbmq5l6asl9qm1f90vg9467y3spmv3ayrw07qizrj43yfd9ap";
};
diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
index 34c367b20a43..3c7784e85062 100644
--- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
@@ -4,7 +4,8 @@ let
version = "1.0.16";
in
stdenv.mkDerivation {
- name = "svn-all-fast-export-${version}";
+ pname = "svn-all-fast-export";
+ inherit version;
src = fetchFromGitHub {
owner = "svn-all-fast-export";
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index d00fdd0c29e0..821ecf3e3d8f 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -4,7 +4,8 @@ let
version = "2.4.0";
in
stdenv.mkDerivation {
- name = "svn2git-${version}";
+ pname = "svn2git";
+ inherit version;
src = fetchurl {
url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz";
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 52f5551e204f..59354598d008 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -5,12 +5,11 @@
stdenv.mkDerivation rec {
pname = "tig";
version = "2.4.1";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "jonas";
repo = pname;
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "0i26yfn2vjgsg1kdvhhv55jwzds7ih7cnad1xqvilqm83zh47ksd";
};
diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
index cea588f76ca2..3b8affb57edf 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, utillinux, gnugrep, gnused, gawk }:
stdenv.mkDerivation rec {
- name = "transcrypt-${version}";
+ pname = "transcrypt";
version = "1.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix
index fd999dc17d4d..ec03c5bed5b1 100644
--- a/pkgs/applications/version-management/git-crecord/default.nix
+++ b/pkgs/applications/version-management/git-crecord/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "git-crecord-${version}";
+ pname = "git-crecord";
version = "20161216.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix
index 3cde046a2adf..e3190667259e 100644
--- a/pkgs/applications/version-management/git-lfs/1.nix
+++ b/pkgs/applications/version-management/git-lfs/1.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "git-lfs-${version}";
+ pname = "git-lfs";
version = "1.5.6";
rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0";
diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 92ba57382501..d9b5e1704976 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "git-lfs-${version}";
+ pname = "git-lfs";
version = "2.7.2";
goPackagePath = "github.com/git-lfs/git-lfs";
diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index ecc054df47e7..c48f455a64a3 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -6,9 +6,9 @@ pythonPackages.buildPythonApplication rec {
# Manually set version because prb wants to get it from the git
# upstream repository (and we are installing from tarball instead)
- PBR_VERSION = "${version}";
+ PBR_VERSION = version;
- src = fetchFromGitHub rec {
+ src = fetchFromGitHub {
owner = "openstack-infra";
repo = pname;
rev = version;
diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix
index 9c5ab20d364f..7a92679583b6 100644
--- a/pkgs/applications/version-management/git-sizer/default.nix
+++ b/pkgs/applications/version-management/git-sizer/default.nix
@@ -2,7 +2,6 @@
buildGoPackage rec {
pname = "git-sizer";
- name = "${pname}-${version}";
version = "1.0.0";
goPackagePath = "github.com/github/git-sizer";
diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix
index 45c97868c4bf..ba0625c433de 100644
--- a/pkgs/applications/version-management/git-up/default.nix
+++ b/pkgs/applications/version-management/git-up/default.nix
@@ -2,10 +2,10 @@
python2Packages.buildPythonApplication rec {
version = "1.4.2";
- name = "git-up-${version}";
+ pname = "git-up";
src = fetchurl {
- url = "mirror://pypi/g/git-up/${name}.zip";
+ url = "mirror://pypi/g/git-up/${pname}-${version}.zip";
sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q";
};
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 00f344597bb4..9c7d83a05fd9 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -8,13 +8,13 @@ with stdenv.lib;
buildGoPackage rec {
pname = "gitea";
- version = "1.9.2";
+ version = "1.9.3";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
- sha256 = "1i7h6scycwzil87fcx1a19w5pl0986g5ax7y030w0wgmrq3zj53a";
+ sha256 = "0g6ch85dq4vazxnr6g78wgqrnfa955395y1zws0a50h0wfxpdjis";
# Required to generate the same checksum on MacOS due to unicode encoding differences
# More information: https://github.com/NixOS/nixpkgs/pull/48128
extraPostFetch = ''
@@ -62,7 +62,7 @@ buildGoPackage rec {
meta = {
description = "Git with a cup of tea";
- homepage = https://gitea.io;
+ homepage = "https://gitea.io";
license = licenses.mit;
maintainers = with maintainers; [ disassembler kolaente ];
};
diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix
index 2428c6cebddd..4467e9746ce9 100644
--- a/pkgs/applications/version-management/gitinspector/default.nix
+++ b/pkgs/applications/version-management/gitinspector/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchzip, python2Packages}:
python2Packages.buildPythonApplication rec {
- name = "gitinspector-${version}";
+ pname = "gitinspector";
version = "0.4.4";
namePrefix = "";
src = fetchzip {
url = "https://github.com/ejwa/gitinspector/archive/v${version}.tar.gz";
sha256 = "1pfsw6xldm6jigs3nhysvqaxk8a0zf8zczgfkrp920as9sya3c7m";
- name = name + "-src";
+ name = "${pname}-${version}" + "-src";
};
checkInputs = with python2Packages; [
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index f766ddbd42c9..fa93ff41a4ae 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -12,7 +12,7 @@ let
curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; };
in
stdenv.mkDerivation rec {
- name = "gitkraken-${version}";
+ pname = "gitkraken";
version = "6.1.4";
src = fetchurl {
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 20f0937274ed..fb18fb7941e6 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -7,7 +7,7 @@ let
rubyEnv = bundlerEnv rec {
name = "gitlab-env-${version}";
inherit ruby;
- gemdir = ./rubyEnv- + "${if gitlabEnterprise then "ee" else "ce"}";
+ gemdir = ./rubyEnv- + (if gitlabEnterprise then "ee" else "ce");
gemset =
let x = import (gemdir + "/gemset.nix");
in x // {
@@ -44,7 +44,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "gitlab${if gitlabEnterprise then "-ee" else ""}-${version}";
src = sources.gitlab;
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 184c6dc7f730..873d9f390905 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -18,7 +18,7 @@ let
};
in buildGoPackage rec {
version = "1.53.2";
- name = "gitaly-${version}";
+ pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index faeed38c918b..cd4784b36c8e 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "9.3.0";
- name = "gitlab-shell-${version}";
+ pname = "gitlab-shell";
src = fetchFromGitLab {
owner = "gitlab-org";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 23cf3483f7a9..12f354bc2fb9 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, git, go }:
stdenv.mkDerivation rec {
- name = "gitlab-workhorse-${version}";
+ pname = "gitlab-workhorse";
version = "8.7.0";
diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix
index 42c091007884..7c157191ab97 100644
--- a/pkgs/applications/version-management/gitolite/default.nix
+++ b/pkgs/applications/version-management/gitolite/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, git, nettools, perl }:
stdenv.mkDerivation rec {
- name = "gitolite-${version}";
+ pname = "gitolite";
version = "3.6.11";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix
index 64b6e2107f6a..5d29c8fcb6c3 100644
--- a/pkgs/applications/version-management/gitstats/default.nix
+++ b/pkgs/applications/version-management/gitstats/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchzip, perl, python, gnuplot, coreutils, gnugrep }:
stdenv.mkDerivation rec {
- name = "gitstats-${version}";
+ pname = "gitstats";
version = "2016-01-08";
# upstream does not make releases
src = fetchzip {
url = "https://github.com/hoxu/gitstats/archive/55c5c285558c410bb35ebf421245d320ab9ee9fa.zip";
sha256 = "1bfcwhksylrpm88vyp33qjby4js31zcxy7w368dzjv4il3fh2i59";
- name = name + "-src";
+ name = "${pname}-${version}" + "-src";
};
buildInputs = [ perl python ];
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 0587bc9af767..c2153ebea893 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -7,7 +7,7 @@
with stdenv.lib;
buildGoPackage rec {
- name = "gogs-${version}";
+ pname = "gogs";
version = "0.11.86";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index 0d2c4d742672..0a24cfbb3a0d 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -4,10 +4,10 @@
stdenv.mkDerivation rec {
version = "0.49";
- name = "gource-${version}";
+ pname = "gource";
src = fetchurl {
- url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz";
+ url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "12hf5ipcsp9dxsqn84n4kr63xaiskrnf5a084wr29qk171lj7pd9";
};
diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix
index 33d2eb89ad08..92bc9f51cac7 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/pkgs/applications/version-management/guitone/default.nix
@@ -1,8 +1,9 @@
{ stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }:
let version = "1.0-mtn-head"; in
-stdenv.mkDerivation rec {
- name = "guitone-${version}";
+stdenv.mkDerivation {
+ pname = "guitone";
+ inherit version;
#src = fetchurl {
# url = "${meta.homepage}/count.php/from=default/${version}/${name}.tgz";
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
index 3c052a26cdee..bee1c82e11b6 100644
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -9,12 +9,12 @@ let graphviz_2_0 = import ./graphviz-2.0.nix {
}; in
stdenv.mkDerivation rec {
version = "1.0.2";
- name = "monotone-viz-${version}";
+ pname = "monotone-viz";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4];
src = fetchurl {
- url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz";
+ url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz";
sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";
};
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 010d4d2f86ad..7081e1a08996 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -11,7 +11,8 @@ in
assert perlVersion != "";
stdenv.mkDerivation rec {
- name = "monotone-${version}";
+ pname = "monotone";
+ inherit version;
src = fetchurl {
url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2";
@@ -25,8 +26,8 @@ stdenv.mkDerivation rec {
openssl gmp bzip2 ];
postInstall = ''
- mkdir -p $out/share/${name}
- cp -rv contrib/ $out/share/${name}/contrib
+ mkdir -p $out/share/${pname}-${version}
+ cp -rv contrib/ $out/share/${pname}-${version}/contrib
mkdir -p $out/${perl.libPrefix}/${perlVersion}
cp -v contrib/Monotone.pm $out/${perl.libPrefix}/${perlVersion}
'';
diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix
index 8150203814d0..a4632399df04 100644
--- a/pkgs/applications/version-management/mr/default.nix
+++ b/pkgs/applications/version-management/mr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, perl }:
-stdenv.mkDerivation rec {
- name = "mr-${version}";
+stdenv.mkDerivation {
+ pname = "mr";
version = "1.20180726";
src = fetchgit {
diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix
index 1a6eda6a04e9..b0a7108ac07f 100644
--- a/pkgs/applications/version-management/nbstripout/default.nix
+++ b/pkgs/applications/version-management/nbstripout/default.nix
@@ -1,9 +1,8 @@
-{lib, python2Packages, fetchFromGitHub, fetchurl, git, mercurial, coreutils}:
+{lib, python2Packages, git, mercurial, coreutils}:
with python2Packages;
buildPythonApplication rec {
- name = "${pname}-${version}";
- version = "0.3.1";
+ version = "0.3.6";
pname = "nbstripout";
# Mercurial should be added as a build input but because it's a Python
@@ -13,30 +12,11 @@ buildPythonApplication rec {
nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ ipython nbformat ];
- # PyPI source is currently missing tests. Thus, use GitHub instead.
- # See: https://github.com/kynan/nbstripout/issues/73
- # Use PyPI again after it has been fixed in a release.
- src = fetchFromGitHub {
- owner = "kynan";
- repo = pname;
- rev = version;
- sha256 = "1jifqmszjzyaqzaw2ir83k5fdb04iyxdad4lclawpb42hbink9ws";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1x6010akw7iqxn7ba5m6malfr2fvaf0bjp3cdh983qn1s7vwlq0r";
};
- patches = [
- (
- # Fix git diff tests by using --no-index.
- # See: https://github.com/kynan/nbstripout/issues/74
- #
- # Remove this patch once the pull request has been merged and a new
- # release made.
- fetchurl {
- url = "https://github.com/jluttine/nbstripout/commit/03e28424fb788dd09a95e99814977b0d0846c0b4.patch";
- sha256 = "09myfb77a2wh8lqqs9fcpam97vmaw8b7zbq8n5gwn6d80zbl7dn0";
- }
- )
- ];
-
# for some reason, darwin uses /bin/sh echo native instead of echo binary, so
# force using the echo binary
postPatch = ''
diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix
index 8fb1095dc581..db9afdc0a74f 100644
--- a/pkgs/applications/version-management/nitpick/default.nix
+++ b/pkgs/applications/version-management/nitpick/default.nix
@@ -7,7 +7,6 @@
buildPythonPackage rec {
pname = "nitpick";
version = "1.1";
- name = "${pname}-${version}";
format = "other";
disabled = !isPy27;
diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix
index 314c379c4e6d..0020c8c2189e 100644
--- a/pkgs/applications/version-management/p4v/default.nix
+++ b/pkgs/applications/version-management/p4v/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl, xkeyboard_config, wrapQtAppsHook }:
stdenv.mkDerivation rec {
- name = "p4v-${version}";
+ pname = "p4v";
version = "2017.3.1601999";
src = fetchurl {
diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix
index 8b68dddfceb4..ea34617dc8b1 100644
--- a/pkgs/applications/version-management/peru/default.nix
+++ b/pkgs/applications/version-management/peru/default.nix
@@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "buildinspace";
repo = "peru";
- rev = "${version}";
+ rev = version;
sha256 = "0p4j51m89glx12cd65lcnbwpvin0v49wkhrx06755skr7v37pm2a";
};
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 180664d33863..6d0e39d47bf4 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }:
rustPlatform.buildRustPackage rec {
- name = "pijul-${version}";
+ pname = "pijul";
version = "0.12.0";
src = fetchurl {
- url = "https://pijul.org/releases/${name}.tar.gz";
+ url = "https://pijul.org/releases/${pname}-${version}.tar.gz";
sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q";
};
diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix
index d3b027fada68..e9950c32549a 100644
--- a/pkgs/applications/version-management/rabbitvcs/default.nix
+++ b/pkgs/applications/version-management/rabbitvcs/default.nix
@@ -1,6 +1,6 @@
{ fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }:
python2Packages.buildPythonApplication rec {
- name = "rabbitvcs-${version}";
+ pname = "rabbitvcs";
version = "0.17.1";
namePrefix = "";
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix
index e799d5fac43b..60486e201165 100644
--- a/pkgs/applications/version-management/rapidsvn/default.nix
+++ b/pkgs/applications/version-management/rapidsvn/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }:
stdenv.mkDerivation rec {
- name = "rapidsvn-${version}";
+ pname = "rapidsvn";
version = "0.12.1";
src = fetchurl {
- url = "http://www.rapidsvn.org/download/release/${version}/${name}.tar.gz";
+ url = "http://www.rapidsvn.org/download/release/${version}/${pname}-${version}.tar.gz";
sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
};
diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix
index 1fbc22f87761..a3ba418a1463 100644
--- a/pkgs/applications/version-management/redmine/4.x/default.nix
+++ b/pkgs/applications/version-management/redmine/4.x/default.nix
@@ -11,10 +11,11 @@ let
};
in
stdenv.mkDerivation rec {
- name = "redmine-${version}";
+ pname = "redmine";
+ inherit version;
src = fetchurl {
- url = "https://www.redmine.org/releases/${name}.tar.gz";
+ url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
sha256 = "0i5bmgdi3mahbis9hn0hk53rnz4ihp9yij4b4i07ny9vf3n4kp1a";
};
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index ba1980c3d142..0b1f64b58a17 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -11,10 +11,11 @@ let
};
in
stdenv.mkDerivation rec {
- name = "redmine-${version}";
+ pname = "redmine";
+ inherit version;
src = fetchurl {
- url = "https://www.redmine.org/releases/${name}.tar.gz";
+ url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
sha256 = "14987sd9ff2n3982qlfwd4m0g1m10w8jyv791nica3wppvnrxh0r";
};
diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix
index 7d655bfc5d3b..a225c23ceebc 100644
--- a/pkgs/applications/version-management/sit/default.nix
+++ b/pkgs/applications/version-management/sit/default.nix
@@ -3,7 +3,7 @@
libiconv, CoreFoundation, Security }:
rustPlatform.buildRustPackage rec {
- name = "sit-${version}";
+ pname = "sit";
version = "0.4.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 049f2756a551..a3fcd209efc0 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python, rcs, git, makeWrapper }:
stdenv.mkDerivation rec {
- name = "src-${version}";
+ pname = "src";
version = "1.26";
src = fetchurl {
- url = "http://www.catb.org/~esr/src/${name}.tar.gz";
+ url = "http://www.catb.org/~esr/src/${pname}-${version}.tar.gz";
sha256 = "06npsnf2bfjgcs7wilhcqn24zn286nyy4qyp3yp88zapkxzlap23";
};
diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix
index 8753d4f6f571..693af89d9785 100644
--- a/pkgs/applications/version-management/srcml/default.nix
+++ b/pkgs/applications/version-management/srcml/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "0.9.5_beta";
- name = "srcml-${version}";
+ pname = "srcml";
src = fetchurl {
url = "http://www.sdml.cs.kent.edu/lmcrs/srcML-${version}-src.tar.gz";
diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index c68cc928848d..c769ec0a66d6 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "tailor-${version}";
+ pname = "tailor";
version = "0.9.35";
src = fetchurl {
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index a6cdf2e4373e..779c33627e8f 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -21,7 +21,7 @@ let
};
};
-in python2Packages.buildPythonApplication rec {
+in python2Packages.buildPythonApplication {
inherit (tortoisehgSrc.meta) name version;
src = tortoisehgSrc;
diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix
index c2bf0a4183c1..2ad6b6f2f62c 100644
--- a/pkgs/applications/version-management/vcprompt/default.nix
+++ b/pkgs/applications/version-management/vcprompt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchhg, autoconf, sqlite }:
stdenv.mkDerivation rec {
- name = "vcprompt-${version}";
+ pname = "vcprompt";
version = "1.2.1";
src = fetchhg {
diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix
index 4089e68d85dc..8a014a633930 100644
--- a/pkgs/applications/version-management/vcsh/default.nix
+++ b/pkgs/applications/version-management/vcsh/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, which, git, ronn, perlPackages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.20170915"; # date of commit we're pulling
- name = "vcsh-${version}";
+ pname = "vcsh";
src = fetchFromGitHub {
owner = "RichiH";
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index 6baeb5279c26..66b785e43b17 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -2,12 +2,13 @@
let version = "1.12.0"; in
stdenv.mkDerivation {
- name = "yadm-${version}";
+ pname = "yadm";
+ inherit version;
src = fetchFromGitHub {
owner = "TheLocehiliosan";
repo = "yadm";
- rev = "${version}";
+ rev = version;
sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6";
};
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index 3df616824801..2734035b6de9 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -21,11 +21,11 @@ assert portaudioSupport -> (portaudio != null);
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "aegisub-${version}";
+ pname = "aegisub";
version = "3.2.2";
src = fetchurl {
- url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz";
+ url = "http://ftp.aegisub.org/pub/releases/${pname}-${version}.tar.xz";
sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5";
};
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 4cbd506c177d..c28d900dd9f1 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -24,7 +24,7 @@ assert default != "qt5" -> default == "cli";
assert !withQT -> default != "qt5";
stdenv.mkDerivation rec {
- name = "avidemux-${version}";
+ pname = "avidemux";
version = "2.7.4";
src = fetchurl {
diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix
index a76608bdd900..f16f655b95db 100644
--- a/pkgs/applications/video/avxsynth/default.nix
+++ b/pkgs/applications/video/avxsynth/default.nix
@@ -7,8 +7,8 @@ let
inherit (stdenv.lib) enableFeature optional;
in
-stdenv.mkDerivation rec {
- name = "avxsynth-${version}";
+stdenv.mkDerivation {
+ pname = "avxsynth";
version = "2015-04-07";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix
index d98b39796608..64b9613363c3 100644
--- a/pkgs/applications/video/bino3d/default.nix
+++ b/pkgs/applications/video/bino3d/default.nix
@@ -1,11 +1,11 @@
{ stdenv, lib, fetchurl, pkgconfig, ffmpeg, glew, libass, openal, qtbase }:
stdenv.mkDerivation rec {
- name = "bino-${version}";
+ pname = "bino";
version = "1.6.7";
src = fetchurl {
- url = "https://bino3d.org/releases/${name}.tar.xz";
+ url = "https://bino3d.org/releases/${pname}-${version}.tar.xz";
sha256 = "04yl7ibnhajlli4a5x77az8jxbzw6b2wjay8aa6px551nmiszn9k";
};
diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix
index 4b97db56e978..1cba1d0e9491 100644
--- a/pkgs/applications/video/bombono/default.nix
+++ b/pkgs/applications/video/bombono/default.nix
@@ -8,7 +8,7 @@ fetchpatch {
url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c";
}; in
stdenv.mkDerivation rec {
- name = "bombono-${version}";
+ pname = "bombono";
version = "1.2.4";
src = fetchFromGitHub {
owner = "muravjov";
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index bbac10140344..9ff65483f261 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -30,7 +30,7 @@ assert cddaSupport -> libcdda != null;
assert youtubeSupport -> youtube-dl != null;
stdenv.mkDerivation rec {
- name = "bomi-${version}";
+ pname = "bomi";
version = "0.9.11";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix
index ea8cb5aa3ffa..10685a72f109 100644
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/pkgs/applications/video/byzanz/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1, xorg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.2.3.alpha";
- name = "byzanz-${version}";
+ pname = "byzanz";
src = fetchgit {
url = git://github.com/GNOME/byzanz;
diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix
index d1a9b64d711b..47a82470137e 100644
--- a/pkgs/applications/video/celluloid/default.nix
+++ b/pkgs/applications/video/celluloid/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
- description = "Simple GTK+ frontend for the mpv video player";
+ description = "Simple GTK frontend for the mpv video player";
longDescription = ''
GNOME MPV interacts with mpv via the client API exported by libmpv,
allowing access to mpv's powerful playback capabilities through an
diff --git a/pkgs/applications/video/clickshare-csc1/default.nix b/pkgs/applications/video/clickshare-csc1/default.nix
index 34c80e1050b4..53d257dd9d07 100644
--- a/pkgs/applications/video/clickshare-csc1/default.nix
+++ b/pkgs/applications/video/clickshare-csc1/default.nix
@@ -24,7 +24,7 @@
stdenv.mkDerivation rec {
- name = "clickshare-csc1-${version}";
+ pname = "clickshare-csc1";
version = "01.07.00.033";
src = fetchurl {
name = "clickshare-csc1-${version}.zip";
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 989000297a33..1872750deb00 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -4,13 +4,13 @@
}:
mkDerivation rec {
- name = "clipgrab-${version}";
+ pname = "clipgrab";
version = "3.8.4";
src = fetchurl {
sha256 = "0pyrg3rrsd538vnrv6x2frhbq9k2638nzffjsar1p76wxp8fm42s";
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
- url = "https://download.clipgrab.org/${name}.tar.gz";
+ url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
};
buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ];
diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix
index 10a8f4019fca..a2de52468f29 100644
--- a/pkgs/applications/video/coriander/default.nix
+++ b/pkgs/applications/video/coriander/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, pkgconfig, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394
, SDL, automake, GConf }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coriander-2.0.1";
src = fetchurl {
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index d614523f5345..388476cbf8e7 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -4,7 +4,7 @@
let
inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3;
-in buildPythonApplication rec {
+in buildPythonApplication {
name = "devede-4.8.8";
namePrefix = "";
diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix
index 344c47eb934a..61894bd22f8e 100644
--- a/pkgs/applications/video/dvd-slideshow/default.nix
+++ b/pkgs/applications/video/dvd-slideshow/default.nix
@@ -28,11 +28,11 @@ let
'';
in stdenv.mkDerivation rec {
- name = "dvd-slideshow-${version}";
+ pname = "dvd-slideshow";
version = "0.8.4-2";
src = fetchurl {
- url = "mirror://sourceforge/dvd-slideshow/files/${name}.tar.gz";
+ url = "mirror://sourceforge/dvd-slideshow/files/${pname}-${version}.tar.gz";
sha256 = "17c09aqvippiji2sd0pcxjg3nb1mnh9k5nia4gn5lhcvngjcp1q5";
};
diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix
index 4712dfac7573..54be20d5faff 100644
--- a/pkgs/applications/video/dvdbackup/default.nix
+++ b/pkgs/applications/video/dvdbackup/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.4.2";
- name = "dvdbackup-${version}";
+ pname = "dvdbackup";
src = fetchurl {
- url = "mirror://sourceforge/dvdbackup/${name}.tar.xz";
+ url = "mirror://sourceforge/dvdbackup/${pname}-${version}.tar.xz";
sha256 = "1rl3h7waqja8blmbpmwy01q9fgr5r0c32b8dy3pbf59bp3xmd37g";
};
diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix
index 24aeedd6760f..495501e0c187 100644
--- a/pkgs/applications/video/dvdstyler/default.nix
+++ b/pkgs/applications/video/dvdstyler/default.nix
@@ -13,7 +13,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "dvdstyler-${version}";
+ pname = "dvdstyler";
srcName = "DVDStyler-${version}";
version = "3.1.2";
diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix
index fd8cc8d86306..3e26b4d68c22 100644
--- a/pkgs/applications/video/gnome-mplayer/default.nix
+++ b/pkgs/applications/video/gnome-mplayer/default.nix
@@ -2,7 +2,7 @@
, libnotify, libpulseaudio, mplayer, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "gnome-mplayer-${version}";
+ pname = "gnome-mplayer";
version = "1.0.9";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix
index 1c625de0dbc0..f81f394ed0b8 100644
--- a/pkgs/applications/video/gpac/default.nix
+++ b/pkgs/applications/video/gpac/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.8.0";
- name = "gpac-${version}";
+ pname = "gpac";
src = fetchFromGitHub {
owner = "gpac";
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index aa2407134f38..a15a4cd5999a 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
and containers. Very versatile and customizable.
Package provides:
CLI - `HandbrakeCLI`
- GTK+ GUI - `ghb`
+ GTK GUI - `ghb`
'';
license = licenses.gpl2;
maintainers = with maintainers; [ Anton-Latukha wmertens ];
diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix
index 02a0f275f570..037331cad9e0 100644
--- a/pkgs/applications/video/k9copy/default.nix
+++ b/pkgs/applications/video/k9copy/default.nix
@@ -7,10 +7,10 @@
stdenv.mkDerivation rec {
version = "3.0.3";
- name = "k9copy-${version}";
+ pname = "k9copy";
src = fetchurl {
- url = "mirror://sourceforge/k9copy-reloaded/${name}.tar.gz";
+ url = "mirror://sourceforge/k9copy-reloaded/${pname}-${version}.tar.gz";
sha256 = "0dp06rwihks50c57bbv04d6bj2qc88isl91971r4lii2xp0qn7sg";
};
diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix
index bc6cd015b865..7dc350da6475 100644
--- a/pkgs/applications/video/key-mon/default.nix
+++ b/pkgs/applications/video/key-mon/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, gnome2, librsvg, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "key-mon-${version}";
+ pname = "key-mon";
version = "1.17";
namePrefix = "";
src = fetchurl {
- url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${name}.tar.gz";
+ url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${pname}-${version}.tar.gz";
sha256 = "1liz0dxcqmchbnl1xhlxkqm3gh76wz9jxdxn9pa7dy77fnrjkl5q";
};
diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index 44313f9499f5..33ff1821640b 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -10,7 +10,7 @@ mkDerivation rec {
majorMinorVersion = "0.12";
patchVersion = "0b";
version = "${majorMinorVersion}.${patchVersion}";
- name = "kmplayer-${version}";
+ pname = "kmplayer";
src = fetchurl {
url = "mirror://kde/stable/kmplayer/${majorMinorVersion}/kmplayer-${version}.tar.bz2";
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 73bcdadbc594..773c63b0036d 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -43,15 +43,15 @@ assert vdpauSupport -> libvdpau != null;
assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null;
let
- kodiReleaseDate = "20190627";
- kodiVersion = "18.3";
+ kodiReleaseDate = "20190901";
+ kodiVersion = "18.4";
rel = "Leia";
kodi_src = fetchFromGitHub {
owner = "xbmc";
repo = "xbmc";
rev = "${kodiVersion}-${rel}";
- sha256 = "18fbl5hs3aqccrn0m3x7hp95wlafjav0yvrwmb5q3gj24mwf6jld";
+ sha256 = "1m0295czxabdcqyqf5m94av9d88pzhnzjvyfs1q07xqq82h313p7";
};
cmakeProto = fetchurl {
@@ -143,7 +143,7 @@ let
postPatch = cmakeProtoPatch;
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "kodi-${lib.optionalString useWayland "wayland-"}${kodiVersion}";
src = kodi_src;
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 1cb510780691..1900bf3634ce 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -51,7 +51,7 @@ let self = rec {
};
mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args:
- toKodiPlugin (stdenv.mkDerivation (rec {
+ toKodiPlugin (stdenv.mkDerivation ({
name = "kodi-plugin-${plugin}-${version}";
dontStrip = true;
@@ -70,7 +70,7 @@ let self = rec {
mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [],
extraRuntimeDependencies ? [], extraInstallPhase ? "", ... }@args:
- toKodiPlugin (stdenv.mkDerivation (rec {
+ toKodiPlugin (stdenv.mkDerivation ({
name = "kodi-plugin-${plugin}-${version}";
dontStrip = true;
@@ -172,7 +172,7 @@ let self = rec {
};
mkController = controller: {
- "${controller}" = mkKodiPlugin rec {
+ ${controller} = mkKodiPlugin rec {
plugin = pname + "-" + controller;
namespace = "game.controller." + controller;
sourceDir = "addons/" + namespace;
@@ -310,7 +310,7 @@ let self = rec {
};
- steam-launcher = mkKodiPlugin rec {
+ steam-launcher = mkKodiPlugin {
plugin = "steam-launcher";
namespace = "script.steam.launcher";
@@ -487,7 +487,7 @@ let self = rec {
src = fetchFromGitHub {
owner = "peak3d";
repo = "inputstream.adaptive";
- rev = "${version}";
+ rev = version;
sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z";
};
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index b4d4312c0fac..1ab7e2c991b9 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -20,7 +20,7 @@ let
lightworks = stdenv.mkDerivation rec {
version = "14.0.0";
- name = "lightworks-${version}";
+ pname = "lightworks";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -28,7 +28,7 @@ let
url = "http://downloads.lwks.com/v14/lwks-14.0.0-amd64.deb";
sha256 = "66eb9f9678d979db76199f1c99a71df0ddc017bb47dfda976b508849ab305033";
}
- else throw "${name} is not supported on ${stdenv.hostPlatform.system}";
+ else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
buildInputs = [ dpkg makeWrapper ];
@@ -76,7 +76,7 @@ let
};
# Lightworks expects some files in /usr/share/lightworks
-in buildFHSUserEnv rec {
+in buildFHSUserEnv {
name = lightworks.name;
targetPkgs = pkgs: [
diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix
index 717853af745c..0a422bb7f50c 100644
--- a/pkgs/applications/video/linuxstopmotion/default.nix
+++ b/pkgs/applications/video/linuxstopmotion/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "0.8";
- name = "linuxstopmotion-${version}";
+ pname = "linuxstopmotion";
src = fetchgit {
url = "git://git.code.sf.net/p/linuxstopmotion/code";
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index f3d8b4ae569b..77aa2779b5d9 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -3,21 +3,21 @@
}:
let
- version = "1.14.4";
+ version = "1.14.5";
# Using two URLs as the first one will break as soon as a new version is released
src_bin = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
];
- sha256 = "0vmmvldmwmq9g202abblj6l15kb8z3b0c6mcc03f30s2yci6ij33";
+ sha256 = "1rnkx0h149n3pawmk8d234x5w1xw4kady9pgrcc5aw6krbx38nis";
};
src_oss = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
];
- sha256 = "0n1nlq17dxcbgk9xqf7nv6zykvh91yhsjqdhq55947wc11fxjqa0";
+ sha256 = "1jg10mslcl0sfwdd9p7hy9zfvk0xc7qhdakiv1kbilsl42bgaxyi";
};
in mkDerivation {
pname = "makemkv";
diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix
index 4dd2e019d1d3..c302ae1730fe 100644
--- a/pkgs/applications/video/mapmap/default.nix
+++ b/pkgs/applications/video/mapmap/default.nix
@@ -13,7 +13,7 @@ with stdenv;
mkDerivation rec {
version = "0.6.1";
- name = "mapmap-${version}";
+ pname = "mapmap";
src = fetchFromGitHub {
owner = "mapmapteam";
diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix
index cceed556f978..a5de209854b3 100644
--- a/pkgs/applications/video/mediathekview/default.nix
+++ b/pkgs/applications/video/mediathekview/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "13.2.1";
- name = "mediathekview-${version}";
+ pname = "mediathekview";
src = fetchurl {
url = "https://download.mediathekview.de/stabil/MediathekView-${version}.tar.gz";
sha256 = "11wg6klviig0h7pprfaygamsgqr7drqra2s4yxgfak6665033l2a";
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index 5ee437a19be5..a9876da234f7 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -6,7 +6,7 @@
, withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
stdenv.mkDerivation rec {
- name = "minitube-${version}";
+ pname = "minitube";
version = "2.9";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix
index 70dc156d6802..d1efae4a9244 100644
--- a/pkgs/applications/video/mjpg-streamer/default.nix
+++ b/pkgs/applications/video/mjpg-streamer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, libjpeg }:
-stdenv.mkDerivation rec {
- name = "mjpg-streamer-${version}";
+stdenv.mkDerivation {
+ pname = "mjpg-streamer";
version = "unstable-2019-05-24";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 42b40ade271f..04ddbbb8c06a 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -13,13 +13,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
- version = "36.0.0";
+ version = "37.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "114j9n2m6dkh7vqzyhcsjzzffadr0lzyjmh31cbl4mvvkg9j5z6r";
+ sha256 = "0r1qzvqc6xx7rmv4v4fjc70cqy832h8v0fjf6c5ljbg1c6pgkl0l";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix
index e3dcf6b3d3b3..684390d3c5c7 100644
--- a/pkgs/applications/video/motion/default.nix
+++ b/pkgs/applications/video/motion/default.nix
@@ -2,7 +2,7 @@
, ffmpeg, libjpeg, libmicrohttpd }:
stdenv.mkDerivation rec {
- name = "motion-${version}";
+ pname = "motion";
version = "4.2.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix
index 81b48e25b96b..efa495a45afe 100644
--- a/pkgs/applications/video/mpc-qt/default.nix
+++ b/pkgs/applications/video/mpc-qt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, qttools, mpv }:
stdenv.mkDerivation rec {
- name = "mpc-qt-${version}";
+ pname = "mpc-qt";
version = "18.08";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index c77486a30cf1..2afb7d1c68a5 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -59,20 +59,21 @@ let
codecs_src =
let
dir = http://www.mplayerhq.hu/MPlayer/releases/codecs/;
+ version = "20071007";
in
if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
- url = "${dir}/essential-20071007.tar.bz2";
+ url = "${dir}/essential-${version}.tar.bz2";
sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic";
} else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {
- url = "${dir}/essential-amd64-20071007.tar.bz2";
+ url = "${dir}/essential-amd64-${version}.tar.bz2";
sha256 = "13xf5b92w1ra5hw00ck151lypbmnylrnznq9hhb0sj36z5wz290x";
} else if stdenv.hostPlatform.system == "powerpc-linux" then fetchurl {
- url = "${dir}/essential-ppc-20071007.tar.bz2";
+ url = "${dir}/essential-ppc-${version}.tar.bz2";
sha256 = "18mlj8dp4wnz42xbhdk1jlz2ygra6fbln9wyrcyvynxh96g1871z";
} else null;
codecs = if codecs_src != null then stdenv.mkDerivation {
- name = "MPlayer-codecs-essential-20071007";
+ pname = "MPlayer-codecs-essential";
src = codecs_src;
@@ -89,11 +90,12 @@ let
in
stdenv.mkDerivation rec {
- name = "mplayer-1.3.0";
+ pname = "mplayer";
+ version = "1.4";
src = fetchurl {
- url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.3.0.tar.xz";
- sha256 = "0hwqn04bdknb2ic88xd75smffxx63scvz0zvwvjb56nqj9n89l1s";
+ url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-${version}.tar.xz";
+ sha256 = "0j5mflr0wnklxsvnpmxvk704hscyn2785hvvihj2i3a7b3anwnc2";
};
prePatch = ''
@@ -218,6 +220,6 @@ stdenv.mkDerivation rec {
homepage = http://mplayerhq.hu;
license = "GPL";
maintainers = [ stdenv.lib.maintainers.eelco ];
- platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+ platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
};
}
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 6c21a6b2012b..bb0b92eee030 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -95,7 +95,7 @@ let
luaEnv = lua.withPackages(ps: with ps; [ luasocket ]);
in stdenv.mkDerivation rec {
- name = "mpv-${version}";
+ pname = "mpv";
version = "0.29.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 74167a67bd2b..d5c46491cf41 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -6,7 +6,7 @@
}:
stdenv.mkDerivation rec {
- name = "mythtv-${version}";
+ pname = "mythtv";
version = "29.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix
index 6299cd7e5937..4617d1d17dc0 100644
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/applications/video/natron/default.nix
@@ -12,7 +12,7 @@ let
};
seexpr = stdenv.mkDerivation rec {
version = "1.0.1";
- name = "seexpr-${version}";
+ pname = "seexpr";
src = fetchurl {
url = "https://github.com/wdas/SeExpr/archive/rel-${version}.tar.gz";
sha256 = "1ackh0xs4ip7mk34bam8zd4qdymkdk0dgv8x0f2mf6gbyzzyh7lp";
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 983bdff106ed..5e7cf9353b25 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -36,13 +36,13 @@
let
optional = stdenv.lib.optional;
in mkDerivation rec {
- name = "obs-studio-${version}";
+ pname = "obs-studio";
version = "23.2.1";
src = fetchFromGitHub {
owner = "jp9000";
repo = "obs-studio";
- rev = "${version}";
+ rev = version;
sha256 = "05brixq2z98mvn1q2rgdl27xj798509nv8yh6h0yzqyk9gly4anz";
};
diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix
index 14f40ad8901f..52aa57bf1986 100644
--- a/pkgs/applications/video/obs-studio/linuxbrowser.nix
+++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix
@@ -9,7 +9,7 @@
}:
stdenv.mkDerivation rec {
- name = "obs-linuxbrowser-${version}";
+ pname = "obs-linuxbrowser";
version = "0.6.1";
src = fetchFromGitHub {
owner = "bazukas";
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index 0b1d9e951150..1c5359e5f0c6 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -1,7 +1,14 @@
-{ stdenv, mkDerivationWith, fetchFromGitHub
+{ stdenv, mkDerivationWith, fetchFromGitHub, fetchpatch
, doxygen, python3Packages, libopenshot
, wrapGAppsHook, gtk3 }:
+let
+ fixPermissions = fetchpatch rec {
+ url = https://github.com/OpenShot/openshot-qt/pull/2973.patch;
+ sha256 = "037rh0p3k4sdzprlpyb73byjq3qhqk5zd0d4iin6bq602r8bbp0n";
+ };
+in
+
mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "openshot-qt";
version = "2.4.4";
@@ -13,6 +20,8 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
sha256 = "0mg63v36h7l8kv2sgf6x8c1n3ygddkqqwlciz7ccxpbm4x1idqba";
};
+ patches = [ fixPermissions ];
+
nativeBuildInputs = [ doxygen wrapGAppsHook ];
buildInputs = [ gtk3 ];
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index b7c8e6feeba4..95f89e0eda5a 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
[ imagemagick ffmpeg swig python3 unittest-cpp
cppzmq czmqpp qtbase qtmultimedia ];
- LIBOPENSHOT_AUDIO_DIR = "${libopenshot-audio}";
+ LIBOPENSHOT_AUDIO_DIR = libopenshot-audio;
"UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++";
doCheck = false;
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 1c124df30238..bef9537b8067 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -12,7 +12,7 @@ let
# don't bother exposing the package to all of nixpkgs.
gst-transcoder = stdenv.mkDerivation rec {
version = "1.14.1";
- name = "gst-transcoder-${version}";
+ pname = "gst-transcoder";
src = fetchFromGitHub {
owner = "pitivi";
repo = "gst-transcoder";
diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix
index d55c3882f30c..a4f9d6222aa6 100644
--- a/pkgs/applications/video/plex-media-player/default.nix
+++ b/pkgs/applications/video/plex-media-player/default.nix
@@ -35,7 +35,7 @@ let
};
};
in mkDerivation rec {
- name = "plex-media-player-${version}";
+ pname = "plex-media-player";
version = "2.40.0.1007";
vsnHash = "5482132c";
diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix
index f0c3776a4336..cd6416032da2 100644
--- a/pkgs/applications/video/qarte/default.nix
+++ b/pkgs/applications/video/qarte/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchbzr, python3, rtmpdump, makeWrapper }:
+{ mkDerivation, lib, fetchbzr, python3, rtmpdump }:
let
- pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 sip ]);
-in stdenv.mkDerivation {
+ pythonEnv = python3.withPackages (ps: with ps; [ pyqt5_with_qtmultimedia ]);
+in mkDerivation {
name = "qarte-4.6.0";
src = fetchbzr {
url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4;
@@ -10,28 +10,33 @@ in stdenv.mkDerivation {
sha256 = "0v4zpj8w67ydvnmanxbl8pwvn0cfv70c0mlw36a1r4n0rvgxffcn";
};
- buildInputs = [ makeWrapper pythonEnv ];
+ buildInputs = [ pythonEnv ];
installPhase = ''
+ runHook preInstall
mkdir -p $out/bin
mv qarte $out/bin/
substituteInPlace $out/bin/qarte \
--replace '/usr/share' "$out/share"
- wrapProgram $out/bin/qarte \
- --prefix PATH : "${rtmpdump}/bin"
mkdir -p $out/share/man/man1/
mv qarte.1 $out/share/man/man1/
mkdir -p $out/share/qarte
mv * $out/share/qarte/
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ wrapQtApp $out/bin/qarte \
+ --prefix PATH : ${rtmpdump}/bin
'';
meta = {
homepage = https://launchpad.net/qarte;
description = "A recorder for Arte TV Guide and Arte Concert";
- license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ vbgl ];
- platforms = stdenv.lib.platforms.linux;
+ license = lib.licenses.gpl3;
+ maintainers = with lib.maintainers; [ vbgl ];
+ platforms = lib.platforms.linux;
};
}
diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix
index ea4816ad6d07..327a2034265e 100644
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/pkgs/applications/video/qstopmotion/default.nix
@@ -5,10 +5,9 @@
stdenv.mkDerivation rec {
pname = "qstopmotion";
version = "2.4.1";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${name}-Source.tar.gz";
+ url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${pname}-${version}-Source.tar.gz";
sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh";
};
diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix
index c3204cc9c0ce..8f9e3131d8aa 100644
--- a/pkgs/applications/video/quvi/library.nix
+++ b/pkgs/applications/video/quvi/library.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }:
stdenv.mkDerivation rec {
- name = "libquvi-${version}";
+ pname = "libquvi";
version="0.9.4";
src = fetchurl {
diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix
index 603534be4c8b..e54fc0eae4ba 100644
--- a/pkgs/applications/video/quvi/scripts.nix
+++ b/pkgs/applications/video/quvi/scripts.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, pkgconfig}:
stdenv.mkDerivation rec {
- name = "quvi-scripts-${version}";
+ pname = "quvi-scripts";
version="0.9.20131130";
src = fetchurl {
diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix
index 333f4e6ab4de..972e08bb61be 100644
--- a/pkgs/applications/video/quvi/tool.nix
+++ b/pkgs/applications/video/quvi/tool.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}:
stdenv.mkDerivation rec {
- name = "quvi-${version}";
+ pname = "quvi";
version="0.9.5";
src = fetchurl {
diff --git a/pkgs/applications/video/recordmydesktop/default.nix b/pkgs/applications/video/recordmydesktop/default.nix
index 8797ad8f953b..e4d6e14d098d 100644
--- a/pkgs/applications/video/recordmydesktop/default.nix
+++ b/pkgs/applications/video/recordmydesktop/default.nix
@@ -2,7 +2,7 @@
, libICE, libSM, libX11, libXext, libXfixes, libXdamage }:
stdenv.mkDerivation rec {
- name = "recordmydesktop-${version}";
+ pname = "recordmydesktop";
version = "0.3.8.1-svn${rev}";
rev = "602";
diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix
index 984b623cee7e..cf02825501f5 100644
--- a/pkgs/applications/video/recordmydesktop/gtk.nix
+++ b/pkgs/applications/video/recordmydesktop/gtk.nix
@@ -4,8 +4,8 @@
let
binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ];
-in stdenv.mkDerivation rec {
- name = "gtk-recordmydesktop-${version}";
+in stdenv.mkDerivation {
+ pname = "gtk-recordmydesktop";
version = "0.3.8-svn${recordmydesktop.rev}";
src = fetchsvn {
diff --git a/pkgs/applications/video/recordmydesktop/qt.nix b/pkgs/applications/video/recordmydesktop/qt.nix
index 560801351515..573a18f62ce9 100644
--- a/pkgs/applications/video/recordmydesktop/qt.nix
+++ b/pkgs/applications/video/recordmydesktop/qt.nix
@@ -4,8 +4,8 @@
let
binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ];
-in stdenv.mkDerivation rec {
- name = "qt-recordmydesktop-${version}";
+in stdenv.mkDerivation {
+ pname = "qt-recordmydesktop";
version = "0.3.8-svn${recordmydesktop.rev}";
src = fetchsvn {
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 2f0b54edc8fb..176c4be4946d 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -6,7 +6,7 @@ assert stdenv.lib.versionAtLeast libmlt.version "6.8.0";
assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
mkDerivation rec {
- name = "shotcut-${version}";
+ pname = "shotcut";
version = "19.08.16";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index c3ef5eae676a..29ad928e27cd 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -3,7 +3,7 @@
}:
mkDerivation rec {
- name = "simplescreenrecorder-${version}";
+ pname = "simplescreenrecorder";
version = "0.3.11";
src = fetchurl {
diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 59e541892eef..352569e5ab39 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -2,10 +2,10 @@
mkDerivation rec {
version = "19.6.0";
- name = "smtube-${version}";
+ pname = "smtube";
src = fetchurl {
- url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
+ url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2";
sha256 = "0d3hskd6ar51zq29xj899i8sii9g4cxq99gz2y1dhgsnqbn36hpm";
};
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index 79f092a882c7..e33610ac4163 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -2,12 +2,12 @@
pythonPackages.buildPythonApplication rec {
version = "1.1.1";
- name = "streamlink-${version}";
+ pname = "streamlink";
src = fetchFromGitHub {
owner = "streamlink";
repo = "streamlink";
- rev = "${version}";
+ rev = version;
sha256 = "1vyf0pifdqygg98azdkfhy5fdckb0w2ca7c46mkrj452gkvmcq33";
};
diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix
index 32bd731f16e9..36a92f0f1afb 100644
--- a/pkgs/applications/video/subdl/default.nix
+++ b/pkgs/applications/video/subdl/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "subdl-0.0pre.2017.11.06";
src = fetchFromGitHub {
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix
index ea51471d9aa4..f628c3b214e4 100644
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@@ -7,8 +7,9 @@ let
version = "0.54.0";
in
-stdenv.mkDerivation rec {
- name = "subtitleeditor-${version}";
+stdenv.mkDerivation {
+ pname = "subtitleeditor";
+ inherit version;
src = fetchFromGitHub {
owner = "kitone";
@@ -48,9 +49,9 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-debug" ];
meta = {
- description = "GTK+3 application to edit video subtitles";
+ description = "GTK 3 application to edit video subtitles";
longDescription = ''
- Subtitle Editor is a GTK+3 tool to edit subtitles for GNU/Linux/*BSD. It
+ Subtitle Editor is a GTK 3 tool to edit subtitles for GNU/Linux/*BSD. It
can be used for new subtitles or as a tool to transform, edit, correct
and refine existing subtitle. This program also shows sound waves, which
makes it easier to synchronise subtitles to voices.
diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix
index 83ca41e201c9..bc6561a0bbd0 100644
--- a/pkgs/applications/video/tivodecode/default.nix
+++ b/pkgs/applications/video/tivodecode/default.nix
@@ -6,7 +6,8 @@ let
in
stdenv.mkDerivation {
- name = "tivodecode-${version}";
+ pname = "tivodecode";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/tivodecode/tivodecode/${version}/tivodecode-${version}.tar.gz";
diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/applications/video/uvccapture/default.nix
index dd595baa52e8..f52ffa923d28 100644
--- a/pkgs/applications/video/uvccapture/default.nix
+++ b/pkgs/applications/video/uvccapture/default.nix
@@ -8,7 +8,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "uvccapture-0.5";
src = fetchurl {
diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix
index 022f4382a492..2ee196baccc7 100644
--- a/pkgs/applications/video/vdr/plugins.nix
+++ b/pkgs/applications/video/vdr/plugins.nix
@@ -201,7 +201,7 @@ in {
};
- text2skin = stdenv.mkDerivation rec {
+ text2skin = stdenv.mkDerivation {
name = "vdr-text2skin-1.3.4-20170702";
src = fetchgit {
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index dda70d797e5e..a38076ca42b6 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -24,11 +24,11 @@ with stdenv.lib;
assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wrapQtAppsHook != null);
stdenv.mkDerivation rec {
- name = "vlc-${version}";
+ pname = "vlc";
version = "3.0.8";
src = fetchurl {
- url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
+ url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz";
sha256 = "e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6";
};
diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix
index 2bf74da3d0f2..3c4f607c6aff 100644
--- a/pkgs/applications/video/w_scan/default.nix
+++ b/pkgs/applications/video/w_scan/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "w_scan-${version}";
+ pname = "w_scan";
version = "20170107";
src = fetchurl {
- url = "http://wirbel.htpc-forum.de/w_scan/${name}.tar.bz2";
+ url = "http://wirbel.htpc-forum.de/w_scan/${pname}-${version}.tar.bz2";
sha256 = "1zkgnj2sfvckix360wwk1v5s43g69snm45m0drnzyv7hgf5g7q1q";
};
diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix
index 0c28b4d57372..8258f8583090 100644
--- a/pkgs/applications/video/webtorrent_desktop/default.nix
+++ b/pkgs/applications/video/webtorrent_desktop/default.nix
@@ -38,7 +38,7 @@
udev
]);
in stdenv.mkDerivation rec {
- name = "webtorrent-desktop-${version}";
+ pname = "webtorrent-desktop";
version = "0.20.0";
src =
diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix
index 64fcf0ba04a5..176d9a87aed0 100644
--- a/pkgs/applications/video/wxcam/default.nix
+++ b/pkgs/applications/video/wxcam/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
- name = "wxcam-${version}";
+ pname = "wxcam";
version = "1.1";
src = fetchurl {
- url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${pname}-${version}.tar.gz";
sha256 = "1765bvc65fpzn9ycnnj5hais9xkx9v0sm6a878d35x54bpanr859";
};
diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix
index ae048f1bdac4..3c4c59a0ee8f 100644
--- a/pkgs/applications/video/xscast/default.nix
+++ b/pkgs/applications/video/xscast/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }:
-stdenv.mkDerivation rec {
- name = "xscast-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "xscast-unstable";
version = "2016-07-26";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix
index 15d98dc9be50..e16fcb84b055 100644
--- a/pkgs/applications/virtualization/8086tiny/default.nix
+++ b/pkgs/applications/virtualization/8086tiny/default.nix
@@ -4,9 +4,9 @@
assert sdlSupport -> (SDL != null);
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
- name = "8086tiny-${version}";
+ pname = "8086tiny";
version = "1.25";
src = fetchurl {
diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix
index e7cd5b7bde68..02fb256b38ce 100644
--- a/pkgs/applications/virtualization/aqemu/default.nix
+++ b/pkgs/applications/virtualization/aqemu/default.nix
@@ -2,7 +2,7 @@
}:
stdenv.mkDerivation rec {
- name = "aqemu-${version}";
+ pname = "aqemu";
version = "0.9.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index f9d7128330fb..72db4f1e5aa5 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -18,11 +18,11 @@ assert curlSupport -> (curl != null);
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "bochs-${version}";
+ pname = "bochs";
version = "2.6.9";
src = fetchurl {
- url = "mirror://sourceforge/project/bochs/bochs/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz";
sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf";
};
diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix
deleted file mode 100644
index 13060a50290b..000000000000
--- a/pkgs/applications/virtualization/cbfstool/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, iasl, flex, bison }:
-
-stdenv.mkDerivation rec {
- name = "cbfstool-${version}";
- version = "4.9";
-
- src = fetchurl {
- url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
- sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij";
- };
-
- nativeBuildInputs = [ flex bison ];
- buildInputs = [ iasl ];
-
- buildPhase = ''
- export LEX=${flex}/bin/flex
- make -C util/cbfstool
- '';
-
- installPhase = ''
- mkdir -p $out/bin
- cp util/cbfstool/cbfstool $out/bin
- cp util/cbfstool/fmaptool $out/bin
- cp util/cbfstool/rmodtool $out/bin
- '';
-
- meta = with stdenv.lib; {
- description = "Management utility for CBFS formatted ROM images";
- homepage = https://www.coreboot.org;
- license = licenses.gpl2;
- maintainers = [ maintainers.tstrobel ];
- platforms = platforms.linux;
- };
-}
-
diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix
index 23084c6286a4..13afe0a42619 100644
--- a/pkgs/applications/virtualization/cntr/default.nix
+++ b/pkgs/applications/virtualization/cntr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
- name = "cntr-${version}";
+ pname = "cntr";
version = "1.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index d21bc8cc32b5..b770c6ed0a59 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -3,7 +3,7 @@
with lib;
buildGoPackage rec {
- name = "containerd-${version}";
+ pname = "containerd";
version = "1.2.6";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 8070e1423fe8..0d2d0278cc3b 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -17,7 +17,7 @@
buildGoPackage rec {
project = "cri-o";
- version = "1.15.0";
+ version = "1.15.1";
name = "${project}-${version}${flavor}";
goPackagePath = "github.com/${project}/${project}";
@@ -26,7 +26,7 @@ buildGoPackage rec {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
- sha256 = "08m84rlar25w6dwv76rab4vdlavacn7kb5ravzqnb8ngx68csbp3";
+ sha256 = "0yjj03qwwb6g05pzavimgj14p6805m3w8qqpl4fp4fpmbrsx4sb0";
};
outputs = [ "bin" "out" ];
diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
new file mode 100644
index 000000000000..7dddc3b533b4
--- /dev/null
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, go-md2man, pkgconfig
+, libcap, libseccomp, python3, systemd, yajl }:
+
+stdenv.mkDerivation rec {
+ pname = "crun";
+ version = "0.8";
+
+ src = fetchFromGitHub {
+ owner = "containers";
+ repo = pname;
+ rev = version;
+ sha256 = "1anvlgw373031w0pp0b28l10yrnyhbj192n60bbbjahw487dk2fi";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ autoreconfHook go-md2man pkgconfig python3 ];
+
+ buildInputs = [ libcap libseccomp systemd yajl ];
+
+ enableParallelBuilding = true;
+
+ # the tests require additional permissions
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A fast and lightweight fully featured OCI runtime and C library for running containers";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ inherit (src.meta) homepage;
+ };
+}
diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix
index 2d983d009f1d..b1c42b099b67 100644
--- a/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/pkgs/applications/virtualization/docker-compose/default.nix
@@ -5,6 +5,7 @@
, six, texttable, websocket_client, cached-property
, enum34, functools32, paramiko
}:
+
buildPythonApplication rec {
version = "1.24.1";
pname = "docker-compose";
@@ -32,15 +33,17 @@ buildPythonApplication rec {
'';
postInstall = ''
- mkdir -p $out/share/bash-completion/completions/
- cp contrib/completion/bash/docker-compose $out/share/bash-completion/completions/docker-compose
+ install -D -m 0444 contrib/completion/bash/docker-compose \
+ $out/share/bash-completion/completions/docker-compose
+
+ install -D -m 0444 contrib/completion/zsh/_docker-compose \
+ $out/share/zsh-completion/zsh/site-functions/_docker-compose
'';
meta = with stdenv.lib; {
homepage = https://docs.docker.com/compose/;
description = "Multi-container orchestration for Docker";
license = licenses.asl20;
- maintainers = with maintainers; [
- ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index a1125f25e816..027404439cd5 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -15,7 +15,7 @@ rec {
, tiniRev, tiniSha256
} :
let
- docker-runc = runc.overrideAttrs (oldAttrs: rec {
+ docker-runc = runc.overrideAttrs (oldAttrs: {
name = "docker-runc-${version}";
inherit version;
src = fetchFromGitHub {
@@ -28,7 +28,7 @@ rec {
patches = [];
});
- docker-containerd = containerd.overrideAttrs (oldAttrs: rec {
+ docker-containerd = containerd.overrideAttrs (oldAttrs: {
name = "docker-containerd-${version}";
inherit version;
src = fetchFromGitHub {
@@ -41,7 +41,7 @@ rec {
hardeningDisable = [ "fortify" ];
});
- docker-tini = tini.overrideAttrs (oldAttrs: rec {
+ docker-tini = tini.overrideAttrs (oldAttrs: {
name = "docker-init-${version}";
inherit version;
src = fetchFromGitHub {
@@ -60,7 +60,7 @@ rec {
];
});
in
- stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) rec {
+ stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) {
inherit docker-runc docker-containerd docker-proxy docker-tini;
@@ -70,7 +70,7 @@ rec {
++ optional (lvm2 == null) "exclude_graphdriver_devicemapper"
++ optional (libseccomp != null) "seccomp";
- }) // rec {
+ }) // {
inherit version rev;
name = "docker-${version}";
@@ -201,9 +201,9 @@ rec {
# https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/*
docker_18_09 = makeOverridable dockerGen {
- version = "18.09.8";
- rev = "0dd43dd87fd530113bf44c9bba9ad8b20ce4637f";
- sha256 = "07ljxdqylbfbq1939hqyaav966ga7ds5b38dn7af1h0aks86y2s3";
+ version = "18.09.9";
+ rev = "039a7df9ba8097dd987370782fcdd6ea79b26016";
+ sha256 = "0wqhjx9qs96q2jd091wffn3cyv2aslqn2cvpdpgljk8yr9s0yg7h";
runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f";
runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf";
containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb";
@@ -213,9 +213,9 @@ rec {
};
docker_19_03 = makeOverridable dockerGen {
- version = "19.03.1";
- rev = "74b1e89e8ac68948be88fe0aa1e2767ae28659fe";
- sha256 = "1m7bq7la29d8piwiq5whzcyrm7g3lv497wnri0lh6gxi10nwv06h";
+ version = "19.03.2";
+ rev = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e";
+ sha256 = "0bghqwxlx4v06bwcv3c2wizbihhf983gvypx5sjcbgmiyd3bgb47";
runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f";
runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf";
containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb";
diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/applications/virtualization/docker/distribution.nix
index 0af9abc852ef..ed4db853c389 100644
--- a/pkgs/applications/virtualization/docker/distribution.nix
+++ b/pkgs/applications/virtualization/docker/distribution.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "distribution-${version}";
+ pname = "distribution";
version = "2.6.2";
rev = "v${version}";
diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix
index 946014e5cc9a..351353ceb96e 100644
--- a/pkgs/applications/virtualization/driver/win-virtio/default.nix
+++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, p7zip }:
stdenv.mkDerivation rec {
- name = "win-virtio-${version}";
+ pname = "win-virtio";
version = "0.1.141-1";
phases = [ "buildPhase" "installPhase" ];
diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix
index cce5a674f7cd..6f35257b50fd 100644
--- a/pkgs/applications/virtualization/dynamips/default.nix
+++ b/pkgs/applications/virtualization/dynamips/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, libelf, libpcap }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "dynamips";
version = "0.2.21";
diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix
index ab971fe64c98..691c74301e39 100644
--- a/pkgs/applications/virtualization/ecs-agent/default.nix
+++ b/pkgs/applications/virtualization/ecs-agent/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "${pname}-${version}";
pname = "amazon-ecs-agent";
version = "1.18.0";
diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix
index 58f4dd48cc8b..0f53a5c4f14d 100644
--- a/pkgs/applications/virtualization/looking-glass-client/default.nix
+++ b/pkgs/applications/virtualization/looking-glass-client/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "looking-glass-client-${version}";
+ pname = "looking-glass-client";
version = "B1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix
index 197b3045cf27..e11ca04f6b36 100644
--- a/pkgs/applications/virtualization/nvidia-docker/default.nix
+++ b/pkgs/applications/virtualization/nvidia-docker/default.nix
@@ -24,8 +24,8 @@ with lib; let
sha256 = "0jcj5xxbg7x7gyhbb67h3ds6vly62gx7j02zm6lg102h34jajj7a";
};
- nvidia-container-runtime-hook = buildGoPackage rec {
- name = "nvidia-container-runtime-hook-${version}";
+ nvidia-container-runtime-hook = buildGoPackage {
+ pname = "nvidia-container-runtime-hook";
version = "1.4.0";
goPackagePath = "nvidia-container-runtime-hook";
@@ -46,7 +46,7 @@ with lib; let
});
in stdenv.mkDerivation rec {
- name = "nvidia-docker-${version}";
+ pname = "nvidia-docker";
version = "2.0.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
index 46b8e3ba43c3..71c02ab4de50 100644
--- a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
+++ b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
@@ -12,7 +12,7 @@ with lib; let
};
in stdenv.mkDerivation rec {
- name = "libnvidia-container-${version}";
+ pname = "libnvidia-container";
version = "1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index 200542f4de84..ee241abda7f8 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -5,7 +5,7 @@
withX ? true }:
stdenv.mkDerivation rec {
- name = "open-vm-tools-${version}";
+ pname = "open-vm-tools";
version = "10.3.10";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index f7ea6df8493b..ff768cb7878c 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "podman-${version}";
+ pname = "podman";
version = "1.5.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index d64baca2cc7e..5aa1f2e1f553 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -35,7 +35,7 @@ let
in
stdenv.mkDerivation rec {
- version = "4.0.0";
+ version = "4.1.0";
name = "qemu-"
+ stdenv.lib.optionalString xenSupport "xen-"
+ stdenv.lib.optionalString hostCpuOnly "host-cpu-only-"
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2";
- sha256 = "085g6f75si8hbn94mnnjn1r7ysixn5bqj4bhqwvadj00fhzp2zvd";
+ sha256 = "1bpl6hwiw1jdxk4xmqp10qgki0dji0l2rzr10dyhyk8d85vxxw29";
};
nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ];
@@ -78,11 +78,6 @@ stdenv.mkDerivation rec {
./no-etc-install.patch
./fix-qemu-ga.patch
./9p-ignore-noatime.patch
- (fetchpatch {
- url = "https://git.qemu.org/?p=qemu.git;a=patch;h=d52680fc932efb8a2f334cc6993e705ed1e31e99";
- name = "CVE-2019-12155.patch";
- sha256 = "0h2q71mcz3gvlrbfkqcgla74jdg73hvzcrwr4max2ckpxx8x9207";
- })
] ++ optional nixosTestRunner ./force-uid0-on-9p.patch
++ optionals stdenv.hostPlatform.isMusl [
(fetchpatch {
diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch
index 37c12ddbfeb7..57e190f5ae79 100644
--- a/pkgs/applications/virtualization/qemu/no-etc-install.patch
+++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch
@@ -1,25 +1,13 @@
-From 98b3e5993bbdb0013b6cc1814e0ad9555290c3af Mon Sep 17 00:00:00 2001
-From: Will Dietz
-Date: Tue, 23 Apr 2019 21:31:45 -0500
-Subject: [PATCH] no install localstatedir
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
diff --git a/Makefile b/Makefile
-index 04a0d45050..5dc82d0eb7 100644
+index 85862fb8..ed52c5ec 100644
--- a/Makefile
+++ b/Makefile
-@@ -786,7 +786,7 @@ endif
+@@ -841,7 +841,7 @@ endif
ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512
--install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir
-+install: all $(if $(BUILD_DOCS),install-doc) install-datadir
+-install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir \
++install: all $(if $(BUILD_DOCS),install-doc) install-datadir \
+ $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \
+ recurse-install
ifneq ($(TOOLS),)
- $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir))
- endif
---
-2.21.GIT
-
diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix
index 0a139448cb3a..bce254061421 100644
--- a/pkgs/applications/virtualization/railcar/default.nix
+++ b/pkgs/applications/virtualization/railcar/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, rustPlatform, libseccomp }:
rustPlatform.buildRustPackage rec {
- name = "railcar-${version}";
+ pname = "railcar";
version = "1.0.4";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix
index 8777f7cc2db2..d8a2878e3f79 100644
--- a/pkgs/applications/virtualization/remotebox/default.nix
+++ b/pkgs/applications/virtualization/remotebox/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, perl, perlPackages }:
stdenv.mkDerivation rec {
- name = "remotebox-${version}";
+ pname = "remotebox";
version = "2.6";
src = fetchurl {
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 0f53ede188ce..fd0bd92faa60 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -13,8 +13,8 @@ let
in stdenv.mkDerivation rec {
version = "1.30.0";
- name = "rkt-${version}";
- BUILDDIR="build-${name}";
+ pname = "rkt";
+ BUILDDIR="build-${pname}-${version}";
src = fetchFromGitHub {
owner = "coreos";
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 10c7d17209c3..6357f9fadff9 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -4,7 +4,7 @@
with lib;
buildGoPackage rec {
- name = "runc-${version}";
+ pname = "runc";
version = "1.0.0-rc8";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix
index 5aa73528e9d7..32528627a3c8 100644
--- a/pkgs/applications/virtualization/seabios/default.nix
+++ b/pkgs/applications/virtualization/seabios/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
- name = "seabios-${version}";
+ pname = "seabios";
version = "1.11.0";
src = fetchurl {
- url = "http://code.coreboot.org/p/seabios/downloads/get/${name}.tar.gz";
+ url = "http://code.coreboot.org/p/seabios/downloads/get/${pname}-${version}.tar.gz";
sha256 = "1xwvp77djxbxbxg82hzj26pv6zka3556vkdcp09hnfwapcp46av2";
};
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index e146086b5549..60825063cabc 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -14,7 +14,7 @@
with lib;
buildGoPackage rec {
- name = "singularity-${version}";
+ pname = "singularity";
version = "3.2.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix
index 25c19cd79c7f..39508412333c 100644
--- a/pkgs/applications/virtualization/tini/default.nix
+++ b/pkgs/applications/virtualization/tini/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.18.0";
- name = "tini-${version}";
+ pname = "tini";
src = fetchFromGitHub {
owner = "krallin";
diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix
index a8f113307251..224f77ed32d4 100644
--- a/pkgs/applications/virtualization/tinyemu/default.nix
+++ b/pkgs/applications/virtualization/tinyemu/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, openssl, curl, SDL }:
stdenv.mkDerivation rec {
- name = "tinyemu-${version}";
+ pname = "tinyemu";
version = "2018-09-23";
src = fetchurl {
- url = "https://bellard.org/tinyemu/${name}.tar.gz";
+ url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz";
sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v";
};
buildInputs = [ openssl curl SDL ];
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index c1dbad94250a..5b2b33d6adf3 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -5,13 +5,13 @@
}:
mkDerivation rec {
- name = "virt-manager-qt-${version}";
+ pname = "virt-manager-qt";
version = "0.70.91";
src = fetchFromGitHub {
owner = "F1ash";
repo = "qt-virt-manager";
- rev = "${version}";
+ rev = version;
sha256 = "1z2kq88lljvr24z1kizvg3h7ckf545h4kjhhrjggkr0w4wjjwr43";
};
diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix
index 493307d0d078..9fc167f5e9de 100644
--- a/pkgs/applications/virtualization/virt-top/default.nix
+++ b/pkgs/applications/virtualization/virt-top/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, ocamlPackages, autoreconfHook }:
-stdenv.mkDerivation rec {
- name = "virt-top-${version}";
+stdenv.mkDerivation {
+ pname = "virt-top";
version = "2017-11-18-unstable";
src = fetchgit {
diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/applications/virtualization/virt-what/default.nix
index 8a339ac83224..7ea83b015592 100644
--- a/pkgs/applications/virtualization/virt-what/default.nix
+++ b/pkgs/applications/virtualization/virt-what/default.nix
@@ -1,11 +1,11 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
- name = "virt-what-${version}";
+ pname = "virt-what";
version = "1.19";
src = fetchurl {
- url = "https://people.redhat.com/~rjones/virt-what/files/${name}.tar.gz";
+ url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz";
sha256 = "00nhwly5q0ps8yv9cy3c2qp8lfshf3s0kdpwiy5zwk3g77z96rwk";
};
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index 8222fb50a8f9..6931e492e99c 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -5,7 +5,8 @@ with stdenv.lib;
let version = "0.600.4"; in
stdenv.mkDerivation rec {
- name = "virtinst-${version}";
+ pname = "virtinst";
+ inherit version;
src = fetchurl {
url = "http://virt-manager.org/download/sources/virtinst/virtinst-${version}.tar.gz";
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 1a6ba5ac5273..ac52b83e43d2 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,8 +1,8 @@
{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, wrapQtAppsHook
, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
-, qttools, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
-, alsaLib, curl, libvpx, nettools, dbus
+, qttools, qtsvg, qtwayland, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
+, alsaLib, curl, libvpx, nettools, dbus, substituteAll
, makeself, perl
, javaBindings ? true, jdk ? null # Almost doesn't affect closure size
, pythonBindings ? false, python3 ? null
@@ -21,10 +21,11 @@ let
buildType = "release";
# Remember to change the extpackRev and version in extpack.nix and
# guest-additions/default.nix as well.
- main = "11sxx2zaablkvjiw0i5g5i5ibak6bsq6fldrcxwbcby6318shnhv";
- version = "6.0.8";
+ main = "1y6j73axjns8ng3m8zs31zwx71wmm91n6vrhdpxphx16jf518djj";
+ version = "6.0.10";
in stdenv.mkDerivation {
- name = "virtualbox-${version}";
+ pname = "virtualbox";
+ inherit version;
src = fetchurl {
url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
@@ -36,7 +37,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ]
++ optional (!headless) wrapQtAppsHook;
- # Wrap manually because we just need to wrap one executable
+ # Wrap manually because we wrap just a small number of executables.
dontWrapQtApps = true;
buildInputs =
@@ -78,6 +79,17 @@ in stdenv.mkDerivation {
patches =
optional enableHardening ./hardened.patch
+ # When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees
+ # the correct environment variables needed for Qt to work, specifically QT_PLUGIN_PATH.
+ # This is because VirtualBoxVM would detect that it is wrapped that and refuse to run,
+ # and also because it would unset QT_PLUGIN_PATH for security reasons. We work around
+ # these issues by patching the code to set QT_PLUGIN_PATH to the necessary paths,
+ # after the code that unsets it. Note that qtsvg is included so that SVG icons from
+ # the user's icon theme can be loaded.
+ ++ optional (!headless && enableHardening) (substituteAll {
+ src = ./qt-env-vars.patch;
+ qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}";
+ })
++ [
./qtx11extras.patch
];
@@ -183,6 +195,11 @@ in stdenv.mkDerivation {
preFixup = optionalString (!headless) ''
wrapQtApp $out/bin/VirtualBox
+ ''
+ # If hardening is disabled, wrap the VirtualBoxVM binary instead of patching
+ # the source code (see postPatch).
+ + optionalString (!headless && !enableHardening) ''
+ wrapQtApp $out/libexec/virtualbox/VirtualBoxVM
'';
passthru = {
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index 78c2538bbb0e..8c9f1aea7baa 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -2,7 +2,7 @@
with lib;
-let version = "6.0.8";
+let version = "6.0.10";
in
fetchurl rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
@@ -10,7 +10,8 @@ fetchurl rec {
sha256 =
# Manually sha256sum the extensionPack file, must be hex!
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
- let value = "6d89127c7f043fa96592da96ca87ac5ee9a7afd347d788380f91b695b67d7954";
+ # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
+ let value = "e5a9eb240379a57c9bf03954a594a03431698e67aef551e27f62170bed9b16ea";
in assert (builtins.stringLength value) == 64; value;
meta = {
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 5ff8a1650bab..e7f6fad79f90 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "1njgxb18r8a1m8fk2b32mmnbwciip3wcxwyhza5k73bx4q2sifac";
+ sha256 = "098kibz8dkiqd8shm44n4h6iyszcbj0ikav1b4vsi75dqzw8d9n8";
};
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
@@ -56,8 +56,6 @@ stdenv.mkDerivation {
}
'';
- doConfigure = false;
-
buildPhase = ''
# Build kernel modules.
cd src
diff --git a/pkgs/applications/virtualization/virtualbox/qt-env-vars.patch b/pkgs/applications/virtualization/virtualbox/qt-env-vars.patch
new file mode 100644
index 000000000000..ad1d1fd11f87
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/qt-env-vars.patch
@@ -0,0 +1,14 @@
+--- a/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp
++++ b/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp
+@@ -2131,6 +2131,11 @@ static void supR3HardenedMainPurgeEnvironment(char **envp)
+ /** @todo Call NT API to do the same. */
+ #endif
+ }
++
++ /*
++ * NixOS hack: Set QT_PLUGIN_PATH to make Qt find plugins.
++ */
++ setenv("QT_PLUGIN_PATH", "@qtPluginPath@", /*overwrite=*/ 1);
+ }
+
+
diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix
index 3d6efcfc8443..464fe46b499c 100644
--- a/pkgs/applications/virtualization/vpcs/default.nix
+++ b/pkgs/applications/virtualization/vpcs/default.nix
@@ -1,13 +1,12 @@
{ stdenv, fetchurl, glibc }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "vpcs";
version = "0.8";
src = fetchurl {
- name = "${name}.tar.bz2";
- url = "mirror://sourceforge/project/${pname}/${version}/${name}-src.tbz";
+ name = "${pname}-${version}.tar.bz2";
+ url = "mirror://sourceforge/project/${pname}/${version}/${pname}-${version}-src.tbz";
sha256 = "14y9nflcyq486vvw0na0fkfmg5dac004qb332v4m5a0vaz8059nw";
};
diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix
index 59d642108374..ea8a24e57a34 100644
--- a/pkgs/applications/virtualization/x11docker/default.nix
+++ b/pkgs/applications/virtualization/x11docker/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }:
stdenv.mkDerivation rec {
- name = "x11docker-${version}";
+ pname = "x11docker";
version = "6.0.0";
src = fetchFromGitHub {
owner = "mviereck";
diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix
index f3055fc79c35..042b01e86780 100644
--- a/pkgs/applications/virtualization/xen/4.10.nix
+++ b/pkgs/applications/virtualization/xen/4.10.nix
@@ -47,7 +47,7 @@ callPackage (import ./generic.nix (rec {
# Sources needed to build tools and firmwares.
xenfiles = optionalAttrs withInternalQemu {
- "qemu-xen" = {
+ qemu-xen = {
src = fetchgit {
url = https://xenbits.xen.org/git-http/qemu-xen.git;
# rev = "refs/tags/qemu-xen-${version}";
@@ -67,7 +67,7 @@ callPackage (import ./generic.nix (rec {
meta.description = "Xen's fork of upstream Qemu";
};
} // optionalAttrs withInternalTraditionalQemu {
- "qemu-xen-traditional" = {
+ qemu-xen-traditional = {
src = fetchgit {
url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
# rev = "refs/tags/xen-${version}";
@@ -114,7 +114,7 @@ callPackage (import ./generic.nix (rec {
meta.description = "Xen's fork of iPXE";
};
} // optionalAttrs withLibHVM {
- "xen-libhvm-dir-remote" = {
+ xen-libhvm-dir-remote = {
src = fetchgit {
name = "xen-libhvm";
url = https://github.com/michalpalka/xen-libhvm;
diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index 64704f73e7b1..af4721516eca 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -50,7 +50,7 @@ callPackage (import ./generic.nix (rec {
# Sources needed to build tools and firmwares.
xenfiles = optionalAttrs withInternalQemu {
- "qemu-xen" = {
+ qemu-xen = {
src = fetchgit {
url = https://xenbits.xen.org/git-http/qemu-xen.git;
rev = "refs/tags/qemu-xen-${version}";
@@ -86,7 +86,7 @@ callPackage (import ./generic.nix (rec {
meta.description = "Xen's fork of upstream Qemu";
};
} // optionalAttrs withInternalTraditionalQemu {
- "qemu-xen-traditional" = {
+ qemu-xen-traditional = {
src = fetchgit {
url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
rev = "refs/tags/xen-${version}";
@@ -152,7 +152,7 @@ callPackage (import ./generic.nix (rec {
meta.description = "Xen's fork of iPXE";
};
} // optionalAttrs withLibHVM {
- "xen-libhvm-dir-remote" = {
+ xen-libhvm-dir-remote = {
src = fetchgit {
name = "xen-libhvm";
url = https://github.com/ts468/xen-libhvm;
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 8ad8edde8cc8..1608fabf4b29 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -64,7 +64,7 @@ callPackage (import ./generic.nix (rec {
# Sources needed to build tools and firmwares.
xenfiles = optionalAttrs withInternalQemu {
- "qemu-xen" = {
+ qemu-xen = {
src = fetchgit {
url = https://xenbits.xen.org/git-http/qemu-xen.git;
rev = "refs/tags/qemu-xen-${version}";
@@ -78,7 +78,7 @@ callPackage (import ./generic.nix (rec {
meta.description = "Xen's fork of upstream Qemu";
};
} // optionalAttrs withInternalTraditionalQemu {
- "qemu-xen-traditional" = {
+ qemu-xen-traditional = {
src = fetchgit {
url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
rev = "refs/tags/xen-${version}";
@@ -123,7 +123,7 @@ callPackage (import ./generic.nix (rec {
meta.description = "Xen's fork of iPXE";
};
} // optionalAttrs withLibHVM {
- "xen-libhvm-dir-remote" = {
+ xen-libhvm-dir-remote = {
src = fetchgit {
name = "xen-libhvm";
url = https://github.com/michalpalka/xen-libhvm;
diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix
index 727546b69fb0..de692820d8f7 100644
--- a/pkgs/applications/virtualization/xen/xsa-patches.nix
+++ b/pkgs/applications/virtualization/xen/xsa-patches.nix
@@ -5,7 +5,7 @@ let
url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
inherit sha256;
});
-in rec {
+in {
# 4.5
XSA_190 = (xsaPatch {
name = "190-4.5";
diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix
index d3990a70bcac..26b55b364f17 100644
--- a/pkgs/applications/virtualization/xhyve/default.nix
+++ b/pkgs/applications/virtualization/xhyve/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc, zlib }:
stdenv.mkDerivation rec {
- name = "xhyve-${version}";
+ pname = "xhyve";
version = "20190124";
src = fetchurl {
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
index 116180f5ec36..4b61fe3d7e6c 100644
--- a/pkgs/applications/window-managers/2bwm/default.nix
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "0.2";
- name = "2bwm-${version}";
+ pname = "2bwm";
src = fetchFromGitHub {
owner = "venam";
diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix
index 46a86da1d66b..5fcbff26b154 100644
--- a/pkgs/applications/window-managers/afterstep/default.nix
+++ b/pkgs/applications/window-managers/afterstep/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
- name = "afterstep-${version}";
+ pname = "afterstep";
version = "2.2.12";
sourceName = "AfterStep-${version}";
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 5c897926432e..2551ea80550e 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -13,7 +13,7 @@
assert gtk3Support -> gtk3 != null;
with luaPackages; stdenv.mkDerivation rec {
- name = "awesome-${version}";
+ pname = "awesome";
version = "4.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/bevelbar/default.nix b/pkgs/applications/window-managers/bevelbar/default.nix
index 582f9cb61f8e..40cebb572af3 100644
--- a/pkgs/applications/window-managers/bevelbar/default.nix
+++ b/pkgs/applications/window-managers/bevelbar/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libX11, libXrandr, libXft }:
stdenv.mkDerivation rec {
- name = "bevelbar-${version}";
+ pname = "bevelbar";
version = "16.11";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index b81f66254377..e863a382470f 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "bspwm-${version}";
+ pname = "bspwm";
version = "0.9.9";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix
index 09c7c8e0e088..eeadfa248d75 100644
--- a/pkgs/applications/window-managers/bspwm/unstable.nix
+++ b/pkgs/applications/window-managers/bspwm/unstable.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libxcb, libXinerama, xcbutil, xcbutilkeysyms, xcbutilwm }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "bspwm-unstable-2016-09-30";
diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix
index f55c55110a29..cf90b1fad63b 100644
--- a/pkgs/applications/window-managers/btops/default.nix
+++ b/pkgs/applications/window-managers/btops/default.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "btops-${version}";
+ pname = "btops";
version = "0.1.0";
goPackagePath = "github.com/cmschuetz/btops";
diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix
index cc00f1e4b6e9..e2c39887a321 100644
--- a/pkgs/applications/window-managers/clfswm/default.nix
+++ b/pkgs/applications/window-managers/clfswm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "clfswm";
src = fetchgit {
diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix
index 0b611906a466..1354171dcfac 100644
--- a/pkgs/applications/window-managers/cwm/default.nix
+++ b/pkgs/applications/window-managers/cwm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "cwm-5.6";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index eac15ca71418..1787e40eb96c 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -8,7 +8,7 @@ let
in
rustPlatform.buildRustPackage rec {
- name = "dwm-status-${version}";
+ pname = "dwm-status";
version = "1.6.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix
index 7bc76d5c2bfb..96dcfb938004 100644
--- a/pkgs/applications/window-managers/dzen2/default.nix
+++ b/pkgs/applications/window-managers/dzen2/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libX11, libXft, libXinerama, libXpm }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dzen2-0.9.5";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix
index 0c13691a36ac..cf45dfa86407 100644
--- a/pkgs/applications/window-managers/fbpanel/default.nix
+++ b/pkgs/applications/window-managers/fbpanel/default.nix
@@ -3,10 +3,10 @@
}:
stdenv.mkDerivation rec {
- name = "fbpanel-${version}";
+ pname = "fbpanel";
version = "6.1";
src = fetchurl {
- url = "mirror://sourceforge/fbpanel/${name}.tbz2";
+ url = "mirror://sourceforge/fbpanel/${pname}-${version}.tbz2";
sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965";
};
buildInputs =
diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix
index c92b70153a72..404044fa3fa1 100644
--- a/pkgs/applications/window-managers/fluxbox/default.nix
+++ b/pkgs/applications/window-managers/fluxbox/default.nix
@@ -7,11 +7,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "fluxbox-${version}";
+ pname = "fluxbox";
version = "1.3.7";
src = fetchurl {
- url = "mirror://sourceforge/fluxbox/${name}.tar.xz";
+ url = "mirror://sourceforge/fluxbox/${pname}-${version}.tar.xz";
sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w";
};
diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix
index 20a95f36cee3..27657c10a7e3 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@@ -10,10 +10,9 @@ assert gestures -> libstroke != null;
stdenv.mkDerivation rec {
pname = "fvwm";
version = "2.6.8";
- name = "${pname}-${version}";
src = fetchurl {
- url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${name}.tar.gz";
+ url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "0hgkkdzcqjnaabvv9cnh0bz90nnjskbhjg9qnzpi2x0mbliwjdpv";
};
diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix
index 83fe3ef163a3..c62edd6d71a1 100644
--- a/pkgs/applications/window-managers/i3/blocks-gaps.nix
+++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix
@@ -12,7 +12,7 @@ let
in
stdenv.mkDerivation rec {
- name = "i3blocks-gaps-${version}";
+ pname = "i3blocks-gaps";
version = "1.4";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix
index bd088db8a366..ef03216d499b 100644
--- a/pkgs/applications/window-managers/i3/blocks.nix
+++ b/pkgs/applications/window-managers/i3/blocks.nix
@@ -2,8 +2,8 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
- name = "i3blocks-${version}";
+stdenv.mkDerivation {
+ pname = "i3blocks";
version = "unstable-2019-02-07";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index d72e56d2489a..403d9939e134 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -4,12 +4,12 @@
, xorgserver, xvfb_run }:
stdenv.mkDerivation rec {
- name = "i3-${version}";
- version = "4.17";
+ pname = "i3";
+ version = "4.17.1";
src = fetchurl {
- url = "https://i3wm.org/downloads/${name}.tar.bz2";
- sha256 = "1z8qmkkq9dhqmqy8sjw3rnpnmnb8v7lr456bs0qzp23bgpj17gjf";
+ url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2";
+ sha256 = "0iazv2i2rgmakzh95pgj6iapyzn7bdpcbcd35a79mhlml4ry33qy";
};
nativeBuildInputs = [ which pkgconfig makeWrapper ];
diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
index 54f238317068..33aac1cf4b65 100644
--- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix
+++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
- name = "i3ipc-glib-${version}";
+ pname = "i3ipc-glib";
version = "0.6.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index fa88a7e26bef..2fb6fb44833d 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
version = "2.12.c";
- name = "i3lock-color-${version}";
+ pname = "i3lock-color";
src = fetchFromGitHub {
owner = "PandorasFox";
diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix
index f6d797c98e1e..4ca69ce31b44 100644
--- a/pkgs/applications/window-managers/i3/lock-fancy.nix
+++ b/pkgs/applications/window-managers/i3/lock-fancy.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' i3lock-fancy
sed -i -e "s|getopt |${getopt}/bin/getopt |" i3lock-fancy
sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" i3lock-fancy
- sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z)|" i3lock-fancy
+ sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z -o)|" i3lock-fancy
rm Makefile
'';
installPhase = ''
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 9d02dbafa5de..3e976f8919f8 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -2,11 +2,11 @@
xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
stdenv.mkDerivation rec {
- name = "i3lock-${version}";
+ pname = "i3lock";
version = "2.12";
src = fetchurl {
- url = "https://i3wm.org/i3lock/${name}.tar.bz2";
+ url = "https://i3wm.org/i3lock/${pname}-${version}.tar.bz2";
sha256 = "02dwaqxpclcwiwvpvq7zwz4sxcv9c15dbf17ifalj1p8djls3cnh";
};
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index 17b147da1b2f..e963259b6247 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -1,21 +1,25 @@
-{ fetchurl, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig
- }:
+{ fetchurl, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
stdenv.mkDerivation rec {
- name = "i3status-2.12";
+ name = "i3status-2.13";
src = fetchurl {
url = "https://i3wm.org/i3status/${name}.tar.bz2";
- sha256 = "06krpbijv4yi33nypg6qcn4hilcrdyarsdpd9fmr2cq46qaqiikg";
+ sha256 = "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];
buildInputs = [ libconfuse yajl alsaLib libpulseaudio libnl ];
makeFlags = [ "all" "PREFIX=$(out)" ];
+ # This hack is needed because for unknown reasons configure generates a broken makefile on the 2.13 release under nixos
+ preBuild = ''
+ sed -i -e 's/\$(TEST_LOGS) \$(TEST_LOGS/\$(TEST_LOGS)/g' Makefile
+ '';
+
meta = {
- description = "A tiling window manager";
+ description = "Generates a status line for i3bar, dzen2, xmobar or lemonbar";
homepage = https://i3wm.org;
maintainers = [ ];
license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 2f6199122f14..f388c2d99db2 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -1,36 +1,40 @@
-{ stdenv, fetchurl, cmake, gettext
+{ stdenv, fetchFromGitHub, cmake, gettext, perl, asciidoc
, libjpeg, libtiff, libungif, libpng, imlib, expat
, freetype, fontconfig, pkgconfig, gdk-pixbuf
, mkfontdir, libX11, libXft, libXext, libXinerama
, libXrandr, libICE, libSM, libXpm, libXdmcp, libxcb
-, libpthreadstubs, pcre }:
+, libpthreadstubs, pcre, libXdamage, libXcomposite, libXfixes
+, libsndfile, fribidi }:
-with stdenv.lib;
stdenv.mkDerivation rec {
- name = "icewm-${version}";
- version = "1.4.2";
+ pname = "icewm";
+ version = "1.6.0";
- buildInputs =
- [ cmake gettext libjpeg libtiff libungif libpng imlib expat
- freetype fontconfig pkgconfig gdk-pixbuf mkfontdir libX11
- libXft libXext libXinerama libXrandr libICE libSM libXpm
- libXdmcp libxcb libpthreadstubs pcre ];
-
- src = fetchurl {
- url = "https://github.com/bbidulock/icewm/archive/${version}.tar.gz";
- sha256 = "05chzjjnb4n4j05ld2gmhhr07c887qb4j9inwg9izhvml51af1bw";
+ src = fetchFromGitHub {
+ owner = "bbidulock";
+ repo = "icewm";
+ rev = version;
+ sha256 = "1l8hjmb19d7ds7z21cx207h86wkjcmmmamcnalgkwh4alvbawc2p";
};
- preConfigure = ''
- export cmakeFlags="-DPREFIX=$out -DCFGDIR=/etc/icewm"
+ nativeBuildInputs = [ cmake pkgconfig perl asciidoc ];
+
+ buildInputs = [
+ gettext libjpeg libtiff libungif libpng imlib expat
+ freetype fontconfig gdk-pixbuf mkfontdir libX11
+ libXft libXext libXinerama libXrandr libICE libSM libXpm
+ libXdmcp libxcb libpthreadstubs pcre libsndfile fribidi
+ libXdamage libXcomposite libXfixes
+ ];
+
+ cmakeFlags = [ "-DPREFIX=$out" "-DCFGDIR=/etc/icewm" ];
+
+ # install legacy themes
+ postInstall = ''
+ cp -r ../lib/themes/{gtk2,Natural,nice,nice2,warp3,warp4,yellowmotif} $out/share/icewm/themes/
'';
- patches = [ ./fix-strlcat_strlcpy.patch ] ++
- stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl.patch;
-
- patchFlags = [ "-p0" ];
-
- meta = {
+ meta = with stdenv.lib; {
description = "A simple, lightweight X window manager";
longDescription = ''
IceWM is a window manager for the X Window System. The goal of
diff --git a/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch b/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch
deleted file mode 100644
index 9721e125b051..000000000000
--- a/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch
+++ /dev/null
@@ -1,236 +0,0 @@
---- src/apppstatus.cc 2017-07-30 10:59:06.000000000 +0200
-+++ src/apppstatus.cc 2017-08-09 09:12:54.332052762 +0200
-@@ -366,7 +366,7 @@
- sscanf(p, "%s %s %s %s %s", val[0], val[1], val[2], val[3], val[4]);
- for (i = 0; i < 4; i++) {
- if (strncmp(val[i+1], "?", 1) != 0)
-- strlcpy(phoneNumber, val[i+1], sizeof phoneNumber);
-+ my_strlcpy(phoneNumber, val[i+1], sizeof phoneNumber);
- }
- }
-
---- src/base.h 2017-07-30 10:59:06.000000000 +0200
-+++ src/base.h 2017-08-09 09:11:13.082025484 +0200
-@@ -44,9 +44,9 @@
- /*** String Functions *********************************************************/
-
- /* Prefer this as a safer alternative over strcpy. Return strlen(from). */
--size_t strlcpy(char *dest, const char *from, size_t dest_size);
-+size_t my_strlcpy(char *dest, const char *from, size_t dest_size);
- /* Prefer this over strcat. Return strlen(dest) + strlen(from). */
--size_t strlcat(char *dest, const char *from, size_t dest_size);
-+size_t my_strlcat(char *dest, const char *from, size_t dest_size);
-
- char *newstr(char const *str);
- char *newstr(char const *str, int len);
---- src/gnome2.cc 2017-07-30 10:59:06.000000000 +0200
-+++ src/gnome2.cc 2017-08-09 09:11:21.819027846 +0200
-@@ -158,8 +158,8 @@
- const int plen = strlen(fPath);
-
- char tmp[256];
-- strlcpy(tmp, fPath, sizeof tmp);
-- strlcat(tmp, "/.directory", sizeof tmp);
-+ my_strlcpy(tmp, fPath, sizeof tmp);
-+ my_strlcat(tmp, "/.directory", sizeof tmp);
-
- if (isDir && !stat(tmp, &sb)) { // looks like kde/gnome1 style
-
-@@ -279,8 +279,8 @@
-
- while ((file = readdir(dir)) != NULL) {
- char fullpath[256];
-- strlcpy(fullpath, dirname, sizeof fullpath);
-- strlcat(fullpath, file->d_name, sizeof fullpath);
-+ my_strlcpy(fullpath, dirname, sizeof fullpath);
-+ my_strlcat(fullpath, file->d_name, sizeof fullpath);
- GnomeDesktopItem *ditem =
- gnome_desktop_item_new_from_file(fullpath,
- (GnomeDesktopItemLoadFlags)0,
---- src/icehelp.cc 2017-07-30 10:59:06.000000000 +0200
-+++ src/icehelp.cc 2017-08-09 09:11:31.490030459 +0200
-@@ -1790,8 +1790,8 @@
- const size_t size = 9 + strlen(cfmt) + strlen(cstr) + strlen(crea);
- char *cbuf = (char *)malloc(size);
- snprintf(cbuf, size, cfmt, cstr);
-- strlcat(cbuf, ":\n ", size);
-- strlcat(cbuf, crea, size);
-+ my_strlcat(cbuf, ":\n ", size);
-+ my_strlcat(cbuf, crea, size);
-
- node *root = new node(node::div);
- flist nodes(root);
---- src/icesm.cc 2017-07-30 10:59:06.000000000 +0200
-+++ src/icesm.cc 2017-08-09 09:13:12.946057758 +0200
-@@ -28,10 +28,10 @@
- wordexp_t w;
- if (wordexp(trim(buf), &w, 0) != 0 || w.we_wordc == 0)
- return false;
-- size_t len = strlcpy(buf, trim(w.we_wordv[0]), bufsiz);
-+ size_t len = my_strlcpy(buf, trim(w.we_wordv[0]), bufsiz);
- for (size_t k = 1; k < w.we_wordc && len < bufsiz; ++k) {
-- strlcat(buf, " ", bufsiz);
-- len = strlcat(buf, trim(w.we_wordv[k]), bufsiz);
-+ my_strlcat(buf, " ", bufsiz);
-+ len = my_strlcat(buf, trim(w.we_wordv[k]), bufsiz);
- }
- wordfree(&w);
- if (len >= bufsiz)
-@@ -39,7 +39,7 @@
- #else
- char *str = trim(buf);
- if (str > buf)
-- strlcpy(buf, str, bufsiz);
-+ my_strlcpy(buf, str, bufsiz);
- #endif
- if (buf[0] == '#' || buf[0] == '=')
- buf[0] = 0;
---- src/icesound.cc 2017-07-30 10:59:06.000000000 +0200
-+++ src/icesound.cc 2017-08-09 09:11:26.686029161 +0200
-@@ -145,8 +145,8 @@
- char * findSample(int sid) {
- char basefname[1024];
-
-- strlcpy(basefname, gui_events[sid].name, sizeof basefname);
-- strlcat(basefname, ".wav", sizeof basefname);
-+ my_strlcpy(basefname, gui_events[sid].name, sizeof basefname);
-+ my_strlcat(basefname, ".wav", sizeof basefname);
-
- return findSample(basefname);
- }
---- src/misc.cc 2017-07-30 10:59:06.000000000 +0200
-+++ src/misc.cc 2017-08-09 09:13:39.372064834 +0200
-@@ -448,7 +448,7 @@
- #endif
-
- /* Prefer this as a safer alternative over strcpy. Return strlen(from). */
--size_t strlcpy(char *dest, const char *from, size_t dest_size)
-+size_t my_strlcpy(char *dest, const char *from, size_t dest_size)
- {
- const char *in = from;
- if (dest_size > 0) {
-@@ -463,12 +463,12 @@
- }
-
- /* Prefer this over strcat. Return strlen(dest) + strlen(from). */
--size_t strlcat(char *dest, const char *from, size_t dest_size)
-+size_t my_strlcat(char *dest, const char *from, size_t dest_size)
- {
- char *to = dest;
- char *const stop = to + dest_size - 1;
- while (to < stop && *to) ++to;
-- return to - dest + strlcpy(to, from, dest_size - (to - dest));
-+ return to - dest + my_strlcpy(to, from, dest_size - (to - dest));
- }
-
- char *newstr(char const *str) {
---- src/strtest.cc 2017-07-30 10:59:06.000000000 +0200
-+++ src/strtest.cc 2017-08-09 09:13:24.395060823 +0200
-@@ -286,63 +286,63 @@
- strtest tester("strlc");
- char d[10] = "@";
- size_t n;
-- n = strlcpy(d, "", 0);
-+ n = my_strlcpy(d, "", 0);
- sequal(d, "@");
- assert(d, n == 0);
-
-- n = strlcpy(d, "a", 0);
-+ n = my_strlcpy(d, "a", 0);
- sequal(d, "@");
- assert(d, n == 1);
-
-- n = strlcpy(d, "", 1);
-+ n = my_strlcpy(d, "", 1);
- sequal(d, "");
- assert(d, n == 0);
-
-- n = strlcpy(d, "a", 1);
-+ n = my_strlcpy(d, "a", 1);
- sequal(d, "");
- assert(d, n == 1);
-
-- n = strlcpy(d, "a", 2);
-+ n = my_strlcpy(d, "a", 2);
- sequal(d, "a");
- assert(d, n == 1);
-
-- n = strlcpy(d, "ab", 2);
-+ n = my_strlcpy(d, "ab", 2);
- sequal(d, "a");
- assert(d, n == 2);
-
-- n = strlcpy(d, "ab", 3);
-+ n = my_strlcpy(d, "ab", 3);
- sequal(d, "ab");
- assert(d, n == 2);
-
-- n = strlcpy(d, "abc", sizeof d);
-+ n = my_strlcpy(d, "abc", sizeof d);
- sequal(d, "abc");
- assert(d, n == 3);
-
-- n = strlcat(d, "def", 4);
-+ n = my_strlcat(d, "def", 4);
- sequal(d, "abc");
- assert(d, n == 6);
-
-- n = strlcat(d, "def", sizeof d);
-+ n = my_strlcat(d, "def", sizeof d);
- sequal(d, "abcdef");
- assert(d, n == 6);
-
-- n = strlcat(d, "ghijkl", sizeof d);
-+ n = my_strlcat(d, "ghijkl", sizeof d);
- sequal(d, "abcdefghi");
- assert(d, n == 12);
-
-- n = strlcpy(d, "123", sizeof d);
-+ n = my_strlcpy(d, "123", sizeof d);
- sequal(d, "123");
- assert(d, n == 3);
-
-- n = strlcpy(d, d + 1, sizeof d);
-+ n = my_strlcpy(d, d + 1, sizeof d);
- sequal(d, "23");
- assert(d, n == 2);
-
-- n = strlcpy(d, d + 1, sizeof d);
-+ n = my_strlcpy(d, d + 1, sizeof d);
- sequal(d, "3");
- assert(d, n == 1);
-
-- n = strlcpy(d, d + 1, sizeof d);
-+ n = my_strlcpy(d, d + 1, sizeof d);
- sequal(d, "");
- assert(d, n == 0);
- }
-@@ -418,7 +418,7 @@
- while (a.next()) {
- const char *e = a.entry();
- assert(e, strcoll(buf, e) < 0);
-- strlcpy(buf, e, sizeof buf);
-+ my_strlcpy(buf, e, sizeof buf);
- }
- assert(buf, strcoll(buf, "~~~~~~~~~") < 0);
- }
-@@ -437,7 +437,7 @@
- cstring c(s.entry());
- const char *e = c.c_str();
- assert(e, strcoll(buf, e) < 0);
-- strlcpy(buf, e, sizeof buf);
-+ my_strlcpy(buf, e, sizeof buf);
- }
- assert(buf, strcoll(buf, "~~~~~~~~~") < 0);
- }
---- src/udir.cc 2017-07-30 10:59:06.000000000 +0200
-+++ src/udir.cc 2017-08-09 09:13:28.346061883 +0200
-@@ -66,7 +66,7 @@
- if (impl) {
- DirPtr dirp(impl);
- if (dirp.next()) {
-- strlcpy(fEntry, dirp.name(), sizeof fEntry);
-+ my_strlcpy(fEntry, dirp.name(), sizeof fEntry);
- return true;
- }
- }
diff --git a/pkgs/applications/window-managers/icewm/musl.patch b/pkgs/applications/window-managers/icewm/musl.patch
deleted file mode 100644
index e7d18e312874..000000000000
--- a/pkgs/applications/window-managers/icewm/musl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/ylocale.cc 2017-07-30 10:59:06.000000000 +0200
-+++ src/ylocale.cc 2017-08-09 08:15:50.938841549 +0200
-@@ -55,6 +55,8 @@
- int const codesetItems[] = {
- #ifdef CONFIG_NL_CODESETS
- CONFIG_NL_CODESETS
-+#elif !defined(__GLIBC__)
-+ CODESET, 0
- #else
- CODESET, _NL_CTYPE_CODESET_NAME, 0
- #endif
---- src/globit.c 2017-07-30 10:59:06.000000000 +0200
-+++ src/globit.c 2017-08-09 08:17:18.691824584 +0200
-@@ -143,7 +143,9 @@
- } else if (*pattern == '~') {
- /* yes, tilde */
- is_absolute = 2;
-+#if defined(__GLIBC__)
- glob_flags |= GLOB_TILDE;
-+#endif
- /* any slash in the pattern? */
- while (*cp && *cp != '/')
- ++cp;
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 6a7c1436b09d..3668b344be50 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -4,7 +4,7 @@
librsvg, freetype, fontconfig }:
stdenv.mkDerivation rec {
- name = "jwm-${version}";
+ pname = "jwm";
version = "1685";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
index 3b764e7095be..db33b27ddd81 100644
--- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
+++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }:
-stdenv.mkDerivation rec {
- name = "jwm-settings-manager-${version}";
+stdenv.mkDerivation {
+ pname = "jwm-settings-manager";
version = "2018-10-19";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix
index 08b79927d21e..bcfcbe3c5f52 100644
--- a/pkgs/applications/window-managers/kbdd/default.nix
+++ b/pkgs/applications/window-managers/kbdd/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, dbus-glib, autoreconfHook, xorg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "kbdd";
version = "unstable-2017-01-29";
diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix
index 574e42cc8481..661ca013e240 100644
--- a/pkgs/applications/window-managers/leftwm/default.nix
+++ b/pkgs/applications/window-managers/leftwm/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "leftwm";
repo = "leftwm";
- rev = "${version}";
+ rev = version;
sha256 = "0ji7m2npkdg27gm33b19rxr50km0gm1h9czi1f425vxq65mlkl4y";
};
diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix
index ed34e75f35db..9d6e0f27f934 100644
--- a/pkgs/applications/window-managers/lemonbar/default.nix
+++ b/pkgs/applications/window-managers/lemonbar/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, perl, libxcb }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "lemonbar-1.3";
src = fetchurl {
diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix
index a1334112cf98..ff34f1dfee78 100644
--- a/pkgs/applications/window-managers/lemonbar/xft.nix
+++ b/pkgs/applications/window-managers/lemonbar/xft.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, perl, libxcb, libXft }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "lemonbar-xft-unstable-2016-02-17";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix
index 9abbd891e310..3c537d6c931b 100644
--- a/pkgs/applications/window-managers/matchbox/default.nix
+++ b/pkgs/applications/window-managers/matchbox/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libmatchbox, libX11, libXext }:
stdenv.mkDerivation rec {
- name = "matchbox-${version}";
+ pname = "matchbox";
version = "1.2";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix
index 722566ea2e9e..026ee2e1287e 100644
--- a/pkgs/applications/window-managers/neocomp/default.nix
+++ b/pkgs/applications/window-managers/neocomp/default.nix
@@ -23,7 +23,7 @@ let
rev = "v0.6-17-g271e784";
in
stdenv.mkDerivation rec {
- name = "neocomp-unstable-${version}";
+ pname = "neocomp-unstable";
version = "2019-03-12";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix
index 8c6926dd2c69..c8d526b6d288 100644
--- a/pkgs/applications/window-managers/openbox/default.nix
+++ b/pkgs/applications/window-managers/openbox/default.nix
@@ -3,7 +3,7 @@
, imlib2, pango, libstartup_notification, makeWrapper }:
stdenv.mkDerivation rec {
- name = "openbox-${version}";
+ pname = "openbox";
version = "3.6.1";
nativeBuildInputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
- url = "http://openbox.org/dist/openbox/${name}.tar.gz";
+ url = "http://openbox.org/dist/openbox/${pname}-${version}.tar.gz";
sha256 = "1xvyvqxlhy08n61rjkckmrzah2si1i7nmc7s8h07riqq01vc0jlb";
};
diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix
index 00ff62520105..d449fc91c0d3 100644
--- a/pkgs/applications/window-managers/oroborus/default.nix
+++ b/pkgs/applications/window-managers/oroborus/default.nix
@@ -7,7 +7,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "oroborus-${version}";
+ pname = "oroborus";
version = "2.0.20";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix
index b2677218e856..38255dce7224 100644
--- a/pkgs/applications/window-managers/pekwm/default.nix
+++ b/pkgs/applications/window-managers/pekwm/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
- name = "pekwm-${version}";
+ pname = "pekwm";
version = "0.1.17";
src = fetchurl {
- url = "https://www.pekwm.org/projects/pekwm/files/${name}.tar.bz2";
+ url = "https://www.pekwm.org/projects/pekwm/files/${pname}-${version}.tar.bz2";
sha256 = "003x6bxj1lb2ljxz3v414bn0rdl6z68c0r185fxwgs1qkyzx67wa";
};
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index 0a1a095e0ced..11a69020ee62 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "ratpoison-${version}";
+ pname = "ratpoison";
version = "1.4.9";
src = fetchurl {
- url = "mirror://savannah/ratpoison/${name}.tar.xz";
+ url = "mirror://savannah/ratpoison/${pname}-${version}.tar.xz";
sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr";
};
diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix
index d8bb58c21b66..f9bcb28e4557 100644
--- a/pkgs/applications/window-managers/sawfish/default.nix
+++ b/pkgs/applications/window-managers/sawfish/default.nix
@@ -10,7 +10,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
- name = "sawfish-${version}";
+ pname = "sawfish";
version = "1.12.90";
sourceName = "sawfish_${version}";
diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix
index 81901be0e60b..ba43403d9bbb 100644
--- a/pkgs/applications/window-managers/spectrwm/default.nix
+++ b/pkgs/applications/window-managers/spectrwm/default.nix
@@ -12,8 +12,8 @@
, stdenv
}:
-stdenv.mkDerivation rec {
- name = "spectrwm-${version}";
+stdenv.mkDerivation {
+ pname = "spectrwm";
version = "2.7.2";
src = fetchurl {
diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix
index 64fa600765b3..f0f724d6cf0e 100644
--- a/pkgs/applications/window-managers/stalonetray/default.nix
+++ b/pkgs/applications/window-managers/stalonetray/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11, xorgproto }:
stdenv.mkDerivation rec {
- name = "stalonetray-${version}";
+ pname = "stalonetray";
version = "0.8.3";
src = fetchurl {
- url = "mirror://sourceforge/stalonetray/${name}.tar.bz2";
+ url = "mirror://sourceforge/stalonetray/${pname}-${version}.tar.bz2";
sha256 = "0k7xnpdb6dvx25d67v0crlr32cdnzykdsi9j889njiididc8lm1n";
};
diff --git a/pkgs/applications/window-managers/stumpish/default.nix b/pkgs/applications/window-managers/stumpish/default.nix
index 56d2515ed7b2..00f4b95b3f27 100644
--- a/pkgs/applications/window-managers/stumpish/default.nix
+++ b/pkgs/applications/window-managers/stumpish/default.nix
@@ -1,9 +1,8 @@
{ stdenv, substituteAll, fetchFromGitHub, gnused, ncurses, xorg, rlwrap }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "stumpish";
version = "0.0.1";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "stumpwm";
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index 3ed7f4325f24..69b2e6ceb50f 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -10,7 +10,7 @@ let
sha256 = "1ml6mjk2fsfv4sf65fdbji3q5x0qiq99g1k8w7a99gsl2i8h60gc";
});
versionSpec = {
- "latest" = {
+ latest = {
name = "1.0.0";
rev = "refs/tags/1.0.0";
sha256 = "16r0lwhxl8g71masmfbjr7s7m7fah4ii4smi1g8zpbpiqjz48ryb";
@@ -22,7 +22,7 @@ let
sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k";
patches = [ ./fix-module-path.patch ];
};
- "git" = {
+ git = {
name = "git-20170203";
rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97";
sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70";
@@ -30,13 +30,13 @@ let
};
}.${version};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "stumpwm-${versionSpec.name}";
src = fetchgit {
url = "https://github.com/stumpwm/stumpwm";
- rev = "${versionSpec.rev}";
- sha256 = "${versionSpec.sha256}";
+ rev = versionSpec.rev;
+ sha256 = versionSpec.sha256;
};
# NOTE: The patch needs an update for the next release.
diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix
index 595197a3f6f0..86301492c468 100644
--- a/pkgs/applications/window-managers/sway/bg.nix
+++ b/pkgs/applications/window-managers/sway/bg.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "swaybg-${version}";
+ pname = "swaybg";
version = "1.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix
index c9daed461c55..bc917e76f974 100644
--- a/pkgs/applications/window-managers/sway/idle.nix
+++ b/pkgs/applications/window-managers/sway/idle.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "swayidle-${version}";
+ pname = "swayidle";
version = "1.5";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix
index 80d6ed4e0729..fe445a6b7adf 100644
--- a/pkgs/applications/window-managers/sway/lock.nix
+++ b/pkgs/applications/window-managers/sway/lock.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "swaylock-${version}";
+ pname = "swaylock";
version = "1.4";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix
index 817184d6cb00..2404129b165d 100644
--- a/pkgs/applications/window-managers/sxhkd/default.nix
+++ b/pkgs/applications/window-managers/sxhkd/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "sxhkd-${version}";
+ pname = "sxhkd";
version = "0.6.1";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
index 0943881da28f..c391532376e3 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -2,7 +2,7 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "tabbed-20180310";
src = fetchgit {
diff --git a/pkgs/applications/window-managers/way-cooler/crates-io.nix b/pkgs/applications/window-managers/way-cooler/crates-io.nix
index 955dfe9b44a1..01638c6332c8 100644
--- a/pkgs/applications/window-managers/way-cooler/crates-io.nix
+++ b/pkgs/applications/window-managers/way-cooler/crates-io.nix
@@ -20,7 +20,7 @@ rec {
(crates."memchr"."${deps."aho_corasick"."0.5.3"."memchr"}" deps)
]);
};
- features_.aho_corasick."0.5.3" = deps: f: updateFeatures f (rec {
+ features_.aho_corasick."0.5.3" = deps: f: updateFeatures f ({
aho_corasick."0.5.3".default = (f.aho_corasick."0.5.3".default or true);
memchr."${deps.aho_corasick."0.5.3".memchr}".default = true;
}) [
@@ -39,7 +39,7 @@ rec {
sha256 = "0an03kibhfcc0mcxf6a0mvbab0s7cggnvflw8jn0b15i351h828c";
features = mkFeatures (features."bitflags"."0.4.0" or {});
};
- features_.bitflags."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.bitflags."0.4.0" = deps: f: updateFeatures f ({
bitflags."0.4.0".default = (f.bitflags."0.4.0".default or true);
}) [];
@@ -54,7 +54,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6";
};
- features_.bitflags."0.6.0" = deps: f: updateFeatures f (rec {
+ features_.bitflags."0.6.0" = deps: f: updateFeatures f ({
bitflags."0.6.0".default = (f.bitflags."0.6.0".default or true);
}) [];
@@ -69,7 +69,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
};
- features_.bitflags."0.7.0" = deps: f: updateFeatures f (rec {
+ features_.bitflags."0.7.0" = deps: f: updateFeatures f ({
bitflags."0.7.0".default = (f.bitflags."0.7.0".default or true);
}) [];
@@ -107,7 +107,7 @@ rec {
sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08";
features = mkFeatures (features."bitflags"."1.0.4" or {});
};
- features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec {
+ features_.bitflags."1.0.4" = deps: f: updateFeatures f ({
bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true);
}) [];
@@ -122,7 +122,7 @@ rec {
authors = [ "Guillaume Gomez " ];
sha256 = "15gm72wx9kd0n51454i58rmpkmig8swghrj2440frxxi9kqg97xd";
};
- features_.c_vec."1.2.1" = deps: f: updateFeatures f (rec {
+ features_.c_vec."1.2.1" = deps: f: updateFeatures f ({
c_vec."1.2.1".default = (f.c_vec."1.2.1".default or true);
}) [];
@@ -284,7 +284,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n";
};
- features_.cfg_if."0.1.6" = deps: f: updateFeatures f (rec {
+ features_.cfg_if."0.1.6" = deps: f: updateFeatures f ({
cfg_if."0.1.6".default = (f.cfg_if."0.1.6".default or true);
}) [];
@@ -336,7 +336,7 @@ rec {
(crates."pkg_config"."${deps."dbus"."0.4.1"."pkg_config"}" deps)
]);
};
- features_.dbus."0.4.1" = deps: f: updateFeatures f (rec {
+ features_.dbus."0.4.1" = deps: f: updateFeatures f ({
dbus."0.4.1".default = (f.dbus."0.4.1".default or true);
libc."${deps.dbus."0.4.1".libc}".default = true;
pkg_config."${deps.dbus."0.4.1".pkg_config}".default = true;
@@ -359,7 +359,7 @@ rec {
(crates."dbus"."${deps."dbus_macros"."0.0.6"."dbus"}" deps)
]);
};
- features_.dbus_macros."0.0.6" = deps: f: updateFeatures f (rec {
+ features_.dbus_macros."0.0.6" = deps: f: updateFeatures f ({
dbus."${deps.dbus_macros."0.0.6".dbus}".default = true;
dbus_macros."0.0.6".default = (f.dbus_macros."0.0.6".default or true);
}) [
@@ -381,7 +381,7 @@ rec {
]);
features = mkFeatures (features."dlib"."0.3.1" or {});
};
- features_.dlib."0.3.1" = deps: f: updateFeatures f (rec {
+ features_.dlib."0.3.1" = deps: f: updateFeatures f ({
dlib."0.3.1".default = (f.dlib."0.3.1".default or true);
libloading."${deps.dlib."0.3.1".libloading}".default = true;
}) [
@@ -403,7 +403,7 @@ rec {
]);
features = mkFeatures (features."dlib"."0.4.1" or {});
};
- features_.dlib."0.4.1" = deps: f: updateFeatures f (rec {
+ features_.dlib."0.4.1" = deps: f: updateFeatures f ({
dlib."0.4.1".default = (f.dlib."0.4.1".default or true);
libloading."${deps.dlib."0.4.1".libloading}".default = true;
}) [
@@ -421,7 +421,7 @@ rec {
authors = [ "David Tolnay " ];
sha256 = "1xysdxdm24sk5ysim7lps4r2qaxfnj0sbakhmps4d42yssx30cw8";
};
- features_.dtoa."0.4.3" = deps: f: updateFeatures f (rec {
+ features_.dtoa."0.4.3" = deps: f: updateFeatures f ({
dtoa."0.4.3".default = (f.dtoa."0.4.3".default or true);
}) [];
@@ -441,7 +441,7 @@ rec {
(crates."wayland_sys"."${deps."dummy_rustwlc"."0.7.1"."wayland_sys"}" deps)
]);
};
- features_.dummy_rustwlc."0.7.1" = deps: f: updateFeatures f (rec {
+ features_.dummy_rustwlc."0.7.1" = deps: f: updateFeatures f ({
bitflags."${deps.dummy_rustwlc."0.7.1".bitflags}".default = true;
dummy_rustwlc."0.7.1".default = (f.dummy_rustwlc."0.7.1".default or true);
libc."${deps.dummy_rustwlc."0.7.1".libc}".default = true;
@@ -498,7 +498,7 @@ rec {
authors = [ "bluss" ];
sha256 = "1bkb5aq7h9p4rzlgxagnda1f0dd11q0qz41bmdy11z18q1p8igy1";
};
- features_.fixedbitset."0.1.9" = deps: f: updateFeatures f (rec {
+ features_.fixedbitset."0.1.9" = deps: f: updateFeatures f ({
fixedbitset."0.1.9".default = (f.fixedbitset."0.1.9".default or true);
}) [];
@@ -517,7 +517,7 @@ rec {
(crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps)
]);
};
- features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f ({
bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true;
fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true);
fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true;
@@ -537,7 +537,7 @@ rec {
authors = [ "Raph Levien " ];
sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
};
- features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({
fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true);
}) [];
@@ -712,7 +712,7 @@ rec {
(crates."unicode_width"."${deps."getopts"."0.2.18"."unicode_width"}" deps)
]);
};
- features_.getopts."0.2.18" = deps: f: updateFeatures f (rec {
+ features_.getopts."0.2.18" = deps: f: updateFeatures f ({
getopts."0.2.18".default = (f.getopts."0.2.18".default or true);
unicode_width."${deps.getopts."0.2.18".unicode_width}".default = true;
}) [
@@ -1033,7 +1033,7 @@ rec {
sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9";
features = mkFeatures (features."itoa"."0.3.4" or {});
};
- features_.itoa."0.3.4" = deps: f: updateFeatures f (rec {
+ features_.itoa."0.3.4" = deps: f: updateFeatures f ({
itoa."0.3.4".default = (f.itoa."0.3.4".default or true);
}) [];
@@ -1051,7 +1051,7 @@ rec {
(crates."rustc_serialize"."${deps."json_macro"."0.1.1"."rustc_serialize"}" deps)
]);
};
- features_.json_macro."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.json_macro."0.1.1" = deps: f: updateFeatures f ({
json_macro."0.1.1".default = (f.json_macro."0.1.1".default or true);
rustc_serialize."${deps.json_macro."0.1.1".rustc_serialize}".default = true;
}) [
@@ -1078,7 +1078,7 @@ rec {
(crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps)
]);
};
- features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec {
+ features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({
kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true);
winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true;
winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true;
@@ -1199,7 +1199,7 @@ rec {
(crates."target_build_utils"."${deps."libloading"."0.3.4"."target_build_utils"}" deps)
]);
};
- features_.libloading."0.3.4" = deps: f: updateFeatures f (rec {
+ features_.libloading."0.3.4" = deps: f: updateFeatures f ({
kernel32_sys."${deps.libloading."0.3.4".kernel32_sys}".default = true;
lazy_static."${deps.libloading."0.3.4".lazy_static}".default = true;
libloading."0.3.4".default = (f.libloading."0.3.4".default or true);
@@ -1231,7 +1231,7 @@ rec {
(crates."cc"."${deps."libloading"."0.5.0"."cc"}" deps)
]);
};
- features_.libloading."0.5.0" = deps: f: updateFeatures f (rec {
+ features_.libloading."0.5.0" = deps: f: updateFeatures f ({
cc."${deps.libloading."0.5.0".cc}".default = true;
libloading."0.5.0".default = (f.libloading."0.5.0".default or true);
winapi = fold recursiveUpdate {} [
@@ -1340,7 +1340,7 @@ rec {
]);
features = mkFeatures (features."log"."0.4.6" or {});
};
- features_.log."0.4.6" = deps: f: updateFeatures f (rec {
+ features_.log."0.4.6" = deps: f: updateFeatures f ({
cfg_if."${deps.log."0.4.6".cfg_if}".default = true;
log."0.4.6".default = (f.log."0.4.6".default or true);
}) [
@@ -1361,7 +1361,7 @@ rec {
(crates."libc"."${deps."memchr"."0.1.11"."libc"}" deps)
]);
};
- features_.memchr."0.1.11" = deps: f: updateFeatures f (rec {
+ features_.memchr."0.1.11" = deps: f: updateFeatures f ({
libc."${deps.memchr."0.1.11".libc}".default = true;
memchr."0.1.11".default = (f.memchr."0.1.11".default or true);
}) [
@@ -1392,7 +1392,7 @@ rec {
]);
features = mkFeatures (features."nix"."0.6.0" or {});
};
- features_.nix."0.6.0" = deps: f: updateFeatures f (rec {
+ features_.nix."0.6.0" = deps: f: updateFeatures f ({
bitflags."${deps.nix."0.6.0".bitflags}".default = true;
cfg_if."${deps.nix."0.6.0".cfg_if}".default = true;
libc."${deps.nix."0.6.0".libc}".default = true;
@@ -1426,7 +1426,7 @@ rec {
(crates."void"."${deps."nix"."0.9.0"."void"}" deps)
]);
};
- features_.nix."0.9.0" = deps: f: updateFeatures f (rec {
+ features_.nix."0.9.0" = deps: f: updateFeatures f ({
bitflags."${deps.nix."0.9.0".bitflags}".default = true;
cfg_if."${deps.nix."0.9.0".cfg_if}".default = true;
libc."${deps.nix."0.9.0".libc}".default = true;
@@ -1453,7 +1453,7 @@ rec {
(crates."num_traits"."${deps."num_traits"."0.1.43"."num_traits"}" deps)
]);
};
- features_.num_traits."0.1.43" = deps: f: updateFeatures f (rec {
+ features_.num_traits."0.1.43" = deps: f: updateFeatures f ({
num_traits = fold recursiveUpdate {} [
{ "${deps.num_traits."0.1.43".num_traits}".default = true; }
{ "0.1.43".default = (f.num_traits."0.1.43".default or true); }
@@ -1620,7 +1620,7 @@ rec {
(crates."phf_shared"."${deps."phf_codegen"."0.7.23"."phf_shared"}" deps)
]);
};
- features_.phf_codegen."0.7.23" = deps: f: updateFeatures f (rec {
+ features_.phf_codegen."0.7.23" = deps: f: updateFeatures f ({
phf_codegen."0.7.23".default = (f.phf_codegen."0.7.23".default or true);
phf_generator."${deps.phf_codegen."0.7.23".phf_generator}".default = true;
phf_shared."${deps.phf_codegen."0.7.23".phf_shared}".default = true;
@@ -1644,7 +1644,7 @@ rec {
(crates."rand"."${deps."phf_generator"."0.7.23"."rand"}" deps)
]);
};
- features_.phf_generator."0.7.23" = deps: f: updateFeatures f (rec {
+ features_.phf_generator."0.7.23" = deps: f: updateFeatures f ({
phf_generator."0.7.23".default = (f.phf_generator."0.7.23".default or true);
phf_shared."${deps.phf_generator."0.7.23".phf_shared}".default = true;
rand."${deps.phf_generator."0.7.23".rand}".default = true;
@@ -1669,7 +1669,7 @@ rec {
]);
features = mkFeatures (features."phf_shared"."0.7.23" or {});
};
- features_.phf_shared."0.7.23" = deps: f: updateFeatures f (rec {
+ features_.phf_shared."0.7.23" = deps: f: updateFeatures f ({
phf_shared."0.7.23".default = (f.phf_shared."0.7.23".default or true);
siphasher."${deps.phf_shared."0.7.23".siphasher}".default = true;
}) [
@@ -1687,7 +1687,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6";
};
- features_.pkg_config."0.3.14" = deps: f: updateFeatures f (rec {
+ features_.pkg_config."0.3.14" = deps: f: updateFeatures f ({
pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true);
}) [];
@@ -2004,7 +2004,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m";
};
- features_.regex_syntax."0.3.9" = deps: f: updateFeatures f (rec {
+ features_.regex_syntax."0.3.9" = deps: f: updateFeatures f ({
regex_syntax."0.3.9".default = (f.regex_syntax."0.3.9".default or true);
}) [];
@@ -2057,7 +2057,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn";
};
- features_.rustc_serialize."0.3.24" = deps: f: updateFeatures f (rec {
+ features_.rustc_serialize."0.3.24" = deps: f: updateFeatures f ({
rustc_serialize."0.3.24".default = (f.rustc_serialize."0.3.24".default or true);
}) [];
@@ -2075,7 +2075,7 @@ rec {
(crates."semver"."${deps."rustc_version"."0.1.7"."semver"}" deps)
]);
};
- features_.rustc_version."0.1.7" = deps: f: updateFeatures f (rec {
+ features_.rustc_version."0.1.7" = deps: f: updateFeatures f ({
rustc_version."0.1.7".default = (f.rustc_version."0.1.7".default or true);
semver."${deps.rustc_version."0.1.7".semver}".default = true;
}) [
@@ -2131,7 +2131,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n";
};
- features_.semver."0.1.20" = deps: f: updateFeatures f (rec {
+ features_.semver."0.1.20" = deps: f: updateFeatures f ({
semver."0.1.20".default = (f.semver."0.1.20".default or true);
}) [];
@@ -2225,7 +2225,7 @@ rec {
authors = [ "Frank Denis " ];
sha256 = "1ganj1grxqnkvv4ds3vby039bm999jrr58nfq2x3kjhzkw2bnqkw";
};
- features_.siphasher."0.2.3" = deps: f: updateFeatures f (rec {
+ features_.siphasher."0.2.3" = deps: f: updateFeatures f ({
siphasher."0.2.3".default = (f.siphasher."0.2.3".default or true);
}) [];
@@ -2282,7 +2282,7 @@ rec {
(crates."libc"."${deps."thread_id"."2.0.0"."libc"}" deps)
]);
};
- features_.thread_id."2.0.0" = deps: f: updateFeatures f (rec {
+ features_.thread_id."2.0.0" = deps: f: updateFeatures f ({
kernel32_sys."${deps.thread_id."2.0.0".kernel32_sys}".default = true;
libc."${deps.thread_id."2.0.0".libc}".default = true;
thread_id."2.0.0".default = (f.thread_id."2.0.0".default or true);
@@ -2305,7 +2305,7 @@ rec {
(crates."thread_id"."${deps."thread_local"."0.2.7"."thread_id"}" deps)
]);
};
- features_.thread_local."0.2.7" = deps: f: updateFeatures f (rec {
+ features_.thread_local."0.2.7" = deps: f: updateFeatures f ({
thread_id."${deps.thread_local."0.2.7".thread_id}".default = true;
thread_local."0.2.7".default = (f.thread_local."0.2.7".default or true);
}) [
@@ -2323,7 +2323,7 @@ rec {
authors = [ "Victor Berger " ];
sha256 = "1v7acraqyh6iibg87pwkxm41v783sminxm5k9f4ndra7r0vq4zvq";
};
- features_.token_store."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.token_store."0.1.2" = deps: f: updateFeatures f ({
token_store."0.1.2".default = (f.token_store."0.1.2".default or true);
}) [];
@@ -2339,7 +2339,7 @@ rec {
sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w";
features = mkFeatures (features."unicode_width"."0.1.5" or {});
};
- features_.unicode_width."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.unicode_width."0.1.5" = deps: f: updateFeatures f ({
unicode_width."0.1.5".default = (f.unicode_width."0.1.5".default or true);
}) [];
@@ -2354,7 +2354,7 @@ rec {
authors = [ "Andrew Gallant " ];
sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp";
};
- features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f ({
utf8_ranges."0.1.3".default = (f.utf8_ranges."0.1.3".default or true);
}) [];
@@ -2542,7 +2542,7 @@ rec {
(crates."xml_rs"."${deps."wayland_scanner"."0.12.5"."xml_rs"}" deps)
]);
};
- features_.wayland_scanner."0.12.5" = deps: f: updateFeatures f (rec {
+ features_.wayland_scanner."0.12.5" = deps: f: updateFeatures f ({
wayland_scanner."0.12.5".default = (f.wayland_scanner."0.12.5".default or true);
xml_rs."${deps.wayland_scanner."0.12.5".xml_rs}".default = true;
}) [
@@ -2737,7 +2737,7 @@ rec {
authors = [ "Peter Atashian " ];
sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
};
- features_.winapi."0.2.8" = deps: f: updateFeatures f (rec {
+ features_.winapi."0.2.8" = deps: f: updateFeatures f ({
winapi."0.2.8".default = (f.winapi."0.2.8".default or true);
}) [];
@@ -2760,7 +2760,7 @@ rec {
]) else []);
features = mkFeatures (features."winapi"."0.3.6" or {});
};
- features_.winapi."0.3.6" = deps: f: updateFeatures f (rec {
+ features_.winapi."0.3.6" = deps: f: updateFeatures f ({
winapi."0.3.6".default = (f.winapi."0.3.6".default or true);
winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true;
winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true;
@@ -2781,7 +2781,7 @@ rec {
sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
libName = "build";
};
- features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({
winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true);
}) [];
@@ -2797,7 +2797,7 @@ rec {
sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
build = "build.rs";
};
- features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({
winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true);
}) [];
@@ -2813,7 +2813,7 @@ rec {
sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
build = "build.rs";
};
- features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({
winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true);
}) [];
@@ -2992,7 +2992,7 @@ rec {
(crates."bitflags"."${deps."xml_rs"."0.7.0"."bitflags"}" deps)
]);
};
- features_.xml_rs."0.7.0" = deps: f: updateFeatures f (rec {
+ features_.xml_rs."0.7.0" = deps: f: updateFeatures f ({
bitflags."${deps.xml_rs."0.7.0".bitflags}".default = true;
xml_rs."0.7.0".default = (f.xml_rs."0.7.0".default or true);
}) [
diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix
index 9ebb0b5ffcfb..7bc6ac700204 100644
--- a/pkgs/applications/window-managers/way-cooler/default.nix
+++ b/pkgs/applications/window-managers/way-cooler/default.nix
@@ -16,23 +16,23 @@ let
# https://nest.pijul.com/pmeunier/carnix/discussions/22
version = "0.8.1";
deps = (callPackage ./way-cooler.nix {}).deps;
- way_cooler_ = f: cratesIO.crates.way_cooler."${version}" deps {
- features = cratesIO.features_.way_cooler."${version}" deps {
- "way_cooler"."${version}" = f;
+ way_cooler_ = f: cratesIO.crates.way_cooler.${version} deps {
+ features = cratesIO.features_.way_cooler.${version} deps {
+ way_cooler.${version} = f;
};
};
way-cooler = ((way_cooler_ { builtin-lua = true; }).override {
crateOverrides = defaultCrateOverrides // {
way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk-pixbuf wayland ]; };
- };}).overrideAttrs (oldAttrs: rec {
+ };}).overrideAttrs (oldAttrs: {
postBuild = ''
mkdir -p $out/etc
cp -r config $out/etc/way-cooler
'';
});
- wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec {
+ wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: {
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
@@ -47,7 +47,7 @@ let
crateOverrides = defaultCrateOverrides // {
wc-lock = attrs: { buildInputs = [ pam ]; };
- };}).overrideAttrs (oldAttrs: rec {
+ };}).overrideAttrs (oldAttrs: {
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
@@ -87,7 +87,7 @@ let
sleep 5
${wc-bar-bare}/bin/bar.py $SELECTED $BACKGROUND $SELECTED_OTHER_WORKSPACE 2> /tmp/bar_debug.txt | ${lemonbar}/bin/lemonbar -B $BACKGROUND -F "#FFF" -n "lemonbar" -p -d
'';
-in symlinkJoin rec {
+in symlinkJoin {
inherit version;
name = "way-cooler-with-extensions-${version}";
paths = [ way-cooler wc-bg wc-grab wc-lock wc-bar ];
diff --git a/pkgs/applications/window-managers/way-cooler/wc-bg.nix b/pkgs/applications/window-managers/way-cooler/wc-bg.nix
index 4d527715c5f2..a797e7aacdef 100644
--- a/pkgs/applications/window-managers/way-cooler/wc-bg.nix
+++ b/pkgs/applications/window-managers/way-cooler/wc-bg.nix
@@ -508,7 +508,7 @@ rec {
inherit dependencies buildDependencies features;
};
ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {};
- ansi_term_0_9_0_features = f: updateFeatures f (rec {
+ ansi_term_0_9_0_features = f: updateFeatures f ({
ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true);
}) [];
atty_0_2_3 = { features?(atty_0_2_3_features {}) }: atty_0_2_3_ {
@@ -516,7 +516,7 @@ rec {
++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_32 ]) else [])
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
};
- atty_0_2_3_features = f: updateFeatures f (rec {
+ atty_0_2_3_features = f: updateFeatures f ({
atty_0_2_3.default = (f.atty_0_2_3.default or true);
kernel32_sys_0_2_2.default = true;
libc_0_2_32.default = (f.libc_0_2_32.default or false);
@@ -524,7 +524,7 @@ rec {
winapi_0_2_8.default = true;
}) [ termion_1_5_1_features libc_0_2_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {};
- bitflags_0_7_0_features = f: updateFeatures f (rec {
+ bitflags_0_7_0_features = f: updateFeatures f ({
bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true);
}) [];
bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ {
@@ -631,25 +631,25 @@ rec {
dependencies = mapFeatures features ([ either_1_2_0 scopeguard_0_3_2 ]);
features = mkFeatures (features.coco_0_1_1 or {});
};
- coco_0_1_1_features = f: updateFeatures f (rec {
+ coco_0_1_1_features = f: updateFeatures f ({
coco_0_1_1.default = (f.coco_0_1_1.default or true);
either_1_2_0.default = true;
scopeguard_0_3_2.default = true;
}) [ either_1_2_0_features scopeguard_0_3_2_features ];
color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {};
- color_quant_1_0_0_features = f: updateFeatures f (rec {
+ color_quant_1_0_0_features = f: updateFeatures f ({
color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true);
}) [];
dlib_0_3_1 = { features?(dlib_0_3_1_features {}) }: dlib_0_3_1_ {
dependencies = mapFeatures features ([ libloading_0_3_4 ]);
features = mkFeatures (features.dlib_0_3_1 or {});
};
- dlib_0_3_1_features = f: updateFeatures f (rec {
+ dlib_0_3_1_features = f: updateFeatures f ({
dlib_0_3_1.default = (f.dlib_0_3_1.default or true);
libloading_0_3_4.default = true;
}) [ libloading_0_3_4_features ];
dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {};
- dtoa_0_4_2_features = f: updateFeatures f (rec {
+ dtoa_0_4_2_features = f: updateFeatures f ({
dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true);
}) [];
either_1_2_0 = { features?(either_1_2_0_features {}) }: either_1_2_0_ {
@@ -665,7 +665,7 @@ rec {
enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ {
dependencies = mapFeatures features ([ num_traits_0_1_40 ]);
};
- enum_primitive_0_1_1_features = f: updateFeatures f (rec {
+ enum_primitive_0_1_1_features = f: updateFeatures f ({
enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true);
num_traits_0_1_40.default = (f.num_traits_0_1_40.default or false);
}) [ num_traits_0_1_40_features ];
@@ -698,14 +698,14 @@ rec {
fuchsia_zircon_0_2_1 = { features?(fuchsia_zircon_0_2_1_features {}) }: fuchsia_zircon_0_2_1_ {
dependencies = mapFeatures features ([ fuchsia_zircon_sys_0_2_0 ]);
};
- fuchsia_zircon_0_2_1_features = f: updateFeatures f (rec {
+ fuchsia_zircon_0_2_1_features = f: updateFeatures f ({
fuchsia_zircon_0_2_1.default = (f.fuchsia_zircon_0_2_1.default or true);
fuchsia_zircon_sys_0_2_0.default = true;
}) [ fuchsia_zircon_sys_0_2_0_features ];
fuchsia_zircon_sys_0_2_0 = { features?(fuchsia_zircon_sys_0_2_0_features {}) }: fuchsia_zircon_sys_0_2_0_ {
dependencies = mapFeatures features ([ bitflags_0_7_0 ]);
};
- fuchsia_zircon_sys_0_2_0_features = f: updateFeatures f (rec {
+ fuchsia_zircon_sys_0_2_0_features = f: updateFeatures f ({
bitflags_0_7_0.default = true;
fuchsia_zircon_sys_0_2_0.default = (f.fuchsia_zircon_sys_0_2_0.default or true);
}) [ bitflags_0_7_0_features ];
@@ -741,7 +741,7 @@ rec {
lzw_0_10_0.default = true;
}) [ color_quant_1_0_0_features lzw_0_10_0_features ];
glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {};
- glob_0_2_11_features = f: updateFeatures f (rec {
+ glob_0_2_11_features = f: updateFeatures f ({
glob_0_2_11.default = (f.glob_0_2_11.default or true);
}) [];
image_0_10_4 = { features?(image_0_10_4_features {}) }: image_0_10_4_ {
@@ -828,13 +828,13 @@ rec {
inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ {
features = mkFeatures (features.inflate_0_1_1 or {});
};
- inflate_0_1_1_features = f: updateFeatures f (rec {
+ inflate_0_1_1_features = f: updateFeatures f ({
inflate_0_1_1.default = (f.inflate_0_1_1.default or true);
}) [];
itoa_0_3_4 = { features?(itoa_0_3_4_features {}) }: itoa_0_3_4_ {
features = mkFeatures (features.itoa_0_3_4 or {});
};
- itoa_0_3_4_features = f: updateFeatures f (rec {
+ itoa_0_3_4_features = f: updateFeatures f ({
itoa_0_3_4.default = (f.itoa_0_3_4.default or true);
}) [];
jpeg_decoder_0_1_13 = { features?(jpeg_decoder_0_1_13_features {}) }: jpeg_decoder_0_1_13_ {
@@ -855,7 +855,7 @@ rec {
dependencies = mapFeatures features ([ winapi_0_2_8 ]);
buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
};
- kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
+ kernel32_sys_0_2_2_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
winapi_0_2_8.default = true;
winapi_build_0_1_1.default = true;
@@ -890,7 +890,7 @@ rec {
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]);
};
- libloading_0_3_4_features = f: updateFeatures f (rec {
+ libloading_0_3_4_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = true;
lazy_static_0_2_9.default = true;
libloading_0_3_4.default = (f.libloading_0_3_4.default or true);
@@ -911,7 +911,7 @@ rec {
dependencies = mapFeatures features ([ libc_0_2_32 ]);
buildDependencies = mapFeatures features ([ cc_1_0_0 ]);
};
- miniz_sys_0_1_10_features = f: updateFeatures f (rec {
+ miniz_sys_0_1_10_features = f: updateFeatures f ({
cc_1_0_0.default = true;
libc_0_2_32.default = true;
miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true);
@@ -940,14 +940,14 @@ rec {
num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ {
dependencies = mapFeatures features ([ num_traits_0_1_40 ]);
};
- num_integer_0_1_35_features = f: updateFeatures f (rec {
+ num_integer_0_1_35_features = f: updateFeatures f ({
num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true);
num_traits_0_1_40.default = true;
}) [ num_traits_0_1_40_features ];
num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ {
dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ]);
};
- num_iter_0_1_34_features = f: updateFeatures f (rec {
+ num_iter_0_1_34_features = f: updateFeatures f ({
num_integer_0_1_35.default = true;
num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true);
num_traits_0_1_40.default = true;
@@ -978,13 +978,13 @@ rec {
rustc_serialize_0_3_24.default = true;
}) [ num_bigint_0_1_40_features num_integer_0_1_35_features num_traits_0_1_40_features rustc_serialize_0_3_24_features ];
num_traits_0_1_40 = { features?(num_traits_0_1_40_features {}) }: num_traits_0_1_40_ {};
- num_traits_0_1_40_features = f: updateFeatures f (rec {
+ num_traits_0_1_40_features = f: updateFeatures f ({
num_traits_0_1_40.default = (f.num_traits_0_1_40.default or true);
}) [];
num_cpus_1_7_0 = { features?(num_cpus_1_7_0_features {}) }: num_cpus_1_7_0_ {
dependencies = mapFeatures features ([ libc_0_2_32 ]);
};
- num_cpus_1_7_0_features = f: updateFeatures f (rec {
+ num_cpus_1_7_0_features = f: updateFeatures f ({
libc_0_2_32.default = true;
num_cpus_1_7_0.default = (f.num_cpus_1_7_0.default or true);
}) [ libc_0_2_32_features ];
@@ -1007,7 +1007,7 @@ rec {
phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ {
dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]);
};
- phf_codegen_0_7_21_features = f: updateFeatures f (rec {
+ phf_codegen_0_7_21_features = f: updateFeatures f ({
phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true);
phf_generator_0_7_21.default = true;
phf_shared_0_7_21.default = true;
@@ -1015,7 +1015,7 @@ rec {
phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ {
dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_17 ]);
};
- phf_generator_0_7_21_features = f: updateFeatures f (rec {
+ phf_generator_0_7_21_features = f: updateFeatures f ({
phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true);
phf_shared_0_7_21.default = true;
rand_0_3_17.default = true;
@@ -1024,7 +1024,7 @@ rec {
dependencies = mapFeatures features ([ siphasher_0_2_2 ]);
features = mkFeatures (features.phf_shared_0_7_21 or {});
};
- phf_shared_0_7_21_features = f: updateFeatures f (rec {
+ phf_shared_0_7_21_features = f: updateFeatures f ({
phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true);
siphasher_0_2_2.default = true;
}) [ siphasher_0_2_2_features ];
@@ -1065,14 +1065,14 @@ rec {
rayon_0_8_2 = { features?(rayon_0_8_2_features {}) }: rayon_0_8_2_ {
dependencies = mapFeatures features ([ rayon_core_1_2_1 ]);
};
- rayon_0_8_2_features = f: updateFeatures f (rec {
+ rayon_0_8_2_features = f: updateFeatures f ({
rayon_0_8_2.default = (f.rayon_0_8_2.default or true);
rayon_core_1_2_1.default = true;
}) [ rayon_core_1_2_1_features ];
rayon_core_1_2_1 = { features?(rayon_core_1_2_1_features {}) }: rayon_core_1_2_1_ {
dependencies = mapFeatures features ([ coco_0_1_1 futures_0_1_16 lazy_static_0_2_9 libc_0_2_32 num_cpus_1_7_0 rand_0_3_17 ]);
};
- rayon_core_1_2_1_features = f: updateFeatures f (rec {
+ rayon_core_1_2_1_features = f: updateFeatures f ({
coco_0_1_1.default = true;
futures_0_1_16.default = true;
lazy_static_0_2_9.default = true;
@@ -1082,24 +1082,24 @@ rec {
rayon_core_1_2_1.default = (f.rayon_core_1_2_1.default or true);
}) [ coco_0_1_1_features futures_0_1_16_features lazy_static_0_2_9_features libc_0_2_32_features num_cpus_1_7_0_features rand_0_3_17_features ];
redox_syscall_0_1_31 = { features?(redox_syscall_0_1_31_features {}) }: redox_syscall_0_1_31_ {};
- redox_syscall_0_1_31_features = f: updateFeatures f (rec {
+ redox_syscall_0_1_31_features = f: updateFeatures f ({
redox_syscall_0_1_31.default = (f.redox_syscall_0_1_31.default or true);
}) [];
redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ {
dependencies = mapFeatures features ([ redox_syscall_0_1_31 ]);
};
- redox_termios_0_1_1_features = f: updateFeatures f (rec {
+ redox_termios_0_1_1_features = f: updateFeatures f ({
redox_syscall_0_1_31.default = true;
redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true);
}) [ redox_syscall_0_1_31_features ];
rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {};
- rustc_serialize_0_3_24_features = f: updateFeatures f (rec {
+ rustc_serialize_0_3_24_features = f: updateFeatures f ({
rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true);
}) [];
scoped_threadpool_0_1_8 = { features?(scoped_threadpool_0_1_8_features {}) }: scoped_threadpool_0_1_8_ {
features = mkFeatures (features.scoped_threadpool_0_1_8 or {});
};
- scoped_threadpool_0_1_8_features = f: updateFeatures f (rec {
+ scoped_threadpool_0_1_8_features = f: updateFeatures f ({
scoped_threadpool_0_1_8.default = (f.scoped_threadpool_0_1_8.default or true);
}) [];
scopeguard_0_3_2 = { features?(scopeguard_0_3_2_features {}) }: scopeguard_0_3_2_ {
@@ -1159,11 +1159,11 @@ rec {
siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ {
dependencies = mapFeatures features ([]);
};
- siphasher_0_2_2_features = f: updateFeatures f (rec {
+ siphasher_0_2_2_features = f: updateFeatures f ({
siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true);
}) [];
strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {};
- strsim_0_6_0_features = f: updateFeatures f (rec {
+ strsim_0_6_0_features = f: updateFeatures f ({
strsim_0_6_0.default = (f.strsim_0_6_0.default or true);
}) [];
target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ {
@@ -1188,7 +1188,7 @@ rec {
++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_32 ]) else [])
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
};
- tempfile_2_2_0_features = f: updateFeatures f (rec {
+ tempfile_2_2_0_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = true;
libc_0_2_32.default = true;
rand_0_3_17.default = true;
@@ -1226,7 +1226,7 @@ rec {
dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_32 ]) else [])
++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_31 redox_termios_0_1_1 ]) else []);
};
- termion_1_5_1_features = f: updateFeatures f (rec {
+ termion_1_5_1_features = f: updateFeatures f ({
libc_0_2_32.default = true;
redox_syscall_0_1_31.default = true;
redox_termios_0_1_1.default = true;
@@ -1235,7 +1235,7 @@ rec {
textwrap_0_8_0 = { features?(textwrap_0_8_0_features {}) }: textwrap_0_8_0_ {
dependencies = mapFeatures features ([ term_size_0_3_0 unicode_width_0_1_4 ]);
};
- textwrap_0_8_0_features = f: updateFeatures f (rec {
+ textwrap_0_8_0_features = f: updateFeatures f ({
term_size_0_3_0.default = true;
textwrap_0_8_0.default = (f.textwrap_0_8_0.default or true);
unicode_width_0_1_4.default = true;
@@ -1243,7 +1243,7 @@ rec {
unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
features = mkFeatures (features.unicode_width_0_1_4 or {});
};
- unicode_width_0_1_4_features = f: updateFeatures f (rec {
+ unicode_width_0_1_4_features = f: updateFeatures f ({
unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
}) [];
vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ {
@@ -1264,7 +1264,7 @@ rec {
way_cooler_client_helpers_0_1_0 = { features?(way_cooler_client_helpers_0_1_0_features {}) }: way_cooler_client_helpers_0_1_0_ {
dependencies = mapFeatures features ([ wayland_client_0_9_10 wayland_sys_0_9_10 ]);
};
- way_cooler_client_helpers_0_1_0_features = f: updateFeatures f (rec {
+ way_cooler_client_helpers_0_1_0_features = f: updateFeatures f ({
way_cooler_client_helpers_0_1_0.default = (f.way_cooler_client_helpers_0_1_0.default or true);
wayland_client_0_9_10.cursor = true;
wayland_client_0_9_10.default = true;
@@ -1309,7 +1309,7 @@ rec {
wayland_scanner_0_9_10 = { features?(wayland_scanner_0_9_10_features {}) }: wayland_scanner_0_9_10_ {
dependencies = mapFeatures features ([ xml_rs_0_6_1 ]);
};
- wayland_scanner_0_9_10_features = f: updateFeatures f (rec {
+ wayland_scanner_0_9_10_features = f: updateFeatures f ({
wayland_scanner_0_9_10.default = (f.wayland_scanner_0_9_10.default or true);
xml_rs_0_6_1.default = true;
}) [ xml_rs_0_6_1_features ];
@@ -1339,7 +1339,7 @@ rec {
dependencies = mapFeatures features ([ byteorder_0_5_3 clap_2_26_2 image_0_10_4 tempfile_2_2_0 way_cooler_client_helpers_0_1_0 wayland_client_0_9_10 wayland_sys_0_9_10 ]);
buildDependencies = mapFeatures features ([ wayland_scanner_0_9_10 ]);
};
- wc_bg_0_3_0_features = f: updateFeatures f (rec {
+ wc_bg_0_3_0_features = f: updateFeatures f ({
byteorder_0_5_3.default = true;
clap_2_26_2.default = true;
image_0_10_4.default = true;
@@ -1355,17 +1355,17 @@ rec {
wc_bg_0_3_0.default = (f.wc_bg_0_3_0.default or true);
}) [ byteorder_0_5_3_features clap_2_26_2_features image_0_10_4_features tempfile_2_2_0_features way_cooler_client_helpers_0_1_0_features wayland_client_0_9_10_features wayland_sys_0_9_10_features wayland_scanner_0_9_10_features ];
winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
- winapi_0_2_8_features = f: updateFeatures f (rec {
+ winapi_0_2_8_features = f: updateFeatures f ({
winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
}) [];
winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
- winapi_build_0_1_1_features = f: updateFeatures f (rec {
+ winapi_build_0_1_1_features = f: updateFeatures f ({
winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
}) [];
xml_rs_0_6_1 = { features?(xml_rs_0_6_1_features {}) }: xml_rs_0_6_1_ {
dependencies = mapFeatures features ([ bitflags_0_9_1 ]);
};
- xml_rs_0_6_1_features = f: updateFeatures f (rec {
+ xml_rs_0_6_1_features = f: updateFeatures f ({
bitflags_0_9_1.default = true;
xml_rs_0_6_1.default = (f.xml_rs_0_6_1.default or true);
}) [ bitflags_0_9_1_features ];
diff --git a/pkgs/applications/window-managers/way-cooler/wc-grab.nix b/pkgs/applications/window-managers/way-cooler/wc-grab.nix
index 6f936eb2e432..3264357b2fdb 100644
--- a/pkgs/applications/window-managers/way-cooler/wc-grab.nix
+++ b/pkgs/applications/window-managers/way-cooler/wc-grab.nix
@@ -305,25 +305,25 @@ rec {
inherit dependencies buildDependencies features;
};
adler32_1_0_0 = { features?(adler32_1_0_0_features {}) }: adler32_1_0_0_ {};
- adler32_1_0_0_features = f: updateFeatures f (rec {
+ adler32_1_0_0_features = f: updateFeatures f ({
adler32_1_0_0.default = (f.adler32_1_0_0.default or true);
}) [];
ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {};
- ansi_term_0_9_0_features = f: updateFeatures f (rec {
+ ansi_term_0_9_0_features = f: updateFeatures f ({
ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true);
}) [];
atty_0_2_2 = { features?(atty_0_2_2_features {}) }: atty_0_2_2_ {
dependencies = (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_21 ]) else [])
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
};
- atty_0_2_2_features = f: updateFeatures f (rec {
+ atty_0_2_2_features = f: updateFeatures f ({
atty_0_2_2.default = (f.atty_0_2_2.default or true);
kernel32_sys_0_2_2.default = true;
libc_0_2_21.default = true;
winapi_0_2_8.default = true;
}) [ libc_0_2_21_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {};
- bitflags_0_7_0_features = f: updateFeatures f (rec {
+ bitflags_0_7_0_features = f: updateFeatures f ({
bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true);
}) [];
bitflags_0_8_0 = { features?(bitflags_0_8_0_features {}) }: bitflags_0_8_0_ {
@@ -402,7 +402,7 @@ rec {
vec_map_0_7_0.default = true;
}) [ ansi_term_0_9_0_features atty_0_2_2_features bitflags_0_8_0_features strsim_0_6_0_features term_size_0_2_3_features unicode_segmentation_1_1_0_features unicode_width_0_1_4_features vec_map_0_7_0_features ];
color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {};
- color_quant_1_0_0_features = f: updateFeatures f (rec {
+ color_quant_1_0_0_features = f: updateFeatures f ({
color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true);
}) [];
dbus_0_5_2 = { features?(dbus_0_5_2_features {}) }: dbus_0_5_2_ {
@@ -410,7 +410,7 @@ rec {
buildDependencies = mapFeatures features ([ metadeps_1_1_1 ]);
features = mkFeatures (features.dbus_0_5_2 or {});
};
- dbus_0_5_2_features = f: updateFeatures f (rec {
+ dbus_0_5_2_features = f: updateFeatures f ({
dbus_0_5_2.default = (f.dbus_0_5_2.default or true);
libc_0_2_21.default = true;
metadeps_1_1_1.default = true;
@@ -418,7 +418,7 @@ rec {
deflate_0_7_5 = { features?(deflate_0_7_5_features {}) }: deflate_0_7_5_ {
dependencies = mapFeatures features ([ adler32_1_0_0 byteorder_1_0_0 ]);
};
- deflate_0_7_5_features = f: updateFeatures f (rec {
+ deflate_0_7_5_features = f: updateFeatures f ({
adler32_1_0_0.default = true;
byteorder_1_0_0.default = true;
deflate_0_7_5.default = (f.deflate_0_7_5.default or true);
@@ -426,14 +426,14 @@ rec {
deque_0_3_1 = { features?(deque_0_3_1_features {}) }: deque_0_3_1_ {
dependencies = mapFeatures features ([ rand_0_3_15 ]);
};
- deque_0_3_1_features = f: updateFeatures f (rec {
+ deque_0_3_1_features = f: updateFeatures f ({
deque_0_3_1.default = (f.deque_0_3_1.default or true);
rand_0_3_15.default = true;
}) [ rand_0_3_15_features ];
enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ {
dependencies = mapFeatures features ([ num_traits_0_1_37 ]);
};
- enum_primitive_0_1_1_features = f: updateFeatures f (rec {
+ enum_primitive_0_1_1_features = f: updateFeatures f ({
enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true);
num_traits_0_1_37.default = (f.num_traits_0_1_37.default or false);
}) [ num_traits_0_1_37_features ];
@@ -470,7 +470,7 @@ rec {
lzw_0_10_0.default = true;
}) [ color_quant_1_0_0_features lzw_0_10_0_features ];
glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {};
- glob_0_2_11_features = f: updateFeatures f (rec {
+ glob_0_2_11_features = f: updateFeatures f ({
glob_0_2_11.default = (f.glob_0_2_11.default or true);
}) [];
image_0_12_3 = { features?(image_0_12_3_features {}) }: image_0_12_3_ {
@@ -557,7 +557,7 @@ rec {
inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ {
features = mkFeatures (features.inflate_0_1_1 or {});
};
- inflate_0_1_1_features = f: updateFeatures f (rec {
+ inflate_0_1_1_features = f: updateFeatures f ({
inflate_0_1_1.default = (f.inflate_0_1_1.default or true);
}) [];
jpeg_decoder_0_1_11 = { features?(jpeg_decoder_0_1_11_features {}) }: jpeg_decoder_0_1_11_ {
@@ -578,7 +578,7 @@ rec {
dependencies = mapFeatures features ([ winapi_0_2_8 ]);
buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
};
- kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
+ kernel32_sys_0_2_2_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
winapi_0_2_8.default = true;
winapi_build_0_1_1.default = true;
@@ -606,7 +606,7 @@ rec {
metadeps_1_1_1 = { features?(metadeps_1_1_1_features {}) }: metadeps_1_1_1_ {
dependencies = mapFeatures features ([ error_chain_0_7_2 pkg_config_0_3_9 toml_0_2_1 ]);
};
- metadeps_1_1_1_features = f: updateFeatures f (rec {
+ metadeps_1_1_1_features = f: updateFeatures f ({
error_chain_0_7_2.default = (f.error_chain_0_7_2.default or false);
metadeps_1_1_1.default = (f.metadeps_1_1_1.default or true);
pkg_config_0_3_9.default = true;
@@ -615,14 +615,14 @@ rec {
num_integer_0_1_33 = { features?(num_integer_0_1_33_features {}) }: num_integer_0_1_33_ {
dependencies = mapFeatures features ([ num_traits_0_1_37 ]);
};
- num_integer_0_1_33_features = f: updateFeatures f (rec {
+ num_integer_0_1_33_features = f: updateFeatures f ({
num_integer_0_1_33.default = (f.num_integer_0_1_33.default or true);
num_traits_0_1_37.default = true;
}) [ num_traits_0_1_37_features ];
num_iter_0_1_33 = { features?(num_iter_0_1_33_features {}) }: num_iter_0_1_33_ {
dependencies = mapFeatures features ([ num_integer_0_1_33 num_traits_0_1_37 ]);
};
- num_iter_0_1_33_features = f: updateFeatures f (rec {
+ num_iter_0_1_33_features = f: updateFeatures f ({
num_integer_0_1_33.default = true;
num_iter_0_1_33.default = (f.num_iter_0_1_33.default or true);
num_traits_0_1_37.default = true;
@@ -649,18 +649,18 @@ rec {
num_traits_0_1_37.default = true;
}) [ num_integer_0_1_33_features num_traits_0_1_37_features ];
num_traits_0_1_37 = { features?(num_traits_0_1_37_features {}) }: num_traits_0_1_37_ {};
- num_traits_0_1_37_features = f: updateFeatures f (rec {
+ num_traits_0_1_37_features = f: updateFeatures f ({
num_traits_0_1_37.default = (f.num_traits_0_1_37.default or true);
}) [];
num_cpus_1_3_0 = { features?(num_cpus_1_3_0_features {}) }: num_cpus_1_3_0_ {
dependencies = mapFeatures features ([ libc_0_2_21 ]);
};
- num_cpus_1_3_0_features = f: updateFeatures f (rec {
+ num_cpus_1_3_0_features = f: updateFeatures f ({
libc_0_2_21.default = true;
num_cpus_1_3_0.default = (f.num_cpus_1_3_0.default or true);
}) [ libc_0_2_21_features ];
pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {};
- pkg_config_0_3_9_features = f: updateFeatures f (rec {
+ pkg_config_0_3_9_features = f: updateFeatures f ({
pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true);
}) [];
png_0_6_2 = { features?(png_0_6_2_features {}) }: png_0_6_2_ {
@@ -686,7 +686,7 @@ rec {
rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ {
dependencies = mapFeatures features ([ libc_0_2_21 ]);
};
- rand_0_3_15_features = f: updateFeatures f (rec {
+ rand_0_3_15_features = f: updateFeatures f ({
libc_0_2_21.default = true;
rand_0_3_15.default = (f.rand_0_3_15.default or true);
}) [ libc_0_2_21_features ];
@@ -694,7 +694,7 @@ rec {
dependencies = mapFeatures features ([ deque_0_3_1 libc_0_2_21 num_cpus_1_3_0 rand_0_3_15 ]);
features = mkFeatures (features.rayon_0_6_0 or {});
};
- rayon_0_6_0_features = f: updateFeatures f (rec {
+ rayon_0_6_0_features = f: updateFeatures f ({
deque_0_3_1.default = true;
libc_0_2_21.default = true;
num_cpus_1_3_0.default = true;
@@ -704,11 +704,11 @@ rec {
scoped_threadpool_0_1_7 = { features?(scoped_threadpool_0_1_7_features {}) }: scoped_threadpool_0_1_7_ {
features = mkFeatures (features.scoped_threadpool_0_1_7 or {});
};
- scoped_threadpool_0_1_7_features = f: updateFeatures f (rec {
+ scoped_threadpool_0_1_7_features = f: updateFeatures f ({
scoped_threadpool_0_1_7.default = (f.scoped_threadpool_0_1_7.default or true);
}) [];
strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {};
- strsim_0_6_0_features = f: updateFeatures f (rec {
+ strsim_0_6_0_features = f: updateFeatures f ({
strsim_0_6_0.default = (f.strsim_0_6_0.default or true);
}) [];
term_size_0_2_3 = { features?(term_size_0_2_3_features {}) }: term_size_0_2_3_ {
@@ -750,13 +750,13 @@ rec {
unicode_segmentation_1_1_0 = { features?(unicode_segmentation_1_1_0_features {}) }: unicode_segmentation_1_1_0_ {
features = mkFeatures (features.unicode_segmentation_1_1_0 or {});
};
- unicode_segmentation_1_1_0_features = f: updateFeatures f (rec {
+ unicode_segmentation_1_1_0_features = f: updateFeatures f ({
unicode_segmentation_1_1_0.default = (f.unicode_segmentation_1_1_0.default or true);
}) [];
unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
features = mkFeatures (features.unicode_width_0_1_4 or {});
};
- unicode_width_0_1_4_features = f: updateFeatures f (rec {
+ unicode_width_0_1_4_features = f: updateFeatures f ({
unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
}) [];
vec_map_0_7_0 = { features?(vec_map_0_7_0_features {}) }: vec_map_0_7_0_ {
@@ -777,18 +777,18 @@ rec {
wc_grab_0_3_0 = { features?(wc_grab_0_3_0_features {}) }: wc_grab_0_3_0_ {
dependencies = mapFeatures features ([ clap_2_22_0 dbus_0_5_2 image_0_12_3 ]);
};
- wc_grab_0_3_0_features = f: updateFeatures f (rec {
+ wc_grab_0_3_0_features = f: updateFeatures f ({
clap_2_22_0.default = true;
dbus_0_5_2.default = true;
image_0_12_3.default = true;
wc_grab_0_3_0.default = (f.wc_grab_0_3_0.default or true);
}) [ clap_2_22_0_features dbus_0_5_2_features image_0_12_3_features ];
winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
- winapi_0_2_8_features = f: updateFeatures f (rec {
+ winapi_0_2_8_features = f: updateFeatures f ({
winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
}) [];
winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
- winapi_build_0_1_1_features = f: updateFeatures f (rec {
+ winapi_build_0_1_1_features = f: updateFeatures f ({
winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
}) [];
}
diff --git a/pkgs/applications/window-managers/way-cooler/wc-lock.nix b/pkgs/applications/window-managers/way-cooler/wc-lock.nix
index 1b9e3df3508e..6ffc5779a0b6 100644
--- a/pkgs/applications/window-managers/way-cooler/wc-lock.nix
+++ b/pkgs/applications/window-managers/way-cooler/wc-lock.nix
@@ -557,21 +557,21 @@ rec {
inherit dependencies buildDependencies features;
};
ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {};
- ansi_term_0_9_0_features = f: updateFeatures f (rec {
+ ansi_term_0_9_0_features = f: updateFeatures f ({
ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true);
}) [];
atty_0_2_2 = { features?(atty_0_2_2_features {}) }: atty_0_2_2_ {
dependencies = (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_23 ]) else [])
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
};
- atty_0_2_2_features = f: updateFeatures f (rec {
+ atty_0_2_2_features = f: updateFeatures f ({
atty_0_2_2.default = (f.atty_0_2_2.default or true);
kernel32_sys_0_2_2.default = true;
libc_0_2_23.default = true;
winapi_0_2_8.default = true;
}) [ libc_0_2_23_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {};
- bitflags_0_7_0_features = f: updateFeatures f (rec {
+ bitflags_0_7_0_features = f: updateFeatures f ({
bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true);
}) [];
bitflags_0_8_2 = { features?(bitflags_0_8_2_features {}) }: bitflags_0_8_2_ {
@@ -674,20 +674,20 @@ rec {
dependencies = mapFeatures features ([ either_1_2_0 scopeguard_0_3_2 ]);
features = mkFeatures (features.coco_0_1_1 or {});
};
- coco_0_1_1_features = f: updateFeatures f (rec {
+ coco_0_1_1_features = f: updateFeatures f ({
coco_0_1_1.default = (f.coco_0_1_1.default or true);
either_1_2_0.default = true;
scopeguard_0_3_2.default = true;
}) [ either_1_2_0_features scopeguard_0_3_2_features ];
color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {};
- color_quant_1_0_0_features = f: updateFeatures f (rec {
+ color_quant_1_0_0_features = f: updateFeatures f ({
color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true);
}) [];
dbus_0_5_4 = { features?(dbus_0_5_4_features {}) }: dbus_0_5_4_ {
dependencies = mapFeatures features ([ libc_0_2_23 libdbus_sys_0_1_1 ]);
features = mkFeatures (features.dbus_0_5_4 or {});
};
- dbus_0_5_4_features = f: updateFeatures f (rec {
+ dbus_0_5_4_features = f: updateFeatures f ({
dbus_0_5_4.default = (f.dbus_0_5_4.default or true);
libc_0_2_23.default = true;
libdbus_sys_0_1_1.default = true;
@@ -696,12 +696,12 @@ rec {
dependencies = mapFeatures features ([ libloading_0_3_4 ]);
features = mkFeatures (features.dlib_0_3_1 or {});
};
- dlib_0_3_1_features = f: updateFeatures f (rec {
+ dlib_0_3_1_features = f: updateFeatures f ({
dlib_0_3_1.default = (f.dlib_0_3_1.default or true);
libloading_0_3_4.default = true;
}) [ libloading_0_3_4_features ];
dtoa_0_4_1 = { features?(dtoa_0_4_1_features {}) }: dtoa_0_4_1_ {};
- dtoa_0_4_1_features = f: updateFeatures f (rec {
+ dtoa_0_4_1_features = f: updateFeatures f ({
dtoa_0_4_1.default = (f.dtoa_0_4_1.default or true);
}) [];
either_1_2_0 = { features?(either_1_2_0_features {}) }: either_1_2_0_ {
@@ -717,7 +717,7 @@ rec {
enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ {
dependencies = mapFeatures features ([ num_traits_0_1_37 ]);
};
- enum_primitive_0_1_1_features = f: updateFeatures f (rec {
+ enum_primitive_0_1_1_features = f: updateFeatures f ({
enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true);
num_traits_0_1_37.default = (f.num_traits_0_1_37.default or false);
}) [ num_traits_0_1_37_features ];
@@ -765,7 +765,7 @@ rec {
fs2_0_2_5 = { features?(fs2_0_2_5_features {}) }: fs2_0_2_5_ {
dependencies = mapFeatures features ([ kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]);
};
- fs2_0_2_5_features = f: updateFeatures f (rec {
+ fs2_0_2_5_features = f: updateFeatures f ({
fs2_0_2_5.default = (f.fs2_0_2_5.default or true);
kernel32_sys_0_2_2.default = true;
libc_0_2_23.default = true;
@@ -814,7 +814,7 @@ rec {
lzw_0_10_0.default = true;
}) [ color_quant_1_0_0_features lzw_0_10_0_features ];
glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {};
- glob_0_2_11_features = f: updateFeatures f (rec {
+ glob_0_2_11_features = f: updateFeatures f ({
glob_0_2_11.default = (f.glob_0_2_11.default or true);
}) [];
image_0_10_4 = { features?(image_0_10_4_features {}) }: image_0_10_4_ {
@@ -901,11 +901,11 @@ rec {
inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ {
features = mkFeatures (features.inflate_0_1_1 or {});
};
- inflate_0_1_1_features = f: updateFeatures f (rec {
+ inflate_0_1_1_features = f: updateFeatures f ({
inflate_0_1_1.default = (f.inflate_0_1_1.default or true);
}) [];
itoa_0_3_1 = { features?(itoa_0_3_1_features {}) }: itoa_0_3_1_ {};
- itoa_0_3_1_features = f: updateFeatures f (rec {
+ itoa_0_3_1_features = f: updateFeatures f ({
itoa_0_3_1.default = (f.itoa_0_3_1.default or true);
}) [];
jpeg_decoder_0_1_13 = { features?(jpeg_decoder_0_1_13_features {}) }: jpeg_decoder_0_1_13_ {
@@ -926,7 +926,7 @@ rec {
dependencies = mapFeatures features ([ winapi_0_2_8 ]);
buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
};
- kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
+ kernel32_sys_0_2_2_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
winapi_0_2_8.default = true;
winapi_build_0_1_1.default = true;
@@ -958,7 +958,7 @@ rec {
}) [];
libdbus_sys_0_1_1 = { features?(libdbus_sys_0_1_1_features {}) }: libdbus_sys_0_1_1_ {
buildDependencies = mapFeatures features ([ metadeps_1_1_2 ]);};
- libdbus_sys_0_1_1_features = f: updateFeatures f (rec {
+ libdbus_sys_0_1_1_features = f: updateFeatures f ({
libdbus_sys_0_1_1.default = (f.libdbus_sys_0_1_1.default or true);
metadeps_1_1_2.default = true;
}) [ metadeps_1_1_2_features ];
@@ -967,7 +967,7 @@ rec {
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]);
};
- libloading_0_3_4_features = f: updateFeatures f (rec {
+ libloading_0_3_4_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = true;
lazy_static_0_2_8.default = true;
libloading_0_3_4.default = (f.libloading_0_3_4.default or true);
@@ -987,7 +987,7 @@ rec {
memmap_0_4_0 = { features?(memmap_0_4_0_features {}) }: memmap_0_4_0_ {
dependencies = mapFeatures features ([ fs2_0_2_5 kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]);
};
- memmap_0_4_0_features = f: updateFeatures f (rec {
+ memmap_0_4_0_features = f: updateFeatures f ({
fs2_0_2_5.default = true;
kernel32_sys_0_2_2.default = true;
libc_0_2_23.default = true;
@@ -997,7 +997,7 @@ rec {
metadeps_1_1_2 = { features?(metadeps_1_1_2_features {}) }: metadeps_1_1_2_ {
dependencies = mapFeatures features ([ error_chain_0_10_0 pkg_config_0_3_9 toml_0_2_1 ]);
};
- metadeps_1_1_2_features = f: updateFeatures f (rec {
+ metadeps_1_1_2_features = f: updateFeatures f ({
error_chain_0_10_0.default = (f.error_chain_0_10_0.default or false);
metadeps_1_1_2.default = (f.metadeps_1_1_2.default or true);
pkg_config_0_3_9.default = true;
@@ -1007,7 +1007,7 @@ rec {
dependencies = mapFeatures features ([ libc_0_2_23 ]);
buildDependencies = mapFeatures features ([ cc_1_0_0 ]);
};
- miniz_sys_0_1_10_features = f: updateFeatures f (rec {
+ miniz_sys_0_1_10_features = f: updateFeatures f ({
cc_1_0_0.default = true;
libc_0_2_23.default = true;
miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true);
@@ -1036,14 +1036,14 @@ rec {
num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ {
dependencies = mapFeatures features ([ num_traits_0_1_37 ]);
};
- num_integer_0_1_35_features = f: updateFeatures f (rec {
+ num_integer_0_1_35_features = f: updateFeatures f ({
num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true);
num_traits_0_1_37.default = true;
}) [ num_traits_0_1_37_features ];
num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ {
dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_37 ]);
};
- num_iter_0_1_34_features = f: updateFeatures f (rec {
+ num_iter_0_1_34_features = f: updateFeatures f ({
num_integer_0_1_35.default = true;
num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true);
num_traits_0_1_37.default = true;
@@ -1074,13 +1074,13 @@ rec {
rustc_serialize_0_3_24.default = true;
}) [ num_bigint_0_1_40_features num_integer_0_1_35_features num_traits_0_1_37_features rustc_serialize_0_3_24_features ];
num_traits_0_1_37 = { features?(num_traits_0_1_37_features {}) }: num_traits_0_1_37_ {};
- num_traits_0_1_37_features = f: updateFeatures f (rec {
+ num_traits_0_1_37_features = f: updateFeatures f ({
num_traits_0_1_37.default = (f.num_traits_0_1_37.default or true);
}) [];
num_cpus_1_6_2 = { features?(num_cpus_1_6_2_features {}) }: num_cpus_1_6_2_ {
dependencies = mapFeatures features ([ libc_0_2_23 ]);
};
- num_cpus_1_6_2_features = f: updateFeatures f (rec {
+ num_cpus_1_6_2_features = f: updateFeatures f ({
libc_0_2_23.default = true;
num_cpus_1_6_2.default = (f.num_cpus_1_6_2.default or true);
}) [ libc_0_2_23_features ];
@@ -1103,7 +1103,7 @@ rec {
phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ {
dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]);
};
- phf_codegen_0_7_21_features = f: updateFeatures f (rec {
+ phf_codegen_0_7_21_features = f: updateFeatures f ({
phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true);
phf_generator_0_7_21.default = true;
phf_shared_0_7_21.default = true;
@@ -1111,7 +1111,7 @@ rec {
phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ {
dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_15 ]);
};
- phf_generator_0_7_21_features = f: updateFeatures f (rec {
+ phf_generator_0_7_21_features = f: updateFeatures f ({
phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true);
phf_shared_0_7_21.default = true;
rand_0_3_15.default = true;
@@ -1120,12 +1120,12 @@ rec {
dependencies = mapFeatures features ([ siphasher_0_2_2 ]);
features = mkFeatures (features.phf_shared_0_7_21 or {});
};
- phf_shared_0_7_21_features = f: updateFeatures f (rec {
+ phf_shared_0_7_21_features = f: updateFeatures f ({
phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true);
siphasher_0_2_2.default = true;
}) [ siphasher_0_2_2_features ];
pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {};
- pkg_config_0_3_9_features = f: updateFeatures f (rec {
+ pkg_config_0_3_9_features = f: updateFeatures f ({
pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true);
}) [];
png_0_5_2 = { features?(png_0_5_2_features {}) }: png_0_5_2_ {
@@ -1151,21 +1151,21 @@ rec {
rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ {
dependencies = mapFeatures features ([ libc_0_2_23 ]);
};
- rand_0_3_15_features = f: updateFeatures f (rec {
+ rand_0_3_15_features = f: updateFeatures f ({
libc_0_2_23.default = true;
rand_0_3_15.default = (f.rand_0_3_15.default or true);
}) [ libc_0_2_23_features ];
rayon_0_8_2 = { features?(rayon_0_8_2_features {}) }: rayon_0_8_2_ {
dependencies = mapFeatures features ([ rayon_core_1_2_1 ]);
};
- rayon_0_8_2_features = f: updateFeatures f (rec {
+ rayon_0_8_2_features = f: updateFeatures f ({
rayon_0_8_2.default = (f.rayon_0_8_2.default or true);
rayon_core_1_2_1.default = true;
}) [ rayon_core_1_2_1_features ];
rayon_core_1_2_1 = { features?(rayon_core_1_2_1_features {}) }: rayon_core_1_2_1_ {
dependencies = mapFeatures features ([ coco_0_1_1 futures_0_1_16 lazy_static_0_2_8 libc_0_2_23 num_cpus_1_6_2 rand_0_3_15 ]);
};
- rayon_core_1_2_1_features = f: updateFeatures f (rec {
+ rayon_core_1_2_1_features = f: updateFeatures f ({
coco_0_1_1.default = true;
futures_0_1_16.default = true;
lazy_static_0_2_8.default = true;
@@ -1175,20 +1175,20 @@ rec {
rayon_core_1_2_1.default = (f.rayon_core_1_2_1.default or true);
}) [ coco_0_1_1_features futures_0_1_16_features lazy_static_0_2_8_features libc_0_2_23_features num_cpus_1_6_2_features rand_0_3_15_features ];
rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {};
- rustc_serialize_0_3_24_features = f: updateFeatures f (rec {
+ rustc_serialize_0_3_24_features = f: updateFeatures f ({
rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true);
}) [];
rustc_version_0_1_7 = { features?(rustc_version_0_1_7_features {}) }: rustc_version_0_1_7_ {
dependencies = mapFeatures features ([ semver_0_1_20 ]);
};
- rustc_version_0_1_7_features = f: updateFeatures f (rec {
+ rustc_version_0_1_7_features = f: updateFeatures f ({
rustc_version_0_1_7.default = (f.rustc_version_0_1_7.default or true);
semver_0_1_20.default = true;
}) [ semver_0_1_20_features ];
scoped_threadpool_0_1_8 = { features?(scoped_threadpool_0_1_8_features {}) }: scoped_threadpool_0_1_8_ {
features = mkFeatures (features.scoped_threadpool_0_1_8 or {});
};
- scoped_threadpool_0_1_8_features = f: updateFeatures f (rec {
+ scoped_threadpool_0_1_8_features = f: updateFeatures f ({
scoped_threadpool_0_1_8.default = (f.scoped_threadpool_0_1_8.default or true);
}) [];
scopeguard_0_3_2 = { features?(scopeguard_0_3_2_features {}) }: scopeguard_0_3_2_ {
@@ -1202,7 +1202,7 @@ rec {
(scopeguard_0_3_2.default or false);
}) [];
semver_0_1_20 = { features?(semver_0_1_20_features {}) }: semver_0_1_20_ {};
- semver_0_1_20_features = f: updateFeatures f (rec {
+ semver_0_1_20_features = f: updateFeatures f ({
semver_0_1_20.default = (f.semver_0_1_20.default or true);
}) [];
serde_0_9_15 = { features?(serde_0_9_15_features {}) }: serde_0_9_15_ {
@@ -1252,11 +1252,11 @@ rec {
siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ {
dependencies = mapFeatures features ([]);
};
- siphasher_0_2_2_features = f: updateFeatures f (rec {
+ siphasher_0_2_2_features = f: updateFeatures f ({
siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true);
}) [];
strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {};
- strsim_0_6_0_features = f: updateFeatures f (rec {
+ strsim_0_6_0_features = f: updateFeatures f ({
strsim_0_6_0.default = (f.strsim_0_6_0.default or true);
}) [];
target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ {
@@ -1281,7 +1281,7 @@ rec {
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
buildDependencies = mapFeatures features ([ rustc_version_0_1_7 ]);
};
- tempfile_2_1_5_features = f: updateFeatures f (rec {
+ tempfile_2_1_5_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = true;
libc_0_2_23.default = true;
rand_0_3_15.default = true;
@@ -1328,13 +1328,13 @@ rec {
unicode_segmentation_1_2_0 = { features?(unicode_segmentation_1_2_0_features {}) }: unicode_segmentation_1_2_0_ {
features = mkFeatures (features.unicode_segmentation_1_2_0 or {});
};
- unicode_segmentation_1_2_0_features = f: updateFeatures f (rec {
+ unicode_segmentation_1_2_0_features = f: updateFeatures f ({
unicode_segmentation_1_2_0.default = (f.unicode_segmentation_1_2_0.default or true);
}) [];
unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
features = mkFeatures (features.unicode_width_0_1_4 or {});
};
- unicode_width_0_1_4_features = f: updateFeatures f (rec {
+ unicode_width_0_1_4_features = f: updateFeatures f ({
unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
}) [];
vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ {
@@ -1355,7 +1355,7 @@ rec {
way_cooler_client_helpers_0_1_0 = { features?(way_cooler_client_helpers_0_1_0_features {}) }: way_cooler_client_helpers_0_1_0_ {
dependencies = mapFeatures features ([ wayland_client_0_9_6 wayland_sys_0_9_6 ]);
};
- way_cooler_client_helpers_0_1_0_features = f: updateFeatures f (rec {
+ way_cooler_client_helpers_0_1_0_features = f: updateFeatures f ({
way_cooler_client_helpers_0_1_0.default = (f.way_cooler_client_helpers_0_1_0.default or true);
wayland_client_0_9_6.cursor = true;
wayland_client_0_9_6.default = true;
@@ -1400,7 +1400,7 @@ rec {
wayland_kbd_0_9_0 = { features?(wayland_kbd_0_9_0_features {}) }: wayland_kbd_0_9_0_ {
dependencies = mapFeatures features ([ bitflags_0_7_0 dlib_0_3_1 lazy_static_0_2_8 memmap_0_4_0 wayland_client_0_9_6 ]);
};
- wayland_kbd_0_9_0_features = f: updateFeatures f (rec {
+ wayland_kbd_0_9_0_features = f: updateFeatures f ({
bitflags_0_7_0.default = true;
dlib_0_3_1.default = true;
lazy_static_0_2_8.default = true;
@@ -1411,7 +1411,7 @@ rec {
wayland_scanner_0_9_6 = { features?(wayland_scanner_0_9_6_features {}) }: wayland_scanner_0_9_6_ {
dependencies = mapFeatures features ([ xml_rs_0_3_6 ]);
};
- wayland_scanner_0_9_6_features = f: updateFeatures f (rec {
+ wayland_scanner_0_9_6_features = f: updateFeatures f ({
wayland_scanner_0_9_6.default = (f.wayland_scanner_0_9_6.default or true);
xml_rs_0_3_6.default = true;
}) [ xml_rs_0_3_6_features ];
@@ -1441,7 +1441,7 @@ rec {
dependencies = mapFeatures features ([ byteorder_0_5_3 clap_2_24_2 dbus_0_5_4 image_0_10_4 libc_0_2_23 rand_0_3_15 tempfile_2_1_5 way_cooler_client_helpers_0_1_0 wayland_client_0_9_6 wayland_kbd_0_9_0 wayland_sys_0_9_6 ]);
buildDependencies = mapFeatures features ([ gcc_0_3_50 wayland_scanner_0_9_6 ]);
};
- wc_lock_0_2_1_features = f: updateFeatures f (rec {
+ wc_lock_0_2_1_features = f: updateFeatures f ({
byteorder_0_5_3.default = true;
clap_2_24_2.default = true;
dbus_0_5_4.default = true;
@@ -1462,17 +1462,17 @@ rec {
wc_lock_0_2_1.default = (f.wc_lock_0_2_1.default or true);
}) [ byteorder_0_5_3_features clap_2_24_2_features dbus_0_5_4_features image_0_10_4_features libc_0_2_23_features rand_0_3_15_features tempfile_2_1_5_features way_cooler_client_helpers_0_1_0_features wayland_client_0_9_6_features wayland_kbd_0_9_0_features wayland_sys_0_9_6_features gcc_0_3_50_features wayland_scanner_0_9_6_features ];
winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
- winapi_0_2_8_features = f: updateFeatures f (rec {
+ winapi_0_2_8_features = f: updateFeatures f ({
winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
}) [];
winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
- winapi_build_0_1_1_features = f: updateFeatures f (rec {
+ winapi_build_0_1_1_features = f: updateFeatures f ({
winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
}) [];
xml_rs_0_3_6 = { features?(xml_rs_0_3_6_features {}) }: xml_rs_0_3_6_ {
dependencies = mapFeatures features ([ bitflags_0_7_0 ]);
};
- xml_rs_0_3_6_features = f: updateFeatures f (rec {
+ xml_rs_0_3_6_features = f: updateFeatures f ({
bitflags_0_7_0.default = true;
xml_rs_0_3_6.default = (f.xml_rs_0_3_6.default or true);
}) [ bitflags_0_7_0_features ];
diff --git a/pkgs/applications/window-managers/way-cooler/wlc.nix b/pkgs/applications/window-managers/way-cooler/wlc.nix
index 3f2891ffd510..03d0b3023f71 100644
--- a/pkgs/applications/window-managers/way-cooler/wlc.nix
+++ b/pkgs/applications/window-managers/way-cooler/wlc.nix
@@ -6,7 +6,7 @@
}:
stdenv.mkDerivation rec {
- name = "wlc-${version}";
+ pname = "wlc";
version = "0.0.11";
src = fetchFromGitHub {
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index a88281369e8f..34ad2bcc732f 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig
, wayland, libGL, mesa, libxkbcommon, cairo, libxcb
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
-, colord, lcms2
+, colord, lcms2, pipewire ? null
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
, libwebp ? null, xwayland ? null, wayland-protocols
# beware of null defaults, as the parameters *are* supplied by callPackage by default
@@ -9,12 +9,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "weston-${version}";
- version = "6.0.1";
+ pname = "weston";
+ version = "7.0.0";
src = fetchurl {
- url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
- sha256 = "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz";
+ url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
+ sha256 = "0r4sj11hq4brv3ryrgp2wmkkfz1h59vh9ih18igzjibagch6s2m0";
};
nativeBuildInputs = [ meson ninja pkgconfig ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva
libwebp wayland-protocols
- colord lcms2
+ colord lcms2 pipewire
];
mesonFlags= [
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
"-Dbackend-rdp=${boolToString (freerdp != null)}"
"-Dxwayland=${boolToString (xwayland != null)}" # Default is true!
"-Dremoting=false" # TODO
+ "-Dpipewire=${boolToString (pipewire != null)}"
"-Dimage-webp=${boolToString (libwebp != null)}"
"-Dsimple-dmabuf-drm=" # Disables all drivers
"-Ddemo-clients=false"
diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix
index caf97c6510de..d0a1de7f6006 100644
--- a/pkgs/applications/window-managers/windowlab/default.nix
+++ b/pkgs/applications/window-managers/windowlab/default.nix
@@ -3,7 +3,8 @@
let version = "1.40"; in
stdenv.mkDerivation {
- name = "windowlab-${version}";
+ pname = "windowlab";
+ inherit version;
src = fetchurl {
url = "http://nickgravgaard.com/windowlab/windowlab-${version}.tar";
diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix
index d83c4493accb..8ad63999289e 100644
--- a/pkgs/applications/window-managers/windowmaker/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/default.nix
@@ -3,7 +3,7 @@
, imagemagick, libpng, libjpeg, libexif, libtiff, libungif, libwebp }:
stdenv.mkDerivation rec {
- name = "windowmaker-${version}";
+ pname = "windowmaker";
version = "0.95.8";
srcName = "WindowMaker-${version}";
diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/applications/window-managers/wmfs/default.nix
index d615b4fe010c..2013096d6fea 100644
--- a/pkgs/applications/window-managers/wmfs/default.nix
+++ b/pkgs/applications/window-managers/wmfs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gnumake,
libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }:
-stdenv.mkDerivation rec {
- name = "wmfs-${version}";
+stdenv.mkDerivation {
+ pname = "wmfs";
version = "201902";
diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix
index 5a8b68df364a..e0f2243827c5 100644
--- a/pkgs/applications/window-managers/wmii-hg/default.nix
+++ b/pkgs/applications/window-managers/wmii-hg/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
rev = "2823";
version = "hg-2012-12-09";
- name = "wmii-${version}";
+ pname = "wmii";
src = fetchurl {
url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip;
diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix
index 60d3e61fdf96..36ca00b776bb 100644
--- a/pkgs/applications/window-managers/wtftw/default.nix
+++ b/pkgs/applications/window-managers/wtftw/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, rustPlatform, libXinerama, libX11, pkgconfig }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
name = "wtftw-0.0pre20170921";
src = fetchFromGitHub {
owner = "kintaro";
diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix
index 678ebad75dd2..f7867882d222 100644
--- a/pkgs/applications/window-managers/yabar/build.nix
+++ b/pkgs/applications/window-managers/yabar/build.nix
@@ -5,7 +5,8 @@
}:
stdenv.mkDerivation {
- name = "yabar-${version}";
+ pname = "yabar";
+ inherit version;
src = fetchFromGitHub {
inherit rev sha256;
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index e1ec09bc95a1..e02e77de45e4 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -180,10 +180,10 @@ stdenv.mkDerivation {
else if targetPlatform.isx86_64 then "x86-64"
else if targetPlatform.isx86_32 then "i386"
else if targetPlatform.isMips then {
- "mips" = "btsmipn32"; # n32 variant
- "mipsel" = "ltsmipn32"; # n32 variant
- "mips64" = "btsmip";
- "mips64el" = "ltsmip";
+ mips = "btsmipn32"; # n32 variant
+ mipsel = "ltsmipn32"; # n32 variant
+ mips64 = "btsmip";
+ mips64el = "ltsmip";
}.${targetPlatform.parsed.cpu.name}
else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc"
else if targetPlatform.isSparc then "sparc"
diff --git a/pkgs/build-support/dhall-to-nix.nix b/pkgs/build-support/dhall-to-nix.nix
index c563b34ff3bc..3805656dfa0e 100644
--- a/pkgs/build-support/dhall-to-nix.nix
+++ b/pkgs/build-support/dhall-to-nix.nix
@@ -33,6 +33,6 @@ let
};
in
- import "${drv}";
+ import drv;
in
dhallToNix
diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix
index bbd2bae46df5..57d2e4ad82d2 100644
--- a/pkgs/build-support/fetchdocker/default.nix
+++ b/pkgs/build-support/fetchdocker/default.nix
@@ -37,8 +37,8 @@ let
repositories =
writeText "repositories" (builtins.toJSON {
- "${repoTag1}" = {
- "${tag}" = lib.last layers;
+ ${repoTag1} = {
+ ${tag} = lib.last layers;
};
});
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 256c86748d28..0405951a9e40 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -52,7 +52,7 @@ else
stdenvNoCC.mkDerivation {
inherit name;
builder = ./builder.sh;
- fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash.
+ fetcher = ./nix-prefetch-git; # This must be a string to ensure it's called with bash.
nativeBuildInputs = [git];
outputHashAlgo = "sha256";
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index b447911ab8d3..931be1a37007 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -265,7 +265,9 @@ make_deterministic_repo(){
rm -f .git/config
# Garbage collect unreferenced objects.
- git gc --prune=all
+ # Note: --keep-largest-pack prevents non-deterministic ordering of packs
+ # listed in .git/objects/info/packs by only using a single pack
+ git gc --prune=all --keep-largest-pack
)
}
diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix
index 59376f3b0424..6731cf87fbd1 100644
--- a/pkgs/build-support/fetchgit/private.nix
+++ b/pkgs/build-support/fetchgit/private.nix
@@ -4,7 +4,7 @@
else null;
GIT_SSH = let
- config = ''${let
+ config = let
sshConfigFile = if (builtins.tryEval ).success
then
else builtins.trace ''
@@ -14,7 +14,7 @@
You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user.
'' "/var/lib/empty/config";
- in builtins.toString sshConfigFile}'';
+ in builtins.toString sshConfigFile;
ssh-wrapped = runCommand "fetchgit-ssh" {
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 1ca1e45f2fbb..c0e115bca280 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -1,4 +1,4 @@
-rec {
+{
# Content-addressable Nix mirrors.
hashedMirrors = [
@@ -8,6 +8,13 @@ rec {
# Mirrors for mirror://site/filename URIs, where "site" is
# "sourceforge", "gnu", etc.
+ luarocks = [
+ https://luarocks.org
+ https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/
+ http://luafr.org/moonrocks
+ http://luarocks.logiceditor.com/rocks
+ ];
+
# SourceForge.
sourceforge = [
https://downloads.sourceforge.net/
diff --git a/pkgs/build-support/install-shell-files/default.nix b/pkgs/build-support/install-shell-files/default.nix
new file mode 100644
index 000000000000..e1f2e24dd875
--- /dev/null
+++ b/pkgs/build-support/install-shell-files/default.nix
@@ -0,0 +1,4 @@
+{ makeSetupHook }:
+
+# See the header comment in ../setup-hooks/install-shell-files.sh for example usage.
+makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh
diff --git a/pkgs/build-support/nix-prefetch-github/default.nix b/pkgs/build-support/nix-prefetch-github/default.nix
index 3c5cbe2b4928..10a6daaf53f7 100644
--- a/pkgs/build-support/nix-prefetch-github/default.nix
+++ b/pkgs/build-support/nix-prefetch-github/default.nix
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "nix-prefetch-github";
- version = "2.3";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "seppeljordan";
repo = "nix-prefetch-github";
rev = "v${version}";
- sha256 = "0b2hgfyxhlqq6lyi5cr98dz6if5kl6b3kq67f2lzfkalydywl1dh";
+ sha256 = "13wvq13iiva97a16kahfpxar5ppb015nnbn7d4v9s9jyxdickc2c";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/build-support/oci-tools/default.nix b/pkgs/build-support/oci-tools/default.nix
new file mode 100644
index 000000000000..18b238033ffd
--- /dev/null
+++ b/pkgs/build-support/oci-tools/default.nix
@@ -0,0 +1,78 @@
+{ lib, writeText, runCommand, writeReferencesToFile }:
+
+{
+ buildContainer =
+ { args
+ , mounts ? {}
+ , os ? "linux"
+ , arch ? "x86_64"
+ , readonly ? false
+ }:
+ let
+ sysMounts = {
+ "/proc" = {
+ type = "proc";
+ source = "proc";
+ };
+ "/dev" = {
+ type = "tmpfs";
+ source = "tmpfs";
+ options = [ "nosuid" "strictatime" "mode=755" "size=65536k" ];
+ };
+ "/dev/pts" = {
+ type = "devpts";
+ source = "devpts";
+ options = [ "nosuid" "noexec" "newinstance" "ptmxmode=0666" "mode=755" "gid=5" ];
+ };
+ "/dev/shm" = {
+ type = "tmpfs";
+ source = "shm";
+ options = [ "nosuid" "noexec" "nodev" "mode=1777" "size=65536k" ];
+ };
+ "/dev/mqueue" = {
+ type = "mqueue";
+ source = "mqueue";
+ options = [ "nosuid" "noexec" "nodev" ];
+ };
+ "/sys" = {
+ type = "sysfs";
+ source = "sysfs";
+ options = [ "nosuid" "noexec" "nodev" "ro" ];
+ };
+ "/sys/fs/cgroup" = {
+ type = "cgroup";
+ source = "cgroup";
+ options = [ "nosuid" "noexec" "nodev" "realatime" "ro" ];
+ };
+ };
+ config = writeText "config.json" (builtins.toJSON {
+ ociVersion = "1.0.0";
+ platform = {
+ inherit os arch;
+ };
+
+ linux = {
+ namespaces = map (type: { inherit type; }) [ "pid" "network" "mount" "ipc" "uts" ];
+ };
+
+ root = { path = "rootfs"; inherit readonly; };
+
+ process = {
+ inherit args;
+ user = { uid = 0; gid = 0; };
+ cwd = "/";
+ };
+
+ mounts = lib.mapAttrsToList (destination: { type, source, options ? null }: {
+ inherit destination type source options;
+ }) sysMounts;
+ });
+ in
+ runCommand "join" {} ''
+ set -o pipefail
+ mkdir -p $out/rootfs/{dev,proc,sys}
+ cp ${config} $out/config.json
+ xargs tar c < ${writeReferencesToFile args} | tar -xC $out/rootfs/
+ '';
+}
+
diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix
index f7ea07baccbe..71eb63b850d5 100644
--- a/pkgs/build-support/release/maven-build.nix
+++ b/pkgs/build-support/release/maven-build.nix
@@ -15,7 +15,7 @@ let
mvnFlags = "-Dmaven.repo.local=$M2_REPO ${if doTest then "" else "-Dmaven.test.skip.exec=true"} ${extraMvnFlags}";
in
-stdenv.mkDerivation ( rec {
+stdenv.mkDerivation ( {
inherit name src;
phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase";
diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
index 2999c3d4c1d9..e0a52e62561b 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, echo_build_heading, noisily, makeDeps }:
{ crateName,
dependencies,
- crateFeatures, libName, release, libPath,
+ crateFeatures, crateRenames, libName, release, libPath,
crateType, metadata, crateBin, hasCrateBin,
extraRustcOpts, verbose, colors }:
let
- deps = makeDeps dependencies;
+ deps = makeDeps dependencies crateRenames;
rustcOpts =
lib.lists.foldl' (opts: opt: opts + " " + opt)
(if release then "-C opt-level=3" else "-C debuginfo=2")
diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
index 169adcf2d43a..2a40240671cb 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -9,6 +9,7 @@
, crateHomepage
, crateFeatures
, crateName
+, crateRenames
, crateVersion
, extraLinkFlags
, extraRustcOpts
@@ -24,7 +25,7 @@ let version_ = lib.splitString "-" crateVersion;
rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt)
(if release then "-C opt-level=3" else "-C debuginfo=2")
(["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts);
- buildDeps = makeDeps buildDependencies;
+ buildDeps = makeDeps buildDependencies crateRenames;
authors = lib.concatStringsSep ":" crateAuthors;
optLevel = if release then 3 else 0;
completeDepsDir = lib.concatStringsSep " " completeDeps;
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index acb2ee63cce4..6534e21c0f0c 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -13,13 +13,18 @@ let
then "macos"
else stdenv.hostPlatform.parsed.kernel.name;
- makeDeps = dependencies:
+ makeDeps = dependencies: crateRenames:
(lib.concatMapStringsSep " " (dep:
- let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in
- (if lib.lists.any (x: x == "lib") dep.crateType then
- " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib"
+ let
+ extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName;
+ name = if builtins.hasAttr dep.crateName crateRenames then
+ lib.strings.replaceStrings ["-"] ["_"] crateRenames.${dep.crateName}
+ else
+ extern;
+ in (if lib.lists.any (x: x == "lib") dep.crateType then
+ " --extern ${name}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib"
else
- " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}")
+ " --extern ${name}=${dep.out}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}")
) dependencies);
echo_build_heading = colors: ''
@@ -60,7 +65,7 @@ let
in
crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides,
- dependencies, buildDependencies,
+ dependencies, buildDependencies, crateRenames,
extraRustcOpts,
preUnpack, postUnpack, prePatch, patches, postPatch,
preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }:
@@ -70,7 +75,7 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr
buildDependencies_ = buildDependencies;
processedAttrs = [
"src" "buildInputs" "crateBin" "crateLib" "libName" "libPath"
- "buildDependencies" "dependencies" "features"
+ "buildDependencies" "dependencies" "features" "crateRenames"
"crateName" "version" "build" "authors" "colors" "edition"
];
extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate;
@@ -143,13 +148,13 @@ stdenv.mkDerivation (rec {
configurePhase = configureCrate {
inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription
- crateFeatures libName build workspace_member release libPath crateVersion
+ crateFeatures crateRenames libName build workspace_member release libPath crateVersion
extraLinkFlags extraRustcOpts
crateAuthors crateHomepage verbose colors target_os;
};
buildPhase = buildCrate {
inherit crateName dependencies
- crateFeatures libName release libPath crateType
+ crateFeatures crateRenames libName release libPath crateType
metadata crateBin hasCrateBin verbose colors
extraRustcOpts;
};
@@ -177,4 +182,5 @@ stdenv.mkDerivation (rec {
postInstall = crate_.postInstall or "";
dependencies = crate_.dependencies or [];
buildDependencies = crate_.buildDependencies or [];
+ crateRenames = crate_.crateRenames or {};
}
diff --git a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
index 068cc5a98843..ab9b0a13ae77 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
@@ -44,7 +44,7 @@ rec {
alloc_no_stdlib_1_3_0 = { features?(alloc_no_stdlib_1_3_0_features {}) }: alloc_no_stdlib_1_3_0_ {
features = mkFeatures (features.alloc_no_stdlib_1_3_0 or {});
};
- alloc_no_stdlib_1_3_0_features = f: updateFeatures f (rec {
+ alloc_no_stdlib_1_3_0_features = f: updateFeatures f ({
alloc_no_stdlib_1_3_0.default = (f.alloc_no_stdlib_1_3_0.default or true);
}) [];
brotli_2_5_0 = { features?(brotli_2_5_0_features {}) }: brotli_2_5_0_ {
@@ -52,20 +52,20 @@ rec {
features = mkFeatures (features.brotli_2_5_0 or {});
};
brotli_2_5_0_features = f: updateFeatures f (rec {
- alloc_no_stdlib_1_3_0."no-stdlib" =
- (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) ||
- (brotli_2_5_0."no-stdlib" or false) ||
- (f.brotli_2_5_0."no-stdlib" or false);
+ alloc_no_stdlib_1_3_0.no-stdlib =
+ (f.alloc_no_stdlib_1_3_0.no-stdlib or false) ||
+ (brotli_2_5_0.no-stdlib or false) ||
+ (f.brotli_2_5_0.no-stdlib or false);
alloc_no_stdlib_1_3_0.default = true;
brotli_2_5_0.default = (f.brotli_2_5_0.default or true);
- brotli_decompressor_1_3_1."disable-timer" =
- (f.brotli_decompressor_1_3_1."disable-timer" or false) ||
- (brotli_2_5_0."disable-timer" or false) ||
- (f.brotli_2_5_0."disable-timer" or false);
- brotli_decompressor_1_3_1."no-stdlib" =
- (f.brotli_decompressor_1_3_1."no-stdlib" or false) ||
- (brotli_2_5_0."no-stdlib" or false) ||
- (f.brotli_2_5_0."no-stdlib" or false);
+ brotli_decompressor_1_3_1.disable-timer =
+ (f.brotli_decompressor_1_3_1.disable-timer or false) ||
+ (brotli_2_5_0.disable-timer or false) ||
+ (f.brotli_2_5_0.disable-timer or false);
+ brotli_decompressor_1_3_1.no-stdlib =
+ (f.brotli_decompressor_1_3_1.no-stdlib or false) ||
+ (brotli_2_5_0.no-stdlib or false) ||
+ (f.brotli_2_5_0.no-stdlib or false);
brotli_decompressor_1_3_1.benchmark =
(f.brotli_decompressor_1_3_1.benchmark or false) ||
(brotli_2_5_0.benchmark or false) ||
@@ -81,10 +81,10 @@ rec {
features = mkFeatures (features.brotli_decompressor_1_3_1 or {});
};
brotli_decompressor_1_3_1_features = f: updateFeatures f (rec {
- alloc_no_stdlib_1_3_0."no-stdlib" =
- (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) ||
- (brotli_decompressor_1_3_1."no-stdlib" or false) ||
- (f.brotli_decompressor_1_3_1."no-stdlib" or false);
+ alloc_no_stdlib_1_3_0.no-stdlib =
+ (f.alloc_no_stdlib_1_3_0.no-stdlib or false) ||
+ (brotli_decompressor_1_3_1.no-stdlib or false) ||
+ (f.brotli_decompressor_1_3_1.no-stdlib or false);
alloc_no_stdlib_1_3_0.default = true;
alloc_no_stdlib_1_3_0.unsafe =
(f.alloc_no_stdlib_1_3_0.unsafe or false) ||
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index f3f9ef377c8c..4a90cf442a4d 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -22,6 +22,13 @@ let
}
'';
+ mkBinExtern = name: extern: mkFile name ''
+ extern crate ${extern};
+ fn main() {
+ assert_eq!(${extern}::test(), 23);
+ }
+ '';
+
mkLib = name: mkFile name "pub fn test() -> i32 { return 23; }";
mkTest = crateArgs: let
@@ -34,12 +41,7 @@ let
libTestBinary = if !isLib then null else mkCrate {
crateName = "run-test-${crateName}";
dependencies = [ crate ];
- src = mkFile "src/main.rs" ''
- extern crate ${libName};
- fn main() {
- assert_eq!(${libName}::test(), 23);
- }
- '';
+ src = mkBinExtern "src/main.rs" libName;
};
in runCommand "run-buildRustCrate-${crateName}-test" {
@@ -71,6 +73,18 @@ let
};
crateBinNoPath3 = { crateBin = [{ name = "my-binary5"; }]; src = mkBin "src/bin/main.rs"; };
crateBinNoPath4 = { crateBin = [{ name = "my-binary6"; }]; src = mkBin "src/main.rs";};
+ crateBinRename1 = {
+ crateBin = [{ name = "my-binary-rename1"; }];
+ src = mkBinExtern "src/main.rs" "foo_renamed";
+ dependencies = [ (mkCrate { crateName = "foo"; src = mkLib "src/lib.rs"; }) ];
+ crateRenames = { "foo" = "foo_renamed"; };
+ };
+ crateBinRename2 = {
+ crateBin = [{ name = "my-binary-rename2"; }];
+ src = mkBinExtern "src/main.rs" "foo_renamed";
+ dependencies = [ (mkCrate { crateName = "foo"; libName = "foolib"; src = mkLib "src/lib.rs"; }) ];
+ crateRenames = { "foo" = "foo_renamed"; };
+ };
};
brotliCrates = (callPackage ./brotli-crates.nix {});
in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // {
diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix
index 9dd2da28ad5b..66f98cd99121 100644
--- a/pkgs/build-support/rust/crates-io.nix
+++ b/pkgs/build-support/rust/crates-io.nix
@@ -19,7 +19,7 @@ rec {
(crates."memchr"."${deps."aho_corasick"."0.6.10"."memchr"}" deps)
]);
};
- features_.aho_corasick."0.6.10" = deps: f: updateFeatures f (rec {
+ features_.aho_corasick."0.6.10" = deps: f: updateFeatures f ({
aho_corasick."0.6.10".default = (f.aho_corasick."0.6.10".default or true);
memchr."${deps.aho_corasick."0.6.10".memchr}".default = true;
}) [
@@ -42,7 +42,7 @@ rec {
(crates."memchr"."${deps."aho_corasick"."0.6.8"."memchr"}" deps)
]);
};
- features_.aho_corasick."0.6.8" = deps: f: updateFeatures f (rec {
+ features_.aho_corasick."0.6.8" = deps: f: updateFeatures f ({
aho_corasick."0.6.8".default = (f.aho_corasick."0.6.8".default or true);
memchr."${deps.aho_corasick."0.6.8".memchr}".default = true;
}) [
@@ -62,7 +62,7 @@ rec {
(crates."winapi"."${deps."ansi_term"."0.11.0"."winapi"}" deps)
]) else []);
};
- features_.ansi_term."0.11.0" = deps: f: updateFeatures f (rec {
+ features_.ansi_term."0.11.0" = deps: f: updateFeatures f ({
ansi_term."0.11.0".default = (f.ansi_term."0.11.0".default or true);
winapi = fold recursiveUpdate {} [
{ "${deps.ansi_term."0.11.0".winapi}"."consoleapi" = true; }
@@ -186,7 +186,7 @@ rec {
(crates."winapi"."${deps."atty"."0.2.11"."winapi"}" deps)
]) else []);
};
- features_.atty."0.2.11" = deps: f: updateFeatures f (rec {
+ features_.atty."0.2.11" = deps: f: updateFeatures f ({
atty."0.2.11".default = (f.atty."0.2.11".default or true);
libc."${deps.atty."0.2.11".libc}".default = (f.libc."${deps.atty."0.2.11".libc}".default or false);
termion."${deps.atty."0.2.11".termion}".default = true;
@@ -215,7 +215,7 @@ rec {
authors = [ "Josh Stone " ];
sha256 = "0dv81dwnp1al3j4ffz007yrjv4w1c7hw09gnf0xs3icxiw6qqfs3";
};
- features_.autocfg."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.autocfg."0.1.2" = deps: f: updateFeatures f ({
autocfg."0.1.2".default = (f.autocfg."0.1.2".default or true);
}) [];
@@ -461,7 +461,7 @@ rec {
(crates."cc"."${deps."backtrace_sys"."0.1.24"."cc"}" deps)
]);
};
- features_.backtrace_sys."0.1.24" = deps: f: updateFeatures f (rec {
+ features_.backtrace_sys."0.1.24" = deps: f: updateFeatures f ({
backtrace_sys."0.1.24".default = (f.backtrace_sys."0.1.24".default or true);
cc."${deps.backtrace_sys."0.1.24".cc}".default = true;
libc."${deps.backtrace_sys."0.1.24".libc}".default = true;
@@ -489,7 +489,7 @@ rec {
(crates."cc"."${deps."backtrace_sys"."0.1.28"."cc"}" deps)
]);
};
- features_.backtrace_sys."0.1.28" = deps: f: updateFeatures f (rec {
+ features_.backtrace_sys."0.1.28" = deps: f: updateFeatures f ({
backtrace_sys."0.1.28".default = (f.backtrace_sys."0.1.28".default or true);
cc."${deps.backtrace_sys."0.1.28".cc}".default = true;
libc."${deps.backtrace_sys."0.1.28".libc}".default = (f.libc."${deps.backtrace_sys."0.1.28".libc}".default or false);
@@ -509,7 +509,7 @@ rec {
sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08";
features = mkFeatures (features."bitflags"."1.0.4" or {});
};
- features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec {
+ features_.bitflags."1.0.4" = deps: f: updateFeatures f ({
bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true);
}) [];
@@ -582,7 +582,7 @@ rec {
(crates."url"."${deps."carnix"."0.10.0"."url"}" deps)
]);
};
- features_.carnix."0.10.0" = deps: f: updateFeatures f (rec {
+ features_.carnix."0.10.0" = deps: f: updateFeatures f ({
carnix."0.10.0".default = (f.carnix."0.10.0".default or true);
clap."${deps.carnix."0.10.0".clap}".default = true;
dirs."${deps.carnix."0.10.0".dirs}".default = true;
@@ -645,7 +645,7 @@ rec {
(crates."toml"."${deps."carnix"."0.9.1"."toml"}" deps)
]);
};
- features_.carnix."0.9.1" = deps: f: updateFeatures f (rec {
+ features_.carnix."0.9.1" = deps: f: updateFeatures f ({
carnix."0.9.1".default = (f.carnix."0.9.1".default or true);
clap."${deps.carnix."0.9.1".clap}".default = true;
dirs."${deps.carnix."0.9.1".dirs}".default = true;
@@ -704,7 +704,7 @@ rec {
(crates."toml"."${deps."carnix"."0.9.2"."toml"}" deps)
]);
};
- features_.carnix."0.9.2" = deps: f: updateFeatures f (rec {
+ features_.carnix."0.9.2" = deps: f: updateFeatures f ({
carnix."0.9.2".default = (f.carnix."0.9.2".default or true);
clap."${deps.carnix."0.9.2".clap}".default = true;
dirs."${deps.carnix."0.9.2".dirs}".default = true;
@@ -764,7 +764,7 @@ rec {
(crates."url"."${deps."carnix"."0.9.8"."url"}" deps)
]);
};
- features_.carnix."0.9.8" = deps: f: updateFeatures f (rec {
+ features_.carnix."0.9.8" = deps: f: updateFeatures f ({
carnix."0.9.8".default = (f.carnix."0.9.8".default or true);
clap."${deps.carnix."0.9.8".clap}".default = true;
dirs."${deps.carnix."0.9.8".dirs}".default = true;
@@ -854,7 +854,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n";
};
- features_.cfg_if."0.1.6" = deps: f: updateFeatures f (rec {
+ features_.cfg_if."0.1.6" = deps: f: updateFeatures f ({
cfg_if."0.1.6".default = (f.cfg_if."0.1.6".default or true);
}) [];
@@ -869,7 +869,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "13gvcx1dxjq4mpmpj26hpg3yc97qffkx2zi58ykr1dwr8q2biiig";
};
- features_.cfg_if."0.1.7" = deps: f: updateFeatures f (rec {
+ features_.cfg_if."0.1.7" = deps: f: updateFeatures f ({
cfg_if."0.1.7".default = (f.cfg_if."0.1.7".default or true);
}) [];
@@ -1001,7 +1001,7 @@ rec {
authors = [ "Cesar Eduardo Barros " ];
sha256 = "03qri9hjf049gwqg9q527lybpg918q6y5q4g9a5lma753nff49wd";
};
- features_.constant_time_eq."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.constant_time_eq."0.1.3" = deps: f: updateFeatures f ({
constant_time_eq."0.1.3".default = (f.constant_time_eq."0.1.3".default or true);
}) [];
@@ -1024,7 +1024,7 @@ rec {
(crates."winapi"."${deps."dirs"."1.0.4"."winapi"}" deps)
]) else []);
};
- features_.dirs."1.0.4" = deps: f: updateFeatures f (rec {
+ features_.dirs."1.0.4" = deps: f: updateFeatures f ({
dirs."1.0.4".default = (f.dirs."1.0.4".default or true);
libc."${deps.dirs."1.0.4".libc}".default = true;
redox_users."${deps.dirs."1.0.4".redox_users}".default = true;
@@ -1062,7 +1062,7 @@ rec {
(crates."winapi"."${deps."dirs"."1.0.5"."winapi"}" deps)
]) else []);
};
- features_.dirs."1.0.5" = deps: f: updateFeatures f (rec {
+ features_.dirs."1.0.5" = deps: f: updateFeatures f ({
dirs."1.0.5".default = (f.dirs."1.0.5".default or true);
libc."${deps.dirs."1.0.5".libc}".default = true;
redox_users."${deps.dirs."1.0.5".redox_users}".default = true;
@@ -1359,7 +1359,7 @@ rec {
]);
features = mkFeatures (features."failure_derive"."0.1.3" or {});
};
- features_.failure_derive."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.failure_derive."0.1.3" = deps: f: updateFeatures f ({
failure_derive."0.1.3".default = (f.failure_derive."0.1.3".default or true);
proc_macro2."${deps.failure_derive."0.1.3".proc_macro2}".default = true;
quote."${deps.failure_derive."0.1.3".quote}".default = true;
@@ -1392,7 +1392,7 @@ rec {
]);
features = mkFeatures (features."failure_derive"."0.1.5" or {});
};
- features_.failure_derive."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.failure_derive."0.1.5" = deps: f: updateFeatures f ({
failure_derive."0.1.5".default = (f.failure_derive."0.1.5".default or true);
proc_macro2."${deps.failure_derive."0.1.5".proc_macro2}".default = true;
quote."${deps.failure_derive."0.1.5".quote}".default = true;
@@ -1417,7 +1417,7 @@ rec {
edition = "2018";
sha256 = "07apwv9dj716yjlcj29p94vkqn5zmfh7hlrqvrjx3wzshphc95h9";
};
- features_.fuchsia_cprng."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_cprng."0.1.1" = deps: f: updateFeatures f ({
fuchsia_cprng."0.1.1".default = (f.fuchsia_cprng."0.1.1".default or true);
}) [];
@@ -1435,7 +1435,7 @@ rec {
(crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps)
]);
};
- features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f ({
bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true;
fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true);
fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true;
@@ -1454,7 +1454,7 @@ rec {
authors = [ "Raph Levien " ];
sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
};
- features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({
fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true);
}) [];
@@ -1472,7 +1472,7 @@ rec {
(crates."quick_error"."${deps."humantime"."1.1.1"."quick_error"}" deps)
]);
};
- features_.humantime."1.1.1" = deps: f: updateFeatures f (rec {
+ features_.humantime."1.1.1" = deps: f: updateFeatures f ({
humantime."1.1.1".default = (f.humantime."1.1.1".default or true);
quick_error."${deps.humantime."1.1.1".quick_error}".default = true;
}) [
@@ -1494,7 +1494,7 @@ rec {
(crates."quick_error"."${deps."humantime"."1.2.0"."quick_error"}" deps)
]);
};
- features_.humantime."1.2.0" = deps: f: updateFeatures f (rec {
+ features_.humantime."1.2.0" = deps: f: updateFeatures f ({
humantime."1.2.0".default = (f.humantime."1.2.0".default or true);
quick_error."${deps.humantime."1.2.0".quick_error}".default = true;
}) [
@@ -1516,7 +1516,7 @@ rec {
(crates."unicode_normalization"."${deps."idna"."0.1.5"."unicode_normalization"}" deps)
]);
};
- features_.idna."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.idna."0.1.5" = deps: f: updateFeatures f ({
idna."0.1.5".default = (f.idna."0.1.5".default or true);
matches."${deps.idna."0.1.5".matches}".default = true;
unicode_bidi."${deps.idna."0.1.5".unicode_bidi}".default = true;
@@ -1730,7 +1730,7 @@ rec {
]);
features = mkFeatures (features."log"."0.4.5" or {});
};
- features_.log."0.4.5" = deps: f: updateFeatures f (rec {
+ features_.log."0.4.5" = deps: f: updateFeatures f ({
cfg_if."${deps.log."0.4.5".cfg_if}".default = true;
log."0.4.5".default = (f.log."0.4.5".default or true);
}) [
@@ -1752,7 +1752,7 @@ rec {
]);
features = mkFeatures (features."log"."0.4.6" or {});
};
- features_.log."0.4.6" = deps: f: updateFeatures f (rec {
+ features_.log."0.4.6" = deps: f: updateFeatures f ({
cfg_if."${deps.log."0.4.6".cfg_if}".default = true;
log."0.4.6".default = (f.log."0.4.6".default or true);
}) [
@@ -1770,7 +1770,7 @@ rec {
sha256 = "03hl636fg6xggy0a26200xs74amk3k9n0908rga2szn68agyz3cv";
libPath = "lib.rs";
};
- features_.matches."0.1.8" = deps: f: updateFeatures f (rec {
+ features_.matches."0.1.8" = deps: f: updateFeatures f ({
matches."0.1.8".default = (f.matches."0.1.8".default or true);
}) [];
@@ -2004,7 +2004,7 @@ rec {
sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i";
libPath = "lib.rs";
};
- features_.percent_encoding."1.0.1" = deps: f: updateFeatures f (rec {
+ features_.percent_encoding."1.0.1" = deps: f: updateFeatures f ({
percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true);
}) [];
@@ -2077,7 +2077,7 @@ rec {
authors = [ "Paul Colomiets " "Colin Kiegel " ];
sha256 = "192a3adc5phgpibgqblsdx1b421l5yg9bjbmv552qqq9f37h60k5";
};
- features_.quick_error."1.2.2" = deps: f: updateFeatures f (rec {
+ features_.quick_error."1.2.2" = deps: f: updateFeatures f ({
quick_error."1.2.2".default = (f.quick_error."1.2.2".default or true);
}) [];
@@ -2362,7 +2362,7 @@ rec {
++ (if kernel == "wasm32-unknown-unknown" then mapFeatures features ([
]) else []);
};
- features_.rand_os."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.rand_os."0.1.3" = deps: f: updateFeatures f ({
cloudabi."${deps.rand_os."0.1.3".cloudabi}".default = true;
fuchsia_cprng."${deps.rand_os."0.1.3".fuchsia_cprng}".default = true;
libc."${deps.rand_os."0.1.3".libc}".default = true;
@@ -2426,7 +2426,7 @@ rec {
sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611";
libName = "syscall";
};
- features_.redox_syscall."0.1.40" = deps: f: updateFeatures f (rec {
+ features_.redox_syscall."0.1.40" = deps: f: updateFeatures f ({
redox_syscall."0.1.40".default = (f.redox_syscall."0.1.40".default or true);
}) [];
@@ -2442,7 +2442,7 @@ rec {
sha256 = "1a61cv7yydx64vpyvzr0z0hwzdvy4gcvcnfc6k70zpkngj5sz3ip";
libName = "syscall";
};
- features_.redox_syscall."0.1.51" = deps: f: updateFeatures f (rec {
+ features_.redox_syscall."0.1.51" = deps: f: updateFeatures f ({
redox_syscall."0.1.51".default = (f.redox_syscall."0.1.51".default or true);
}) [];
@@ -2460,7 +2460,7 @@ rec {
(crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps)
]);
};
- features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.redox_termios."0.1.1" = deps: f: updateFeatures f ({
redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true;
redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true);
}) [
@@ -2483,7 +2483,7 @@ rec {
(crates."redox_syscall"."${deps."redox_users"."0.2.0"."redox_syscall"}" deps)
]);
};
- features_.redox_users."0.2.0" = deps: f: updateFeatures f (rec {
+ features_.redox_users."0.2.0" = deps: f: updateFeatures f ({
argon2rs."${deps.redox_users."0.2.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.2.0".argon2rs}".default or false);
failure."${deps.redox_users."0.2.0".failure}".default = true;
rand."${deps.redox_users."0.2.0".rand}".default = true;
@@ -2513,7 +2513,7 @@ rec {
(crates."redox_syscall"."${deps."redox_users"."0.3.0"."redox_syscall"}" deps)
]);
};
- features_.redox_users."0.3.0" = deps: f: updateFeatures f (rec {
+ features_.redox_users."0.3.0" = deps: f: updateFeatures f ({
argon2rs."${deps.redox_users."0.3.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.3.0".argon2rs}".default or false);
failure."${deps.redox_users."0.3.0".failure}".default = true;
rand_os."${deps.redox_users."0.3.0".rand_os}".default = true;
@@ -2626,7 +2626,7 @@ rec {
(crates."ucd_util"."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps)
]);
};
- features_.regex_syntax."0.6.2" = deps: f: updateFeatures f (rec {
+ features_.regex_syntax."0.6.2" = deps: f: updateFeatures f ({
regex_syntax."0.6.2".default = (f.regex_syntax."0.6.2".default or true);
ucd_util."${deps.regex_syntax."0.6.2".ucd_util}".default = true;
}) [
@@ -2647,7 +2647,7 @@ rec {
(crates."ucd_util"."${deps."regex_syntax"."0.6.5"."ucd_util"}" deps)
]);
};
- features_.regex_syntax."0.6.5" = deps: f: updateFeatures f (rec {
+ features_.regex_syntax."0.6.5" = deps: f: updateFeatures f ({
regex_syntax."0.6.5".default = (f.regex_syntax."0.6.5".default or true);
ucd_util."${deps.regex_syntax."0.6.5".ucd_util}".default = true;
}) [
@@ -2667,7 +2667,7 @@ rec {
(crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps)
]) else []);
};
- features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f (rec {
+ features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f ({
remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true);
winapi = fold recursiveUpdate {} [
{ "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; }
@@ -2692,7 +2692,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "0sr6cr02araqnlqwc5ghvnafjmkw11vzjswqaz757lvyrcl8xcy6";
};
- features_.rustc_demangle."0.1.13" = deps: f: updateFeatures f (rec {
+ features_.rustc_demangle."0.1.13" = deps: f: updateFeatures f ({
rustc_demangle."0.1.13".default = (f.rustc_demangle."0.1.13".default or true);
}) [];
@@ -2706,7 +2706,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "00ma4r9haq0zv5krps617mym6y74056pfcivyld0kpci156vfaax";
};
- features_.rustc_demangle."0.1.9" = deps: f: updateFeatures f (rec {
+ features_.rustc_demangle."0.1.9" = deps: f: updateFeatures f ({
rustc_demangle."0.1.9".default = (f.rustc_demangle."0.1.9".default or true);
}) [];
@@ -2724,7 +2724,7 @@ rec {
]);
features = mkFeatures (features."ryu"."0.2.6" or {});
};
- features_.ryu."0.2.6" = deps: f: updateFeatures f (rec {
+ features_.ryu."0.2.6" = deps: f: updateFeatures f ({
ryu."0.2.6".default = (f.ryu."0.2.6".default or true);
}) [];
@@ -2743,7 +2743,7 @@ rec {
]);
features = mkFeatures (features."ryu"."0.2.7" or {});
};
- features_.ryu."0.2.7" = deps: f: updateFeatures f (rec {
+ features_.ryu."0.2.7" = deps: f: updateFeatures f ({
ryu."0.2.7".default = (f.ryu."0.2.7".default or true);
}) [];
@@ -2758,7 +2758,7 @@ rec {
sha256 = "1arqj2skcfr46s1lcyvnlmfr5456kg5nhn8k90xyfjnxkp5yga2v";
features = mkFeatures (features."scoped_threadpool"."0.1.9" or {});
};
- features_.scoped_threadpool."0.1.9" = deps: f: updateFeatures f (rec {
+ features_.scoped_threadpool."0.1.9" = deps: f: updateFeatures f ({
scoped_threadpool."0.1.9".default = (f.scoped_threadpool."0.1.9".default or true);
}) [];
@@ -2876,7 +2876,7 @@ rec {
]);
features = mkFeatures (features."serde_derive"."1.0.80" or {});
};
- features_.serde_derive."1.0.80" = deps: f: updateFeatures f (rec {
+ features_.serde_derive."1.0.80" = deps: f: updateFeatures f ({
proc_macro2."${deps.serde_derive."1.0.80".proc_macro2}".default = true;
quote."${deps.serde_derive."1.0.80".quote}".default = true;
serde_derive."1.0.80".default = (f.serde_derive."1.0.80".default or true);
@@ -2908,7 +2908,7 @@ rec {
]);
features = mkFeatures (features."serde_derive"."1.0.89" or {});
};
- features_.serde_derive."1.0.89" = deps: f: updateFeatures f (rec {
+ features_.serde_derive."1.0.89" = deps: f: updateFeatures f ({
proc_macro2."${deps.serde_derive."1.0.89".proc_macro2}".default = true;
quote."${deps.serde_derive."1.0.89".quote}".default = true;
serde_derive."1.0.89".default = (f.serde_derive."1.0.89".default or true);
@@ -3024,7 +3024,7 @@ rec {
authors = [ "Danny Guo " ];
sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv";
};
- features_.strsim."0.7.0" = deps: f: updateFeatures f (rec {
+ features_.strsim."0.7.0" = deps: f: updateFeatures f ({
strsim."0.7.0".default = (f.strsim."0.7.0".default or true);
}) [];
@@ -3176,7 +3176,7 @@ rec {
]);
features = mkFeatures (features."synstructure"."0.10.0" or {});
};
- features_.synstructure."0.10.0" = deps: f: updateFeatures f (rec {
+ features_.synstructure."0.10.0" = deps: f: updateFeatures f ({
proc_macro2."${deps.synstructure."0.10.0".proc_macro2}".default = true;
quote."${deps.synstructure."0.10.0".quote}".default = true;
syn = fold recursiveUpdate {} [
@@ -3211,7 +3211,7 @@ rec {
]);
features = mkFeatures (features."synstructure"."0.10.1" or {});
};
- features_.synstructure."0.10.1" = deps: f: updateFeatures f (rec {
+ features_.synstructure."0.10.1" = deps: f: updateFeatures f ({
proc_macro2."${deps.synstructure."0.10.1".proc_macro2}".default = true;
quote."${deps.synstructure."0.10.1".quote}".default = true;
syn = fold recursiveUpdate {} [
@@ -3242,7 +3242,7 @@ rec {
(crates."remove_dir_all"."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps)
]);
};
- features_.tempdir."0.3.7" = deps: f: updateFeatures f (rec {
+ features_.tempdir."0.3.7" = deps: f: updateFeatures f ({
rand."${deps.tempdir."0.3.7".rand}".default = true;
remove_dir_all."${deps.tempdir."0.3.7".remove_dir_all}".default = true;
tempdir."0.3.7".default = (f.tempdir."0.3.7".default or true);
@@ -3264,7 +3264,7 @@ rec {
(crates."wincolor"."${deps."termcolor"."1.0.4"."wincolor"}" deps)
]) else []);
};
- features_.termcolor."1.0.4" = deps: f: updateFeatures f (rec {
+ features_.termcolor."1.0.4" = deps: f: updateFeatures f ({
termcolor."1.0.4".default = (f.termcolor."1.0.4".default or true);
wincolor."${deps.termcolor."1.0.4".wincolor}".default = true;
}) [
@@ -3288,7 +3288,7 @@ rec {
(crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps)
]) else []);
};
- features_.termion."1.5.1" = deps: f: updateFeatures f (rec {
+ features_.termion."1.5.1" = deps: f: updateFeatures f ({
libc."${deps.termion."1.5.1".libc}".default = true;
redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true;
redox_termios."${deps.termion."1.5.1".redox_termios}".default = true;
@@ -3312,7 +3312,7 @@ rec {
(crates."unicode_width"."${deps."textwrap"."0.10.0"."unicode_width"}" deps)
]);
};
- features_.textwrap."0.10.0" = deps: f: updateFeatures f (rec {
+ features_.textwrap."0.10.0" = deps: f: updateFeatures f ({
textwrap."0.10.0".default = (f.textwrap."0.10.0".default or true);
unicode_width."${deps.textwrap."0.10.0".unicode_width}".default = true;
}) [
@@ -3332,7 +3332,7 @@ rec {
(crates."lazy_static"."${deps."thread_local"."0.3.6"."lazy_static"}" deps)
]);
};
- features_.thread_local."0.3.6" = deps: f: updateFeatures f (rec {
+ features_.thread_local."0.3.6" = deps: f: updateFeatures f ({
lazy_static."${deps.thread_local."0.3.6".lazy_static}".default = true;
thread_local."0.3.6".default = (f.thread_local."0.3.6".default or true);
}) [
@@ -3352,7 +3352,7 @@ rec {
(crates."serde"."${deps."toml"."0.4.10"."serde"}" deps)
]);
};
- features_.toml."0.4.10" = deps: f: updateFeatures f (rec {
+ features_.toml."0.4.10" = deps: f: updateFeatures f ({
serde."${deps.toml."0.4.10".serde}".default = true;
toml."0.4.10".default = (f.toml."0.4.10".default or true);
}) [
@@ -3372,7 +3372,7 @@ rec {
(crates."serde"."${deps."toml"."0.4.8"."serde"}" deps)
]);
};
- features_.toml."0.4.8" = deps: f: updateFeatures f (rec {
+ features_.toml."0.4.8" = deps: f: updateFeatures f ({
serde."${deps.toml."0.4.8".serde}".default = true;
toml."0.4.8".default = (f.toml."0.4.8".default or true);
}) [
@@ -3420,7 +3420,7 @@ rec {
(crates."toml"."${deps."toml2nix"."0.1.1"."toml"}" deps)
]);
};
- features_.toml2nix."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.toml2nix."0.1.1" = deps: f: updateFeatures f ({
toml."${deps.toml2nix."0.1.1".toml}".default = true;
toml2nix."0.1.1".default = (f.toml2nix."0.1.1".default or true);
}) [
@@ -3437,7 +3437,7 @@ rec {
authors = [ "Andrew Gallant " ];
sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0";
};
- features_.ucd_util."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.ucd_util."0.1.1" = deps: f: updateFeatures f ({
ucd_util."0.1.1".default = (f.ucd_util."0.1.1".default or true);
}) [];
@@ -3452,7 +3452,7 @@ rec {
authors = [ "Andrew Gallant " ];
sha256 = "1n1qi3jywq5syq90z9qd8qzbn58pcjgv1sx4sdmipm4jf9zanz15";
};
- features_.ucd_util."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.ucd_util."0.1.3" = deps: f: updateFeatures f ({
ucd_util."0.1.3".default = (f.ucd_util."0.1.3".default or true);
}) [];
@@ -3502,7 +3502,7 @@ rec {
authors = [ "kwantam " ];
sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs";
};
- features_.unicode_normalization."0.1.7" = deps: f: updateFeatures f (rec {
+ features_.unicode_normalization."0.1.7" = deps: f: updateFeatures f ({
unicode_normalization."0.1.7".default = (f.unicode_normalization."0.1.7".default or true);
}) [];
@@ -3520,7 +3520,7 @@ rec {
(crates."smallvec"."${deps."unicode_normalization"."0.1.8"."smallvec"}" deps)
]);
};
- features_.unicode_normalization."0.1.8" = deps: f: updateFeatures f (rec {
+ features_.unicode_normalization."0.1.8" = deps: f: updateFeatures f ({
smallvec."${deps.unicode_normalization."0.1.8".smallvec}".default = true;
unicode_normalization."0.1.8".default = (f.unicode_normalization."0.1.8".default or true);
}) [
@@ -3538,7 +3538,7 @@ rec {
sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w";
features = mkFeatures (features."unicode_width"."0.1.5" or {});
};
- features_.unicode_width."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.unicode_width."0.1.5" = deps: f: updateFeatures f ({
unicode_width."0.1.5".default = (f.unicode_width."0.1.5".default or true);
}) [];
@@ -3553,7 +3553,7 @@ rec {
sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj";
features = mkFeatures (features."unicode_xid"."0.1.0" or {});
};
- features_.unicode_xid."0.1.0" = deps: f: updateFeatures f (rec {
+ features_.unicode_xid."0.1.0" = deps: f: updateFeatures f ({
unicode_xid."0.1.0".default = (f.unicode_xid."0.1.0".default or true);
}) [];
@@ -3604,7 +3604,7 @@ rec {
authors = [ "Andrew Gallant " ];
sha256 = "1s56ihd2c8ba6191078wivvv59247szaiszrh8x2rxqfsxlfrnpp";
};
- features_.utf8_ranges."1.0.1" = deps: f: updateFeatures f (rec {
+ features_.utf8_ranges."1.0.1" = deps: f: updateFeatures f ({
utf8_ranges."1.0.1".default = (f.utf8_ranges."1.0.1".default or true);
}) [];
@@ -3619,7 +3619,7 @@ rec {
authors = [ "Andrew Gallant " ];
sha256 = "1my02laqsgnd8ib4dvjgd4rilprqjad6pb9jj9vi67csi5qs2281";
};
- features_.utf8_ranges."1.0.2" = deps: f: updateFeatures f (rec {
+ features_.utf8_ranges."1.0.2" = deps: f: updateFeatures f ({
utf8_ranges."1.0.2".default = (f.utf8_ranges."1.0.2".default or true);
}) [];
@@ -3656,7 +3656,7 @@ rec {
authors = [ "Sergio Benitez " ];
sha256 = "1yrx9xblmwbafw2firxyqbj8f771kkzfd24n3q7xgwiqyhi0y8qd";
};
- features_.version_check."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.version_check."0.1.5" = deps: f: updateFeatures f ({
version_check."0.1.5".default = (f.version_check."0.1.5".default or true);
}) [];
@@ -3678,7 +3678,7 @@ rec {
]) else []);
features = mkFeatures (features."winapi"."0.3.6" or {});
};
- features_.winapi."0.3.6" = deps: f: updateFeatures f (rec {
+ features_.winapi."0.3.6" = deps: f: updateFeatures f ({
winapi."0.3.6".default = (f.winapi."0.3.6".default or true);
winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true;
winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true;
@@ -3698,7 +3698,7 @@ rec {
sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
build = "build.rs";
};
- features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({
winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true);
}) [];
@@ -3715,7 +3715,7 @@ rec {
(crates."winapi"."${deps."winapi_util"."0.1.1"."winapi"}" deps)
]) else []);
};
- features_.winapi_util."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.winapi_util."0.1.1" = deps: f: updateFeatures f ({
winapi = fold recursiveUpdate {} [
{ "${deps.winapi_util."0.1.1".winapi}"."consoleapi" = true; }
{ "${deps.winapi_util."0.1.1".winapi}"."errhandlingapi" = true; }
@@ -3747,7 +3747,7 @@ rec {
(crates."winapi"."${deps."winapi_util"."0.1.2"."winapi"}" deps)
]) else []);
};
- features_.winapi_util."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.winapi_util."0.1.2" = deps: f: updateFeatures f ({
winapi = fold recursiveUpdate {} [
{ "${deps.winapi_util."0.1.2".winapi}"."consoleapi" = true; }
{ "${deps.winapi_util."0.1.2".winapi}"."errhandlingapi" = true; }
@@ -3777,7 +3777,7 @@ rec {
sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
build = "build.rs";
};
- features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({
winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true);
}) [];
@@ -3795,7 +3795,7 @@ rec {
(crates."winapi_util"."${deps."wincolor"."1.0.1"."winapi_util"}" deps)
]);
};
- features_.wincolor."1.0.1" = deps: f: updateFeatures f (rec {
+ features_.wincolor."1.0.1" = deps: f: updateFeatures f ({
winapi = fold recursiveUpdate {} [
{ "${deps.wincolor."1.0.1".winapi}"."minwindef" = true; }
{ "${deps.wincolor."1.0.1".winapi}"."wincon" = true; }
@@ -4104,7 +4104,7 @@ rec {
dependencies = mapFeatures features ([
]);
};
- features_.bytesize."1.0.0" = deps: f: updateFeatures f (rec {
+ features_.bytesize."1.0.0" = deps: f: updateFeatures f ({
bytesize."1.0.0".default = (f.bytesize."1.0.0".default or true);
}) [];
@@ -4549,7 +4549,7 @@ rec {
build = "build.rs";
features = mkFeatures (features."core_foundation_sys"."0.6.2" or {});
};
- features_.core_foundation_sys."0.6.2" = deps: f: updateFeatures f (rec {
+ features_.core_foundation_sys."0.6.2" = deps: f: updateFeatures f ({
core_foundation_sys."0.6.2".default = (f.core_foundation_sys."0.6.2".default or true);
}) [];
@@ -4576,7 +4576,7 @@ rec {
(crates."url"."${deps."crates_io"."0.23.0"."url"}" deps)
]);
};
- features_.crates_io."0.23.0" = deps: f: updateFeatures f (rec {
+ features_.crates_io."0.23.0" = deps: f: updateFeatures f ({
crates_io."0.23.0".default = (f.crates_io."0.23.0".default or true);
curl."${deps.crates_io."0.23.0".curl}".default = true;
failure."${deps.crates_io."0.23.0".failure}".default = true;
@@ -4670,7 +4670,7 @@ rec {
(crates."smallvec"."${deps."crossbeam_channel"."0.3.8"."smallvec"}" deps)
]);
};
- features_.crossbeam_channel."0.3.8" = deps: f: updateFeatures f (rec {
+ features_.crossbeam_channel."0.3.8" = deps: f: updateFeatures f ({
crossbeam_channel."0.3.8".default = (f.crossbeam_channel."0.3.8".default or true);
crossbeam_utils."${deps.crossbeam_channel."0.3.8".crossbeam_utils}".default = true;
smallvec."${deps.crossbeam_channel."0.3.8".smallvec}".default = true;
@@ -4737,7 +4737,7 @@ rec {
(crates."winapi"."${deps."crypto_hash"."0.3.3"."winapi"}" deps)
]) else []);
};
- features_.crypto_hash."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.crypto_hash."0.3.3" = deps: f: updateFeatures f ({
commoncrypto."${deps.crypto_hash."0.3.3".commoncrypto}".default = true;
crypto_hash."0.3.3".default = (f.crypto_hash."0.3.3".default or true);
hex."${deps.crypto_hash."0.3.3".hex}".default = true;
@@ -4929,7 +4929,7 @@ rec {
(crates."strsim"."${deps."docopt"."1.1.0"."strsim"}" deps)
]);
};
- features_.docopt."1.1.0" = deps: f: updateFeatures f (rec {
+ features_.docopt."1.1.0" = deps: f: updateFeatures f ({
docopt."1.1.0".default = (f.docopt."1.1.0".default or true);
lazy_static."${deps.docopt."1.1.0".lazy_static}".default = true;
regex."${deps.docopt."1.1.0".regex}".default = true;
@@ -4989,7 +4989,7 @@ rec {
(crates."libc"."${deps."filetime"."0.2.4"."libc"}" deps)
]) else []);
};
- features_.filetime."0.2.4" = deps: f: updateFeatures f (rec {
+ features_.filetime."0.2.4" = deps: f: updateFeatures f ({
cfg_if."${deps.filetime."0.2.4".cfg_if}".default = true;
filetime."0.2.4".default = (f.filetime."0.2.4".default or true);
libc."${deps.filetime."0.2.4".libc}".default = true;
@@ -5078,7 +5078,7 @@ rec {
sha256 = "128mlh23y3gg6ag5h8iiqlcbl59smisdzraqy88ldrf75kbw27ip";
libPath = "lib.rs";
};
- features_.fnv."1.0.6" = deps: f: updateFeatures f (rec {
+ features_.fnv."1.0.6" = deps: f: updateFeatures f ({
fnv."1.0.6".default = (f.fnv."1.0.6".default or true);
}) [];
@@ -5096,7 +5096,7 @@ rec {
(crates."foreign_types_shared"."${deps."foreign_types"."0.3.2"."foreign_types_shared"}" deps)
]);
};
- features_.foreign_types."0.3.2" = deps: f: updateFeatures f (rec {
+ features_.foreign_types."0.3.2" = deps: f: updateFeatures f ({
foreign_types."0.3.2".default = (f.foreign_types."0.3.2".default or true);
foreign_types_shared."${deps.foreign_types."0.3.2".foreign_types_shared}".default = true;
}) [
@@ -5114,7 +5114,7 @@ rec {
authors = [ "Steven Fackler " ];
sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5";
};
- features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f ({
foreign_types_shared."0.1.1".default = (f.foreign_types_shared."0.1.1".default or true);
}) [];
@@ -5135,7 +5135,7 @@ rec {
(crates."winapi"."${deps."fs2"."0.4.3"."winapi"}" deps)
]) else []);
};
- features_.fs2."0.4.3" = deps: f: updateFeatures f (rec {
+ features_.fs2."0.4.3" = deps: f: updateFeatures f ({
fs2."0.4.3".default = (f.fs2."0.4.3".default or true);
libc."${deps.fs2."0.4.3".libc}".default = true;
winapi = fold recursiveUpdate {} [
@@ -5167,7 +5167,7 @@ rec {
(crates."termcolor"."${deps."fwdansi"."1.0.1"."termcolor"}" deps)
]);
};
- features_.fwdansi."1.0.1" = deps: f: updateFeatures f (rec {
+ features_.fwdansi."1.0.1" = deps: f: updateFeatures f ({
fwdansi."1.0.1".default = (f.fwdansi."1.0.1".default or true);
memchr."${deps.fwdansi."1.0.1".memchr}".default = true;
termcolor."${deps.fwdansi."1.0.1".termcolor}".default = true;
@@ -5279,7 +5279,7 @@ rec {
(crates."url"."${deps."git2_curl"."0.9.0"."url"}" deps)
]);
};
- features_.git2_curl."0.9.0" = deps: f: updateFeatures f (rec {
+ features_.git2_curl."0.9.0" = deps: f: updateFeatures f ({
curl."${deps.git2_curl."0.9.0".curl}".default = true;
git2."${deps.git2_curl."0.9.0".git2}".default = (f.git2."${deps.git2_curl."0.9.0".git2}".default or false);
git2_curl."0.9.0".default = (f.git2_curl."0.9.0".default or true);
@@ -5303,7 +5303,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf";
};
- features_.glob."0.2.11" = deps: f: updateFeatures f (rec {
+ features_.glob."0.2.11" = deps: f: updateFeatures f ({
glob."0.2.11".default = (f.glob."0.2.11".default or true);
}) [];
@@ -5326,7 +5326,7 @@ rec {
]);
features = mkFeatures (features."globset"."0.4.3" or {});
};
- features_.globset."0.4.3" = deps: f: updateFeatures f (rec {
+ features_.globset."0.4.3" = deps: f: updateFeatures f ({
aho_corasick."${deps.globset."0.4.3".aho_corasick}".default = true;
bstr = fold recursiveUpdate {} [
{ "${deps.globset."0.4.3".bstr}"."std" = true; }
@@ -5360,7 +5360,7 @@ rec {
]);
features = mkFeatures (features."hashbrown"."0.1.8" or {});
};
- features_.hashbrown."0.1.8" = deps: f: updateFeatures f (rec {
+ features_.hashbrown."0.1.8" = deps: f: updateFeatures f ({
byteorder."${deps.hashbrown."0.1.8".byteorder}".default = (f.byteorder."${deps.hashbrown."0.1.8".byteorder}".default or false);
hashbrown."0.1.8".default = (f.hashbrown."0.1.8".default or true);
scopeguard."${deps.hashbrown."0.1.8".scopeguard}".default = (f.scopeguard."${deps.hashbrown."0.1.8".scopeguard}".default or false);
@@ -5381,7 +5381,7 @@ rec {
sha256 = "0hs0xfb4x67y4ss9mmbjmibkwakbn3xf23i21m409bw2zqk9b6kz";
features = mkFeatures (features."hex"."0.3.2" or {});
};
- features_.hex."0.3.2" = deps: f: updateFeatures f (rec {
+ features_.hex."0.3.2" = deps: f: updateFeatures f ({
hex."0.3.2".default = (f.hex."0.3.2".default or true);
}) [];
@@ -5400,7 +5400,7 @@ rec {
(crates."winapi"."${deps."home"."0.3.4"."winapi"}" deps)
]) else []);
};
- features_.home."0.3.4" = deps: f: updateFeatures f (rec {
+ features_.home."0.3.4" = deps: f: updateFeatures f ({
home."0.3.4".default = (f.home."0.3.4".default or true);
scopeguard."${deps.home."0.3.4".scopeguard}".default = true;
winapi = fold recursiveUpdate {} [
@@ -5434,7 +5434,7 @@ rec {
(crates."itoa"."${deps."http"."0.1.17"."itoa"}" deps)
]);
};
- features_.http."0.1.17" = deps: f: updateFeatures f (rec {
+ features_.http."0.1.17" = deps: f: updateFeatures f ({
bytes."${deps.http."0.1.17".bytes}".default = true;
fnv."${deps.http."0.1.17".fnv}".default = true;
http."0.1.17".default = (f.http."0.1.17".default or true);
@@ -5524,7 +5524,7 @@ rec {
(crates."rustc_version"."${deps."im_rc"."12.3.4"."rustc_version"}" deps)
]);
};
- features_.im_rc."12.3.4" = deps: f: updateFeatures f (rec {
+ features_.im_rc."12.3.4" = deps: f: updateFeatures f ({
im_rc."12.3.4".default = (f.im_rc."12.3.4".default or true);
rustc_version."${deps.im_rc."12.3.4".rustc_version}".default = true;
sized_chunks."${deps.im_rc."12.3.4".sized_chunks}".default = true;
@@ -5552,7 +5552,7 @@ rec {
(crates."winapi"."${deps."iovec"."0.1.2"."winapi"}" deps)
]) else []);
};
- features_.iovec."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.iovec."0.1.2" = deps: f: updateFeatures f ({
iovec."0.1.2".default = (f.iovec."0.1.2".default or true);
libc."${deps.iovec."0.1.2".libc}".default = true;
winapi."${deps.iovec."0.1.2".winapi}".default = true;
@@ -5609,7 +5609,7 @@ rec {
(crates."rand"."${deps."jobserver"."0.1.13"."rand"}" deps)
]) else []);
};
- features_.jobserver."0.1.13" = deps: f: updateFeatures f (rec {
+ features_.jobserver."0.1.13" = deps: f: updateFeatures f ({
jobserver."0.1.13".default = (f.jobserver."0.1.13".default or true);
libc."${deps.jobserver."0.1.13".libc}".default = true;
log."${deps.jobserver."0.1.13".log}".default = true;
@@ -5640,7 +5640,7 @@ rec {
(crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps)
]);
};
- features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec {
+ features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({
kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true);
winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true;
winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true;
@@ -5790,7 +5790,7 @@ rec {
(crates."cc"."${deps."libnghttp2_sys"."0.1.1"."cc"}" deps)
]);
};
- features_.libnghttp2_sys."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.libnghttp2_sys."0.1.1" = deps: f: updateFeatures f ({
cc."${deps.libnghttp2_sys."0.1.1".cc}".default = true;
libc."${deps.libnghttp2_sys."0.1.1".libc}".default = true;
libnghttp2_sys."0.1.1".default = (f.libnghttp2_sys."0.1.1".default or true);
@@ -5827,7 +5827,7 @@ rec {
(crates."pkg_config"."${deps."libssh2_sys"."0.2.11"."pkg_config"}" deps)
]);
};
- features_.libssh2_sys."0.2.11" = deps: f: updateFeatures f (rec {
+ features_.libssh2_sys."0.2.11" = deps: f: updateFeatures f ({
cc."${deps.libssh2_sys."0.2.11".cc}".default = true;
libc."${deps.libssh2_sys."0.2.11".libc}".default = true;
libssh2_sys."0.2.11".default = (f.libssh2_sys."0.2.11".default or true);
@@ -5865,7 +5865,7 @@ rec {
]);
features = mkFeatures (features."libz_sys"."1.0.25" or {});
};
- features_.libz_sys."1.0.25" = deps: f: updateFeatures f (rec {
+ features_.libz_sys."1.0.25" = deps: f: updateFeatures f ({
cc."${deps.libz_sys."1.0.25".cc}".default = true;
libc."${deps.libz_sys."1.0.25".libc}".default = true;
libz_sys."1.0.25".default = (f.libz_sys."1.0.25".default or true);
@@ -5891,7 +5891,7 @@ rec {
]);
features = mkFeatures (features."lock_api"."0.1.5" or {});
};
- features_.lock_api."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.lock_api."0.1.5" = deps: f: updateFeatures f ({
lock_api."0.1.5".default = (f.lock_api."0.1.5".default or true);
scopeguard."${deps.lock_api."0.1.5".scopeguard}".default = (f.scopeguard."${deps.lock_api."0.1.5".scopeguard}".default or false);
}) [
@@ -5913,7 +5913,7 @@ rec {
(crates."rawpointer"."${deps."matrixmultiply"."0.1.15"."rawpointer"}" deps)
]);
};
- features_.matrixmultiply."0.1.15" = deps: f: updateFeatures f (rec {
+ features_.matrixmultiply."0.1.15" = deps: f: updateFeatures f ({
matrixmultiply."0.1.15".default = (f.matrixmultiply."0.1.15".default or true);
rawpointer."${deps.matrixmultiply."0.1.15".rawpointer}".default = true;
}) [
@@ -5941,7 +5941,7 @@ rec {
(crates."cc"."${deps."miniz_sys"."0.1.11"."cc"}" deps)
]);
};
- features_.miniz_sys."0.1.11" = deps: f: updateFeatures f (rec {
+ features_.miniz_sys."0.1.11" = deps: f: updateFeatures f ({
cc."${deps.miniz_sys."0.1.11".cc}".default = true;
libc."${deps.miniz_sys."0.1.11".libc}".default = true;
miniz_sys."0.1.11".default = (f.miniz_sys."0.1.11".default or true);
@@ -5964,7 +5964,7 @@ rec {
(crates."adler32"."${deps."miniz_oxide"."0.2.1"."adler32"}" deps)
]);
};
- features_.miniz_oxide."0.2.1" = deps: f: updateFeatures f (rec {
+ features_.miniz_oxide."0.2.1" = deps: f: updateFeatures f ({
adler32."${deps.miniz_oxide."0.2.1".adler32}".default = true;
miniz_oxide."0.2.1".default = (f.miniz_oxide."0.2.1".default or true);
}) [
@@ -6039,7 +6039,7 @@ rec {
(crates."winapi"."${deps."miow"."0.3.3"."winapi"}" deps)
]);
};
- features_.miow."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.miow."0.3.3" = deps: f: updateFeatures f ({
miow."0.3.3".default = (f.miow."0.3.3".default or true);
socket2."${deps.miow."0.3.3".socket2}".default = true;
winapi = fold recursiveUpdate {} [
@@ -6200,7 +6200,7 @@ rec {
(crates."libc"."${deps."num_cpus"."1.10.0"."libc"}" deps)
]);
};
- features_.num_cpus."1.10.0" = deps: f: updateFeatures f (rec {
+ features_.num_cpus."1.10.0" = deps: f: updateFeatures f ({
libc."${deps.num_cpus."1.10.0".libc}".default = true;
num_cpus."1.10.0".default = (f.num_cpus."1.10.0".default or true);
}) [
@@ -6253,7 +6253,7 @@ rec {
(crates."winapi"."${deps."opener"."0.3.2"."winapi"}" deps)
]) else []);
};
- features_.opener."0.3.2" = deps: f: updateFeatures f (rec {
+ features_.opener."0.3.2" = deps: f: updateFeatures f ({
failure."${deps.opener."0.3.2".failure}".default = true;
failure_derive."${deps.opener."0.3.2".failure_derive}".default = true;
opener."0.3.2".default = (f.opener."0.3.2".default or true);
@@ -6321,7 +6321,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "1a89fznx26vvaxyrxdvgf6iwai5xvs6xjvpjin68fgvrslv6n15a";
};
- features_.openssl_probe."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.openssl_probe."0.1.2" = deps: f: updateFeatures f ({
openssl_probe."0.1.2".default = (f.openssl_probe."0.1.2".default or true);
}) [];
@@ -6339,7 +6339,7 @@ rec {
(crates."cc"."${deps."openssl_src"."111.2.1+1.1.1b"."cc"}" deps)
]);
};
- features_.openssl_src."111.2.1+1.1.1b" = deps: f: updateFeatures f (rec {
+ features_.openssl_src."111.2.1+1.1.1b" = deps: f: updateFeatures f ({
cc."${deps.openssl_src."111.2.1+1.1.1b".cc}".default = true;
openssl_src."111.2.1+1.1.1b".default = (f.openssl_src."111.2.1+1.1.1b".default or true);
}) [
@@ -6518,7 +6518,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6";
};
- features_.pkg_config."0.3.14" = deps: f: updateFeatures f (rec {
+ features_.pkg_config."0.3.14" = deps: f: updateFeatures f ({
pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true);
}) [];
@@ -6705,7 +6705,7 @@ rec {
(crates."autocfg"."${deps."rand_chacha"."0.1.1"."autocfg"}" deps)
]);
};
- features_.rand_chacha."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.rand_chacha."0.1.1" = deps: f: updateFeatures f ({
autocfg."${deps.rand_chacha."0.1.1".autocfg}".default = true;
rand_chacha."0.1.1".default = (f.rand_chacha."0.1.1".default or true);
rand_core."${deps.rand_chacha."0.1.1".rand_core}".default = (f.rand_core."${deps.rand_chacha."0.1.1".rand_core}".default or false);
@@ -6728,7 +6728,7 @@ rec {
(crates."rand_core"."${deps."rand_hc"."0.1.0"."rand_core"}" deps)
]);
};
- features_.rand_hc."0.1.0" = deps: f: updateFeatures f (rec {
+ features_.rand_hc."0.1.0" = deps: f: updateFeatures f ({
rand_core."${deps.rand_hc."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_hc."0.1.0".rand_core}".default or false);
rand_hc."0.1.0".default = (f.rand_hc."0.1.0".default or true);
}) [
@@ -6896,7 +6896,7 @@ rec {
authors = [ "bluss" ];
sha256 = "0hblv2cv310ixf5f1jw4nk9w5pb95wh4dwqyjv07g2xrshbw6j04";
};
- features_.rawpointer."0.1.0" = deps: f: updateFeatures f (rec {
+ features_.rawpointer."0.1.0" = deps: f: updateFeatures f ({
rawpointer."0.1.0".default = (f.rawpointer."0.1.0".default or true);
}) [];
@@ -6912,7 +6912,7 @@ rec {
sha256 = "1ndcp7brnvii87ndcd34fk846498r07iznphkslcy0shic9cp4rr";
libName = "syscall";
};
- features_.redox_syscall."0.1.54" = deps: f: updateFeatures f (rec {
+ features_.redox_syscall."0.1.54" = deps: f: updateFeatures f ({
redox_syscall."0.1.54".default = (f.redox_syscall."0.1.54".default or true);
}) [];
@@ -6974,7 +6974,7 @@ rec {
(crates."ucd_util"."${deps."regex_syntax"."0.6.6"."ucd_util"}" deps)
]);
};
- features_.regex_syntax."0.6.6" = deps: f: updateFeatures f (rec {
+ features_.regex_syntax."0.6.6" = deps: f: updateFeatures f ({
regex_syntax."0.6.6".default = (f.regex_syntax."0.6.6".default or true);
ucd_util."${deps.regex_syntax."0.6.6".ucd_util}".default = true;
}) [
@@ -7020,7 +7020,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "0arpdp472j4lrwxbmf4z21d8kh95rbbphnzccf605pqq2rvczv3p";
};
- features_.rustc_workspace_hack."1.0.0" = deps: f: updateFeatures f (rec {
+ features_.rustc_workspace_hack."1.0.0" = deps: f: updateFeatures f ({
rustc_workspace_hack."1.0.0".default = (f.rustc_workspace_hack."1.0.0".default or true);
}) [];
@@ -7038,7 +7038,7 @@ rec {
(crates."semver"."${deps."rustc_version"."0.2.3"."semver"}" deps)
]);
};
- features_.rustc_version."0.2.3" = deps: f: updateFeatures f (rec {
+ features_.rustc_version."0.2.3" = deps: f: updateFeatures f ({
rustc_version."0.2.3".default = (f.rustc_version."0.2.3".default or true);
semver."${deps.rustc_version."0.2.3".semver}".default = true;
}) [
@@ -7063,7 +7063,7 @@ rec {
(crates."serde_json"."${deps."rustfix"."0.4.5"."serde_json"}" deps)
]);
};
- features_.rustfix."0.4.5" = deps: f: updateFeatures f (rec {
+ features_.rustfix."0.4.5" = deps: f: updateFeatures f ({
failure."${deps.rustfix."0.4.5".failure}".default = true;
log."${deps.rustfix."0.4.5".log}".default = true;
rustfix."0.4.5".default = (f.rustfix."0.4.5".default or true);
@@ -7092,7 +7092,7 @@ rec {
(crates."winapi_util"."${deps."same_file"."1.0.4"."winapi_util"}" deps)
]) else []);
};
- features_.same_file."1.0.4" = deps: f: updateFeatures f (rec {
+ features_.same_file."1.0.4" = deps: f: updateFeatures f ({
same_file."1.0.4".default = (f.same_file."1.0.4".default or true);
winapi_util."${deps.same_file."1.0.4".winapi_util}".default = true;
}) [
@@ -7114,7 +7114,7 @@ rec {
(crates."winapi"."${deps."schannel"."0.1.15"."winapi"}" deps)
]);
};
- features_.schannel."0.1.15" = deps: f: updateFeatures f (rec {
+ features_.schannel."0.1.15" = deps: f: updateFeatures f ({
lazy_static."${deps.schannel."0.1.15".lazy_static}".default = true;
schannel."0.1.15".default = (f.schannel."0.1.15".default or true);
winapi = fold recursiveUpdate {} [
@@ -7199,7 +7199,7 @@ rec {
authors = [ "Steve Klabnik " ];
sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h";
};
- features_.semver_parser."0.7.0" = deps: f: updateFeatures f (rec {
+ features_.semver_parser."0.7.0" = deps: f: updateFeatures f ({
semver_parser."0.7.0".default = (f.semver_parser."0.7.0".default or true);
}) [];
@@ -7258,7 +7258,7 @@ rec {
]);
features = mkFeatures (features."serde_derive"."1.0.90" or {});
};
- features_.serde_derive."1.0.90" = deps: f: updateFeatures f (rec {
+ features_.serde_derive."1.0.90" = deps: f: updateFeatures f ({
proc_macro2."${deps.serde_derive."1.0.90".proc_macro2}".default = true;
quote."${deps.serde_derive."1.0.90".quote}".default = true;
serde_derive."1.0.90".default = (f.serde_derive."1.0.90".default or true);
@@ -7286,7 +7286,7 @@ rec {
(crates."serde"."${deps."serde_ignored"."0.0.4"."serde"}" deps)
]);
};
- features_.serde_ignored."0.0.4" = deps: f: updateFeatures f (rec {
+ features_.serde_ignored."0.0.4" = deps: f: updateFeatures f ({
serde."${deps.serde_ignored."0.0.4".serde}".default = true;
serde_ignored."0.0.4".default = (f.serde_ignored."0.0.4".default or true);
}) [
@@ -7304,7 +7304,7 @@ rec {
authors = [ "Steven Fackler " ];
sha256 = "02ik28la039b8anx0sx8mbdp2yx66m64mjrjyy6x0dgpbmfxmc24";
};
- features_.shell_escape."0.1.4" = deps: f: updateFeatures f (rec {
+ features_.shell_escape."0.1.4" = deps: f: updateFeatures f ({
shell_escape."0.1.4".default = (f.shell_escape."0.1.4".default or true);
}) [];
@@ -7323,7 +7323,7 @@ rec {
(crates."typenum"."${deps."sized_chunks"."0.1.3"."typenum"}" deps)
]);
};
- features_.sized_chunks."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.sized_chunks."0.1.3" = deps: f: updateFeatures f ({
sized_chunks."0.1.3".default = (f.sized_chunks."0.1.3".default or true);
typenum."${deps.sized_chunks."0.1.3".typenum}".default = true;
}) [
@@ -7352,7 +7352,7 @@ rec {
]) else []);
features = mkFeatures (features."socket2"."0.3.8" or {});
};
- features_.socket2."0.3.8" = deps: f: updateFeatures f (rec {
+ features_.socket2."0.3.8" = deps: f: updateFeatures f ({
cfg_if."${deps.socket2."0.3.8".cfg_if}".default = true;
libc."${deps.socket2."0.3.8".libc}".default = true;
redox_syscall."${deps.socket2."0.3.8".redox_syscall}".default = true;
@@ -7383,7 +7383,7 @@ rec {
authors = [ "Danny Guo " ];
sha256 = "0d3jsdz22wgjyxdakqnvdgmwjdvkximz50d9zfk4qlalw635qcvy";
};
- features_.strsim."0.8.0" = deps: f: updateFeatures f (rec {
+ features_.strsim."0.8.0" = deps: f: updateFeatures f ({
strsim."0.8.0".default = (f.strsim."0.8.0".default or true);
}) [];
@@ -7402,7 +7402,7 @@ rec {
(crates."ndarray"."${deps."strsim"."0.9.1"."ndarray"}" deps)
]);
};
- features_.strsim."0.9.1" = deps: f: updateFeatures f (rec {
+ features_.strsim."0.9.1" = deps: f: updateFeatures f ({
hashbrown."${deps.strsim."0.9.1".hashbrown}".default = true;
ndarray."${deps.strsim."0.9.1".ndarray}".default = true;
strsim."0.9.1".default = (f.strsim."0.9.1".default or true);
@@ -7539,7 +7539,7 @@ rec {
(crates."winapi"."${deps."tempfile"."3.0.7"."winapi"}" deps)
]) else []);
};
- features_.tempfile."3.0.7" = deps: f: updateFeatures f (rec {
+ features_.tempfile."3.0.7" = deps: f: updateFeatures f ({
cfg_if."${deps.tempfile."3.0.7".cfg_if}".default = true;
libc."${deps.tempfile."3.0.7".libc}".default = true;
rand."${deps.tempfile."3.0.7".rand}".default = true;
@@ -7575,7 +7575,7 @@ rec {
(crates."unicode_width"."${deps."textwrap"."0.11.0"."unicode_width"}" deps)
]);
};
- features_.textwrap."0.11.0" = deps: f: updateFeatures f (rec {
+ features_.textwrap."0.11.0" = deps: f: updateFeatures f ({
textwrap."0.11.0".default = (f.textwrap."0.11.0".default or true);
unicode_width."${deps.textwrap."0.11.0".unicode_width}".default = true;
}) [
@@ -7595,7 +7595,7 @@ rec {
build = "build/main.rs";
features = mkFeatures (features."typenum"."1.10.0" or {});
};
- features_.typenum."1.10.0" = deps: f: updateFeatures f (rec {
+ features_.typenum."1.10.0" = deps: f: updateFeatures f ({
typenum."1.10.0".default = (f.typenum."1.10.0".default or true);
}) [];
@@ -7614,7 +7614,7 @@ rec {
(crates."url"."${deps."url_serde"."0.2.0"."url"}" deps)
]);
};
- features_.url_serde."0.2.0" = deps: f: updateFeatures f (rec {
+ features_.url_serde."0.2.0" = deps: f: updateFeatures f ({
serde."${deps.url_serde."0.2.0".serde}".default = true;
url."${deps.url_serde."0.2.0".url}".default = true;
url_serde."0.2.0".default = (f.url_serde."0.2.0".default or true);
@@ -7634,7 +7634,7 @@ rec {
authors = [ "Jim McGrath " ];
sha256 = "1ig6jqpzzl1z9vk4qywgpfr4hfbd8ny8frqsgm3r449wkc4n1i5x";
};
- features_.vcpkg."0.2.6" = deps: f: updateFeatures f (rec {
+ features_.vcpkg."0.2.6" = deps: f: updateFeatures f ({
vcpkg."0.2.6".default = (f.vcpkg."0.2.6".default or true);
}) [];
@@ -7656,7 +7656,7 @@ rec {
(crates."winapi_util"."${deps."walkdir"."2.2.7"."winapi_util"}" deps)
]) else []);
};
- features_.walkdir."2.2.7" = deps: f: updateFeatures f (rec {
+ features_.walkdir."2.2.7" = deps: f: updateFeatures f ({
same_file."${deps.walkdir."2.2.7".same_file}".default = true;
walkdir."2.2.7".default = (f.walkdir."2.2.7".default or true);
winapi = fold recursiveUpdate {} [
@@ -7682,7 +7682,7 @@ rec {
authors = [ "Peter Atashian " ];
sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
};
- features_.winapi."0.2.8" = deps: f: updateFeatures f (rec {
+ features_.winapi."0.2.8" = deps: f: updateFeatures f ({
winapi."0.2.8".default = (f.winapi."0.2.8".default or true);
}) [];
@@ -7732,7 +7732,7 @@ rec {
sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
libName = "build";
};
- features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({
winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true);
}) [];
@@ -7747,7 +7747,7 @@ rec {
authors = [ "Remi Rampin " ];
sha256 = "1z3mvjgw02mbqk98kizzibrca01d5wfkpazsrp3vkkv3i56pn6fb";
};
- features_.adler32."1.0.3" = deps: f: updateFeatures f (rec {
+ features_.adler32."1.0.3" = deps: f: updateFeatures f ({
adler32."1.0.3".default = (f.adler32."1.0.3".default or true);
}) [];
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 09802d56d34c..ce1bf8002767 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -44,8 +44,8 @@ let
hostConfig = stdenv.hostPlatform.config;
rustHostConfig = {
- "x86_64-pc-mingw32" = "x86_64-pc-windows-gnu";
- }."${hostConfig}" or hostConfig;
+ x86_64-pc-mingw32 = "x86_64-pc-windows-gnu";
+ }.${hostConfig} or hostConfig;
ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc";
cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++";
diff --git a/pkgs/build-support/setup-hooks/install-shell-files.sh b/pkgs/build-support/setup-hooks/install-shell-files.sh
new file mode 100644
index 000000000000..e0ea1f7f30a7
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/install-shell-files.sh
@@ -0,0 +1,165 @@
+#!/bin/bash
+# Setup hook for the `installShellFiles` package.
+#
+# Example usage in a derivation:
+#
+# { …, installShellFiles, … }:
+# stdenv.mkDerivation {
+# …
+# nativeBuildInputs = [ installShellFiles ];
+# postInstall = ''
+# installManPage share/doc/foobar.1
+# installShellCompletion share/completions/foobar.{bash,fish,zsh}
+# '';
+# …
+# }
+#
+# See comments on each function for more details.
+
+# installManPage [...]
+#
+# Each argument is checked for its man section suffix and installed into the appropriate
+# share/man/ directory. The function returns an error if any paths don't have the man section
+# suffix (with optional .gz compression).
+installManPage() {
+ local path
+ for path in "$@"; do
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then
+ echo "installManPage: installing $path"
+ fi
+ if test -z "$path"; then
+ echo "installManPage: error: path cannot be empty" >&2
+ return 1
+ fi
+ local basename
+ basename=$(stripHash "$path") # use stripHash in case it's a nix store path
+ local trimmed=${basename%.gz} # don't get fooled by compressed manpages
+ local suffix=${trimmed##*.}
+ if test -z "$suffix" -o "$suffix" = "$trimmed"; then
+ echo "installManPage: error: path missing manpage section suffix: $path" >&2
+ return 1
+ fi
+ local outRoot
+ if test "$suffix" = 3; then
+ outRoot=${!outputDevman:?}
+ else
+ outRoot=${!outputMan:?}
+ fi
+ install -Dm644 -T "$path" "${outRoot}/share/man/man$suffix/$basename" || return
+ done
+}
+
+# installShellCompletion [--bash|--fish|--zsh] ([--name ] )...
+#
+# Each path is installed into the appropriate directory for shell completions for the given shell.
+# If one of `--bash`, `--fish`, or `--zsh` is given the path is assumed to belong to that shell.
+# Otherwise the file extension will be examined to pick a shell. If the shell is unknown a warning
+# will be logged and the command will return a non-zero status code after processing any remaining
+# paths. Any of the shell flags will affect all subsequent paths (unless another shell flag is
+# given).
+#
+# If the shell completion needs to be renamed before installing the optional `--name ` flag
+# may be given. Any name provided with this flag only applies to the next path.
+#
+# For zsh completions, if the `--name` flag is not given, the path will be automatically renamed
+# such that `foobar.zsh` becomes `_foobar`.
+#
+# This command accepts multiple shell flags in conjunction with multiple paths if you wish to
+# install them all in one command:
+#
+# installShellCompletion share/completions/foobar.{bash,fish} --zsh share/completions/_foobar
+#
+# However it may be easier to read if each shell is split into its own invocation, especially when
+# renaming is involved:
+#
+# installShellCompletion --bash --name foobar.bash share/completions.bash
+# installShellCompletion --fish --name foobar.fish share/completions.fish
+# installShellCompletion --zsh --name _foobar share/completions.zsh
+#
+# If any argument is `--` the remaining arguments will be treated as paths.
+installShellCompletion() {
+ local shell='' name='' retval=0 parseArgs=1 arg
+ while { arg=$1; shift; }; do
+ # Parse arguments
+ if (( parseArgs )); then
+ case "$arg" in
+ --bash|--fish|--zsh)
+ shell=${arg#--}
+ continue;;
+ --name)
+ name=$1
+ shift || {
+ echo 'installShellCompletion: error: --name flag expected an argument' >&2
+ return 1
+ }
+ continue;;
+ --name=*)
+ # treat `--name=foo` the same as `--name foo`
+ name=${arg#--name=}
+ continue;;
+ --?*)
+ echo "installShellCompletion: warning: unknown flag ${arg%%=*}" >&2
+ retval=2
+ continue;;
+ --)
+ # treat remaining args as paths
+ parseArgs=0
+ continue;;
+ esac
+ fi
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then
+ echo "installShellCompletion: installing $arg${name:+ as $name}"
+ fi
+ # if we get here, this is a path
+ # Identify shell
+ local basename
+ basename=$(stripHash "$arg")
+ local curShell=$shell
+ if [[ -z "$curShell" ]]; then
+ # auto-detect the shell
+ case "$basename" in
+ ?*.bash) curShell=bash;;
+ ?*.fish) curShell=fish;;
+ ?*.zsh) curShell=zsh;;
+ *)
+ if [[ "$basename" = _* && "$basename" != *.* ]]; then
+ # probably zsh
+ echo "installShellCompletion: warning: assuming path \`$arg' is zsh; please specify with --zsh" >&2
+ curShell=zsh
+ else
+ echo "installShellCompletion: warning: unknown shell for path: $arg" >&2
+ retval=2
+ continue
+ fi;;
+ esac
+ fi
+ # Identify output path
+ local outName sharePath
+ outName=${name:-$basename}
+ case "$curShell" in
+ bash) sharePath=bash-completion/completions;;
+ fish) sharePath=fish/vendor_completions.d;;
+ zsh)
+ sharePath=zsh/site-functions
+ # only apply automatic renaming if we didn't have a manual rename
+ if test -z "$name"; then
+ # convert a name like `foo.zsh` into `_foo`
+ outName=${outName%.zsh}
+ outName=_${outName#_}
+ fi;;
+ *)
+ # Our list of shells is out of sync with the flags we accept or extensions we detect.
+ echo 'installShellCompletion: internal error' >&2
+ return 1;;
+ esac
+ # Install file
+ install -Dm644 -T "$arg" "${!outputBin:?}/share/$sharePath/$outName" || return
+ # Clear the name, it only applies to one path
+ name=
+ done
+ if [[ -n "$name" ]]; then
+ echo 'installShellCompletion: error: --name flag given with no path' >&2
+ return 1
+ fi
+ return $retval
+}
diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix
index aca4e340e267..30465c740e53 100644
--- a/pkgs/build-support/templaterpm/default.nix
+++ b/pkgs/build-support/templaterpm/default.nix
@@ -1,7 +1,7 @@
{stdenv, makeWrapper, python, toposort, rpm}:
-stdenv.mkDerivation rec {
- name = "nix-template-rpm-${version}";
+stdenv.mkDerivation {
+ pname = "nix-template-rpm";
version = "0.1";
buildInputs = [ makeWrapper python toposort rpm ];
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 0bfe14a85393..55df09121b42 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -381,4 +381,37 @@ rec {
# Copy a list of paths to the Nix store.
copyPathsToStore = builtins.map copyPathToStore;
+ /* Applies a list of patches to a source directory.
+ *
+ * Examples:
+ *
+ * # Patching nixpkgs:
+ * applyPatches {
+ * src = pkgs.path;
+ * patches = [
+ * (pkgs.fetchpatch {
+ * url = "https://github.com/NixOS/nixpkgs/commit/1f770d20550a413e508e081ddc08464e9d08ba3d.patch";
+ * sha256 = "1nlzx171y3r3jbk0qhvnl711kmdk57jlq4na8f8bs8wz2pbffymr";
+ * })
+ * ];
+ * }
+ */
+ applyPatches =
+ { src
+ , name ? (if builtins.typeOf src == "path"
+ then builtins.baseNameOf src
+ else
+ if builtins.isAttrs src && builtins.hasAttr "name" src
+ then src.name
+ else throw "applyPatches: please supply a `name` argument because a default name can only be computed when the `src` is a path or is an attribute set with a `name` attribute."
+ ) + "-patched"
+ , patches ? []
+ , postPatch ? ""
+ }: stdenvNoCC.mkDerivation {
+ inherit name src patches postPatch;
+ preferLocalBuild = true;
+ allowSubstitutes = false;
+ phases = "unpackPhase patchPhase installPhase";
+ installPhase = "cp -R ./ $out";
+ };
}
diff --git a/pkgs/build-support/upstream-updater/attrset-to-dir.nix b/pkgs/build-support/upstream-updater/attrset-to-dir.nix
index bdf44b7a5bf3..24f7b735c2e2 100644
--- a/pkgs/build-support/upstream-updater/attrset-to-dir.nix
+++ b/pkgs/build-support/upstream-updater/attrset-to-dir.nix
@@ -1,5 +1,5 @@
a :
-a.stdenv.mkDerivation rec {
+a.stdenv.mkDerivation {
buildCommand = ''
mkdir -p "$out/attributes"
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index a59da3a8745b..371ab13c5281 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -741,7 +741,7 @@ rec {
# Note: no i386 release for Fedora >= 26
fedora26x86_64 =
let version = "26";
- in rec {
+ in {
name = "fedora-${version}-x86_64";
fullName = "Fedora ${version} (x86_64)";
packagesList = fetchurl rec {
@@ -756,7 +756,7 @@ rec {
fedora27x86_64 =
let version = "27";
- in rec {
+ in {
name = "fedora-${version}-x86_64";
fullName = "Fedora ${version} (x86_64)";
packagesList = fetchurl rec {
@@ -816,7 +816,7 @@ rec {
/* The set of supported Dpkg-based distributions. */
- debDistros = rec {
+ debDistros = {
# Interestingly, the SHA-256 hashes provided by Ubuntu in
# http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are
diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix
index d0d85fce3662..698503032671 100644
--- a/pkgs/build-support/vm/test.nix
+++ b/pkgs/build-support/vm/test.nix
@@ -1,7 +1,7 @@
with import ../../.. {};
with vmTools;
-rec {
+{
# Run the PatchELF derivation in a VM.
diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index e5ff13f0da9d..48ee2713d1f6 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -25,7 +25,7 @@ in {
bootstrap = bootstrapper attrs.windowsImage;
in {
requiredSystemFeatures = [ "kvm" ];
- builder = "${pkgs.stdenv.shell}";
+ builder = pkgs.stdenv.shell;
args = ["-e" (bootstrap.resumeAndRun builder)];
windowsImage = bootstrap.suspendedVM;
origArgs = attrs.args;
diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index ae7b42449fb3..8dbe0dbdbd03 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -10,12 +10,12 @@ rec {
# makeScriptWriter { interpreter = "${pkgs.dash}/bin/dash"; } "hello" "echo hello world"
makeScriptWriter = { interpreter, check ? "" }: nameOrPath: content:
assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
- assert lib.or (types.path.check content) (types.string.check content);
+ assert lib.or (types.path.check content) (types.str.check content);
let
name = last (builtins.split "/" nameOrPath);
in
- pkgs.runCommand name (if (types.string.check content) then {
+ pkgs.runCommand name (if (types.str.check content) then {
inherit content interpreter;
passAsFile = [ "content" ];
} else {
@@ -42,11 +42,11 @@ rec {
# writeSimpleC = makeBinWriter { compileScript = name: "gcc -o $out $contentPath"; }
makeBinWriter = { compileScript }: nameOrPath: content:
assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
- assert lib.or (types.path.check content) (types.string.check content);
+ assert lib.or (types.path.check content) (types.str.check content);
let
name = last (builtins.split "/" nameOrPath);
in
- pkgs.runCommand name (if (types.string.check content) then {
+ pkgs.runCommand name (if (types.str.check content) then {
inherit content;
passAsFile = [ "content" ];
} else {
diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix
index 80e9543f9c85..d7c347a559ef 100644
--- a/pkgs/build-support/writers/test.nix
+++ b/pkgs/build-support/writers/test.nix
@@ -159,8 +159,8 @@ in runCommand "test-writers" {
meta.platforms = stdenv.lib.platforms.all;
} ''
${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}/bin/test_writers") (lib.attrValues bin)}
- ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}") (lib.attrValues simple)}
- ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}") (lib.attrValues path)}
+ ${lib.concatMapStringsSep "\n" (test: writeTest "success" test) (lib.attrValues simple)}
+ ${lib.concatMapStringsSep "\n" (test: writeTest "success" test) (lib.attrValues path)}
echo 'nix-writers successfully tested' >&2
touch $out
diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix
index 51ebe704beac..7297d18df277 100644
--- a/pkgs/data/documentation/bgnet/default.nix
+++ b/pkgs/data/documentation/bgnet/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, python, zip, fop }:
-stdenv.mkDerivation rec {
- name = "bgnet-${version}";
+stdenv.mkDerivation {
+ pname = "bgnet";
version = "3.0.21";
src = fetchurl {
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index c4ce27501721..8b0696408e63 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "man-pages-${version}";
+ pname = "man-pages";
version = "5.02";
src = fetchurl {
- url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
+ url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
sha256 = "1s4pdz2pwf0kvhdwx2s6lqn3xxzi38yz5jfyq5ymdmswc9gaiyn2";
};
diff --git a/pkgs/data/documentation/mustache-spec/default.nix b/pkgs/data/documentation/mustache-spec/default.nix
index 08690b7cecfc..b2a6eaa15352 100644
--- a/pkgs/data/documentation/mustache-spec/default.nix
+++ b/pkgs/data/documentation/mustache-spec/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "mustache-spec-${version}";
+ pname = "mustache-spec";
version = "1.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix
index d90fa99dd702..b3b2b956de87 100644
--- a/pkgs/data/documentation/std-man-pages/default.nix
+++ b/pkgs/data/documentation/std-man-pages/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "std-man-pages-4.4.0";
src = fetchurl {
diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix
index 25df45258a6f..66f1a5033ebe 100644
--- a/pkgs/data/documentation/stdman/default.nix
+++ b/pkgs/data/documentation/stdman/default.nix
@@ -1,13 +1,13 @@
{ stdenv, curl, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "stdman-${version}";
+ pname = "stdman";
version = "2018.03.11";
src = fetchFromGitHub {
owner = "jeaye";
repo = "stdman";
- rev = "${version}";
+ rev = version;
sha256 = "1017vwhcwlwi5sa8h6pkhj048in826wxnhl6qarykmzksvidff3r";
};
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 9bca390f96e2..2566b162d659 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -3,7 +3,7 @@
, libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }:
mkDerivation rec {
- name = "zeal-${version}";
+ pname = "zeal";
version = "0.6.1";
src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/aileron/default.nix b/pkgs/data/fonts/aileron/default.nix
index ee85ee598827..4961a5e7449d 100644
--- a/pkgs/data/fonts/aileron/default.nix
+++ b/pkgs/data/fonts/aileron/default.nix
@@ -6,7 +6,7 @@ let
pname = "aileron";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}.zip";
diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/data/fonts/ankacoder/condensed.nix
index 53f4d94b38fe..0b6340d1ba94 100644
--- a/pkgs/data/fonts/ankacoder/condensed.nix
+++ b/pkgs/data/fonts/ankacoder/condensed.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let version = "1.100"; in
-fetchzip rec {
+fetchzip {
name = "ankacoder-condensed-${version}";
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${version}.zip";
diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix
index 52e2d4a42330..3a57d08dbc28 100644
--- a/pkgs/data/fonts/ankacoder/default.nix
+++ b/pkgs/data/fonts/ankacoder/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let version = "1.100"; in
-fetchzip rec {
+fetchzip {
name = "ankacoder-${version}";
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoder.${version}.zip";
diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/data/fonts/behdad-fonts/default.nix
index 8b4228ec4235..a0fcd5f7bbf5 100644
--- a/pkgs/data/fonts/behdad-fonts/default.nix
+++ b/pkgs/data/fonts/behdad-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "behdad-fonts";
version = "0.0.3";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "font-store";
repo = "BehdadFont";
diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix
index 29bd001f8089..b1f9312a7e9c 100644
--- a/pkgs/data/fonts/caladea/default.nix
+++ b/pkgs/data/fonts/caladea/default.nix
@@ -2,7 +2,7 @@
let
version = "20130214";
-in fetchzip rec {
+in fetchzip {
name = "caladea-${version}";
url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz";
diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix
index 3c0e314579de..79913bb83980 100644
--- a/pkgs/data/fonts/carlito/default.nix
+++ b/pkgs/data/fonts/carlito/default.nix
@@ -2,7 +2,7 @@
let
version = "20130920";
-in fetchzip rec {
+in fetchzip {
name = "carlito-${version}";
url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz";
diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index e563d201ff3d..38a2d8fe56ca 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -24,7 +24,8 @@ let
};
full-ttf = stdenv.mkDerivation {
- name = "dejavu-fonts-full-${version}";
+ pname = "dejavu-fonts-full";
+ inherit version;
nativeBuildInputs = [fontforge perl perlPackages.IOString perlPackages.FontTTF];
src = fetchFromGitHub {
@@ -44,14 +45,16 @@ let
};
minimal = stdenv.mkDerivation {
- name = "dejavu-fonts-minimal-${version}";
+ pname = "dejavu-fonts-minimal";
+ inherit version;
buildCommand = ''
install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/DejaVuSans.ttf
'';
inherit meta;
};
in stdenv.mkDerivation {
- name = "dejavu-fonts-${version}";
+ pname = "dejavu-fonts";
+ inherit version;
buildCommand = ''
install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/*.ttf
ln -s --relative --force --target-directory=$out/share/fonts/truetype ${minimal}/share/fonts/truetype/DejaVuSans.ttf
diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix
index 27306a0ef05c..eff0c579a707 100644
--- a/pkgs/data/fonts/dina-pcf/default.nix
+++ b/pkgs/data/fonts/dina-pcf/default.nix
@@ -1,8 +1,8 @@
{stdenv, fetchurl, unzip, bdftopcf, mkfontdir, mkfontscale}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2.92";
- name = "dina-font-pcf-${version}";
+ pname = "dina-font-pcf";
src = fetchurl {
url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix
index 8638ec74f77a..0d4cd286219e 100644
--- a/pkgs/data/fonts/dina/default.nix
+++ b/pkgs/data/fonts/dina/default.nix
@@ -2,7 +2,7 @@
let
version = "2.92";
-in fetchzip rec {
+in fetchzip {
name = "dina-font-${version}";
# `meta.homepage` has no direct download link
diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix
index 4837425d19a7..81a1b5649b36 100644
--- a/pkgs/data/fonts/dosemu-fonts/default.nix
+++ b/pkgs/data/fonts/dosemu-fonts/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }:
stdenv.mkDerivation rec {
- name = "dosemu-fonts-${version}";
+ pname = "dosemu-fonts";
version = "1.4.0";
src = fetchurl {
diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix
index 3e71352f8025..171ec10c8f16 100644
--- a/pkgs/data/fonts/emojione/default.nix
+++ b/pkgs/data/fonts/emojione/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }:
stdenv.mkDerivation rec {
- name = "emojione-${version}";
+ pname = "emojione";
version = "1.4";
src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix
index 0e31231d05fc..351a0617ddc8 100644
--- a/pkgs/data/fonts/envypn-font/default.nix
+++ b/pkgs/data/fonts/envypn-font/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, mkfontdir, mkfontscale }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "envypn-font-1.7.1";
src = fetchurl {
diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/data/fonts/eunomia/default.nix
index 55250156fcd0..de68b17d6ebb 100644
--- a/pkgs/data/fonts/eunomia/default.nix
+++ b/pkgs/data/fonts/eunomia/default.nix
@@ -6,7 +6,7 @@ let
pname = "eunomia";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
diff --git a/pkgs/data/fonts/f5_6/default.nix b/pkgs/data/fonts/f5_6/default.nix
index 28969f02364a..175648198cee 100644
--- a/pkgs/data/fonts/f5_6/default.nix
+++ b/pkgs/data/fonts/f5_6/default.nix
@@ -6,7 +6,7 @@ let
pname = "f5_6";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
diff --git a/pkgs/data/fonts/ferrum/default.nix b/pkgs/data/fonts/ferrum/default.nix
index ec3f3218ea56..fe40252ab23d 100644
--- a/pkgs/data/fonts/ferrum/default.nix
+++ b/pkgs/data/fonts/ferrum/default.nix
@@ -6,7 +6,7 @@ let
pname = "ferrum";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}.zip";
diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix
index 09bae8cbea53..46149b0781b5 100644
--- a/pkgs/data/fonts/fira-code/default.nix
+++ b/pkgs/data/fonts/fira-code/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
let
- version = "1.207";
+ version = "2";
in fetchzip {
name = "fira-code-${version}";
@@ -10,9 +10,10 @@ in fetchzip {
postFetch = ''
mkdir -p $out/share/fonts
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
+ unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
'';
- sha256 = "13w2jklqndria2plgangl5gi56v1cj5ja9vznh9079kqnvq0cffz";
+ sha256 = "0kg9lrrjr6wrd4r96y0rnslnaw2276558a369qdvalwb3q1gi8d2";
meta = with stdenv.lib; {
homepage = https://github.com/tonsky/FiraCode;
diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix
index 422258f84d11..bcf02f1328e6 100644
--- a/pkgs/data/fonts/font-awesome-5/default.nix
+++ b/pkgs/data/fonts/font-awesome-5/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub }:
let
- font-awesome = { version, sha256, rev ? version}: fetchFromGitHub rec {
+ font-awesome = { version, sha256, rev ? version}: fetchFromGitHub {
name = "font-awesome-${version}";
diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix
index 59ac4ec850b1..1f861afcf83f 100644
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/pkgs/data/fonts/gohufont/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "gohufont-${version}";
+ pname = "gohufont";
version = "2.1";
src = fetchurl {
- url = "http://font.gohu.org/${name}.tar.gz";
+ url = "http://font.gohu.org/${pname}-${version}.tar.gz";
sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm";
};
diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index d743d2ccbd42..7c1af485a989 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "google-fonts-${version}";
+stdenv.mkDerivation {
+ pname = "google-fonts";
version = "2019-07-14";
src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix
index ef0df1ba67f6..3c49bf7f5656 100644
--- a/pkgs/data/fonts/hack/default.nix
+++ b/pkgs/data/fonts/hack/default.nix
@@ -2,7 +2,7 @@
let
version = "3.003";
-in fetchzip rec {
+in fetchzip {
name = "hack-font-${version}";
url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version}-ttf.zip";
diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
index 759d2c2db1d2..23f6fb29be07 100644
--- a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
+++ b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix
@@ -2,7 +2,7 @@
let
version = "2013.06.07"; # date of most recent file in distribution
-in fetchzip rec {
+in fetchzip {
name = "helvetica-neue-lt-std-${version}";
url = "http://www.ephifonts.com/downloads/helvetica-neue-lt-std.zip";
diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/data/fonts/hyperscrypt/default.nix
index 362781c05bb5..726fbab95bd8 100644
--- a/pkgs/data/fonts/hyperscrypt/default.nix
+++ b/pkgs/data/fonts/hyperscrypt/default.nix
@@ -5,7 +5,7 @@ let
pname = "HyperScrypt";
in
-fetchzip rec {
+fetchzip {
name = "${lib.toLower pname}-font-${version}";
url = "https://gitlab.com/StudioTriple/Hyper-Scrypt/-/archive/${version}/Hyper-Scrypt-${version}.zip";
sha256 = "01pf5p2scmw02s0gxnibiwxbpzczphaaapv0v4s7svk9aw2gmc0m";
diff --git a/pkgs/data/fonts/ia-writer-duospace/default.nix b/pkgs/data/fonts/ia-writer-duospace/default.nix
index a042a31f1d02..1d910ed54a4b 100644
--- a/pkgs/data/fonts/ia-writer-duospace/default.nix
+++ b/pkgs/data/fonts/ia-writer-duospace/default.nix
@@ -2,7 +2,7 @@
let
version = "20180721";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "ia-writer-duospace-${version}";
owner = "iaolo";
diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix
index 7e1014da2102..7401c5694624 100644
--- a/pkgs/data/fonts/ibm-plex/default.nix
+++ b/pkgs/data/fonts/ibm-plex/default.nix
@@ -2,7 +2,7 @@
let
version = "2.0.0";
-in fetchzip rec {
+in fetchzip {
name = "ibm-plex-${version}";
url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
postFetch = ''
diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix
index 7eded5deab48..a170a0780a48 100644
--- a/pkgs/data/fonts/inconsolata/default.nix
+++ b/pkgs/data/fonts/inconsolata/default.nix
@@ -1,7 +1,7 @@
{ stdenv, google-fonts }:
-stdenv.mkDerivation rec {
- name = "inconsolata-${version}";
+stdenv.mkDerivation {
+ pname = "inconsolata";
inherit (google-fonts) src version;
diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix
index 8b5570081757..aec48b120860 100644
--- a/pkgs/data/fonts/inconsolata/lgc.nix
+++ b/pkgs/data/fonts/inconsolata/lgc.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, fontforge}:
stdenv.mkDerivation rec {
- name = "inconsolata-lgc-${version}";
+ pname = "inconsolata-lgc";
version = "1.3";
src = fetchFromGitHub {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
installPhase = ''
find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \;
- install -m444 -Dt $out/share/doc/${name} LICENSE README
+ install -m444 -Dt $out/share/doc/${pname}-${version} LICENSE README
'';
meta = with stdenv.lib; {
diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix
index 4910ef21f9ab..3bc836fa4e48 100644
--- a/pkgs/data/fonts/input-fonts/default.nix
+++ b/pkgs/data/fonts/input-fonts/default.nix
@@ -1,7 +1,7 @@
{ stdenv, requireFile, unzip }:
-stdenv.mkDerivation rec {
- name = "input-fonts-${version}";
+stdenv.mkDerivation {
+ pname = "input-fonts";
version = "2017-08-10"; # date of the download and checksum
src = requireFile {
diff --git a/pkgs/data/fonts/inriafonts/default.nix b/pkgs/data/fonts/inriafonts/default.nix
index 52c28db639ef..5a8e3476bf80 100644
--- a/pkgs/data/fonts/inriafonts/default.nix
+++ b/pkgs/data/fonts/inriafonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "inriafonts";
version = "1.200";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "BlackFoundry";
repo = "InriaFonts";
diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index 0676d3c0e1f6..962769b81445 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchzip }:
let
- version = "2.2.1";
-in fetchzip rec {
+ version = "2.3.0";
+in fetchzip {
name = "iosevka-bin-${version}";
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip";
@@ -12,7 +12,7 @@ in fetchzip rec {
unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
'';
- sha256 = "0d5ys9k8adj9v1hpwbmjqshzpjlnyj81xwp0328vc5q8pvjcfly6";
+ sha256 = "0nry6zsmvcj44rijhbvrry84rh5hrixzb4n1mx9c27vvpy33a56w";
meta = with stdenv.lib; {
homepage = https://be5invis.github.io/Iosevka/;
diff --git a/pkgs/data/fonts/iosevka/package-lock.nix b/pkgs/data/fonts/iosevka/package-lock.nix
index 4a7be92e7375..546482cc0d26 100644
--- a/pkgs/data/fonts/iosevka/package-lock.nix
+++ b/pkgs/data/fonts/iosevka/package-lock.nix
@@ -14,58 +14,58 @@ let
0;
chars = stringToCharacters (substring 0 (len - padding) str);
table = {
- "A" = [0 0 0];
- "B" = [0 0 1];
- "C" = [0 0 2];
- "D" = [0 0 3];
- "E" = [0 1 0];
- "F" = [0 1 1];
- "G" = [0 1 2];
- "H" = [0 1 3];
- "I" = [0 2 0];
- "J" = [0 2 1];
- "K" = [0 2 2];
- "L" = [0 2 3];
- "M" = [0 3 0];
- "N" = [0 3 1];
- "O" = [0 3 2];
- "P" = [0 3 3];
- "Q" = [1 0 0];
- "R" = [1 0 1];
- "S" = [1 0 2];
- "T" = [1 0 3];
- "U" = [1 1 0];
- "V" = [1 1 1];
- "W" = [1 1 2];
- "X" = [1 1 3];
- "Y" = [1 2 0];
- "Z" = [1 2 1];
- "a" = [1 2 2];
- "b" = [1 2 3];
- "c" = [1 3 0];
- "d" = [1 3 1];
- "e" = [1 3 2];
- "f" = [1 3 3];
- "g" = [2 0 0];
- "h" = [2 0 1];
- "i" = [2 0 2];
- "j" = [2 0 3];
- "k" = [2 1 0];
- "l" = [2 1 1];
- "m" = [2 1 2];
- "n" = [2 1 3];
- "o" = [2 2 0];
- "p" = [2 2 1];
- "q" = [2 2 2];
- "r" = [2 2 3];
- "s" = [2 3 0];
- "t" = [2 3 1];
- "u" = [2 3 2];
- "v" = [2 3 3];
- "w" = [3 0 0];
- "x" = [3 0 1];
- "y" = [3 0 2];
- "z" = [3 0 3];
+ A = [0 0 0];
+ B = [0 0 1];
+ C = [0 0 2];
+ D = [0 0 3];
+ E = [0 1 0];
+ F = [0 1 1];
+ G = [0 1 2];
+ H = [0 1 3];
+ I = [0 2 0];
+ J = [0 2 1];
+ K = [0 2 2];
+ L = [0 2 3];
+ M = [0 3 0];
+ N = [0 3 1];
+ O = [0 3 2];
+ P = [0 3 3];
+ Q = [1 0 0];
+ R = [1 0 1];
+ S = [1 0 2];
+ T = [1 0 3];
+ U = [1 1 0];
+ V = [1 1 1];
+ W = [1 1 2];
+ X = [1 1 3];
+ Y = [1 2 0];
+ Z = [1 2 1];
+ a = [1 2 2];
+ b = [1 2 3];
+ c = [1 3 0];
+ d = [1 3 1];
+ e = [1 3 2];
+ f = [1 3 3];
+ g = [2 0 0];
+ h = [2 0 1];
+ i = [2 0 2];
+ j = [2 0 3];
+ k = [2 1 0];
+ l = [2 1 1];
+ m = [2 1 2];
+ n = [2 1 3];
+ o = [2 2 0];
+ p = [2 2 1];
+ q = [2 2 2];
+ r = [2 2 3];
+ s = [2 3 0];
+ t = [2 3 1];
+ u = [2 3 2];
+ v = [2 3 3];
+ w = [3 0 0];
+ x = [3 0 1];
+ y = [3 0 2];
+ z = [3 0 3];
"0" = [3 1 0];
"1" = [3 1 1];
"2" = [3 1 2];
diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/data/fonts/ir-standard-fonts/default.nix
index 1501e0fb7fa2..eef3883506ef 100644
--- a/pkgs/data/fonts/ir-standard-fonts/default.nix
+++ b/pkgs/data/fonts/ir-standard-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "ir-standard-fonts";
version = "unstable-2017-01-21";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "morealaz";
repo = pname;
diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix
index f54838d5a646..fc6481e9a89e 100644
--- a/pkgs/data/fonts/joypixels/default.nix
+++ b/pkgs/data/fonts/joypixels/default.nix
@@ -1,13 +1,7 @@
{ stdenv, fetchurl }:
-let
- fontconfig = fetchurl {
- name = "75-joypixels.conf";
- url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/75-joypixels.conf?h=packages/ttf-joypixels&id=b2b38f8393ec56ed7338c256f5b85f3439a2dfc3";
- sha256 = "065y2fmf86zzvna1hrvcg46cnr7a76xd2mwa26nss861dsx6pnd6";
- };
-in stdenv.mkDerivation rec {
- pname = "emojione";
+stdenv.mkDerivation rec {
+ pname = "joypixels";
version = "5.0.2";
src = fetchurl {
@@ -19,7 +13,6 @@ in stdenv.mkDerivation rec {
installPhase = ''
install -Dm644 $src $out/share/fonts/truetype/joypixels.ttf
- install -Dm644 ${fontconfig} $out/etc/fonts/conf.d/75-joypixels.conf
'';
meta = with stdenv.lib; {
diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix
index c1de2806ef18..f6a031c7faf0 100644
--- a/pkgs/data/fonts/kawkab-mono/default.nix
+++ b/pkgs/data/fonts/kawkab-mono/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "kawkab-mono-20151015";
url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip";
diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix
index 6ed540121a2c..cf89a8fcb8f1 100644
--- a/pkgs/data/fonts/kochi-substitute/default.nix
+++ b/pkgs/data/fonts/kochi-substitute/default.nix
@@ -3,7 +3,8 @@
let version = "20030809";
in
stdenv.mkDerivation {
- name = "kochi-substitute-${version}";
+ pname = "kochi-substitute";
+ inherit version;
src = fetchurl {
url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-gothic_${version}-15_all.deb";
diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix
index 2152b960cdc2..eb0a47e13d96 100644
--- a/pkgs/data/fonts/libertine/default.nix
+++ b/pkgs/data/fonts/libertine/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fontforge }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "linux-libertine-5.3.0";
src = fetchurl {
diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix
index ec932ab978c2..7a68c9deb5a6 100644
--- a/pkgs/data/fonts/libre-caslon/default.nix
+++ b/pkgs/data/fonts/libre-caslon/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "libre-caslon-${version}";
+ pname = "libre-caslon";
version = "1.002";
srcs = [
@@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/share/fonts/opentype
- mkdir -p $out/share/doc/${name}
+ mkdir -p $out/share/doc/${pname}-${version}
cp -v "libre-caslon-text-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/
cp -v "libre-caslon-display-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/
- cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${name}
+ cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${pname}-${version}
'';
outputHashAlgo = "sha256";
diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix
index d9e7ec66ee67..773b53c88921 100644
--- a/pkgs/data/fonts/lobster-two/default.nix
+++ b/pkgs/data/fonts/lobster-two/default.nix
@@ -50,15 +50,15 @@ let
in
stdenv.mkDerivation rec {
- name = "lobstertwo-${version}";
+ pname = "lobstertwo";
version = "1.006";
phases = ["installPhase"];
installPhase = ''
mkdir -p $out/share/fonts/opentype
- mkdir -p $out/share/doc/${name}
- cp -v ${fontlog.file} $out/share/doc/${name}/${fontlog.name}
+ mkdir -p $out/share/doc/${pname}-${version}
+ cp -v ${fontlog.file} $out/share/doc/${pname}-${version}/${fontlog.name}
cp -v ${bold.file} $out/share/fonts/opentype/${bold.name}
cp -v ${boldItalic.file} $out/share/fonts/opentype/${boldItalic.name}
cp -v ${italic.file} $out/share/fonts/opentype/${italic.name}
diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/data/fonts/luculent/default.nix
index fe733359f3a8..7e5a69a2c1f7 100644
--- a/pkgs/data/fonts/luculent/default.nix
+++ b/pkgs/data/fonts/luculent/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let version = "2.0.0"; in
-fetchzip rec {
+fetchzip {
name = "luculent-${version}";
url = http://www.eastfarthing.com/luculent/luculent.tar.xz;
diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix
index 024e6049a386..c94046f085f9 100644
--- a/pkgs/data/fonts/medio/default.nix
+++ b/pkgs/data/fonts/medio/default.nix
@@ -6,7 +6,7 @@ let
pname = "medio";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}.zip";
diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix
index f990575def0f..a041f9ce907a 100644
--- a/pkgs/data/fonts/meslo-lg/default.nix
+++ b/pkgs/data/fonts/meslo-lg/default.nix
@@ -3,17 +3,17 @@
stdenv.mkDerivation rec {
version = "1.2.1";
- name = "meslo-lg-${version}";
+ pname = "meslo-lg";
meslo-lg = fetchurl {
url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20v${version}.zip?raw=true";
- name="${name}";
+ name="${pname}-${version}";
sha256="1l08mxlzaz3i5bamnfr49s2k4k23vdm64b8nz2ha33ysimkbgg6h";
};
meslo-lg-dz = fetchurl {
url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20DZ%20v${version}.zip?raw=true";
- name="${name}-dz";
+ name="${pname}-${version}-dz";
sha256="0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875";
};
diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix
index 228952aaa56d..8a089ea9e79f 100644
--- a/pkgs/data/fonts/migmix/default.nix
+++ b/pkgs/data/fonts/migmix/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
- name = "migmix-${version}";
+ pname = "migmix";
version = "20150712";
srcs = [
diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/data/fonts/migu/default.nix
index 193e98d01a4b..775d1766894c 100644
--- a/pkgs/data/fonts/migu/default.nix
+++ b/pkgs/data/fonts/migu/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
- name = "migu-${version}";
+ pname = "migu";
version = "20150712";
srcs = [
diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix
index 2bc5a82fa94f..06fb7499b81b 100644
--- a/pkgs/data/fonts/monoid/default.nix
+++ b/pkgs/data/fonts/monoid/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python, fontforge }:
-stdenv.mkDerivation rec {
- name = "monoid-${version}";
+stdenv.mkDerivation {
+ pname = "monoid";
version = "2016-07-21";
src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix
index 03bc8a0db4da..75e8899e664a 100644
--- a/pkgs/data/fonts/mplus-outline-fonts/default.nix
+++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix
@@ -2,7 +2,7 @@
let
version = "063a";
-in fetchzip rec {
+in fetchzip {
name = "mplus-${version}";
url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz";
diff --git a/pkgs/data/fonts/myrica/default.nix b/pkgs/data/fonts/myrica/default.nix
index f3be8857284c..444d526f5ae1 100644
--- a/pkgs/data/fonts/myrica/default.nix
+++ b/pkgs/data/fonts/myrica/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub }:
-fetchFromGitHub rec {
+fetchFromGitHub {
name = "myrica-2.011.20160403";
owner = "tomokuni";
diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix
index b39a59d1ba7a..d2aaadc42794 100644
--- a/pkgs/data/fonts/nafees/default.nix
+++ b/pkgs/data/fonts/nafees/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, unzip}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "nafees";
srcs = [(fetchurl {
diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/pkgs/data/fonts/nanum-gothic-coding/default.nix
index f6b8210290e7..7d908b62cc6d 100644
--- a/pkgs/data/fonts/nanum-gothic-coding/default.nix
+++ b/pkgs/data/fonts/nanum-gothic-coding/default.nix
@@ -4,7 +4,7 @@ let
version = "VER2.5";
fullName = "NanumGothicCoding-2.5";
-in fetchzip rec {
+in fetchzip {
name = "nanum-gothic-coding";
url = "https://github.com/naver/nanumfont/releases/download/${version}/${fullName}.zip";
diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix
index c08630335d4a..59b0f89e45ed 100644
--- a/pkgs/data/fonts/nerdfonts/default.nix
+++ b/pkgs/data/fonts/nerdfonts/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.0.0";
- name = "nerdfonts-${version}";
+ pname = "nerdfonts";
src = fetchFromGitHub {
owner = "ryanoasis";
repo = "nerd-fonts";
diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/data/fonts/nika-fonts/default.nix
index c6bdbd40248a..3f58bc5f9336 100644
--- a/pkgs/data/fonts/nika-fonts/default.nix
+++ b/pkgs/data/fonts/nika-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "nika-fonts";
version = "1.0.0";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "font-store";
repo = "NikaFont";
diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/data/fonts/norwester/default.nix
index 0de5aa8fdf3e..ae70c74c3e49 100644
--- a/pkgs/data/fonts/norwester/default.nix
+++ b/pkgs/data/fonts/norwester/default.nix
@@ -3,7 +3,7 @@
let
version = "1.2";
pname = "norwester";
-in fetchzip rec {
+in fetchzip {
name = "${pname}-${version}";
url = "http://jamiewilson.io/norwester/assets/norwester.zip";
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index 5043e031c08f..bd0d39c7f29e 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -46,7 +46,7 @@ let
};
in
-rec {
+{
noto-fonts = mkNoto {
name = "noto-fonts";
weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}";
@@ -90,7 +90,8 @@ rec {
};
};
noto-fonts-emoji = let version = "2018-08-10-unicode11"; in stdenv.mkDerivation {
- name = "noto-fonts-emoji-${version}";
+ pname = "noto-fonts-emoji";
+ inherit version;
src = fetchFromGitHub {
owner = "googlei18n";
diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix
index 376a47434e18..f4c36f34074c 100644
--- a/pkgs/data/fonts/noto-fonts/tools.nix
+++ b/pkgs/data/fonts/noto-fonts/tools.nix
@@ -1,8 +1,8 @@
{ fetchFromGitHub, pythonPackages, lib }:
pythonPackages.buildPythonPackage rec {
+ pname = "nototools";
version = "unstable-2019-03-20";
- name = "nototools-${version}";
src = fetchFromGitHub {
owner = "googlefonts";
diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix
index dfe1426d697a..0c1293ebda3f 100644
--- a/pkgs/data/fonts/open-sans/default.nix
+++ b/pkgs/data/fonts/open-sans/default.nix
@@ -3,7 +3,7 @@
let
pname = "open-sans";
version = "1.11";
-in fetchFromGitLab rec {
+in fetchFromGitLab {
name = "${pname}-${version}";
domain = "salsa.debian.org";
diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/data/fonts/parastoo-fonts/default.nix
index d02925e3a375..d297baddc4d7 100644
--- a/pkgs/data/fonts/parastoo-fonts/default.nix
+++ b/pkgs/data/fonts/parastoo-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "parastoo-fonts";
version = "1.0.0-alpha5";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix
index e6f0776daea0..6b619d232016 100644
--- a/pkgs/data/fonts/paratype-pt/mono.nix
+++ b/pkgs/data/fonts/paratype-pt/mono.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "paratype-pt-mono";
url = [
diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix
index 1e6610e8e44d..a36928090264 100644
--- a/pkgs/data/fonts/paratype-pt/sans.nix
+++ b/pkgs/data/fonts/paratype-pt/sans.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "paratype-pt-sans";
url = [
diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix
index f4da6508f083..d74295571e00 100644
--- a/pkgs/data/fonts/paratype-pt/serif.nix
+++ b/pkgs/data/fonts/paratype-pt/serif.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "paratype-pt-serif";
url = [
diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index 144ec3bab850..1fc252421de6 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -4,7 +4,7 @@ let
version = "5.4";
in
-fetchurl rec {
+fetchurl {
name = "pecita-${version}";
url = "http://pecita.eu/b/Pecita.otf";
diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix
index 57395c507fe0..784f9d2573ef 100644
--- a/pkgs/data/fonts/penna/default.nix
+++ b/pkgs/data/fonts/penna/default.nix
@@ -6,7 +6,7 @@ let
pname = "penna";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}.zip";
diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix
index c28c9283a9bc..89565910f7a5 100644
--- a/pkgs/data/fonts/profont/default.nix
+++ b/pkgs/data/fonts/profont/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "profont";
url = "http://web.archive.org/web/20160707013914/http://tobiasjung.name/downloadfile.php?file=profont-x11.zip";
diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix
index b2207e01df1a..580ea61a2df5 100644
--- a/pkgs/data/fonts/proggyfonts/default.nix
+++ b/pkgs/data/fonts/proggyfonts/default.nix
@@ -2,7 +2,7 @@
# adapted from https://aur.archlinux.org/packages/proggyfonts/
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "proggyfonts-0.1";
src = fetchurl {
diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix
index 14c66fb39b22..46ebe4dd4b27 100644
--- a/pkgs/data/fonts/public-sans/default.nix
+++ b/pkgs/data/fonts/public-sans/default.nix
@@ -2,7 +2,7 @@
let
version = "1.005";
-in fetchzip rec {
+in fetchzip {
name = "public-sans-${version}";
url = "https://github.com/uswds/public-sans/releases/download/v${version}/public-sans-v${version}.zip";
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index 61206ca5d14b..6d075424bc52 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -50,13 +50,13 @@ let
};
in {
- liberation_ttf_v1 = common rec {
+ liberation_ttf_v1 = common {
repo = "liberation-1.7-fonts";
version = "1.07.5";
nativeBuildInputs = [ fontforge ];
sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v";
};
- liberation_ttf_v2 = common rec {
+ liberation_ttf_v2 = common {
repo = "liberation-fonts";
version = "2.00.4";
nativeBuildInputs = [ fontforge fonttools ];
diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix
index c05b9c69aef5..33321a2c7fe1 100644
--- a/pkgs/data/fonts/redhat-official/default.nix
+++ b/pkgs/data/fonts/redhat-official/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let version = "2.2.0"; in
-fetchzip rec {
+fetchzip {
name = "redhat-official-${version}";
url = "https://github.com/RedHatOfficial/RedHatFont/archive/${version}.zip";
diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix
index 2667562b1b02..ab794992e45f 100644
--- a/pkgs/data/fonts/ricty/default.nix
+++ b/pkgs/data/fonts/ricty/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, google-fonts, migu, fontforge, which }:
stdenv.mkDerivation rec {
- name = "ricty-${version}";
+ pname = "ricty";
version = "4.1.1";
src = fetchurl {
diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
index 2bdb96228d9c..2e83d5b12d4c 100644
--- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
+++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, fontforge, pythonFull }:
stdenv.mkDerivation rec {
- name = "rictydiminished-with-firacode-${version}";
+ pname = "rictydiminished-with-firacode";
version = "0.0.1";
src = fetchgit {
url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git";
diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix
index 175acb22d7b2..cfd4e3808aa3 100644
--- a/pkgs/data/fonts/roboto-mono/default.nix
+++ b/pkgs/data/fonts/roboto-mono/default.nix
@@ -4,8 +4,8 @@ let
# last commit on the directory containing the fonts in the upstream repository
commit = "883939708704a19a295e0652036369d22469e8dc";
in
-stdenv.mkDerivation rec {
- name = "roboto-mono-${version}";
+stdenv.mkDerivation {
+ pname = "roboto-mono";
version = "2016-01-11";
srcs = [
diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix
index c5ce13ad7ae4..f9f6ec342e91 100644
--- a/pkgs/data/fonts/roboto-slab/default.nix
+++ b/pkgs/data/fonts/roboto-slab/default.nix
@@ -4,8 +4,8 @@ let
# last commit on the directory containing the fonts in the upstream repository
commit = "883939708704a19a295e0652036369d22469e8dc";
in
-stdenv.mkDerivation rec {
- name = "roboto-slab-${version}";
+stdenv.mkDerivation {
+ pname = "roboto-slab";
version = "2016-01-11";
srcs = [
diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix
index 707d31ac531a..50629c5f9773 100644
--- a/pkgs/data/fonts/roboto/default.nix
+++ b/pkgs/data/fonts/roboto/default.nix
@@ -2,7 +2,7 @@
let
version = "2.138";
-in fetchzip rec {
+in fetchzip {
name = "roboto-${version}";
url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip";
diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix
index 1b8d4e60653c..cbc89c550b3c 100644
--- a/pkgs/data/fonts/route159/default.nix
+++ b/pkgs/data/fonts/route159/default.nix
@@ -6,7 +6,7 @@ let
pname = "route159";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/data/fonts/sahel-fonts/default.nix
index 0b90a43ca3e2..029ed33611f4 100644
--- a/pkgs/data/fonts/sahel-fonts/default.nix
+++ b/pkgs/data/fonts/sahel-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "sahel-fonts";
version = "1.0.0-alpha22";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/data/fonts/samim-fonts/default.nix
index dd4a01c782ee..d8d3d0d3b5ae 100644
--- a/pkgs/data/fonts/samim-fonts/default.nix
+++ b/pkgs/data/fonts/samim-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "samim-fonts";
version = "3.1.0";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix
index f46fda0dd310..2d9fbfdae050 100644
--- a/pkgs/data/fonts/sarasa-gothic/default.nix
+++ b/pkgs/data/fonts/sarasa-gothic/default.nix
@@ -2,7 +2,7 @@
let
version = "0.8.0";
-in fetchurl rec {
+in fetchurl {
name = "sarasa-gothic-${version}";
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix
index af3c5dd25ee0..71483a04cbb7 100644
--- a/pkgs/data/fonts/seshat/default.nix
+++ b/pkgs/data/fonts/seshat/default.nix
@@ -6,7 +6,7 @@ let
pname = "seshat";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}.zip";
diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/data/fonts/shabnam-fonts/default.nix
index 89bca56a53ef..5834b797eeab 100644
--- a/pkgs/data/fonts/shabnam-fonts/default.nix
+++ b/pkgs/data/fonts/shabnam-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "shabnam-fonts";
version = "4.0.0";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix
index 87484a99b110..eb776a3df26f 100644
--- a/pkgs/data/fonts/source-serif-pro/default.nix
+++ b/pkgs/data/fonts/source-serif-pro/default.nix
@@ -1,20 +1,20 @@
{ lib, fetchzip }:
let
- version = "2.010";
+ version = "3.000";
in fetchzip {
name = "source-serif-pro-${version}";
- url = "https://github.com/adobe-fonts/source-serif-pro/releases/download/${version}R-ro%2F1.010R-it/source-serif-pro-${version}R-ro-1.010R-it.zip";
+ url = "https://github.com/adobe-fonts/source-serif-pro/releases/download/${version}R/source-serif-pro-${version}R.zip";
postFetch = ''
mkdir -p $out/share/fonts/{opentype,truetype,variable}
- unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype
- unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype
- unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
+ unzip -j $downloadedFile "OTF/*.otf" -d $out/share/fonts/opentype
+ unzip -j $downloadedFile "TTF/*.ttf" -d $out/share/fonts/truetype
+ unzip -j $downloadedFile "VAR/*.otf" -d $out/share/fonts/variable
'';
- sha256 = "1a3lmqk7hyxpfkb30s9z73lhs823dmq6xr5llp9w23g6bh332x2h";
+ sha256 = "06yp8y79mqk02qzp81h8zkmzqqlhicgrkwmzkd0bm338xh8grsiz";
meta = with lib; {
homepage = https://adobe-fonts.github.io/source-serif-pro/;
diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix
index 873528b8bde1..2964b8692dcc 100644
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@@ -3,7 +3,7 @@
let
pname = "spleen";
version = "1.0.5";
-in fetchurl rec {
+in fetchurl {
name = "${pname}-${version}";
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix
index f5d15439079d..f3ff9600f5de 100644
--- a/pkgs/data/fonts/stix-otf/default.nix
+++ b/pkgs/data/fonts/stix-otf/default.nix
@@ -2,7 +2,7 @@
let
version = "1.1.1";
-in fetchzip rec {
+in fetchzip {
name = "stix-otf-${version}";
url = "http://ftp.fi.muni.cz/pub/linux/gentoo/distfiles/STIXv${version}-word.zip";
diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix
index bfc66a77207f..359139ec9c67 100644
--- a/pkgs/data/fonts/sudo/default.nix
+++ b/pkgs/data/fonts/sudo/default.nix
@@ -1,11 +1,11 @@
{ lib, fetchzip }:
let
- version = "0.37";
-in fetchzip rec {
+ version = "0.40";
+in fetchzip {
name = "sudo-font-${version}";
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
- sha256 = "16x6vs016wz6rmd4p248ri9fn35xq7r3dc8hv4w2c4rz1xl8c099";
+ sha256 = "1nf025sjps4yysf6zkns5fzjgls6xdpifh7bz4ray9x8h5pz0z64";
postFetch = ''
mkdir -p $out/share/fonts/truetype/
diff --git a/pkgs/data/fonts/tenderness/default.nix b/pkgs/data/fonts/tenderness/default.nix
index 958af414ff09..09ea566e7382 100644
--- a/pkgs/data/fonts/tenderness/default.nix
+++ b/pkgs/data/fonts/tenderness/default.nix
@@ -6,7 +6,7 @@ let
pname = "tenderness";
in
-fetchzip rec {
+fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix
index 211cc73cc9de..bdd0fd7762b6 100644
--- a/pkgs/data/fonts/terminus-font-ttf/default.nix
+++ b/pkgs/data/fonts/terminus-font-ttf/default.nix
@@ -2,7 +2,7 @@
let
version = "4.47.0";
-in fetchzip rec {
+in fetchzip {
name = "terminus-font-ttf-${version}";
url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip";
diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix
index 57356398004e..358ab959cd0e 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -2,11 +2,10 @@
stdenv.mkDerivation rec {
pname = "terminus-font";
- version = "4.48";
- name = "${pname}-${version}"; # set here for use in URL below
+ version = "4.48"; # set here for use in URL below
src = fetchurl {
- url = "mirror://sourceforge/project/${pname}/${name}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l";
};
diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/data/fonts/tlwg/default.nix
index 494f48fd36e0..787009928313 100644
--- a/pkgs/data/fonts/tlwg/default.nix
+++ b/pkgs/data/fonts/tlwg/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, fontforge }:
stdenv.mkDerivation rec {
- name = "tlwg-${version}";
+ pname = "tlwg";
version = "0.6.4";
src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix
index 5f072f90f055..7c90c16d4d1e 100644
--- a/pkgs/data/fonts/ubuntu-font-family/default.nix
+++ b/pkgs/data/fonts/ubuntu-font-family/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "ubuntu-font-family-0.83";
url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip";
diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix
index 996d11923972..0ea0363763dc 100644
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, mkfontdir, mkfontscale }:
-stdenv.mkDerivation rec {
- name = "ucs-fonts-${version}";
+stdenv.mkDerivation {
+ pname = "ucs-fonts";
version = "20090406";
srcs = [
diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
index 35551e929e64..f9045794fe15 100644
--- a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
+++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
@@ -3,7 +3,7 @@
let
version = "1.0";
in
-fetchzip rec {
+fetchzip {
name = "ultimate-oldschool-pc-font-pack-${version}";
url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip";
sha256 = "0hid4dgqfy2w26734vcw2rxmpacd9vd1r2qpdr9ww1n3kgc92k9y";
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index b3c6d585b8bb..a80beee342b3 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, mkfontscale, mkfontdir }:
stdenv.mkDerivation rec {
- name = "unifont-${version}";
+ pname = "unifont";
version = "12.1.03";
ttf = fetchurl {
- url = "mirror://gnu/unifont/${name}/${name}.ttf";
+ url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
sha256 = "10igjlf05d97h3vcggr2ahxmq9ljby4ypja2g4s9bvxs2w1si51p";
};
pcf = fetchurl {
- url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
+ url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf";
};
diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix
index 6d169e940cf9..cd4d0dc42cdd 100644
--- a/pkgs/data/fonts/unscii/default.nix
+++ b/pkgs/data/fonts/unscii/default.nix
@@ -1,11 +1,10 @@
{stdenv, fetchurl, perl, bdftopcf, perlPackages, fontforge, SDL, SDL_image}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "unscii";
version = "1.1";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
src = fetchurl {
- url = "http://pelulamu.net/${pname}/${name}-src.tar.gz";
+ url = "http://pelulamu.net/${pname}/${pname}-${version}-src.tar.gz";
sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1";
};
nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge
diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix
index d004e75571b7..f39867538099 100755
--- a/pkgs/data/fonts/vazir-fonts/default.nix
+++ b/pkgs/data/fonts/vazir-fonts/default.nix
@@ -3,7 +3,7 @@
let
pname = "vazir-fonts";
version = "19.2.0";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/data/fonts/vdrsymbols/default.nix
index 01a4072099ad..fd74897077f3 100644
--- a/pkgs/data/fonts/vdrsymbols/default.nix
+++ b/pkgs/data/fonts/vdrsymbols/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchzip }:
-fetchzip rec {
+fetchzip {
name = "vdrsymbols-20100612";
url = http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz;
diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix
index e1ef611d686f..e886ad7578e3 100644
--- a/pkgs/data/fonts/victor-mono/default.nix
+++ b/pkgs/data/fonts/victor-mono/default.nix
@@ -2,7 +2,7 @@
let
pname = "victor-mono";
- version = "1.2.1";
+ version = "1.2.5";
in fetchFromGitHub rec {
name = "${pname}-${version}";
@@ -26,7 +26,7 @@ in fetchFromGitHub rec {
unzip -j VictorMonoAll.zip \*.otf -d $out/share/fonts/opentype/${pname}
'';
- sha256 = "0347n3kdyrbg42rxcgnyghi21qz5iz6w30v7ms2vjal7pfm6h2vn";
+ sha256 = "0dj5h45qk6abggj6mgm19sb0a7q0v4x41f2zds1ab79yd22gbjns";
meta = with lib; {
description = "Free programming font with cursive italics and ligatures";
diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix
index 553c1dbde221..24e9f2a39357 100644
--- a/pkgs/data/fonts/xits-math/default.nix
+++ b/pkgs/data/fonts/xits-math/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages, fontforge }:
stdenv.mkDerivation rec {
- name = "xits-math-${version}";
+ pname = "xits-math";
version = "1.200";
src = fetchFromGitHub {
diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix
index 0e996da2fc7c..e5dd11db72a7 100644
--- a/pkgs/data/fonts/xkcd-font/default.nix
+++ b/pkgs/data/fonts/xkcd-font/default.nix
@@ -3,7 +3,7 @@
let
pname = "xkcd-font";
version = "unstable-2017-08-24";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "ipython";
diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix
index ce7bb11522ba..2e99c3d92327 100644
--- a/pkgs/data/icons/bibata-cursors/default.nix
+++ b/pkgs/data/icons/bibata-cursors/default.nix
@@ -1,7 +1,7 @@
{ fetchFromGitHub, gnome-themes-extra, inkscape, stdenv, xcursorgen }:
stdenv.mkDerivation rec {
- name = "bibata-cursors-${version}";
+ pname = "bibata-cursors";
version = "0.4.1";
src = fetchFromGitHub {
diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index 4b42f0b6ee9f..5a566bef6ef9 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }:
stdenv.mkDerivation rec {
- name = "elementary-xfce-icon-theme-${version}";
+ pname = "elementary-xfce-icon-theme";
version = "0.13.1";
src = fetchFromGitHub {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Elementary icons for Xfce and other GTK+ desktops like GNOME";
+ description = "Elementary icons for Xfce and other GTK desktops like GNOME";
homepage = https://github.com/shimmerproject/elementary-xfce;
license = licenses.gpl2;
# darwin cannot deal with file names differing only in case
diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix
index a4ffefe1f26d..99488a26f2b6 100644
--- a/pkgs/data/icons/faba-mono-icons/default.nix
+++ b/pkgs/data/icons/faba-mono-icons/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "faba-mono-icons";
version = "2016-04-30";
diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix
index ee45a186f290..f7015621853c 100644
--- a/pkgs/data/icons/iconpack-obsidian/default.nix
+++ b/pkgs/data/icons/iconpack-obsidian/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gtk3 }:
stdenv.mkDerivation rec {
- name = "iconpack-obsidian-${version}";
+ pname = "iconpack-obsidian";
version = "4.3";
src = fetchFromGitHub {
diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix
index 7b4ed7a66809..a623af206048 100644
--- a/pkgs/data/icons/maia-icon-theme/default.nix
+++ b/pkgs/data/icons/maia-icon-theme/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }:
-stdenv.mkDerivation rec {
- name = "maia-icon-theme-${version}";
+stdenv.mkDerivation {
+ pname = "maia-icon-theme";
version = "2018-02-24";
src = fetchFromGitLab {
diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix
index 17892679a7ea..83c4b19472a3 100644
--- a/pkgs/data/icons/moka-icon-theme/default.nix
+++ b/pkgs/data/icons/moka-icon-theme/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "moka-icon-theme";
version = "5.4.0";
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 1a2eb6504d9d..e41373f536ff 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "numix-icon-theme";
version = "18.07.17";
diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix
index de808e44ea6c..5359b2229f39 100644
--- a/pkgs/data/icons/paper-icon-theme/default.nix
+++ b/pkgs/data/icons/paper-icon-theme/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3 }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "paper-icon-theme";
version = "2018-06-24";
diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix
index b6def37def6f..c4a8fd44a610 100644
--- a/pkgs/data/icons/vanilla-dmz/default.nix
+++ b/pkgs/data/icons/vanilla-dmz/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchzip, xorg }:
stdenv.mkDerivation rec {
- name = "vanilla-dmz-${version}";
+ pname = "vanilla-dmz";
version = "0.4.4";
src = fetchzip {
url = "http://ftp.de.debian.org/debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${version}.tar.gz";
diff --git a/pkgs/data/machine-learning/mnist/default.nix b/pkgs/data/machine-learning/mnist/default.nix
index 26b06b4e652e..fe9e83492e42 100644
--- a/pkgs/data/machine-learning/mnist/default.nix
+++ b/pkgs/data/machine-learning/mnist/default.nix
@@ -20,7 +20,7 @@ let
};
in
stdenvNoCC.mkDerivation rec {
- name = "mnist-${version}";
+ pname = "mnist";
version = "2018-11-16";
installPhase = ''
mkdir -p $out
diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix
index 54b54d278ffb..f1e0604acf86 100644
--- a/pkgs/data/misc/brise/default.nix
+++ b/pkgs/data/misc/brise/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, librime }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "brise-unstable-2017-09-16";
src = fetchFromGitHub {
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index a99df2e7bd65..99739646a8ba 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -15,7 +15,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "nss-cacert-${nss.version}";
src = nss.src;
diff --git a/pkgs/data/misc/combinatorial_designs/default.nix b/pkgs/data/misc/combinatorial_designs/default.nix
index 18331b5ada9d..5df7343f3be7 100644
--- a/pkgs/data/misc/combinatorial_designs/default.nix
+++ b/pkgs/data/misc/combinatorial_designs/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "combinatorial_designs-${version}";
+ pname = "combinatorial_designs";
version = "20140630";
src = fetchurl {
diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/pkgs/data/misc/conway_polynomials/default.nix
index fec422b33acf..48b538fe1833 100644
--- a/pkgs/data/misc/conway_polynomials/default.nix
+++ b/pkgs/data/misc/conway_polynomials/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "conway_polynomials-${version}";
+ pname = "conway_polynomials";
version = "0.5";
pythonEnv = python.withPackages (ps: with ps; [ six ]);
diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/data/misc/elliptic_curves/default.nix
index 528486328c68..49b8736b0846 100644
--- a/pkgs/data/misc/elliptic_curves/default.nix
+++ b/pkgs/data/misc/elliptic_curves/default.nix
@@ -6,7 +6,6 @@
stdenv.mkDerivation rec {
pname = "elliptic_curves";
version = "0.8";
- name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 309ae47a8516..8cbd526f3d3b 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -6,8 +6,8 @@ let
url = "https://geolite.maxmind.com/download/geoip/database/${src}";
};
in
-stdenv.mkDerivation rec {
- name = "geolite-legacy-${version}";
+stdenv.mkDerivation {
+ pname = "geolite-legacy";
version = "2017-12-02";
srcGeoIP = fetchDB
diff --git a/pkgs/data/misc/graphs/default.nix b/pkgs/data/misc/graphs/default.nix
index aea5feef46c7..14551c6a4a47 100644
--- a/pkgs/data/misc/graphs/default.nix
+++ b/pkgs/data/misc/graphs/default.nix
@@ -5,7 +5,6 @@
stdenv.mkDerivation rec {
pname = "graphs";
version = "20161026";
- name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 87c4afb986be..3500eaa63265 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
- url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/2b4df08d487f0821b932f92392b67fe12dc1d42c.tar.gz";
- sha256 = "02d06fr2jr69za5751z25c3x3zspiwdmlhmdmxaj1g48v00gbfag";
+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/93bcfb09798da885d29304fa4dab1e234e3b728e.tar.gz";
+ sha256 = "1mv5kxqldakapzbmch2b88mynng268njq3dxbkmyzli8fwnllra2";
}
diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/data/misc/libkkc-data/default.nix
index 343071fcf59c..cb446e9b0bc1 100644
--- a/pkgs/data/misc/libkkc-data/default.nix
+++ b/pkgs/data/misc/libkkc-data/default.nix
@@ -3,10 +3,9 @@
stdenv.mkDerivation rec {
pname = "libkkc-data";
version = "0.2.7";
- name = "${pname}-${version}";
src = fetchurl {
- url = "${meta.homepage}/releases/download/v${libkkc.version}/${name}.tar.xz";
+ url = "${meta.homepage}/releases/download/v${libkkc.version}/${pname}-${version}.tar.xz";
sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy";
};
diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix
index 71fe32c10665..4814232fbfe7 100644
--- a/pkgs/data/misc/nixos-artwork/default.nix
+++ b/pkgs/data/misc/nixos-artwork/default.nix
@@ -1,5 +1,5 @@
{ callPackage }:
-rec {
+{
wallpapers = callPackage ./wallpapers.nix { };
}
diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/data/misc/pari-galdata/default.nix
index 222fd2f88707..2535e8cfc250 100644
--- a/pkgs/data/misc/pari-galdata/default.nix
+++ b/pkgs/data/misc/pari-galdata/default.nix
@@ -2,9 +2,9 @@
, fetchurl
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "20080411";
- name = "pari-galdata-${version}";
+ pname = "pari-galdata";
src = fetchurl {
url = "http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz";
diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/data/misc/pari-seadata-small/default.nix
index 967122c1bd4d..3470a0804f74 100644
--- a/pkgs/data/misc/pari-seadata-small/default.nix
+++ b/pkgs/data/misc/pari-seadata-small/default.nix
@@ -2,9 +2,9 @@
, fetchurl
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "20090618";
- name = "pari-seadata-small-${version}";
+ pname = "pari-seadata-small";
src = fetchurl {
url = "http://pari.math.u-bordeaux.fr/pub/pari/packages/seadata-small.tgz";
diff --git a/pkgs/data/misc/polytopes_db/default.nix b/pkgs/data/misc/polytopes_db/default.nix
index 85f2cff09db2..8fec9a854260 100644
--- a/pkgs/data/misc/polytopes_db/default.nix
+++ b/pkgs/data/misc/polytopes_db/default.nix
@@ -5,7 +5,6 @@
stdenv.mkDerivation rec {
pname = "polytopes_db";
version = "20170220";
- name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/data/misc/publicsuffix-list/default.nix
index b5414ab18b4d..ca79e251f28a 100644
--- a/pkgs/data/misc/publicsuffix-list/default.nix
+++ b/pkgs/data/misc/publicsuffix-list/default.nix
@@ -3,7 +3,7 @@
let
pname = "publicsuffix-list";
version = "2019-05-24";
-in fetchFromGitHub rec {
+in fetchFromGitHub {
name = "${pname}-${version}";
owner = "publicsuffix";
repo = "list";
diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix
index c90b8aa7e37d..f15a7534e267 100644
--- a/pkgs/data/misc/scowl/default.nix
+++ b/pkgs/data/misc/scowl/default.nix
@@ -3,7 +3,6 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "scowl";
version = "2018.04.16";
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix
index 6d29d8760734..6952d2da6bad 100644
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@@ -2,8 +2,9 @@
, libxml2, glib}:
let version = "1.12"; in
-stdenv.mkDerivation rec {
- name = "shared-mime-info-${version}";
+stdenv.mkDerivation {
+ pname = "shared-mime-info";
+ inherit version;
src = fetchurl {
url = "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/shared-mime-info-1.12.tar.xz";
diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/data/misc/sound-theme-freedesktop/default.nix
index 043d3d65b84e..355a2c2c577a 100644
--- a/pkgs/data/misc/sound-theme-freedesktop/default.nix
+++ b/pkgs/data/misc/sound-theme-freedesktop/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, intltool }:
stdenv.mkDerivation rec {
- name = "sound-theme-freedesktop-${version}";
+ pname = "sound-theme-freedesktop";
version = "0.8";
src = fetchurl {
sha256 = "054abv4gmfk9maw93fis0bf605rc56dah7ys5plc4pphxqh8nlfb";
- url = "https://people.freedesktop.org/~mccann/dist/${name}.tar.bz2";
+ url = "https://people.freedesktop.org/~mccann/dist/${pname}-${version}.tar.bz2";
};
nativeBuildInputs = [ intltool ];
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 0d19d8c9dcab..b2363b4b549e 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, buildPackages }:
stdenv.mkDerivation rec {
- name = "tzdata-${version}";
- version = "2019a";
+ pname = "tzdata";
+ version = "2019b";
srcs =
[ (fetchurl {
url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
- sha256 = "0wlpqm4asvi0waaz24xj20iq40gqfypmb4nldjhkfgm09bgnsdlh";
+ sha256 = "0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85";
})
(fetchurl {
url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
- sha256 = "1x9z8fpgnhzlsnps0hamb54ymaskjab7ys9m4i4gpk9hpiig2fc7";
+ sha256 = "0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf";
})
];
diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix
index e11362992608..12acc424b9d1 100644
--- a/pkgs/data/misc/xorg-rgb/default.nix
+++ b/pkgs/data/misc/xorg-rgb/default.nix
@@ -1,6 +1,5 @@
{stdenv, fetchurl, pkgconfig, xorgproto}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "rgb";
version = "1.0.6";
diff --git a/pkgs/data/themes/adementary/default.nix b/pkgs/data/themes/adementary/default.nix
index 40190d65d5ed..1cb7ac53432f 100644
--- a/pkgs/data/themes/adementary/default.nix
+++ b/pkgs/data/themes/adementary/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme";
+ description = "Adwaita-based GTK theme with design influence from elementary OS and Vertex GTK theme";
homepage = https://github.com/hrdwrrsk/adementary-theme;
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ];
diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix
index d573603ce903..1c5a631a48c0 100644
--- a/pkgs/data/themes/greybird/default.nix
+++ b/pkgs/data/themes/greybird/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- description = "Grey and blue theme from the Shimmer Project for GTK+-based environments";
+ description = "Grey and blue theme from the Shimmer Project for GTK-based environments";
homepage = https://github.com/shimmerproject/Greybird;
license = with licenses; [ gpl2Plus ]; # or alternatively: cc-by-nc-sa-30
platforms = platforms.linux;
diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index 762ab3eac3e5..bfbf98b508e5 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }:
stdenv.mkDerivation rec {
- name = "matcha-${version}";
- version = "2019-06-22";
+ pname = "matcha";
+ version = "2019-07";
src = fetchFromGitHub {
owner = "vinceliuice";
- repo = "matcha";
- rev = "f42df7a3219d7fbacb7be1b2e0e416d74339865e";
- sha256 = "1x954rmxv14xndn4ybhbr4pmzccnwqp462bpvzd2hak5wsqs4wxc";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1jv7qq4lsjpz40wchrqlzc8w4ggrmwjavy4ipzz11jal99skpv7i";
};
buildInputs = [ gdk-pixbuf librsvg ];
diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix
index ccdd1067302e..02c1b91a3ebd 100644
--- a/pkgs/data/themes/materia-theme/default.nix
+++ b/pkgs/data/themes/materia-theme/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "materia-theme";
- version = "20190315";
+ version = "20190831";
src = fetchFromGitHub {
owner = "nana-4";
repo = pname;
rev = "v${version}";
- sha256 = "1fpipwvwxjiriqhysqgx51rnax73hyd5jkyxhc2g3y73s5r2xq82";
+ sha256 = "19b2wyq38wj3id0an47jln1y3zp5ih3kbrgmfpjp6bbdrmfcyccf";
};
nativeBuildInputs = [ glib libxml2 bc ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Material Design theme for GNOME/GTK+ based desktop environments";
+ description = "Material Design theme for GNOME/GTK based desktop environments";
homepage = https://github.com/nana-4/materia-theme;
license = licenses.gpl2;
platforms = platforms.all;
diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix
index c4265875390e..d1cfb800001b 100644
--- a/pkgs/data/themes/nordic-polar/default.nix
+++ b/pkgs/data/themes/nordic-polar/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, gtk-engine-murrine }:
stdenv.mkDerivation rec {
- name = "nordic-polar-${version}";
+ pname = "nordic-polar";
version = "1.5.0";
srcs = [
diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix
index 1f0e110488b7..5172b2992ccc 100644
--- a/pkgs/data/themes/nordic/default.nix
+++ b/pkgs/data/themes/nordic/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, gtk-engine-murrine }:
stdenv.mkDerivation rec {
- name = "nordic-${version}";
+ pname = "nordic";
version = "1.6.5";
srcs = [
diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix
index cf2eb5447f74..d026e06e39d3 100644
--- a/pkgs/data/themes/plata/default.nix
+++ b/pkgs/data/themes/plata/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "A Gtk+ theme based on Material Design Refresh";
+ description = "A GTK theme based on Material Design Refresh";
homepage = https://gitlab.com/tista500/plata-theme;
license = with licenses; [ gpl2 cc-by-sa-40 ];
platforms = platforms.linux;
diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix
index 4d91b60960b3..6461697b04f2 100644
--- a/pkgs/data/themes/qogir/default.nix
+++ b/pkgs/data/themes/qogir/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qogir-theme";
- version = "2019-05-03";
+ version = "2019-08-31";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "031nqr47b3x8ahcym7cfc75y8sy53dcmrrrlywi7m1a10ckfp0pd";
+ sha256 = "1pqfnqc2c6f5cidg6c3y492hqlyn5ma4b7ra2lchw7g2dxfvq8w1";
};
buildInputs = [ gdk-pixbuf librsvg ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
installPhase = ''
patchShebangs .
mkdir -p $out/share/themes
- name= ./Install -d $out/share/themes
+ name= ./install.sh -d $out/share/themes
'';
meta = with stdenv.lib; {
diff --git a/pkgs/data/themes/shades-of-gray/default.nix b/pkgs/data/themes/shades-of-gray/default.nix
index fb94fa00b75f..5d335905273d 100644
--- a/pkgs/data/themes/shades-of-gray/default.nix
+++ b/pkgs/data/themes/shades-of-gray/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "shades-of-gray-theme";
- version = "1.1.8";
+ version = "1.1.9";
src = fetchFromGitHub {
owner = "WernerFP";
repo = pname;
rev = version;
- sha256 = "08i2pkq7ygf9fs9cdrw4khrb8m1w2hvgmz064g36fh35r02sms3w";
+ sha256 = "1hg4g242cjncrx9cn7gbzl9gj7zz2fwrkzkkbfazzrdaylbwgm4i";
};
buildInputs = [ gtk_engines ];
diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix
index ee0c81d7d39e..2511f05c4ea3 100644
--- a/pkgs/desktops/deepin/dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/dbus-factory/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator, deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "dbus-factory";
version = "3.1.17";
@@ -18,13 +17,13 @@ stdenv.mkDerivation rec {
go-dbus-generator
];
- makeFlags = [ "GOPATH=${placeholder ''out''}/share/go" ];
+ makeFlags = [ "GOPATH=${placeholder "out"}/share/go" ];
postPatch = ''
sed -i -e 's:/share/gocode:/share/go:' Makefile
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Generates static DBus bindings for Golang and QML at build-time";
diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix
index 608096951b60..b052a1042403 100644
--- a/pkgs/desktops/deepin/dde-api/default.nix
+++ b/pkgs/desktops/deepin/dde-api/default.nix
@@ -23,7 +23,6 @@
}:
buildGoPackage rec {
- name = "${pname}-${version}";
pname = "dde-api";
version = "3.18.4.1";
@@ -114,7 +113,7 @@ buildGoPackage rec {
searchHardCodedPaths $out # debugging
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Go-lang bindings for dde-daemon";
diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix
index 0d25d9083ebb..427cb1249c90 100644
--- a/pkgs/desktops/deepin/dde-calendar/default.nix
+++ b/pkgs/desktops/deepin/dde-calendar/default.nix
@@ -3,7 +3,6 @@
}:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "dde-calendar";
version = "1.2.10";
@@ -38,7 +37,7 @@ mkDerivation rec {
-e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert,"
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Calendar for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix
index 88c3639ff2e6..0871e004e5f9 100644
--- a/pkgs/desktops/deepin/dde-control-center/default.nix
+++ b/pkgs/desktops/deepin/dde-control-center/default.nix
@@ -7,7 +7,6 @@
}:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "dde-control-center";
version = "4.10.11";
@@ -100,7 +99,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Control panel of Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
index 4fb0272a3cef..19089a6b050e 100644
--- a/pkgs/desktops/deepin/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -7,7 +7,6 @@
deepin, makeWrapper, xkeyboard_config, wrapGAppsHook }:
buildGoPackage rec {
- name = "${pname}-${version}";
pname = "dde-daemon";
version = "3.27.2.6";
@@ -122,7 +121,7 @@ buildGoPackage rec {
searchHardCodedPaths $out # debugging
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Daemon for handling Deepin Desktop Environment session settings";
diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix
index 21c8221bd13b..fc25d007f200 100644
--- a/pkgs/desktops/deepin/dde-dock/default.nix
+++ b/pkgs/desktops/deepin/dde-dock/default.nix
@@ -6,7 +6,6 @@
let
unwrapped = mkDerivation rec {
- name = "${pname}-${version}";
pname = "dde-dock";
version = "4.10.3";
@@ -69,7 +68,7 @@ unwrapped = mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Dock for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix
index 3580eeb43045..081c93a65c86 100644
--- a/pkgs/desktops/deepin/dde-file-manager/default.nix
+++ b/pkgs/desktops/deepin/dde-file-manager/default.nix
@@ -9,7 +9,6 @@
xdg-user-dirs, xorg, zlib, wrapGAppsHook }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "dde-file-manager";
version = "4.8.6.4";
@@ -239,7 +238,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "File manager and desktop module for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix
index f8a05b869802..b36d87604e74 100644
--- a/pkgs/desktops/deepin/dde-launcher/default.nix
+++ b/pkgs/desktops/deepin/dde-launcher/default.nix
@@ -4,7 +4,6 @@
which, xdg_utils, wrapGAppsHook }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "dde-launcher";
version = "4.6.13";
@@ -64,7 +63,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin Desktop Environment launcher module";
diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix
index 4fd08749ee49..5397439949b3 100644
--- a/pkgs/desktops/deepin/dde-network-utils/default.nix
+++ b/pkgs/desktops/deepin/dde-network-utils/default.nix
@@ -2,7 +2,6 @@
dde-qt-dbus-factory, proxychains, which, deepin }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "dde-network-utils";
version = "0.1.4";
@@ -42,7 +41,7 @@ mkDerivation rec {
searchHardCodedPaths $out # for debugging
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin network utils";
diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
index d1f1bed2775a..9d181c188d4d 100644
--- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix
+++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
@@ -2,7 +2,6 @@
dtkcore, dtkwidget, dde-qt-dbus-factory, deepin }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "dde-polkit-agent";
version = "0.2.10";
@@ -39,7 +38,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "PolicyKit agent for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
index 0d063cbd8485..a0e1e35ad859 100644
--- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, qmake, python3, deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "dde-qt-dbus-factory";
version = "1.1.5";
@@ -27,7 +26,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Qt DBus interface library for Deepin software";
diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix
index 8302e8e97bcd..d6713fb3688e 100644
--- a/pkgs/desktops/deepin/dde-session-ui/default.nix
+++ b/pkgs/desktops/deepin/dde-session-ui/default.nix
@@ -6,7 +6,6 @@
xkeyboard_config, xorg, xrandr, wrapGAppsHook }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "dde-session-ui";
version = "4.9.12";
@@ -115,7 +114,7 @@ mkDerivation rec {
searchHardCodedPaths $out # debugging
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin desktop-environment - Session UI module";
diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix
index c768fa60ce70..7c88102c5f3a 100644
--- a/pkgs/desktops/deepin/deepin-anything/default.nix
+++ b/pkgs/desktops/deepin/deepin-anything/default.nix
@@ -2,7 +2,6 @@
dtkcore, deepin }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-anything";
version = "0.1.0";
@@ -31,7 +30,7 @@ mkDerivation rec {
makeFlags = [
"DEB_HOST_MULTIARCH="
- "PREFIX=${placeholder ''out''}"
+ "PREFIX=${placeholder "out"}"
];
postPatch = ''
@@ -52,7 +51,7 @@ mkDerivation rec {
searchHardCodedPaths $modsrc # for debugging
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin file search tool";
diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix
index 51f0b666cb1e..97d2b53da70a 100644
--- a/pkgs/desktops/deepin/deepin-calculator/default.nix
+++ b/pkgs/desktops/deepin/deepin-calculator/default.nix
@@ -2,7 +2,6 @@
dtkwidget, deepin }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-calculator";
version = "1.0.11";
@@ -37,7 +36,7 @@ mkDerivation rec {
searchHardCodedPaths $out # debugging
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Easy to use calculator for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
index f43909f37dc1..ba826eb9063f 100644
--- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix
+++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, deepin-wallpapers, deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-desktop-base";
version = "2019.06.19";
@@ -41,7 +40,7 @@ stdenv.mkDerivation rec {
ln -s ../lib/deepin/desktop-version $out/etc/deepin-version
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Base assets and definitions for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
index 5849bc78ac0b..4f2427e8237a 100644
--- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
+++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
@@ -2,7 +2,6 @@
deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-desktop-schemas";
version = "3.13.6";
@@ -33,7 +32,7 @@ stdenv.mkDerivation rec {
# fix default background url
sed -i -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' \
overrides/common/com.deepin.wrap.gnome.desktop.override
-
+
fixPath ${deepin-wallpapers} /usr/share/backgrounds \
overrides/common/com.deepin.wrap.gnome.desktop.override
@@ -47,7 +46,7 @@ stdenv.mkDerivation rec {
# /usr/share/desktop-directories
'';
- makeFlags = [ "PREFIX=${placeholder ''out''}" ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
doCheck = true;
checkTarget = "test";
@@ -57,7 +56,7 @@ stdenv.mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "GSettings deepin desktop-wide schemas";
diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
index d9a6f3701688..67fcc36bcefc 100644
--- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
+++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages, deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-gettext-tools";
version = "1.0.8";
@@ -24,7 +23,7 @@ stdenv.mkDerivation rec {
python3Packages.python
];
- makeFlags = [ "PREFIX=${placeholder ''out''}" ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
postPatch = ''
sed -e 's/sudo cp/cp/' -i src/generate_mo.py
@@ -36,7 +35,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin Internationalization utilities";
diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
index 469a43efe329..8e2469a2c788 100644
--- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, gtk-engine-murrine, deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-gtk-theme";
version = "17.10.11";
@@ -14,9 +13,9 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
- makeFlags = [ "PREFIX=${placeholder ''out''}" ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin GTK Theme";
diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
index c5cf9e9ad3a8..e63a228d0cbe 100644
--- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-icon-theme";
version = "15.12.71";
@@ -28,13 +27,13 @@ stdenv.mkDerivation rec {
buildTargets = "all hicolor-links";
installTargets = "install-icons install-cursors";
- installFlags = [ "PREFIX=${placeholder ''out''}" ];
+ installFlags = [ "PREFIX=${placeholder "out"}" ];
postInstall = ''
cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Icons for the Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
index 89ef62475047..733f4846f5cf 100644
--- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix
+++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
@@ -4,7 +4,6 @@
}:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-image-viewer";
version = "1.3.17";
@@ -42,7 +41,7 @@ mkDerivation rec {
-e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix,"
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Image Viewer for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix
index 4292fb2d212b..9aef8a15eb94 100644
--- a/pkgs/desktops/deepin/deepin-menu/default.nix
+++ b/pkgs/desktops/deepin/deepin-menu/default.nix
@@ -2,7 +2,6 @@
qt5integration, deepin }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-menu";
version = "3.4.8";
@@ -35,7 +34,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin menu service";
diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix
index a4aede5857c9..18f542233019 100644
--- a/pkgs/desktops/deepin/deepin-metacity/default.nix
+++ b/pkgs/desktops/deepin/deepin-metacity/default.nix
@@ -4,7 +4,6 @@
deepin, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-metacity";
version = "3.22.24";
@@ -54,7 +53,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "2D window manager for Deepin";
diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
index 6e14f0fd804e..046f589263bd 100644
--- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
+++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
@@ -3,7 +3,6 @@
libdvdnav, libdvdread, xorg, deepin }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-movie-reborn";
version = "3.2.24";
@@ -45,7 +44,7 @@ mkDerivation rec {
sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,'
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin movie player";
diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix
index 83afe1ee24f7..9f2e8068d555 100644
--- a/pkgs/desktops/deepin/deepin-mutter/default.nix
+++ b/pkgs/desktops/deepin/deepin-mutter/default.nix
@@ -5,7 +5,6 @@
deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-mutter";
version = "3.20.38";
@@ -68,7 +67,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Base window manager for deepin, fork of gnome mutter";
diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix
index 256744828db8..e77aa5e68c63 100644
--- a/pkgs/desktops/deepin/deepin-screenshot/default.nix
+++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix
@@ -3,7 +3,6 @@
deepin }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-screenshot";
version = "4.2.1";
@@ -49,7 +48,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Easy-to-use screenshot tool for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
index 8c482d534052..62c6c7ed9259 100644
--- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
+++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
@@ -2,7 +2,6 @@
qt5integration, deepin }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-shortcut-viewer";
version = "1.3.5";
@@ -26,7 +25,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Pop-up shortcut viewer for Deepin applications";
diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
index bb752cc1ca90..e61e91fc87c7 100644
--- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-sound-theme";
version = "15.10.3";
@@ -12,9 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9";
};
- makeFlags = [ "PREFIX=${placeholder ''out''}" ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin sound theme";
diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 51156554f999..59789bd84bbe 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -5,7 +5,6 @@
libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-terminal";
version = "3.2.6";
@@ -60,7 +59,7 @@ stdenv.mkDerivation rec {
"-DVERSION=${version}"
];
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Default terminal emulator for Deepin";
diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix
index 1fe930ea490d..299db5336746 100644
--- a/pkgs/desktops/deepin/deepin-turbo/default.nix
+++ b/pkgs/desktops/deepin/deepin-turbo/default.nix
@@ -1,7 +1,6 @@
{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-turbo";
version = "0.0.3";
@@ -32,7 +31,7 @@ mkDerivation rec {
searchHardCodedPaths $out # for debugging
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "A daemon that helps to launch applications faster";
diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix
index f99974ba9c26..e822cf6269dd 100644
--- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix
+++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, dde-api, deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-wallpapers";
version = "1.7.7";
@@ -34,7 +33,7 @@ stdenv.mkDerivation rec {
$out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Wallpapers for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix
index 986bee2f0dd2..13b115e7042f 100644
--- a/pkgs/desktops/deepin/deepin-wm/default.nix
+++ b/pkgs/desktops/deepin/deepin-wm/default.nix
@@ -4,7 +4,6 @@
deepin-desktop-schemas, wrapGAppsHook, deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "deepin-wm";
version = "1.9.38";
@@ -64,7 +63,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin Window Manager";
diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
index 4baa2262cd6e..f645be0f4d9b 100644
--- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
+++ b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
@@ -2,7 +2,6 @@
dde-polkit-agent, deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "dpa-ext-gnomekeyring";
version = "0.1.0";
@@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "GNOME keyring extension for dde-polkit-agent";
diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix
index 2a527e3cc19c..2ed10f993681 100644
--- a/pkgs/desktops/deepin/dtkcore/default.nix
+++ b/pkgs/desktops/deepin/dtkcore/default.nix
@@ -1,7 +1,6 @@
{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "dtkcore";
version = "2.0.14";
@@ -43,7 +42,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin tool kit core modules";
diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix
index 8487509e73b2..54c4163fcd1d 100644
--- a/pkgs/desktops/deepin/dtkwidget/default.nix
+++ b/pkgs/desktops/deepin/dtkwidget/default.nix
@@ -3,7 +3,6 @@
dde-qt-dbus-factory, dtkcore, deepin }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "dtkwidget";
version = "2.0.14";
@@ -41,7 +40,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin graphical user interface library";
diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix
index c05eedd8857a..4807c3d312b5 100644
--- a/pkgs/desktops/deepin/dtkwm/default.nix
+++ b/pkgs/desktops/deepin/dtkwm/default.nix
@@ -2,7 +2,6 @@
deepin }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "dtkwm";
version = "2.0.11";
@@ -31,7 +30,7 @@ mkDerivation rec {
"LIB_INSTALL_DIR=${outRef}/lib"
];
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin graphical user interface library";
diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix
index 044d5e2a2eaf..d302cc3417f2 100644
--- a/pkgs/desktops/deepin/go-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "go-dbus-factory";
version = "0.9.0";
@@ -12,13 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "06fqyad9f50gcjsjkh7929yyaprahdjhnd0dr4gl2797a7wysl3f";
};
- makeFlags = [ "PREFIX=${placeholder ''out''}" ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
postPatch = ''
sed -i -e 's:/share/gocode:/share/go:' Makefile
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "GoLang DBus factory for the Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix
index 92cf3960c736..125629764902 100644
--- a/pkgs/desktops/deepin/go-dbus-generator/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, go, go-lib, deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "go-dbus-generator";
version = "0.6.6";
@@ -18,11 +17,11 @@ stdenv.mkDerivation rec {
];
makeFlags = [
- "PREFIX=${placeholder ''out''}"
+ "PREFIX=${placeholder "out"}"
"GOCACHE=$(TMPDIR)/go-cache"
];
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Convert dbus interfaces to go-lang or qml wrapper code";
diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix
index 4b79969970a8..2f431bd941b8 100644
--- a/pkgs/desktops/deepin/go-gir-generator/default.nix
+++ b/pkgs/desktops/deepin/go-gir-generator/default.nix
@@ -2,7 +2,6 @@
libgudev, deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "go-gir-generator";
version = "2.0.2";
@@ -28,11 +27,11 @@ stdenv.mkDerivation rec {
'';
makeFlags = [
- "PREFIX=${placeholder ''out''}"
+ "PREFIX=${placeholder "out"}"
"GOCACHE=$(TMPDIR)/go-cache"
];
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Generate static golang bindings for GObject";
diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix
index 6f3a851eb2f1..fff92b595f8b 100644
--- a/pkgs/desktops/deepin/go-lib/default.nix
+++ b/pkgs/desktops/deepin/go-lib/default.nix
@@ -2,7 +2,6 @@
mobile-broadband-provider-info, deepin }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "go-lib";
version = "1.10.2";
@@ -28,7 +27,7 @@ stdenv.mkDerivation rec {
rm -r $out/share/go/src/pkg.deepin.io/lib/debian
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Go bindings for Deepin Desktop Environment development";
diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix
index b275174fa9f1..ffbc230d2e2a 100644
--- a/pkgs/desktops/deepin/qcef/default.nix
+++ b/pkgs/desktops/deepin/qcef/default.nix
@@ -39,7 +39,6 @@ let
in
mkDerivation rec {
- name = "${pname}-${version}";
pname = "qcef";
version = "1.1.6";
@@ -91,7 +90,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Qt5 binding of Chromium Embedded Framework";
diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
index f2e6eb0d1233..4d0240c426ba 100644
--- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
+++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
@@ -2,7 +2,6 @@
mtdev, cairo, deepin, qtbase }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "qt5dxcb-plugin";
version = "1.2.2";
@@ -26,12 +25,12 @@ mkDerivation rec {
];
qmakeFlags = [
- "INSTALL_PATH=${placeholder ''out''}/${qtbase.qtPluginPrefix}/platforms"
+ "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms"
];
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Qt platform theme integration plugin for DDE";
diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix
index 8302e701b386..97e60be6d678 100644
--- a/pkgs/desktops/deepin/qt5integration/default.nix
+++ b/pkgs/desktops/deepin/qt5integration/default.nix
@@ -3,7 +3,6 @@
qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "qt5integration";
version = "0.3.12";
@@ -41,7 +40,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Qt platform theme integration plugins for DDE";
diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix
index e7f735a4256a..51c38f6d3474 100644
--- a/pkgs/desktops/deepin/udisks2-qt5/default.nix
+++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix
@@ -1,7 +1,6 @@
{ stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, deepin }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "udisks2-qt5";
version = "0.0.1";
@@ -29,7 +28,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit name; };
+ passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "UDisks2 D-Bus interfaces binding for Qt5";
diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix
index 8d0fed6b3d85..2739b9a2517f 100644
--- a/pkgs/desktops/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/default.nix
@@ -1,5 +1,5 @@
{ callPackage, pkgs }:
-rec {
+{
#### CORE EFL
efl = callPackage ./efl.nix {
openjpeg = pkgs.openjpeg_1;
diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix
index 8e73682065d3..93b0cb59650b 100644
--- a/pkgs/desktops/enlightenment/econnman.nix
+++ b/pkgs/desktops/enlightenment/econnman.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }:
stdenv.mkDerivation rec {
- name = "econnman-${version}";
+ pname = "econnman";
version = "1.1";
src = fetchurl {
- url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz";
+ url = "http://download.enlightenment.org/rel/apps/econnman/${pname}-${version}.tar.gz";
sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0";
};
diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix
index 409b3f7bb8dd..f1455f68338f 100644
--- a/pkgs/desktops/enlightenment/ephoto.nix
+++ b/pkgs/desktops/enlightenment/ephoto.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }:
stdenv.mkDerivation rec {
- name = "ephoto-${version}";
+ pname = "ephoto";
version = "1.5";
src = fetchurl {
- url = "http://www.smhouston.us/stuff/${name}.tar.gz";
+ url = "http://www.smhouston.us/stuff/${pname}-${version}.tar.gz";
sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb";
};
diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
index 31dd985af2a7..7d8365337aa8 100644
--- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
@@ -6,7 +6,7 @@ in stdenv.mkDerivation rec {
ver_maj = "2.32";
ver_min = "0";
version = "${ver_maj}.${ver_min}";
- name = "gnome-python-desktop-${version}";
+ pname = "gnome-python-desktop";
src = fetchurl {
url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
# gnome-python-desktop expects that .pth file is already installed by PyGTK
# in the same directory. This is not the case for Nix.
postInstall = ''
- echo "gtk-2.0" > $out/${python2.sitePackages}/${name}.pth
+ echo "gtk-2.0" > $out/${python2.sitePackages}/${pname}-${version}.pth
'';
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 16828f08bc27..6cc6848b316f 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -57,8 +57,6 @@ lib.makeScope pkgs.newScope (self: with self; {
#### DESKTOP
- gvfs = pkgs.gvfs.override { gnome = self; };
-
# Removed from recent GNOME releases, but still required
scrollkeeper = callPackage ./desktop/scrollkeeper { };
@@ -78,7 +76,10 @@ lib.makeScope pkgs.newScope (self: with self; {
glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
# Included for backwards compatibility
- libsoup libwnck gtk-doc gnome-doc-utils rarian;
+ libsoup libwnck gtk-doc gnome-doc-utils rarian
+
+ gvfs # added 2019-09-03
+ ;
gtk = pkgs.gtk2;
gtkmm = pkgs.gtkmm2;
diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 03440c02c14f..87d2931d2744 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "gtksourceview-${version}";
+ pname = "gtksourceview";
version = "2.10.5";
src = fetchurl {
- url = "mirror://gnome/sources/gtksourceview/2.10/${name}.tar.bz2";
+ url = "mirror://gnome/sources/gtksourceview/2.10/${pname}-${version}.tar.bz2";
sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e";
};
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
index ac9a87299ab8..10b99e4eb5d2 100644
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
rev = "9ae8768";
version = "5.4";
- name = "mail-notification-${version}";
+ pname = "mail-notification";
src = fetchFromGitHub {
inherit rev;
diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index c774468852ee..606ba93d3fcd 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -45,10 +45,10 @@ in stdenv.mkDerivation rec {
meta = {
homepage = https://www.gnome.org/;
- description = "A library implementing a terminal emulator widget for GTK+";
+ description = "A library implementing a terminal emulator widget for GTK";
longDescription = ''
VTE is a library (libvte) implementing a terminal emulator widget for
- GTK+, and a minimal sample application (vte) using that. Vte is
+ GTK, and a minimal sample application (vte) using that. Vte is
mainly used in gnome-terminal, but can also be used to embed a
console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
character set conversion, as well as emulating any terminal known to
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index df3de11e738d..1a1848491b16 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2, polkit, python2, intltool }:
stdenv.mkDerivation rec {
- name = "gconf-${version}";
+ pname = "gconf";
version = "3.2.6";
src = fetchurl {
diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
index 369880c4fc1a..27caaa70634f 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
@@ -29,14 +29,14 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://projects.gnome.org/gtkglext/;
- description = "GtkGLExt, an OpenGL extension to GTK+";
- longDescription =
- '' GtkGLExt is an OpenGL extension to GTK+. It provides additional GDK
- objects which support OpenGL rendering in GTK+ and GtkWidget API
- add-ons to make GTK+ widgets OpenGL-capable. In contrast to Janne
- Löf's GtkGLArea, GtkGLExt provides a GtkWidget API that enables
- OpenGL drawing for standard and custom GTK+ widgets.
- '';
+ description = "GtkGLExt, an OpenGL extension to GTK";
+ longDescription = ''
+ GtkGLExt is an OpenGL extension to GTK. It provides additional GDK
+ objects which support OpenGL rendering in GTK and GtkWidget API
+ add-ons to make GTK widgets OpenGL-capable. In contrast to Janne
+ Löf's GtkGLArea, GtkGLExt provides a GtkWidget API that enables
+ OpenGL drawing for standard and custom GTK widgets.
+ '';
license = licenses.lgpl2Plus;
platforms = platforms.linux;
};
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
index 3ea04048accc..33c2abef0fab 100644
--- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
version = "4.10.0";
- name = "gtkhtml-${version}";
+ pname = "gtkhtml";
src = fetchurl {
- url = "mirror://gnome/sources/gtkhtml/4.10/${name}.tar.xz";
+ url = "mirror://gnome/sources/gtkhtml/4.10/${pname}-${version}.tar.xz";
sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya";
};
diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
index f21e81237b26..b18e58f6f56f 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix
@@ -5,11 +5,11 @@
, adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2 }:
stdenv.mkDerivation rec {
- name = "cheese-${version}";
+ pname = "cheese";
version = "3.32.1";
src = fetchurl {
- url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1xlmsm4zsx05ahvpd4mgy1hfhxbag0r5i6p63bksjxdligdd36kv";
};
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 733b8ecca920..267a7f2f7d20 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -2,11 +2,11 @@
, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
stdenv.mkDerivation rec {
- name = "file-roller-${version}";
+ pname = "file-roller";
version = "3.32.1";
src = fetchurl {
- url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0irm72cf8222h93skivn0nn0ckahiiiimy4rb9r3ccjvhi3hiaqw";
};
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 2dcd265e2e48..35d97a87a86f 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -5,11 +5,11 @@
, gnome3, gspell, perl, itstool, desktop-file-utils }:
stdenv.mkDerivation rec {
- name = "gedit-${version}";
+ pname = "gedit";
version = "3.32.2";
src = fetchurl {
- url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl";
};
diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index 4424eb4a3fd4..84d1a8a76ba3 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -4,11 +4,11 @@
, gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
- name = "glade-${version}";
+ pname = "glade";
version = "3.22.1";
src = fetchurl {
- url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z";
};
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Glade;
- description = "User interface designer for GTK+ applications";
+ description = "User interface designer for GTK applications";
maintainers = gnome3.maintainers;
license = licenses.lgpl2;
platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 2a308a2da450..27ce5d0f078b 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -11,10 +11,11 @@
let
version = "3.32.1";
in stdenv.mkDerivation rec {
- name = "gnome-boxes-${version}";
+ pname = "gnome-boxes";
+ inherit version;
src = fetchurl {
- url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index d2845bef2a13..38182f1f994f 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -5,11 +5,11 @@
, gnome3, gdk-pixbuf, geoclue2, libgweather }:
stdenv.mkDerivation rec {
- name = "gnome-clocks-${version}";
+ pname = "gnome-clocks";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1w6lgjdak3x76c9gyhd1lqrdmjfh8q77sjnrkcimylsg0jq913bc";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index e8796d49e9a1..1301381e5aaf 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -7,11 +7,11 @@
, desktop-file-utils, wrapGAppsHook, python3, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
- name = "gnome-documents-${version}";
+ pname = "gnome-documents";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1gqddzbr4d8s0asmrhy0sfmwggzhbmpm61mqf8rxpdjk7s26086c";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
index 4c215d347299..655e9e9fe34d 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
stdenv.mkDerivation rec {
- name = "gnome-getting-started-docs-${version}";
+ pname = "gnome-getting-started-docs";
version = "3.32.2";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1v4k465mlzrhgcdddzs6bmm0yliyrfx6jg3gh0s17a08i0w5rbwq";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index d46882deb41e..8681a3c866ce 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -2,11 +2,11 @@
, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
- name = "gnome-logs-${version}";
+ pname = "gnome-logs";
version = "3.32.1";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0hh3nnbq7q2xbflvaywanm0j3dqhb04ngphskhnjx2sg7px12068";
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
index 4a34f12912f7..920343a60241 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
@@ -6,8 +6,9 @@
let
version = "3.32.2";
-in stdenv.mkDerivation rec {
- name = "gnome-notes-${version}";
+in stdenv.mkDerivation {
+ pname = "gnome-notes";
+ inherit version;
src = fetchurl {
url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
index d21cfcfd72d2..1e5a641f08fd 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
@@ -2,11 +2,11 @@
, libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
- name = "gnome-weather-${version}";
+ pname = "gnome-weather";
version = "3.32.2";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0jfxdfbjkrk3x48w6nxgbmazd6jw1fh4mfw12hlly4rs0cjw698s";
};
diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
index ae360d73b879..c5377157ef0c 100644
--- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
@@ -2,11 +2,11 @@
, libsecret, itstool, wrapGAppsHook, librsvg }:
stdenv.mkDerivation rec {
- name = "vinagre-${version}";
+ pname = "vinagre";
version = "3.22.0";
src = fetchurl {
- url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82";
};
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index 9ef94adcbd09..a7f4a637b178 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -2,11 +2,11 @@
, iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }:
stdenv.mkDerivation rec {
- name = "adwaita-icon-theme-${version}";
+ pname = "adwaita-icon-theme";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9";
};
diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index 8a6ecc5d5e19..7f4f84fa5fe1 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
- packageName = "${pname}";
+ packageName = pname;
attrPath = "gnome3.${pname}";
};
};
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 73c3f65a968a..5e4bbf8cce17 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -10,11 +10,11 @@
, isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }:
stdenv.mkDerivation rec {
- name = "empathy-${version}";
+ pname = "empathy";
version = "3.25.90";
src = fetchurl {
- url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc";
};
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 7b7b7f64aa4d..c52162ce7f1d 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -1,15 +1,15 @@
{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk3, glib, icu
, wrapGAppsHook, gnome3, libxml2, libxslt, itstool
, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
-, sqlite, gcr, isocodes, desktop-file-utils, python3
+, sqlite, gcr, isocodes, desktop-file-utils, python3, nettle
, gdk-pixbuf, gst_all_1, json-glib, libdazzle, libhandy }:
stdenv.mkDerivation rec {
- name = "epiphany-${version}";
+ pname = "epiphany";
version = "3.32.4";
src = fetchurl {
- url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "15d9s295yr6m9pbwh344c4akm7rgn19y4g1xkyn7gbq1hdbjia69";
};
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf gnome3.adwaita-icon-theme gcr
glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
- gst_all_1.gst-libav json-glib libdazzle
+ gst_all_1.gst-libav json-glib libdazzle nettle
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 078145e1231f..0048b02581a7 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -5,13 +5,13 @@
, glib, gtk3, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
- name = "evolution-data-server-${version}";
+ pname = "evolution-data-server";
version = "3.32.4";
outputs = [ "out" "dev" ];
src = fetchurl {
- url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3";
};
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
];
prePatch = ''
- substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas \
- --subst-var-by GDS_GSETTINGS_PATH "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}/glib-2.0/schemas"
+ substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \
+ --subst-var-by GDS_GSETTINGS_PATH ${glib.getSchemaPath gsettings-desktop-schemas}
patches="$patches $PWD/hardcode-gsettings.patch"
'';
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 420a0d3e6b11..a4d2fd2be5a5 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -4,11 +4,11 @@
, librsvg, coreutils, xwayland }:
stdenv.mkDerivation rec {
- name = "gdm-${version}";
+ pname = "gdm";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4";
};
diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 4e43d5f9d50c..303377b8631a 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -3,11 +3,11 @@
, makeWrapper }:
stdenv.mkDerivation rec {
- name = "gjs-${version}";
+ pname = "gjs";
version = "1.56.2";
src = fetchurl {
- url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index 1e332502db5d..e4c772cb1d40 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gettext }:
stdenv.mkDerivation rec {
- name = "gnome-backgrounds-${version}";
+ pname = "gnome-backgrounds";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 9214aa0a9a79..df43371a4971 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -3,11 +3,11 @@
, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
- name = "gnome-calculator-${version}";
+ pname = "gnome-calculator";
version = "3.32.2";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
index d0ab339a504d..f2eb65e50bbf 100644
--- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, which, gnome3, autoconf, automake }:
stdenv.mkDerivation rec {
- name = "gnome-common-${version}";
+ pname = "gnome-common";
version = "3.18.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index 57cb90c7c458..75a15a41f97b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -7,10 +7,11 @@
let
version = "3.32.1";
in stdenv.mkDerivation rec {
- name = "gnome-contacts-${version}";
+ pname = "gnome-contacts";
+ inherit version;
src = fetchurl {
- url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "17g1gh8yj58cfpdx69h2szivlbjgvv982kmhnkkh0i5bwj0zs2yy";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index 4beeb190f025..9d798c2811bd 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -3,13 +3,13 @@
, libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
- name = "gnome-desktop-${version}";
+ pname = "gnome-desktop";
version = "3.32.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
index 613de6c3c164..98398311882b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
@@ -3,11 +3,11 @@
, gnome3, gtk3, glib, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
- name = "gnome-dictionary-${version}";
+ pname = "gnome-dictionary";
version = "3.26.1";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 8e09b152e83a..d6d9f9272528 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -4,11 +4,11 @@
, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
stdenv.mkDerivation rec {
- name = "gnome-disk-utility-${version}";
+ pname = "gnome-disk-utility";
version = "3.32.1";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "08vwbji9m1nhjjdiyhhaqi8cncys7i89b4bpy095f8475v8y05bg";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index 317c7e915841..976829acd4c6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
@@ -3,11 +3,11 @@
, wrapGAppsHook, gnome3, harfbuzz }:
stdenv.mkDerivation rec {
- name = "gnome-font-viewer-${version}";
+ pname = "gnome-font-viewer";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "10b150sa3971i5lfnk0jkkzlril97lz09sshwsbkabc8b7kv1qa3";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index f36d3f4a6e0a..7817936bfda6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -3,11 +3,11 @@
, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
stdenv.mkDerivation rec {
- name = "gnome-keyring-${version}";
+ pname = "gnome-keyring";
version = "3.31.91";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1fjylqw4xp0rqsylq4gbxzw1sql2sy55h1mnz1pprrxb9py0mnd4";
};
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
];
configureFlags = [
- "--with-pkcs11-config=${placeholder ''out''}/etc/pkcs11/" # installation directories
- "--with-pkcs11-modules=${placeholder ''out''}/lib/pkcs11/"
+ "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories
+ "--with-pkcs11-modules=${placeholder "out"}/lib/pkcs11/"
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index ed4c1a3da13a..93da1f8abec9 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -3,11 +3,11 @@
, tracker, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "gnome-online-miners-${version}";
+ pname = "gnome-online-miners";
version = "3.30.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index 1d14481e7783..33acfd245cf5 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
- packageName = "${pname}";
+ packageName = pname;
attrPath = "gnome3.${pname}";
};
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 38adf7137f76..f13ad9f47aa6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -3,11 +3,11 @@
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }:
stdenv.mkDerivation rec {
- name = "gnome-session-${version}";
+ pname = "gnome-session";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0zrzkpd406i159mla7bfs5npa32fgqh66aip1rfq02rgsgmc9m5v";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index 6929f821e379..b9f33ce73a8a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -95,6 +95,12 @@ stdenv.mkDerivation rec {
"-Dudev_dir=${placeholder "out"}/lib/udev"
];
+ NIX_CFLAGS_COMPILE = [
+ # Default for release buildtype but passed manually because
+ # we're using plain
+ "-DG_DISABLE_CAST_CHECKS"
+ ];
+
# So the polkit policy can reference /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper
postFixup = ''
mkdir -p $out/bin/gnome-settings-daemon
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index 21281f15a5c1..3d37040828c5 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -2,11 +2,11 @@
, gnome3, gnome-menus, substituteAll }:
stdenv.mkDerivation rec {
- name = "gnome-shell-extensions-${version}";
+ pname = "gnome-shell-extensions";
version = "3.32.1";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "07libf6z24n42hpdsq163w0j8xyrav0lxqrwxrvq5kbz8zxv5ch2";
};
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
# Fixup adapted from export-zips.sh in the source.
extensiondir=$out/share/gnome-shell/extensions
- schemadir=$out/share/gsettings-schemas/${name}/glib-2.0/schemas/
+ schemadir=${glib.makeSchemaPath "$out" "${pname}-${version}"}
glib-compile-schemas $schemadir
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 1363cf6d6695..a1d8f2c599a8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -13,11 +13,11 @@ let
pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] );
in stdenv.mkDerivation rec {
- name = "gnome-shell-${version}";
+ pname = "gnome-shell";
version = "3.32.2";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 6d4875979007..12081bbae5b0 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -10,11 +10,11 @@ let
in
stdenv.mkDerivation rec {
- name = "gnome-software-${version}";
+ pname = "gnome-software";
version = "3.32.4";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0g30wdrpypj23npvx85wqh1i4a8bbg00ainz7wmsvry21hcny4d4";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index 5c332c4135c5..a9f8367a5484 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -3,11 +3,11 @@
, gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }:
stdenv.mkDerivation rec {
- name = "gnome-system-monitor-${version}";
+ pname = "gnome-system-monitor";
version = "3.32.1";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1wd43qdgjav6xamq5z5cy8fri5zr01jga3plc9w95gcia0rk3ha8";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index c9f5229f8701..75d4b117e778 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -3,11 +3,11 @@
, desktop-file-utils, itstool, wrapGAppsHook, hicolor-icon-theme }:
stdenv.mkDerivation rec {
- name = "gnome-terminal-${version}";
+ pname = "gnome-terminal";
version = "3.32.2";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 1a8582626e3a..7915e71a73c0 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gnome3, itstool, libxml2, intltool }:
stdenv.mkDerivation rec {
- name = "gnome-user-docs-${version}";
+ pname = "gnome-user-docs";
version = "3.32.3";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0dvsl0ldg8rf7yq0r4dv1pn41s7gjgcqp7agkbflkbmhrl6vbhig";
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 65f9fb0db806..2a425acb067d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-httpd=${apacheHttpd.out}/bin/httpd"
"--with-modules-path=${apacheHttpd.dev}/modules"
- "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user"
- "--with-nautilusdir=${placeholder ''out''}/lib/nautilus/extensions-3.0"
+ "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
+ "--with-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0"
];
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
index cfdda920e27c..56104aff4840 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, gnome3 }:
stdenv.mkDerivation rec {
- name = "unicode-data-${version}";
+ pname = "unicode-data";
version = "12.0.0";
srcs = [
(fetchurl {
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
index 7e1f696c58d1..41527298ffbe 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
- rev = version;
- sha256 = "0p8ky306dnm4alkncmsnd8r2awpsi37p0bzvkv313pgqw2hbwq9i";
+ rev = "74e3126b77eb5f27c0ae3f53b0aff2d2eebc15af"; # patches of tip from gnome-3-28 branch
+ sha256 = "0gw1n1w3i040w5mv30kkg7g8a59ymjlc5yaklip0ngg8xv76g0zi";
};
patches = [
@@ -58,7 +58,6 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-x"
- "--disable-static"
"--enable-shape"
"--enable-sm"
"--enable-startup-notification"
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 61219ca4488e..eab0b131ea93 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo
+{ fetchurl, fetchpatch, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo
, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
, ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
, gsettings-desktop-schemas, glib, gtk3, gnome-desktop
@@ -55,6 +55,13 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
inherit zenity;
})
+ # Fix a segmentation fault in dri_flush_front_buffer() upon
+ # suspend/resume. This change should be removed when Mutter
+ # is updated to 3.34.
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/mutter/commit/8307c0f7ab60760de53f764e6636893733543be8.diff";
+ sha256 = "1hzfva71xdqvvnx5smjsrjlgyrmc7dj94mpylkak0gwda5si0h2n";
+ })
];
postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 4f57c5247d97..de56b14d46fd 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -3,11 +3,11 @@
, libxml2, sane-backends, vala, gnome3, gobject-introspection }:
stdenv.mkDerivation rec {
- name = "simple-scan-${version}";
+ pname = "simple-scan";
version = "3.32.2.1";
src = fetchurl {
- url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0xqb642bsd2hddsm4bd199vyq8jcipdlxm0br3mjlc5vjcxgkxyp";
};
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index 5554dbdfe302..86675f21f06a 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -4,11 +4,11 @@
, gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja }:
stdenv.mkDerivation rec {
- name = "sushi-${version}";
+ pname = "sushi";
version = "3.32.1";
src = fetchurl {
- url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "02idvqjk76lii9xyg3b1yz4rw721709bdm5j8ikjym6amcghl0aj";
};
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 4953b7ec7a82..a5388f2eae19 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -6,11 +6,11 @@
, gdk-pixbuf, tracker, nautilus, xvfb_run }:
stdenv.mkDerivation rec {
- name = "totem-${version}";
+ pname = "totem";
version = "3.32.1";
src = fetchurl {
- url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0yra8apc7smpwf7d1k8crhrm8d4wix24ds6i9yxbch1v11jnhr3v";
};
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
index 444c144cfab8..e18f4de68d6c 100644
--- a/pkgs/desktops/gnome-3/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/core/vino/default.nix
@@ -28,7 +28,7 @@
, telepathy-glib ? null
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "vino";
version = "unstable-2019-07-08";
diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
index aac216262584..43863bf7f856 100644
--- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
stdenv.mkDerivation rec {
- name = "yelp-tools-${version}";
+ pname = "yelp-tools";
version = "3.32.2";
src = fetchurl {
- url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q";
};
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index f1a393117280..fc5b0268df70 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -2,11 +2,11 @@
, itstool, libxml2, libxslt, gnome3 }:
stdenv.mkDerivation rec {
- name = "yelp-xsl-${version}";
+ pname = "yelp-xsl";
version = "3.32.1";
src = fetchurl {
- url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya";
};
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 24a49413960c..7e326dd1657d 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -4,11 +4,11 @@
, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "yelp-${version}";
+ pname = "yelp";
version = "3.32.2";
src = fetchurl {
- url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0yrl96icmmrxvg7sxl519gzg9qb368cmzgrr9ddh181ignkxzx7f";
};
diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix
index 89d0fd7a3b90..5023ffce6b96 100644
--- a/pkgs/desktops/gnome-3/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/core/zenity/default.nix
@@ -2,11 +2,11 @@
, gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "zenity-${version}";
+ pname = "zenity";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7";
};
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 1f16ff9d0b52..370733798aff 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -53,10 +53,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gjs = callPackage ./core/gjs { };
- glib-networking = pkgs.glib-networking.override {
- inherit (pkgs) gsettings-desktop-schemas;
- };
-
gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
@@ -111,7 +107,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gucharmap = callPackage ./core/gucharmap { };
- gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
+ gvfs = pkgs.gvfs.override { gnomeSupport = true; };
eog = callPackage ./core/eog { };
@@ -235,8 +231,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { };
- nemiver = callPackage ./devtools/nemiver { };
-
#### Games
aisleriot = callPackage ./games/aisleriot { };
@@ -348,6 +342,8 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16
inherit (pkgs) gnome-video-effects; # added 2019-08-19
inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23
+ inherit (pkgs) glib-networking; # added 2019-09-02
+ inherit (pkgs) nemiver; # added 2019-09-09
defaultIconTheme = adwaita-icon-theme;
gtk = gtk3;
diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
index d1e5179063f3..573259b7e7d0 100644
--- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
@@ -3,11 +3,11 @@
itstool, python3, ncurses, makeWrapper }:
stdenv.mkDerivation rec {
- name = "anjuta-${version}";
+ pname = "anjuta";
version = "3.28.0";
src = fetchurl {
- url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh";
};
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 80a3770b7030..23a58011e027 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -3,11 +3,11 @@
, webkitgtk, gettext, itstool, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
- name = "devhelp-${version}";
+ pname = "devhelp";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "06sa83zggk29wcg75fl3gqh0rmi7cd3gsbk09a2z23r7vpy7xanq";
};
diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
index 647e7163d0b9..81f63941729f 100644
--- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
stdenv.mkDerivation rec {
- name = "gnome-devel-docs-${version}";
+ pname = "gnome-devel-docs";
version = "3.32.1";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0xqpgf975rws60qxilq635pblbpgwspyykgzxnb4awd9zrs5lbx0";
};
diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch b/pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch
deleted file mode 100644
index 83423122110c..000000000000
--- a/pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/dbgengine/nmv-dbg-common.h 2014-07-09 10:36:05.000000000 +0200
-+++ b/src/dbgengine/nmv-dbg-common.h 2016-08-04 22:40:28.447842746 +0200
-@@ -171,7 +171,9 @@
-
- bool has_slot () const
- {
-- return m_slot;
-+ //return m_slot;
-+ // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822502
-+ return static_cast (m_slot);
- }
-
- template
diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
deleted file mode 100644
index 9fbce7c6cc02..000000000000
--- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb,
- boost, sqlite, libgtop, glibmm, gtkmm3, vte, gtksourceview, gsettings-desktop-schemas,
- gtksourceviewmm, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
- name = "nemiver-${version}";
- version = "0.9.6";
-
- src = fetchurl {
- url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2";
- };
-
- nativeBuildInputs = [ libxml2 intltool itstool pkgconfig wrapGAppsHook ];
-
- buildInputs = [
- gtk3 gdb boost sqlite libgtop
- glibmm gtkmm3 vte gtksourceview gtksourceviewmm
- gsettings-desktop-schemas
- ];
-
- patches = [
- ./bool_slot.patch
- ./safe_ptr.patch
- (fetchpatch {
- url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch;
- sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7";
- })
- ];
-
- configureFlags = [
- "--enable-gsettings"
- ];
-
- passthru = {
- updateScript = gnome3.updateScript {
- packageName = "nemiver";
- attrPath = "gnome3.nemiver";
- versionPolicy = "none";
- };
- };
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Nemiver;
- description = "Easy to use standalone C/C++ debugger";
- license = licenses.gpl2;
- platforms = platforms.linux;
- maintainers = [ maintainers.juliendehos ];
- };
-}
diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch b/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch
deleted file mode 100644
index e3413b224977..000000000000
--- a/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/confmgr/nmv-gconf-mgr.cc 2014-07-08 10:24:06.000000000 +0200
-+++ b/src/confmgr/nmv-gconf-mgr.cc 2016-08-04 23:50:08.143060464 +0200
-@@ -32,6 +32,7 @@
- NEMIVER_BEGIN_NAMESPACE (nemiver)
-
- using nemiver::common::GCharSafePtr;
-+using nemiver::common::GErrorSafePtr;
-
- class GConfMgr : public IConfMgr {
- GConfMgr (const GConfMgr &);
diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
index 568a6cace720..6f289fd74d9f 100644
--- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gnome3 }:
stdenv.mkDerivation rec {
- name = "gnome-shell-extension-appindicator-${version}";
+ pname = "gnome-shell-extension-appindicator";
version = "29";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix
new file mode 100644
index 000000000000..b38f0aeba919
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitLab, glib, gettext, substituteAll, gnome-menus }:
+
+stdenv.mkDerivation rec {
+ pname = "gnome-shell-arc-menu";
+ version = "31";
+
+ src = fetchFromGitLab {
+ owner = "LinxGem33";
+ repo = "Arc-Menu";
+ rev = "v${version}-stable";
+ sha256 = "124jgdy6mw76nrkq3f0y7qkhdm39wg273zifdvwbgpvirwzxbia1";
+ };
+
+ patches = [
+ (substituteAll {
+ src = ./fix_gmenu.patch;
+ gmenu_path = "${gnome-menus}/lib/girepository-1.0";
+ })
+ ];
+
+ buildInputs = [
+ glib gettext
+ ];
+
+ makeFlags = [ "INSTALL_BASE=$(out)/share/gnome-shell/extensions" ];
+
+ meta = with stdenv.lib; {
+ description = "Gnome shell extension designed to replace the standard menu found in Gnome 3";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ dkabot ];
+ homepage = https://gitlab.com/LinxGem33/Arc-Menu;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch b/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch
new file mode 100644
index 000000000000..7f6b8489ea8b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/arc-menu/fix_gmenu.patch
@@ -0,0 +1,12 @@
+--- a/extension.js
++++ b/extension.js
+@@ -29,6 +29,8 @@
+ * https://github.com/The-Panacea-Projects/Gnomenu
+ */
+
++
++imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@');
+
+ // Import Libraries
+ const Main = imports.ui.main;
+
diff --git a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix
index afedd5f98e1a..b7bde83915c1 100644
--- a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "gnome-shell-extension-battery-status-${version}";
+ pname = "gnome-shell-extension-battery-status";
version = "6";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
index e627bec8b931..95a68505c7c8 100644
--- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, glib, gettext, bash }:
stdenv.mkDerivation rec {
- name = "gnome-shell-extension-caffeine-${version}";
+ pname = "gnome-shell-extension-caffeine";
version = "unstable-2019-04-02";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
index 755c8e1b02fb..f04999a449c2 100644
--- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
@@ -5,10 +5,11 @@ let
inherit (python3.pkgs) python pygobject3 requests;
in stdenv.mkDerivation rec {
- name = "chrome-gnome-shell-${version}";
+ pname = "chrome-gnome-shell";
+ inherit version;
src = fetchurl {
- url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${pname}-${version}.tar.xz";
sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban";
};
@@ -34,7 +35,7 @@ in stdenv.mkDerivation rec {
description = "GNOME Shell integration for Chrome";
homepage = https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome;
longDescription = ''
- To use the integration, install the browser extension, and then set to true. For Firefox based browsers, you will also need to build the wrappers with set to true.
+ To use the integration, install the browser extension, and then set to true.
'';
license = licenses.gpl3;
maintainers = gnome3.maintainers;
diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
index e41227e85139..0faadbcd2b68 100644
--- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "gnome-shell-extension-clipboard-indicator-${version}";
+ pname = "gnome-shell-extension-clipboard-indicator";
version = "30";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
index 06e7d27c5444..e80149e50053 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, glib, gettext }:
stdenv.mkDerivation rec {
- name = "gnome-shell-dash-to-dock-${version}";
+ pname = "gnome-shell-dash-to-dock";
version = "66";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
index 0d48b8359c91..f7f189e23bdc 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, glib, gettext }:
stdenv.mkDerivation rec {
- name = "gnome-shell-dash-to-panel-${version}";
- version = "19";
+ pname = "gnome-shell-dash-to-panel";
+ version = "23";
src = fetchFromGitHub {
owner = "home-sweet-gnome";
repo = "dash-to-panel";
rev = "v${version}";
- sha256 = "0r26ph6zq87kvglydv00rf24mshz7l4r38zf9niyp3mxyzz6rwys";
+ sha256 = "12smkz3clcvgicr0pdc0fk6igf82nw4hzih1ywv9q43xkqh9w1i6";
};
buildInputs = [
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index dd2a02b6be85..cff0db665bba 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -3,7 +3,7 @@
, glib, gtk3, at-spi2-core, upower, openssh, gnome3 }:
stdenv.mkDerivation rec {
- name = "gnome-shell-gsconnect-${version}";
+ pname = "gnome-shell-gsconnect";
version = "23";
src = fetchFromGitHub {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
(substituteAll {
src = ./fix-paths.patch;
gapplication = "${glib.bin}/bin/gapplication";
- mutter_gsettings_path = "${gnome3.mutter}/share/gsettings-schemas/${gnome3.mutter.name}/glib-2.0/schemas";
+ mutter_gsettings_path = glib.getSchemaPath gnome3.mutter;
})
];
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dgnome_shell_libdir=${gnome3.gnome-shell}/lib"
- "-Dgsettings_schemadir=${placeholder "out"}/share/gsettings-schemas/${name}/glib-2.0/schemas"
+ "-Dgsettings_schemadir=${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}"
"-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts"
"-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts"
"-Dopenssl_path=${openssl}/bin/openssl"
diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
index d08e6f3a57df..8214300a5311 100644
--- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gnome3 }:
stdenv.mkDerivation rec {
- name = "gnome-shell-extension-icon-hider-${version}";
+ pname = "gnome-shell-extension-icon-hider";
version = "23";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/pkgs/desktops/gnome-3/extensions/impatience.nix
index 24b4c1cf703f..b36f3489b57c 100644
--- a/pkgs/desktops/gnome-3/extensions/impatience.nix
+++ b/pkgs/desktops/gnome-3/extensions/impatience.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, glib }:
stdenv.mkDerivation rec {
- name = "gnome-shell-impatience-${version}";
+ pname = "gnome-shell-impatience";
version = "0.4.5";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
index 686d7be91a47..10175719e46c 100644
--- a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, glib, meson, gettext, ninja, python3 }:
-stdenv.mkDerivation rec {
- name = "gnome-shell-extensions-mediaplayer-${version}";
+stdenv.mkDerivation {
+ pname = "gnome-shell-extensions-mediaplayer";
version = "unstable-2019-03-21";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
index 8c075a11bdcd..f9f72bd77f02 100644
--- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, substituteAll, glib, gettext, xorg }:
stdenv.mkDerivation rec {
- name = "gnome-shell-extension-no-title-bar-${version}";
+ pname = "gnome-shell-extension-no-title-bar";
version = "9";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
index 21ff70140be1..e2b5288e8869 100644
--- a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "gnome-shell-extension-nohotcorner-${version}";
+ pname = "gnome-shell-extension-nohotcorner";
version = "19.0";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
index 5faa55652d8a..d9ea670db09e 100644
--- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "gnome-shell-extension-remove-dropdown-arrows-${version}";
+ pname = "gnome-shell-extension-remove-dropdown-arrows";
version = "11";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 7046e6737269..13b2d6a1db4f 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -1,14 +1,14 @@
{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }:
stdenv.mkDerivation rec {
- name = "gnome-shell-system-monitor-${version}";
- version = "36";
+ pname = "gnome-shell-system-monitor";
+ version = "38";
src = fetchFromGitHub {
owner = "paradoxxxzero";
repo = "gnome-shell-system-monitor-applet";
rev = "v${version}";
- sha256 = "0x3r189h5264kjxsm18d34gzb5ih8l4pz7i9qks9slcnzaiw4y0z";
+ sha256 = "1sdj2kxb418mgq44a6lf6jic33wlfbnn3ja61igmx0jj1530iknv";
};
buildInputs = [
@@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Display system informations in gnome shell status bar";
license = licenses.gpl3Plus;
- broken = true; # GNOME 3.32 support WIP: https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/510
maintainers = with maintainers; [ aneeshusa tiramiseb ];
homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet;
};
diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
index c72d72cce126..90be6aed1d79 100644
--- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }:
stdenv.mkDerivation rec {
- name = "gnome-shell-extension-taskwhisperer-${version}";
+ pname = "gnome-shell-extension-taskwhisperer";
version = "12";
src = fetchFromGitHub {
@@ -22,14 +22,14 @@ stdenv.mkDerivation rec {
uuid = "taskwhisperer-extension@infinicode.de";
makeFlags = [
- "INSTALLBASE=${placeholder ''out''}/share/gnome-shell/extensions"
+ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions"
];
patches = [
(substituteAll {
src = ./fix-paths.patch;
task = "${taskwarrior}/bin/task";
- shell = "${runtimeShell}";
+ shell = runtimeShell;
})
];
diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix
index 604b7433ccb4..f841ef2403dc 100644
--- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "gnome-shell-extension-timepp-${version}";
+ pname = "gnome-shell-extension-timepp";
version = "unstable-2019-03-30";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
index 9a151a6ac8f7..f0f6279fe2ee 100644
--- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, glib, gettext }:
stdenv.mkDerivation rec {
- name = "gnome-shell-extension-topicons-plus-${version}";
+ pname = "gnome-shell-extension-topicons-plus";
version = "22";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
index 19ced0b5252c..072d31b84fed 100644
--- a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
+++ b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, glib }:
stdenv.mkDerivation rec {
- name = "gnome-shell-volume-mixer-${version}";
+ pname = "gnome-shell-volume-mixer";
version = "844ed80ad448855d8f6218847183a80474b523c7";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/extensions/workspace-grid.nix b/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
index 10aee5cafe6e..811e9911f628 100644
--- a/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
+++ b/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, glib }:
stdenv.mkDerivation rec {
- name = "gnome-shell-workspace-grid-${version}";
+ pname = "gnome-shell-workspace-grid";
version = "0f3a430e7d04bb5465a17c1225aab0f574426d6b";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
index 21f089b324ef..b4c6eaaec1bf 100644
--- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
@@ -2,11 +2,11 @@
, librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }:
stdenv.mkDerivation rec {
- name = "five-or-more-${version}";
+ pname = "five-or-more";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0v52i22ygv6y4zqs8nyb1qmacmj9whhqrw7qss6vn7by4nsikhrn";
};
diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 94428d6640d0..5b233c48385d 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -3,11 +3,11 @@
, python3, ninja, desktop-file-utils }:
stdenv.mkDerivation rec {
- name = "four-in-a-row-${version}";
+ pname = "four-in-a-row";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0h4wmbkdp7x3gp9sbxmvla316m8n6iy4f5sq0ksldj0z7ghlx9zl";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index c6c24be4be8c..d7001e1c5279 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -2,11 +2,11 @@
, gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }:
stdenv.mkDerivation rec {
- name = "gnome-chess-${version}";
+ pname = "gnome-chess";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0hzb6s4wmfy1fysagc5hmn1ijvrwyd2cg7iz41mpn7gfdjyak639";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index c913a9e87294..904edd7e51a7 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
- packageName = "${pname}";
+ packageName = pname;
attrPath = "gnome3.${pname}";
};
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index ee55b5a65a5d..9d173945cdd8 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "gnome-mahjongg-${version}";
+ pname = "gnome-mahjongg";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "12kamxnxbh26k4iykhbs873mx25a2wrjnhr013lfkwbyl52kg12j";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index b2c8e99e8239..1ac7e51357eb 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -2,11 +2,11 @@
, librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }:
stdenv.mkDerivation rec {
- name = "gnome-mines-${version}";
+ pname = "gnome-mines";
version = "3.32.2";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1nv966wkp2rqxzcdb76bwlbzpjqadcaqzrnkxpzwnvjjr167yx8g";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index 3bea240ecb97..7b0699221696 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -3,11 +3,11 @@
, libxml2, libgee, libgnome-games-support }:
stdenv.mkDerivation rec {
- name = "gnome-nibbles-${version}";
+ pname = "gnome-nibbles";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0g627pzbfywiy2rsh4aidgbln9s4j5m8pryw4cgr5ygc4z8l6l9p";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index 2b40548d37ce..46723867f8ad 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
@@ -3,11 +3,11 @@
, libgee, meson, ninja, python3, desktop-file-utils , hicolor-icon-theme, adwaita-icon-theme }:
stdenv.mkDerivation rec {
- name = "gnome-robots-${version}";
+ pname = "gnome-robots";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1xp1sijl5k7wmnbb0hdgh4ajxgp74k7fcnmd5c6rw6lf51wpinyh";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index 5c3fafd3d02a..a555ee31cf37 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -2,11 +2,11 @@
, libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }:
stdenv.mkDerivation rec {
- name = "gnome-sudoku-${version}";
+ pname = "gnome-sudoku";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1wwdjflw1lbx3cv6gvqcgp5jnjkrq37ld6mjbjj03g3vr90qaf0l";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 06914d9817c7..b6c60362265d 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "gnome-taquin-${version}";
+ pname = "gnome-taquin";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1kyxh68gg7clxg22ls4sliisxb2sydwccbxqgfvxjg2fklr6r1lm";
};
diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index ab0f0f0faf2d..291415302116 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "gnome-tetravex-${version}";
+ pname = "gnome-tetravex";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "18drxp43j2jnywxl6qa7mn1iv33jxr0dpc1l9xza3lnrb0jp0kjl";
};
diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix
index 657bf4a76391..8e53a937a5e9 100644
--- a/pkgs/desktops/gnome-3/games/hitori/default.nix
+++ b/pkgs/desktops/gnome-3/games/hitori/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Hitori;
- description = "GTK+ application to generate and let you play games of Hitori";
+ description = "GTK application to generate and let you play games of Hitori";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 86a1bd6485be..114551ed4ee1 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "iagno-${version}";
+ pname = "iagno";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1rcqb4gpam16xw87n4q2akkrg94ksrn16ry21pr6bsd7qs7hw17d";
};
diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index 5801c2935632..9c582f037a25 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -3,11 +3,11 @@
, meson, ninja, python3 }:
stdenv.mkDerivation rec {
- name = "lightsoff-${version}";
+ pname = "lightsoff";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0vc3ibjs9ynnm0gxlhhin7jpnsx22vnn4ygaybxwmv9w2q49cs9f";
};
diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix
index f0da625316fa..f196ada38504 100644
--- a/pkgs/desktops/gnome-3/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/games/tali/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "tali-${version}";
+ pname = "tali";
version = "3.32.1";
src = fetchurl {
- url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0na7sswfh63wj44aibcnqdsbb24yfngcwgi07lv8rky6rry0kqgz";
};
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index 94703f375b21..94418849b987 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
@@ -30,21 +30,13 @@
stdenv.mkDerivation rec {
pname = "gitg";
- version = "3.32.0";
+ version = "3.32.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1wzsv7bh0a2w70f938hkpzbb9xkyrp3bil65c0q3yf2v72nbbn81";
+ sha256 = "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914";
};
- patches = [
- # https://gitlab.gnome.org/GNOME/gitg/issues/213
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/gitg/merge_requests/83.patch";
- sha256 = "1f7wx1d3k5pnp8zbrqssip57b9jxn3hc7a83psm7fny970qmd18z";
- })
- ];
-
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
index 7bb162b7b8b4..25e1347f1c92 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
@@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
doCheck = true;
configureFlags = [
- "--with-libpanel-applet-dir=${placeholder ''out''}/share/gnome-panel/applets"
+ "--with-libpanel-applet-dir=${placeholder "out"}/share/gnome-panel/applets"
];
passthru = {
diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
index c80c8b977cf5..c8d26988391d 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "gnome-autoar-${version}";
+ pname = "gnome-autoar";
version = "0.2.3";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax";
};
diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
index d819961d2819..ea9a79de40e4 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
@@ -2,11 +2,11 @@
, gtk3, systemd, wrapGAppsHook, desktop-file-utils, hicolor-icon-theme }:
stdenv.mkDerivation rec {
- name = "gnome-packagekit-${version}";
+ pname = "gnome-packagekit";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "08rhsisdvx7pnx3rrg5v7c09jbw4grglkdj979gwl4a31j24zjsd";
};
diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index a35067587e04..46ca01c1a1a1 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "3.32.0";
- name = "gpaste-${version}";
+ pname = "gpaste";
src = fetchurl {
url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
substituteInPlace src/gnome-shell/prefs.js \
--subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0"
substituteInPlace src/libgpaste/settings/gpaste-settings.c \
- --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${name}/glib-2.0/schemas"
+ --subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}
'';
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
index 543453a2bd31..a607a6eb6a07 100644
--- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
@@ -2,11 +2,11 @@
, gnome3, enchant, isocodes, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
- name = "gtkhtml-${version}";
+ pname = "gtkhtml";
version = "4.10.0";
src = fetchurl {
- url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3";
};
diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix
index 6ef87cece4e4..64e9332a3066 100644
--- a/pkgs/desktops/gnustep/make/default.nix
+++ b/pkgs/desktops/gnustep/make/default.nix
@@ -4,8 +4,9 @@ let
version = "2.7.0";
in
-stdenv.mkDerivation rec {
- name = "gnustep-make-${version}";
+stdenv.mkDerivation {
+ pname = "gnustep-make";
+ inherit version;
src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz";
diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix
index 6e8644b19b0c..550e98c9dcc8 100644
--- a/pkgs/desktops/lxde/core/lxmenu-data.nix
+++ b/pkgs/desktops/lxde/core/lxmenu-data.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, intltool }:
stdenv.mkDerivation rec {
- name = "lxmenu-data-${version}";
+ pname = "lxmenu-data";
version = "0.1.5";
src = fetchurl {
- url = "mirror://sourceforge/lxde/${name}.tar.xz";
+ url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8";
};
diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix
index ca601531b68f..0646078d8257 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/pkgs/desktops/lxde/core/lxtask/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libintl }:
stdenv.mkDerivation rec {
- name = "lxtask-${version}";
+ pname = "lxtask";
version = "0.1.9";
src = fetchurl {
- url = "mirror://sourceforge/lxde/${name}.tar.xz";
+ url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
sha256 = "0cv4hx5dg01hbyi5p10pl78n0a40xajpq4wx9c7886pkmpq8isj1";
};
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
with all xfce4 dependencies removed, some bugs fixed, and some
improvement of UI. Although being part of LXDE, the Lightweight X11
Desktop Environment, it's totally desktop independent and only
- requires pure gtk+.
+ requires pure GTK.
'';
homepage = https://wiki.lxde.org/en/LXTask;
license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix
index c1b29b161254..df717debbae8 100644
--- a/pkgs/desktops/lxqt/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/qlipper/default.nix
@@ -1,7 +1,6 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools }:
mkDerivation rec {
- name = "${pname}-${version}";
pname = "qlipper";
version = "5.1.1";
diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index 5ef080ef50be..15dea9b10184 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "atril-${version}";
+ pname = "atril";
version = "1.22.1";
src = fetchurl {
- url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0i2wgsksgwhrmajj1lay3iym4dcyj8cdd813yh5mrfz4rkv49190";
};
diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
index 108e8fe1e0b1..ba21cb00d35d 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "caja-extensions-${version}";
+ pname = "caja-extensions";
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1h866jmdd3qpjzi7wjj11krwiaadnlf21844g1zqfb4jgrzj773p";
};
diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
index 8fad6cac8799..0278fd7fec83 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "engrampa-${version}";
- version = "1.22.1";
+ pname = "engrampa";
+ version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "06z38vfs15f5crrrgvcsqfb557fhpq1mqkj5fd9wb0hvi77hasrk";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "0ph7ngk32nnzc3psqjs5zy52zbjilk30spr2r4sixqxvmz7d28gd";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index 72e509d59afd..cc683ab2db21 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "eom-${version}";
+ pname = "eom";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "03lpxqvyaqhz4wmi07nxcyn5q73ym3dzm41cdid53f2dp9lk1mv4";
};
diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix
index bd6488d2c2ce..d6709c375e6d 100644
--- a/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }:
stdenv.mkDerivation rec {
- name = "libmatekbd-${version}";
+ pname = "libmatekbd";
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1dsr7618c92mhwabwhgxqsfp7gnf9zrz2z790jc5g085dxhg13y8";
};
diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix
index bf2a91971dd9..17fee5d61cbe 100644
--- a/pkgs/desktops/mate/libmatemixer/default.nix
+++ b/pkgs/desktops/mate/libmatemixer/default.nix
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "libmatemixer-${version}";
+ pname = "libmatemixer";
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1v0gpr55gj4mj8hzxbhgzrmhaxvs2inxhsmirvjw39sc7iplvrh9";
};
diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index 664b85fc287b..e4976f71ae68 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }:
stdenv.mkDerivation rec {
- name = "libmateweather-${version}";
+ pname = "libmateweather";
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ribgcwl4ncfbcf9bkcbxrgc7yzajdnxg12837psngymkqswlp6a";
};
diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index 4f77b3035015..9899256018a8 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "marco-${version}";
+ pname = "marco";
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0sc7x14229yj22ka1vlzbaqndwcgh6idypjmm9rydkj4n968jwry";
};
diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
index 7fbd192ac2ca..ec7ad2b4294d 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-applets-${version}";
+ pname = "mate-applets";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "19sjm2180ir8a264rz8m528qaqjpl3q3cq095ab0sbkp2igksrfx";
};
diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix
index f5c151d01f7f..2667c25959e6 100644
--- a/pkgs/desktops/mate/mate-backgrounds/default.nix
+++ b/pkgs/desktops/mate/mate-backgrounds/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, intltool }:
stdenv.mkDerivation rec {
- name = "mate-backgrounds-${version}";
+ pname = "mate-backgrounds";
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1j9ch04qi2q4mdcvb92w667ra9hpfdf2bfpi1dpw0nbph7r6qvj9";
};
diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix
index 85631f03e1d4..64ede5101c75 100644
--- a/pkgs/desktops/mate/mate-calc/default.nix
+++ b/pkgs/desktops/mate/mate-calc/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-calc-${version}";
+ pname = "mate-calc";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0zin3w03zrkpb12rvay23bfk9fnjpybkr5mqzkpn9xfnqamhk8ld";
};
diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
index 3b154fd9812a..f85dd632bd16 100644
--- a/pkgs/desktops/mate/mate-common/default.nix
+++ b/pkgs/desktops/mate/mate-common/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "mate-common-${version}";
+ pname = "mate-common";
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "11lwckndizawbq993ws8lqp59vsc873zri0m8s1i5zyc4qx9f69z";
};
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index 6e54b137ba1d..a06c24b9c728 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "mate-control-center-${version}";
+ pname = "mate-control-center";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0w9w3wkxksbhzyd96y1x6yxb0q5lkp16y8i42564b6njvwqch5a0";
};
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index 0bfcab586635..58515a492b5c 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-desktop-${version}";
+ pname = "mate-desktop";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1hr4r69855csqrcaqpbcyplsy4cwjfz7gabps2pzkh5132jycfr0";
};
diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
index ba0cbd526f96..7db01f598164 100644
--- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }:
stdenv.mkDerivation rec {
- name = "mate-icon-theme-faenza-${version}";
+ pname = "mate-icon-theme-faenza";
version = "1.20.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna";
};
diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index 8f0f15fac2dd..9df0d0ce5a88 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor-icon-theme, gtk3 }:
stdenv.mkDerivation rec {
- name = "mate-icon-theme-${version}";
+ pname = "mate-icon-theme";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1pn1xbmr4w4mi45nwk1qh18z9rlngmkhp9bw671yn4k6sii8fi3k";
};
diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix
index 623e7f240964..e1a6e874d1d6 100644
--- a/pkgs/desktops/mate/mate-indicator-applet/default.nix
+++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-indicator-applet-${version}";
+ pname = "mate-indicator-applet";
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0zad81qvcin4m329hfxhv4a5j8gf4gj8944mvjrdgdh71bzan2x1";
};
diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix
index 7185181d7476..93c765a99533 100644
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/pkgs/desktops/mate/mate-media/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-media-${version}";
+ pname = "mate-media";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "13g1n2ddgr1yxgl4fsqj3sgb9344b756kam9v3sq6vh0bxlr4yf2";
};
diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix
index bb09b0a4849d..e37a270f9dca 100644
--- a/pkgs/desktops/mate/mate-menus/default.nix
+++ b/pkgs/desktops/mate/mate-menus/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection, python3 }:
stdenv.mkDerivation rec {
- name = "mate-menus-${version}";
+ pname = "mate-menus";
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1lkakbf2f1815c146z4xp5f0h4lim6jzr02681wbvzalc6k97v5c";
};
diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix
index 049e0a4bb69a..51d23e475ff3 100644
--- a/pkgs/desktops/mate/mate-netbook/default.nix
+++ b/pkgs/desktops/mate/mate-netbook/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-netbook-${version}";
+ pname = "mate-netbook";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "00n162bskbvxhy4k2w14f9zwlsg3wgi43228ssx7sc2p95psmm64";
};
diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index 45d483503aa7..d53ae8efa356 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -2,11 +2,11 @@
libnotify, libwnck3, gtk3, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-notification-daemon-${version}";
+ pname = "mate-notification-daemon";
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "06z3xczhz5diy4kk7b8lrzljrnql6fz0n1jyy916cf8pnnanpg0j";
};
diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index bbb49c203472..39d2c1812cbc 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-panel-${version}";
+ pname = "mate-panel";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0pb9dpgsfjp6gsldg4ad2jz23xdvjfarmz4cjwkpakygkq5i6dma";
};
diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix
index f5b6d62dd590..253472e3987e 100644
--- a/pkgs/desktops/mate/mate-polkit/default.nix
+++ b/pkgs/desktops/mate/mate-polkit/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }:
stdenv.mkDerivation rec {
- name = "mate-polkit-${version}";
+ pname = "mate-polkit";
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "02r8n71xflhvw2hsf6g4svdahzyg3r4n6xamasyzqfhyn0mqmjy0";
};
diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index 7f4d1c850151..6ba6ac205ce1 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-power-manager-${version}";
+ pname = "mate-power-manager";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "06vs2w44l1s25j0mifkid02yncw0nvdxw8r4pp2jm18kxan4frms";
};
diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix
index 53a89bec4c1e..d1c1e481d700 100644
--- a/pkgs/desktops/mate/mate-screensaver/default.nix
+++ b/pkgs/desktops/mate/mate-screensaver/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-screensaver-${version}";
+ pname = "mate-screensaver";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0c4qq5szsbfrz8hgkmlby2k7f1qs8kgqf2shd63z0pc8p6f47vvc";
};
diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix
index c5ad4628c54f..bd9ed9f6cbe7 100644
--- a/pkgs/desktops/mate/mate-sensors-applet/default.nix
+++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-sensors-applet-${version}";
+ pname = "mate-sensors-applet";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0rv19jxxviqqwk2wlhxlm98jsxa26scvs7ilp2i6plhn3ap2alq3";
};
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 3448e8327f5b..b7735ec77fec 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "mate-session-manager-${version}";
+ pname = "mate-session-manager";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ix8picxgc28m5zd0ww3zvzw6rz38wvzsrbqw28hghrfg926h6ig";
};
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index 00d967a2d5cf..5ee995402ecd 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -4,11 +4,11 @@
wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-settings-daemon-${version}";
+ pname = "mate-settings-daemon";
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0yr5v6b9hdk20j29smbw1k4fkyg82i5vlflmgly0vi5whgc74gym";
};
diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix
index f7cdf036cebf..6f5993cfc353 100644
--- a/pkgs/desktops/mate/mate-system-monitor/default.nix
+++ b/pkgs/desktops/mate/mate-system-monitor/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-system-monitor-${version}";
+ pname = "mate-system-monitor";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0yh1sh5snd7ivchh6l9rbn1s7ia4j5ihhzhqkyjnhr8ln59dvcbm";
};
diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
index 2339ad8fb1b3..7ec9944aa0e1 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, gtk3, vte, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-terminal-${version}";
+ pname = "mate-terminal";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "08210ry5lrivsgzqpdaxrchhpj0n5s1q0x4pxmwdpnksjpcj11mn";
};
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index a4724049f7c1..9ed5515ea3e7 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -2,11 +2,11 @@
gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }:
stdenv.mkDerivation rec {
- name = "mate-themes-${version}";
+ pname = "mate-themes";
version = "3.22.20";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0c3dhf8p9nc2maky4g9xr04iil9wwbdkmhpzynlc6lfg4ksqq2bx";
};
diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix
index eae425b18920..a9a0e1712312 100644
--- a/pkgs/desktops/mate/mate-user-guide/default.nix
+++ b/pkgs/desktops/mate/mate-user-guide/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, intltool, itstool, libxml2, yelp }:
stdenv.mkDerivation rec {
- name = "mate-user-guide-${version}";
+ pname = "mate-user-guide";
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "01kcszsjiriqp4hf1k4fhazi2yfqlkn415sfgx0jw0p821bzqf2h";
};
diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix
index f152515d60e9..999bee2e5d10 100644
--- a/pkgs/desktops/mate/mate-user-share/default.nix
+++ b/pkgs/desktops/mate/mate-user-share/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-user-share-${version}";
+ pname = "mate-user-share";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1krsar1pwa8720qz2dckcg0f6z9mvfk49djdxaz1afvi7blmqd6k";
};
diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix
index 606a473cfaac..7775173611e2 100644
--- a/pkgs/desktops/mate/mate-utils/default.nix
+++ b/pkgs/desktops/mate/mate-utils/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-utils-${version}";
+ pname = "mate-utils";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0768y6x33ljc9dxjlfmvplsn4lrxj5xhjddbyab9h6pqav8527rg";
};
diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index 171d8971c4e8..cfbe33dd380d 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "pluma-${version}";
+ pname = "pluma";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "14d5c5fg31d7br9h1y3gdcr53j4sxlgybf326jvdcw8mgy91k3dg";
};
diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix
index c3b39e85925d..42a8e328a161 100644
--- a/pkgs/desktops/mate/python-caja/default.nix
+++ b/pkgs/desktops/mate/python-caja/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, python3Packages }:
stdenv.mkDerivation rec {
- name = "python-caja-${version}";
+ pname = "python-caja";
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1zwdjvxci72j0181nlfq6912lw3aq8j3746brlp7wlzn22qp7b0k";
};
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index ae6583c46720..0decbbc6c7a6 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -10,6 +10,7 @@
, desktop-file-utils
, libcanberra
, gtk3
+, glib
, libgee
, granite
, libnotify
@@ -82,7 +83,7 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
substituteInPlace filechooser-module/FileChooserDialog.vala \
- --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas
+ --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
index a03594b7b18b..7a79f72f1a2e 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
@@ -1,4 +1,5 @@
{ stdenv
+, substituteAll
, fetchFromGitHub
, pantheon
, meson
@@ -9,6 +10,7 @@
, granite
, gtk3
, switchboard
+, onboard
}:
stdenv.mkDerivation rec {
@@ -22,6 +24,13 @@ stdenv.mkDerivation rec {
sha256 = "1wh46lrsliii5bbvfc4xnzgnii2v7sqxnbn43ylmyqppfv9mk1wd";
};
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ inherit onboard;
+ })
+ ];
+
passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
@@ -42,7 +51,7 @@ stdenv.mkDerivation rec {
switchboard
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Universal Access Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch
new file mode 100644
index 000000000000..4d69390f39d9
--- /dev/null
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Panes/Typing.vala b/src/Panes/Typing.vala
+index b4ae8b0..5b8fd7e 100644
+--- a/src/Panes/Typing.vala
++++ b/src/Panes/Typing.vala
+@@ -83,7 +83,7 @@ public class Accessibility.Panes.Typing : Categories.Pane {
+
+ onboard_settings_label.clicked.connect (() => {
+ try {
+- var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, AppInfoCreateFlags.NONE);
++ var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, AppInfoCreateFlags.NONE);
+ appinfo.launch (null, null);
+ } catch (Error e) {
+ warning ("%s\n", e.message);
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index bd6df460c04b..3247aed4993e 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
./remove-update-button.patch
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard About Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index dca9cc662a2b..ddb589c9e792 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
switchboard
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Applications Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
index d1663ad48cd3..9f1c75b7b438 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
switchboard
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Bluetooth Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
index fb7ea18e88be..c0c7bbdec2e5 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
./clock-format.patch
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Date & Time Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
index c15abfd8cb81..76cfe61fc777 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
switchboard
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Displays Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index ba753af7e202..8b82543a0e5f 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
})
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Keyboard Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index 00579c545254..a8556bd54014 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -10,6 +10,7 @@
, gtk3
, switchboard
, elementary-settings-daemon
+, glib
}:
stdenv.mkDerivation rec {
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace src/Views/General.vala \
- --subst-var-by GSD_GSETTINGS ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas
+ --subst-var-by GSD_GSETTINGS ${glib.getSchemaPath elementary-settings-daemon}
'';
passthru = {
@@ -46,13 +47,14 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ glib
granite
gtk3
libgee
switchboard
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Mouse & Touchpad Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index 09d6da4f2460..175f0e45f46e 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -50,12 +50,12 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./nma.patch;
- networkmanagerapplet = "${networkmanagerapplet}";
+ networkmanagerapplet = networkmanagerapplet;
})
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Networking Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
index e547f22fec16..a61124954698 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
switchboard
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Notifications Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index b9fad17c2f75..35dd958483d6 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala
+{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, glib
, libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop
, gala, wingpanel, plank, switchboard, gettext, bamf, fetchpatch }:
@@ -29,9 +29,10 @@ stdenv.mkDerivation rec {
buildInputs = [
bamf
- gexiv2
- gnome-desktop
elementary-settings-daemon
+ gexiv2
+ glib
+ gnome-desktop
granite
gtk3
libgee
@@ -51,13 +52,13 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace src/Views/Appearance.vala \
- --subst-var-by GALA_GSETTINGS_PATH ${gala}/share/gsettings-schemas/${gala.name}/glib-2.0/schemas
+ --subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala}
substituteInPlace src/Views/Appearance.vala \
- --subst-var-by WINGPANEL_GSETTINGS_PATH ${wingpanel}/share/gsettings-schemas/${wingpanel.name}/glib-2.0/schemas
+ --subst-var-by WINGPANEL_GSETTINGS_PATH ${glib.getSchemaPath wingpanel}
'';
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Desktop Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 461ddcd3764a..7bc3f6ba7adb 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -11,6 +11,7 @@
, elementary-settings-daemon
, granite
, gtk3
+, glib
, dbus
, polkit
, switchboard
@@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [
dbus
+ glib
granite
gtk3
libgee
@@ -52,22 +54,22 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./dpms-helper-exec.patch;
- elementary_dpms_helper = "${elementary-dpms-helper}";
+ elementary_dpms_helper = elementary-dpms-helper;
})
./hardcode-gsettings.patch
];
postPatch = ''
substituteInPlace src/MainView.vala \
- --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${elementary-dpms-helper}/share/gsettings-schemas/${elementary-dpms-helper.name}/glib-2.0/schemas
+ --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${glib.getSchemaPath elementary-dpms-helper}
substituteInPlace src/MainView.vala \
- --subst-var-by GSD_GSETTINGS_PATH ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas
+ --subst-var-by GSD_GSETTINGS_PATH ${glib.getSchemaPath elementary-settings-daemon}
'';
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
- PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "${placeholder ''out''}/share/dbus-1/system-services";
- PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder ''out''}/etc";
- PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder ''out''}/share/polkit-1/actions";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
+ PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/system-services";
+ PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder "out"}/etc";
+ PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
meta = with stdenv.lib; {
description = "Switchboard Power Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
index 5c303e04982b..d1feaaf0ea4f 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
switchboard
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Printers Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
index 19967c3bce05..fd67440a43c2 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
@@ -9,6 +9,7 @@
, libgee
, granite
, gtk3
+, glib
, polkit
, zeitgeist
, switchboard
@@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ glib
granite
gtk3
libgee
@@ -49,7 +51,7 @@ stdenv.mkDerivation rec {
zeitgeist
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
patches = [
./hardcode-gsettings.patch
@@ -60,9 +62,9 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
substituteInPlace src/Views/LockPanel.vala \
- --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${lightlocker}/share/gsettings-schemas/${lightlocker.name}/glib-2.0/schemas
+ --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${glib.getSchemaPath lightlocker}
substituteInPlace src/Views/FirewallPanel.vala \
- --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas
+ --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index b4aafb270062..87ae233916d8 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
switchboard
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Sharing Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index ed3518c764f9..dee2f851e3fd 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
switchboard
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Sound Plug";
diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
index 76bdcf643f8f..df2475ce82a3 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
@@ -3,7 +3,7 @@
, pantheon
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "elementary-redacted-script";
version = "unstable-2016-06-03";
diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
index b273bbece969..9fc4418e7ca1 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
@@ -33,16 +33,17 @@ with stdenv.lib;
# TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this
runCommand "elementary-gsettings-desktop-schemas" {}
''
- mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
- cp -rf ${gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
+ schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
- ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") gsettingsOverridePackages}
+ mkdir -p $schema_dir
+ cp -rf ${glib.getSchemaPath gsettings-desktop-schemas}/*.xml $schema_dir
+
+ ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml $schema_dir\n") gsettingsOverridePackages}
chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
- cp ${elementary-default-settings}/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override \
- $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
+ cp ${elementary-default-settings}/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override $schema_dir
- cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
+ cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF
[org.gnome.desktop.background]
picture-uri='file://${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png'
primary-color='#000000'
@@ -50,5 +51,5 @@ runCommand "elementary-gsettings-desktop-schemas" {}
${extraGSettingsOverrides}
EOF
- ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/
+ ${glib.dev}/bin/glib-compile-schemas $schema_dir
''
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index c262fb37dbc5..7b0657bcd80b 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -7,6 +7,7 @@
, gnome-session
, wingpanel
, orca
+, onboard
, at-spi2-core
, elementary-default-settings
, writeShellScriptBin
@@ -46,7 +47,7 @@ let
dockitemAutostart = substituteAll {
src = ./default-elementary-dockitems.desktop;
- script = "${dockitems-script}";
+ script = dockitems-script;
};
executable = writeShellScriptBin "pantheon" ''
@@ -85,9 +86,9 @@ stdenv.mkDerivation rec {
cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list
mkdir -p $out/etc/xdg/autostart
- cp -av ${gnome-keyring}/etc/xdg/autostart/* $out/etc/xdg/autostart
- cp -av ${orca}/etc/xdg/autostart/* $out/etc/xdg/autostart
- cp -av ${at-spi2-core}/etc/xdg/autostart/* $out/etc/xdg/autostart
+ for package in ${gnome-keyring} ${orca} ${onboard} ${at-spi2-core}; do
+ cp -av $package/etc/xdg/autostart/* $out/etc/xdg/autostart
+ done
cp "${dockitemAutostart}" $out/etc/xdg/autostart/default-elementary-dockitems.desktop
diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
index 973040a8da64..8e180ca83a66 100644
--- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
+++ b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./exec-path.patch;
- file_roller = "${file-roller}";
- gnome_bluetooth = "${gnome-bluetooth}";
+ file_roller = file-roller;
+ gnome_bluetooth = gnome-bluetooth;
})
];
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index 9f40c0f9e582..ae138c9215c1 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -70,11 +70,11 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
- "--sysconfdir=${placeholder ''out''}/etc"
+ "--sysconfdir=${placeholder "out"}/etc"
];
- PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+ PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
+ PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
patches = [
(substituteAll {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index 7e73adcd7e91..36d1cf0e77a3 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
wingpanel
];
- PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+ PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
postPatch = ''
chmod +x meson/post_install.py
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index 1ab3c579e145..74408a4ed6d4 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
})
];
- PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+ PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
postPatch = ''
chmod +x meson/post_install.py
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
index 00a57cb99433..5431b982f540 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
})
];
- PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+ PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
meta = with stdenv.lib; {
description = "Keyboard Indicator for Wingpanel";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
index d5ce97df509d..6ba19ebf77ee 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
wingpanel
];
- PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+ PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
meta = with stdenv.lib; {
description = "Network Indicator for Wingpanel";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
index 0eab02bf8c80..0327d5e78e2c 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
wingpanel
];
- PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+ PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
meta = with stdenv.lib; {
description = "Night Light Indicator for Wingpanel";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
index 78c901a23063..a4266a6f4595 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
wingpanel
];
- PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+ PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
meta = with stdenv.lib; {
description = "Notifications Indicator for Wingpanel";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
index f63cca74a4dc..9f9d47030600 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
wingpanel
];
- PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+ PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
postPatch = ''
chmod +x meson/post_install.py
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
index b363cb5485a5..f48638ff2b16 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
wingpanel
];
- PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+ PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
meta = with stdenv.lib; {
description = "Session Indicator for Wingpanel";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
index 6d0e791d1e41..038ab75094cd 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
wingpanel
];
- PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
+ PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
postPatch = ''
chmod +x meson/post_install.py
diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix
index 7fba9610db0b..521d22d23353 100644
--- a/pkgs/desktops/pantheon/granite/default.nix
+++ b/pkgs/desktops/pantheon/granite/default.nix
@@ -66,9 +66,9 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "An extension to GTK+ used by elementary OS";
+ description = "An extension to GTK used by elementary OS";
longDescription = ''
- Granite is a companion library for GTK+ and GLib. Among other things, it provides complex widgets and convenience functions
+ Granite is a companion library for GTK and GLib. Among other things, it provides complex widgets and convenience functions
designed for use in apps built for elementary OS.
'';
homepage = https://github.com/elementary/granite;
diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix
index 6401b96a2eab..b10e97f77d73 100644
--- a/pkgs/desktops/pantheon/services/contractor/default.nix
+++ b/pkgs/desktops/pantheon/services/contractor/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
libgee
];
- PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder ''out''}/share/dbus-1/services";
+ PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services";
meta = with stdenv.lib; {
description = "A desktop-wide extension service used by elementary OS";
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index 8381796c4561..67a67dd4b3d2 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -150,6 +150,12 @@ stdenv.mkDerivation rec {
"-Dudev_dir=${placeholder "out"}/lib/udev"
];
+ NIX_CFLAGS_COMPILE = [
+ # Default for release buildtype but passed manually because
+ # we're using plain
+ "-DG_DISABLE_CAST_CHECKS"
+ ];
+
passthru = {
updateScript = gnome3.updateScript {
packageName = repoName;
diff --git a/pkgs/desktops/pantheon/update.nix b/pkgs/desktops/pantheon/update.nix
index 7e9aacc0c2b2..3bc432c5d325 100644
--- a/pkgs/desktops/pantheon/update.nix
+++ b/pkgs/desktops/pantheon/update.nix
@@ -31,6 +31,6 @@ let
throwFlag = throw "${versionPolicy} is not a valid versionPolicy - Options are either 'release' or 'master' (defaults to release).";
- versionFlag = { "release" = "-r"; "master" = "-m"; }.${versionPolicy} or throwFlag;
+ versionFlag = { release = "-r"; master = "-m"; }.${versionPolicy} or throwFlag;
in [ updateScript versionFlag repoName attrPath ]
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index d1bd9e957f71..e188e4e3fcdd 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -72,7 +72,7 @@ let
let
inherit (args) name;
sname = args.sname or name;
- inherit (srcs."${sname}") src version;
+ inherit (srcs.${sname}) src version;
outputs = args.outputs or [ "out" ];
hasBin = lib.elem "bin" outputs;
@@ -86,7 +86,7 @@ let
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = lib.platforms.linux;
- maintainers = with lib.maintainers; [ ttuegel ];
+ maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
homepage = http://www.kde.org;
} // (args.meta or {});
in
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 034b57ec06a3..e2e6da6f07c2 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.5/ )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.16.5/ )
diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix
index 150b97be50d7..01e740f74c4b 100644
--- a/pkgs/desktops/plasma-5/ksysguard.nix
+++ b/pkgs/desktops/plasma-5/ksysguard.nix
@@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
lm_sensors,
kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
- knewstuff, libksysguard, qtwebkit
+ knewstuff, libksysguard
}:
mkDerivation {
@@ -11,6 +11,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
- kdelibs4support ki18n lm_sensors qtwebkit
+ kdelibs4support ki18n lm_sensors
];
}
diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix
index 1cbfb87ea563..b4fd032cf1f7 100644
--- a/pkgs/desktops/plasma-5/kwallet-pam.nix
+++ b/pkgs/desktops/plasma-5/kwallet-pam.nix
@@ -1,9 +1,9 @@
-{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, }:
+{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, kwallet, }:
mkDerivation {
name = "kwallet-pam";
nativeBuildInputs = [ extra-cmake-modules ];
- buildInputs = [ pam socat libgcrypt qtbase ];
+ buildInputs = [ pam socat libgcrypt qtbase kwallet ];
postPatch = ''
sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|"
'';
diff --git a/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix
new file mode 100644
index 000000000000..d2c68d3cb7b2
--- /dev/null
+++ b/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix
@@ -0,0 +1,44 @@
+{ lib, mkDerivation, fetchFromGitHub
+, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }:
+
+mkDerivation rec {
+ pname = "kwin-tiling";
+ version = "2.2";
+
+ src = fetchFromGitHub {
+ owner = "kwin-scripts";
+ repo = "kwin-tiling";
+ rev = "v${version}";
+ sha256 = "1sx64xv7g9yh3j26zxxrbndv79xam9jq0vs00fczgfv2n0m7j7bl";
+ };
+
+ # This is technically not needed, but we might as well clean up
+ postPatch = ''
+ rm release.sh
+ '';
+
+ buildInputs = [
+ kcoreaddons kwindowsystem plasma-framework systemsettings
+ ];
+
+ dontBuild = true;
+
+ # 1. --global still installs to $HOME/.local/share so we use --packageroot
+ # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually
+ installPhase = ''
+ runHook preInstall
+
+ plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts
+ install -Dm644 ${src}/metadata.desktop $out/share/kservices5/kwin-script-tiling.desktop
+
+ runHook postInstalll
+ '';
+
+ meta = with lib; {
+ description = "Tiling script for kwin";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ peterhoeg ];
+ inherit (src.meta) homepage;
+ inherit (kwindowsystem.meta) platforms;
+ };
+}
diff --git a/pkgs/desktops/plasma-5/kwin/xwayland.patch b/pkgs/desktops/plasma-5/kwin/xwayland.patch
index 51f15c87d274..9d405b3bbb86 100644
--- a/pkgs/desktops/plasma-5/kwin/xwayland.patch
+++ b/pkgs/desktops/plasma-5/kwin/xwayland.patch
@@ -1,13 +1,13 @@
-Index: kwin-5.7.3/main_wayland.cpp
+Index: kwin-5.15.5/xwl/xwayland.cpp
===================================================================
---- kwin-5.7.3.orig/main_wayland.cpp
-+++ kwin-5.7.3/main_wayland.cpp
-@@ -315,7 +315,7 @@ void ApplicationWayland::startXwaylandSe
+--- kwin-5.15.5.orig/xwl/xwayland.cpp
++++ kwin-5.15.5/xwl/xwayland.cpp
+@@ -143,7 +143,7 @@ void Xwayland::init()
- m_xwaylandProcess = new Process(kwinApp());
+ m_xwaylandProcess = new Process(this);
m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel);
- m_xwaylandProcess->setProgram(QStringLiteral("Xwayland"));
+ m_xwaylandProcess->setProgram(QLatin1String(NIXPKGS_XWAYLAND));
- QProcessEnvironment env = m_environment;
+ QProcessEnvironment env = m_app->processStartupEnvironment();
env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd));
- m_xwaylandProcess->setProcessEnvironment(env);
+ env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM"));
diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix
index 0f9fe40d73c3..96d113e11fb6 100644
--- a/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ b/pkgs/desktops/plasma-5/libksysguard/default.nix
@@ -2,7 +2,7 @@
mkDerivation,
extra-cmake-modules,
kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes,
- kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit,
+ kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebengine,
qtx11extras
}:
@@ -15,7 +15,7 @@ mkDerivation {
buildInputs = [
kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets
kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
- qtwebkit
+ qtwebengine
];
outputs = [ "bin" "dev" "out" ];
}
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 32bd5f3a9f28..4183b38ba493 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -15,7 +15,7 @@
plasma-workspace, xf86inputlibinput
}:
-mkDerivation rec {
+mkDerivation {
name = "plasma-desktop";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
index 55a4518021ed..5c27eee5010e 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
@@ -2,12 +2,13 @@ diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
index 69d3070..52e9102 100644
--- a/sddm-theme/theme.conf.cmake
+++ b/sddm-theme/theme.conf.cmake
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
[General]
type=image
color=#1d99f3
--background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png
-+background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png
+ fontSize=10
+-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png
++background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png
diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt
index 6a1a212..f03fd34 100644
--- a/startkde/CMakeLists.txt
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index ac0a3494c226..f299ed953de2 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,363 +3,363 @@
{
bluedevil = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/bluedevil-5.15.5.tar.xz";
- sha256 = "7379230de96c5e6d4ea40f4dfa8732e20a6ee3bd291e6f119ccb57646c33fe1f";
- name = "bluedevil-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/bluedevil-5.16.5.tar.xz";
+ sha256 = "60ac3471d30cb113b1959eacdaa1f4898f04f779f94a35dbca00993cda4ea464";
+ name = "bluedevil-5.16.5.tar.xz";
};
};
breeze = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/breeze-5.15.5.tar.xz";
- sha256 = "a13de0472dacd5240c3d38d0841ea7b9098405cf1f8cff77504d1824d09dcac4";
- name = "breeze-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/breeze-5.16.5.tar.xz";
+ sha256 = "09225021a2cf396e74cabe692b0a5dcf9a12f0b47f02fb14df6ccc9db01f2e6b";
+ name = "breeze-5.16.5.tar.xz";
};
};
breeze-grub = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/breeze-grub-5.15.5.tar.xz";
- sha256 = "4a27689446d66b7de043321022093e8f457dd4d47c124186f233b0606ddcfd64";
- name = "breeze-grub-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/breeze-grub-5.16.5.tar.xz";
+ sha256 = "ce73297350e7b79b04aa8ba44594e8eca2d37c0342eb331bd5d31679f3887878";
+ name = "breeze-grub-5.16.5.tar.xz";
};
};
breeze-gtk = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/breeze-gtk-5.15.5.tar.xz";
- sha256 = "d4e16ffbcbe74c48fda7c5bfd18c3f479f56d54b761d9b1d9678119479412ca8";
- name = "breeze-gtk-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/breeze-gtk-5.16.5.tar.xz";
+ sha256 = "d9849ecf6c2fc85fde76912410ab36c46ca65b96d80b4e51819ca35015a88098";
+ name = "breeze-gtk-5.16.5.tar.xz";
};
};
breeze-plymouth = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/breeze-plymouth-5.15.5.tar.xz";
- sha256 = "0a518d5a9e1bddeb3e1c7329966ce178a36ab0a0bd6dd28caf803fe8c1680de8";
- name = "breeze-plymouth-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/breeze-plymouth-5.16.5.tar.xz";
+ sha256 = "bb10d2f0185181e6f2fe8e3b85415dfcce6069595e0074b182688c6f567dd0b0";
+ name = "breeze-plymouth-5.16.5.tar.xz";
};
};
discover = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/discover-5.15.5.tar.xz";
- sha256 = "6f2bbaade87b959c8bd847e90ecec0c9aa8b4accee63318d25e5beb77deaf854";
- name = "discover-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/discover-5.16.5.tar.xz";
+ sha256 = "26c47a5c0f59a31f37da85e894a926c76805b66f91dde8ba6d2de8015842d5c1";
+ name = "discover-5.16.5.tar.xz";
};
};
drkonqi = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/drkonqi-5.15.5.tar.xz";
- sha256 = "8669913aa8485257cbb19bbe5bb6956044d0a6896a365cea024b1247d0a6502e";
- name = "drkonqi-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/drkonqi-5.16.5.tar.xz";
+ sha256 = "b4ae1518108c2d3ccbc533708801b52b83b7e9efd6eed9f1ee9d67936b9e78ff";
+ name = "drkonqi-5.16.5.tar.xz";
};
};
kactivitymanagerd = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/kactivitymanagerd-5.15.5.tar.xz";
- sha256 = "e38ec9074e0bc5c1a21bd5eee97b7d99e6528186918e832fecf1e3f95da239db";
- name = "kactivitymanagerd-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/kactivitymanagerd-5.16.5.tar.xz";
+ sha256 = "e35dbf7aae8a7b7f21b2304935cad96881af558a7c9d947f0114093038b1c4bc";
+ name = "kactivitymanagerd-5.16.5.tar.xz";
};
};
kde-cli-tools = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/kde-cli-tools-5.15.5.tar.xz";
- sha256 = "fbff40188d7864a11aa6aea0b6d8cca2c66025924b3cb29275ac6d282ece9ace";
- name = "kde-cli-tools-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/kde-cli-tools-5.16.5.tar.xz";
+ sha256 = "bc82b159d3c9a23f0ecb47a8314b645041b01692887a3be0ef0582d54f926de2";
+ name = "kde-cli-tools-5.16.5.tar.xz";
};
};
kdecoration = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/kdecoration-5.15.5.tar.xz";
- sha256 = "33d613b706b83c025675d7d2b20e074219c9a0953a500c306081c24fcf84d99f";
- name = "kdecoration-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/kdecoration-5.16.5.tar.xz";
+ sha256 = "2b8c7b7cf114d0eff4ec842009cda264d8cf1254ec4bf65868b6d26f263829bb";
+ name = "kdecoration-5.16.5.tar.xz";
};
};
kde-gtk-config = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/kde-gtk-config-5.15.5.tar.xz";
- sha256 = "958163b1134b7c9e9735b5b6a4448973f09dbf43991511f768b29bd038baa185";
- name = "kde-gtk-config-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/kde-gtk-config-5.16.5.tar.xz";
+ sha256 = "f78abf129aaa7afac2c7a71105b36b9553a975bbcb89ec65a0166099d1cca8c1";
+ name = "kde-gtk-config-5.16.5.tar.xz";
};
};
kdeplasma-addons = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/kdeplasma-addons-5.15.5.tar.xz";
- sha256 = "1e11158f636e1d4bb25bbe4bb2f2fca37728c6aae07340ca6c2c1ec9e882ece3";
- name = "kdeplasma-addons-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/kdeplasma-addons-5.16.5.tar.xz";
+ sha256 = "a4737a54b75143053a9f8a5bc28c608f843c524872c665d4e5a65bd2853e1e00";
+ name = "kdeplasma-addons-5.16.5.tar.xz";
};
};
kgamma5 = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/kgamma5-5.15.5.tar.xz";
- sha256 = "5e5d2dd439d4fd298eb0283fd9f2bad009c5efe22f72aea795138d22adfdc1e7";
- name = "kgamma5-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/kgamma5-5.16.5.tar.xz";
+ sha256 = "838fabf4312f022ee3df5bba940c0c73e26260cfee39235c1ba8da8a2e61bfa0";
+ name = "kgamma5-5.16.5.tar.xz";
};
};
khotkeys = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/khotkeys-5.15.5.tar.xz";
- sha256 = "59dd6a571d52401b1963cde732b6c6c589a328438155ec0e0c5c77b5ac029127";
- name = "khotkeys-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/khotkeys-5.16.5.tar.xz";
+ sha256 = "e7b866b5249ff7c5860a5a222dca79691ca1f09af176f786021fbbadbd718c8c";
+ name = "khotkeys-5.16.5.tar.xz";
};
};
kinfocenter = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/kinfocenter-5.15.5.tar.xz";
- sha256 = "0119da58b2274bab76ef27d37032b5b104bad162675bfbee631286186d2e17a8";
- name = "kinfocenter-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/kinfocenter-5.16.5.tar.xz";
+ sha256 = "e3bbc5e2baedf35dc8750c99e18c115b651f2665218a105c08177bc5250eb9b1";
+ name = "kinfocenter-5.16.5.tar.xz";
};
};
kmenuedit = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/kmenuedit-5.15.5.tar.xz";
- sha256 = "ad407757e93928dc506271998881a2e5f4a4c96bf763c25e80347e3e23361c26";
- name = "kmenuedit-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/kmenuedit-5.16.5.tar.xz";
+ sha256 = "8e95b81b910e5e78689fc7d4427c813ba7d39426df24cf8606adb850913a19a4";
+ name = "kmenuedit-5.16.5.tar.xz";
};
};
kscreen = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/kscreen-5.15.5.tar.xz";
- sha256 = "c0c47c6d5c618e2c40794dd37586a1733ef6939383b4bb760638e8758a0bd6f7";
- name = "kscreen-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/kscreen-5.16.5.tar.xz";
+ sha256 = "ce35f554014cee819767180f0c9381d539e497edfb9c290b279fa78e9dea4bb0";
+ name = "kscreen-5.16.5.tar.xz";
};
};
kscreenlocker = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/kscreenlocker-5.15.5.tar.xz";
- sha256 = "09d9d63e81a60d1c95532639287ba29403e0b04d7e4d46f5a49adbfccf215dcd";
- name = "kscreenlocker-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/kscreenlocker-5.16.5.tar.xz";
+ sha256 = "5ed6fdeac9aaba014edf67c5f782fc210d58310d083afaa589d0ff1bb3e8e02d";
+ name = "kscreenlocker-5.16.5.tar.xz";
};
};
ksshaskpass = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/ksshaskpass-5.15.5.tar.xz";
- sha256 = "4b6eae3b594480f6265843fa0b2f3d2051fd45894d27eee3681b7b33c4f52e7e";
- name = "ksshaskpass-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/ksshaskpass-5.16.5.tar.xz";
+ sha256 = "78eaa38ebbf888a8905e9385173e7161335041d6d07720283ce6f3fa06426a33";
+ name = "ksshaskpass-5.16.5.tar.xz";
};
};
ksysguard = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/ksysguard-5.15.5.tar.xz";
- sha256 = "c767cfff83cb8d6d99a6ba13fa534656d6d31666a3eaa7cdce677535e9f9624a";
- name = "ksysguard-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/ksysguard-5.16.5.tar.xz";
+ sha256 = "5558977389cb1fac4a5ce52c9430b27d9d1ee92705ae1995d92bed5340477282";
+ name = "ksysguard-5.16.5.tar.xz";
};
};
kwallet-pam = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/kwallet-pam-5.15.5.tar.xz";
- sha256 = "36f3e50019dcd9919755d47b62abf99412299aa87ee27fecbf1dca212a94d22e";
- name = "kwallet-pam-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/kwallet-pam-5.16.5.tar.xz";
+ sha256 = "4a12a8ed51973f9ea318a39a699523bcc99ae4e1cac932fccd19dedd45e758a8";
+ name = "kwallet-pam-5.16.5.tar.xz";
};
};
kwayland-integration = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/kwayland-integration-5.15.5.tar.xz";
- sha256 = "8dec5719104a551fc8c1d6249568accedce9b8d18691d818f2b7abc13f21fd17";
- name = "kwayland-integration-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/kwayland-integration-5.16.5.tar.xz";
+ sha256 = "63724ecfb6db053ee949273979b393192309dbeed45b59bc193a605f90232282";
+ name = "kwayland-integration-5.16.5.tar.xz";
};
};
kwin = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/kwin-5.15.5.tar.xz";
- sha256 = "e341c8165354643fd201292e53418050970bf8819b2cd0dd932423a342d2f805";
- name = "kwin-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/kwin-5.16.5.tar.xz";
+ sha256 = "7ff0e114e323ff7e10d78a157f8242b1d3cfa03967898d9e3fd3c039b7c9918b";
+ name = "kwin-5.16.5.tar.xz";
};
};
kwrited = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/kwrited-5.15.5.tar.xz";
- sha256 = "fbc27517898e57aa6b4c476673971f310121ac3d61e1d30a23e9289930056510";
- name = "kwrited-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/kwrited-5.16.5.tar.xz";
+ sha256 = "4b122099b0a362fc409b50b7523689ba8a112508dad26f58753c6b648e7c5313";
+ name = "kwrited-5.16.5.tar.xz";
};
};
libkscreen = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/libkscreen-5.15.5.tar.xz";
- sha256 = "bee15b0ce38e17475542b0e500a82567fdbe0a635e84a543b2f3255ac8c58d87";
- name = "libkscreen-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/libkscreen-5.16.5.tar.xz";
+ sha256 = "fd2d1e849315ac745ecfe757d6b2c5cc6486e0be5397f686dae3916c0252c938";
+ name = "libkscreen-5.16.5.tar.xz";
};
};
libksysguard = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/libksysguard-5.15.5.tar.xz";
- sha256 = "4255a997c4f0b2039201db6e00038e08519c5fde73032ba709ae9bcfaceabfd0";
- name = "libksysguard-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/libksysguard-5.16.5.tar.xz";
+ sha256 = "f09b99737a937df890ecdd2a33720b6cba3c79fc8bc17ef1470572748a6e1976";
+ name = "libksysguard-5.16.5.tar.xz";
};
};
milou = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/milou-5.15.5.tar.xz";
- sha256 = "2740cbfae30483c402471349f4d1315b98edf054827ec70980bb966cd6b3fcf9";
- name = "milou-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/milou-5.16.5.tar.xz";
+ sha256 = "bfcdba29262dda9f386ee99132053ad5751194b2df8219899fcbb0b3699afcd5";
+ name = "milou-5.16.5.tar.xz";
};
};
oxygen = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/oxygen-5.15.5.tar.xz";
- sha256 = "0791314c8894331bfa46d8b8aa30805972d09497a9e4bbe3f82270d4455be62c";
- name = "oxygen-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/oxygen-5.16.5.tar.xz";
+ sha256 = "0e85dcd874d2e69aaa2d4eefc379289c7dd572437f53e42f1d6d260d97c2f8a2";
+ name = "oxygen-5.16.5.tar.xz";
};
};
plasma-browser-integration = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/plasma-browser-integration-5.15.5.tar.xz";
- sha256 = "f1883b504cb5e86a43e16fea803b93c81b09e4ce1339ae8bcf6cf35d7e734d3b";
- name = "plasma-browser-integration-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/plasma-browser-integration-5.16.5.tar.xz";
+ sha256 = "99269c7e27fddb0c075bff28a5afba41298dc8d28297d69f35f6bc30f3af1d35";
+ name = "plasma-browser-integration-5.16.5.tar.xz";
};
};
plasma-desktop = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/plasma-desktop-5.15.5.tar.xz";
- sha256 = "42097c0b2553dd4767b6fde441db371d5e2defbd4e82389ca91d076f62ae3741";
- name = "plasma-desktop-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/plasma-desktop-5.16.5.tar.xz";
+ sha256 = "49dc4c9eff5742eb52fc0d12c139c194eda837945389cd09f498a0c4c352a20f";
+ name = "plasma-desktop-5.16.5.tar.xz";
};
};
plasma-integration = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/plasma-integration-5.15.5.tar.xz";
- sha256 = "05920610c68981a9effb1a97395a22d281d3b61e42d55d66adf8bb587da29621";
- name = "plasma-integration-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/plasma-integration-5.16.5.tar.xz";
+ sha256 = "635f109e7b59bb440c6be0c7a4baae70d2f44e659ab0522e170693b664e6d709";
+ name = "plasma-integration-5.16.5.tar.xz";
};
};
plasma-nm = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/plasma-nm-5.15.5.tar.xz";
- sha256 = "6a2cde83ff031de3565465d48538578380301debb8e49345e25ff3f723c908ee";
- name = "plasma-nm-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/plasma-nm-5.16.5.tar.xz";
+ sha256 = "b519429bd784ff2ede0bf10e1e943822ef08ea5cf85e901363fda36d32907460";
+ name = "plasma-nm-5.16.5.tar.xz";
};
};
plasma-pa = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/plasma-pa-5.15.5.tar.xz";
- sha256 = "326a6d3f6f9d462a3b88402ae6be2dac976f166995a5cb750d294d51085a0a92";
- name = "plasma-pa-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/plasma-pa-5.16.5.tar.xz";
+ sha256 = "e029563d50cc6266a4a3e22574c33fef4670e1aaab18630eb30769e2167acc96";
+ name = "plasma-pa-5.16.5.tar.xz";
};
};
plasma-sdk = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/plasma-sdk-5.15.5.tar.xz";
- sha256 = "f91ccb03f016328c2bd54ac11a916b4f874cfe2304da1600f3fa014faeb7d329";
- name = "plasma-sdk-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/plasma-sdk-5.16.5.tar.xz";
+ sha256 = "1b05f0501309099f241ebae857c24b31bc4e61fde8bfc33e854d3a1dd3d37385";
+ name = "plasma-sdk-5.16.5.tar.xz";
};
};
plasma-tests = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/plasma-tests-5.15.5.tar.xz";
- sha256 = "534c018f45f8545f027aeccea8731a26311179328e7a746522fa11961c5c5827";
- name = "plasma-tests-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/plasma-tests-5.16.5.tar.xz";
+ sha256 = "236a83c2caa99801b6db1debce53a6c7390087115899410a8139ad3b7268b7f7";
+ name = "plasma-tests-5.16.5.tar.xz";
};
};
plasma-vault = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/plasma-vault-5.15.5.tar.xz";
- sha256 = "2d7c356fa951b341fcb5ea48ed819f396fe9096e06e6f2026c9f59a59fa48fd5";
- name = "plasma-vault-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/plasma-vault-5.16.5.tar.xz";
+ sha256 = "2bb40a80c35f3eaedc729013a8b6b76641cc74eca4fd171f1cda99237f83198c";
+ name = "plasma-vault-5.16.5.tar.xz";
};
};
plasma-workspace = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-5.15.5.tar.xz";
- sha256 = "c25f9b348e3ab2d370325f7da989a3f599a408dabfadda65cbb590fb26a2f973";
- name = "plasma-workspace-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/plasma-workspace-5.16.5.tar.xz";
+ sha256 = "43364fe4e7ea10ad7b5b1d7af4f1baa1d8796b60692f2dfc0d58693f63e458ff";
+ name = "plasma-workspace-5.16.5.tar.xz";
};
};
plasma-workspace-wallpapers = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-wallpapers-5.15.5.tar.xz";
- sha256 = "0dc21728f3a08d823106bae7dd99d9b6b28b9b77abe8cf8f213bd4cf5b66b945";
- name = "plasma-workspace-wallpapers-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/plasma-workspace-wallpapers-5.16.5.tar.xz";
+ sha256 = "ff6e0eac42c540c72556439e6477fb78be2dab456386218813cce021f82d42d9";
+ name = "plasma-workspace-wallpapers-5.16.5.tar.xz";
};
};
plymouth-kcm = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/plymouth-kcm-5.15.5.tar.xz";
- sha256 = "9454cff23e7acae549bdd61818cb351332b334f9cf0b7a7eb065d6dd784950aa";
- name = "plymouth-kcm-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/plymouth-kcm-5.16.5.tar.xz";
+ sha256 = "db839c5fe9f6df882b95f436983c129cd553dd50e6cf1065c4410a91b20f1dcc";
+ name = "plymouth-kcm-5.16.5.tar.xz";
};
};
polkit-kde-agent = {
- version = "1-5.15.5";
+ version = "1-5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/polkit-kde-agent-1-5.15.5.tar.xz";
- sha256 = "628ce9a02defa31e98a6a373abb6a1f2bf39f065eaf82fdbb4f93bf07165e267";
- name = "polkit-kde-agent-1-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/polkit-kde-agent-1-5.16.5.tar.xz";
+ sha256 = "6f7a17990d72bb25c93acae919b764f95ac226754209b2e177075fbe9251f95f";
+ name = "polkit-kde-agent-1-5.16.5.tar.xz";
};
};
powerdevil = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/powerdevil-5.15.5.tar.xz";
- sha256 = "c435cdcab2ff367ca86f91a45ac43fa9f9b68251e8e444b285b7edd33482ad06";
- name = "powerdevil-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/powerdevil-5.16.5.tar.xz";
+ sha256 = "ac868f31df8c6bcc6b1c850efa0640695ba698caabefcb21fc0b0c3405712139";
+ name = "powerdevil-5.16.5.tar.xz";
};
};
sddm-kcm = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/sddm-kcm-5.15.5.tar.xz";
- sha256 = "4d5ee74e494f78a90d1586862749d53f4dc34970f47307d62a4e6ead9161c25b";
- name = "sddm-kcm-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/sddm-kcm-5.16.5.tar.xz";
+ sha256 = "4220d18f1a04c767649bffee1aed6c2b2c12c60cd7d6ca6fabc3dbec1ec3f127";
+ name = "sddm-kcm-5.16.5.tar.xz";
};
};
systemsettings = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/systemsettings-5.15.5.tar.xz";
- sha256 = "a29227329f8ddd2db2ba8aafb3eb5f2b09d01e3a6f761d291afba95935ceb93a";
- name = "systemsettings-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/systemsettings-5.16.5.tar.xz";
+ sha256 = "57944cf3f566cf5e25d5859f5716b2ad5dbd87de259f8d77efdfdd50a16fe1ec";
+ name = "systemsettings-5.16.5.tar.xz";
};
};
user-manager = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/user-manager-5.15.5.tar.xz";
- sha256 = "09e746e14bc732e296e93290929dfd1d378abe0b6b47fce084c97dd82a3f2431";
- name = "user-manager-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/user-manager-5.16.5.tar.xz";
+ sha256 = "e9df3ec2718de68b0b46d0b86f993fe450b236e13dda6219f350121f08f4c468";
+ name = "user-manager-5.16.5.tar.xz";
};
};
xdg-desktop-portal-kde = {
- version = "5.15.5";
+ version = "5.16.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.15.5/xdg-desktop-portal-kde-5.15.5.tar.xz";
- sha256 = "fd98af5fe77e5a387bee25bcbdfa39607d1b91ba1cd431ae72cff8103548ac50";
- name = "xdg-desktop-portal-kde-5.15.5.tar.xz";
+ url = "${mirror}/stable/plasma/5.16.5/xdg-desktop-portal-kde-5.16.5.tar.xz";
+ sha256 = "4884652b642fb6e8db791a04e9d42b5fec53f28cc0f0d26f49eb2bdaaa1709df";
+ name = "xdg-desktop-portal-kde-5.16.5.tar.xz";
};
};
}
diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/desktops/surf-display/default.nix
index f3554fe0b40a..47b7e1172068 100644
--- a/pkgs/desktops/surf-display/default.nix
+++ b/pkgs/desktops/surf-display/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
--prefix PATH ':' ${stdenv.lib.makeBinPath buildInputs}
'';
- makeFlags = [ "PREFIX=${placeholder ''out''}" ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with stdenv.lib; {
description = "Kiosk browser session manager based on the surf browser";
diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
index bb319e6fc6c3..567d3b80387a 100644
--- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
+++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = https://www.xfce.org/;
- description = "GTK+ theme engine for Xfce";
+ description = "GTK theme engine for Xfce";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index e5182a12d434..20d5175fed6f 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -20,7 +20,7 @@ lib.makeScope pkgs.newScope (self: with self; {
garcon = callPackage ./core/garcon.nix { };
- # When built with GTK+3, it was breaking GTK+3 app layout
+ # When built with GTK 3, it was breaking GTK 3 app layout
gtk-xfce-engine = callPackage ./core/gtk-xfce-engine.nix { withGtk3 = false; };
libxfce4ui = callPackage ./core/libxfce4ui.nix { };
@@ -151,7 +151,7 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { };
- #### GTK+3 (deprecated, see NixOS/nixpkgs#32763)
+ #### GTK3 (deprecated, see NixOS/nixpkgs#32763)
libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; };
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
index 79f0800ff34c..2782decf6c4c 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
@@ -3,12 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "xfce4-hardware-monitor-plugin";
version = "1.6.0";
src = fetchurl {
- url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${name}.tar.bz2";
+ url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${pname}-${version}.tar.bz2";
sha256 = "0xg5har11fk1wmdymydxlbk1z8aa39j8k0p4gzw2iqslv3n0zf7b";
};
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
index 7134d29c9ffb..39393dd39e9f 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }:
stdenv.mkDerivation rec {
- name = "vala-panel-appmenu-xfce-${version}";
+ pname = "vala-panel-appmenu-xfce";
version = "0.6.94";
src = "${fetchFromGitHub {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Port of the Unity GTK+ Module";
+ description = "Port of the Unity GTK Module";
license = licenses.lgpl3;
maintainers = with maintainers; [ jD91mZM2 ];
};
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
index 694f6772282b..144291da86d7 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
@@ -3,7 +3,7 @@
xfce, libwnck3, libdbusmenu, gobject-introspection }:
stdenv.mkDerivation rec {
- name = "xfce4-vala-panel-appmenu-plugin-${version}";
+ pname = "xfce4-vala-panel-appmenu-plugin";
version = "0.6.94";
src = fetchFromGitHub {
diff --git a/pkgs/desktops/xfce4-14/exo/default.nix b/pkgs/desktops/xfce4-14/exo/default.nix
index b0dcec78765d..59ab5823314e 100644
--- a/pkgs/desktops/xfce4-14/exo/default.nix
+++ b/pkgs/desktops/xfce4-14/exo/default.nix
@@ -1,7 +1,7 @@
{ mkXfceDerivation, docbook_xsl, glib, libxslt, perlPackages, gtk3
, libxfce4ui, libxfce4util }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "exo";
version = "0.12.8";
diff --git a/pkgs/desktops/xfce4-14/garcon/default.nix b/pkgs/desktops/xfce4-14/garcon/default.nix
index d4e7e2ffc809..0d6cb8c410e0 100644
--- a/pkgs/desktops/xfce4-14/garcon/default.nix
+++ b/pkgs/desktops/xfce4-14/garcon/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "garcon";
version = "0.6.4";
diff --git a/pkgs/desktops/xfce4-14/gigolo/default.nix b/pkgs/desktops/xfce4-14/gigolo/default.nix
index 6939e8859ac9..5b25e474af27 100644
--- a/pkgs/desktops/xfce4-14/gigolo/default.nix
+++ b/pkgs/desktops/xfce4-14/gigolo/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, exo, gtk3, gvfs, glib }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "gigolo";
version = "0.5.0";
diff --git a/pkgs/desktops/xfce4-14/libxfce4ui/default.nix b/pkgs/desktops/xfce4-14/libxfce4ui/default.nix
index 2ea6d195d6fd..79c8ec74b626 100644
--- a/pkgs/desktops/xfce4-14/libxfce4ui/default.nix
+++ b/pkgs/desktops/xfce4-14/libxfce4ui/default.nix
@@ -1,7 +1,7 @@
{ lib, mkXfceDerivation, gobject-introspection, gtk2, gtk3, libICE, libSM
, libstartup_notification, libxfce4util, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "libxfce4ui";
version = "4.14.1";
diff --git a/pkgs/desktops/xfce4-14/libxfce4util/default.nix b/pkgs/desktops/xfce4-14/libxfce4util/default.nix
index 99fe59583aa4..4540d2352511 100644
--- a/pkgs/desktops/xfce4-14/libxfce4util/default.nix
+++ b/pkgs/desktops/xfce4-14/libxfce4util/default.nix
@@ -1,6 +1,6 @@
{ lib, mkXfceDerivation, gobject-introspection }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "libxfce4util";
version = "4.14.0";
diff --git a/pkgs/desktops/xfce4-14/mkXfceDerivation.nix b/pkgs/desktops/xfce4-14/mkXfceDerivation.nix
index cf4b5eb3cdc6..b7dc83225696 100644
--- a/pkgs/desktops/xfce4-14/mkXfceDerivation.nix
+++ b/pkgs/desktops/xfce4-14/mkXfceDerivation.nix
@@ -12,7 +12,7 @@ let
concatAttrLists = attrsets:
zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets;
- template = rec {
+ template = {
name = "${pname}-${version}";
nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ];
diff --git a/pkgs/desktops/xfce4-14/mousepad/default.nix b/pkgs/desktops/xfce4-14/mousepad/default.nix
index ca80fd8bf53e..77559aaf329f 100644
--- a/pkgs/desktops/xfce4-14/mousepad/default.nix
+++ b/pkgs/desktops/xfce4-14/mousepad/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, exo, glib, gtk3, gtksourceview3, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "mousepad";
version = "0.4.2";
diff --git a/pkgs/desktops/xfce4-14/orage/default.nix b/pkgs/desktops/xfce4-14/orage/default.nix
index 8c453aa96a25..7bb10c2fd94b 100644
--- a/pkgs/desktops/xfce4-14/orage/default.nix
+++ b/pkgs/desktops/xfce4-14/orage/default.nix
@@ -7,7 +7,7 @@ let
inherit (lib) optionals;
in
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "orage";
version = "4.12.1";
diff --git a/pkgs/desktops/xfce4-14/parole/default.nix b/pkgs/desktops/xfce4-14/parole/default.nix
index 578be8329b0c..ed3979072ed3 100644
--- a/pkgs/desktops/xfce4-14/parole/default.nix
+++ b/pkgs/desktops/xfce4-14/parole/default.nix
@@ -5,7 +5,7 @@
# Doesn't seem to find H.264 codec even though built with gst-plugins-bad.
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "parole";
version = "1.0.4";
diff --git a/pkgs/desktops/xfce4-14/ristretto/default.nix b/pkgs/desktops/xfce4-14/ristretto/default.nix
index 1c09d3a0c008..4a24bf905328 100644
--- a/pkgs/desktops/xfce4-14/ristretto/default.nix
+++ b/pkgs/desktops/xfce4-14/ristretto/default.nix
@@ -1,7 +1,7 @@
{ mkXfceDerivation, automakeAddFlags, exo, gtk3, glib, libexif
, libxfce4ui, libxfce4util, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "ristretto";
version = "0.10.0";
diff --git a/pkgs/desktops/xfce4-14/thunar-volman/default.nix b/pkgs/desktops/xfce4-14/thunar-volman/default.nix
index 1fa714c7ff1b..11b29c64b33f 100644
--- a/pkgs/desktops/xfce4-14/thunar-volman/default.nix
+++ b/pkgs/desktops/xfce4-14/thunar-volman/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, exo, gtk3, libgudev, libxfce4ui, libxfce4util, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "thunar-volman";
version = "0.9.5";
diff --git a/pkgs/desktops/xfce4-14/thunar/default.nix b/pkgs/desktops/xfce4-14/thunar/default.nix
index ed0be4420232..12a1a62991a7 100644
--- a/pkgs/desktops/xfce4-14/thunar/default.nix
+++ b/pkgs/desktops/xfce4-14/thunar/default.nix
@@ -1,7 +1,7 @@
{ mkXfceDerivation, docbook_xsl, exo, gdk-pixbuf, gtk3, libgudev
, libnotify, libX11, libxfce4ui, libxfce4util, libxslt, xfconf, gobject-introspection, gvfs }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "thunar";
version = "1.8.9";
diff --git a/pkgs/desktops/xfce4-14/tumbler/default.nix b/pkgs/desktops/xfce4-14/tumbler/default.nix
index 81b008083366..ecbc62d8ffbf 100644
--- a/pkgs/desktops/xfce4-14/tumbler/default.nix
+++ b/pkgs/desktops/xfce4-14/tumbler/default.nix
@@ -11,7 +11,7 @@
# TODO: add libopenraw
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "tumbler";
version = "0.2.7";
diff --git a/pkgs/desktops/xfce4-14/xfburn/default.nix b/pkgs/desktops/xfce4-14/xfburn/default.nix
index 97d086366565..27fae12981ca 100644
--- a/pkgs/desktops/xfce4-14/xfburn/default.nix
+++ b/pkgs/desktops/xfce4-14/xfburn/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, docbook_xsl, exo, gtk2, libburn, libisofs, libxfce4ui, libxslt }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "xfburn";
version = "0.5.5";
diff --git a/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix b/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix
index 312e64cdbbe9..6c4af66c8666 100644
--- a/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, exo, garcon, gtk3, libxfce4util, libxfce4ui, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfce4-appfinder";
version = "4.14.0";
diff --git a/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix
index 84cb74276997..22793963df3d 100644
--- a/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "panel-plugins";
pname = "xfce4-cpufreq-plugin";
version = "1.2.1";
diff --git a/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix
index b18f3fd45d62..38fe82ffb011 100644
--- a/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix
@@ -1,7 +1,7 @@
{ mkXfceDerivation, autoreconfHook, autoconf, automake
, glib, gtk-doc, intltool, libtool }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfce4-dev-tools";
version = "4.14.0";
diff --git a/pkgs/desktops/xfce4-14/xfce4-dict/default.nix b/pkgs/desktops/xfce4-14/xfce4-dict/default.nix
index 603863264efc..66ca7affa481 100644
--- a/pkgs/desktops/xfce4-14/xfce4-dict/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-dict/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, automakeAddFlags, gtk3, libxfce4ui, libxfce4util, xfce4-panel }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "xfce4-dict";
version = "0.8.2";
diff --git a/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix
index a99c3ecb9844..e468fea637e8 100644
--- a/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix
@@ -1,7 +1,7 @@
{ mkXfceDerivation, glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util
, xfce4-panel, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "xfce4-notifyd";
version = "0.4.4";
diff --git a/pkgs/desktops/xfce4-14/xfce4-panel/default.nix b/pkgs/desktops/xfce4-14/xfce4-panel/default.nix
index 27acb3bee587..c571666e5c4b 100644
--- a/pkgs/desktops/xfce4-14/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-panel/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, tzdata, exo, garcon, gtk2, gtk3, glib, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf, gobject-introspection }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfce4-panel";
version = "4.14.0";
diff --git a/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix
index 115668334c3c..985146c82571 100644
--- a/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix
@@ -1,7 +1,7 @@
{ mkXfceDerivation, automakeAddFlags, exo, gtk3, libnotify
, libxfce4ui, libxfce4util, upower, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfce4-power-manager";
version = "1.6.5";
diff --git a/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix
index 185494c25439..6fca6069d1e8 100644
--- a/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix
@@ -1,7 +1,7 @@
{ mkXfceDerivation, automakeAddFlags, dbus-glib, dbus, gtk3, libpulseaudio
, libnotify, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "panel-plugins";
pname = "xfce4-pulseaudio-plugin";
version = "0.4.1";
diff --git a/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
index 0f74a78e8f2c..f13a8fba6d0a 100644
--- a/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, glib-networking }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "xfce4-screenshooter";
version = "1.9.5";
diff --git a/pkgs/desktops/xfce4-14/xfce4-session/default.nix b/pkgs/desktops/xfce4-14/xfce4-session/default.nix
index 070f40b52d5c..d44cd8b0dd7c 100644
--- a/pkgs/desktops/xfce4-14/xfce4-session/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-session/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfce4-session";
version = "4.14.0";
@@ -9,7 +9,7 @@ mkXfceDerivation rec {
buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ];
- configureFlags = [ "--with-xsession-prefix=${placeholder ''out''}" ];
+ configureFlags = [ "--with-xsession-prefix=${placeholder "out"}" ];
# See https://github.com/NixOS/nixpkgs/issues/36468
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
diff --git a/pkgs/desktops/xfce4-14/xfce4-settings/default.nix b/pkgs/desktops/xfce4-14/xfce4-settings/default.nix
index 21aaef5fd081..8cda66359e34 100644
--- a/pkgs/desktops/xfce4-14/xfce4-settings/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-settings/default.nix
@@ -2,7 +2,7 @@
, libnotify, libxfce4ui, libxfce4util, libxklavier
, upower, xfconf, xf86inputlibinput }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfce4-settings";
version = "4.14.0";
diff --git a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
index e62332343ba7..78e98e9ea7de 100644
--- a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "xfce4-terminal";
version = "0.8.8";
diff --git a/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix
index b1405910021a..97a00e9b67fa 100644
--- a/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix
@@ -1,6 +1,6 @@
{ lib, mkXfceDerivation, gtk3, libnotify, libpulseaudio, keybinder3, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "apps";
pname = "xfce4-volumed-pulse";
version = "0.2.3";
diff --git a/pkgs/desktops/xfce4-14/xfconf/default.nix b/pkgs/desktops/xfce4-14/xfconf/default.nix
index 8e56e0f8b37d..a9d6ceaf4695 100644
--- a/pkgs/desktops/xfce4-14/xfconf/default.nix
+++ b/pkgs/desktops/xfce4-14/xfconf/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, libxfce4util }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfconf";
version = "4.14.1";
diff --git a/pkgs/desktops/xfce4-14/xfdesktop/default.nix b/pkgs/desktops/xfce4-14/xfdesktop/default.nix
index c4b7d738b329..afcd0d19dc33 100644
--- a/pkgs/desktops/xfce4-14/xfdesktop/default.nix
+++ b/pkgs/desktops/xfce4-14/xfdesktop/default.nix
@@ -1,6 +1,6 @@
{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf, libnotify, garcon, thunar }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfdesktop";
version = "4.14.1";
diff --git a/pkgs/desktops/xfce4-14/xfwm4/default.nix b/pkgs/desktops/xfce4-14/xfwm4/default.nix
index b84487c09ae0..358e99c893f1 100644
--- a/pkgs/desktops/xfce4-14/xfwm4/default.nix
+++ b/pkgs/desktops/xfce4-14/xfwm4/default.nix
@@ -2,7 +2,7 @@
, libstartup_notification, libxfce4ui, libxfce4util, libwnck3
, libXpresent, xfconf }:
-mkXfceDerivation rec {
+mkXfceDerivation {
category = "xfce";
pname = "xfwm4";
version = "4.14.0";
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index fcdd2eb51811..02aa6567c1a9 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -12,31 +12,31 @@ let
# than we do. We don't just use theirs because ours are less ambiguous and
# some builds need that clarity.
ndkInfoFun = { config, ... }: {
- "x86_64-apple-darwin" = {
+ x86_64-apple-darwin = {
double = "darwin-x86_64";
};
- "x86_64-unknown-linux-gnu" = {
+ x86_64-unknown-linux-gnu = {
double = "linux-x86_64";
};
- "i686-unknown-linux-android" = {
+ i686-unknown-linux-android = {
triple = "i686-linux-android";
arch = "x86";
toolchain = "x86";
gccVer = "4.9";
};
- "x86_64-unknown-linux-android" = {
+ x86_64-unknown-linux-android = {
triple = "x86_64-linux-android";
arch = "x86_64";
toolchain = "x86_64";
gccVer = "4.9";
};
- "armv7a-unknown-linux-androideabi" = {
+ armv7a-unknown-linux-androideabi = {
arch = "arm";
triple = "arm-linux-androideabi";
toolchain = "arm-linux-androideabi";
gccVer = "4.9";
};
- "aarch64-unknown-linux-android" = {
+ aarch64-unknown-linux-android = {
arch = "arm64";
triple = "aarch64-linux-android";
toolchain = "aarch64-linux-android";
diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix
index e35444ed516e..7bb779d1d138 100644
--- a/pkgs/development/androidndk-pkgs/default.nix
+++ b/pkgs/development/androidndk-pkgs/default.nix
@@ -1,7 +1,7 @@
{ androidenv, buildPackages, pkgs, targetPackages
}:
-rec {
+{
"18b" =
let
ndkVersion = "18.1.5063045";
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix
index 5d151e5fa210..2897bac06144 100644
--- a/pkgs/development/arduino/arduino-core/default.nix
+++ b/pkgs/development/arduino/arduino-core/default.nix
@@ -24,8 +24,8 @@ let
};
# Some .so-files are later copied from .jar-s to $HOME, so patch them beforehand
patchelfInJars =
- lib.optional (stdenv.hostPlatform.system == "x86_64-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino1.jar"; file = "libs/linux/libjSSC-2.8_x86_64.so";}
- ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino1.jar"; file = "libs/linux/libjSSC-2.8_x86.so";}
+ lib.optional (stdenv.hostPlatform.system == "x86_64-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino3.jar"; file = "libs/linux/libjSSC-2.8_x86_64.so";}
+ ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino3.jar"; file = "libs/linux/libjSSC-2.8_x86.so";}
;
# abiVersion 6 is default, but we need 5 for `avrdude_bin` executable
ncurses5 = ncurses.override { abiVersion = "5"; };
@@ -58,37 +58,37 @@ let
+ stdenv.lib.optionalString (!withGui) "-core";
in
stdenv.mkDerivation rec {
- version = "1.8.5";
+ version = "1.8.9";
name = "${flavor}-${version}";
src = fetchFromGitHub {
owner = "arduino";
repo = "Arduino";
- rev = "${version}";
- sha256 = "0ww72qfk7fyvprz15lc80i1axfdacb5fij4h5j5pakrg76mng2c3";
+ rev = version;
+ sha256 = "0kblq0bqap2zzkflrj6rmdi8dvqxa28fcwwrc3lfmbz2893ni3w4";
};
- teensyduino_version = "145";
+ teensyduino_version = "147";
teensyduino_src = fetchurl {
url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}";
sha256 =
- lib.optionalString ("${teensy_architecture}" == "linux64")
- "0n8812znwdyvy7d1321p4r6j5pixg1sr31z5pfr7i0ikw0jxfrxb"
- + lib.optionalString ("${teensy_architecture}" == "linux32")
- "1p74rb8g4v6kd09a0af1yra8xjzy3iyv5w5b6h6ljfhb022v3l57"
- + lib.optionalString ("${teensy_architecture}" == "linuxarm")
- "0jd9dvr8zx9hlyn6j979d66qdvzgv3dmx5x9yviqvrn1f3w4hfbf";
+ lib.optionalString (teensy_architecture == "linux64")
+ "09ysanip5d2f5axzd81z2l74ayng60zqhjxmxs7xa5098fff46il"
+ + lib.optionalString (teensy_architecture == "linux32")
+ "1zw3cfv2p62dwg8838vh0gd1934b18cyx7c13azvwmrpj601l0xx"
+ + lib.optionalString (teensy_architecture == "linuxarm")
+ "12421z26ksx84aldw1pq0cakh8jhs33mwafgvfij0zfgn9x0i877";
};
# Used because teensyduino requires jars be a specific size
arduino_dist_src = fetchurl {
url = "http://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz";
sha256 =
- lib.optionalString ("${teensy_architecture}" == "linux64")
- "1f8s3by5lc6fazyaa9zc9kz3ar8zj8jabab1fy5jzh49fbd8bydx"
- + lib.optionalString ("${teensy_architecture}" == "linux32")
- "1r9ral9aq5vp02dwgagifk5h403l7knxdyi1w23rqpcbbpa423lw"
- + lib.optionalString ("${teensy_architecture}" == "linuxarm")
- "0sz18wns00kysmb2zv7a67dy9wpxiawq3ykfr07wjyg8h1fy3p6h";
+ lib.optionalString (teensy_architecture == "linux64")
+ "1lv4in9j0r8s0cis4zdvbk2637vlj12w69wdxgcxcrwvkcdahkpa"
+ + lib.optionalString (teensy_architecture == "linux32")
+ "0zla3a6gd9prclgrbbgsmhf8ds8zb221m65x21pvz0y1cwsdvjpm"
+ + lib.optionalString (teensy_architecture == "linuxarm")
+ "1w5m49wfd68zazli0lf3w4zykab8n7mzp3wnbjqfpx2vip80bqnz";
};
@@ -216,6 +216,6 @@ stdenv.mkDerivation rec {
homepage = http://arduino.cc/;
license = if withTeensyduino then licenses.unfreeRedistributable else licenses.gpl2;
platforms = platforms.linux;
- maintainers = with maintainers; [ antono auntie robberer bjornfor ];
+ maintainers = with maintainers; [ antono auntie robberer bjornfor bergey ];
};
}
diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix
index 12cc7a6e52ca..9c4f795d2936 100644
--- a/pkgs/development/arduino/arduino-core/downloads.nix
+++ b/pkgs/development/arduino/arduino-core/downloads.nix
@@ -16,13 +16,33 @@
url = "https://downloads.arduino.cc/Edison_help_files-1.6.2.zip";
sha256 = "1x25rivmh0zpa6lr8dafyxvim34wl3wnz3r9msfxg45hnbjqqwan";
};
- "build/Firmata-2.5.6.zip" = fetchurl {
- url = "https://github.com/arduino-libraries/Firmata/archive/2.5.6.zip";
- sha256 = "117dd4pdlgv60gdlgm2ckjfq89i0dg1q8vszg6hxywdf701c1fk4";
+ "build/Ethernet-2.0.0.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/Ethernet/archive/2.0.0.zip";
+ sha256 = "0had46c1n1wx9fa7ki5dwidvchiy00pv7qj9msp6wgv199vm19m8";
};
- "build/Bridge-1.6.3.zip" = fetchurl {
- url = "https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip";
- sha256 = "1lha5wkzz63bgcn7bhx4rmgsh9ywa47lffycpyz6qjnl1pvm5mmj";
+ "build/GSM-1.0.6.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/GSM/archive/1.0.6.zip";
+ sha256 = "1kmikxr07cyzsnhhymvgj9m4dxi671ni120l33gfmmm6079qfwbk";
+ };
+ "build/Stepper-1.1.3.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/Stepper/archive/1.1.3.zip";
+ sha256 = "1kyv6bmhmbjh7z8x77v04aywd2s54nm80g0j07gay2sa3f6k1p4v";
+ };
+ "build/TFT-1.0.6.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/TFT/archive/1.0.6.zip";
+ sha256 = "1d69xp3hrva58nrx0vy4skrr1h63649q1jnc2g55bpbaxjhf5j5w";
+ };
+ "build/WiFi-1.2.7.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/WiFi/archive/1.2.7.zip";
+ sha256 = "1fmj2q2672hivp5jn05xhc875ii3w54nfja3b1yrp8s2fwinh7f6";
+ };
+ "build/Firmata-2.5.8.zip" = fetchurl {
+ url = "https://github.com/firmata/arduino/archive/2.5.8.zip";
+ sha256 = "0jmlqrnw5fksyqkjhcsl6j1q7c0clnvfr8yknanqqssc19pxp722";
+ };
+ "build/Bridge-1.7.0.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/Bridge/archive/1.7.0.zip";
+ sha256 = "1qpnb2mj77jm4qczk1ndgjc9j2kqxnyahxdvlp0120x6w2jcq8s8";
};
"build/Robot_Control-1.0.4.zip" = fetchurl {
url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.4.zip";
@@ -52,87 +72,91 @@
url = "https://github.com/arduino-libraries/Mouse/archive/1.0.1.zip";
sha256 = "106jjqxzpf5lrs9akwvamqsblj5w2fb7vd0wafm9ihsikingiypr";
};
- "build/Keyboard-1.0.1.zip" = fetchurl {
- url = "https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip";
- sha256 = "1spv73zhjbrb0vgpzjnh6wr3bddlbyzv78d21dbn8z2l0aqv2sac";
+ "build/Keyboard-1.0.2.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/Keyboard/archive/1.0.2.zip";
+ sha256 = "17yfj95r1i7fb87q4krmxmaq07b4x2xf8cjngrj5imj68wgjck53";
};
- "build/SD-1.1.1.zip" = fetchurl {
- url = "https://github.com/arduino-libraries/SD/archive/1.1.1.zip";
- sha256 = "0nackcf7yx5np1s24wnsrcjl8j0nlmqqir6316vqqkfayvb1247n";
+ "build/SD-1.2.3.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/SD/archive/1.2.3.zip";
+ sha256 = "0i5hb5hmrsrhfgxx8w7zzrfrkc751vs63vhxrj6qvwazhfcdpjw2";
};
- "build/Servo-1.1.2.zip" = fetchurl {
- url = "https://github.com/arduino-libraries/Servo/archive/1.1.2.zip";
- sha256 = "14k1883qrx425wnm0r8kszzq32yvvs3jwxf3g7ybp7v0ga0q47l7";
+ "build/Servo-1.1.3.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/Servo/archive/1.1.3.zip";
+ sha256 = "1m019a75cdn1fg0cwlzbahmaqvg8sgzr6v1812rd7rjh8ismiah6";
};
"build/LiquidCrystal-1.0.7.zip" = fetchurl {
url = "https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip";
sha256 = "1wrxrqz3n4yrj9j1a2b7pdd7a1rlyi974ra7crv5amjng8817x9n";
};
- "build/Adafruit_CircuitPlayground-1.6.8.zip" = fetchurl {
- url = "https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip";
- sha256 = "0zm667xiaygx8v1ygcls43s6qd5n7pf21n0998n1z7nf18s35j41";
+ "build/Adafruit_Circuit_Playground-1.8.1.zip" = fetchurl {
+ url = "https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.8.1.zip";
+ sha256 = "1fl24px4c42f6shpb3livwsxgpj866yy285274qrj4m1zl07f18q";
};
- "build/libastylej-2.05.1-3.zip" = fetchurl {
- url = "https://downloads.arduino.cc/libastylej-2.05.1-3.zip";
- sha256 = "0a1xy2cdl0xls5r21vy5d2j1dapn1jsdw0vbimlwnzfx7r84mxa6";
+ "build/libastylej-2.05.1-4.zip" = fetchurl {
+ url = "https://downloads.arduino.cc/libastylej-2.05.1-4.zip";
+ sha256 = "0q307b85xba7izjh344kqby3qahg3f5zy18gg52sjk1lbkl9i39s";
};
- "build/liblistSerials-1.4.0.zip" = fetchurl {
- url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.0.zip";
- sha256 = "129mfbyx7snq3znzhkfbdjiifdr85cwk6wjn8l9ia0wynszs5zyv";
+ "build/liblistSerials-1.4.2.zip" = fetchurl {
+ url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.2.zip";
+ sha256 = "1p58b421k92rbgwfgbihy0d04mby7kfssghpmjb4gk9yix09za3m";
};
- "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip" = fetchurl {
- url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip";
- sha256 = "15przp8z1dp6lamcvqdx4daq6fqi3c1algc3sbinyh25pm69pq74";
+ "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.10.6.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.6/WiFi101-Updater-ArduinoIDE-Plugin-0.10.6.zip";
+ sha256 = "1k23xyr5dmr60y8hb9x24wrgd4mfgvrzky621p6fvawn5xbdq8a3";
};
}
// optionalAttrs (system == "x86_64-linux") {
- "build/arduino-builder-linux64-1.3.25.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.25.tar.bz2";
- sha256 = "15y80p255w2rg028vc8dq4hpqsmf770qigv3hgf78npb4qrjnqqf";
+ "build/arduino-builder-linux64-1.4.4.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.4.4.tar.bz2";
+ sha256 = "1m5b4rc9i235ra6isqdpjj9llddb5sldkhidb8c4i14mcqbdci1n";
};
- "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2";
- sha256 = "132qm8l6h50z4s9h0i5mfv6bp0iia0pp9kc3gd37hkajy4bh4j0r";
+ "build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-x86_64-pc-linux-gnu.tar.bz2";
+ sha256 = "11ciwv9sw900wxb2fwm4i4ml4a85ylng0f595v0mf0xifc6jnhh5";
};
- "build/linux/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2";
- sha256 = "0shz5ymnlsrbnaqcb13fwbd73hz9k45adw14gf1ywjgywa2cpk68";
+ "build/linux/avrdude-6.3.0-arduino14-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-x86_64-pc-linux-gnu.tar.bz2";
+ sha256 = "1z4b6pvn1823h8mg0iph88igmcnrk2y7skr3z44dqlwk0pryi1kr";
};
- "build/linux/arduinoOTA-1.1.1-linux_amd64.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_amd64.tar.bz2";
- sha256 = "0xy25srvpz6d0yfnz8b17mkmary3k51lb1cvgw7n2zyxayjd0npb";
+ "build/linux/arduinoOTA-1.2.1-linux_amd64.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/arduinoOTA-1.2.1-linux_amd64.tar.bz2";
+ sha256 = "1ya834p2cqjj8k1ad3yxcnzd4bcgrlqsqsli9brq1138ac6k30jv";
+ };
+ "build/avr-1.6.23.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/cores/avr-1.6.23.tar.bz2";
+ sha256 = "1al449r8hcdck7f4y295g7q388qvbn6qhk2zqdvws9kg4mzqsq8q";
};
}
// optionalAttrs (system == "i686-linux") {
- "build/arduino-builder-linux32-1.3.25.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.25.tar.bz2";
- sha256 = "0hjiqbf7xspdcr7lganqnl68qcmndc9pz06dghkrwzbzc5ki72qr";
+ "build/arduino-builder-linux32-1.4.4.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.4.4.tar.bz2";
+ sha256 = "0q3i1ba7vh14616d9ligizcz89yadr0skazxbrcq3mvvjqzbifw8";
};
- "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2";
- sha256 = "1d81z5m4cklv29hgb5ywrmyq64ymlwmjx2plm1gzs1mcpg7d9ab3";
+ "build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-pc-linux-gnu.tar.bz2";
+ sha256 = "13skspybzq80ndsi93s7v15900lf26n5243mbib77andyc27xy2i";
};
- "build/linux/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2";
- sha256 = "12r1drjafxwzrvf1y1glxd46rv870mhz1ifn0g328ciwivas4da2";
+ "build/linux/avrdude-6.3.0-arduino14-i686-pc-linux-gnu.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-i686-pc-linux-gnu.tar.bz2";
+ sha256 = "1jklpk1sgrmbh1r25ynps4qcs5dbg6hd54fzjx4hcdf68cw0w42g";
};
- "build/linux/arduinoOTA-1.1.1-linux_386.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_386.tar.bz2";
- sha256 = "1vvilbbbvv68svxzyhjspacbavcqakph5glhnz7c0mxkspqixjbs";
+ "build/linux/arduinoOTA-1.2.1-linux_386.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/arduinoOTA-1.2.1-linux_386.tar.bz2";
+ sha256 = "1m56ps58h0fs8rr4ifc45slmrdvalc63vhldy85isv28g15zdz9g";
};
}
// optionalAttrs (system == "x86_64-darwin") {
- "build/arduino-builder-macosx-1.3.25.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.25.tar.bz2";
- sha256 = "0inkxjzdplb8b17j7lyam6v9gca25rxmsinrkgqnx3xxgkaxz2k0";
+ "build/arduino-builder-macosx-1.4.4.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.4.4.tar.bz2";
+ sha256 = "1jp5kg32aiw062kcxlv660w38iaprifm8h3g2798izpwyfj0dmwg";
};
- "build/macosx/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2";
- sha256 = "0c27i3y4f5biinxjdpp43wbj00lz7dvl08pnqr7hpkzaalsyvcv7";
+ "build/macosx/avr-gcc-5.4.0-atmel3.6.1-arduino2-i386-apple-darwin11.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-i386-apple-darwin11.tar.bz2";
+ sha256 = "1y2972b08ac59xwjqkyjmi5lf2pmzw88a6sdgci3x9rvahvh3idb";
};
- "build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2";
- sha256 = "0rc4x8mcsva4v6j7ssfj8rdyg14l2pd9ivgdm39m5wnz8b06p85z";
+ "build/macosx/avrdude-6.3.0-arduino14-i386-apple-darwin11.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-i386-apple-darwin11.tar.bz2";
+ sha256 = "0qsa3sb3f480fm2z75fq14cqddw5hq8w8q0c2a9cw8i7aa8kkl27";
};
"build/macosx/appbundler/appbundler-1.0ea-arduino4.jar.zip" = fetchurl {
url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip";
@@ -140,20 +164,20 @@
};
}
// optionalAttrs (system == "armv6l-linux") {
- "build/arduino-builder-linuxarm-1.3.25.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.3.25.tar.bz2";
- sha256 = "1jvlihpcbdv1sgq1wjdwp7dhznk7nd88zin6yj40kr80gcd2ykry";
+ "build/arduino-builder-linuxarm-1.4.4.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.4.4.tar.bz2";
+ sha256 = "03bhlhdkg1jx0d3lh9194xgaqsbank9njhlnwy8braa7pw4p58gn";
};
- "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2";
- sha256 = "033jb1vmspcxsv0w9pk73xv195xnbnmckjsiccgqs8xx36g00dpf";
+ "build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-armhf-pc-linux-gnu.tar.bz2";
+ sha256 = "17z9li387mx2acgad733h7l1jnnwv09ynw4nrwlqfahqqdfgjhb7";
};
- "build/linux/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2";
- sha256 = "1kp1xry97385zbrs94j285h1gqlzyyhkchh26z7zq6c0wi5879i5";
+ "build/linux/avrdude-6.3.0-arduino14-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-armhf-pc-linux-gnu.tar.bz2";
+ sha256 = "12amp8hqcj6gcdga7hfs22asgmgzafy8ny0rqhqs8n8d95sn586i";
};
- "build/linux/arduinoOTA-1.1.1-linux_arm.tar.bz2" = fetchurl {
- url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_arm.tar.bz2";
- sha256 = "0k1pib8lmvk6c0y3m038fj3mc18ax1hy3kbvgd5nygrxvy1hv274";
+ "build/linux/arduinoOTA-1.2.1-linux_arm.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/arduinoOTA-1.2.1-linux_arm.tar.bz2";
+ sha256 = "1q79w1d0h2lp3jcg58qrlh3k5lak7dbsnawrzm0jj8c6spfb6m5d";
};
}
diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix
index 2178226ab9d3..f450d4f850f3 100644
--- a/pkgs/development/arduino/arduino-mk/default.nix
+++ b/pkgs/development/arduino/arduino-mk/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "1.6.0";
- name = "arduino-mk-${version}";
+ pname = "arduino-mk";
src = fetchFromGitHub {
owner = "sudar";
repo = "Arduino-Makefile";
- rev = "${version}";
+ rev = version;
sha256 = "0flpl97d2231gp51n3y4qvf3y1l8xzafi1sgpwc305vwc2h4dl2x";
};
diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix
index 182f8fbefab5..01a2fb873aa2 100644
--- a/pkgs/development/arduino/platformio/chrootenv.nix
+++ b/pkgs/development/arduino/platformio/chrootenv.nix
@@ -3,19 +3,8 @@
let
pio-pkgs = pkgs:
let
- python = pkgs.python.override {
+ python = pkgs.python3.override {
packageOverrides = self: super: {
-
- # https://github.com/platformio/platformio-core/issues/349
- click = super.click.overridePythonAttrs (oldAttrs: rec {
- version = "5.1";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a";
- };
- postPatch = "";
- });
-
platformio = self.callPackage ./core.nix { };
};
};
@@ -38,7 +27,7 @@ in buildFHSUserEnv {
meta = with lib; {
description = "An open source ecosystem for IoT development";
- homepage = http://platformio.org;
+ homepage = "https://platformio.org";
maintainers = with maintainers; [ mog ];
license = licenses.asl20;
platforms = with platforms; linux;
diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix
index 0866311ad894..bfe216c6ad39 100644
--- a/pkgs/development/arduino/platformio/core.nix
+++ b/pkgs/development/arduino/platformio/core.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, buildPythonApplication, fetchFromGitHub
, bottle, click, colorama
, lockfile, pyserial, requests
-, pytest, semantic-version, tox
+, pytest, semantic-version, tox, tabulate
, git
}:
@@ -35,6 +35,7 @@ let
"test_builder.py::test_build_unflags"
"test_misc.py::test_api_cache"
"test_misc.py::test_ping_internet_ips"
+ "test_misc.py::test_platformio_cli"
"test_pkgmanifest.py::test_packages"
]) ++ (map (e: "--ignore=tests/${e}") [
"commands/test_boards.py"
@@ -46,19 +47,20 @@ let
in buildPythonApplication rec {
pname = "platformio";
- version = "3.6.6";
+ version = "4.0.3";
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
src = fetchFromGitHub {
owner = "platformio";
repo = "platformio-core";
rev = "v${version}";
- sha256 = "1qwd6684y2xagl375sv8fm6a535hcdqx296hknjlbvsgc1jc514a";
+ sha256 = "1naaa53cc7n7zyqggqjvvgkcq8cyzngdf904y9ag0x1vvb70f8j9";
};
propagatedBuildInputs = [
bottle click colorama git lockfile
pyserial requests semantic-version
+ tabulate
];
HOME = "/tmp";
diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix
index 45186914604d..280fd496650c 100644
--- a/pkgs/development/arduino/platformio/default.nix
+++ b/pkgs/development/arduino/platformio/default.nix
@@ -4,7 +4,7 @@
let
callPackage = newScope self;
- self = rec {
+ self = {
platformio-chrootenv = callPackage ./chrootenv.nix { };
};
diff --git a/pkgs/development/arduino/platformio/fix-searchpath.patch b/pkgs/development/arduino/platformio/fix-searchpath.patch
index a215ffc7d614..1570cae1b193 100644
--- a/pkgs/development/arduino/platformio/fix-searchpath.patch
+++ b/pkgs/development/arduino/platformio/fix-searchpath.patch
@@ -1,6 +1,6 @@
---- ./platformio/util.py-old 2017-09-29 01:20:08.174548250 +0200
-+++ ./platformio/util.py 2017-09-29 01:19:48.410485308 +0200
-@@ -395,7 +395,7 @@
+--- ./platformio/proc.py-old 2017-09-29 01:20:08.174548250 +0200
++++ ./platformio/proc.py 2017-09-29 01:19:48.410485308 +0200
+@@ -164,7 +164,7 @@
isdir(join(p, "click")) or isdir(join(p, "platformio")))
if all(conditions):
_PYTHONPATH.append(p)
diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix
index 110c06e6f8ad..4dedf782b753 100644
--- a/pkgs/development/beam-modules/build-erlang-mk.nix
+++ b/pkgs/development/beam-modules/build-erlang-mk.nix
@@ -25,7 +25,7 @@ let
};
pkg = self: stdenv.mkDerivation ( attrs // {
- app_name = "${name}";
+ app_name = name;
name = "${name}-${version}";
inherit version;
diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix
index 18abe1055b5b..6edee5d8bc65 100644
--- a/pkgs/development/beam-modules/pgsql/default.nix
+++ b/pkgs/development/beam-modules/pgsql/default.nix
@@ -6,7 +6,7 @@ let
buildInputs = [ drv ];
};
- pkg = self: buildRebar3 rec {
+ pkg = self: buildRebar3 {
name = "pgsql";
version = "25+beta.2";
diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix
index 4de7e3cc01ea..b6695029f34c 100644
--- a/pkgs/development/beam-modules/webdriver/default.nix
+++ b/pkgs/development/beam-modules/webdriver/default.nix
@@ -6,7 +6,7 @@ let
buildInputs = [ drv ];
};
- pkg = self: stdenv.mkDerivation rec {
+ pkg = self: stdenv.mkDerivation {
name = "webdriver";
version = "0.0.0+build.18.7ceaf1f";
diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix
index c48b36e5aba5..accedf9a7af7 100644
--- a/pkgs/development/compilers/abcl/default.nix
+++ b/pkgs/development/compilers/abcl/default.nix
@@ -1,6 +1,5 @@
{stdenv, fetchurl, ant, jre, jdk}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "abcl";
version = "1.5.0";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
index 40b690048eba..22a3c9cf4686 100755
--- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
+++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
@@ -6,14 +6,15 @@ import re
import requests
import sys
-releases = ["openjdk11"]
-oses = ["mac", "linux"]
-types = ["jre", "jdk"]
-impls = ["hotspot", "openj9"]
+releases = ("openjdk8", "openjdk11")
+oses = ("mac", "linux")
+types = ("jre", "jdk")
+impls = ("hotspot", "openj9")
arch_to_nixos = {
- "x64": "x86_64",
- "aarch64": "aarch64",
+ "x64": ("x86_64",),
+ "aarch64": ("aarch64",),
+ "arm": ("armv6l", "armv7l"),
}
def get_sha256(url):
@@ -23,7 +24,6 @@ def get_sha256(url):
sys.exit(1)
return resp.text.strip().split(" ")[0]
-RE_RELEASE_NAME = re.compile(r'[^-]+-([0-9.]+)\+([0-9]+)') # example release name: jdk-11.0.1+13
def generate_sources(release, assets):
out = {}
for asset in assets:
@@ -33,7 +33,8 @@ def generate_sources(release, assets):
if asset["heap_size"] != "normal": continue
if asset["architecture"] not in arch_to_nixos: continue
- version, build = RE_RELEASE_NAME.match(asset["release_name"]).groups()
+ # examples: 11.0.1+13, 8.0.222+10
+ version, build = asset["version_data"]["semver"].split("+")
type_map = out.setdefault(asset["os"], {})
impl_map = type_map.setdefault(asset["binary_type"], {})
@@ -42,12 +43,13 @@ def generate_sources(release, assets):
"vmType": asset["openjdk_impl"],
})
- arch_map[arch_to_nixos[asset["architecture"]]] = {
- "url": asset["binary_link"],
- "sha256": get_sha256(asset["checksum_link"]),
- "version": version,
- "build": build,
- }
+ for nixos_arch in arch_to_nixos[asset["architecture"]]:
+ arch_map[nixos_arch] = {
+ "url": asset["binary_link"],
+ "sha256": get_sha256(asset["checksum_link"]),
+ "version": version,
+ "build": build,
+ }
return out
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
index 7b16d6ad9dbc..03857627952d 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
@@ -6,7 +6,7 @@ sourcePerArch:
}:
let cpuName = stdenv.hostPlatform.parsed.cpu.name;
- result = stdenv.mkDerivation rec {
+ result = stdenv.mkDerivation {
name = if sourcePerArch.packageType == "jdk"
then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"
else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}";
@@ -46,9 +46,6 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name;
passthru.home = result;
- # for backward compatibility
- passthru.architecture = "";
-
meta = with stdenv.lib; {
license = licenses.gpl2Classpath;
description = "AdoptOpenJDK, prebuilt OpenJDK binary";
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index a837c6f1e851..509050209fb2 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -1,48 +1,17 @@
sourcePerArch:
-{ swingSupport ? true
-, stdenv
+{ stdenv
+, lib
, fetchurl
-, file
-, xorg ? null
-, glib
-, libxml2
-, ffmpeg_2
-, libxslt
-, libGL
+, autoPatchelfHook
+, alsaLib
, freetype
, fontconfig
-, gtk2
-, pango
-, cairo
-, alsaLib
-, atk
-, gdk-pixbuf
, zlib
-, elfutils
+, xorg
}:
-assert swingSupport -> xorg != null;
-
let
- rSubPaths = [
- "lib/jli"
- "lib/server"
- "lib/compressedrefs" # OpenJ9
- "lib/j9vm" # OpenJ9
- "lib"
- ];
-
- libraries = [
- stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL
- xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf
- atk zlib elfutils
- ] ++ (stdenv.lib.optionals swingSupport [
- xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt
- xorg.libXrender
- stdenv.cc.cc
- ]);
-
cpuName = stdenv.hostPlatform.parsed.cpu.name;
in
@@ -57,7 +26,12 @@ let result = stdenv.mkDerivation rec {
inherit (sourcePerArch.${cpuName}) url sha256;
};
- nativeBuildInputs = [ file ];
+ buildInputs = [
+ alsaLib freetype fontconfig zlib xorg.libX11 xorg.libXext xorg.libXtst
+ xorg.libXi xorg.libXrender
+ ];
+
+ nativeBuildInputs = [ autoPatchelfHook ];
# See: https://github.com/NixOS/patchelf/issues/10
dontStrip = 1;
@@ -74,45 +48,31 @@ let result = stdenv.mkDerivation rec {
# Remove embedded freetype to avoid problems like
# https://github.com/NixOS/nixpkgs/issues/57733
- rm $out/lib/libfreetype.so
-
- # for backward compatibility
- ln -s $out $out/jre
+ find "$out" -name 'libfreetype.so*' -delete
mkdir -p $out/nix-support
# Set JAVA_HOME automatically.
- cat <> $out/nix-support/setup-hook
+ cat <> "$out/nix-support/setup-hook"
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
EOF
'';
- postFixup = ''
- rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}"
-
- # set all the dynamic linkers
- find $out -type f -perm -0100 \
- -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "$rpath" {} \;
-
- find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
+ preFixup = ''
+ find "$out" -name libfontmanager.so -exec \
+ patchelf --add-needed libfontconfig.so {} \;
'';
- rpath = stdenv.lib.strings.makeLibraryPath libraries;
-
# FIXME: use multiple outputs or return actual JRE package
passthru.jre = result;
passthru.home = result;
- # for backward compatibility
- passthru.architecture = "";
-
meta = with stdenv.lib; {
license = licenses.gpl2Classpath;
description = "AdoptOpenJDK, prebuilt OpenJDK binary";
- platforms = stdenv.lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
- maintainers = with stdenv.lib.maintainers; [ taku0 ];
+ platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
+ maintainers = with lib.maintainers; [ taku0 ];
};
}; in result
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
new file mode 100644
index 000000000000..a170e0141cf0
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
@@ -0,0 +1,9 @@
+let
+ sources = builtins.fromJSON (builtins.readFile ./sources.json);
+in
+{
+ jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.hotspot;
+ jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.hotspot;
+ jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.openj9;
+ jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.openj9;
+}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
new file mode 100644
index 000000000000..4937eace4903
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
@@ -0,0 +1,9 @@
+let
+ sources = builtins.fromJSON (builtins.readFile ./sources.json);
+in
+{
+ jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.hotspot;
+ jre-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.hotspot;
+ jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.openj9;
+ jre-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.openj9;
+}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
index 03febb6aa355..403bd96efb0e 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json
+++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
@@ -4,56 +4,68 @@
"jdk": {
"hotspot": {
"aarch64": {
+ "build": "11",
+ "sha256": "10e33e1862638e11a9158947b3d7b461727d8e396e378b171be1eb4dfe12f1ed",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.4_11.tar.gz",
+ "version": "11.0.4"
+ },
+ "armv6l": {
"build": "7",
- "sha256": "894a846600ddb0df474350037a2fb43e3343dc3606809a20c65e750580d8f2b9",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.3_7.tar.gz",
+ "sha256": "3fbe418368e6d5888d0f15c4751139eb60d9785b864158a001386537fa46f67e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz",
+ "version": "11.0.3"
+ },
+ "armv7l": {
+ "build": "7",
+ "sha256": "3fbe418368e6d5888d0f15c4751139eb60d9785b864158a001386537fa46f67e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz",
"version": "11.0.3"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "7",
- "sha256": "23cded2b43261016f0f246c85c8948d4a9b7f2d44988f75dad69723a7a526094",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "90c33cf3f2ed0bd773f648815de7347e69cfbb3416ef3bf41616ab1c4aa0f5a8",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz",
+ "version": "11.0.4"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "7",
- "sha256": "7012edd56fc958070bc4747073de14ea08eb43081eb6ea19bdbf4763186e2d17",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.3_7_openj9-0.14.0.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "b1099cccc80a3f434728c9bc3b8a90395793b625f4680ca05267cf635143d64d",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jdk_x64_linux_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
+ "version": "11.0.4"
}
}
},
"jre": {
"hotspot": {
"aarch64": {
- "build": "7",
- "sha256": "de31fab70640c6d5099de5fc8fa8b4d6b484a7352fa48a9fafbdc088ca708564",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.3_7.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "5f7b5c110fc0f344a549cb11784a6d76838061a2b6f654f7841f60e0cd286c6a",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.4_11.tar.gz",
+ "version": "11.0.4"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "7",
- "sha256": "d2df8bc799b09c8375f79bf646747afac3d933bb1f65de71d6c78e7466ff8fe4",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.3_7.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "70d2cc675155476f1d8516a7ae6729d44681e4fad5a6fc8dfa65cab36a67b7e0",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_x64_linux_hotspot_11.0.4_11.tar.gz",
+ "version": "11.0.4"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "7",
- "sha256": "14c660294832c7b2deb2845d96dce83df677e204b4f0f1fee0052764c4a56720",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jre_x64_linux_openj9_11.0.3_7_openj9-0.14.0.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "c2601e7cb22af7a910e03883280cee805074656104d6d3dcaaf30e3bbb832690",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jre_x64_linux_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
+ "version": "11.0.4"
}
}
}
@@ -64,20 +76,20 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "7",
- "sha256": "5ca2a24f1827bd7c110db99854693bf418f51ee3093c31332db5cd605278faad",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.3_7.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "a50b211f475b9497311c9b65594764d7b852b1653f249582bb20fc3c302846a5",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_mac_hotspot_11.0.4_11.tar.gz",
+ "version": "11.0.4"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "7",
- "sha256": "01045a99ff23bda354f82c0fd3fa6e8222e4a5acce7494e82495f47b30bc5e18",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.3_7_openj9-0.14.0.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "7c09678d9c2d9dd0366693c6ab27bed39c76a23e7ac69b8a25c794e99dcf3ba7",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jdk_x64_mac_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
+ "version": "11.0.4"
}
}
},
@@ -86,20 +98,126 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "7",
- "sha256": "9523b97288ff5d50e404565d346ed8ea8f19dd155092951af88d4be6b8414776",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_x64_mac_hotspot_11.0.3_7.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "1647fded28d25e562811f7bce2092eb9c21d30608843b04250c023b40604ff26",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_x64_mac_hotspot_11.0.4_11.tar.gz",
+ "version": "11.0.4"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "7",
- "sha256": "150c4065a57ec368b692276e8e3320b183ee17b402b7db07e676dff5837f0c52",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jre_x64_mac_openj9_11.0.3_7_openj9-0.14.0.tar.gz",
- "version": "11.0.3"
+ "build": "11",
+ "sha256": "1a8e84bae517a848aa5f25c7b04f26ab3a3bfffaa7fdf9be24e1f83325e46766",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jre_x64_mac_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
+ "version": "11.0.4"
+ }
+ }
+ }
+ }
+ },
+ "openjdk8": {
+ "linux": {
+ "jdk": {
+ "hotspot": {
+ "aarch64": {
+ "build": "10",
+ "sha256": "652776586ede124189dc218174b5922cc97feac81021ad81905900b349a352d2",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u222b10.tar.gz",
+ "version": "8.0.222"
+ },
+ "packageType": "jdk",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "10",
+ "sha256": "37356281345b93feb4212e6267109b4409b55b06f107619dde4960e402bafa77",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz",
+ "version": "8.0.222"
+ }
+ },
+ "openj9": {
+ "packageType": "jdk",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "10",
+ "sha256": "20cff719c6de43f8bb58c7f59e251da7c1fa2207897c9a4768c8c669716dc819",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jdk_x64_linux_openj9_8u222b10_openj9-0.15.1.tar.gz",
+ "version": "8.0.222"
+ }
+ }
+ },
+ "jre": {
+ "hotspot": {
+ "aarch64": {
+ "build": "10",
+ "sha256": "dfaf5a121f7606c54bd6232793677a4267eddf65d29cde352b84d84edbccbb51",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u222b10.tar.gz",
+ "version": "8.0.222"
+ },
+ "packageType": "jre",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "10",
+ "sha256": "a418ce895c8bf3ca2e7b2f423f038b8b093941684c9430f2e40da0982e12b52d",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_x64_linux_hotspot_8u222b10.tar.gz",
+ "version": "8.0.222"
+ }
+ },
+ "openj9": {
+ "packageType": "jre",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "10",
+ "sha256": "ae56994a7c8e8c19939c0c2ff8fe5a850eb2f23845c499aa5ede26deb3d5ad28",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jre_x64_linux_openj9_8u222b10_openj9-0.15.1.tar.gz",
+ "version": "8.0.222"
+ }
+ }
+ }
+ },
+ "mac": {
+ "jdk": {
+ "hotspot": {
+ "packageType": "jdk",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "10",
+ "sha256": "9605fd00d2960934422437f601c7a9a1c5537309b9199d5bc75f84f20cd29a76",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u222b10.tar.gz",
+ "version": "8.0.222"
+ }
+ },
+ "openj9": {
+ "packageType": "jdk",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "10",
+ "sha256": "df185e167756332163633a826b329db067f8a721f7d5d27f0b353a35fc415de0",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jdk_x64_mac_openj9_8u222b10_openj9-0.15.1.tar.gz",
+ "version": "8.0.222"
+ }
+ }
+ },
+ "jre": {
+ "hotspot": {
+ "packageType": "jre",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "10",
+ "sha256": "b3ac2436534cea932ccf665b317dbf5ffc0ee065efca808b22b6c2d795ca1b90",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_x64_mac_hotspot_8u222b10.tar.gz",
+ "version": "8.0.222"
+ }
+ },
+ "openj9": {
+ "packageType": "jre",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "10",
+ "sha256": "d5754413d7bc3a3233aaa7f8465451fbdabaf2a0c2a91743155bf135a3047ec8",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jre_x64_mac_openj9_8u222b10_openj9-0.15.1.tar.gz",
+ "version": "8.0.222"
}
}
}
diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
index a3c34bd7e8e6..305e0f202bf1 100644
--- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
+++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "AdoptOpenJDK";
repo = "IcedTea-Web";
- rev = "${pname}-${version}";
+ rev = "icedtea-web-${version}";
sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq";
};
diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix
index e8759ec073b3..ed6b2b2ff247 100644
--- a/pkgs/development/compilers/apache-flex-sdk/default.nix
+++ b/pkgs/development/compilers/apache-flex-sdk/default.nix
@@ -7,11 +7,11 @@ let
sha256 = "0qw2bgls8qsmp80j8vpd4c7s0c8anlrk0ac8z42w89bajcdbwk2f";
};
in stdenv.mkDerivation rec {
- name = "apache-flex-sdk-${version}";
+ pname = "apache-flex-sdk";
version = "4.16.1";
src = fetchurl {
- url = "https://www.apache.org/dist/flex/${version}/binaries/${name}-bin.tar.gz";
+ url = "https://www.apache.org/dist/flex/${version}/binaries/${pname}-${version}-bin.tar.gz";
sha256 = "13iq16dqvgcpb0p35x66hzxsq5pkbr2lbwr766nnqiryinnagz8p";
};
diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
index ad68382c13ae..3058e926c3f9 100644
--- a/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -3,7 +3,7 @@
with builtins;
stdenv.mkDerivation rec {
- name = "arachne-pnr-${version}";
+ pname = "arachne-pnr";
version = "2018.09.09";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix
index 519992fd8c26..b70fde00e15e 100644
--- a/pkgs/development/compilers/as31/default.nix
+++ b/pkgs/development/compilers/as31/default.nix
@@ -5,7 +5,8 @@ let
version = "2.3.1";
in stdenv.mkDerivation {
- name = "as31-${version}";
+ pname = "as31";
+ inherit version;
src = fetchurl {
name = "as31-${version}.tar.gz"; # Nix doesn't like the colons in the URL
url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz";
diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix
index ce754813dda1..3cbb7577f34c 100644
--- a/pkgs/development/compilers/asn1c/default.nix
+++ b/pkgs/development/compilers/asn1c/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
- name = "asn1c-${version}";
+ pname = "asn1c";
version = "0.9.28";
src = fetchurl {
diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix
index 002f34daa13b..f086c36468d7 100644
--- a/pkgs/development/compilers/ats/default.nix
+++ b/pkgs/development/compilers/ats/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, gmp }:
stdenv.mkDerivation rec {
- name = "ats-${version}";
+ pname = "ats";
version = "0.2.12";
src = fetchurl {
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index df61ea2b791c..a1e5927e349f 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -26,7 +26,7 @@ let
in
stdenv.mkDerivation rec {
- name = "ats2-${version}";
+ pname = "ats2";
version = versionPkg;
src = fetchurl {
diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix
index 387ae906b88d..34d1e64c484f 100644
--- a/pkgs/development/compilers/avian/default.nix
+++ b/pkgs/development/compilers/avian/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }:
stdenv.mkDerivation rec {
- name = "avian-${version}";
+ pname = "avian";
version = "1.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix
index bf2272a75c17..6e768e65091b 100644
--- a/pkgs/development/compilers/bigloo/default.nix
+++ b/pkgs/development/compilers/bigloo/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, gmp }:
stdenv.mkDerivation rec {
- name = "bigloo-${version}";
+ pname = "bigloo";
version = "4.1a-2";
src = fetchurl {
diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index 52323b3de765..664335c3dade 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -5,7 +5,7 @@ let
# Map from git revs to SHA256 hashes
sha256s = {
- "version_89" = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij";
+ version_89 = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij";
"1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v";
};
in
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
rev = if emscriptenRev == null
then "version_${version}"
else emscriptenRev;
- name = "binaryen-${version}";
+ pname = "binaryen";
src = fetchFromGitHub {
owner = "WebAssembly";
diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix
index 65f0481a8010..235ec4090391 100644
--- a/pkgs/development/compilers/carp/default.nix
+++ b/pkgs/development/compilers/carp/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }:
-haskellPackages.mkDerivation rec {
+haskellPackages.mkDerivation {
pname = "carp";
version = "unstable-2018-09-15";
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 646963eedbca..ec166352267e 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -29,11 +29,11 @@ let
};
armv6l-linux = armv7l-linux;
};
- cfg = options."${stdenv.hostPlatform.system}" or (throw "missing source url for platform ${stdenv.hostPlatform.system}");
+ cfg = options.${stdenv.hostPlatform.system} or (throw "missing source url for platform ${stdenv.hostPlatform.system}");
in
stdenv.mkDerivation rec {
- name = "ccl-${version}";
+ pname = "ccl";
version = "1.11.5";
src = fetchurl {
diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix
index 9216c7791433..12d68f0265c4 100644
--- a/pkgs/development/compilers/chez/default.nix
+++ b/pkgs/development/compilers/chez/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "chez-scheme-${version}";
+ pname = "chez-scheme";
version = "9.5.2";
src = fetchFromGitHub {
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation";
+
/*
** We patch out a very annoying 'feature' in ./configure, which
** tries to use 'git' to update submodules.
diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix
index ceeff56330b2..34512fc8ef05 100644
--- a/pkgs/development/compilers/chicken/4/chicken.nix
+++ b/pkgs/development/compilers/chicken/4/chicken.nix
@@ -11,7 +11,8 @@ let
lib = stdenv.lib;
in
stdenv.mkDerivation {
- name = "chicken-${version}";
+ pname = "chicken";
+ inherit version;
binaryVersion = 8;
diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix
index 74f711811907..5fefce12dbf1 100644
--- a/pkgs/development/compilers/chicken/5/chicken.nix
+++ b/pkgs/development/compilers/chicken/5/chicken.nix
@@ -11,7 +11,8 @@ let
lib = stdenv.lib;
in
stdenv.mkDerivation {
- name = "chicken-${version}";
+ pname = "chicken";
+ inherit version;
binaryVersion = 11;
diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix
index a1e29951ddb5..664d84921135 100644
--- a/pkgs/development/compilers/clasp/default.nix
+++ b/pkgs/development/compilers/clasp/default.nix
@@ -56,7 +56,6 @@ let
};
in
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "clasp";
version = "0.8.99.20181128";
diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix
index 91c163fd343a..03a5cec50041 100644
--- a/pkgs/development/compilers/clean/default.nix
+++ b/pkgs/development/compilers/clean/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "clean-3.0";
src =
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index e9e973618257..d9f2a588d8f6 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
- name = "closure-compiler-${version}";
+ pname = "closure-compiler";
version = "20190215";
src = fetchurl {
diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix
index dab724ea607c..9a01519a8812 100644
--- a/pkgs/development/compilers/cmdstan/default.nix
+++ b/pkgs/development/compilers/cmdstan/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, python, runtimeShell }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "cmdstan-2.17.1";
src = fetchurl {
diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix
index 9e3184c42eb2..3f93ea9e1bac 100644
--- a/pkgs/development/compilers/cmucl/binary.nix
+++ b/pkgs/development/compilers/cmucl/binary.nix
@@ -19,7 +19,8 @@ let
in
stdenv.mkDerivation {
- name = "cmucl-binary-${version}";
+ pname = "cmucl-binary";
+ inherit version;
buildCommand = ''
mkdir -p $out
diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
index 237a80280ec8..cc8e9f827b7f 100644
--- a/pkgs/development/compilers/colm/default.nix
+++ b/pkgs/development/compilers/colm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "colm-${version}";
+ pname = "colm";
version = "0.13.0.7";
src = fetchurl {
- url = "https://www.colm.net/files/colm/${name}.tar.gz";
+ url = "https://www.colm.net/files/colm/${pname}-${version}.tar.gz";
sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4";
};
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 69e11a48918c..940eb851fe61 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -11,7 +11,7 @@ let
ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux";
in
stdenv.mkDerivation rec {
- name = "compcert-${version}";
+ pname = "compcert";
version = "3.5";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix
index 8be482e2150f..00816fca36bd 100644
--- a/pkgs/development/compilers/coreclr/default.nix
+++ b/pkgs/development/compilers/coreclr/default.nix
@@ -18,7 +18,7 @@
}:
stdenv.mkDerivation rec {
- name = "coreclr-${version}";
+ pname = "coreclr";
version = "2.0.7";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 2bc3d396da64..409ac03d92f7 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -13,22 +13,23 @@
let
archs = {
- "x86_64-linux" = "linux-x86_64";
- "i686-linux" = "linux-i686";
- "x86_64-darwin" = "darwin-x86_64";
+ x86_64-linux = "linux-x86_64";
+ i686-linux = "linux-i686";
+ x86_64-darwin = "darwin-x86_64";
};
- arch = archs."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+ arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported");
checkInputs = [ git gmp openssl_1_0_2 readline libxml2 libyaml ];
genericBinary = { version, sha256s, rel ? 1 }:
stdenv.mkDerivation rec {
- name = "crystal-binary-${version}";
+ pname = "crystal-binary";
+ inherit version;
src = fetchurl {
url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz";
- sha256 = sha256s."${stdenv.system}";
+ sha256 = sha256s.${stdenv.system};
};
buildCommand = ''
@@ -152,27 +153,27 @@ in rec {
binaryCrystal_0_26 = genericBinary {
version = "0.26.1";
sha256s = {
- "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45";
- "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic";
- "x86_64-darwin" = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s";
+ x86_64-linux = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45";
+ i686-linux = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic";
+ x86_64-darwin = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s";
};
};
binaryCrystal_0_27 = genericBinary {
version = "0.27.2";
sha256s = {
- "x86_64-linux" = "05l5x7kx2acgnv42fj3rr17z73ix06zvi05h7d7vf3kw0izxrasm";
- "i686-linux" = "1iwizkvn6pglc0azkyfhlmk9ap793krdgcnbihd1kvrvs4cz0mm9";
- "x86_64-darwin" = "14c69ac2dmfwmb5q56ps3xyxxb0mrbc91ahk9h07c8fiqfii3k9g";
+ x86_64-linux = "05l5x7kx2acgnv42fj3rr17z73ix06zvi05h7d7vf3kw0izxrasm";
+ i686-linux = "1iwizkvn6pglc0azkyfhlmk9ap793krdgcnbihd1kvrvs4cz0mm9";
+ x86_64-darwin = "14c69ac2dmfwmb5q56ps3xyxxb0mrbc91ahk9h07c8fiqfii3k9g";
};
};
binaryCrystal_0_29 = genericBinary {
version = "0.29.0";
sha256s = {
- "x86_64-linux" = "1wrk29sfx35akg7hxwpdiikvl18wd40gq1kwirw7x522hnq7vlna";
- "i686-linux" = "1nx0piis2k3nn7kqiijqazzbvlaavhgvsln0l3dxmpfa4i4dz5h2";
- "x86_64-darwin" = "1fd0fbyf05abivnp3igjlrm2axf65n2wdmg4aq6nqj60ipc01rvd";
+ x86_64-linux = "1wrk29sfx35akg7hxwpdiikvl18wd40gq1kwirw7x522hnq7vlna";
+ i686-linux = "1nx0piis2k3nn7kqiijqazzbvlaavhgvsln0l3dxmpfa4i4dz5h2";
+ x86_64-darwin = "1fd0fbyf05abivnp3igjlrm2axf65n2wdmg4aq6nqj60ipc01rvd";
};
};
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 5b9e9010ef05..8aab9580232b 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -16,7 +16,7 @@ let
}:
stdenv.mkDerivation rec {
- name = "cudatoolkit-${version}";
+ pname = "cudatoolkit";
inherit version runPatches;
dontPatchELF = true;
diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix
index 8bae6e2363f6..128c245d2773 100644
--- a/pkgs/development/compilers/dale/default.nix
+++ b/pkgs/development/compilers/dale/default.nix
@@ -11,7 +11,8 @@
let version = "20170519";
in stdenv.mkDerivation {
- name = "dale-${version}";
+ pname = "dale";
+ inherit version;
src = fetchFromGitHub {
owner = "tomhrr";
diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix
index 514075651e15..839ee821d00e 100644
--- a/pkgs/development/compilers/dev86/default.nix
+++ b/pkgs/development/compilers/dev86/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "dev86-${version}";
+ pname = "dev86";
version = "0.16.21";
src = fetchurl {
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index b3b58e836215..6cae1fa073b3 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -13,7 +13,7 @@ let
dmdConfFile = writeTextFile {
name = "dmd.conf";
text = (lib.generators.toINI {} {
- "Environment" = {
+ Environment = {
DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}'';
};
});
@@ -22,7 +22,7 @@ let
in
stdenv.mkDerivation rec {
- name = "dmd-${version}";
+ pname = "dmd";
inherit version;
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 2a90902df1e7..97af433d6067 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -26,6 +26,7 @@ edk2 = stdenv.mkDerivation {
buildInputs = [ libuuid pythonEnv ];
makeFlags = [ "-C BaseTools" ];
+ NIX_CFLAGS_COMPILE = "-Wno-return-type -Wno-error=stringop-truncation";
hardeningDisable = [ "format" "fortify" ];
diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix
index 4635c6d0a4e8..a22862c42920 100644
--- a/pkgs/development/compilers/eli/default.nix
+++ b/pkgs/development/compilers/eli/default.nix
@@ -28,11 +28,11 @@ let
};
in
stdenv.mkDerivation rec {
- name = "eli-${version}";
+ pname = "eli";
version = "4.8.1";
src = fetchurl {
- url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${name}.tar.bz2";
+ url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${pname}-${version}.tar.bz2";
sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj";
};
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index 1ffd758ac82e..870ad900210a 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ../../../node-packages/node-env.nix {
diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix
index 1128fbe64ec3..cb960227bebe 100644
--- a/pkgs/development/compilers/eql/default.nix
+++ b/pkgs/development/compilers/eql/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = src.rev;
- name = "eql-git-${version}";
+ pname = "eql-git";
src = fetchgit {
rev = "9097bf98446ee33c07bb155d800395775ce0d9b2";
url = "https://gitlab.com/eql/eql.git";
diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix
index 405aa8aa3ca5..ef445faec923 100644
--- a/pkgs/development/compilers/factor-lang/default.nix
+++ b/pkgs/development/compilers/factor-lang/default.nix
@@ -4,7 +4,7 @@
mesa, xorg, openssl, unzip }:
stdenv.mkDerivation rec {
- name = "factor-lang-${version}";
+ pname = "factor-lang";
version = "0.98";
rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4";
diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix
index 44d784133f5f..5353862424a0 100644
--- a/pkgs/development/compilers/fasm/bin.nix
+++ b/pkgs/development/compilers/fasm/bin.nix
@@ -1,7 +1,7 @@
{ stdenvNoCC, lib, fetchurl }:
stdenvNoCC.mkDerivation rec {
- name = "fasm-bin-${version}";
+ pname = "fasm-bin";
version = "1.73.16";
diff --git a/pkgs/development/compilers/fasm/default.nix b/pkgs/development/compilers/fasm/default.nix
index 47b90469234f..f17d18bf92a6 100644
--- a/pkgs/development/compilers/fasm/default.nix
+++ b/pkgs/development/compilers/fasm/default.nix
@@ -1,9 +1,9 @@
{ stdenv, lib, fasm-bin, isx86_64 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (fasm-bin) version src meta;
- name = "fasm-${version}";
+ pname = "fasm";
nativeBuildInputs = [ fasm-bin ];
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index b516019ffc9a..a2b73f61c279 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -4,7 +4,7 @@ let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
stdenv.mkDerivation rec {
version = "3.0.0";
- name = "fpc-${version}";
+ pname = "fpc";
src = fetchurl {
url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 3fe72e6b5057..1b3f4d168ee9 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -3,7 +3,7 @@
, libXi, xorgproto, libX11, libXext
}:
stdenv.mkDerivation rec {
- name = "lazarus-${version}";
+ pname = "lazarus";
version = "1.8.4";
src = fetchurl {
diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 2de487cc9c8b..bcb95d9ca906 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -3,7 +3,7 @@
{ stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }:
stdenv.mkDerivation rec {
- name = "fsharp-${version}";
+ pname = "fsharp";
version = "4.0.1.1";
src = fetchurl {
diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix
index 468fd49ba44e..e497deb2e873 100644
--- a/pkgs/development/compilers/fsharp41/default.nix
+++ b/pkgs/development/compilers/fsharp41/default.nix
@@ -3,7 +3,7 @@
{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }:
stdenv.mkDerivation rec {
- name = "fsharp-${version}";
+ pname = "fsharp";
version = "4.1.34";
src = fetchurl {
diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix
index 94836e84fd68..9306eec817f9 100644
--- a/pkgs/development/compilers/fstar/default.nix
+++ b/pkgs/development/compilers/fstar/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper }:
stdenv.mkDerivation rec {
- name = "fstar-${version}";
+ pname = "fstar";
version = "0.9.6.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix
index 65cd67f527d4..f00a8b6efc91 100644
--- a/pkgs/development/compilers/gambit/bootstrap.nix
+++ b/pkgs/development/compilers/gambit/bootstrap.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoconf, ... }:
-stdenv.mkDerivation rec {
- name = "gambit-bootstrap-${version}";
+stdenv.mkDerivation {
+ pname = "gambit-bootstrap";
version = "4.9.3";
src = fetchurl {
diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix
index 65d16c48a616..7a3324d75602 100644
--- a/pkgs/development/compilers/gambit/build.nix
+++ b/pkgs/development/compilers/gambit/build.nix
@@ -1,7 +1,8 @@
{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, src }:
stdenv.mkDerivation rec {
- name = "gambit-${version}";
+ pname = "gambit";
+ inherit version;
inherit src;
bootstrap = import ./bootstrap.nix ( pkgs );
diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
index 9e5a172eed84..940dec0338ca 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ncurses5, python27 }:
stdenv.mkDerivation rec {
- name = "gcc-arm-embedded-${version}";
+ pname = "gcc-arm-embedded";
version = "6-2017-q2-update";
subdir = "6-2017q2";
diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
index 80e042b5c2e9..90f9d5957bb3 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
@@ -3,7 +3,7 @@
with lib;
stdenv.mkDerivation rec {
- name = "gcc-arm-embedded-${version}";
+ pname = "gcc-arm-embedded";
version = "7-2018-q2-update";
subdir = "7-2018q2";
diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
index 562a21716b72..b2815cc71849 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
@@ -3,7 +3,7 @@
with lib;
stdenv.mkDerivation rec {
- name = "gcc-arm-embedded-${version}";
+ pname = "gcc-arm-embedded";
version = "8-2019-q3-update";
subdir = "8-2019q3/RC1.1";
diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix
index 350eed2fedd0..b86b35525a67 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix
@@ -14,7 +14,8 @@ let
else "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update
in
stdenv.mkDerivation {
- name = "gcc-arm-embedded-${version}";
+ pname = "gcc-arm-embedded";
+ inherit version;
src = fetchurl {
url = "https://launchpad.net/gcc-arm-embedded/${dirName_}/${subdirName_}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2";
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 8fba9be4901b..06c2aa838c5a 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -162,7 +162,7 @@ let version = "4.8.5";
in
-# We need all these X libraries when building AWT with GTK+.
+# We need all these X libraries when building AWT with GTK.
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
@@ -341,7 +341,7 @@ stdenv.mkDerivation ({
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
# library headers and binaries, regarless of the language being compiled.
#
- # Note: When building the Java AWT GTK+ peer, the build system doesn't honor
+ # Note: When building the Java AWT GTK peer, the build system doesn't honor
# `--with-gmp' et al., e.g., when building
# `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add
# them to $CPATH and $LIBRARY_PATH in this case.
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 3ce5ea1f64c2..ebcf20d4e099 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -170,7 +170,7 @@ let version = "4.9.4";
in
-# We need all these X libraries when building AWT with GTK+.
+# We need all these X libraries when building AWT with GTK.
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
@@ -354,7 +354,7 @@ stdenv.mkDerivation ({
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
# library headers and binaries, regarless of the language being compiled.
#
- # Note: When building the Java AWT GTK+ peer, the build system doesn't honor
+ # Note: When building the Java AWT GTK peer, the build system doesn't honor
# `--with-gmp' et al., e.g., when building
# `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add
# them to $CPATH and $LIBRARY_PATH in this case.
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index e6115b104817..0adedb6f8420 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -157,7 +157,7 @@ let version = "5.5.0";
in
-# We need all these X libraries when building AWT with GTK+.
+# We need all these X libraries when building AWT with GTK.
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
@@ -359,7 +359,7 @@ stdenv.mkDerivation ({
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
# library headers and binaries, regarless of the language being compiled.
#
- # Note: When building the Java AWT GTK+ peer, the build system doesn't honor
+ # Note: When building the Java AWT GTK peer, the build system doesn't honor
# `--with-gmp' et al., e.g., when building
# `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add
# them to $CPATH and $LIBRARY_PATH in this case.
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 7644f4d3f623..959b5e62381e 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -156,7 +156,7 @@ let version = "6.5.0";
in
-# We need all these X libraries when building AWT with GTK+.
+# We need all these X libraries when building AWT with GTK.
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
@@ -366,7 +366,7 @@ stdenv.mkDerivation ({
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
# library headers and binaries, regarless of the language being compiled.
#
- # Note: When building the Java AWT GTK+ peer, the build system doesn't honor
+ # Note: When building the Java AWT GTK peer, the build system doesn't honor
# `--with-gmp' et al., e.g., when building
# `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add
# them to $CPATH and $LIBRARY_PATH in this case.
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index f5572c077f31..129ca72251fc 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -373,6 +373,9 @@ stdenv.mkDerivation ({
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
+
+ # See #40038
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix
index 16450cf24ab4..f4f63bc9b19f 100644
--- a/pkgs/development/compilers/gcl/2.6.13-pre.nix
+++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix
@@ -7,8 +7,8 @@ assert stdenv.cc.isGNU ;
assert stdenv.cc ? libc ;
assert stdenv.cc.libc != null ;
-stdenv.mkDerivation rec {
- name = "gcl-${version}";
+stdenv.mkDerivation {
+ pname = "gcl";
version = "2.6.13pre50";
src = fetchgit {
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index 50d397d2cd47..e3c2d0e09de3 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -8,12 +8,12 @@ assert stdenv.cc ? libc ;
assert stdenv.cc.libc != null ;
stdenv.mkDerivation rec {
- name = "gcl-${version}";
+ pname = "gcl";
version = "2.6.12";
src = fetchurl {
sha256 = "1s4hs2qbjqmn9h88l4xvsifq5c3dlc5s74lyb61rdi5grhdlkf4f";
- url = "http://gnu.spinellicreations.com/gcl/${name}.tar.gz";
+ url = "http://gnu.spinellicreations.com/gcl/${pname}-${version}.tar.gz";
};
patches = [(fetchurl {
diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix
index b20d6f9c47ef..9ef650c330fa 100644
--- a/pkgs/development/compilers/gerbil/build.nix
+++ b/pkgs/development/compilers/gerbil/build.nix
@@ -7,7 +7,8 @@
# TODO: make static compilation work
stdenv.mkDerivation rec {
- name = "gerbil-${version}";
+ pname = "gerbil";
+ inherit version;
inherit src;
# Use makeStaticLibraries to enable creation of statically linked binaries
diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix
index 675522d54ead..e90e0dc3d983 100644
--- a/pkgs/development/compilers/gforth/default.nix
+++ b/pkgs/development/compilers/gforth/default.nix
@@ -4,7 +4,8 @@ let
version = "0.7.3";
in
stdenv.mkDerivation {
- name = "gforth-${version}";
+ pname = "gforth";
+ inherit version;
src = fetchurl {
url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz";
sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig";
diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix
index 9fe3a7d9dba3..d68bf7e24b5e 100644
--- a/pkgs/development/compilers/ghc/8.2.2-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.2-binary.nix
@@ -29,23 +29,23 @@ stdenv.mkDerivation rec {
name = "ghc-${version}-binary";
src = fetchurl ({
- "i686-linux" = {
+ i686-linux = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz";
sha256 = "08w2ik55dp3n95qikmrflc91lsiq01xp53ki3jlhnbj8fqnxfrwy";
};
- "x86_64-linux" = {
+ x86_64-linux = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz";
sha256 = "0ahv26304pqi3dm7i78si4pxwvg5f5dc2jwsfgvcrhcx5g30bqj8";
};
- "armv7l-linux" = {
+ armv7l-linux = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz";
sha256 = "1jmv8qmnh5bn324fivbwdcaj55kvw7cb2zq9pafmlmv3qwwx7s46";
};
- "aarch64-linux" = {
+ aarch64-linux = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb8-linux.tar.xz";
sha256 = "1k2amylcp1ad67c75h1pqf7czf9m0zj1i7hdc45ghjklnfq9hrk7";
};
- "x86_64-darwin" = {
+ x86_64-darwin = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
sha256 = "09swx71gh5habzbx55shz2xykgr96xkcy09nzinnm4z0yxicy3zr";
};
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index a034e4ec8dd8..7c13db74c4c8 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -8,6 +8,8 @@
, libiconv ? null, ncurses
+, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support
+
, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
@@ -69,7 +71,8 @@ let
# Splicer will pull out correct variations
libDeps = platform: [ ncurses ]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
- ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
+ ++ stdenv.lib.optional (platform.libc != "glibc") libiconv
+ ++ stdenv.lib.optional enableDwarf elfutils;
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
@@ -203,6 +206,8 @@ stdenv.mkDerivation (rec {
] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
# fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
"--disable-large-address-space"
+ ] ++ stdenv.lib.optional enableDwarf [
+ "--enable-dwarf-unwind"
];
# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index 52fb926cdc68..30353771ea63 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -7,6 +7,8 @@
, libiconv ? null, ncurses
+, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support
+
, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
@@ -71,7 +73,8 @@ let
# Splicer will pull out correct variations
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
- ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+ ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
+ ++ stdenv.lib.optional enableDwarf elfutils;
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
@@ -180,6 +183,8 @@ stdenv.mkDerivation (rec {
] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
# fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
"--disable-large-address-space"
+ ] ++ stdenv.lib.optional enableDwarf [
+ "--enable-dwarf-unwind"
];
# Make sure we never relax`$PATH` and hooks support for compatability.
diff --git a/pkgs/development/compilers/ghc/8.6.3-binary.nix b/pkgs/development/compilers/ghc/8.6.3-binary.nix
index 7e845da5b648..152bd5e4874c 100644
--- a/pkgs/development/compilers/ghc/8.6.3-binary.nix
+++ b/pkgs/development/compilers/ghc/8.6.3-binary.nix
@@ -29,15 +29,15 @@ stdenv.mkDerivation rec {
name = "ghc-${version}-binary";
src = fetchurl ({
- "i686-linux" = {
+ i686-linux = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz";
sha256 = "0bw8a7fxcbskf93rb4m542ff66vrmx5i5kj77qx37cbhijx70w5m";
};
- "x86_64-linux" = {
+ x86_64-linux = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz";
sha256 = "1m9gaga2pzi2cx5gvasg0rx1dlvr68gmi20l67652kag6xjsa719";
};
- "x86_64-darwin" = {
+ x86_64-darwin = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
sha256 = "1hbzk57v45176kxcx848p5jn5p1xbp2129ramkbzsk6plyhnkl3r";
};
diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix
index 1534e6d1d08e..7b6769df682a 100644
--- a/pkgs/development/compilers/ghc/8.6.4.nix
+++ b/pkgs/development/compilers/ghc/8.6.4.nix
@@ -7,6 +7,8 @@
, libiconv ? null, ncurses
+, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support
+
, # GHC can be built with system libffi or a bundled one.
libffi ? null
@@ -76,7 +78,8 @@ let
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
++ [libffi]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
- ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+ ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
+ ++ stdenv.lib.optional enableDwarf elfutils;
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
@@ -104,7 +107,7 @@ stdenv.mkDerivation (rec {
name = "D5123.diff";
sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
})
- (fetchpatch rec { # https://github.com/haskell/haddock/issues/900
+ (fetchpatch { # https://github.com/haskell/haddock/issues/900
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
name = "loadpluginsinmodules.diff";
sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
@@ -179,6 +182,8 @@ stdenv.mkDerivation (rec {
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
"--disable-large-address-space"
+ ] ++ stdenv.lib.optional enableDwarf [
+ "--enable-dwarf-unwind"
];
# Make sure we never relax`$PATH` and hooks support for compatability.
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index c859a34729d0..acc97f93c630 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -7,6 +7,8 @@
, libiconv ? null, ncurses
+, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support
+
, # GHC can be built with system libffi or a bundled one.
libffi ? null
@@ -76,7 +78,8 @@ let
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
++ [libffi]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
- ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+ ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
+ ++ stdenv.lib.optional enableDwarf elfutils;
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
@@ -104,7 +107,7 @@ stdenv.mkDerivation (rec {
name = "D5123.diff";
sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
})
- (fetchpatch rec { # https://github.com/haskell/haddock/issues/900
+ (fetchpatch { # https://github.com/haskell/haddock/issues/900
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
name = "loadpluginsinmodules.diff";
sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
@@ -179,6 +182,8 @@ stdenv.mkDerivation (rec {
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
"--disable-large-address-space"
+ ] ++ stdenv.lib.optional enableDwarf [
+ "--enable-dwarf-unwind"
];
# Make sure we never relax`$PATH` and hooks support for compatability.
@@ -225,6 +230,10 @@ stdenv.mkDerivation (rec {
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
done
+ ''
+ # Temporary work-around for https://github.com/NixOS/nixpkgs/issues/66277
+ + stdenv.lib.optionalString hostPlatform.isAarch64 ''
+ rm -rf "$doc/share/doc/ghc/html/libraries"
'';
passthru = {
diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix
index 95bbab3cb3e1..c80ccf72817f 100644
--- a/pkgs/development/compilers/ghc/8.8.1.nix
+++ b/pkgs/development/compilers/ghc/8.8.1.nix
@@ -7,6 +7,8 @@
, libiconv ? null, ncurses
+, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support
+
, # GHC can be built with system libffi or a bundled one.
libffi ? null
@@ -76,7 +78,8 @@ let
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
++ [libffi]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
- ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+ ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
+ ++ stdenv.lib.optional enableDwarf elfutils;
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
@@ -164,6 +167,8 @@ stdenv.mkDerivation (rec {
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
"--disable-large-address-space"
+ ] ++ stdenv.lib.optional enableDwarf [
+ "--enable-dwarf-unwind"
];
# Make sure we never relax`$PATH` and hooks support for compatability.
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 804edabba0c2..240b55deb682 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -7,6 +7,8 @@
, libiconv ? null, ncurses
+, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support
+
, useLLVM ? !stdenv.targetPlatform.isx86
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
@@ -73,7 +75,8 @@ let
# Splicer will pull out correct variations
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
- ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+ ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
+ ++ stdenv.lib.optional enableDwarf elfutils;
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
@@ -98,7 +101,7 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ];
patches = [
- (fetchpatch rec { # https://github.com/haskell/haddock/issues/900
+ (fetchpatch { # https://github.com/haskell/haddock/issues/900
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
name = "loadpluginsinmodules.diff";
sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
@@ -176,6 +179,8 @@ stdenv.mkDerivation (rec {
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
"--disable-large-address-space"
+ ] ++ stdenv.lib.optional enableDwarf [
+ "--enable-dwarf-unwind"
];
# Make sure we never relax`$PATH` and hooks support for compatability.
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index e9c303b88b6e..ba0bbb1962b8 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -61,7 +61,7 @@
let
inherit (bootPkgs) ghc;
-in mkDerivation (rec {
+in mkDerivation ({
pname = "ghcjs";
inherit version;
src = ghcjsSrc;
diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index 3c46dfc107b8..161e57b54792 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -1,16 +1,29 @@
-{ stdenv, fetchFromGitHub, cmake, bison, jq, python, spirv-tools, spirv-headers }:
+{ stdenv, fetchFromGitHub
+, bison
+, cmake
+, jq
+, python3
+, spirv-headers
+, spirv-tools
+}:
+
stdenv.mkDerivation rec {
- name = "glslang-${version}";
- version = "7.11.3113";
+ pname = "glslang";
+ version = "7.11.3214";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
- rev = "${version}";
- sha256 = "1kzv2b4q1fddxd7c0hc754nd6rw6y9vijb9fsi13xzzq9dficgb6";
+ rev = version;
+ sha256 = "0dqjga0lcza006fhac26zp2plbq4gx8a6nsmrwkqlzji6lw1jins";
};
- nativeBuildInputs = [ cmake python bison jq ];
+ # These get set at all-packages, keep onto them for child drvs
+ passthru = {
+ inherit spirv-tools spirv-headers;
+ };
+
+ nativeBuildInputs = [ cmake python3 bison jq ];
enableParallelBuilding = true;
postPatch = ''
@@ -18,6 +31,7 @@ stdenv.mkDerivation rec {
ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers
'';
+ # Ensure spirv-headers and spirv-tools match exactly to what is expected
preConfigure = ''
HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit')
TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit')
diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix
index ae27964ae8f0..df5202cb1c20 100644
--- a/pkgs/development/compilers/gnu-cobol/default.nix
+++ b/pkgs/development/compilers/gnu-cobol/default.nix
@@ -6,7 +6,7 @@ let
lib = stdenv.lib;
in
stdenv.mkDerivation rec {
- name = "gnu-cobol-${version}";
+ pname = "gnu-cobol";
inherit version;
src = fetchurl {
diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix
index 41c325c2b1ad..1035091654a6 100644
--- a/pkgs/development/compilers/gnu-smalltalk/default.nix
+++ b/pkgs/development/compilers/gnu-smalltalk/default.nix
@@ -18,7 +18,7 @@ let # The gnu-smalltalk project has a dependency to the libsigsegv library.
in stdenv.mkDerivation rec {
version = "3.2.5";
- name = "gnu-smalltalk-${version}";
+ pname = "gnu-smalltalk";
src = fetchurl {
url = "mirror://gnu/smalltalk/smalltalk-${version}.tar.xz";
diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix
index 69507685f29b..e051d41993cc 100644
--- a/pkgs/development/compilers/go-jsonnet/default.nix
+++ b/pkgs/development/compilers/go-jsonnet/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "go-jsonnet-${version}";
+ pname = "go-jsonnet";
version = "0.13.0";
goPackagePath = "github.com/google/go-jsonnet";
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
deleted file mode 100644
index 39de36293c8e..000000000000
--- a/pkgs/development/compilers/go/1.10.nix
+++ /dev/null
@@ -1,187 +0,0 @@
-{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
-, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
-, fetchpatch
-}:
-
-let
-
- inherit (stdenv.lib) optionals optionalString;
-
- clangHack = writeScriptBin "clang" ''
- #!${stdenv.shell}
- exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2)
- '';
-
- goBootstrap = runCommand "go-bootstrap" {} ''
- mkdir $out
- cp -rf ${go_bootstrap}/* $out/
- chmod -R u+w $out
- find $out -name "*.c" -delete
- cp -rf $out/bin/* $out/share/go/bin/
- '';
-
-in
-
-stdenv.mkDerivation rec {
- name = "go-${version}";
- version = "1.10.8";
-
- src = fetchFromGitHub {
- owner = "golang";
- repo = "go";
- rev = "go${version}";
- sha256 = "1yynv105wh8pwiq61v4yg5i50k13g3x634x60mhxhv4gj9cq06cx";
- };
-
- GOCACHE = "off";
-
- # perl is used for testing go vet
- nativeBuildInputs = [ perl which pkgconfig patch procps ];
- buildInputs = [ cacert pcre ]
- ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
- ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
- propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
-
- hardeningDisable = [ "all" ];
-
- prePatch = ''
- patchShebangs ./ # replace /bin/bash
-
- # This source produces shell script at run time,
- # and thus it is not corrected by patchShebangs.
- substituteInPlace misc/cgo/testcarchive/carchive_test.go \
- --replace '#!/usr/bin/env bash' '#!${stdenv.shell}'
-
- # Disabling the 'os/http/net' tests (they want files not available in
- # chroot builds)
- rm src/net/{listen,parse}_test.go
- rm src/syscall/exec_linux_test.go
-
- # !!! substituteInPlace does not seems to be effective.
- # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
- sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
- sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
- # Disable the unix socket test
- sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
- # Disable the hostname test
- sed -i '/TestHostname/areturn' src/os/os_test.go
- # ParseInLocation fails the test
- sed -i '/TestParseInSydney/areturn' src/time/format_test.go
- # Remove the api check as it never worked
- sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
- # Remove the coverage test as we have removed this utility
- sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
- # Remove the timezone naming test
- sed -i '/TestLoadFixed/areturn' src/time/time_test.go
- # Remove disable setgid test
- sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go
- # Remove cert tests that conflict with NixOS's cert resolution
- sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
- # TestWritevError hangs sometimes
- sed -i '/TestWritevError/areturn' src/net/writev_test.go
- # TestVariousDeadlines fails sometimes
- sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go
-
- sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
- sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
-
- # Disable cgo lookup tests not works, they depend on resolver
- rm src/net/cgo_unix_test.go
-
- '' + optionalString stdenv.isLinux ''
- sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
- '' + optionalString stdenv.isAarch32 ''
- sed -i '/TestCurrent/areturn' src/os/user/user_test.go
- echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash
- '' + optionalString stdenv.isDarwin ''
- substituteInPlace src/race.bash --replace \
- "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
- sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
- sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
- sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
-
- sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
- sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go
- sed -i '/TestCurrent/areturn' src/os/user/user_test.go
- sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
- sed -i '/TestRead0/areturn' src/os/os_test.go
- sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
-
- sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
- sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go
-
- sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
-
- sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
-
- touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
- '';
-
- patches = [
- ./remove-tools-1.9.patch
- ./ssl-cert-file-1.9.patch
- ./remove-test-pie.patch
- ./creds-test.patch
- ./go-1.9-skip-flaky-19608.patch
- ./go-1.9-skip-flaky-20072.patch
- (fetchpatch {
- name = "missing_cpuHog_in_pprof_output.diff";
- url = "https://github.com/golang/go/commit/33110e2c.diff";
- sha256 = "04vh9lflbpz9xjvymyzhd91gkxiiwwz4lhglzl3r8z0lk45p96qn";
- })
- ];
-
- GOOS = if stdenv.isDarwin then "darwin" else "linux";
- GOARCH = if stdenv.isDarwin then "amd64"
- else if stdenv.hostPlatform.system == "i686-linux" then "386"
- else if stdenv.hostPlatform.system == "x86_64-linux" then "amd64"
- else if stdenv.isAarch32 then "arm"
- else if stdenv.isAarch64 then "arm64"
- else throw "Unsupported system";
- GOARM = optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5";
- GO386 = 387; # from Arch: don't assume sse2 on i686
- CGO_ENABLED = 1;
- GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
- # Hopefully avoids test timeouts on Hydra
- GO_TEST_TIMEOUT_SCALE = 3;
-
- # The go build actually checks for CC=*/clang and does something different, so we don't
- # just want the generic `cc` here.
- CC = if stdenv.isDarwin then "clang" else "cc";
-
- configurePhase = ''
- mkdir -p $out/share/go/bin
- export GOROOT=$out/share/go
- export GOBIN=$GOROOT/bin
- export PATH=$GOBIN:$PATH
- ulimit -a
- '';
-
- postConfigure = optionalString stdenv.isDarwin ''
- export PATH=${clangHack}/bin:$PATH
- '';
-
- installPhase = ''
- cp -r . $GOROOT
- ( cd $GOROOT/src && ./all.bash )
- '';
-
- preFixup = ''
- rm -r $out/share/go/pkg/bootstrap
- ln -s $out/share/go/bin $out/bin
- '';
-
- setupHook = ./setup-hook.sh;
-
- disallowedReferences = [ go_bootstrap ];
-
- meta = with stdenv.lib; {
- branch = "1.10";
- homepage = http://golang.org/;
- description = "The Go Programming language";
- license = licenses.bsd3;
- maintainers = with maintainers; [ cstrahan orivej velovix mic92 ];
- platforms = platforms.linux ++ platforms.darwin;
- badPlatforms = [ "x86_64-darwin" ];
- };
-}
diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
deleted file mode 100644
index a87876390537..000000000000
--- a/pkgs/development/compilers/go/1.11.nix
+++ /dev/null
@@ -1,232 +0,0 @@
-{ stdenv, fetchurl, tzdata, iana-etc, runCommand
-, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
-, mailcap, runtimeShell
-, buildPackages, pkgsTargetTarget
-}:
-
-let
-
- inherit (stdenv.lib) optionals optionalString;
-
- goBootstrap = runCommand "go-bootstrap" {} ''
- mkdir $out
- cp -rf ${buildPackages.go_bootstrap}/* $out/
- chmod -R u+w $out
- find $out -name "*.c" -delete
- cp -rf $out/bin/* $out/share/go/bin/
- '';
-
- goarch = platform: {
- "i686" = "386";
- "x86_64" = "amd64";
- "aarch64" = "arm64";
- "arm" = "arm";
- "armv5tel" = "arm";
- "armv6l" = "arm";
- "armv7l" = "arm";
- }.${platform.parsed.cpu.name} or (throw "Unsupported system");
-
-in
-
-stdenv.mkDerivation rec {
- pname = "go";
- version = "1.11.13";
-
- src = fetchurl {
- url = "https://dl.google.com/go/go${version}.src.tar.gz";
- sha256 = "0xj0pbviikdf8g0sfz5hwxf7hwz8b8g5akqnrvyclhgnsdghjcjh";
- };
-
- # perl is used for testing go vet
- nativeBuildInputs = [ perl which pkgconfig patch procps ];
- buildInputs = [ cacert pcre ]
- ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
- ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
-
-
- propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
-
- hardeningDisable = [ "all" ];
-
- prePatch = ''
- patchShebangs ./ # replace /bin/bash
-
- # This source produces shell script at run time,
- # and thus it is not corrected by patchShebangs.
- substituteInPlace misc/cgo/testcarchive/carchive_test.go \
- --replace '#!/usr/bin/env bash' '#!${runtimeShell}'
-
- # Patch the mimetype database location which is missing on NixOS.
- substituteInPlace src/mime/type_unix.go \
- --replace '/etc/mime.types' '${mailcap}/etc/mime.types'
-
- # Disabling the 'os/http/net' tests (they want files not available in
- # chroot builds)
- rm src/net/{listen,parse}_test.go
- rm src/syscall/exec_linux_test.go
-
- # !!! substituteInPlace does not seems to be effective.
- # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
- sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
- sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
- # Disable the unix socket test
- sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
- # Disable the hostname test
- sed -i '/TestHostname/areturn' src/os/os_test.go
- # ParseInLocation fails the test
- sed -i '/TestParseInSydney/areturn' src/time/format_test.go
- # Remove the api check as it never worked
- sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
- # Remove the coverage test as we have removed this utility
- sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
- # Remove the timezone naming test
- sed -i '/TestLoadFixed/areturn' src/time/time_test.go
- # Remove disable setgid test
- sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go
- # Remove cert tests that conflict with NixOS's cert resolution
- sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
- # TestWritevError hangs sometimes
- sed -i '/TestWritevError/areturn' src/net/writev_test.go
- # TestVariousDeadlines fails sometimes
- sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go
-
- sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
- sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
-
- # Disable cgo lookup tests not works, they depend on resolver
- rm src/net/cgo_unix_test.go
-
- '' + optionalString stdenv.isLinux ''
- sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
- '' + optionalString stdenv.isAarch32 ''
- echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash
- '' + optionalString stdenv.isDarwin ''
- substituteInPlace src/race.bash --replace \
- "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
- sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
- sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
- sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
-
- sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
- sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go
- sed -i '/TestRead0/areturn' src/os/os_test.go
- sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
-
- sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
- sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go
-
- sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
-
- sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
-
- touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
- '';
-
- patches = [
- ./remove-tools-1.11.patch
- ./ssl-cert-file-1.12.1.patch
- ./remove-test-pie.patch
- ./creds-test.patch
- ./go-1.9-skip-flaky-19608.patch
- ./go-1.9-skip-flaky-20072.patch
- ./remove-fhs-test-references.patch
- ./skip-external-network-tests.patch
- ./skip-nohup-tests.patch
- # breaks under load: https://github.com/golang/go/issues/25628
- ./skip-test-extra-files-on-386.patch
- ];
-
- GOOS = stdenv.targetPlatform.parsed.kernel.name;
- GOARCH = goarch stdenv.targetPlatform;
- # GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
- # Go will nevertheless build a for host system that we will copy over in
- # the install phase.
- GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
- GOHOSTARCH = goarch stdenv.buildPlatform;
-
- # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
- # to be different from CC/CXX
- CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
- "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc"
- else
- null;
- CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
- "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++"
- else
- null;
-
- GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
- GO386 = 387; # from Arch: don't assume sse2 on i686
- CGO_ENABLED = 1;
- # Hopefully avoids test timeouts on Hydra
- GO_TEST_TIMEOUT_SCALE = 3;
-
- # Indicate that we are running on build infrastructure
- # Some tests assume things like home directories and users exists
- GO_BUILDER_NAME = "nix";
-
- GOROOT_BOOTSTRAP="${goBootstrap}/share/go";
-
- postConfigure = ''
- export GOCACHE=$TMPDIR/go-cache
- # this is compiled into the binary
- export GOROOT_FINAL=$out/share/go
-
- export PATH=$(pwd)/bin:$PATH
-
- # Independent from host/target, CC should produce code for the building system.
- export CC=${buildPackages.stdenv.cc}/bin/cc
- ulimit -a
- '';
-
- postBuild = ''
- (cd src && ./make.bash)
- '';
-
- doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin;
-
- checkPhase = ''
- runHook preCheck
- (cd src && ./run.bash --no-rebuild)
- runHook postCheck
- '';
-
- preInstall = ''
- rm -r pkg/{bootstrap,obj}
- # Contains the wrong perl shebang when cross compiling,
- # since it is not used for anything we can deleted as well.
- rm src/regexp/syntax/make_perl_groups.pl
- '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
- mv bin/*_*/* bin
- rmdir bin/*_*
- ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
- rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
- ''}
- '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then ''
- rm -rf bin/*_*
- ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
- rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
- ''}
- '' else "");
-
- installPhase = ''
- runHook preInstall
- mkdir -p $GOROOT_FINAL
- cp -a bin pkg src lib misc api doc $GOROOT_FINAL
- ln -s $GOROOT_FINAL/bin $out/bin
- runHook postInstall
- '';
-
- setupHook = ./setup-hook.sh;
-
- disallowedReferences = [ goBootstrap ];
-
- meta = with stdenv.lib; {
- branch = "1.11";
- homepage = http://golang.org/;
- description = "The Go Programming language";
- license = licenses.bsd3;
- maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs ];
- platforms = platforms.linux ++ platforms.darwin;
- };
-}
diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix
index dae4c173223c..817f3ab324d6 100644
--- a/pkgs/development/compilers/go/1.12.nix
+++ b/pkgs/development/compilers/go/1.12.nix
@@ -17,13 +17,13 @@ let
'';
goarch = platform: {
- "i686" = "386";
- "x86_64" = "amd64";
- "aarch64" = "arm64";
- "arm" = "arm";
- "armv5tel" = "arm";
- "armv6l" = "arm";
- "armv7l" = "arm";
+ i686 = "386";
+ x86_64 = "amd64";
+ aarch64 = "arm64";
+ arm = "arm";
+ armv5tel = "arm";
+ armv6l = "arm";
+ armv7l = "arm";
}.${platform.parsed.cpu.name} or (throw "Unsupported system");
in
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 95312f9e1ead..1052f1f1ae1e 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -4,11 +4,11 @@
, Security }:
let
- libc = if stdenv ? "cross" then libcCross else stdenv.cc.libc;
+ libc = if stdenv ? cross then libcCross else stdenv.cc.libc;
in
stdenv.mkDerivation rec {
- name = "go-${version}";
+ pname = "go";
version = "1.4-bootstrap-20161024";
revision = "79d85a4965ea7c46db483314c3981751909d7883";
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index be03e1aeeed3..61e3b6c16aee 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -214,7 +214,7 @@ in rec {
jvmci8 = stdenv.mkDerivation rec {
version = "19.2-b01";
- name = "jvmci-${version}";
+ pname = "jvmci";
src = fetchFromGitHub {
owner = "graalvm";
repo = "graal-jvmci-8";
@@ -280,7 +280,7 @@ in rec {
graalvm8 = stdenv.mkDerivation rec {
inherit version;
- name = "graal-${version}";
+ pname = "graal";
src = fetchFromGitHub {
owner = "oracle";
repo = "graal";
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index 0a974fccc888..0ae038d47138 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -2,8 +2,9 @@
let
generic = { version, sha256, prePatch }:
- stdenv.mkDerivation rec {
- name = "haxe-${version}";
+ stdenv.mkDerivation {
+ pname = "haxe";
+ inherit version;
buildInputs = [ocaml zlib pcre neko camlp4];
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index 010dacd0c71a..24e88f9ee2e2 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -7,7 +7,7 @@
}:
stdenv.mkDerivation rec {
- name = "hhvm-${version}";
+ pname = "hhvm";
version = "3.23.2";
# use git version since we need submodules
diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index 2b5891256043..fccdf7a978d4 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@@ -1,15 +1,17 @@
-{stdenv, fetchurl, bison, flex}:
+{stdenv, fetchurl, fetchpatch, bison, flex}:
stdenv.mkDerivation rec {
- name = "iasl-${version}";
- version = "20181213";
+ pname = "iasl";
+ version = "20190108";
src = fetchurl {
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
- sha256 = "1vgqlv9pvxc52faxixpgz7hi1awqmj88bw5vqn3bldf6fmkh147w";
+ sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q";
};
- NIX_CFLAGS_COMPILE = "-O3";
+ NIX_CFLAGS_COMPILE = [
+ "-O3"
+ ];
buildFlags = "iasl";
diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix
index a6955c030519..2a6551aad187 100644
--- a/pkgs/development/compilers/inform7/default.nix
+++ b/pkgs/development/compilers/inform7/default.nix
@@ -2,7 +2,8 @@
let
version = "6M62";
in stdenv.mkDerivation {
- name = "inform7-${version}";
+ pname = "inform7";
+ inherit version;
buildInputs = [ perl coreutils gnutar gzip ];
src = fetchzip {
url = "http://inform7.com/download/content/6M62/I7_6M62_Linux_all.tar.gz";
diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix
index f601dc254a43..6640c4aa89ab 100644
--- a/pkgs/development/compilers/intercal/default.nix
+++ b/pkgs/development/compilers/intercal/default.nix
@@ -6,11 +6,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "intercal-${version}";
+ pname = "intercal";
version = "0.30";
src = fetchurl {
- url = "http://catb.org/esr/intercal/${name}.tar.gz";
+ url = "http://catb.org/esr/intercal/${pname}-${version}.tar.gz";
sha256 = "058ppvvgz9r5603ia9jkknbrciypgg4hjbczrv9v1d9w3ak652xk";
};
diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix
index 1cbe95232eb7..f240deda0bf9 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
inherit testedTargets;
- name = "ispc-${version}";
+ pname = "ispc";
src = fetchFromGitHub {
owner = "ispc";
diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix
index 06f321bc39c4..f49d3d6e2109 100644
--- a/pkgs/development/compilers/javacard-devkit/default.nix
+++ b/pkgs/development/compilers/javacard-devkit/default.nix
@@ -3,7 +3,6 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "javacard-devkit";
version = "2.2.2";
uscoreVersion = builtins.replaceStrings ["."] ["_"] version;
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index d407fb46b9b5..1349b7f0dddc 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -8,7 +8,6 @@
let drv = stdenv.mkDerivation rec {
pname = "jetbrainsjdk";
version = "164";
- name = pname + "-" + version;
src = if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index 7bbad0e12016..460ff405b94e 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "jsonnet-${version}";
+ pname = "jsonnet";
version = "0.13.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix
index d8d521952bda..c706f2facec7 100644
--- a/pkgs/development/compilers/julia/shared.nix
+++ b/pkgs/development/compilers/julia/shared.nix
@@ -77,10 +77,9 @@ in
stdenv.mkDerivation rec {
pname = "julia";
inherit version;
- name = "${pname}-${version}";
src = fetchzip {
- url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
+ url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = src_sha256;
};
prePatch = ''
@@ -130,10 +129,10 @@ stdenv.mkDerivation rec {
makeFlags =
let
arch = head (splitString "-" stdenv.system);
- march = { "x86_64" = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; "i686" = "pentium4"; }."${arch}"
+ march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch}
or (throw "unsupported architecture: ${arch}");
# Julia requires Pentium 4 (SSE2) or better
- cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
+ cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch}
or (throw "unsupported architecture: ${arch}");
in [
"ARCH=${arch}"
diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix
index 9800b33e7a9e..a9613de91eb9 100644
--- a/pkgs/development/compilers/jwasm/default.nix
+++ b/pkgs/development/compilers/jwasm/default.nix
@@ -2,8 +2,8 @@
, cmake }:
with stdenv.lib;
-stdenv.mkDerivation rec {
- name = "jwasm-${version}";
+stdenv.mkDerivation {
+ pname = "jwasm";
version = "git-2017-11-22";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 32659d5be564..90dc20fcd3ea 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -2,9 +2,9 @@
let
version = "1.3.41";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit version;
- name = "kotlin-${version}";
+ pname = "kotlin";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index e4ef37e4721d..787a9352e225 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -21,7 +21,8 @@ let
in
stdenv.mkDerivation rec {
- name = "ldc-${version}";
+ pname = "ldc";
+ inherit version;
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix
index 132cd67a4aeb..9a602c62777d 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -2,7 +2,8 @@
let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation {
- name = "clang-${version}";
+ pname = "clang";
+ inherit version;
src = fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg";
diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
index d54ffd96382d..e327fa79c6f0 100644
--- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
@@ -1,7 +1,8 @@
{stdenv, fetch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}:
stdenv.mkDerivation rec {
- name = "dragonegg-${version}";
+ pname = "dragonegg";
+ inherit version;
src = fetch "dragonegg" "1va4wv2b1dj0dpzsksnpnd0jic52q7pqj79w3m9jwdb58h7104dw";
@@ -11,9 +12,9 @@ stdenv.mkDerivation rec {
buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ];
installPhase = ''
- mkdir -p $out/lib $out/share/doc/${name}
+ mkdir -p $out/lib $out/share/doc/${pname}-${version}
cp -d dragonegg.so $out/lib
- cp README COPYING $out/share/doc/${name}
+ cp README COPYING $out/share/doc/${pname}-${version}
'';
meta = {
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
index 6edd5e9798c7..44610a1b11d3 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
@@ -2,8 +2,9 @@
let version = "3.5.2"; in
-stdenv.mkDerivation rec {
- name = "libc++-${version}";
+stdenv.mkDerivation {
+ pname = "libc++";
+ inherit version;
src = fetchurl {
url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.xz";
diff --git a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
index 268f2702a234..d295ddbf8a44 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
@@ -8,7 +8,8 @@ let
sha256 = "10idgcbs4pcx6mjsbq1vjm8hzqqdk2p7k86cw9f473jmfyfwgf5j";
};
in stdenv.mkDerivation {
- name = "libc++abi-${version}";
+ pname = "libc++abi";
+ inherit version;
src = fetchurl {
url = "http://llvm.org/releases/${version}/libcxxabi-${version}.src.tar.xz";
diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix
index 4a398bd96a05..8fe4dd6f1d5f 100644
--- a/pkgs/development/compilers/llvm/3.5/lld.nix
+++ b/pkgs/development/compilers/llvm/3.5/lld.nix
@@ -1,7 +1,8 @@
{ stdenv, fetch, cmake, llvm, ncurses, zlib, python, version }:
stdenv.mkDerivation {
- name = "lld-${version}";
+ pname = "lld";
+ inherit version;
src = fetch "lld" "1hpqawg1sc8mdqxqaxqmlzbrn69w1pkj8rxhjgqgmwra6c0xky89";
diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix
index a5161333b282..b4823e9d8c2a 100644
--- a/pkgs/development/compilers/llvm/3.5/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.5/lldb.nix
@@ -13,7 +13,8 @@
}:
stdenv.mkDerivation {
- name = "lldb-${version}";
+ pname = "lldb";
+ inherit version;
src = fetch "lldb" "0ffi9jn4k3yd0hvxs1v4n710x8siq21lb49v3351d7j5qinrpgi7";
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index 6eec99717785..fc53ad266a65 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -17,8 +17,9 @@
, enableSharedLibraries ? !stdenv.isDarwin
}:
-stdenv.mkDerivation rec {
- name = "llvm-${version}";
+stdenv.mkDerivation {
+ pname = "llvm";
+ inherit version;
src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4";
diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix
index bacf4d30556b..06bc7490c7b5 100644
--- a/pkgs/development/compilers/llvm/3.5/polly.nix
+++ b/pkgs/development/compilers/llvm/3.5/polly.nix
@@ -1,7 +1,8 @@
{ stdenv, fetch, cmake, isl, python, gmp, llvm, version }:
stdenv.mkDerivation {
- name = "polly-${version}";
+ pname = "polly";
+ inherit version;
src = fetch "polly" "1s6v54czmgq626an4yk2k34lrzkwmz1bjrbiafh7j23yc2w4nalx";
diff --git a/pkgs/development/compilers/llvm/3.8/D17533-1.patch b/pkgs/development/compilers/llvm/3.8/D17533-1.patch
deleted file mode 100644
index 79ca953d6e5b..000000000000
--- a/pkgs/development/compilers/llvm/3.8/D17533-1.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit eb92f5a745014532b83abfba04602fce87ca8393
-Author: Chuang-Yu Cheng
-Date: Fri Apr 8 12:04:32 2016 +0000
-
- CXX_FAST_TLS calling convention: performance improvement for PPC64
-
- This is the same change on PPC64 as r255821 on AArch64. I have even borrowed
- his commit message.
-
- The access function has a short entry and a short exit, the initialization
- block is only run the first time. To improve the performance, we want to
- have a short frame at the entry and exit.
-
- We explicitly handle most of the CSRs via copies. Only the CSRs that are not
- handled via copies will be in CSR_SaveList.
-
- Frame lowering and prologue/epilogue insertion will generate a short frame
- in the entry and exit according to CSR_SaveList. The majority of the CSRs will
- be handled by register allcoator. Register allocator will try to spill and
- reload them in the initialization block.
-
- We add CSRsViaCopy, it will be explicitly handled during lowering.
-
- 1> we first set FunctionLoweringInfo->SplitCSR if conditions are met (the target
- supports it for the given machine function and the function has only return
- exits). We also call TLI->initializeSplitCSR to perform initialization.
- 2> we call TLI->insertCopiesSplitCSR to insert copies from CSRsViaCopy to
- virtual registers at beginning of the entry block and copies from virtual
- registers to CSRsViaCopy at beginning of the exit blocks.
- 3> we also need to make sure the explicit copies will not be eliminated.
-
- Author: Tom Jablin (tjablin)
- Reviewers: hfinkel kbarton cycheng
-
- http://reviews.llvm.org/D17533
-
- git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@265781 91177308-0d34-0410-b5e6-96231b3b80d8
-
-diff --git a/lib/CodeGen/TargetFrameLoweringImpl.cpp b/lib/CodeGen/TargetFrameLoweringImpl.cpp
-index 679ade1..0a0e079 100644
---- a/lib/CodeGen/TargetFrameLoweringImpl.cpp
-+++ b/lib/CodeGen/TargetFrameLoweringImpl.cpp
-@@ -63,12 +63,15 @@ void TargetFrameLowering::determineCalleeSaves(MachineFunction &MF,
- const TargetRegisterInfo &TRI = *MF.getSubtarget().getRegisterInfo();
- const MCPhysReg *CSRegs = TRI.getCalleeSavedRegs(&MF);
-
-+ // Resize before the early returns. Some backends expect that
-+ // SavedRegs.size() == TRI.getNumRegs() after this call even if there are no
-+ // saved registers.
-+ SavedRegs.resize(TRI.getNumRegs());
-+
- // Early exit if there are no callee saved registers.
- if (!CSRegs || CSRegs[0] == 0)
- return;
-
-- SavedRegs.resize(TRI.getNumRegs());
--
- // In Naked functions we aren't going to save any registers.
- if (MF.getFunction()->hasFnAttribute(Attribute::Naked))
- return;
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix
deleted file mode 100644
index 47a1bed126da..000000000000
--- a/pkgs/development/compilers/llvm/3.8/clang/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }:
-
-let
- gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
- self = stdenv.mkDerivation {
- name = "clang-${version}";
-
- src = fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc";
-
- unpackPhase = ''
- unpackFile $src
- mv cfe-${version}.src clang
- sourceRoot=$PWD/clang
- unpackFile ${clang-tools-extra_src}
- mv clang-tools-extra-* $sourceRoot/tools/extra
- '';
-
- nativeBuildInputs = [ cmake ];
- buildInputs = [ libxml2 llvm python ];
-
- cmakeFlags = [
- "-DCMAKE_CXX_FLAGS=-std=c++11"
- ] ++
- # Maybe with compiler-rt this won't be needed?
- (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
- (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
-
- patches = [ ./purity.patch ];
-
- postPatch = ''
- sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
- sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
- '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
- sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp
- '';
-
- outputs = [ "out" "lib" "python" ];
-
- # Clang expects to find LLVMgold in its own prefix
- # Clang expects to find sanitizer libraries in its own prefix
- postInstall = ''
- if [ -e ${llvm}/lib/LLVMgold.so ]; then
- ln -sv ${llvm}/lib/LLVMgold.so $out/lib
- fi
-
- ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
- ln -sv $out/bin/clang $out/bin/cpp
-
- # Move libclang to 'lib' output
- moveToOutput "lib/libclang.*" "$lib"
- substituteInPlace $out/share/clang/cmake/ClangTargets-release.cmake \
- --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang."
-
- mkdir -p $python/bin $python/share/clang/
- mv $out/bin/{git-clang-format,scan-view} $python/bin
- if [ -e $out/bin/set-xcode-analyzer ]; then
- mv $out/bin/set-xcode-analyzer $python/bin
- fi
- mv $out/share/clang/*.py $python/share/clang
-
- rm $out/bin/c-index-test
- '';
-
- enableParallelBuilding = true;
-
- passthru = {
- isClang = true;
- inherit llvm;
- } // stdenv.lib.optionalAttrs stdenv.isLinux {
- inherit gcc;
- };
-
- meta = {
- description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
- homepage = http://llvm.org/;
- license = stdenv.lib.licenses.ncsa;
- platforms = stdenv.lib.platforms.all;
- };
- };
-in self
diff --git a/pkgs/development/compilers/llvm/3.8/clang/purity.patch b/pkgs/development/compilers/llvm/3.8/clang/purity.patch
deleted file mode 100644
index 2d1c68d865e6..000000000000
--- a/pkgs/development/compilers/llvm/3.8/clang/purity.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/lib/Driver/Tools.cpp 2016-02-12 15:51:41.000000000 -0700
-+++ b/lib/Driver/Tools.cpp 2016-03-08 15:39:06.790111122 -0700
-@@ -8833,15 +8833,6 @@
- CmdArgs.push_back("-shared");
- }
-
-- if (Arch == llvm::Triple::arm || Arch == llvm::Triple::armeb ||
-- Arch == llvm::Triple::thumb || Arch == llvm::Triple::thumbeb ||
-- (!Args.hasArg(options::OPT_static) &&
-- !Args.hasArg(options::OPT_shared))) {
-- CmdArgs.push_back("-dynamic-linker");
-- CmdArgs.push_back(Args.MakeArgString(
-- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain)));
-- }
--
- CmdArgs.push_back("-o");
- CmdArgs.push_back(Output.getFilename());
diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix
deleted file mode 100644
index a848c8b9252b..000000000000
--- a/pkgs/development/compilers/llvm/3.8/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith
-, buildLlvmTools # tools, but from the previous stage, for cross
-, targetLlvmLibraries # libraries, but from the next stage, for cross
-}:
-
-let
- version = "3.8.1";
-
- fetch = fetch_v version;
- fetch_v = ver: name: sha256: fetchurl {
- url = "https://releases.llvm.org/${ver}/${name}-${ver}.src.tar.xz";
- inherit sha256;
- };
-
- compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d";
- clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6";
-
- tools = stdenv.lib.makeExtensible (tools: let
- callPackage = newScope (tools // { inherit stdenv isl version fetch; });
- in {
- llvm = callPackage ./llvm.nix {
- inherit compiler-rt_src;
- };
-
- clang-unwrapped = callPackage ./clang {
- inherit clang-tools-extra_src;
- };
-
- libclang = tools.clang-unwrapped.lib;
-
- clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
-
- libstdcxxClang = wrapCCWith {
- cc = tools.clang-unwrapped;
- extraPackages = [ libstdcxxHook ];
- };
-
- libcxxClang = wrapCCWith {
- cc = tools.clang-unwrapped;
- extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
- };
-
- lldb = callPackage ./lldb.nix {};
- });
-
- libraries = stdenv.lib.makeExtensible (libraries: let
- callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
- in {
-
- stdenv = overrideCC stdenv buildLlvmTools.clang;
-
- libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
-
- libcxx = callPackage ./libc++ {};
-
- libcxxabi = callPackage ./libc++abi.nix {};
- });
-
-in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch b/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch
deleted file mode 100644
index 6e56c67c8977..000000000000
--- a/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- llvm.org/utils/llvm-build/llvmbuild/main.py 2015-10-07 00:24:35.000000000 +0100
-+++ llvm/utils/llvm-build/llvmbuild/main.py 2017-06-16 17:08:39.866586578 +0100
-@@ -413,7 +413,7 @@
- if library_name is None:
- library_name_as_cstr = 'nullptr'
- else:
-- library_name_as_cstr = '"lib%s.a"' % library_name
-+ library_name_as_cstr = '"lib%s.so"' % library_name
- if is_installed:
- is_installed_as_cstr = 'true'
- else:
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/darwin.patch b/pkgs/development/compilers/llvm/3.8/libc++/darwin.patch
deleted file mode 100644
index 6dd756f01cc2..000000000000
--- a/pkgs/development/compilers/llvm/3.8/libc++/darwin.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- libcxx-3.8.0.src.org/lib/CMakeLists.txt 2015-12-16 15:41:05.000000000 -0800
-+++ libcxx-3.8.0.src/lib/CMakeLists.txt 2016-06-17 19:40:00.293394500 -0700
-@@ -94,30 +94,30 @@
- add_definitions(-D__STRICT_ANSI__)
- add_link_flags(
- "-compatibility_version 1"
- "-current_version 1"
-- "-install_name /usr/lib/libc++.1.dylib"
-- "-Wl,-reexport_library,/usr/lib/libc++abi.dylib"
-+ "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib"
-+ "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
- "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp"
- "/usr/lib/libSystem.B.dylib")
- else()
- if ( ${CMAKE_OSX_SYSROOT} )
- list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7)
- if (OSX_HAS_ARMV7)
- set(OSX_RE_EXPORT_LINE
-- "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"
-+ "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
- "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp")
- else()
- set(OSX_RE_EXPORT_LINE
-- "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib")
-+ "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib")
- endif()
- else()
-- set(OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
-+ set(OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
- endif()
-
- add_link_flags(
- "-compatibility_version 1"
-- "-install_name /usr/lib/libc++.1.dylib"
-+ "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib"
- "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp"
- "${OSX_RE_EXPORT_LINE}"
- "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/notweak.exp"
- "-Wl,-force_symbols_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/weak.exp")
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix
deleted file mode 100644
index 5a0410302f2f..000000000000
--- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }:
-
-stdenv.mkDerivation rec {
- name = "libc++-${version}";
-
- src = fetch "libcxx" "1k7f9qk5bgwa02ksh6yr9hccwcbhmcdzl1fpbdw6s2c89iwg7mvp";
-
- postUnpack = ''
- unpackFile ${libcxxabi.src}
- '';
-
- preConfigure = ''
- # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
- cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include")
- '';
-
- patches = [
- # glibc 2.26 fix
- ../../3.9/libc++/xlocale-glibc-2.26.patch
- ]
- ++ lib.optional stdenv.isDarwin ./darwin.patch
- ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
- ../../libcxx-0001-musl-hacks.patch
- ../../libcxx-max_align_t.patch
- ];
-
- nativeBuildInputs = [ cmake ];
-
- buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
-
- cmakeFlags = [
- "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
- "-DLIBCXX_LIBCPPABI_VERSION=2"
- "-DLIBCXX_CXX_ABI=libcxxabi"
- ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
-
- enableParallelBuilding = true;
-
- linkCxxAbi = stdenv.isLinux;
-
- setupHooks = [
- ../../../../../build-support/setup-hooks/role.bash
- ./setup-hook.sh
- ];
-
- meta = {
- homepage = http://libcxx.llvm.org/;
- description = "A new implementation of the C++ standard library, targeting C++11";
- license = with stdenv.lib.licenses; [ ncsa mit ];
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh
deleted file mode 100644
index 6611259165ae..000000000000
--- a/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# See pkgs/build-support/setup-hooks/role.bash
-getHostRole
-
-linkCxxAbi="@linkCxxAbi@"
-export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix
deleted file mode 100644
index 8b25681c2dbf..000000000000
--- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
-
-stdenv.mkDerivation {
- name = "libc++abi-${version}";
-
- src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1";
-
- nativeBuildInputs = [ cmake ];
- buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
-
- postUnpack = ''
- unpackFile ${libcxx.src}
- unpackFile ${llvm.src}
- export NIX_CFLAGS_COMPILE+=" -I$PWD/include"
- export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include"
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
- export TRIPLE=x86_64-apple-darwin
- '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
- patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
- patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch}
- '';
-
- installPhase = if stdenv.isDarwin
- then ''
- for file in lib/*.dylib; do
- # this should be done in CMake, but having trouble figuring out
- # the magic combination of necessary CMake variables
- # if you fancy a try, take a look at
- # http://www.cmake.org/Wiki/CMake_RPATH_handling
- install_name_tool -id $out/$file $file
- done
- make install
- install -d 755 $out/include
- install -m 644 ../include/*.h $out/include
- ''
- else ''
- install -d -m 755 $out/include $out/lib
- install -m 644 lib/libc++abi.so.1.0 $out/lib
- install -m 644 ../include/cxxabi.h $out/include
- ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
- ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
- '';
-
- meta = {
- homepage = http://libcxxabi.llvm.org/;
- description = "A new implementation of low level support for a standard C++ library";
- license = with stdenv.lib.licenses; [ ncsa mit ];
- maintainers = with stdenv.lib.maintainers; [ vlstill ];
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix
deleted file mode 100644
index d27786464c05..000000000000
--- a/pkgs/development/compilers/llvm/3.8/lldb.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv
-, fetch
-, cmake
-, zlib
-, ncurses
-, swig
-, which
-, libedit
-, llvm
-, clang-unwrapped
-, python
-, version
-}:
-
-stdenv.mkDerivation {
- name = "lldb-${version}";
-
- src = fetch "lldb" "18z8vhfgh4m57hl66i83cp4d4mv3i86z2hjhbp5rvqs7d88li49l";
-
- postUnpack = ''
- # Hack around broken standalone builf as of 3.8
- unpackFile ${llvm.src}
- srcDir="$(ls -d lldb-*.src)"
- mkdir -p "$srcDir/tools/lib/Support"
- cp "$(ls -d llvm-*.src)/lib/Support/regex_impl.h" "$srcDir/tools/lib/Support/"
- '';
-
- buildInputs = [ cmake python which swig ncurses zlib libedit llvm ];
-
- hardeningDisable = [ "format" ];
-
- cmakeFlags = [
- "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
- "-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include"
- "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}"
- "-DCLANG_MAIN_INCLUDE_DIR=${clang-unwrapped}/include"
- "-DPYTHON_VERSION_MAJOR=2"
- "-DPYTHON_VERSION_MINOR=7"
- "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898
- ];
-
- enableParallelBuilding = true;
-
- meta = {
- description = "A next-generation high-performance debugger";
- homepage = http://llvm.org/;
- license = stdenv.lib.licenses.ncsa;
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
deleted file mode 100644
index a73b73137ddc..000000000000
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ /dev/null
@@ -1,115 +0,0 @@
-{ stdenv
-, fetch
-, fetchpatch
-, perl
-, groff
-, cmake
-, python
-, libffi
-, libbfd
-, libxml2
-, ncurses
-, version
-, zlib
-, compiler-rt_src
-, debugVersion ? false
-, enableSharedLibraries ? true
-}:
-
-stdenv.mkDerivation rec {
- name = "llvm-${version}";
-
- src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf";
-
- unpackPhase = ''
- unpackFile $src
- mv llvm-${version}.src llvm
- sourceRoot=$PWD/llvm
- unpackFile ${compiler-rt_src}
- mv compiler-rt-* $sourceRoot/projects/compiler-rt
- '';
-
- buildInputs = [ perl groff cmake libxml2 python libffi ];
-
- propagatedBuildInputs = [ ncurses zlib ];
-
- # Fix a segfault in llc
- # See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html
- patches = [ ./D17533-1.patch ]
- ++ stdenv.lib.optional (!stdenv.isDarwin) ./fix-llvm-config.patch
- ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
- ../TLI-musl.patch
- ../dynamiclibrary-musl.patch
- ];
-
- # hacky fix: New LLVM releases require a newer macOS SDK than
- # 10.9. This is a temporary measure until nixpkgs darwin support is
- # updated.
- postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
- sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
-
- substituteInPlace CMakeLists.txt \
- --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \
- --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' ""
- ''
- + ''
- (
- cd projects/compiler-rt
- patch -p1 < ${
- fetchpatch {
- name = "sigaltstack.patch"; # for glibc-2.26
- url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff;
- sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi";
- }
- }
- )
- '';
-
- # hacky fix: created binaries need to be run before installation
- preBuild = ''
- mkdir -p $out/
- ln -sv $PWD/lib $out
- '';
-
- cmakeFlags = with stdenv; [
- "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
- "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc
- "-DLLVM_BUILD_TESTS=ON"
- "-DLLVM_ENABLE_FFI=ON"
- "-DLLVM_ENABLE_RTTI=ON"
-
- "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
- "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
- "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}"
- ] ++ stdenv.lib.optional enableSharedLibraries [
- "-DLLVM_LINK_LLVM_DYLIB=ON"
- ] ++ stdenv.lib.optional (!isDarwin)
- "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
- ++ stdenv.lib.optionals ( isDarwin) [
- "-DLLVM_ENABLE_LIBCXX=ON"
- "-DCAN_TARGET_i386=false"
- ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
- # Not yet supported
- "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
- "-DCOMPILER_RT_BUILD_XRAY=OFF"
-
- ];
-
- postBuild = ''
- rm -fR $out
- '';
-
- postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
- ln -s $out/lib/libLLVM.dylib $out/lib/libLLVM-${version}.dylib
- '';
-
- enableParallelBuilding = true;
-
- meta = {
- description = "Collection of modular and reusable compiler and toolchain technologies";
- homepage = http://llvm.org/;
- license = stdenv.lib.licenses.ncsa;
- maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ];
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index e2cf437e19e1..3d09277ad4cf 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -3,7 +3,8 @@
let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
self = stdenv.mkDerivation {
- name = "clang-${version}";
+ pname = "clang";
+ inherit version;
src = fetch "cfe" "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76";
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
index bd2cc19d2e0b..9d82aa230357 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }:
-stdenv.mkDerivation rec {
- name = "libc++-${version}";
+stdenv.mkDerivation {
+ pname = "libc++";
+ inherit version;
src = fetch "libcxx" "0qbl3afl2p2h87p977lsqr5kykl6cgjpkzczs0g6a3pn53j1bri5";
diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix
index dffb207a32b6..f799199d449f 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix
@@ -1,7 +1,8 @@
{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
stdenv.mkDerivation {
- name = "libc++abi-${version}";
+ pname = "libc++abi";
+ inherit version;
src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj";
diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix
index 52f27de8cdb5..1a7c9aeead86 100644
--- a/pkgs/development/compilers/llvm/3.9/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.9/lldb.nix
@@ -13,7 +13,8 @@
}:
stdenv.mkDerivation {
- name = "lldb-${version}";
+ pname = "lldb";
+ inherit version;
src = fetch "lldb" "1z30ljmcpp261bjng1i5k3bb9jkrs1cr97z04qs4s3zql6r12cvy";
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index c8d819cc9634..4dde3be277ab 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -27,7 +27,8 @@ let
in
stdenv.mkDerivation {
- name = "llvm-${version}";
+ pname = "llvm";
+ inherit version;
src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z";
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index 2b543b9d793a..0213741e3e06 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
-stdenv.mkDerivation rec {
- name = "libc++-${version}";
+stdenv.mkDerivation {
+ pname = "libc++";
+ inherit version;
src = fetch "libcxx" "0k6cmjcxnp2pyl8xwy1wkyyckkmdrjddim94yf1gzjbjy9qi22jj";
diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix
index 735c5e9e7435..8e36c5ad53a6 100644
--- a/pkgs/development/compilers/llvm/4/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/4/libc++abi.nix
@@ -1,7 +1,8 @@
{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
stdenv.mkDerivation {
- name = "libc++abi-${version}";
+ pname = "libc++abi";
+ inherit version;
src = fetch "libcxxabi" "0cqvzallxh0nwiijsf6i4d5ds9m5ijfzywg7376ncv50i64if24g";
diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix
index cf6de26a9e83..3ab56677d72f 100644
--- a/pkgs/development/compilers/llvm/4/lld.nix
+++ b/pkgs/development/compilers/llvm/4/lld.nix
@@ -6,7 +6,8 @@
}:
stdenv.mkDerivation {
- name = "lld-${version}";
+ pname = "lld";
+ inherit version;
src = fetch "lld" "1v9nkpr158j4yd4zmi6rpnfxkp78r1fapr8wji9s6v176gji1kk3";
diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix
index 325149fc19be..8adf11abddda 100644
--- a/pkgs/development/compilers/llvm/4/lldb.nix
+++ b/pkgs/development/compilers/llvm/4/lldb.nix
@@ -15,7 +15,8 @@
}:
stdenv.mkDerivation {
- name = "lldb-${version}";
+ pname = "lldb";
+ inherit version;
src = fetch "lldb" "0yy43a27zx3r51b6gkv3v2mdiqcq3mf0ngki47ya0i30v3gx4cl4";
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index ea70382d2ac7..7e8559953524 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -23,7 +23,7 @@ let
imap (i: _: concatStringsSep "." (take i parts)) parts;
in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
name = "llvm-${version}";
src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s";
@@ -46,6 +46,14 @@ stdenv.mkDerivation (rec {
propagatedBuildInputs = [ ncurses zlib ];
+ patches = [
+ (fetchpatch {
+ name = "0001-Fix-return-type-in-ORC-readMem-client-interface.patch";
+ url = "https://bugzilla.redhat.com/attachment.cgi?id=1389687";
+ sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch";
+ })
+ ];
+
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
# can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix
index a8a6b3dfea87..a69fe286ecc0 100644
--- a/pkgs/development/compilers/llvm/4/openmp.nix
+++ b/pkgs/development/compilers/llvm/4/openmp.nix
@@ -7,7 +7,8 @@
}:
stdenv.mkDerivation {
- name = "openmp-${version}";
+ pname = "openmp";
+ inherit version;
src = fetch "openmp" "195dykamd39yhi5az7nqj3ksqhb3wq30l93jnfkxl0061qbknsgc";
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix
index 19833e4d3d4a..c87b0f235961 100644
--- a/pkgs/development/compilers/llvm/5/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix
@@ -1,7 +1,7 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
with stdenv.lib;
-stdenv.mkDerivation rec {
- name = "compiler-rt-${version}";
+stdenv.mkDerivation {
+ pname = "compiler-rt";
inherit version;
src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy";
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index b182f1250e72..03d8a2085d0b 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
-stdenv.mkDerivation rec {
- name = "libc++-${version}";
+stdenv.mkDerivation {
+ pname = "libc++";
+ inherit version;
src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf";
diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix
index 227ecbeda194..1b891af09ed1 100644
--- a/pkgs/development/compilers/llvm/5/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/5/libc++abi.nix
@@ -1,7 +1,8 @@
{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
stdenv.mkDerivation {
- name = "libc++abi-${version}";
+ pname = "libc++abi";
+ inherit version;
src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv";
diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix
index bf23f80ef103..bfee91d91bf6 100644
--- a/pkgs/development/compilers/llvm/5/lld.nix
+++ b/pkgs/development/compilers/llvm/5/lld.nix
@@ -6,7 +6,8 @@
}:
stdenv.mkDerivation {
- name = "lld-${version}";
+ pname = "lld";
+ inherit version;
src = fetch "lld" "1ah75rjly6747jk1zbwca3z0svr9b09ylgxd4x9ns721xir6sia6";
diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix
index 5e670d4de159..cce44c7e50f9 100644
--- a/pkgs/development/compilers/llvm/5/lldb.nix
+++ b/pkgs/development/compilers/llvm/5/lldb.nix
@@ -15,7 +15,8 @@
}:
stdenv.mkDerivation {
- name = "lldb-${version}";
+ pname = "lldb";
+ inherit version;
src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq";
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index 23b7bf4e2461..02db395db571 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetch
+, fetchpatch
, cmake
, python
, libffi
@@ -21,7 +22,7 @@ let
imap (i: _: concatStringsSep "." (take i parts)) parts;
in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
name = "llvm-${version}";
src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm";
@@ -42,6 +43,13 @@ stdenv.mkDerivation (rec {
propagatedBuildInputs = [ ncurses zlib ];
+ patches = [
+ (fetchpatch {
+ url = "https://bugzilla.redhat.com/attachment.cgi?id=1389687";
+ name = "llvm-gcc8-type-mismatch.patch";
+ sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch";
+ })
+ ];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace cmake/modules/AddLLVM.cmake \
--replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix
index 901015bf2ff4..559377bcc1b7 100644
--- a/pkgs/development/compilers/llvm/5/openmp.nix
+++ b/pkgs/development/compilers/llvm/5/openmp.nix
@@ -7,7 +7,8 @@
}:
stdenv.mkDerivation {
- name = "openmp-${version}";
+ pname = "openmp";
+ inherit version;
src = fetch "openmp" "0p2n52676wlq6y9q99n5pivq6pvvda1p994r69fxj206ahn59jir";
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix
index be18a315f12a..4cf79e79569c 100644
--- a/pkgs/development/compilers/llvm/6/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix
@@ -1,7 +1,7 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
with stdenv.lib;
-stdenv.mkDerivation rec {
- name = "compiler-rt-${version}";
+stdenv.mkDerivation {
+ pname = "compiler-rt";
inherit version;
src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl";
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index 3a165e9da7b1..658068cbfaff 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
-stdenv.mkDerivation rec {
- name = "libc++-${version}";
+stdenv.mkDerivation {
+ pname = "libc++";
+ inherit version;
src = fetch "libcxx" "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n";
diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix
index df9c784a10f4..ac1f4f653e6a 100644
--- a/pkgs/development/compilers/llvm/6/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/6/libc++abi.nix
@@ -1,7 +1,8 @@
{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
stdenv.mkDerivation {
- name = "libc++abi-${version}";
+ pname = "libc++abi";
+ inherit version;
src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0";
diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix
index 1e68276945ec..58b9b8060fa3 100644
--- a/pkgs/development/compilers/llvm/6/lld.nix
+++ b/pkgs/development/compilers/llvm/6/lld.nix
@@ -7,7 +7,8 @@
}:
stdenv.mkDerivation {
- name = "lld-${version}";
+ pname = "lld";
+ inherit version;
src = fetch "lld" "04afcfq2h7ysyqxxhyhb7ig4p0vdw7mi63kh8mffl74j0rc781p7";
diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix
index 9571e7ab5a63..d3db8082c963 100644
--- a/pkgs/development/compilers/llvm/6/lldb.nix
+++ b/pkgs/development/compilers/llvm/6/lldb.nix
@@ -15,7 +15,8 @@
}:
stdenv.mkDerivation {
- name = "lldb-${version}";
+ pname = "lldb";
+ inherit version;
src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb";
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index e104d051fed7..2586602d7378 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -25,7 +25,7 @@ let
imap (i: _: concatStringsSep "." (take i parts)) parts;
in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
name = "llvm-${version}";
src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn";
diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix
index 908a5f1218f7..447904b9ad5f 100644
--- a/pkgs/development/compilers/llvm/6/openmp.nix
+++ b/pkgs/development/compilers/llvm/6/openmp.nix
@@ -7,7 +7,8 @@
}:
stdenv.mkDerivation {
- name = "openmp-${version}";
+ pname = "openmp";
+ inherit version;
src = fetch "openmp" "0nhwfba9c351r16zgyjyfwdayr98nairky3c2f0b2lc360mwmbv6";
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
index 989529ff8cc8..0912435327ce 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -1,6 +1,6 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
-stdenv.mkDerivation rec {
- name = "compiler-rt-${version}";
+stdenv.mkDerivation {
+ pname = "compiler-rt";
inherit version;
src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5";
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
index 7f99cc9ae2cd..621a246225d7 100644
--- a/pkgs/development/compilers/llvm/7/default.nix
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -111,7 +111,7 @@ let
'' + mkExtraBuildCommands cc;
};
- lldClangNoCompilerRt = wrapCCWith rec {
+ lldClangNoCompilerRt = wrapCCWith {
cc = tools.clang-unwrapped;
bintools = wrapBintoolsWith {
inherit (tools) bintools;
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
index e2ec4e274f4c..7a0716a6eb38 100644
--- a/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
-stdenv.mkDerivation rec {
- name = "libc++-${version}";
+stdenv.mkDerivation {
+ pname = "libc++";
+ inherit version;
src = fetch "libcxx" "0kmhcapm2cjwalyiqasj9dmqbw59mcwdl8fgl951wg7ax84b8hj4";
diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix
index 2fe6f1c58f66..b5e6e0e70480 100644
--- a/pkgs/development/compilers/llvm/7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/7/libc++abi.nix
@@ -1,7 +1,8 @@
{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
stdenv.mkDerivation {
- name = "libc++abi-${version}";
+ pname = "libc++abi";
+ inherit version;
src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2";
diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix
index 63ad43e62cd7..823e9640cf4e 100644
--- a/pkgs/development/compilers/llvm/7/lld.nix
+++ b/pkgs/development/compilers/llvm/7/lld.nix
@@ -7,7 +7,8 @@
}:
stdenv.mkDerivation {
- name = "lld-${version}";
+ pname = "lld";
+ inherit version;
src = fetch "lld" "0rsqb7zcnij5r5ipfhr129j7skr5n9pyr388kjpqwh091952f3x1";
diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix
index 1b2dff2c76cf..44687ead4d1c 100644
--- a/pkgs/development/compilers/llvm/7/lldb.nix
+++ b/pkgs/development/compilers/llvm/7/lldb.nix
@@ -16,7 +16,8 @@
}:
stdenv.mkDerivation {
- name = "lldb-${version}";
+ pname = "lldb";
+ inherit version;
src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v";
diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
index a9caa88141a6..cfcda02b4131 100644
--- a/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -29,7 +29,7 @@ let
let parts = splitString "." release_version; in
imap (i: _: concatStringsSep "." (take i parts)) parts;
-in stdenv.mkDerivation (rec {
+in stdenv.mkDerivation ({
name = "llvm-${version}";
src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v";
diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix
index e55f4aa5ba13..7adc2aa588e3 100644
--- a/pkgs/development/compilers/llvm/7/openmp.nix
+++ b/pkgs/development/compilers/llvm/7/openmp.nix
@@ -7,7 +7,8 @@
}:
stdenv.mkDerivation {
- name = "openmp-${version}";
+ pname = "openmp";
+ inherit version;
src = fetch "openmp" "1dg53wzsci2kra8lh1y0chh60h2l8h1by93br5spzvzlxshkmrqy";
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix
index 5959b99316d9..936c877d58c9 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix
@@ -1,6 +1,6 @@
{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
-stdenv.mkDerivation rec {
- name = "compiler-rt-${version}";
+stdenv.mkDerivation {
+ pname = "compiler-rt";
inherit version;
src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi";
diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix
index f864e24acfef..36d7a14142b4 100644
--- a/pkgs/development/compilers/llvm/8/default.nix
+++ b/pkgs/development/compilers/llvm/8/default.nix
@@ -145,7 +145,7 @@ let
'' + mkExtraBuildCommands cc;
};
- lldClangNoCompilerRt = wrapCCWith rec {
+ lldClangNoCompilerRt = wrapCCWith {
cc = tools.clang-unwrapped;
libcxx = null;
bintools = wrapBintoolsWith {
diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix
index f8a07de07222..8ec1c419748d 100644
--- a/pkgs/development/compilers/llvm/8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/8/libc++/default.nix
@@ -1,8 +1,9 @@
{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version
, enableShared ? true }:
-stdenv.mkDerivation rec {
- name = "libc++-${version}";
+stdenv.mkDerivation {
+ pname = "libc++";
+ inherit version;
src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz";
diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix
index 1ee6d069f4b5..58a1241d8236 100644
--- a/pkgs/development/compilers/llvm/8/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/8/libc++abi.nix
@@ -2,7 +2,8 @@
, enableShared ? true }:
stdenv.mkDerivation {
- name = "libc++abi-${version}";
+ pname = "libc++abi";
+ inherit version;
src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp";
diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix
index 75edd1fff54d..646cd3c3ca4a 100644
--- a/pkgs/development/compilers/llvm/8/libunwind.nix
+++ b/pkgs/development/compilers/llvm/8/libunwind.nix
@@ -1,7 +1,8 @@
{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }:
stdenv.mkDerivation {
- name = "libunwind-${version}";
+ pname = "libunwind";
+ inherit version;
src = fetch "libunwind" "0vhgcgzsb33l83qaikrkj87ypqb48mi607rccczccwiiv8ficw0q";
diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix
index aec1b14b9943..fc52d691d030 100644
--- a/pkgs/development/compilers/llvm/8/lld.nix
+++ b/pkgs/development/compilers/llvm/8/lld.nix
@@ -7,7 +7,8 @@
}:
stdenv.mkDerivation {
- name = "lld-${version}";
+ pname = "lld";
+ inherit version;
src = fetch "lld" "121xhxrlvwy3k5nf6p1wv31whxlb635ssfkci8z93mwv4ja1xflz";
diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix
index f31da000bb82..254933c82a09 100644
--- a/pkgs/development/compilers/llvm/8/lldb.nix
+++ b/pkgs/development/compilers/llvm/8/lldb.nix
@@ -15,7 +15,8 @@
}:
stdenv.mkDerivation {
- name = "lldb-${version}";
+ pname = "lldb";
+ inherit version;
src = fetch "lldb" "1mriw4adrwm6kzabrjr7yqmdiylxd6glf6samd80dp8idnm9p9z8";
diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix
index 6799a3f935f5..70e666ba27de 100644
--- a/pkgs/development/compilers/llvm/8/llvm.nix
+++ b/pkgs/development/compilers/llvm/8/llvm.nix
@@ -27,7 +27,7 @@ let
shortVersion = with stdenv.lib;
concatStringsSep "." (take 1 (splitString "." release_version));
-in stdenv.mkDerivation (rec {
+in stdenv.mkDerivation ({
name = "llvm-${version}";
src = fetch "llvm" "1rvm5gqp5v8hfn17kqws3zhk94w4kxndal12bqa0y57p09nply24";
diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix
index 8cf551735619..166e7f68eb3b 100644
--- a/pkgs/development/compilers/llvm/8/openmp.nix
+++ b/pkgs/development/compilers/llvm/8/openmp.nix
@@ -7,7 +7,8 @@
}:
stdenv.mkDerivation {
- name = "openmp-${version}";
+ pname = "openmp";
+ inherit version;
src = fetch "openmp" "0b3jlxhqbpyd1nqkpxjfggm5d9va5qpyf7d4i5y7n4a1mlydv19y";
diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index efbf8561b7ff..6e0716659c79 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -2,8 +2,8 @@
let
rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4";
-in stdenv.mkDerivation rec {
- name = "manticore-${version}";
+in stdenv.mkDerivation {
+ pname = "manticore";
version = "2018.09.29";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix
index 9ce7c9166bca..d71511479339 100644
--- a/pkgs/development/compilers/mcpp/default.nix
+++ b/pkgs/development/compilers/mcpp/default.nix
@@ -1,10 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "mcpp-2.7.2";
+ pname = "mcpp";
+ version = "2.7.2";
src = fetchurl {
- url = "mirror://sourceforge/mcpp/${name}.tar.gz";
+ url = "mirror://sourceforge/mcpp/mcpp-${version}.tar.gz";
sha256 = "0r48rfghjm90pkdyr4khxg783g9v98rdx2n69xn8f6c5i0hl96rv";
};
diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix
index b7fc3e4dd772..0327e0dc2155 100644
--- a/pkgs/development/compilers/mercury/default.nix
+++ b/pkgs/development/compilers/mercury/default.nix
@@ -2,7 +2,7 @@
, readline }:
stdenv.mkDerivation rec {
- name = "mercury-${version}";
+ pname = "mercury";
version = "14.01.1";
src = fetchurl {
diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix
index f15a76243277..a18202b9f884 100644
--- a/pkgs/development/compilers/microscheme/default.nix
+++ b/pkgs/development/compilers/microscheme/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchzip, vim, makeWrapper }:
stdenv.mkDerivation rec {
- name = "microscheme-${version}";
+ pname = "microscheme";
version = "0.9.3";
src = fetchzip {
- name = "${name}-src";
+ name = "${pname}-${version}-src";
url = "https://github.com/ryansuchocki/microscheme/archive/v${version}.tar.gz";
sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976";
};
diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix
index 72626ec0014b..405846343cf1 100644
--- a/pkgs/development/compilers/mkcl/default.nix
+++ b/pkgs/development/compilers/mkcl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }:
with stdenv.lib; stdenv.mkDerivation rec {
- name = "mkcl-${version}";
+ pname = "mkcl";
version = "1.1.11";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix
index f495be8a93e4..207ed8f29bc7 100644
--- a/pkgs/development/compilers/mlton/20130715.nix
+++ b/pkgs/development/compilers/mlton/20130715.nix
@@ -9,32 +9,33 @@ let
in
stdenv.mkDerivation rec {
- name = "mlton-${version}";
+ pname = "mlton";
+ inherit version;
binSrc =
if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
- url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz";
+ url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.x86-linux.tgz";
sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j";
})
else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
- url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz";
+ url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-linux.tgz";
sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn";
})
else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl {
- url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz";
+ url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-darwin.gmp-macports.tgz";
sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9";
})
else throw "Architecture not supported";
codeSrc =
fetchurl {
- url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz";
+ url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}.src.tgz";
sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11";
};
srcs = [ binSrc codeSrc ];
- sourceRoot = name;
+ sourceRoot = "${pname}-${version}";
buildInputs = [ gmp ];
nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/pkgs/development/compilers/mlton/20180207-binary.nix
index 0589733cb3c6..2b4998f91c91 100644
--- a/pkgs/development/compilers/mlton/20180207-binary.nix
+++ b/pkgs/development/compilers/mlton/20180207-binary.nix
@@ -3,15 +3,15 @@ let
dynamic-linker = stdenv.cc.bintools.dynamicLinker;
in
stdenv.mkDerivation rec {
- name = "mlton-${version}";
+ pname = "mlton";
version = "20180207";
src = if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
- url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-linux.tgz";
+ url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux.tgz";
sha256 = "0f4q575yfm5dpg4a2wsnqn4l2zrar96p6rlsk0dw10ggyfwvsjlf";
})
else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl {
- url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-darwin.gmp-static.tgz";
+ url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin.gmp-static.tgz";
sha256 = "1cw7yhw48qp12q0adwf8srpjzrgkp84kmlkqw3pz8vkxz4p9hbdv";
})
else
diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix
index 3a3538a7ea42..2585b599caf3 100644
--- a/pkgs/development/compilers/mlton/from-git-source.nix
+++ b/pkgs/development/compilers/mlton/from-git-source.nix
@@ -9,7 +9,8 @@
}:
stdenv.mkDerivation {
- name = "mlton-${version}";
+ pname = "mlton";
+ inherit version;
src = fetchgit {
inherit url rev sha256;
diff --git a/pkgs/development/compilers/mono/4.nix b/pkgs/development/compilers/mono/4.nix
index 3c748e2dff7d..cb6edb2a546d 100644
--- a/pkgs/development/compilers/mono/4.nix
+++ b/pkgs/development/compilers/mono/4.nix
@@ -1,6 +1,6 @@
{ callPackage, Foundation, libobjc }:
-callPackage ./generic.nix (rec {
+callPackage ./generic.nix ({
inherit Foundation libobjc;
version = "4.8.1.0";
sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
diff --git a/pkgs/development/compilers/mono/5.nix b/pkgs/development/compilers/mono/5.nix
index 0db13308a5af..0ecb362acb4d 100644
--- a/pkgs/development/compilers/mono/5.nix
+++ b/pkgs/development/compilers/mono/5.nix
@@ -1,6 +1,6 @@
{ callPackage, Foundation, libobjc }:
-callPackage ./generic.nix (rec {
+callPackage ./generic.nix ({
inherit Foundation libobjc;
version = "5.20.1.27";
sha256 = "15rpwxw642ad1na93k5nj7d2lb24f21kncr924gxr00178a9x0jy";
diff --git a/pkgs/development/compilers/mono/6.nix b/pkgs/development/compilers/mono/6.nix
index ec91d7e979c1..0157fa7b7f68 100644
--- a/pkgs/development/compilers/mono/6.nix
+++ b/pkgs/development/compilers/mono/6.nix
@@ -1,6 +1,6 @@
{ callPackage, Foundation, libobjc }:
-callPackage ./generic.nix (rec {
+callPackage ./generic.nix ({
inherit Foundation libobjc;
version = "6.0.0.313";
srcArchiveSuffix = "tar.xz";
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index 6b5c15642a5c..9a2f01b9f3d5 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -7,10 +7,12 @@ let
llvm = callPackage ./llvm.nix { };
in
stdenv.mkDerivation rec {
- name = "mono-${version}";
+ pname = "mono";
+ inherit version;
+
src = fetchurl {
inherit sha256;
- url = "https://download.mono-project.com/sources/mono/${name}.${srcArchiveSuffix}";
+ url = "https://download.mono-project.com/sources/mono/${pname}-${version}.${srcArchiveSuffix}";
};
buildInputs =
diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix
index 616ec420d2d0..36a457125fad 100644
--- a/pkgs/development/compilers/mono/llvm.nix
+++ b/pkgs/development/compilers/mono/llvm.nix
@@ -13,8 +13,8 @@
, zlib
}:
-stdenv.mkDerivation rec {
- name = "llvm-${version}";
+stdenv.mkDerivation {
+ pname = "llvm";
version = "3.6-mono-2017-02-15";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix
index b22072651a46..19324593a30c 100644
--- a/pkgs/development/compilers/mosml/default.nix
+++ b/pkgs/development/compilers/mosml/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, gmp, perl }:
stdenv.mkDerivation rec {
- name = "mosml-${version}";
+ pname = "mosml";
version = "2.10.1";
buildInputs = [ gmp perl ];
diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix
index ef6cd1160b33..8eb35f1b5f7a 100644
--- a/pkgs/development/compilers/mozart/binary.nix
+++ b/pkgs/development/compilers/mozart/binary.nix
@@ -8,7 +8,7 @@ let
version = "2.0.0";
binaries = {
- "x86_64-linux" = fetchurl {
+ x86_64-linux = fetchurl {
url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z";
};
@@ -16,11 +16,12 @@ let
in
stdenv.mkDerivation {
- name = "mozart-binary-${version}";
+ pname = "mozart-binary";
+ inherit version;
preferLocalBuild = true;
- src = binaries."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+ src = binaries.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.cc
diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index bfb3c154a3c7..f5645ae02192 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
stdenv.mkDerivation rec {
- name = "nasm-${version}";
+ pname = "nasm";
version = "2.14.02";
src = fetchFromRepoOrCz {
repo = "nasm";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa";
};
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
make golden && make test
'';
+ NIX_CFLAGS_COMPILE="-Wno-error=attributes";
+
meta = with stdenv.lib; {
homepage = https://www.nasm.us/;
description = "An 80x86 and x86-64 assembler designed for portability and modularity";
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index e2aa5736c7a3..74ccaac388f2 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "neko-${version}";
+ pname = "neko";
version = "2.2.0";
src = fetchurl {
diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index c1e01ef77828..357f26cf3141 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -1,10 +1,12 @@
{ stdenv, fetchFromGitHub, cmake
, boost, python3, eigen
, icestorm, trellis
+, llvmPackages
, enableGui ? true
, wrapQtAppsHook
, qtbase
+, OpenGL ? null
}:
let
@@ -12,13 +14,13 @@ let
in
with stdenv; mkDerivation rec {
pname = "nextpnr";
- version = "2019.08.21";
+ version = "2019.08.31";
src = fetchFromGitHub {
owner = "yosyshq";
repo = "nextpnr";
- rev = "c192ba261d77ad7f0a744fb90b01e4a5b63938c4";
- sha256 = "0g2ar1z89b31qw5vgqj2rrcv9rzncs94184dgcsrz19p866654mf";
+ rev = "c0b7379e8672b6263152d5e340e62f22179fdc8b";
+ sha256 = "174n962xiwyzy53cn192h9rq95h951k3xy6bs43p5ya592ai5mjh";
};
nativeBuildInputs
@@ -26,7 +28,8 @@ with stdenv; mkDerivation rec {
++ (lib.optional enableGui wrapQtAppsHook);
buildInputs
= [ boostPython python3 eigen ]
- ++ (lib.optional enableGui qtbase);
+ ++ (lib.optional enableGui qtbase)
+ ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp);
enableParallelBuilding = true;
cmakeFlags =
@@ -39,7 +42,10 @@ with stdenv; mkDerivation rec {
"-DSERIALIZE_CHIPDB=OFF"
# use PyPy for icestorm if enabled
"-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}"
- ] ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF");
+ ]
+ ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF")
+ ++ (lib.optional (enableGui && stdenv.isDarwin)
+ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks");
# Fix the version number. This is a bit stupid (and fragile) in practice
# but works ok. We should probably make this overrideable upstream.
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
index 6bd4af05da36..fa49bf9dd732 100644
--- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
date = "April2012";
- name = "nvidia-cg-toolkit-${version}";
+ pname = "nvidia-cg-toolkit";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix
index 0d171a474a20..8fd6f33740e4 100644
--- a/pkgs/development/compilers/obliv-c/default.nix
+++ b/pkgs/development/compilers/obliv-c/default.nix
@@ -1,6 +1,6 @@
{ stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
stdenv.mkDerivation rec {
- name = "obliv-c-${version}";
+ pname = "obliv-c";
version = "0.0pre20180624";
buildInputs = [ perl ]
++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]);
diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix
index 4337de702e16..cd621c131ffa 100644
--- a/pkgs/development/compilers/ocaml/3.08.0.nix
+++ b/pkgs/development/compilers/ocaml/3.08.0.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, xlibsWrapper }:
stdenv.mkDerivation rec {
- name = "ocaml-${version}";
+ pname = "ocaml";
version = "3.08.0";
builder = ./builder.sh;
src = fetchurl {
- url = "http://tarballs.nixos.org/${name}.tar.gz";
+ url = "http://tarballs.nixos.org/${pname}-${version}.tar.gz";
sha256 = "135g5waj7djzrj0dbc8z1llasfs2iv5asq41jifhldxb4l2b97mx";
};
configureScript = ./configure-3.08.0;
diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix
index 99a65dec1501..556aefd37049 100644
--- a/pkgs/development/compilers/ocaml/3.10.0.nix
+++ b/pkgs/development/compilers/ocaml/3.10.0.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation (rec {
- name = "ocaml-${version}";
+ pname = "ocaml";
version = "3.10.0";
src = fetchurl {
- url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2";
+ url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${pname}-${version}.tar.bz2";
sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d";
};
diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix
index e65510c172e6..4be414905348 100644
--- a/pkgs/development/compilers/ocaml/3.11.2.nix
+++ b/pkgs/development/compilers/ocaml/3.11.2.nix
@@ -8,11 +8,11 @@ in
stdenv.mkDerivation rec {
- name = "ocaml-${version}";
+ pname = "ocaml";
version = "3.11.2";
src = fetchurl {
- url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2";
+ url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${pname}-${version}.tar.bz2";
sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143";
};
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix
index 8636f670059c..edb3acdbdb1a 100644
--- a/pkgs/development/compilers/ocaml/3.12.1.nix
+++ b/pkgs/development/compilers/ocaml/3.12.1.nix
@@ -8,11 +8,11 @@ in
stdenv.mkDerivation rec {
- name = "ocaml-${version}";
+ pname = "ocaml";
version = "3.12.1";
src = fetchurl {
- url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2";
+ url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${pname}-${version}.tar.bz2";
sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd";
};
diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix
index 0a30ef1352c4..2669e8224bff 100644
--- a/pkgs/development/compilers/ocaml/4.00.1.nix
+++ b/pkgs/development/compilers/ocaml/4.00.1.nix
@@ -7,11 +7,11 @@ let
in
stdenv.mkDerivation rec {
- name = "ocaml-${version}";
+ pname = "ocaml";
version = "4.00.1";
src = fetchurl {
- url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2";
+ url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${pname}-${version}.tar.bz2";
sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951";
};
diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix
index aa6cf68d2c96..6362f360f7da 100644
--- a/pkgs/development/compilers/ocaml/4.01.0.nix
+++ b/pkgs/development/compilers/ocaml/4.01.0.nix
@@ -1,4 +1,4 @@
-import ./generic.nix rec {
+import ./generic.nix {
major_version = "4";
minor_version = "01";
patch_version = "0";
diff --git a/pkgs/development/compilers/ocaml/4.02.nix b/pkgs/development/compilers/ocaml/4.02.nix
index 9ac53f567909..4773f9f74a5a 100644
--- a/pkgs/development/compilers/ocaml/4.02.nix
+++ b/pkgs/development/compilers/ocaml/4.02.nix
@@ -1,4 +1,4 @@
-import ./generic.nix rec {
+import ./generic.nix {
major_version = "4";
minor_version = "02";
patch_version = "3";
diff --git a/pkgs/development/compilers/ocaml/4.03.nix b/pkgs/development/compilers/ocaml/4.03.nix
index c9536c487d05..0bbe82330419 100644
--- a/pkgs/development/compilers/ocaml/4.03.nix
+++ b/pkgs/development/compilers/ocaml/4.03.nix
@@ -1,4 +1,4 @@
-import ./generic.nix rec {
+import ./generic.nix {
major_version = "4";
minor_version = "03";
patch_version = "0";
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix
index a933151de12a..fb507b9836ad 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix
@@ -14,7 +14,7 @@ let
in
stdenv.mkDerivation rec {
- name = "ber-metaocaml-${version}";
+ pname = "ber-metaocaml";
version = metaocamlPatch;
src = fetchurl {
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
postConfigure = ''
tar -xvzf $metaocaml
- cd ${name}
+ cd ${pname}-${version}
make patch
cd ..
'';
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
make installopt
mkdir -p $out/include
ln -sv $out/lib/ocaml/caml $out/include/caml
- cd ${name}
+ cd ${pname}-${version}
make all
'';
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
'';
checkPhase = ''
- cd ${name}
+ cd ${pname}-${version}
make test
make test-compile
make test-native
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 0085739147bf..9557d0a79aeb 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -30,7 +30,7 @@ let
x11inc = x11env + "/include";
in
-stdenv.mkDerivation (args // rec {
+stdenv.mkDerivation (args // {
inherit name;
inherit version;
diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
index e9adbeff4904..aa50cf225cac 100644
--- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
+++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, xlibsWrapper, ncurses }:
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
- name = "metaocaml-${version}";
+ pname = "metaocaml";
version = "3.09-alpha-30";
src = fetchurl {
diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix
index 06ed7c51e9ab..da1df6f30bbd 100644
--- a/pkgs/development/compilers/opa/default.nix
+++ b/pkgs/development/compilers/opa/default.nix
@@ -7,7 +7,6 @@
stdenv.mkDerivation rec {
pname = "opa";
version = "4310";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "MLstate";
diff --git a/pkgs/development/compilers/openjdk/005_enable-infinality.patch b/pkgs/development/compilers/openjdk/005_enable-infinality.patch
index f8de96989967..cc34e548758e 100644
--- a/pkgs/development/compilers/openjdk/005_enable-infinality.patch
+++ b/pkgs/development/compilers/openjdk/005_enable-infinality.patch
@@ -6,7 +6,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
@@ -23,6 +23,9 @@
* questions.
*/
-
+
+/* Use Infinality patches as default */
+#define INFINALITY
+
@@ -21,13 +21,13 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
+#include FT_LCD_FILTER_H
+#include
+#endif
-
+
#include "fontscaler.h"
-
+
@@ -676,6 +683,147 @@ static void CopyFTSubpixelVToSubpixel(co
}
}
-
+
+#ifdef INFINALITY
+typedef struct {
+ FT_Render_Mode ftRenderMode;
@@ -169,7 +169,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
+ rp->ftLcdFilter = ftLcdFilter;
+}
+#endif
-
+
/*
* Class: sun_font_FreetypeFontScaler
@@ -691,7 +839,9 @@ Java_sun_font_FreetypeFontScaler_getGlyp
@@ -180,28 +180,27 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
int renderFlags = FT_LOAD_RENDER, target;
+#endif
FT_GlyphSlot ftglyph;
-
+
FTScalerContext* context =
-@@ -709,6 +859,11 @@ Java_sun_font_FreetypeFontScaler_getGlyp
+@@ -709,5 +859,10 @@ Java_sun_font_FreetypeFontScaler_getGlyp
return ptr_to_jlong(getNullGlyphImage());
}
-
+
+#ifdef INFINALITY
+ RenderingProperties renderingProperties;
+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
+ context->ptsz, context->aaType, &renderingProperties);
+#else
- /* if algorithmic styling is required then we do not request bitmap */
- if (context->doBold || context->doItalize) {
- renderFlags = FT_LOAD_DEFAULT;
+ if (!context->useSbits) {
+ renderFlags |= FT_LOAD_NO_BITMAP;
@@ -731,10 +886,17 @@ Java_sun_font_FreetypeFontScaler_getGlyp
target = FT_LOAD_TARGET_LCD_V;
}
renderFlags |= target;
+#endif
-
+
glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
-
+
+#ifdef INFINALITY
+ FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter);
+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
@@ -213,7 +212,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
//do not destroy scaler yet.
//this can be problem of particular context (e.g. with bad transform)
@@ -753,9 +915,13 @@ Java_sun_font_FreetypeFontScaler_getGlyp
-
+
/* generate bitmap if it is not done yet
e.g. if algorithmic styling is performed and style was added to outline */
+#ifdef INFINALITY
@@ -223,7 +222,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target));
}
+#endif
-
+
width = (UInt16) ftglyph->bitmap.width;
height = (UInt16) ftglyph->bitmap.rows;
@@ -969,7 +1135,9 @@ Java_sun_font_FreetypeFontScaler_getGlyp
@@ -239,7 +238,7 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
@@ -984,11 +1152,22 @@ static FT_Outline* getFTOutline(JNIEnv*
return NULL;
}
-
+
+#ifdef INFINALITY
+ RenderingProperties renderingProperties;
+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
@@ -247,9 +246,9 @@ diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native
+#else
renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
+#endif
-
+
glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
-
+
+#ifdef INFINALITY
+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
+#else
diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 7ccbfb6351d5..57911f2d58e6 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -1,42 +1,33 @@
-{ stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype
-, alsaLib, bootjdk, perl, fontconfig, zlib, lndir
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
-, libjpeg, giflib
+{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
+, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
+, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
+, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap
, setJavaClassPath
-, minimal ? false
-, enableJavaFX ? true, openjfx
+, headless ? false
+, enableJavaFX ? openjfx.meta.available, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
}:
let
-
- /**
- * The JDK libraries are in directories that depend on the CPU.
- */
- architecture =
- if stdenv.hostPlatform.system == "i686-linux" then
- "i386"
- else "amd64";
-
major = "11";
- update = ".0.3";
+ update = ".0.4";
build = "ga";
- repover = "jdk-${major}${update}-${build}";
- openjdk = stdenv.mkDerivation {
- name = "openjdk-${major}${update}-${build}";
+ openjdk = stdenv.mkDerivation rec {
+ pname = "openjdk" + lib.optionalString headless "-headless";
+ version = "${major}${update}-${build}";
src = fetchurl {
- url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz";
+ url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
sha256 = "1v6pam38iidlhz46046h17hf5kki6n3kl302awjcyxzk7bmkvb8x";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig autoconf ];
buildInputs = [
- autoconf cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
- libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
- libXi libXinerama libXcursor libXrandr lndir fontconfig
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+ libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
+ libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap
+ ] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
];
@@ -45,66 +36,60 @@ let
./read-truststore-from-env-jdk10.patch
./currency-date-range-jdk10.patch
./increase-javadoc-heap.patch
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ ] ++ lib.optionals (!headless && enableGnome2) [
./swing-use-gtk-jdk10.patch
];
preConfigure = ''
chmod +x configure
substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
-
- configureFlagsArray=(
- "--with-boot-jdk=${bootjdk.home}"
- "--with-update-version=${major}${update}"
- "--with-build-number=${build}"
- "--with-milestone=fcs"
- "--enable-unlimited-crypto"
- "--disable-debug-symbols"
- "--with-zlib=system"
- "--with-giflib=system"
- "--with-stdc++lib=dynamic"
-
- # glibc 2.24 deprecated readdir_r so we need this
- # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
- "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result"
- ''
- + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\""
- + lib.optionalString minimal " \"--enable-headless-only\""
- + lib.optionalString (!minimal && enableJavaFX) " \"--with-import-modules=${openjfx}\""
- + ");"
- # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
- # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
- + stdenv.lib.optionalString stdenv.cc.isGNU ''
- NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error"
'';
- NIX_LDFLAGS= lib.optionals (!minimal) [
+ configureFlags = [
+ "--with-boot-jdk=${openjdk11-bootstrap.home}"
+ "--enable-unlimited-crypto"
+ "--with-native-debug-symbols=internal"
+ "--with-libjpeg=system"
+ "--with-giflib=system"
+ "--with-libpng=system"
+ "--with-zlib=system"
+ "--with-lcms=system"
+ "--with-stdc++lib=dynamic"
+ ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
+ ++ lib.optional headless "--enable-headless-only"
+ ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+
+ separateDebugInfo = true;
+
+ NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
+
+ NIX_LDFLAGS = lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ ] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
];
buildFlags = [ "all" ];
installPhase = ''
- mkdir -p $out/lib/openjdk $out/share
+ mkdir -p $out/lib
- cp -av build/*/images/jdk/* $out/lib/openjdk
+ mv build/*/images/jdk $out/lib/openjdk
# Remove some broken manpages.
rm -rf $out/lib/openjdk/man/ja*
# Mirror some stuff in top-level.
- mkdir $out/include $out/share/man
- ln -s $out/lib/openjdk/include/* $out/include/
- ln -s $out/lib/openjdk/man/* $out/share/man/
+ mkdir -p $out/share
+ ln -s $out/lib/openjdk/include $out/include
+ ln -s $out/lib/openjdk/man $out/share/man
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/
# Remove crap from the installation.
rm -rf $out/lib/openjdk/demo
- ${lib.optionalString minimal ''
+ ${lib.optionalString headless ''
rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
''}
@@ -129,11 +114,12 @@ let
# Build the set of output library directories to rpath against
LIBDIRS=""
for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
done
-
# Add the local library paths to remove dependencies on the bootstrap
for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
OUTPUTDIR=$(eval echo \$$output)
BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
echo "$BINLIBS" | while read i; do
@@ -141,26 +127,20 @@ let
patchelf --shrink-rpath "$i" || true
done
done
-
- # Test to make sure that we don't depend on the bootstrap
- for output in $outputs; do
- if grep -q -r '${bootjdk}' $(eval echo \$$output); then
- echo "Extraneous references to ${bootjdk} detected"
- exit 1
- fi
- done
'';
+ disallowedReferences = [ openjdk11-bootstrap ];
+
meta = with stdenv.lib; {
homepage = http://openjdk.java.net/;
license = licenses.gpl2;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
- platforms = ["i686-linux" "x86_64-linux"];
+ platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
};
passthru = {
- inherit architecture;
+ architecture = "";
home = "${openjdk}/lib/openjdk";
};
};
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 952c5d1bf6ae..1d356945a4f1 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -1,9 +1,10 @@
-{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
-, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir
+{ stdenv, lib, fetchurl, pkgconfig, lndir, bash, cpio, file, which, unzip, zip
+, cups, freetype, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
, libjpeg, giflib
+, openjdk8-bootstrap
, setJavaClassPath
-, minimal ? false
+, headless ? false
, enableInfinality ? true # font rendering patch
, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
}:
@@ -13,69 +14,88 @@ let
/**
* The JRE libraries are in directories that depend on the CPU.
*/
- architecture =
- if stdenv.hostPlatform.system == "i686-linux" then
- "i386"
- else if stdenv.hostPlatform.system == "x86_64-linux" then
- "amd64"
- else
- throw "openjdk requires i686-linux or x86_64 linux";
+ architecture = {
+ i686-linux = "i386";
+ x86_64-linux = "amd64";
+ aarch64-linux = "aarch64";
+ }.${stdenv.system} or (throw "Unsupported platform");
+
+ update = "222";
+ build = if stdenv.isAarch64 then "b10"
+ else "ga";
+ baseurl = if stdenv.isAarch64 then "https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah"
+ else "https://hg.openjdk.java.net/jdk8u/jdk8u";
+ repover = lib.optionalString stdenv.isAarch64 "aarch64-shenandoah-"
+ + "jdk8u${update}-${build}";
- update = "212";
- build = "ga";
- baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
- repover = "jdk8u${update}-${build}";
jdk8 = fetchurl {
+ name = "jdk8-${repover}.tar.gz";
url = "${baseurl}/archive/${repover}.tar.gz";
- sha256 = "00rl33h4cl4b4p3hcid765h38x2jdkb14ylh8k1zhnd0ka76crgg";
+ sha256 = if stdenv.isAarch64 then "1h19zpmc76f8v4s0mfvqxmxvv8imdwq92z5dmgi19y4xnl978qq8"
+ else "19dyqayn8n2y08p08g34xxnf0dkm6bfjxkp7633m7dx50mjcpxnj";
};
langtools = fetchurl {
+ name = "langtools-${repover}.tar.gz";
url = "${baseurl}/langtools/archive/${repover}.tar.gz";
- sha256 = "0va6g2dccf1ph6mpwxswbks5axp7zz258cl89qq9r8jn4ni04agw";
+ sha256 = if stdenv.isAarch64 then "09phy2izw2yyp3hnw7jmb7lp559dgnp2a0rymx1k3q97anfz3bzj"
+ else "11nibmqnf7nap10sydk57gimgwpxqk5mn12dyg6fzg4s2fxf0y1q";
};
hotspot = fetchurl {
+ name = "hotspot-${repover}.tar.gz";
url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
- sha256 = "0sgr9df10hs49pjld6c6kr374v4zwd9s52pc3drz68zrlk71ja4s";
+ sha256 = if stdenv.isAarch64 then "1dqrzg2af94pjam6jg9nq8ydaibn4bsjv7ai6m7m3r2ph2fml80s"
+ else "1g512xrrxvnrk5szg7wqqz00x4gv53dx3yffk5im2zfcalyka2q7";
};
corba = fetchurl {
+ name = "corba-${repover}.tar.gz";
url = "${baseurl}/corba/archive/${repover}.tar.gz";
- sha256 = "1hq0sr4k4k4iv815kg72i9lvd7n7mn5pmw96ckk9p1rnyagn9z03";
+ sha256 = if stdenv.isAarch64 then "15l1ccvk2slx8wf5gilzjvhc428hl57gg1knbma1jqgs3ymnqwpr"
+ else "0h8nprfzpy21mfl39fxxzfa420skwmaaji4r31j7lj3g8c1wp62r";
};
jdk = fetchurl {
+ name = "jdk-${repover}.tar.gz";
url = "${baseurl}/jdk/archive/${repover}.tar.gz";
- sha256 = "1fc59jrbfq8l067mggzy5dnrvni7lwaqd7hahs4nqv87kyrfg545";
+ sha256 = if stdenv.isAarch64 then "179ij3rs1ahl6dh3n64k4xp2prv413ckqk7sj1g5lw48rj7bjh83"
+ else "1sb38h0rckgkr2y0kfzav6mb74nv5whb9l8m842mv1jpavxrdv6k";
};
jaxws = fetchurl {
+ name = "jaxws-${repover}.tar.gz";
url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
- sha256 = "1ka2fvyxdmpfhk814s314gx53yvdr19vpsqygx283v9nbq90l1yg";
+ sha256 = if stdenv.isAarch64 then "16bayw7c4vzm9s0ixhw2dv6pan6wywyiddh9a8dss35660dnhrm0"
+ else "0akn5zapff5m32ibgm3f4lhgq96bsqx74g4xl38xmivvxddsd6kz";
};
jaxp = fetchurl {
+ name = "jaxp-${repover}.tar.gz";
url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
- sha256 = "15vlgs5v2ax8sqwh7bg50fnlrwlpnkp0myzrvpqs1mcza8pyasp8";
+ sha256 = if stdenv.isAarch64 then "176db7pi2irc7q87c273cjm5nrlj5g973fjmh24m6a1jxanrrm9x"
+ else "0bw4q8yhmrl8hqlimy1ijnarav4r91dj73lpr7axba77rqlr41c8";
};
nashorn = fetchurl {
+ name = "nashorn-${repover}.tar.gz";
url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
- sha256 = "1jzn0yi0v6lda5y8ib07g1p6zymnbcx9yy6iz8niggpm7205y93h";
+ sha256 = if stdenv.isAarch64 then "0vi3kbsqfpdjxc08ayxk2c87zycd7z0qbqw9xka1vc59iyv97n62"
+ else "0bfcf3iv2lr0xlp6sclxq7zz7b9ahajl008hz5rasjnrnr993qja";
};
openjdk8 = stdenv.mkDerivation {
- name = "openjdk-8u${update}-${build}";
+ pname = "openjdk" + lib.optionalString headless "-headless";
+ version = "8u${update}-${build}";
srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ];
sourceRoot = ".";
outputs = [ "out" "jre" ];
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig lndir ];
buildInputs = [
- cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
+ cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
- libXi libXinerama libXcursor libXrandr lndir fontconfig
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ libXi libXinerama libXcursor libXrandr fontconfig
+ ] ++ lib.optionals (!headless && enableGnome2) [
gtk2 gnome_vfs GConf glib
];
- #move the seven other source dirs under the main jdk8u directory,
- #with version suffixes removed, as the remainder of the build will expect
+ # move the seven other source dirs under the main jdk8u directory,
+ # with version suffixes removed, as the remainder of the build will expect
prePatch = ''
mainDir=$(find . -maxdepth 1 -name jdk8u\*);
find . -maxdepth 1 -name \*jdk\* -not -name jdk8u\* | awk -F- '{print $1}' | while read p; do
@@ -88,10 +108,10 @@ let
./fix-java-home-jdk8.patch
./read-truststore-from-env-jdk8.patch
./currency-date-range-jdk8.patch
- ] ++ lib.optionals (!minimal && enableInfinality) [
+ ] ++ lib.optionals (!headless && enableInfinality) [
./004_add-fontconfig.patch
./005_enable-infinality.patch
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ ] ++ lib.optionals (!headless && enableGnome2) [
./swing-use-gtk-jdk8.patch
];
@@ -103,33 +123,39 @@ let
substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}"
substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path"
- ''
- # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
- # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
- + stdenv.lib.optionalString stdenv.cc.isGNU ''
- NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error"
'';
configureFlags = [
- "--with-boot-jdk=${bootjdk.home}"
+ "--with-boot-jdk=${openjdk8-bootstrap.home}"
"--with-update-version=${update}"
"--with-build-number=${build}"
"--with-milestone=fcs"
"--enable-unlimited-crypto"
- "--disable-debug-symbols"
+ "--with-native-debug-symbols=internal"
"--disable-freetype-bundling"
"--with-zlib=system"
"--with-giflib=system"
"--with-stdc++lib=dynamic"
+ ] ++ lib.optional headless "--disable-headful";
+ separateDebugInfo = true;
+
+ NIX_CFLAGS_COMPILE = [
# glibc 2.24 deprecated readdir_r so we need this
# See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
- "--with-extra-cflags=\"-Wno-error=deprecated-declarations\""
- ] ++ lib.optional minimal "--disable-headful";
+ "-Wno-error=deprecated-declarations"
+ ] ++ lib.optionals stdenv.cc.isGNU [
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
+ # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
+ "-fno-lifetime-dse"
+ "-fno-delete-null-pointer-checks"
+ "-std=gnu++98"
+ "-Wno-error"
+ ];
- NIX_LDFLAGS= lib.optionals (!minimal) [
+ NIX_LDFLAGS= lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ ] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
];
@@ -138,45 +164,40 @@ let
doCheck = false; # fails with "No rule to make target 'y'."
installPhase = ''
- mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
+ mkdir -p $out/lib
- cp -av build/*/images/j2sdk-image/* $out/lib/openjdk
+ mv build/*/images/j2sdk-image $out/lib/openjdk
# Remove some broken manpages.
rm -rf $out/lib/openjdk/man/ja*
# Mirror some stuff in top-level.
- mkdir $out/include $out/share/man
- ln -s $out/lib/openjdk/include/* $out/include/
- ln -s $out/lib/openjdk/man/* $out/share/man/
+ mkdir -p $out/share
+ ln -s $out/lib/openjdk/include $out/include
+ ln -s $out/lib/openjdk/man $out/share/man
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/
# Remove crap from the installation.
rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample
- ${lib.optionalString minimal ''
+ ${lib.optionalString headless ''
rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so
rm $out/lib/openjdk/jre/bin/policytool
rm $out/lib/openjdk/bin/{policytool,appletviewer}
''}
- # Move the JRE to a separate output and setup fallback fonts
- mv $out/lib/openjdk/jre $jre/lib/openjdk/
+ # Move the JRE to a separate output
+ mkdir -p $jre/lib/openjdk
+ mv $out/lib/openjdk/jre $jre/lib/openjdk/jre
mkdir $out/lib/openjdk/jre
- ${lib.optionalString (!minimal) ''
- mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback
- lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
- ''}
lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
- rm -rf $out/lib/openjdk/jre/bina
- ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin
-
- # Make sure cmm/*.pf are not symlinks:
- # https://youtrack.jetbrains.com/issue/IDEA-147272
- rm -rf $out/lib/openjdk/jre/lib/cmm
- ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
+ # Setup fallback fonts
+ ${lib.optionalString (!headless) ''
+ mkdir -p $jre/lib/openjdk/jre/lib/fonts
+ ln -s ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
+ ''}
# Remove duplicate binaries.
for i in $(cd $out/lib/openjdk/bin && echo *); do
@@ -198,12 +219,7 @@ let
ln -s $jre/lib/openjdk/jre $out/jre
'';
- # FIXME: this is unnecessary once the multiple-outputs branch is merged.
preFixup = ''
- prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}"
- patchELF $jre
- propagatedBuildInputs+=" $jre"
-
# Propagate the setJavaClassPath setup hook from the JRE so that
# any package that depends on the JRE has $CLASSPATH set up
# properly.
@@ -221,11 +237,12 @@ let
# Build the set of output library directories to rpath against
LIBDIRS=""
for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
done
-
# Add the local library paths to remove dependencies on the bootstrap
for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
OUTPUTDIR=$(eval echo \$$output)
BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
echo "$BINLIBS" | while read i; do
@@ -233,22 +250,16 @@ let
patchelf --shrink-rpath "$i" || true
done
done
-
- # Test to make sure that we don't depend on the bootstrap
- for output in $outputs; do
- if grep -q -r '${bootjdk}' $(eval echo \$$output); then
- echo "Extraneous references to ${bootjdk} detected"
- exit 1
- fi
- done
'';
- meta = with stdenv.lib; {
+ disallowedReferences = [ openjdk8-bootstrap ];
+
+ meta = with lib; {
homepage = http://openjdk.java.net/;
license = licenses.gpl2;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo nequissimus ];
- platforms = platforms.linux;
+ platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
};
passthru = {
diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix
index 61c2d57423e4..4c808302b4fa 100644
--- a/pkgs/development/compilers/openjdk/darwin/11.nix
+++ b/pkgs/development/compilers/openjdk/darwin/11.nix
@@ -52,7 +52,10 @@ let
home = jdk;
};
- meta.platforms = stdenv.lib.platforms.darwin;
+ meta = with stdenv.lib; {
+ license = licenses.gpl2;
+ platforms = platforms.darwin;
+ };
};
in jdk
diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix
index 7457ffceab1f..045901b1bae6 100644
--- a/pkgs/development/compilers/openjdk/darwin/8.nix
+++ b/pkgs/development/compilers/openjdk/darwin/8.nix
@@ -53,7 +53,10 @@ let
home = jdk;
};
- meta.platforms = stdenv.lib.platforms.darwin;
+ meta = with stdenv.lib; {
+ license = licenses.gpl2;
+ platforms = platforms.darwin;
+ };
};
in jdk
diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix
index b4e19c32e26d..58e4ba990149 100644
--- a/pkgs/development/compilers/openjdk/darwin/default.nix
+++ b/pkgs/development/compilers/openjdk/darwin/default.nix
@@ -52,7 +52,10 @@ let
home = jdk;
};
- meta.platforms = stdenv.lib.platforms.darwin;
+ meta = with stdenv.lib; {
+ license = licenses.gpl2;
+ platforms = platforms.darwin;
+ };
};
in jdk
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 65c85d055cbb..094bd57e6e98 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,42 +1,33 @@
-{ stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype
-, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
-, libjpeg, giflib
+{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
+, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
+, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
+, libXcursor, libXrandr, fontconfig, openjdk11
, setJavaClassPath
-, minimal ? false
-, enableJavaFX ? true, openjfx
+, headless ? false
+, enableJavaFX ? openjfx.meta.available, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
}:
let
-
- /**
- * The JDK libraries are in directories that depend on the CPU.
- */
- architecture =
- if stdenv.hostPlatform.system == "i686-linux" then
- "i386"
- else "amd64";
-
major = "12";
update = ".0.2";
build = "ga";
- repover = "jdk-${major}${update}-${build}";
- openjdk = stdenv.mkDerivation {
- name = "openjdk-${major}${update}-${build}";
+ openjdk = stdenv.mkDerivation rec {
+ pname = "openjdk" + lib.optionalString headless "-headless";
+ version = "${major}${update}-${build}";
src = fetchurl {
- url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz";
+ url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig autoconf ];
buildInputs = [
- autoconf cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
- libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
- libXi libXinerama libXcursor libXrandr lndir fontconfig
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+ libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
+ libXi libXinerama libXcursor libXrandr fontconfig openjdk11
+ ] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
];
@@ -53,62 +44,60 @@ let
url = https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch;
sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
})
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ ] ++ lib.optionals (!headless && enableGnome2) [
./swing-use-gtk-jdk10.patch
];
- preConfigure = ''
+ prePatch = ''
chmod +x configure
- substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
-
- configureFlagsArray=(
- "--with-boot-jdk=${bootjdk.home}"
- "--enable-unlimited-crypto"
- "--with-zlib=system"
- "--with-giflib=system"
- "--with-stdc++lib=dynamic"
-
- # glibc 2.24 deprecated readdir_r so we need this
- # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
- "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=unused-result"
- ''
- + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\""
- + lib.optionalString minimal " \"--enable-headless-only\""
- + lib.optionalString (!minimal && enableJavaFX) " \"--with-import-modules=${openjfx}\""
- + ");"
- # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
- # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
- + stdenv.lib.optionalString stdenv.cc.isGNU ''
- NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error"
+ patchShebangs --build configure
'';
- NIX_LDFLAGS= lib.optionals (!minimal) [
+ configureFlags = [
+ "--with-boot-jdk=${openjdk11.home}"
+ "--enable-unlimited-crypto"
+ "--with-native-debug-symbols=internal"
+ "--with-libjpeg=system"
+ "--with-giflib=system"
+ "--with-libpng=system"
+ "--with-zlib=system"
+ "--with-lcms=system"
+ "--with-stdc++lib=dynamic"
+ ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
+ ++ lib.optional headless "--enable-headless-only"
+ ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+
+ separateDebugInfo = true;
+
+ NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
+
+ NIX_LDFLAGS = lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
- ] ++ lib.optionals (!minimal && enableGnome2) [
+ ] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
];
buildFlags = [ "all" ];
installPhase = ''
- mkdir -p $out/lib/openjdk $out/share
+ mkdir -p $out/lib
- cp -av build/*/images/jdk/* $out/lib/openjdk
+ mv build/*/images/jdk $out/lib/openjdk
# Remove some broken manpages.
rm -rf $out/lib/openjdk/man/ja*
# Mirror some stuff in top-level.
- mkdir $out/include $out/share/man
- ln -s $out/lib/openjdk/include/* $out/include/
- ln -s $out/lib/openjdk/man/* $out/share/man/
+ mkdir -p $out/share
+ ln -s $out/lib/openjdk/include $out/include
+ ln -s $out/lib/openjdk/man $out/share/man
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/
# Remove crap from the installation.
rm -rf $out/lib/openjdk/demo
- ${lib.optionalString minimal ''
+ ${lib.optionalString headless ''
rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
''}
@@ -133,11 +122,12 @@ let
# Build the set of output library directories to rpath against
LIBDIRS=""
for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
done
-
# Add the local library paths to remove dependencies on the bootstrap
for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
OUTPUTDIR=$(eval echo \$$output)
BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
echo "$BINLIBS" | while read i; do
@@ -145,26 +135,20 @@ let
patchelf --shrink-rpath "$i" || true
done
done
-
- # Test to make sure that we don't depend on the bootstrap
- for output in $outputs; do
- if grep -q -r '${bootjdk}' $(eval echo \$$output); then
- echo "Extraneous references to ${bootjdk} detected"
- exit 1
- fi
- done
'';
+ disallowedReferences = [ openjdk11 ];
+
meta = with stdenv.lib; {
homepage = http://openjdk.java.net/;
license = licenses.gpl2;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
- platforms = ["i686-linux" "x86_64-linux"];
+ platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
};
passthru = {
- inherit architecture;
+ architecture = "";
home = "${openjdk}/lib/openjdk";
};
};
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix
index 223feb1e2a14..9e6d30efda81 100644
--- a/pkgs/development/compilers/openjdk/openjfx/11.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/11.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, writeText, openjdk, bootjdk, gradleGen, pkgconfig, perl, cmake, gperf
-, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby }:
+{ stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake
+, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby
+, openjdk11-bootstrap }:
let
major = "11";
@@ -7,14 +8,14 @@ let
build = "1";
repover = "${major}${update}+${build}";
gradle_ = (gradleGen.override {
- java = bootjdk;
+ java = openjdk11-bootstrap;
}).gradle_4_10;
makePackage = args: stdenv.mkDerivation ({
- version = "${major}${update}-${repover}";
+ version = "${major}${update}-${build}";
src = fetchurl {
- url = "http://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz";
+ url = "https://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz";
sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194";
};
@@ -25,7 +26,7 @@ let
config = writeText "gradle.properties" (''
CONF = Release
- JDK_HOME = ${bootjdk}/lib/openjdk
+ JDK_HOME = ${openjdk11-bootstrap.home}
'' + args.gradleProperties or "");
buildPhase = ''
@@ -56,11 +57,11 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash =
- # Downloaded AWT jars differ by platform.
- if stdenv.system == "x86_64-linux" then "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a"
- else if stdenv.system == "i686-linux" then "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08"
- else throw "Unsupported platform";
+ # Downloaded AWT jars differ by platform.
+ outputHash = {
+ i686-linux = "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08";
+ x86_64-linux = "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a";
+ }.${stdenv.system} or (throw "Unsupported platform");
};
in makePackage {
@@ -87,24 +88,20 @@ in makePackage {
postFixup = ''
# Remove references to bootstrap.
find "$out" -name \*.so | while read lib; do
- new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${bootjdk}[^:]*,,')"
+ new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11-bootstrap}[^:]*,,')"
patchelf --set-rpath "$new_refs" "$lib"
done
-
- # Test to make sure that we don't depend on the bootstrap
- if grep -q -r '${bootjdk}' "$out"; then
- echo "Extraneous references to ${bootjdk} detected" >&2
- exit 1
- fi
'';
+ disallowedReferences = [ openjdk11-bootstrap ];
+
passthru.deps = deps;
meta = with stdenv.lib; {
homepage = http://openjdk.java.net/projects/openjfx/;
- license = openjdk.meta.license;
+ license = licenses.gpl2;
description = "The next-generation Java client toolkit.";
maintainers = with maintainers; [ abbradar ];
- platforms = openjdk.meta.platforms;
+ platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/development/compilers/openjdk/openjfx/12.nix b/pkgs/development/compilers/openjdk/openjfx/12.nix
index 266dd7f334ef..418c58ac683e 100644
--- a/pkgs/development/compilers/openjdk/openjfx/12.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/12.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, writeText, openjdk, bootjdk, gradleGen, pkgconfig, perl, cmake, gperf
-, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby }:
+{ stdenv, lib, fetchurl, writeText, openjdk11_headless, gradleGen
+, pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
+, ffmpeg, python, ruby }:
let
major = "12";
@@ -7,14 +8,14 @@ let
build = "14";
repover = "${major}${update}+${build}";
gradle_ = (gradleGen.override {
- java = bootjdk;
+ java = openjdk11_headless;
}).gradle_4_10;
makePackage = args: stdenv.mkDerivation ({
- version = "${major}${update}-${repover}";
+ version = "${major}${update}-${build}";
src = fetchurl {
- url = "http://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz";
+ url = "https://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz";
sha256 = "16jjfjkrg57wsj9mmm52i2kl3byz3ba1f9f8wwc8zwqm4cpjzliz";
};
@@ -25,7 +26,7 @@ let
config = writeText "gradle.properties" (''
CONF = Release
- JDK_HOME = ${bootjdk}/lib/openjdk
+ JDK_HOME = ${openjdk11_headless.home}
'' + args.gradleProperties or "");
buildPhase = ''
@@ -56,11 +57,11 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash =
- # Downloaded AWT jars differ by platform.
- if stdenv.system == "x86_64-linux" then "1z5qar5l28ja4pkf5l5m48xbv3x1yrnilsv9lpf2j3vkdk9h1nci"
- else if stdenv.system == "i686-linux" then "0rbygvjc7w197fi5nxldqdrm6mpiyd3n45042g3gd4s5qk08spjd"
- else throw "Unsupported platform";
+ # Downloaded AWT jars differ by platform.
+ outputHash = {
+ x86_64-linux = "1z5qar5l28ja4pkf5l5m48xbv3x1yrnilsv9lpf2j3vkdk9h1nci";
+ i686-linux = "0rbygvjc7w197fi5nxldqdrm6mpiyd3n45042g3gd4s5qk08spjd";
+ }.${stdenv.system} or (throw "Unsupported platform");
};
in makePackage {
@@ -87,24 +88,20 @@ in makePackage {
postFixup = ''
# Remove references to bootstrap.
find "$out" -name \*.so | while read lib; do
- new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${bootjdk}[^:]*,,')"
+ new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11_headless}[^:]*,,')"
patchelf --set-rpath "$new_refs" "$lib"
done
-
- # Test to make sure that we don't depend on the bootstrap
- if grep -q -r '${bootjdk}' "$out"; then
- echo "Extraneous references to ${bootjdk} detected" >&2
- exit 1
- fi
'';
+ disallowedReferences = [ openjdk11_headless ];
+
passthru.deps = deps;
meta = with stdenv.lib; {
homepage = http://openjdk.java.net/projects/openjfx/;
- license = openjdk.meta.license;
+ license = licenses.gpl2;
description = "The next-generation Java client toolkit.";
maintainers = with maintainers; [ abbradar ];
- platforms = openjdk.meta.platforms;
+ platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch
index 4902b8e84011..08cf554a18fe 100644
--- a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch
+++ b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch
@@ -1,21 +1,30 @@
-diff -ur openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
---- openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-07-17 12:12:14.000000000 +0200
-+++ openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-12-09 13:31:27.821960372 +0100
-@@ -161,6 +161,7 @@
- /*
- * Try:
- * javax.net.ssl.trustStore (if this variable exists, stop)
-+ * system environment variable JAVAX_NET_SSL_TRUSTSTORE
- * jssecacerts
- * cacerts
- *
-@@ -169,6 +169,9 @@
-
- try {
- storeFileName = props.get("trustStore");
-+ if (storeFileName == null) {
-+ storeFileName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE");
-+ }
- if (!"NONE".equals(storeFileName)) {
- if (storeFileName != null) {
- storeFile = new File(storeFileName);
+--- a/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400
++++ b/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java 2017-07-05 20:45:57.491295030 -0400
+@@ -71,6 +71,7 @@
+ *
+ * The preference of the default trusted KeyStore is:
+ * javax.net.ssl.trustStore
++ * system environment variable JAVAX_NET_SSL_TRUSTSTORE
+ * jssecacerts
+ * cacerts
+ */
+@@ -132,7 +133,8 @@
+ public TrustStoreDescriptor run() {
+ // Get the system properties for trust store.
+ String storePropName = System.getProperty(
+- "javax.net.ssl.trustStore", jsseDefaultStore);
++ "javax.net.ssl.trustStore",
++ System.getenv("JAVAX_NET_SSL_TRUSTSTORE"));
+ String storePropType = System.getProperty(
+ "javax.net.ssl.trustStoreType",
+ KeyStore.getDefaultType());
+@@ -144,6 +146,9 @@
+ String temporaryName = "";
+ File temporaryFile = null;
+ long temporaryTime = 0L;
++ if (storePropName == null) {
++ storePropName = jsseDefaultStore;
++ }
+ if (!"NONE".equals(storePropName)) {
+ String[] fileNames =
+ new String[] {storePropName, defaultStore};
diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix
index 690707265b4a..b1e95bb704cb 100644
--- a/pkgs/development/compilers/openspin/default.nix
+++ b/pkgs/development/compilers/openspin/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "openspin-${version}";
+stdenv.mkDerivation {
+ pname = "openspin";
version = "unstable-2018-10-02";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/pforth/default.nix b/pkgs/development/compilers/pforth/default.nix
index 7885582ad125..67d444428e92 100644
--- a/pkgs/development/compilers/pforth/default.nix
+++ b/pkgs/development/compilers/pforth/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "28";
pname = "pforth";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix
index 7f22f4de6244..370c08f001a7 100644
--- a/pkgs/development/compilers/polyml/5.6.nix
+++ b/pkgs/development/compilers/polyml/5.6.nix
@@ -5,7 +5,8 @@ let
in
stdenv.mkDerivation {
- name = "polyml-${version}";
+ pname = "polyml";
+ inherit version;
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace configure.ac --replace stdc++ c++
diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix
index b7feed84c37f..eef972a2cc3c 100644
--- a/pkgs/development/compilers/polyml/5.7.nix
+++ b/pkgs/development/compilers/polyml/5.7.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:
stdenv.mkDerivation rec {
- name = "polyml-${version}";
+ pname = "polyml";
version = "5.7.1";
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 91a3bb45352f..5ab13d5f761f 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:
stdenv.mkDerivation rec {
- name = "polyml-${version}";
+ pname = "polyml";
version = "5.8";
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index 2aab6a99a1cf..6719293af2a7 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, ponyc }:
stdenv.mkDerivation rec {
- name = "pony-stable-${version}";
+ pname = "pony-stable";
version = "0.2.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix
index eee4507d6cec..3856ced250e7 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/pkgs/development/compilers/rgbds/default.nix
@@ -5,7 +5,7 @@
# in a published version.
stdenv.mkDerivation rec {
- name = "rgbds-${version}";
+ pname = "rgbds";
version = "0.3.8";
src = fetchFromGitHub {
owner = "rednex";
diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binary.nix
similarity index 96%
rename from pkgs/development/compilers/rust/binaryBuild.nix
rename to pkgs/development/compilers/rust/binary.nix
index cb2fba96e181..06202901563e 100644
--- a/pkgs/development/compilers/rust/binaryBuild.nix
+++ b/pkgs/development/compilers/rust/binary.nix
@@ -18,7 +18,7 @@ let
in
rec {
- rustc = stdenv.mkDerivation rec {
+ rustc = stdenv.mkDerivation {
name = "rustc-${versionType}-${version}";
inherit version;
@@ -60,9 +60,11 @@ rec {
# are very hard to track down. For details, see
# https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943
'';
+
+ setupHooks = ./setup-hook.sh;
};
- cargo = stdenv.mkDerivation rec {
+ cargo = stdenv.mkDerivation {
name = "cargo-${versionType}-${version}";
inherit version;
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 973d17e1c7bd..43a72985ddec 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -3,16 +3,16 @@
let
# Note: the version MUST be one version prior to the version we're
# building
- version = "1.35.0";
+ version = "1.36.0";
- # fetch hashes by running `print-hashes.sh 1.34.2`
+ # fetch hashes by running `print-hashes.sh 1.36.0`
hashes = {
- i686-unknown-linux-gnu = "05337776b3645e4b8c8c7ced0bcd1615cf9ad1b9c8b3d0f333620e5401e31aee";
- x86_64-unknown-linux-gnu = "cf600e2273644d8629ed57559c70ca8db4023fd0156346facca9ab3ad3e8f86c";
- armv7-unknown-linux-gnueabihf = "8f0f32d8ddc6fb7bcb8f50ec5e694078799d93facbf135eec5bd9a8c94d0c11e";
- aarch64-unknown-linux-gnu = "31e6da56e67838fd2874211ae896a433badf67c13a7b68481f1d5f7dedcc5952";
- i686-apple-darwin = "6a45ae8db094c5f6c57c5594a00f1a92b08c444a7347a657b4033186d4f08b19";
- x86_64-apple-darwin = "ac14b1c7dc330dcb53d8641d74ebf9b32aa8b03b9d650bcb9258030d8b10dbd6";
+ i686-unknown-linux-gnu = "9f95c3e96622a792858c8a1c9274fa63e6992370493b27c1ac7299a3bec5156d";
+ x86_64-unknown-linux-gnu = "15e592ec52f14a0586dcebc87a957e472c4544e07359314f6354e2b8bd284c55";
+ armv7-unknown-linux-gnueabihf = "798181a728017068f9eddfa665771805d97846cd87bddcd67e0fe27c8d082ceb";
+ aarch64-unknown-linux-gnu = "db78c24d93756f9fe232f081dbc4a46d38f8eec98353a9e78b9b164f9628042d";
+ i686-apple-darwin = "3dbc34fdea8bc030badf9c8b2572c09fd3f5369b59ac099fc521064b390b9e60";
+ x86_64-apple-darwin = "91f151ec7e24f5b0645948d439fc25172ec4012f0584dd16c3fb1acb709aa325";
};
platform =
@@ -32,10 +32,10 @@ let
src = fetchurl {
url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz";
- sha256 = hashes."${platform}";
+ sha256 = hashes.${platform};
};
-in callPackage ./binaryBuild.nix
+in callPackage ./binary.nix
{ inherit version src platform;
versionType = "bootstrap";
}
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index e000edad49b6..2bf2722818b9 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -3,7 +3,7 @@
, CoreFoundation, Security
}:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
name = "cargo-${rustc.version}";
inherit (rustc) version src;
diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix
index 2b8fcbe0ba4b..56b70f21d4c7 100644
--- a/pkgs/development/compilers/rust/clippy.nix
+++ b/pkgs/development/compilers/rust/clippy.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, rustPlatform, rustc, Security, patchelf }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
name = "clippy-${rustc.version}";
inherit (rustc) version src;
diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix
index 470611242e07..942e23c6170d 100644
--- a/pkgs/development/compilers/rust/rls/default.nix
+++ b/pkgs/development/compilers/rust/rls/default.nix
@@ -2,7 +2,7 @@
, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv
, CoreFoundation, Security }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
pname = "rls";
inherit (rustPlatform.rust.rustc) src version;
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index d77769583902..daf7af1babdc 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,6 +1,6 @@
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
, fetchurl, file, python2, tzdata, ps
-, llvm_7, darwin, git, cmake, rustPlatform
+, llvmPackages_7, darwin, git, cmake, rustPlatform
, which, libffi, gdb
, withBundledLLVM ? false
}:
@@ -9,21 +9,31 @@ let
inherit (stdenv.lib) optional optionalString;
inherit (darwin.apple_sdk.frameworks) Security;
- llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; };
- llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; };
- llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; };
+ llvmPackages = llvmPackages_7;
+
+ llvmSharedForBuild = pkgsBuildBuild.llvmPackages.llvm.override { enableSharedLibraries = true; };
+ llvmSharedForHost = pkgsBuildHost.llvmPackages.llvm.override { enableSharedLibraries = true; };
+ llvmSharedForTarget = pkgsBuildTarget.llvmPackages.llvm.override { enableSharedLibraries = true; };
# For use at runtime
- llvmShared = llvm_7.override { enableSharedLibraries = true; };
-in stdenv.mkDerivation rec {
+ llvmShared = llvmPackages.llvm.override { enableSharedLibraries = true; };
+in
+
+stdenv.mkDerivation rec {
pname = "rustc";
- version = "1.36.0";
+ version = "1.37.0";
src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
- sha256 = "06xv2p6zq03lidr0yaf029ii8wnjjqa894nkmrm6s0rx47by9i04";
+ sha256 = "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj";
};
+ # Provide the compiler-rt sources needed for profiling.
+ preConfigure = ''
+ mkdir src/llvm-project/compiler-rt
+ tar xf ${llvmPackages.compiler-rt.src} -C src/llvm-project/compiler-rt --strip-components=1
+ '';
+
__darwinAllowLocalNetworking = true;
# rustc complains about modified source files otherwise
@@ -38,7 +48,6 @@ in stdenv.mkDerivation rec {
# See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656
stripDebugList = [ "bin" ];
-
NIX_LDFLAGS =
# when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state"
diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix
index 537bdaf445cd..9793eee1708b 100644
--- a/pkgs/development/compilers/rust/rustfmt.nix
+++ b/pkgs/development/compilers/rust/rustfmt.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
- name = "rustfmt-${version}";
+ pname = "rustfmt";
inherit (rustPlatform.rust.rustc) version src;
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 056ad7454600..9c777cc75728 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -2,38 +2,38 @@
let
options = rec {
- x86_64-darwin = rec {
+ x86_64-darwin = {
version = "1.2.11";
system = "x86-64-darwin";
sha256 = "0lh4gpvi8hl6g6b9321g5pwh8sk3218i7h4lx7p3vd9z0cf3lz85";
};
- x86_64-linux = rec {
+ x86_64-linux = {
version = "1.3.16";
system = "x86-64-linux";
sha256 = "0sq2dylwwyqfwkbdvcgqwz3vay9v895zpb0fyzsiwy31d1x9pr2s";
};
- i686-linux = rec {
+ i686-linux = {
version = "1.2.7";
system = "x86-linux";
sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j";
};
- aarch64-linux = rec {
+ aarch64-linux = {
version = "1.3.16";
system = "arm64-linux";
sha256 = "0q1brz9c49xgdljzfx8rpxxnlwhadxkcy5kg0mcd9wnxygind1cl";
};
- armv7l-linux = rec {
+ armv7l-linux = {
version = "1.2.14";
system = "armhf-linux";
sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5";
};
armv6l-linux = armv7l-linux;
- x86_64-freebsd = rec {
+ x86_64-freebsd = {
version = "1.2.7";
system = "x86-64-freebsd";
sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6";
};
- x86_64-solaris = rec {
+ x86_64-solaris = {
version = "1.2.7";
system = "x86-64-solaris";
sha256 = "05c12fmac4ha72k1ckl6i780rckd7jh4g5s5hiic7fjxnf1kx8d0";
@@ -43,7 +43,7 @@ let
in
assert builtins.hasAttr stdenv.hostPlatform.system options;
stdenv.mkDerivation rec {
- name = "sbcl-bootstrap-${version}";
+ pname = "sbcl-bootstrap";
version = cfg.version;
src = fetchurl {
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index e2cc7adc26e1..e3d9ee98635b 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,12 +9,12 @@
}:
stdenv.mkDerivation rec {
- name = "sbcl-${version}";
- version = "1.5.3";
+ pname = "sbcl";
+ version = "1.5.6";
src = fetchurl {
- url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
- sha256 = "0334cfnvjy0ccq9p05mxrgawhww8wb73rp318qcsf9yj8h8r19yj";
+ url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2";
+ sha256 = "10z43dc29p7s8dl3jixklhmzqfp7gcm3fccjdfd36qqhyfxqxx3a";
};
buildInputs = [texinfo];
diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix
index ab42eae31a68..5a01e295e49e 100644
--- a/pkgs/development/compilers/scala/dotty-bare.nix
+++ b/pkgs/development/compilers/scala/dotty-bare.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.14.0-RC1";
- name = "dotty-bare-${version}";
+ pname = "dotty-bare";
src = fetchurl {
url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz";
diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix
index 4fd46c35a0a9..cdac400b1afd 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@@ -9,7 +9,7 @@ let
in
stdenv.mkDerivation rec {
- name = "sdcc-${version}";
+ pname = "sdcc";
version = "3.9.0";
src = fetchurl {
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
homepage = http://sdcc.sourceforge.net/;
license = with licenses; if (gputils == null) then gpl2 else unfreeRedistributable;
maintainers = with maintainers; [ bjornfor yorickvp ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix
index a6abe6791d7e..f6b732f02aeb 100644
--- a/pkgs/development/compilers/seexpr/default.nix
+++ b/pkgs/development/compilers/seexpr/default.nix
@@ -2,8 +2,8 @@
bison, flex, libGLU, pythonPackages
}:
-stdenv.mkDerivation rec {
- name = "seexpr-${version}";
+stdenv.mkDerivation {
+ pname = "seexpr";
version = "2.11";
src = fetchFromGitHub {
owner = "wdas";
diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix
index e9c6b706e5ad..6f1156897db9 100644
--- a/pkgs/development/compilers/serpent/default.nix
+++ b/pkgs/development/compilers/serpent/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ... }:
-stdenv.mkDerivation rec {
- name = "serpent-${version}";
+stdenv.mkDerivation {
+ pname = "serpent";
# I can't find any version numbers, so we're just using the date
# of the last commit.
diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix
index 75717b5ba096..82cccc3befc3 100644
--- a/pkgs/development/compilers/shaderc/default.nix
+++ b/pkgs/development/compilers/shaderc/default.nix
@@ -24,7 +24,7 @@ let
sha256 = "0qdnj34bkagszyvci6ifpqd7iqvybhmqzvc9lvqnls44qg90aqh2";
};
in stdenv.mkDerivation rec {
- name = "shaderc-${version}";
+ pname = "shaderc";
version = "2019.0";
outputs = [ "out" "lib" "bin" "dev" "static" ];
diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix
index 21cfd4082988..e2103fb718fa 100644
--- a/pkgs/development/compilers/smlnj/bootstrap.nix
+++ b/pkgs/development/compilers/smlnj/bootstrap.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cpio, rsync, xar, makeWrapper }:
stdenv.mkDerivation rec {
- name = "smlnj-bootstrap-${version}";
+ pname = "smlnj-bootstrap";
version = "110.91";
diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index dce46ade4592..89912ac9ad6b 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -29,7 +29,8 @@ let
{ url = "${baseurl}/asdl.tgz"; sha256 = "1pi3m21jllyd2h0zpz4bajskfv58g6pjhpprqiwgmikn6w1pryp8"; }
];
in stdenv.mkDerivation {
- name = "smlnj-${version}";
+ pname = "smlnj";
+ inherit version;
inherit sources;
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index f34283938326..b0fdc8863784 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -16,7 +16,7 @@ let
in
stdenv.mkDerivation rec {
- name = "solc-${version}";
+ pname = "solc";
version = "0.5.11";
# upstream suggests avoid using archive generated by github
diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix
index 219d5307790d..a39a6c4a2e4f 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/pkgs/development/compilers/souffle/default.nix
@@ -9,7 +9,7 @@ let
toolsPath = stdenv.lib.makeBinPath [ mcpp ];
in
stdenv.mkDerivation rec {
- name = "souffle-${version}";
+ pname = "souffle";
version = "1.6.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix
index 25ea47978fcd..c8379fe90909 100644
--- a/pkgs/development/compilers/squeak/default.nix
+++ b/pkgs/development/compilers/squeak/default.nix
@@ -2,7 +2,7 @@
, libpthreadstubs, pango, pkgconfig, libpulseaudio, which }:
stdenv.mkDerivation rec {
- name = "squeak-${version}";
+ pname = "squeak";
version = "4.10.2.2614";
src = fetchurl {
diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index bf452d21d1dc..9245e59553fe 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -13,7 +13,8 @@ let
'';
in
stdenv.mkDerivation {
- name = "swi-prolog-${version}";
+ pname = "swi-prolog";
+ inherit version;
src = fetchgit {
url = "https://github.com/SWI-Prolog/swipl-devel";
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index f21b2ae3cb80..817f81f9257b 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -35,7 +35,7 @@
let
v_base = "5.0.2";
version = "${v_base}-RELEASE";
- version_friendly = "${v_base}";
+ version_friendly = v_base;
tag = "refs/tags/swift-${version}";
fetch = { repo, sha256, fetchSubmodules ? false }:
@@ -131,7 +131,7 @@ let
extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"'';
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "swift-${version_friendly}";
nativeBuildInputs = [
diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
index b1f9ee799e5c..dea6df1b7aa4 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/pkgs/development/compilers/terra/default.nix
@@ -9,7 +9,7 @@ let
in
stdenv.mkDerivation rec {
- name = "terra-git-${version}";
+ pname = "terra-git";
version = "1.0.0-beta1";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix
index 04efe1a91342..41cc9b386067 100644
--- a/pkgs/development/compilers/teyjus/default.nix
+++ b/pkgs/development/compilers/teyjus/default.nix
@@ -5,7 +5,8 @@ let
in
stdenv.mkDerivation {
- name = "teyjus-${version}";
+ pname = "teyjus";
+ inherit version;
src = fetchurl {
url = "https://github.com/teyjus/teyjus/archive/v${version}.tar.gz";
diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index a5c3db65857f..338ba9312492 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -2,7 +2,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "tcc-${version}";
+ pname = "tcc";
version = "0.9.27";
src = fetchFromRepoOrCz {
diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix
index d5f0dcbec29f..f3ff864f81b1 100644
--- a/pkgs/development/compilers/urn/default.nix
+++ b/pkgs/development/compilers/urn/default.nix
@@ -20,7 +20,7 @@ let
inherit (stdenv.lib) optionalString concatMapStringsSep;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "urn-${optionalString (extraLibraries != []) "with-libraries-"}${version}";
src = fetchFromGitLab {
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 2300d63015b9..01d4972a55d5 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "urweb-${version}";
+ pname = "urweb";
version = "20190217";
src = fetchurl {
- url = "https://github.com/urweb/urweb/releases/download/${version}/${name}.tar.gz";
+ url = "https://github.com/urweb/urweb/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s";
};
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 353963007d4b..15ed7f8bd29d 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -119,8 +119,8 @@ in rec {
};
vala_0_40 = generic {
- version = "0.40.15";
- sha256 = "0mfayli159yyw6abjf6sgq41j54mr3nspg25b1kxhypcz0scjm19";
+ version = "0.40.16";
+ sha256 = "0vv25fmr9jqiqf080vak1x4raa4w3cz3n5ysjglqsq9qfx304i7b";
};
vala_0_42 = generic {
@@ -129,8 +129,8 @@ in rec {
};
vala_0_44 = generic {
- version = "0.44.5";
- sha256 = "0zy2kfcvhikczfzhk5l7pkw6mvn3d6vw8cv7g08iah85p22q33xv";
+ version = "0.44.6";
+ sha256 = "0fkrrpnisgq3y816piyr7hm2b94jaj7ki9y974galq3lmxb1g7xb";
};
vala = vala_0_44;
diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix
index ad01fb4be290..f72ec0890543 100644
--- a/pkgs/development/compilers/vlang/default.nix
+++ b/pkgs/development/compilers/vlang/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "vlang";
repo = "v";
- rev = "${version}";
+ rev = version;
sha256 = "0js92v2r1h4vaaha3z1spgi7qynlmr9vls41gxp284w4yhnjzv15";
};
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
vc = fetchFromGitHub {
owner = "vlang";
repo = "vc";
- rev = "${version}";
+ rev = version;
sha256 = "0qx1drs1hr94w7vaaq5w8mkq7j1d3biffnmxkyz63yv8573k03bj";
};
diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix
index 8cb1e8e5f2cd..5f812e2c4632 100644
--- a/pkgs/development/compilers/wcc/default.nix
+++ b/pkgs/development/compilers/wcc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }:
-stdenv.mkDerivation rec {
- name = "wcc-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "wcc-unstable";
version = "2018-04-05";
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix
index 88666148da3f..3d955c4394b0 100644
--- a/pkgs/development/compilers/x11basic/default.nix
+++ b/pkgs/development/compilers/x11basic/default.nix
@@ -6,7 +6,6 @@
stdenv.mkDerivation rec {
pname = "X11basic";
version = "1.26";
- name = pname + "-" + version;
src = fetchFromGitHub {
owner = "kollokollo";
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index 3ad0bc25787e..1cc96455be7a 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "6.3.3";
- name = "yap-${version}";
+ pname = "yap";
src = fetchurl {
- url = "https://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz";
+ url = "https://www.dcc.fc.up.pt/~vsc/Yap/${pname}-${version}.tar.gz";
sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf";
};
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 467d4e3b49eb..1535c7a7de64 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -8,14 +8,14 @@ with builtins;
stdenv.mkDerivation rec {
pname = "yosys";
- version = "2019.08.21";
+ version = "2019.09.01";
srcs = [
(fetchFromGitHub {
owner = "yosyshq";
repo = "yosys";
- rev = "fe1b2337fd7950e1d563be5b8ccbaa81688261e4";
- sha256 = "0z7sngc2z081yyhzh8c2kchg48sp2333hn1wa94q5vsgnyzlqrdw";
+ rev = "4aa505d1b254b3fbb66af2d95b396a8f077da9d0";
+ sha256 = "16rhwmn1z2ppaq3wycgq713krq48s80a6h57vgzjzj17hgncg7hs";
name = "yosys";
})
diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix
index 19056ec2b6fd..433b6e6b32cb 100644
--- a/pkgs/development/compilers/z88dk/default.nix
+++ b/pkgs/development/compilers/z88dk/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
#_FORTIFY_SOURCE requires compiling with optimization (-O)
NIX_CFLAGS_COMPILE = "-O";
- short_rev = "${builtins.substring 0 7 src.rev}";
+ short_rev = builtins.substring 0 7 src.rev;
makeFlags = [
"git_rev=${short_rev}"
"version=${version}"
diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix
index cc42ee1dd3f1..d4caabc6cb83 100644
--- a/pkgs/development/compilers/zulu/8.nix
+++ b/pkgs/development/compilers/zulu/8.nix
@@ -23,10 +23,10 @@ let
xorg.libXt xorg.libXrender stdenv.cc.cc
]));
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit version openjdk platform hash extension;
- name = "zulu-${version}";
+ pname = "zulu";
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}";
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
rpath = stdenv.lib.strings.makeLibraryPath libraries;
passthru = {
- home = "${zulu}";
+ home = zulu;
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
index a43992164d23..5f345c87355f 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -23,10 +23,10 @@ let
xorg.libXt xorg.libXrender stdenv.cc.cc
]));
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit version openjdk platform hash extension;
- name = "zulu-${version}";
+ pname = "zulu";
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/zulu${version}-jdk${openjdk}-${platform}_x64.${extension}";
@@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {
rpath = stdenv.lib.strings.makeLibraryPath libraries;
passthru = {
- home = "${zulu}";
+ home = zulu;
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix
index d58f65102190..4e75b9407dee 100644
--- a/pkgs/development/coq-modules/Cheerios/default.nix
+++ b/pkgs/development/coq-modules/Cheerios/default.nix
@@ -8,7 +8,7 @@ let param =
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-Cheerios-${param.version}";
src = fetchFromGitHub {
diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix
index 4fe86c3fae18..5df96519e7ff 100644
--- a/pkgs/development/coq-modules/InfSeqExt/default.nix
+++ b/pkgs/development/coq-modules/InfSeqExt/default.nix
@@ -8,7 +8,7 @@ let param =
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-InfSeqExt-${param.version}";
src = fetchFromGitHub {
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 874b99f2bebf..b99612894802 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -14,7 +14,7 @@ let params =
sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
};
- "8.8" = rec {
+ "8.8" = {
version = "20190311";
rev = "22af9e9a223d0038f05638654422e637e863b355";
sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq";
@@ -26,12 +26,12 @@ let params =
sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-QuickChick-${param.version}";
diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix
index e33b9427223e..2e4d12478b79 100644
--- a/pkgs/development/coq-modules/StructTact/default.nix
+++ b/pkgs/development/coq-modules/StructTact/default.nix
@@ -8,7 +8,7 @@ let param =
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-StructTact-${param.version}";
src = fetchFromGitHub {
diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix
index cd7ddfefb84a..92c9b2569ca4 100644
--- a/pkgs/development/coq-modules/Velisarios/default.nix
+++ b/pkgs/development/coq-modules/Velisarios/default.nix
@@ -20,10 +20,10 @@ let params =
sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-Velisarios-${param.version}";
src = fetchFromGitHub {
diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix
index 00d088a4a92c..d2e9660a630e 100644
--- a/pkgs/development/coq-modules/Verdi/default.nix
+++ b/pkgs/development/coq-modules/Verdi/default.nix
@@ -13,7 +13,7 @@ let param =
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-verdi-${param.version}";
src = fetchFromGitHub {
diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix
index a074b27ff658..fb45e591ec1a 100644
--- a/pkgs/development/coq-modules/bignums/default.nix
+++ b/pkgs/development/coq-modules/bignums/default.nix
@@ -22,10 +22,10 @@ let params = {
sha256 = "1slw227idwjw9a21vj3s6kal22mrmvvlpg8r7xk590ml99bn6404";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-bignums";
diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix
index 3dfa95154d33..025a67a1e70b 100644
--- a/pkgs/development/coq-modules/category-theory/default.nix
+++ b/pkgs/development/coq-modules/category-theory/default.nix
@@ -19,10 +19,10 @@ let
"8.8" = v20190414;
"8.9" = v20190414;
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-category-theory-${param.version}";
diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix
index faf7db09ff9b..524427c109a6 100644
--- a/pkgs/development/coq-modules/contribs/default.nix
+++ b/pkgs/development/coq-modules/contribs/default.nix
@@ -3,13 +3,13 @@
let mkContrib = repo: revs: param:
stdenv.mkDerivation rec {
name = "coq${coq.coq-version}-${repo}-${version}";
- version = "${param.version}";
+ version = param.version;
src = fetchFromGitHub {
owner = "coq-contribs";
- repo = "${repo}";
- rev = "${param.rev}";
- sha256 = "${param.sha256}";
+ repo = repo;
+ rev = param.rev;
+ sha256 = param.sha256;
};
buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];
@@ -34,7 +34,7 @@ let mkContrib = repo: revs: param:
rev = "86ac28259030649ef51460e4de2441c8a1017751";
sha256 = "09bbk2a7pn0j76mmapl583f8a20zqd3a1m9lkml8rpwml692bzi9";
};
- }."${coq.coq-version}";
+ }.${coq.coq-version};
abp = mkContrib "abp" [ "8.5" "8.6" "8.7" ] {
version = "v8.6.0";
@@ -219,7 +219,7 @@ let mkContrib = repo: revs: param:
rev = "aa33052c1edfc5a65885942a67c2773b5d96f8cc";
sha256 = "0mjgfdr9bzsch0dlk4vq1frkaig14dqh46r54cv0l15flxapg0iw";
};
- }."${coq.coq-version}";
+ }.${coq.coq-version};
continuations = mkContrib "continuations" [ ] {
version = "v8.5.0-13-g6885310";
diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix
index 04fc428b4092..c689cea1a827 100644
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -7,7 +7,7 @@ let params = {
sha256 = "188avk9irwjsbs5ya4ka01mpk3vw4397kv2rmsncqrrrsa1pdddk";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix
index cade2bd352eb..898272d402b6 100644
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix
@@ -8,7 +8,7 @@ let params =
"8.8" = { version = "0.9.8"; sha256 = "0z1ix855kdjl7zw5ca664h5njd1x8mmvf5wi37fck4dj9dgamwlz"; };
"8.9" = { version = "0.10.1"; sha256 = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95"; };
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix
index 57f31e1847c1..e9263fb2be1e 100644
--- a/pkgs/development/coq-modules/coq-haskell/default.nix
+++ b/pkgs/development/coq-modules/coq-haskell/default.nix
@@ -26,10 +26,10 @@ let params =
sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "coq${coq.coq-version}-coq-haskell-${param.version}";
diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix
index 28c651f9b16a..83a505017fbc 100644
--- a/pkgs/development/coq-modules/coqhammer/default.nix
+++ b/pkgs/development/coq-modules/coqhammer/default.nix
@@ -9,7 +9,7 @@ let
sha256 = "0hmqwsry8ldg4g4hhwg4b84dgzibpdrg1wwsajhlyqfx3fb3n3b5";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix
index c67342f1a2f7..6228bd4be9d0 100644
--- a/pkgs/development/coq-modules/coqprime/default.nix
+++ b/pkgs/development/coq-modules/coqprime/default.nix
@@ -15,7 +15,7 @@ let params =
"8.9" = v_8_8;
"8.10" = v_8_8;
};
- param = params."${coq.coq-version}"
+ param = params.${coq.coq-version}
; in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index e403f7d4fb5c..401cb299497b 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -22,7 +22,7 @@ let params = {
sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n";
};
};
-param = params."${coq.coq-version}";
+param = params.${coq.coq-version};
in
stdenv.mkDerivation {
diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix
index 5446b540fac3..b6efd3d75a4e 100644
--- a/pkgs/development/coq-modules/equations/default.nix
+++ b/pkgs/development/coq-modules/equations/default.nix
@@ -32,19 +32,19 @@ let
sha256 = "1v5kx0xzxzsbs5r4w08rm1lrmjjggnd3ap0sd1my88ds17jzyasd";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
stdenv.mkDerivation rec {
name = "coq${coq.coq-version}-equations-${version}";
- version = "${param.version}";
+ version = param.version;
src = fetchFromGitHub {
owner = "mattam82";
repo = "Coq-Equations";
- rev = "${param.rev}";
- sha256 = "${param.sha256}";
+ rev = param.rev;
+ sha256 = param.sha256;
};
buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];
diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix
index ea26f3e1ca9d..0718e518b35c 100644
--- a/pkgs/development/coq-modules/iris/default.nix
+++ b/pkgs/development/coq-modules/iris/default.nix
@@ -1,15 +1,18 @@
-{ stdenv, fetchzip, coq, ssreflect, stdpp }:
+{ stdenv, fetchFromGitLab, coq, stdpp }:
stdenv.mkDerivation rec {
- version = "3.1.0";
+ version = "3.2.0";
name = "coq${coq.coq-version}-iris-${version}";
- src = fetchzip {
- url = "https://gitlab.mpi-sws.org/FP/iris-coq/-/archive/iris-${version}/iris-coq-iris-${version}.tar.gz";
- sha256 = "0ipdb061jj205avxifshxkpyxxqykigmlxk2n5nvxj62gs3rl5j1";
+ src = fetchFromGitLab {
+ domain = "gitlab.mpi-sws.org";
+ owner = "iris";
+ repo = "iris";
+ rev = "iris-${version}";
+ sha256 = "10dfi7qx6j5w6kbmbrf05xh18jwxr9iz5g7y0f6157msgvl081xs";
};
buildInputs = [ coq ];
- propagatedBuildInputs = [ ssreflect stdpp ];
+ propagatedBuildInputs = [ stdpp ];
enableParallelBuilding = true;
@@ -24,7 +27,7 @@ stdenv.mkDerivation rec {
};
passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ];
+ compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ];
};
}
diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix
index 30917fcb78f2..80b167aaa98a 100644
--- a/pkgs/development/coq-modules/ltac2/default.nix
+++ b/pkgs/development/coq-modules/ltac2/default.nix
@@ -17,7 +17,7 @@ let params = {
sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index d573eca809a2..6798236591c4 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -30,7 +30,7 @@ let
# COMPUTED using the configuration above (edit with caution) #
##############################################################
default-mathcomp-version = let v = head (
- filter (mc: mathcomp-coq-versions."${mc}" coq.coq-version)
+ filter (mc: mathcomp-coq-versions.${mc} coq.coq-version)
mathcomp-version-preference ++ ["0.0.0"]);
in if v == "0.0.0" then max-mathcomp-version else v;
@@ -73,7 +73,7 @@ let
custom-version = if is-released then mathcomp-version else "custom";
# the base set of attributes for mathcomp
- attrs = rec {
+ attrs = {
name = "coq${coq.coq-version}-${pkgname}-${custom-version}";
# used in ssreflect
@@ -126,9 +126,9 @@ let
};
};
in
- {"${mathcomp-pkg}" = stdenv.mkDerivation (attrs // overrides attrs);};
+ {${mathcomp-pkg} = stdenv.mkDerivation (attrs // overrides attrs);};
-getAttrOr = a: n: a."${n}" or (throw a.error);
+getAttrOr = a: n: a.${n} or (throw a.error);
mathcompCorePkgs_1_7 = mathcompGen "1.7.0";
mathcompCorePkgs_1_8 = mathcompGen "1.8.0";
@@ -136,7 +136,7 @@ mathcompCorePkgs_1_9 = mathcompGen "1.9.0";
mathcompCorePkgs = recurseIntoAttrs
(mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version));
-in rec {
+in {
# mathcompGenSingle: given a version of mathcomp
# generates an attribute set {single = ;} with the single mathcomp derivation
inherit mathcompGenSingle;
diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix
index 0d9557623c36..c342c25a4118 100644
--- a/pkgs/development/coq-modules/mathcomp/extra.nix
+++ b/pkgs/development/coq-modules/mathcomp/extra.nix
@@ -139,7 +139,7 @@ packageGen = {
else compatibleCoqVersions;
mc-core-deps = if builtins.isNull core-deps then [ssreflect] else core-deps;
in
- { "${package}" = let from = src; in
+ { ${package} = let from = src; in
stdenv.mkDerivation rec {
inherit version;
@@ -149,7 +149,7 @@ packageGen = {
owner = owner;
repo = package;
rev = version;
- sha256 = version-sha256."${version}";
+ sha256 = version-sha256.${version};
} else from;
propagatedBuildInputs = [ coq ] ++ mc-core-deps ++ extra-deps;
@@ -173,7 +173,7 @@ packageGen = {
};
};
-current-versions = versions."${current-ssreflect.version}" or {};
+current-versions = versions.${current-ssreflect.version} or {};
select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x);
@@ -181,14 +181,14 @@ for-version = v: suffix: (mapAttrs' (n: pkg:
{name = "mathcomp_${suffix}-${n}";
value = (packageGen ({
ssreflect = coqPackages."mathcomp-ssreflect_${suffix}";
- } // pkg))."${n}";})
- (select versions."${v}"));
+ } // pkg)).${n};})
+ (select versions.${v}));
all = (for-version "1.7.0" "1_7") //
(for-version "1.8.0" "1_8") //
(for-version "1.9.0" "1_9") //
(recurseIntoAttrs (mapDerivationAttrset dontDistribute (
- mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg)."${n}";})
+ mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg).${n};})
(select current-versions))));
in
{
diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix
index 472d3aeb2d08..a8dd74dd5fb6 100644
--- a/pkgs/development/coq-modules/paramcoq/default.nix
+++ b/pkgs/development/coq-modules/paramcoq/default.nix
@@ -15,7 +15,7 @@ let params =
sha256 = "002xabhjlph394vydw3dx8ipv5ry2nq3py4440bk9a18ljx0w6ll";
};
};
- param = params."${coq.coq-version}";
+ param = params.${coq.coq-version};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix
index 883ed971b083..3ba99e87ffb6 100644
--- a/pkgs/development/coq-modules/stdpp/default.nix
+++ b/pkgs/development/coq-modules/stdpp/default.nix
@@ -1,10 +1,14 @@
-{ stdenv, fetchzip, coq }:
+{ stdenv, fetchFromGitLab, coq }:
-stdenv.mkDerivation {
- name = "coq${coq.coq-version}-stdpp-1.1";
- src = fetchzip {
- url = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp/-/archive/coq-stdpp-1.1.0/coq-stdpp-coq-stdpp-1.1.0.tar.gz";
- sha256 = "0z8zl288x9w32w06sjax01jcpy12wd5i3ygps58dl2hfy7r3lwg0";
+stdenv.mkDerivation rec {
+ name = "coq${coq.coq-version}-stdpp-${version}";
+ version = "1.2.1";
+ src = fetchFromGitLab {
+ domain = "gitlab.mpi-sws.org";
+ owner = "iris";
+ repo = "stdpp";
+ rev = "coq-stdpp-${version}";
+ sha256 = "1lczybg1jq9drbi8nzrlb0k199x4n07aawjwfzrl3qqc0w8kmvdz";
};
buildInputs = [ coq ];
@@ -14,7 +18,7 @@ stdenv.mkDerivation {
installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
meta = {
- homepage = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp";
+ inherit (src.meta) homepage;
description = "An extended “Standard Library” for Coq";
inherit (coq.meta) platforms;
license = stdenv.lib.licenses.bsd3;
@@ -22,7 +26,7 @@ stdenv.mkDerivation {
};
passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ];
+ compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ];
};
}
diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix
index f03e6e42739a..d1e7ac882d79 100644
--- a/pkgs/development/em-modules/generic/default.nix
+++ b/pkgs/development/em-modules/generic/default.nix
@@ -7,10 +7,11 @@
, meta ? {}, ... } @ args:
pkgs.stdenv.mkDerivation (
- args //
+ args //
{
- name = "emscripten-${args.name}";
+ pname = "emscripten-${args.pname or (builtins.parseDrvName args.name).name}";
+ version = args.version or (builtins.parseDrvName args.name).version;
buildInputs = [ emscripten python ] ++ buildInputs;
nativeBuildInputs = [ emscripten python ] ++ nativeBuildInputs;
diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix
index 592e6ad89994..8377dad690f6 100644
--- a/pkgs/development/guile-modules/guile-cairo/default.nix
+++ b/pkgs/development/guile-modules/guile-cairo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }:
stdenv.mkDerivation rec {
- name = "guile-cairo-${version}";
+ pname = "guile-cairo";
version = "1.10.0";
src = fetchurl {
- url = "mirror://savannah/guile-cairo/${name}.tar.gz";
+ url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz";
sha256 = "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf";
};
diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix
index 26fffac0a131..17f03f67cef5 100644
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/pkgs/development/guile-modules/guile-gnome/default.nix
@@ -5,12 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "guile-gnome-platform";
version = "2.16.4";
src = fetchurl {
- url = "mirror://gnu/guile-gnome/${pname}/${name}.tar.gz";
+ url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz";
sha256 = "adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3";
};
@@ -29,7 +28,7 @@ stdenv.mkDerivation rec {
longDescription = ''
GNU guile-gnome brings the power of Scheme to your graphical application.
guile-gnome modules support the entire Gnome library stack: from Pango to
- GnomeCanvas, Gtk+ to GStreamer, Glade to GtkSourceView, you will find in
+ GnomeCanvas, GTK to GStreamer, Glade to GtkSourceView, you will find in
guile-gnome a comprehensive environment for developing modern
applications.
'';
diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix
index 35bcd7bfc2f3..6ffcc153ec45 100644
--- a/pkgs/development/guile-modules/guile-reader/default.nix
+++ b/pkgs/development/guile-modules/guile-reader/default.nix
@@ -4,11 +4,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "guile-reader-${version}";
+ pname = "guile-reader";
version = "0.6.2";
src = fetchurl {
- url = "http://download.savannah.nongnu.org/releases/guile-reader/${name}.tar.gz";
+ url = "http://download.savannah.nongnu.org/releases/guile-reader/${pname}-${version}.tar.gz";
sha256 = "0592s2s8ampqmqwilc4fvcild6rb9gy79di6vxv5kcdmv23abkgx";
};
diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix
index a606b3ecf288..41bfb2ef62a9 100644
--- a/pkgs/development/guile-modules/guile-sdl/default.nix
+++ b/pkgs/development/guile-modules/guile-sdl/default.nix
@@ -3,12 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "guile-sdl";
version = "0.5.2";
src = fetchurl {
- url = "mirror://gnu/${pname}/${name}.tar.xz";
+ url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01";
};
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f0e53b97266a..c4cca42309db 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -325,6 +325,7 @@ self: super: {
lensref = dontCheck super.lensref;
lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25
lvmrun = disableHardening (dontCheck super.lvmrun) ["format"];
+ matplotlib = dontCheck super.matplotlib;
memcache = dontCheck super.memcache;
MemoTrie = dontHaddock (dontCheck super.MemoTrie);
metrics = dontCheck super.metrics;
@@ -985,25 +986,17 @@ self: super: {
'';
});
- # https://github.com/haskell-rewriting/term-rewriting/issues/11
- term-rewriting = dontCheck (doJailbreak super.term-rewriting);
+ # https://github.com/haskell-rewriting/term-rewriting/pull/15
+ # remove on next hackage update
+ term-rewriting = doJailbreak super.term-rewriting;
- # https://github.com/nick8325/twee/pull/1
- twee-lib = dontHaddock super.twee-lib;
-
- # Needs older hlint
- hpio = dontCheck super.hpio;
-
- # https://github.com/fpco/inline-c/issues/72
- inline-c = dontCheck super.inline-c;
-
- # https://github.com/GaloisInc/pure-zlib/issues/6
+ # https://github.com/GaloisInc/pure-zlib/pull/11
pure-zlib = doJailbreak super.pure-zlib;
- # https://github.com/strake/lenz-template.hs/issues/1
+ # https://github.com/strake/lenz-template.hs/pull/2
lenz-template = doJailbreak super.lenz-template;
- # https://github.com/haskell-hvr/resolv/issues/1
+ # https://github.com/haskell-hvr/resolv/pull/6
resolv = dontCheck super.resolv;
resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2;
@@ -1016,11 +1009,6 @@ self: super: {
testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
});
- arbtt = overrideCabal super.arbtt (drv: {
- preCheck = ''
- for n in $PWD/dist/build/*; do PATH+=":$n"; done
- '';
- });
# This package refers to the wrong library (itself in fact!)
vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
@@ -1031,14 +1019,11 @@ self: super: {
# };
# https://github.com/dmwit/encoding/pull/3
- encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch;
+ encoding = doJailbreak (appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch);
# Work around overspecified constraint on github ==0.18.
github-backup = doJailbreak super.github-backup;
- # https://github.com/fpco/streaming-commons/issues/49
- streaming-commons = dontCheck super.streaming-commons;
-
# Test suite depends on old QuickCheck 2.10.x.
cassava = dontCheck super.cassava;
@@ -1069,16 +1054,9 @@ self: super: {
super.dhall-nix
);
- # https://github.com/well-typed/cborg/issues/174
- cborg = doJailbreak super.cborg;
- serialise = doJailbreak (dontCheck super.serialise);
-
# https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
netrc = doJailbreak super.netrc;
- # https://github.com/phadej/tree-diff/issues/19
- tree-diff = doJailbreak super.tree-diff;
-
# https://github.com/haskell-hvr/hgettext/issues/14
hgettext = doJailbreak super.hgettext;
@@ -1089,23 +1067,6 @@ self: super: {
haddock-library = doJailbreak (dontCheck super.haddock-library);
# haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
- # haskell-names-0.9.4: Break out of “tasty >=0.12 && <1.2”
- haskell-names = doJailbreak super.haskell-names;
-
- # hdocs-0.5.3.1: Break out of “haddock-api ==2.21.*”
- # cannot use doJailbreak due to https://github.com/peti/jailbreak-cabal/issues/7
- hdocs = overrideCabal super.hdocs (drv: {
- postPatch = ''
- sed -i 's#haddock-api == 2\.21\.\*,#haddock-api == 2.22.*,#' hdocs.cabal
- '';
- });
-
- # Break out of tasty >=0.10 && <1.2.
- aeson-compat = doJailbreak super.aeson-compat;
-
- # Break out of pretty-show >=1.6 && <1.9
- hedgehog = doJailbreak super.hedgehog;
-
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: {
@@ -1146,22 +1107,6 @@ self: super: {
# Generate shell completions
purescript = generateOptparseApplicativeCompletion "purs" super.purescript;
- # https://github.com/adinapoli/mandrill/pull/52
- mandrill = appendPatch super.mandrill (pkgs.fetchpatch {
- url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch;
- sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv";
- });
-
- # https://github.com/Euterpea/Euterpea2/pull/22
- Euterpea = overrideSrc super.Euterpea {
- src = pkgs.fetchFromGitHub {
- owner = "Euterpea";
- repo = "Euterpea2";
- rev = "6f49b790adfb8b65d95a758116c20098fb0cd34c";
- sha256 = "0qz1svb96n42nmig16vyphwxas34hypgayvwc91ri7w7xd6yi1ba";
- };
- };
-
# https://github.com/kcsongor/generic-lens/pull/65
generic-lens = dontCheck super.generic-lens;
@@ -1186,7 +1131,6 @@ self: super: {
# Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30
tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1
- these = doJailbreak super.these; # until these >= 0.7.6
uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch {
url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch";
@@ -1198,13 +1142,6 @@ self: super: {
testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql];
});
- # https://github.com/sighingnow/computations/pull/1
- primesieve = appendPatch super.primesieve (pkgs.fetchpatch {
- url = "https://github.com/sighingnow/computations/commit/1f96788367c879b999afe733e2fe28d919d17702.patch";
- sha256 = "0lrcmcrxp9imj9rfaq7mb0fn9mxms4gq4sz95n4san3dpd0qmj9x";
- stripLen = 1;
- });
-
# Fix for base >= 4.11
scat = overrideCabal super.scat (drv: {
patches = [(pkgs.fetchpatch {
@@ -1239,9 +1176,6 @@ self: super: {
# Fix build with attr-2.4.48 (see #53716)
xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;
- # Break out of pandoc >=2.0 && <2.7 (https://github.com/pbrisbin/yesod-markdown/pull/65)
- yesod-markdown = doJailbreak super.yesod-markdown;
-
# These packages needs network 3.x, which is not in LTS-13.x.
network-bsd_2_8_1_0 = super.network-bsd_2_8_1_0.override { network = self.network_3_0_1_1; };
lambdabot-core = super.lambdabot-core.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
@@ -1270,9 +1204,6 @@ self: super: {
# https://github.com/pruvisto/heap/issues/11
heap = dontCheck super.heap;
- # https://github.com/hslua/tasty-lua/issues/1
- tasty-lua = dontCheck super.tasty-lua;
-
# Test suite won't link for no apparent reason.
constraints-deriving = dontCheck super.constraints-deriving;
@@ -1280,7 +1211,7 @@ self: super: {
hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_0_20190723; };
# https://github.com/sol/hpack/issues/366
- hpack = dontCheck super.hpack;
+ hpack = self.hpack_0_32_0;
# QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7
graphviz = dontCheck super.graphviz;
@@ -1288,4 +1219,13 @@ self: super: {
# https://github.com/elliottt/hsopenid/issues/15
openid = markBroken super.openid;
+ # The test suite needs the packages's executables in $PATH to succeed.
+ arbtt = overrideCabal super.arbtt (drv: {
+ preCheck = ''
+ for i in $PWD/dist/build/*; do
+ export PATH="$i:$PATH"
+ done
+ '';
+ });
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 76aabb915618..8e796aa3f1fd 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -43,8 +43,8 @@ self: super: {
stm = self.stm_2_5_0_0;
text = self.text_1_2_4_0;
- # Build with the latest Cabal version, which works best albeit not perfectly.
- jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_2_2_0_1; };
+ # Needs Cabal 3.0.x.
+ jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; };
# https://github.com/bmillwood/applicative-quoters/issues/6
applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 0919292d44a5..513c55ea9e9c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -42,6 +42,7 @@ self: super: {
# Needs Cabal 3.0.x.
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; });
+ jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; };
# Restricts aeson to <1.4
# https://github.com/purescript/purescript/pull/3537
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 4addc834040a..d2e463b123c0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -43,6 +43,7 @@ self: super: {
# Needs Cabal 3.0.x.
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; });
+ jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; };
# https://github.com/tibbe/unordered-containers/issues/214
unordered-containers = dontCheck super.unordered-containers;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 2209f5707323..69bd3844c9c4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -59,7 +59,6 @@ self: super: {
split = doJailbreak super.split;
tasty-expected-failure = doJailbreak super.tasty-expected-failure;
test-framework = doJailbreak super.test-framework;
- th-lift = self.th-lift_0_8_0_1;
# These packages don't work and need patching and/or an update.
primitive = overrideSrc (doJailbreak super.primitive) {
@@ -71,29 +70,11 @@ self: super: {
sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q";
};
};
- tar = overrideCabal (appendPatch super.tar (pkgs.fetchpatch {
- url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/tar-0.5.1.0.patch";
- sha256 = "1inbfpamfdpi3yfac59j5xpaq5fvh5g1ca8hlbpic1bizd3s03i0";
- })) (drv: {
- configureFlags = ["-f-old-time"];
- editedCabalFile = null;
- preConfigure = ''
- cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/tar-0.5.1.0.cabal"; sha256 = "1lydbwsmccf2av0g61j07bx7r5mzbcfgwvmh0qwg3a91857x264x";}} tar.cabal
- sed -i -e 's/time < 1.9/time < 2/' tar.cabal
- '';
- });
- dlist = appendPatch (doJailbreak super.dlist) (pkgs.fetchpatch {
- url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/dlist-0.8.0.6.patch";
- sha256 = "0lkhibfxfk6mi796mrjgmbb50hbyjgc7xdinci64dahj8325jlpc";
- });
vector-th-unbox = appendPatch super.vector-th-unbox (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch";
sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19";
});
- cabal-doctest = appendPatch (doJailbreak super.cabal-doctest) (pkgs.fetchpatch {
- url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cabal-doctest-1.0.6.patch";
- sha256 = "0735mkxhv557pgnfvdjakkw9r85l5gy28grdwg929m26ghbf9s8j";
- });
+ cabal-doctest = super.cabal-doctest_1_0_7;
regex-base = overrideCabal (appendPatch super.regex-base (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch";
sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1";
@@ -104,15 +85,7 @@ self: super: {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch";
sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2";
});
- th-abstraction = appendPatch (doJailbreak super.th-abstraction) (pkgs.fetchpatch {
- url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/th-abstraction-0.2.11.0.patch";
- sha256 = "0czqfszfblz6bvsybcd1z5jijj79f9czqq6dn992wp2gibsbrgj3";
- });
- zlib = appendPatch super.zlib (pkgs.fetchpatch {
- url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/zlib-0.6.2.patch";
- sha256 = "13fy730z9ihyc9kw3qkh642mi0bdbd7bz01dksj1zz845pr9jjif";
- });
- haskell-src-exts = appendPatch super.haskell-src-exts_1_21_0 (pkgs.fetchpatch {
+ haskell-src-exts = appendPatch super.haskell-src-exts (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/haskell-src-exts-1.21.0.patch";
sha256 = "0alb28hcsp774c9s73dgrajcb44vgv1xqfg2n5a9y2bpyngqscs3";
});
@@ -125,8 +98,8 @@ self: super: {
sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
});
happy = appendPatch super.happy (pkgs.fetchpatch {
- url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.9.patch";
- sha256 = "1zmcb7dgcwivq2mddcy1f20djw2kds1m7ahwsa4xpbbwnijc6zjx";
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.11.patch";
+ sha256 = "16m659kxbq0s87ak2y1pqggfy67yfvcwc0zi3hcphf3v8735xhkk";
});
hedgehog = appendPatch super.hedgehog (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hedgehog-0.6.1.patch";
@@ -137,15 +110,10 @@ self: super: {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
});
- unordered-containers = self.unordered-containers_0_2_10_0;
- attoparsec = appendPatch super.attoparsec (pkgs.fetchpatch {
+ attoparsec = appendPatch (doJailbreak super.attoparsec) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch";
sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl";
});
- aeson = appendPatch (dontCheck super.aeson) (pkgs.fetchpatch { # the test suite breaks the compiler
- url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/aeson-1.4.3.0.patch";
- sha256 = "1z6wmsmc682qs3y768r0zx493dxardwbsp0wdc4dsx83c0m5x66f";
- });
cassava = appendPatch super.cassava (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch";
sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g";
@@ -154,9 +122,51 @@ self: super: {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch";
sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y";
});
+ socks = appendPatch super.socks (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch";
+ sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp";
+ });
lens = appendPatch (doJailbreak super.lens) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/lens-4.17.1.patch";
sha256 = "0w89ipi6dfkx5vlw4a64hh6fd0bm9hg33mwpghliyyxik5jmilv1";
});
-
+ polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch";
+ sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5";
+ });
+ foundation = dontCheck super.foundation;
+ memory = overrideCabal (appendPatch super.memory (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/memory-0.14.18.patch";
+ sha256 = "16ar8921s3bi31y1az9zgyg0iaxxc2wvvwqjnl11a17p03wi6b29";
+ })) (drv: {
+ editedCabalFile = null;
+ preConfigure = ''
+ cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/memory-0.14.18.cabal"; sha256 = "1325wny0irnq51rz0f4xgkvm01p6n4z5jid2jgpkhjac8a2sdgwl";}} memory.cabal
+ '';
+ });
+ chell = overrideCabal (doJailbreak super.chell) (_drv: {
+ broken = false;
+ });
+ th-expand-syns = doJailbreak super.th-expand-syns;
+ shelly = overrideCabal (appendPatch (doJailbreak super.shelly) (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shelly-1.8.1.patch";
+ sha256 = "1kglbwrr4ra81v9x3bfsk5l6pyl0my2a1zkr3qjjx7acn0dfpgbc";
+ })) (drv: {
+ editedCabalFile = null;
+ preConfigure = ''
+ cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shelly-1.8.1.cabal"; sha256 = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0";}} shelly.cabal
+ sed -i -e 's/< 1.9,/< 2,/' shelly.cabal # bump time version
+ '';
+ });
+ system-fileio = doJailbreak super.system-fileio;
+ yaml = self.yaml_0_11_1_2;
+ haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
+ url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.2.patch";
+ sha256 = "146im1amywyl29kcldvgrxpwj22lrpzxysl7vc8rmn3hrq130dyc";
+ });
+ asn1-encoding = appendPatch (dontCheck (doJailbreak super.asn1-encoding)) (pkgs.fetchpatch {
+ url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch";
+ sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5";
+ });
+ tls = self.tls_1_5_1;
}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0a269acbdb6f..c0692d975df4 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
- # LTS Haskell 14.3
+ # LTS Haskell 14.5
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -64,7 +64,7 @@ default-package-overrides:
- aeson-extra ==0.4.1.2
- aeson-generic-compat ==0.0.1.3
- aeson-iproute ==0.2
- - aeson-picker ==0.1.0.4
+ - aeson-picker ==0.1.0.5
- aeson-pretty ==0.8.7
- aeson-qq ==0.8.2
- aeson-utils ==0.3.0.2
@@ -121,7 +121,7 @@ default-package-overrides:
- atom-basic ==0.2.5
- atomic-primops ==0.8.3
- atomic-write ==0.2.0.6
- - attoparsec ==0.13.2.2
+ - attoparsec ==0.13.2.3
- attoparsec-base64 ==0.0.0
- attoparsec-binary ==0.2
- attoparsec-expr ==0.1.1.2
@@ -176,7 +176,7 @@ default-package-overrides:
- bencoding ==0.4.5.1
- between ==0.11.0.0
- bibtex ==0.1.0.6
- - bifunctors ==5.5.4
+ - bifunctors ==5.5.5
- bimap ==0.4.0
- bimap-server ==0.1.0.1
- binary-bits ==0.5
@@ -264,7 +264,7 @@ default-package-overrides:
- c2hs ==0.28.6
- Cabal ==2.4.1.0
- cabal2spec ==2.2.2.1
- - cabal-doctest ==1.0.6
+ - cabal-doctest ==1.0.7
- cabal-file-th ==0.2.6
- cache ==0.1.1.2
- cacophony ==0.10.1
@@ -275,8 +275,8 @@ default-package-overrides:
- cased ==0.1.0.0
- case-insensitive ==1.2.0.11
- cases ==0.1.3.2
- - casing ==0.1.4.0
- - cassava ==0.5.1.0
+ - casing ==0.1.4.1
+ - cassava ==0.5.2.0
- cassava-conduit ==0.5.1
- cassava-megaparsec ==2.0.0
- cassava-records ==0.1.0.4
@@ -304,7 +304,7 @@ default-package-overrides:
- cheapskate-highlight ==0.1.0.0
- cheapskate-lucid ==0.1.0.0
- check-email ==1.0.2
- - checkers ==0.5.0
+ - checkers ==0.5.2
- checksum ==0.0
- chimera ==0.2.0.0
- choice ==0.2.2
@@ -383,7 +383,7 @@ default-package-overrides:
- configurator ==0.3.0.0
- configurator-export ==0.1.0.1
- configurator-pg ==0.1.0.3
- - connection ==0.3.0
+ - connection ==0.3.1
- connection-pool ==0.2.2
- console-style ==0.0.2.1
- constraint ==0.1.3.0
@@ -412,7 +412,7 @@ default-package-overrides:
- crackNum ==2.3
- crc32c ==0.0.0
- credential-store ==0.1.2
- - criterion ==1.5.5.0
+ - criterion ==1.5.6.0
- criterion-measurement ==0.1.2.0
- cron ==0.6.1
- crypto-api ==0.13.3
@@ -511,7 +511,7 @@ default-package-overrides:
- dependent-sum-template ==0.0.0.6
- deque ==0.4.2.3
- deriveJsonNoPrefix ==0.1.0.1
- - deriving-compat ==0.5.6
+ - deriving-compat ==0.5.7
- derulo ==1.0.5
- detour-via-sci ==1.0.0
- dhall ==1.24.0
@@ -538,7 +538,7 @@ default-package-overrides:
- disk-free-space ==0.1.0.1
- distributed-closure ==0.4.1.1
- distribution-opensuse ==1.1.1
- - distributive ==0.6
+ - distributive ==0.6.1
- dl-fedora ==0.5
- dlist ==0.8.0.7
- dlist-instances ==0.1.1.1
@@ -547,7 +547,7 @@ default-package-overrides:
- dockerfile ==0.2.0
- docopt ==0.7.0.5
- doctemplates ==0.2.2.1
- - doctest ==0.16.1
+ - doctest ==0.16.2
- doctest-discover ==0.2.0.0
- doctest-driver-gen ==0.3.0.1
- doldol ==0.4.1.2
@@ -596,10 +596,10 @@ default-package-overrides:
- elm-street ==0.0.1
- emacs-module ==0.1.1
- email-validate ==2.3.2.11
- - emd ==0.1.4.0
+ - emd ==0.1.5.1
- enclosed-exceptions ==1.0.3
- ENIG ==0.0.1.0
- - entropy ==0.4.1.4
+ - entropy ==0.4.1.5
- enummapset ==0.6.0.2
- enumset ==0.0.5
- enum-subset-generate ==0.1.0.0
@@ -629,7 +629,7 @@ default-package-overrides:
- exact-pi ==0.5.0.1
- exceptional ==0.3.0.0
- exception-mtl ==0.4.0.1
- - exceptions ==0.10.2
+ - exceptions ==0.10.3
- exception-transformers ==0.4.0.7
- executable-hash ==0.2.0.4
- executable-path ==0.0.3.1
@@ -648,7 +648,7 @@ default-package-overrides:
- farmhash ==0.1.0.5
- fast-builder ==0.1.1.0
- fast-digits ==0.2.1.0
- - fast-logger ==2.4.16
+ - fast-logger ==2.4.17
- fast-math ==1.0.2
- fb ==2.0.0
- fclabels ==2.0.3.3
@@ -708,8 +708,8 @@ default-package-overrides:
- forma ==1.1.2
- format-numbers ==0.1.0.0
- formatting ==6.3.7
- - foundation ==0.0.24
- - free ==5.1.1
+ - foundation ==0.0.25
+ - free ==5.1.2
- freenect ==1.2.1
- freer-simple ==1.2.1.0
- freetype2 ==0.1.2
@@ -724,12 +724,12 @@ default-package-overrides:
- function-builder ==0.3.0.1
- functor-classes-compat ==1
- functor-combinators ==0.1.1.1
- - fused-effects ==0.5.0.0
+ - fused-effects ==0.5.0.1
- fuzzcheck ==0.1.1
- fuzzy-dates ==0.1.1.1
- fuzzyset ==0.1.1
- galois-field ==0.3.0
- - gauge ==0.2.4
+ - gauge ==0.2.5
- gc ==0.0.3
- gd ==3000.7.3
- gdp ==0.0.0.2
@@ -764,7 +764,7 @@ default-package-overrides:
- genvalidity-uuid ==0.1.0.2
- genvalidity-vector ==0.3.0.0
- geojson ==4.0.1
- - getopt-generics ==0.13.0.3
+ - getopt-generics ==0.13.0.4
- ghc-compact ==0.1.0.0
- ghc-core ==0.5.6
- ghc-exactprint ==0.6.1
@@ -778,7 +778,7 @@ default-package-overrides:
- ghc-prof ==1.4.1.5
- ghc-syntax-highlighter ==0.0.4.0
- ghc-tcplugins-extra ==0.3
- - ghc-typelits-extra ==0.3
+ - ghc-typelits-extra ==0.3.1
- ghc-typelits-knownnat ==0.6
- ghc-typelits-natnormalise ==0.6.2
- ghost-buster ==0.1.1.0
@@ -796,7 +796,7 @@ default-package-overrides:
- ginger ==0.9.1.0
- gingersnap ==0.3.1.0
- gi-pango ==1.0.22
- - githash ==0.1.3.1
+ - githash ==0.1.3.2
- github-release ==1.2.4
- github-types ==0.2.1
- github-webhooks ==0.10.1
@@ -845,14 +845,14 @@ default-package-overrides:
- hackage-db ==2.0.1
- hackage-security ==0.5.3.0
- haddock-library ==1.7.0
- - hadolint ==1.17.1
+ - hadolint ==1.17.2
- half ==0.3
- hamilton ==0.1.0.3
- hamtsolo ==1.0.3
- HandsomeSoup ==0.4.2
- hapistrano ==0.3.9.3
- - happy ==1.19.11
- - hasbolt ==0.1.3.4
+ - happy ==1.19.12
+ - hasbolt ==0.1.3.5
- hashable ==1.2.7.0
- hashable-time ==0.2.0.2
- hashids ==1.0.2.4
@@ -863,14 +863,14 @@ default-package-overrides:
- haskell-gi-base ==0.23.0
- haskell-gi-overloading ==1.0
- haskell-lexer ==1.0.2
- - haskell-lsp ==0.15.0.0
- - haskell-lsp-types ==0.15.0.0
+ - haskell-lsp ==0.15.0.1
+ - haskell-lsp-types ==0.15.0.1
- haskell-names ==0.9.6
- haskell-spacegoo ==0.2.0.1
- haskell-src ==1.0.3.0
- - haskell-src-exts ==1.21.0
+ - haskell-src-exts ==1.21.1
- haskell-src-exts-util ==0.2.5
- - haskell-src-meta ==0.8.2
+ - haskell-src-meta ==0.8.3
- haskey-btree ==0.3.0.1
- haskintex ==0.8.0.0
- haskoin-core ==0.9.0
@@ -893,7 +893,7 @@ default-package-overrides:
- hedgehog ==1.0
- hedgehog-corpus ==0.1.0
- hedgehog-fn ==1.0
- - hedis ==0.12.7
+ - hedis ==0.12.8
- hedn ==0.2.0.1
- here ==1.2.13
- heredoc ==0.2.0.0
@@ -944,7 +944,7 @@ default-package-overrides:
- hruby ==0.3.8
- hsass ==0.8.0
- hs-bibutils ==6.7.0.0
- - hsc2hs ==0.68.4
+ - hsc2hs ==0.68.6
- hschema ==0.0.1.1
- hschema-aeson ==0.0.1.1
- hschema-prettyprinter ==0.0.1.1
@@ -1037,7 +1037,7 @@ default-package-overrides:
- hw-fingertree ==0.1.1.0
- hw-fingertree-strict ==0.1.1.1
- hw-hedgehog ==0.1.0.3
- - hw-hspec-hedgehog ==0.1.0.7
+ - hw-hspec-hedgehog ==0.1.0.8
- hw-int ==0.0.0.3
- hw-ip ==2.3.4.1
- hw-json ==1.0.0.2
@@ -1094,7 +1094,7 @@ default-package-overrides:
- inline-r ==0.10.2
- inliterate ==0.1.0
- insert-ordered-containers ==0.2.2
- - inspection-testing ==0.4.2.1
+ - inspection-testing ==0.4.2.2
- instance-control ==0.1.2.0
- int-cast ==0.2.0.0
- integer-logarithms ==1.0.3
@@ -1164,7 +1164,7 @@ default-package-overrides:
- kdt ==0.2.4
- keycode ==0.2.2
- keys ==3.12.2
- - kind-apply ==0.3.1.0
+ - kind-apply ==0.3.2.0
- kind-generics ==0.3.0.0
- kind-generics-th ==0.1.1.0
- kleene ==0.1
@@ -1276,11 +1276,11 @@ default-package-overrides:
- markdown ==0.1.17.4
- markdown-unlit ==0.5.0
- markov-chain ==0.0.3.4
- - massiv ==0.4.0.0
+ - massiv ==0.4.1.0
- massiv-io ==0.1.6.0
- massiv-test ==0.1.0
- mathexpr ==0.3.0.0
- - math-functions ==0.3.1.0
+ - math-functions ==0.3.2.0
- matplotlib ==0.7.4
- matrices ==0.5.0
- matrix ==0.3.6.1
@@ -1329,6 +1329,7 @@ default-package-overrides:
- missing-foreign ==0.1.1
- MissingH ==1.4.1.0
- mixed-types-num ==0.4.0.1
+ - mixpanel-client ==0.2.1
- mltool ==0.2.0.1
- mmap ==0.5.9
- mmark ==0.0.7.1
@@ -1376,7 +1377,7 @@ default-package-overrides:
- mono-traversable-keys ==0.1.0
- more-containers ==0.2.1.2
- mountpoints ==1.0.2
- - mpi-hs ==0.5.1.2
+ - mpi-hs ==0.5.3.0
- msgpack ==1.0.1.0
- msgpack-aeson ==0.1.0.0
- mtl ==2.2.2
@@ -1469,7 +1470,7 @@ default-package-overrides:
- oblivious-transfer ==0.1.0
- odbc ==0.2.2
- oeis ==0.3.9
- - oeis2 ==1.0.2
+ - oeis2 ==1.0.3
- ofx ==0.4.2.0
- old-locale ==1.0.0.7
- old-time ==1.1.0.3
@@ -1512,7 +1513,7 @@ default-package-overrides:
- pandoc-markdown-ghci-filter ==0.1.0.0
- pandoc-pyplot ==2.1.5.1
- pandoc-types ==1.17.6
- - pantry ==0.1.1.1
+ - pantry ==0.1.1.2
- parallel ==3.2.2.0
- parallel-io ==0.3.3
- paripari ==0.6.0.0
@@ -1568,11 +1569,11 @@ default-package-overrides:
- pg-harness-client ==0.6.0
- pg-harness-server ==0.6.2
- pgp-wordlist ==0.1.0.3
- - pg-transact ==0.1.0.1
+ - pg-transact ==0.1.2.0
- phantom-state ==0.2.1.2
- pid1 ==0.1.2.0
- pinboard ==0.10.1.4
- - pipes ==4.3.11
+ - pipes ==4.3.12
- pipes-aeson ==0.4.1.8
- pipes-attoparsec ==0.5.1.5
- pipes-binary ==0.4.2
@@ -1590,7 +1591,7 @@ default-package-overrides:
- pipes-network-tls ==0.3
- pipes-parse ==3.0.8
- pipes-random ==1.0.0.5
- - pipes-safe ==2.3.1
+ - pipes-safe ==2.3.2
- pipes-wai ==3.2.0
- pkcs10 ==0.2.0.0
- placeholders ==0.1
@@ -1605,7 +1606,7 @@ default-package-overrides:
- polynomials-bernstein ==1.1.2
- polyparse ==1.12.1
- polysemy ==1.0.0.0
- - polysemy-plugin ==0.2.2.0
+ - polysemy-plugin ==0.2.3.0
- polysemy-zoo ==0.5.0.1
- pooled-io ==0.0.2.2
- port-utils ==0.2.1.0
@@ -1676,9 +1677,10 @@ default-package-overrides:
- psqueues ==0.2.7.2
- pureMD5 ==2.1.3
- purescript-bridge ==0.13.0.0
- - pure-zlib ==0.6.4
+ - pure-zlib ==0.6.6
- pushbullet-types ==0.4.1.0
- pusher-http-haskell ==1.5.1.9
+ - PyF ==0.8.1.0
- qchas ==1.1.0.1
- qm-interpolated-string ==0.3.0.0
- qnap-decrypt ==0.3.5
@@ -1720,7 +1722,7 @@ default-package-overrides:
- ratel ==1.0.8
- ratel-wai ==1.1.0
- rattle ==0.1
- - rattletrap ==9.0.1
+ - rattletrap ==9.0.2
- rawfilepath ==0.2.4
- rawstring-qm ==0.2.3.0
- raw-strings-qq ==1.1
@@ -1731,7 +1733,7 @@ default-package-overrides:
- read-editor ==0.1.0.2
- read-env-var ==1.0.0.0
- reanimate ==0.1.5.0
- - reanimate-svg ==0.9.0.0
+ - reanimate-svg ==0.9.1.0
- rebase ==1.3.1.1
- record-dot-preprocessor ==0.2
- record-hasfield ==1.0
@@ -1740,7 +1742,7 @@ default-package-overrides:
- reducers ==3.12.3
- refact ==0.3.0.2
- references ==0.3.3.1
- - reflection ==2.1.4
+ - reflection ==2.1.5
- RefSerialize ==0.4.0
- regex ==1.0.2.0
- regex-applicative ==0.3.3.1
@@ -1785,7 +1787,7 @@ default-package-overrides:
- rhine ==0.5.1.0
- rhine-gloss ==0.5.1.0
- rigel-viz ==0.2.0.0
- - rio ==0.1.11.0
+ - rio ==0.1.12.0
- rio-orphans ==0.1.1.0
- rio-prettyprint ==0.1.0.0
- roc-id ==0.1.0.0
@@ -1809,9 +1811,9 @@ default-package-overrides:
- safe-json ==0.1.0
- safe-money ==0.9
- SafeSemaphore ==0.10.1
- - salak ==0.3.5.1
- - salak-toml ==0.3.5.1
- - salak-yaml ==0.3.5.1
+ - salak ==0.3.5.3
+ - salak-toml ==0.3.5.3
+ - salak-yaml ==0.3.5.3
- saltine ==0.1.0.2
- salve ==1.0.6
- sample-frame ==0.0.3
@@ -1827,7 +1829,7 @@ default-package-overrides:
- scanner ==0.3
- scheduler ==1.4.2
- scientific ==0.3.6.2
- - scotty ==0.11.4
+ - scotty ==0.11.5
- scrypt ==0.5.0
- sdl2 ==2.5.0.0
- sdl2-gfx ==0.2
@@ -1843,7 +1845,7 @@ default-package-overrides:
- selective ==0.3
- semialign ==1
- semigroupoid-extras ==5
- - semigroupoids ==5.3.2
+ - semigroupoids ==5.3.3
- semigroups ==0.18.5
- semirings ==0.4.2
- semiring-simple ==1.0.0.1
@@ -1873,7 +1875,7 @@ default-package-overrides:
- servant-http-streams ==0.16
- servant-js ==0.9.4
- servant-JuicyPixels ==0.3.0.4
- - servant-kotlin ==0.1.1.8
+ - servant-kotlin ==0.1.1.9
- servant-lucid ==0.9
- servant-machines ==0.15
- servant-mock ==0.8.5
@@ -1900,7 +1902,7 @@ default-package-overrides:
- sexpr-parser ==0.1.1.2
- SHA ==1.6.4.4
- shake-language-c ==0.12.0
- - shakespeare ==2.0.20
+ - shakespeare ==2.0.21
- shared-memory ==0.2.0.0
- shell-conduit ==4.7.0
- shell-escape ==0.2.0
@@ -1929,7 +1931,7 @@ default-package-overrides:
- simplistic-generics ==0.1.0.0
- since ==0.0.0
- singleton-bool ==0.1.5
- - singleton-nats ==0.4.2
+ - singleton-nats ==0.4.3
- singletons ==2.5.1
- siphash ==1.0.3
- size-based ==0.1.2.0
@@ -1958,7 +1960,6 @@ default-package-overrides:
- sox ==0.2.3.1
- soxlib ==0.0.3.1
- sparse-linear-algebra ==0.3.1
- - sparse-tensor ==0.2.1
- spatial-math ==0.5.0.1
- special-values ==0.1.0.0
- speculate ==0.3.5
@@ -2059,14 +2060,14 @@ default-package-overrides:
- tagstream-conduit ==0.5.5.3
- tao ==1.0.0
- tao-example ==1.0.0
- - tar ==0.5.1.0
+ - tar ==0.5.1.1
- tar-conduit ==0.3.2
- tardis ==0.4.1.0
- tasty ==1.2.3
- tasty-ant-xml ==1.1.6
- tasty-dejafu ==2.0.0.1
- tasty-discover ==4.2.1
- - tasty-expected-failure ==0.11.1.1
+ - tasty-expected-failure ==0.11.1.2
- tasty-golden ==2.3.2
- tasty-hedgehog ==1.0.0.1
- tasty-hspec ==1.1.5.1
@@ -2117,7 +2118,7 @@ default-package-overrides:
- text-region ==0.3.1.0
- text-short ==0.1.3
- text-show ==3.8.2
- - text-show-instances ==3.8.1
+ - text-show-instances ==3.8.2
- text-zipper ==0.10.1
- tfp ==1.0.1.1
- tf-random ==0.5
@@ -2125,12 +2126,12 @@ default-package-overrides:
- th-data-compat ==0.0.2.7
- th-desugar ==1.9
- these ==1.0.1
- - th-expand-syns ==0.4.4.0
+ - th-expand-syns ==0.4.5.0
- th-extras ==0.0.0.4
- th-lift ==0.8.0.1
- th-lift-instances ==0.1.14
- th-nowq ==0.1.0.3
- - th-orphans ==0.13.7
+ - th-orphans ==0.13.8
- th-printf ==0.6.0
- thread-hierarchy ==0.3.0.1
- thread-local-storage ==0.2
@@ -2194,7 +2195,7 @@ default-package-overrides:
- trivial-constraint ==0.6.0.0
- true-name ==0.1.0.3
- tsv2csv ==0.1.0.2
- - ttl-hashtables ==1.3.1.0
+ - ttl-hashtables ==1.3.1.1
- ttrie ==0.1.2.1
- tuple ==0.3.0.2
- tuples-homogenous-h98 ==0.1.1.0
@@ -2306,9 +2307,9 @@ default-package-overrides:
- vector-split ==1.0.0.2
- vector-th-unbox ==0.2.1.6
- verbosity ==0.3.0.0
- - versions ==3.5.1
+ - versions ==3.5.1.1
- ViennaRNAParser ==1.3.3
- - viewprof ==0.0.0.28
+ - viewprof ==0.0.0.29
- vinyl ==0.11.0
- vivid ==0.4.2.3
- vivid-osc ==0.5.0.0
@@ -2363,7 +2364,7 @@ default-package-overrides:
- windns ==0.1.0.1
- winery ==1.1.2
- wire-streams ==0.1.1.0
- - witherable ==0.3.2
+ - witherable ==0.3.3
- with-location ==0.1.0
- witness ==0.4
- wizards ==1.0.3
@@ -2406,7 +2407,7 @@ default-package-overrides:
- xml-conduit-parse ==0.3.1.2
- xml-conduit-writer ==0.1.1.2
- xmlgen ==0.6.2.2
- - xml-hamlet ==0.5.0
+ - xml-hamlet ==0.5.0.1
- xml-html-qq ==0.1.0.1
- xml-indexed-cursor ==0.1.1.0
- xml-isogen ==0.3.0
@@ -2420,17 +2421,17 @@ default-package-overrides:
- xmonad-extras ==0.15.1
- xss-sanitize ==0.3.6
- xxhash-ffi ==0.2.0.0
- - yaml ==0.11.1.1
+ - yaml ==0.11.1.2
- yeshql ==4.1.0.1
- yeshql-core ==4.1.0.2
- yeshql-hdbc ==4.1.0.2
- yesod ==1.6.0
- yesod-alerts ==0.1.3.0
- - yesod-auth ==1.6.7
+ - yesod-auth ==1.6.8
- yesod-auth-hashdb ==1.7.1.1
- - yesod-auth-oauth2 ==0.6.1.1
+ - yesod-auth-oauth2 ==0.6.1.2
- yesod-bin ==1.6.0.3
- - yesod-core ==1.6.15
+ - yesod-core ==1.6.16.1
- yesod-csp ==0.2.5.0
- yesod-eventsource ==1.6.0
- yesod-fb ==0.5.0
@@ -2461,7 +2462,7 @@ default-package-overrides:
- zip-archive ==0.4.1
- zippers ==0.3
- zip-stream ==0.2.0.1
- - zlib ==0.6.2
+ - zlib ==0.6.2.1
- zlib-bindings ==0.1.1.5
- zlib-lens ==0.1.2.1
- zot ==0.0.3
@@ -3115,6 +3116,7 @@ broken-packages:
- armor
- arpa
- arpack
+ - array-chunks
- array-forth
- array-primops
- arraylist
@@ -3366,7 +3368,9 @@ broken-packages:
- Biobase
- BiobaseBlast
- BiobaseDotP
+ - BiobaseENA
- BiobaseEnsembl
+ - BiobaseFasta
- BiobaseFR3D
- BiobaseHTTP
- BiobaseHTTPTools
@@ -3375,7 +3379,9 @@ broken-packages:
- BiobaseNewick
- BiobaseTrainingData
- BiobaseTurner
+ - BiobaseTypes
- BiobaseVienna
+ - BiobaseXNA
- biocore
- biofasta
- biofastq
@@ -3388,7 +3394,6 @@ broken-packages:
- birch-beer
- bird
- BirdPP
- - bisc
- bisect-binary
- bit-array
- bit-stream
@@ -3593,8 +3598,6 @@ broken-packages:
- cabin
- cabocha
- cached
- - cachix
- - cachix-api
- cacophony
- caffegraph
- cairo-core
@@ -3948,6 +3951,7 @@ broken-packages:
- Conscript
- consistent
- const-math-ghc-plugin
+ - constr-eq
- constrained-categories
- constrained-category
- constrained-dynamic
@@ -4090,6 +4094,7 @@ broken-packages:
- ctpl
- cube
- cuboid
+ - cuckoo
- cudd
- currency-convert
- curry-frontend
@@ -4488,6 +4493,7 @@ broken-packages:
- DysFRP-Cairo
- DysFRP-Craftwerk
- dywapitchtrack
+ - dzen-dhall
- dzen-utils
- earclipper
- ease
@@ -4533,6 +4539,7 @@ broken-packages:
- ekg-rrd
- elevator
- elision
+ - elliptic-curve
- elm-websocket
- elsa
- emacs-keys
@@ -4548,7 +4555,6 @@ broken-packages:
- Empty
- empty-monad
- enchant
- - encoding
- encoding-io
- engine-io-growler
- engine-io-snap
@@ -4620,7 +4626,6 @@ broken-packages:
- euler-tour-tree
- euphoria
- eurofxref
- - Euterpea
- eve
- eve-cli
- event
@@ -4960,6 +4965,7 @@ broken-packages:
- funpat
- funsat
- fusion
+ - futhark
- futun
- future
- fuzzy-timings
@@ -5035,6 +5041,7 @@ broken-packages:
- GenSmsPdu
- gentlemark
- GenussFold
+ - genvalidity-mergeless
- geo-resolver
- GeocoderOpenCage
- geodetic
@@ -5366,6 +5373,7 @@ broken-packages:
- hakismet
- hakka
- hako
+ - hakyll
- hakyll-agda
- hakyll-blaze-templates
- hakyll-contrib
@@ -5819,6 +5827,7 @@ broken-packages:
- hiccup
- hichi
- hid-examples
+ - hie-core
- hieraclus
- hierarchical-clustering
- hierarchical-clustering-diagrams
@@ -5926,8 +5935,6 @@ broken-packages:
- hmt-diagrams
- hmumps
- hnetcdf
- - hnix
- - hnix-store-remote
- HNM
- hnormalise
- ho-rewriting
@@ -6299,6 +6306,7 @@ broken-packages:
- hw-json-simple-cursor
- hw-json-standard-cursor
- hw-packed-vector
+ - hw-prim-bits
- hw-rankselect
- hw-rankselect-base
- hw-simd
@@ -6353,6 +6361,7 @@ broken-packages:
- hypher
- hzulip
- i18n
+ - I1M
- i3blocks-hs-contrib
- i3ipc
- iap-verifier
@@ -6658,6 +6667,7 @@ broken-packages:
- katydid
- kawaii
- kawhi
+ - kazura-queue
- kd-tree
- kdesrc-build-extra
- keccak
@@ -6882,6 +6892,7 @@ broken-packages:
- liblawless
- liblinear-enumerator
- libltdl
+ - libmodbus
- libmolude
- liboath-hs
- liboleg
@@ -7150,7 +7161,6 @@ broken-packages:
- mathflow
- mathgenealogy
- mathlink
- - matplotlib
- matrix-as-xyz
- matsuri
- matterhorn
@@ -7423,6 +7433,7 @@ broken-packages:
- multibase
- multifocal
- multihash
+ - multihash-cryptonite
- multihash-serialise
- multilinear
- multilinear-io
@@ -7788,6 +7799,7 @@ broken-packages:
- pandoc-japanese-filters
- pandoc-lens
- pandoc-markdown-ghci-filter
+ - pandoc-placetable
- pandoc-plantuml-diagrams
- pandoc-pyplot
- pandoc-unlit
@@ -8005,6 +8017,7 @@ broken-packages:
- plat
- platinum-parsing
- PlayingCards
+ - plex
- plist-buddy
- plocketed
- plot
@@ -8074,6 +8087,7 @@ broken-packages:
- postgresql-query
- postgresql-simple-bind
- postgresql-simple-named
+ - postgresql-simple-opts
- postgresql-simple-queue
- postgresql-simple-sop
- postgresql-simple-typed
@@ -8677,6 +8691,7 @@ broken-packages:
- scenegraph
- schedevr
- schedule-planner
+ - scheduler
- schedyield
- schematic
- scholdoc
@@ -8760,6 +8775,7 @@ broken-packages:
- seqloc
- seqloc-datafiles
- sequence-formats
+ - sequenceTools
- sequent-core
- sequor
- serialize-instances
@@ -8776,7 +8792,6 @@ broken-packages:
- servant-auth-token-leveldb
- servant-auth-token-persistent
- servant-auth-token-rocksdb
- - servant-checked-exceptions
- servant-cli
- servant-client-namedargs
- servant-csharp
@@ -8805,7 +8820,6 @@ broken-packages:
- servant-pushbullet-client
- servant-py
- servant-quickcheck
- - servant-rawm
- servant-reason
- servant-reflex
- servant-router
@@ -9807,6 +9821,7 @@ broken-packages:
- unagi-streams
- unamb-custom
- unbound
+ - unbound-kind-generics
- unbounded-delays-units
- unboxed-containers
- unbreak
@@ -10208,7 +10223,6 @@ broken-packages:
- xkcd
- xleb
- xlsior
- - xlsx
- xlsx-tabular
- xlsx-templater
- xml-catalog
@@ -10265,7 +10279,10 @@ broken-packages:
- yahoo-web-search
- yajl
- yajl-enumerator
+ - yam
+ - yam-datasource
- yam-job
+ - yam-redis
- yam-servant
- yam-transaction-odbc
- yam-web
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 29483b56a7db..88ec8ad85ff0 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -94,7 +94,12 @@ self: super: builtins.intersectAttrs super {
# Won't find it's header files without help.
sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
- cachix = enableSeparateBinOutput super.cachix;
+ cachix = overrideCabal (addBuildTools (enableSeparateBinOutput super.cachix) [pkgs.boost]) (drv: {
+ postPatch = (drv.postPatch or "") + ''
+ substituteInPlace cachix.cabal --replace "c++14" "c++17"
+ '';
+ });
+
ghcid = enableSeparateBinOutput super.ghcid;
hzk = overrideCabal super.hzk (drv: {
diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix
index 43a3b82923ba..71ae70335fd4 100644
--- a/pkgs/development/haskell-modules/configuration-tensorflow.nix
+++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix
@@ -44,7 +44,7 @@ in
);
tensorflow-proto = super.tensorflow-proto.override {
- inherit proto-lens proto-lens-protoc proto-lens-protobuf-types;
+ inherit proto-lens proto-lens-protobuf-types;
};
tensorflow = super.tensorflow.override {
inherit mainland-pretty proto-lens;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index eaa0f799f922..3b91b02ffada 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1562,6 +1562,8 @@ self: {
];
description = "European Nucleotide Archive data";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"BiobaseEnsembl" = callPackage
@@ -1622,6 +1624,8 @@ self: {
];
description = "streaming FASTA parser";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"BiobaseHTTP" = callPackage
@@ -1817,6 +1821,8 @@ self: {
];
description = "Collection of types for bioinformatics";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"BiobaseVienna" = callPackage
@@ -1875,6 +1881,8 @@ self: {
];
description = "Efficient RNA/DNA/Protein Primary/Secondary Structure";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"BirdPP" = callPackage
@@ -1946,8 +1954,8 @@ self: {
}:
mkDerivation {
pname = "BlastHTTP";
- version = "1.4.0";
- sha256 = "0gvgwjsqrbk42vmbsh47d8fiwbwhdbsk5mlqj99pfmqi8fddwdm3";
+ version = "1.4.1";
+ sha256 = "1h7bj9a6qfzwlclr39dvbcz4r8l8s7n53z6ir8wff5ssq2wvq4qd";
libraryHaskellDepends = [
base BiobaseBlast BiobaseFasta bytestring conduit either-unwrap
HTTP http-conduit hxt mtl network transformers zip-archive
@@ -2867,6 +2875,8 @@ self: {
pname = "Chart";
version = "1.9.1";
sha256 = "1pn735k9ifxlb9mdh8xy7wi22cxni8xyr28n8zx9w0j6vprcg89l";
+ revision = "1";
+ editedCabalFile = "1v7qip375kzn9k9k0c79jj55xigi05s5dl318smqazjdlyj55q55";
libraryHaskellDepends = [
array base colour data-default-class lens mtl old-locale
operational time vector
@@ -2883,6 +2893,8 @@ self: {
pname = "Chart-cairo";
version = "1.9.1";
sha256 = "0hknj4rsjf2m8p5pyq5zff8ai7v80yvmxb5c6n0bkgxs4317nbl9";
+ revision = "1";
+ editedCabalFile = "1c1m0vk4rnx3myv43kag17nf1j1w9kjc226jpf1f86gkcd35lq45";
libraryHaskellDepends = [
array base cairo Chart colour data-default-class lens mtl
old-locale operational time
@@ -2901,6 +2913,8 @@ self: {
pname = "Chart-diagrams";
version = "1.9.2";
sha256 = "0am51ck84apijwwvpkwhnpmsr4047svzdi7g5nbf5yprsb8vzd4n";
+ revision = "1";
+ editedCabalFile = "0h57ds1j43h4knnwb75dgsgw90mz7lf8k590dkfdrgsszpb9as50";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base blaze-markup bytestring Chart colour containers
@@ -5372,8 +5386,6 @@ self: {
];
description = "Library for computer music research and education";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"EventSocket" = callPackage
@@ -10598,6 +10610,8 @@ self: {
pname = "HsYAML";
version = "0.1.2.0";
sha256 = "1pajfhj16559v64ixm8j7bvxdqmxg6c3c0z3wz7in8ckswgzfp54";
+ revision = "1";
+ editedCabalFile = "0j6qmmcz5yqh89hs2cq453maix50q61vl2h0ahj5lg02bygn42cf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -10756,6 +10770,8 @@ self: {
testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
description = "Code for the Haskell course taught at the University of Seville";
license = stdenv.lib.licenses.gpl2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"IDynamic" = callPackage
@@ -11409,8 +11425,8 @@ self: {
pname = "JuicyPixels-scale-dct";
version = "0.1.2";
sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p";
- revision = "2";
- editedCabalFile = "0pp67ygrd3m6q8ry5229m1b2rhy401gb74368h09bqc6wa3g7ygv";
+ revision = "4";
+ editedCabalFile = "0r6v9iv7fkslznn6fw2132j1gpxk9dyccdg8r5qj2vvsrbp0dpjf";
libraryHaskellDepends = [
base base-compat carray fft JuicyPixels
];
@@ -14261,8 +14277,8 @@ self: {
pname = "OTP";
version = "0.1.0.0";
sha256 = "1r7vpc0bv89d70j6pc3z3vam93gahl4j0y5w8smknxwjliwqxkcb";
- revision = "1";
- editedCabalFile = "1bcp6mixf0yxn6qmql3zhyshpa55mkrfnxdb1ma6gvbs7h28lnin";
+ revision = "2";
+ editedCabalFile = "012yi2pvjjlk6vri5zj8a7pipscsfc6rgkw7s5qldqmvvwvrk64s";
libraryHaskellDepends = [
base bytestring cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
time
@@ -14427,8 +14443,8 @@ self: {
pname = "OneTuple";
version = "0.2.2";
sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq";
- revision = "2";
- editedCabalFile = "1ii7hpmxi794xywx89agnvinxgral1rfn5hfnanr4zw26nczhcv3";
+ revision = "3";
+ editedCabalFile = "0m3a9fj2h0v529q3i1kq1jfbdj68wxsmhq65hgx2rwjpgb8cqf0z";
libraryHaskellDepends = [ base ];
description = "Singleton Tuple";
license = stdenv.lib.licenses.bsd3;
@@ -15494,6 +15510,8 @@ self: {
pname = "Prelude";
version = "0.1.0.1";
sha256 = "14p4jkhzdh618r7gvj6dd4w1zj4b032g4nx43bihnnaf2dqyppy6";
+ revision = "1";
+ editedCabalFile = "14z8gv75jnvykk5naqcqqrdcx7160kzd3gnfdvx6rw4nqzsi6hw1";
libraryHaskellDepends = [ base ];
description = "A Prelude module replacement";
license = stdenv.lib.licenses.bsd3;
@@ -15501,20 +15519,20 @@ self: {
"PrimitiveArray" = callPackage
({ mkDerivation, aeson, base, binary, bits, cereal, cereal-vector
- , containers, deepseq, DPutils, hashable, lens, log-domain, mtl
- , OrderedBits, primitive, QuickCheck, smallcheck, tasty
- , tasty-quickcheck, tasty-smallcheck, tasty-th, text, vector
+ , containers, criterion, deepseq, DPutils, hashable, lens
+ , log-domain, mtl, OrderedBits, primitive, QuickCheck, smallcheck
+ , tasty, tasty-quickcheck, tasty-smallcheck, tasty-th, text, vector
, vector-binary-instances, vector-th-unbox
}:
mkDerivation {
pname = "PrimitiveArray";
- version = "0.9.1.1";
- sha256 = "0q6i5754ysay2c4xs7m6hz69l35qd7irzxinmga431nvmbnqa21y";
+ version = "0.10.0.0";
+ sha256 = "0g9shj3zqk8rdp905di9i5g5bhga5msc7cs609fk3nkjm16ms0vi";
libraryHaskellDepends = [
aeson base binary bits cereal cereal-vector containers deepseq
DPutils hashable lens log-domain mtl OrderedBits primitive
- QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck
- tasty-th text vector vector-binary-instances vector-th-unbox
+ QuickCheck smallcheck text vector vector-binary-instances
+ vector-th-unbox
];
testHaskellDepends = [
aeson base binary bits cereal cereal-vector containers deepseq
@@ -15522,6 +15540,12 @@ self: {
QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck
tasty-th text vector vector-binary-instances vector-th-unbox
];
+ benchmarkHaskellDepends = [
+ aeson base binary bits cereal cereal-vector containers criterion
+ deepseq DPutils hashable lens log-domain mtl OrderedBits primitive
+ QuickCheck smallcheck text vector vector-binary-instances
+ vector-th-unbox
+ ];
description = "Efficient multidimensional arrays";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -15736,15 +15760,15 @@ self: {
"PyF" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, filepath, hashable, haskell-src-exts, haskell-src-meta, hspec
- , HUnit, megaparsec, process, python3, template-haskell, temporary
- , text
+ , HUnit, megaparsec, mtl, process, python3, template-haskell
+ , temporary, text
}:
mkDerivation {
pname = "PyF";
- version = "0.8.0.1";
- sha256 = "1bv57hi26nmrhcdr4hki62ycd0k5p0i0jdwcdcxi7vmhjavnyq08";
+ version = "0.8.1.0";
+ sha256 = "10zmw6ircqq53jvkmpqdf7sqf1pgc85m4w2k981jwbhpc3dycgrb";
libraryHaskellDepends = [
- base containers haskell-src-exts haskell-src-meta megaparsec
+ base containers haskell-src-exts haskell-src-meta megaparsec mtl
template-haskell text
];
testHaskellDepends = [
@@ -16204,13 +16228,13 @@ self: {
, ClustalParser, cmdargs, containers, directory, edit-distance
, either-unwrap, filepath, hierarchical-clustering, HTTP
, http-conduit, http-types, hxt, matrix, network, parsec, process
- , pureMD5, random, split, Taxonomy, text, text-metrics, time
- , transformers, vector, ViennaRNAParser
+ , pureMD5, random, silently, split, Taxonomy, text, text-metrics
+ , time, transformers, vector, ViennaRNAParser
}:
mkDerivation {
pname = "RNAlien";
- version = "1.6.0";
- sha256 = "0pp9rim4k1gbc2dscqygi90c2721xc6q1fl2sqkfpafz30m022pq";
+ version = "1.7.0";
+ sha256 = "1yqf2i1q5s65i968ha4lhnn0njmgapb30sxwdq5rpf7wbw2f29by";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -16218,8 +16242,8 @@ self: {
BlastHTTP bytestring cassava ClustalParser cmdargs containers
directory edit-distance either-unwrap filepath
hierarchical-clustering HTTP http-conduit http-types hxt matrix
- network parsec process pureMD5 random Taxonomy text text-metrics
- transformers vector ViennaRNAParser
+ network parsec process pureMD5 random silently Taxonomy text
+ text-metrics transformers vector ViennaRNAParser
];
executableHaskellDepends = [
base BiobaseFasta BiobaseTypes bytestring cassava cmdargs
@@ -16297,6 +16321,8 @@ self: {
pname = "RabbitMQ";
version = "0.1.0.0";
sha256 = "14rxwsxxqhj91alcnvvp6949ig0ifnls9x2mgnd1jmknqz7pwvrs";
+ revision = "1";
+ editedCabalFile = "17ypl1n9f1nyc1axdmmfgb188d0ml7i3sqgmbka1k4l0p2ik9qpp";
libraryHaskellDepends = [
array base binary bytestring clock containers HsOpenSSL io-streams
monad-control network network-uri openssl-streams split stm text
@@ -16702,6 +16728,8 @@ self: {
pname = "S3";
version = "0.1.0.0";
sha256 = "0z59h36qnb1vvshqik3f1ai3a3frnmzzxdcmkbbh3x6flnih7r0a";
+ revision = "1";
+ editedCabalFile = "115432ww5hm6nv82rib363sx38f7vm0kl0xd5qc2dpfn1jljr0g7";
libraryHaskellDepends = [
base base-encoding bytestring cryptohash-md5 cryptohash-sha1
cryptohash-sha256 deepseq hashable http-io-streams io-streams
@@ -20429,6 +20457,8 @@ self: {
pname = "X";
version = "0.3.0.0";
sha256 = "0grjiznl8j44mq3m0jkhm9z7wcr4cywrnfmk92nk3g6ddhcyakkc";
+ revision = "1";
+ editedCabalFile = "1nbp0zci2sp07cr5j5xlh7gswcnj52z9dp6akh9xk4mzk3salxwq";
libraryHaskellDepends = [
base bytestring deepseq text text-short
];
@@ -22468,14 +22498,12 @@ self: {
}) {};
"acquire" = callPackage
- ({ mkDerivation, base }:
+ ({ mkDerivation, base, transformers }:
mkDerivation {
pname = "acquire";
- version = "0.2.0.1";
- sha256 = "0l6c3kdvg71z6pfjg71jgaffb403w8y8lixw4dhi7phhhb91phn2";
- revision = "1";
- editedCabalFile = "1ihmdh0dpppgshsh7mxdz6bm9kn632xxd3g6nkigpjpfrb372q7z";
- libraryHaskellDepends = [ base ];
+ version = "0.3.1";
+ sha256 = "1spw70dw8x6d9dy5wg47fim4kpsvzgr25nmwpv8c4wd8g3gmnqmw";
+ libraryHaskellDepends = [ base transformers ];
description = "Abstraction over management of resources";
license = stdenv.lib.licenses.mit;
}) {};
@@ -22499,8 +22527,8 @@ self: {
pname = "active";
version = "0.2.0.13";
sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx";
- revision = "8";
- editedCabalFile = "1j771jblfaygc3qf8iaw9b87yrqxhkq79mdi9zyhvlr2vcac362s";
+ revision = "9";
+ editedCabalFile = "1xq08xn26v3zi3fz1y5lhb1q2xv1d413wdg4pibi98n98nc2ypxz";
libraryHaskellDepends = [
base lens linear semigroupoids semigroups vector
];
@@ -22955,6 +22983,8 @@ self: {
pname = "aeson";
version = "1.4.4.0";
sha256 = "0bjdgr6wjq6cci5hxb63i18yrg66p892n6xj23rih7k5rbd7rihp";
+ revision = "1";
+ editedCabalFile = "1mn7ws8v5zsm9fy9ndvb0rygchjbwnnxyyxpl63cf9lmzzffvxd6";
libraryHaskellDepends = [
attoparsec base base-compat bytestring containers deepseq dlist
ghc-prim hashable primitive scientific tagged template-haskell text
@@ -22973,6 +23003,39 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "aeson_1_4_5_0" = callPackage
+ ({ mkDerivation, attoparsec, base, base-compat, base-orphans
+ , base16-bytestring, bytestring, containers, deepseq, Diff
+ , directory, dlist, filepath, generic-deriving, ghc-prim, hashable
+ , hashable-time, integer-logarithms, primitive, QuickCheck
+ , quickcheck-instances, scientific, tagged, tasty, tasty-golden
+ , tasty-hunit, tasty-quickcheck, template-haskell, text
+ , th-abstraction, time, time-compat, unordered-containers
+ , uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "aeson";
+ version = "1.4.5.0";
+ sha256 = "1jhabz1lbbv6yqxqiybifi86cb5xlsadrn368n5dd0wzzc7ja4iz";
+ libraryHaskellDepends = [
+ attoparsec base base-compat bytestring containers deepseq dlist
+ ghc-prim hashable primitive scientific tagged template-haskell text
+ th-abstraction time time-compat unordered-containers uuid-types
+ vector
+ ];
+ testHaskellDepends = [
+ attoparsec base base-compat base-orphans base16-bytestring
+ bytestring containers Diff directory dlist filepath
+ generic-deriving ghc-prim hashable hashable-time integer-logarithms
+ QuickCheck quickcheck-instances scientific tagged tasty
+ tasty-golden tasty-hunit tasty-quickcheck template-haskell text
+ time time-compat unordered-containers uuid-types vector
+ ];
+ description = "Fast JSON parsing and encoding";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"aeson-applicative" = callPackage
({ mkDerivation, aeson, base, text, unordered-containers }:
mkDerivation {
@@ -23070,8 +23133,8 @@ self: {
pname = "aeson-compat";
version = "0.3.9";
sha256 = "1j13gykv4ryvmr14w5blz0nnpdb4p0hpa27wahw3mhb1lwdr8hz0";
- revision = "1";
- editedCabalFile = "0m154kalrzqbnp41306i6md3ncvw02myb730bz8bv6ah59jq1qy6";
+ revision = "2";
+ editedCabalFile = "1y07skwfg22z37fvjmqcpcl1yz1kx2zn4zz3n1bfghk7740c4gyd";
libraryHaskellDepends = [
aeson attoparsec attoparsec-iso8601 base base-compat bytestring
containers exceptions hashable scientific tagged text time
@@ -23167,8 +23230,8 @@ self: {
pname = "aeson-extra";
version = "0.4.1.2";
sha256 = "1i6bm91d332117fx829imaxz6y59a0vqa7fjsr293sp8xyhlkkax";
- revision = "1";
- editedCabalFile = "0zvqb36r3dsh1dsrw3cbzqiia416qjby0gpskx5xz6nnab0l8mg4";
+ revision = "2";
+ editedCabalFile = "0z43xclsy4x3my7p7d1irb40nqvj9z49m7vhkwf3k2n5gxjs6379";
libraryHaskellDepends = [
aeson aeson-compat attoparsec attoparsec-iso8601 base
base-compat-batteries bytestring containers deepseq exceptions
@@ -23295,8 +23358,8 @@ self: {
}:
mkDerivation {
pname = "aeson-injector";
- version = "1.1.1.0";
- sha256 = "04hg0vdrfb7x6qxwcifsayc6z5vhc1l96ahvswg8q5wddc00ypzp";
+ version = "1.1.2.0";
+ sha256 = "05506d6nkw7q924l2ww5mg1ahzs9122vj02mgscdh7g72n3krdd4";
libraryHaskellDepends = [
aeson base bifunctors deepseq hashable lens servant-docs swagger2
text unordered-containers
@@ -23408,8 +23471,8 @@ self: {
({ mkDerivation, aeson, base, hspec, lens, lens-aeson, text }:
mkDerivation {
pname = "aeson-picker";
- version = "0.1.0.4";
- sha256 = "0ln4qwx7app1sc01irmy5lx7bqsq6wsgdig6zihpnp9rbj8263mj";
+ version = "0.1.0.5";
+ sha256 = "05lw6fd8xk9s37iz8pvznqh4vj856ayc75ha9iw1w82zxzv87pwp";
libraryHaskellDepends = [ aeson base lens lens-aeson text ];
testHaskellDepends = [ base hspec text ];
description = "Tiny library to get fields from JSON format";
@@ -24448,8 +24511,8 @@ self: {
pname = "alex-tools";
version = "0.4";
sha256 = "0qyh3dr5nh7whv3qh431l8x4lx3nzkildlyl3xgnaxpbs8gr8sgi";
- revision = "1";
- editedCabalFile = "1dwr1w2zhbvwnjc65zzmwfmwb1yxxyyfrjypvqp3m7fpc7dg1nxg";
+ revision = "2";
+ editedCabalFile = "1hz7gdff15bxvx5jijgh6ih1m2v39nadfy2yjsb43c48p9hcn93z";
libraryHaskellDepends = [ base deepseq template-haskell text ];
description = "A set of functions for a common use case of Alex";
license = stdenv.lib.licenses.isc;
@@ -28619,6 +28682,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ansi-terminal_0_10" = callPackage
+ ({ mkDerivation, base, colour }:
+ mkDerivation {
+ pname = "ansi-terminal";
+ version = "0.10";
+ sha256 = "0l96g8m88qbyhp6mvm895b102jc5z3b85i0fvb4w99x2zj4pnv7y";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base colour ];
+ description = "Simple ANSI terminal support, with Windows compatibility";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ansi-terminal-game" = callPackage
({ mkDerivation, ansi-terminal, array, base, bytestring, cereal
, clock, exceptions, hspec, linebreak, mintty, mtl, QuickCheck
@@ -28650,6 +28727,8 @@ self: {
pname = "ansi-wl-pprint";
version = "0.6.9";
sha256 = "1b2fg8px98dzbaqyns10kvs8kn6cl1hdq5wb9saz40izrpkyicm7";
+ revision = "1";
+ editedCabalFile = "0bb5fzjjc00932pny1fql40dmpmikfqzbrbmpwr09bfw9aynvzgn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ ansi-terminal base ];
@@ -30685,8 +30764,8 @@ self: {
pname = "argon2";
version = "1.3.0.1";
sha256 = "1v0clf78hykdyhv81z8v3kwp86hjgqh6b8a7wfbjv0fyy55bwxry";
- revision = "1";
- editedCabalFile = "1bqzf2cfpd03sl3wq9dnrcxaysbs116ib33ja0v8zi4szddm33jv";
+ revision = "2";
+ editedCabalFile = "0y1dg4dp3f40ghh2zcn1s4l19i8pjs0d1zpbghy4aaar4npiqxz7";
libraryHaskellDepends = [ base bytestring deepseq text-short ];
testHaskellDepends = [
base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -30966,12 +31045,12 @@ self: {
broken = true;
}) {inherit (pkgs) arpack;};
- "array_0_5_3_0" = callPackage
+ "array_0_5_4_0" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "array";
- version = "0.5.3.0";
- sha256 = "07pyr2x09n23rdxldqgbx12hlg9dk92q9p56bpcdw3r87ajc3m9z";
+ version = "0.5.4.0";
+ sha256 = "1ixqnwxd36l2j3873hwnfip17k2nzncbvsx7pnprqzv9z59mf4rv";
libraryHaskellDepends = [ base ];
description = "Mutable and immutable arrays";
license = stdenv.lib.licenses.bsd3;
@@ -30993,6 +31072,8 @@ self: {
];
description = "Lists of chunks";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"array-forth" = callPackage
@@ -31596,8 +31677,8 @@ self: {
pname = "asn1-data";
version = "0.7.2";
sha256 = "18dc4d71pvp5q6npxicqqj3fk6n39lm98450vvhgg4y9rc1rr6c3";
- revision = "1";
- editedCabalFile = "18qjn7asld26nlri6md4z3kmyvarvvg5wi7rwsg4ngrxw4gbqhqm";
+ revision = "2";
+ editedCabalFile = "0xnj367rxj21gnxq7d5qih54g0zwwyc6r6gaaijikhprppbvjjvy";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -31614,6 +31695,8 @@ self: {
pname = "asn1-encoding";
version = "0.9.5";
sha256 = "0adgbamyq0mj1l1hdq4zyyllay714bac1wl0rih3fv1z6vykp1hy";
+ revision = "1";
+ editedCabalFile = "0vsw8rd6fxd87rx3jyh3bb96sjd7ag0mrlylhkcmgaps2ma8sw5b";
libraryHaskellDepends = [ asn1-types base bytestring hourglass ];
testHaskellDepends = [
asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
@@ -31789,6 +31872,8 @@ self: {
pname = "assoc";
version = "1";
sha256 = "0i1jj6lrabl0fhh1iya4nxr2hw1s4xmhca5qnim93ng5znziv9n2";
+ revision = "1";
+ editedCabalFile = "0hcpyypnj9qwbpk079h6lnm8aa3mp3fzjilk9qwibkmnnqwwwcld";
libraryHaskellDepends = [ base bifunctors ];
description = "swap and assoc: Symmetric and Semigroupy Bifunctors";
license = stdenv.lib.licenses.bsd3;
@@ -32673,8 +32758,8 @@ self: {
pname = "atto-lisp";
version = "0.2.2.3";
sha256 = "00a7w4jysx55y5xxmgm09akvhxxa3fs68wqn6mp789bvhvdk9khd";
- revision = "1";
- editedCabalFile = "0im8kc54hkfj578ck79j0ijc3iaigvx06pgj4sk8za26ryy7v46q";
+ revision = "2";
+ editedCabalFile = "065v6vllvwvm0zpkra7bl2hpz1lnhara13965p75pzdppv8ghd6w";
libraryHaskellDepends = [
attoparsec base blaze-builder blaze-textual bytestring containers
deepseq text
@@ -32718,10 +32803,8 @@ self: {
}:
mkDerivation {
pname = "attoparsec";
- version = "0.13.2.2";
- sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx";
- revision = "4";
- editedCabalFile = "1vz6jz7cwd80sryabpa99hccamgccjf2l7907wjblbs7dy66a8cb";
+ version = "0.13.2.3";
+ sha256 = "1ngjn9h5n0vyki0m2jir4mg85875ysswy9hznpmj1r856mqwc6ix";
libraryHaskellDepends = [
array base bytestring containers deepseq scientific text
transformers
@@ -32864,6 +32947,8 @@ self: {
pname = "attoparsec-iso8601";
version = "1.0.1.0";
sha256 = "0hj10w15qp2z5bz2v4xahhmbgzclpyfi5l2sv97wqycysg9gp7s9";
+ revision = "1";
+ editedCabalFile = "1rjhscmczgs1bwyqx7lvkm8py3ylxjd2797mrzgnq60fvm292750";
libraryHaskellDepends = [ attoparsec base base-compat text time ];
description = "Parsing of ISO 8601 dates, originally from aeson";
license = stdenv.lib.licenses.bsd3;
@@ -33174,46 +33259,41 @@ self: {
}) {};
"aura" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, algebraic-graphs, array
- , async, aur, base, base-prelude, bytestring, compactable
- , containers, directory, errors, filepath, freer-simple
- , generic-lens, http-client, http-client-tls, http-types
- , language-bash, megaparsec, microlens, microlens-ghc, mtl
- , mwc-random, network-uri, non-empty-containers
+ ({ mkDerivation, aeson, aeson-pretty, algebraic-graphs, aur, base
+ , base-prelude, bytestring, compactable, containers, directory
+ , errors, filepath, fused-effects, generic-lens, http-client
+ , http-client-tls, http-types, language-bash, megaparsec, microlens
+ , microlens-ghc, mwc-random, network-uri, nonempty-containers
, optparse-applicative, paths, pretty-simple, prettyprinter
- , prettyprinter-ansi-terminal, semigroupoids, stm, tasty
- , tasty-hunit, text, throttled, time, transformers, typed-process
- , versions, witherable
+ , prettyprinter-ansi-terminal, scheduler, semigroupoids, stm, tasty
+ , tasty-hunit, text, these, time, transformers, typed-process
+ , unliftio, versions
}:
mkDerivation {
pname = "aura";
- version = "2.0.0";
- sha256 = "1k53r44kxy7p23nsjbx12mvn7nkl8j3h9fzy4v3dxyqkd4jz0996";
- revision = "1";
- editedCabalFile = "1z73n5fcrp23hms0l6r45p1knqqlng8g4gfb44a4raqj7da823zj";
+ version = "2.0.2";
+ sha256 = "1r11dzyy7z759ch664cml6lywh7033s6qrv56mkn41kn91jrl3qy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson aeson-pretty algebraic-graphs array async aur base
- base-prelude bytestring compactable containers directory errors
- filepath freer-simple generic-lens http-client http-types
- language-bash megaparsec microlens microlens-ghc mtl mwc-random
- network-uri non-empty-containers paths pretty-simple prettyprinter
- prettyprinter-ansi-terminal semigroupoids stm text throttled time
- transformers typed-process versions witherable
+ aeson aeson-pretty algebraic-graphs aur base base-prelude
+ bytestring compactable containers directory errors filepath
+ fused-effects generic-lens http-client http-types language-bash
+ megaparsec microlens microlens-ghc mwc-random network-uri
+ nonempty-containers paths prettyprinter prettyprinter-ansi-terminal
+ scheduler semigroupoids stm text these time transformers
+ typed-process unliftio versions
];
executableHaskellDepends = [
- base base-prelude bytestring containers errors freer-simple
- http-client http-client-tls language-bash microlens
- non-empty-containers optparse-applicative paths pretty-simple
- prettyprinter prettyprinter-ansi-terminal text transformers
- typed-process versions
+ base base-prelude bytestring containers errors fused-effects
+ http-client http-client-tls microlens nonempty-containers
+ optparse-applicative paths pretty-simple prettyprinter
+ prettyprinter-ansi-terminal text transformers typed-process
+ versions
];
testHaskellDepends = [
- base base-prelude bytestring containers errors freer-simple
- http-client language-bash megaparsec microlens non-empty-containers
- paths pretty-simple prettyprinter prettyprinter-ansi-terminal tasty
- tasty-hunit text transformers typed-process versions
+ base base-prelude bytestring containers megaparsec microlens paths
+ tasty tasty-hunit text versions
];
description = "A secure package manager for Arch Linux and the AUR, written in Haskell";
license = stdenv.lib.licenses.gpl3;
@@ -33556,8 +33636,8 @@ self: {
pname = "avers";
version = "0.0.17.1";
sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
- revision = "31";
- editedCabalFile = "03nzgni96r6yfmn196iya6akrzh46njqzd2873aj341ynfaqjyy1";
+ revision = "32";
+ editedCabalFile = "0p4jhc8rxvm82cp3zaibazb5jnjs33vl4f71pvgvzf31xd7immyy";
libraryHaskellDepends = [
aeson attoparsec base bytestring clock containers cryptonite
filepath inflections memory MonadRandom mtl network network-uri
@@ -35407,6 +35487,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "base-compat_0_11_0" = callPackage
+ ({ mkDerivation, base, unix }:
+ mkDerivation {
+ pname = "base-compat";
+ version = "0.11.0";
+ sha256 = "0svswi3nby9cabai2l9mkcx0c9zqw9y8js50sh09cms1s2jjly26";
+ libraryHaskellDepends = [ base unix ];
+ description = "A compatibility layer for base";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"base-compat-batteries" = callPackage
({ mkDerivation, base, base-compat, hspec, hspec-discover
, QuickCheck
@@ -35424,6 +35516,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "base-compat-batteries_0_11_0" = callPackage
+ ({ mkDerivation, base, base-compat, hspec, hspec-discover
+ , QuickCheck
+ }:
+ mkDerivation {
+ pname = "base-compat-batteries";
+ version = "0.11.0";
+ sha256 = "0r9p14ks2fspbhj61b2gi4ixipkhhkzpcx0y35nf4yypcqv5262h";
+ libraryHaskellDepends = [ base base-compat ];
+ testHaskellDepends = [ base hspec QuickCheck ];
+ testToolDepends = [ hspec-discover ];
+ description = "base-compat with extra batteries";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"base-compat-migrate" = callPackage
({ mkDerivation, base, base-compat }:
mkDerivation {
@@ -35448,8 +35556,8 @@ self: {
pname = "base-encoding";
version = "0.1.0.0";
sha256 = "1chmx5qvglf91i0c9ih9xydzb37v8j4bykvmb2g6pyg7wdq0s8si";
- revision = "1";
- editedCabalFile = "0miysladpqwm5qhphv23qhvambd7245n14qbkgvp664xj56y6df1";
+ revision = "2";
+ editedCabalFile = "0flfvs03zs7k04x7yhsc3jiw3zpnx7n3637jyy10flpqv90fy6sx";
libraryHaskellDepends = [
base base16-bytestring base64-bytestring bytestring text
];
@@ -35712,8 +35820,8 @@ self: {
pname = "base64-bytestring-type";
version = "1.0.1";
sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn";
- revision = "1";
- editedCabalFile = "13yjasdw3dh33rv1jhx5hjdvpp7cnxymrk836jk1mnpjw32606c9";
+ revision = "3";
+ editedCabalFile = "0gqyij803y0shpc5knljbffss6c1pbdanfzwlws01vkl4y10sfja";
libraryHaskellDepends = [
aeson base base-compat base64-bytestring binary bytestring cereal
deepseq hashable http-api-data QuickCheck serialise text
@@ -35786,6 +35894,8 @@ self: {
pname = "basement";
version = "0.0.11";
sha256 = "0srlws74yiraqaapgcjd9p5d1fwb3zr9swcz74jpjm55fls2nn37";
+ revision = "2";
+ editedCabalFile = "1l95bzmn23cmx386hk3d3r0ykdaibh9rp489lcnba5g56kiy4hxg";
libraryHaskellDepends = [ base ghc-prim ];
description = "Foundation scrap box of array & string";
license = stdenv.lib.licenses.bsd3;
@@ -36777,6 +36887,8 @@ self: {
pname = "bencode";
version = "0.6.0.0";
sha256 = "12pnh598k30ggs54f0pic19j7ji8f4xn7fydkdnlig79rvzgv3iv";
+ revision = "1";
+ editedCabalFile = "0nvph7frmrra9k57v01saxgnhf1ma3m8qzwj1i53pswssfnj41mv";
libraryHaskellDepends = [
base binary bytestring containers parsec
];
@@ -37208,30 +37320,6 @@ self: {
}) {};
"bifunctors" = callPackage
- ({ mkDerivation, base, base-orphans, comonad, containers, hspec
- , hspec-discover, QuickCheck, tagged, template-haskell
- , th-abstraction, transformers, transformers-compat
- }:
- mkDerivation {
- pname = "bifunctors";
- version = "5.5.4";
- sha256 = "134vn71wd194175k2fcdvd0ak2bdmdbk6ql5lls4byff7zs2rmi9";
- revision = "1";
- editedCabalFile = "05qh2xh2j3w5f1q94wfgfp06z9c4fyrgm4cncy6y2lbb1ficsh3j";
- libraryHaskellDepends = [
- base base-orphans comonad containers tagged template-haskell
- th-abstraction transformers
- ];
- testHaskellDepends = [
- base hspec QuickCheck template-haskell transformers
- transformers-compat
- ];
- testToolDepends = [ hspec-discover ];
- description = "Bifunctors";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "bifunctors_5_5_5" = callPackage
({ mkDerivation, base, base-orphans, comonad, containers, hspec
, hspec-discover, QuickCheck, tagged, template-haskell
, th-abstraction, transformers, transformers-compat
@@ -37251,7 +37339,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Bifunctors";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bighugethesaurus" = callPackage
@@ -37666,8 +37753,8 @@ self: {
pname = "binary-instances";
version = "1";
sha256 = "07y9582vsw94ks8whkd3dcmf4wdwlq8riyk2shmxxprkq0gsv3z0";
- revision = "1";
- editedCabalFile = "141hhr872rg0g2pvz1mbxamz9cijik9jilr1y0wdx5r71x0m1vyd";
+ revision = "2";
+ editedCabalFile = "0yawdwm086gk51y5s5zbybiwiv386cx8xyj6kcgj9wwdidcnaxdi";
libraryHaskellDepends = [
aeson base binary binary-orphans case-insensitive hashable
scientific tagged text text-binary time-compat unordered-containers
@@ -39248,8 +39335,6 @@ self: {
];
description = "A small tool that clears qutebrowser cookies";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"bisect-binary" = callPackage
@@ -40209,6 +40294,8 @@ self: {
pname = "blank-canvas";
version = "0.7";
sha256 = "11blkr9yhag4l8lyg5gyi2wzcnapkgihkh01mp9lm28f3bb1v1z7";
+ revision = "1";
+ editedCabalFile = "11jqhxcr8vynlknpw73s0nmg1a7n9rsbyifyhaxi3aq7hzvb0qai";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base base-compat-batteries base64-bytestring bytestring
@@ -41624,12 +41711,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "boots_0_2" = callPackage
+ "boots_0_2_0_1" = callPackage
({ mkDerivation, base, exceptions, hspec, mtl }:
mkDerivation {
pname = "boots";
- version = "0.2";
- sha256 = "0v7p2pfs4kcczc4wpswb0rgl2ak9xijq7ha9c6lagyb1av17sx9r";
+ version = "0.2.0.1";
+ sha256 = "04dh749p5nwar3hgmx5g12814lazwrzzqxbxbk4f003qpbd8np8w";
libraryHaskellDepends = [ base exceptions mtl ];
testHaskellDepends = [ base exceptions hspec mtl ];
description = "IoC Monad in Haskell";
@@ -41639,19 +41726,20 @@ self: {
"boots-app" = callPackage
({ mkDerivation, base, boots, data-default, exceptions, fast-logger
- , menshen, microlens, mtl, salak, salak-yaml, splitmix, text, time
- , unliftio-core, unordered-containers
+ , megaparsec, microlens, mtl, optparse-applicative, salak
+ , salak-yaml, splitmix, text, time, unliftio-core
+ , unordered-containers
}:
mkDerivation {
pname = "boots-app";
- version = "0.2";
- sha256 = "0rnlb9fzaxcx4lvacqklv1kr2ygzgssgz1xzcfmbgkqpzp08nxqx";
+ version = "0.2.0.1";
+ sha256 = "0wk177f6ljcqd0ya7cddvx3i6sdwx0wl9fz1idzfa8klb8pnkghh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base boots data-default exceptions fast-logger menshen microlens
- mtl salak salak-yaml splitmix text unliftio-core
- unordered-containers
+ base boots data-default exceptions fast-logger megaparsec microlens
+ mtl optparse-applicative salak salak-yaml splitmix text
+ unliftio-core unordered-containers
];
executableHaskellDepends = [ base time ];
description = "Factory for quickly building an application";
@@ -41682,18 +41770,17 @@ self: {
"boots-web" = callPackage
({ mkDerivation, aeson, base, boots, boots-app, bytestring
, containers, ekg-core, http-types, microlens, monad-logger, salak
- , servant-server, servant-swagger, swagger2, text, time
+ , servant, servant-server, servant-swagger, swagger2, text
, unordered-containers, vault, wai, warp
}:
mkDerivation {
pname = "boots-web";
- version = "0.2";
- sha256 = "00f55k7gc4dirzxmgngw9vpcl0w8fgklsyscy5h584pbhd84x4mj";
+ version = "0.2.0.1";
+ sha256 = "1czylbghh9rzhr4zs394gdm39d2xqqkv3v7fjzq1askah48zqx18";
libraryHaskellDepends = [
aeson base boots boots-app bytestring containers ekg-core
- http-types microlens monad-logger salak servant-server
- servant-swagger swagger2 text time unordered-containers vault wai
- warp
+ http-types microlens monad-logger salak servant servant-server
+ servant-swagger swagger2 text unordered-containers vault wai warp
];
description = "Factory for quickly building a web application";
license = stdenv.lib.licenses.mit;
@@ -41766,8 +41853,8 @@ self: {
pname = "boring";
version = "0.1.2";
sha256 = "0978dq53rpb7clz1ydjm6x38nrx0vkp3safqcbjp2kq6jlaz29jr";
- revision = "1";
- editedCabalFile = "010k2mw8q3iby78ak56xamp6pzdwijn92r64r76hblw32k1i80c0";
+ revision = "2";
+ editedCabalFile = "1qdgv5zanglhhx3hs4a7qlvfivsv82hnppj8lpyamfl4xw4x8vp1";
libraryHaskellDepends = [
adjunctions base base-compat constraints dec fin generics-sop
singleton-bool streams tagged transformers transformers-compat vec
@@ -41880,8 +41967,8 @@ self: {
pname = "bound-extras";
version = "0.0.1";
sha256 = "0f49yqz5s5h4f3m3i7kpm2fqnd42nl4dbl24lvm6z3nb8qrx6ynq";
- revision = "1";
- editedCabalFile = "1gyhbcnb1q1f8fdlmsmjn19xp4nvi2vb6ns0h8h2dvvpz9x3wgab";
+ revision = "2";
+ editedCabalFile = "1a88bxgz9r1v6lqkab12ljw3vknx7sgi6vi3fsqli8ji2ajfn5k1";
libraryHaskellDepends = [
base bound deepseq hashable transformers
];
@@ -42247,6 +42334,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "brick_0_49" = callPackage
+ ({ mkDerivation, base, bytestring, config-ini, containers
+ , contravariant, data-clist, deepseq, directory, dlist, filepath
+ , microlens, microlens-mtl, microlens-th, QuickCheck, stm
+ , template-haskell, text, text-zipper, transformers, unix, vector
+ , vty, word-wrap
+ }:
+ mkDerivation {
+ pname = "brick";
+ version = "0.49";
+ sha256 = "1jlxzizxgmdsjd0x146kcmp92x7gjn0vkj0lc5dplbgshlg5hfhd";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring config-ini containers contravariant data-clist
+ deepseq directory dlist filepath microlens microlens-mtl
+ microlens-th stm template-haskell text text-zipper transformers
+ unix vector vty word-wrap
+ ];
+ testHaskellDepends = [
+ base containers microlens QuickCheck vector
+ ];
+ description = "A declarative terminal user interface library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"brick-dropdownmenu" = callPackage
({ mkDerivation, base, brick, containers, microlens, microlens-ghc
, microlens-th, pointedlist, vector, vty
@@ -42675,6 +42789,8 @@ self: {
pname = "brotli";
version = "0.0.0.0";
sha256 = "1l9qiw5cl0k1rcnqnj9pb7vgj1b06wckkk5i73nqr15ixgcjmr9j";
+ revision = "1";
+ editedCabalFile = "0fw26rv8i9zz4qyr32paz2y0psdppdaz427jp8mpbanwmg763024";
libraryHaskellDepends = [ base bytestring transformers ];
libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ];
testHaskellDepends = [
@@ -44099,14 +44215,16 @@ self: {
}) {};
"bytestring-progress" = callPackage
- ({ mkDerivation, base, bytestring, terminal-progress-bar, time }:
+ ({ mkDerivation, base, bytestring, terminal-progress-bar, text
+ , time
+ }:
mkDerivation {
pname = "bytestring-progress";
- version = "1.2";
- sha256 = "195vsqpmaycxi0k7kk1hasrklnblr3psllc288vkh77pbnfm3vqi";
+ version = "1.4";
+ sha256 = "140dn6zyc1ka8vjxwd6zzc3mwd651zrawcwk3d5ipfxrgddf9bws";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- base bytestring terminal-progress-bar time
+ base bytestring terminal-progress-bar text time
];
description = "A library for tracking the consumption of a lazy ByteString";
license = stdenv.lib.licenses.bsd3;
@@ -44358,6 +44476,8 @@ self: {
pname = "bzlib";
version = "0.5.0.5";
sha256 = "0zh130vw719a8d11q5qzc3ilzgv8cqyc2a7r1a131cv1fjnd1rwy";
+ revision = "1";
+ editedCabalFile = "1d4ra5prh2q9h8inpwvrsmkmg1ndisdj47jv06iijpj6xdp5bapl";
libraryHaskellDepends = [ base bytestring ];
librarySystemDepends = [ bzip2 ];
description = "Compression and decompression in the bzip2 format";
@@ -44888,19 +45008,6 @@ self: {
}) {};
"cabal-doctest" = callPackage
- ({ mkDerivation, base, Cabal, directory, filepath }:
- mkDerivation {
- pname = "cabal-doctest";
- version = "1.0.6";
- sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny";
- revision = "2";
- editedCabalFile = "1kbiwqm4fxrsdpcqijdq98h8wzmxydcvxd03f1z8dliqzyqsbd60";
- libraryHaskellDepends = [ base Cabal directory filepath ];
- description = "A Setup.hs helper for doctests running";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "cabal-doctest_1_0_7" = callPackage
({ mkDerivation, base, Cabal, directory, filepath }:
mkDerivation {
pname = "cabal-doctest";
@@ -44909,7 +45016,6 @@ self: {
libraryHaskellDepends = [ base Cabal directory filepath ];
description = "A Setup.hs helper for doctests running";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cabal-file-th" = callPackage
@@ -45654,6 +45760,8 @@ self: {
pname = "cabal2spec";
version = "2.2.2.1";
sha256 = "0jv335b6vz1y6jp381hhrb2miniyqzkn18ansc67as04yf3ngmay";
+ revision = "1";
+ editedCabalFile = "09bkjwnr01mgn1yf861p3dai18kgpm5mvw8nmh5zvdr8sgqi207v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base Cabal filepath time ];
@@ -45666,6 +45774,27 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
+ "cabal2spec_2_3" = callPackage
+ ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty
+ , tasty-golden, time
+ }:
+ mkDerivation {
+ pname = "cabal2spec";
+ version = "2.3";
+ sha256 = "1hjxsmfgf3p919d6zr3gwkzizxg4lmqyga84a917qywp9b5g3mfi";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base Cabal filepath time ];
+ executableHaskellDepends = [
+ base Cabal filepath optparse-applicative
+ ];
+ testHaskellDepends = [ base Cabal filepath tasty tasty-golden ];
+ description = "Convert Cabal files into rpm spec files";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ maintainers = with stdenv.lib.maintainers; [ peti ];
+ }) {};
+
"cabalQuery" = callPackage
({ mkDerivation, base, Cabal, containers, directory, MissingH
, pretty
@@ -45888,11 +46017,12 @@ self: {
}) {};
"cachix" = callPackage
- ({ mkDerivation, async, base, base16-bytestring, base64-bytestring
- , bytestring, cachix-api, conduit, conduit-extra, cookie
+ ({ mkDerivation, async, base, base64-bytestring, bytestring
+ , cachix-api, conduit, conduit-extra, containers, cookie
, cryptonite, dhall, directory, ed25519, filepath, fsnotify, here
- , hspec, hspec-discover, http-client, http-client-tls, http-conduit
- , http-types, lzma-conduit, megaparsec, memory, mmorph, netrc
+ , hnix-store-core, hspec, hspec-discover, http-client
+ , http-client-tls, http-conduit, http-types, inline-c, inline-c-cpp
+ , lzma-conduit, megaparsec, memory, mmorph, netrc, nix
, optparse-applicative, process, protolude, resourcet, retry
, safe-exceptions, servant, servant-auth, servant-auth-client
, servant-client, servant-client-core, servant-conduit, temporary
@@ -45900,21 +46030,21 @@ self: {
}:
mkDerivation {
pname = "cachix";
- version = "0.2.1";
- sha256 = "1yz0qfpp8d2n4h9k9cy394zgqg24vvb9ahzxdsvabjwbpmg9sijv";
+ version = "0.3.0";
+ sha256 = "0s22p9dwqw4pqlrqfqspdsiiw2k5zwzzdxc6ha6f4fxa4wa2w5dm";
isLibrary = true;
isExecutable = true;
- enableSeparateDataOutput = true;
libraryHaskellDepends = [
- async base base16-bytestring base64-bytestring bytestring
- cachix-api conduit conduit-extra cookie cryptonite dhall directory
- ed25519 filepath fsnotify here http-client http-client-tls
- http-conduit http-types lzma-conduit megaparsec memory mmorph netrc
- optparse-applicative process protolude resourcet retry
- safe-exceptions servant servant-auth servant-auth-client
- servant-client servant-client-core servant-conduit text unix
- uri-bytestring versions
+ async base base64-bytestring bytestring cachix-api conduit
+ conduit-extra containers cookie cryptonite dhall directory ed25519
+ filepath fsnotify here hnix-store-core http-client http-client-tls
+ http-conduit http-types inline-c inline-c-cpp lzma-conduit
+ megaparsec memory mmorph netrc optparse-applicative process
+ protolude resourcet retry safe-exceptions servant servant-auth
+ servant-auth-client servant-client servant-client-core
+ servant-conduit text unix uri-bytestring versions
];
+ libraryPkgconfigDepends = [ nix ];
executableHaskellDepends = [ base cachix-api ];
executableToolDepends = [ hspec-discover ];
testHaskellDepends = [
@@ -45922,9 +46052,7 @@ self: {
];
description = "Command line client for Nix binary cache hosting https://cachix.org";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {};
+ }) {inherit (pkgs) nix;};
"cachix-api" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, bytestring
@@ -45937,8 +46065,8 @@ self: {
}:
mkDerivation {
pname = "cachix-api";
- version = "0.2.1";
- sha256 = "1ja724ji12whjhyw135yi2fq323a65h4bj37r43b5d9ir1c04g67";
+ version = "0.3.0";
+ sha256 = "0lkmdgqvwx6cy1hbrx130yqbcq6ln1i9kr8s9r75g6lnv539lazq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -45959,8 +46087,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Servant HTTP API specification for https://cachix.org";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"cacophony" = callPackage
@@ -46404,27 +46530,25 @@ self: {
"camfort" = callPackage
({ mkDerivation, alex, array, base, binary, bytestring, containers
- , directory, fgl, filepath, flint, fortran-src, GenericPretty
- , ghc-prim, happy, hmatrix, hspec, hspec-discover, lattices, lens
- , matrix, mmorph, mtl, optparse-applicative, parallel, pretty
- , QuickCheck, sbv, silently, singletons, strict, syb, syz
- , template-haskell, temporary, text, time, transformers, uniplate
- , vector, verifiable-expressions, vinyl, writer-cps-morph
- , writer-cps-mtl, writer-cps-transformers
+ , deepseq, directory, fgl, filepath, flint, fortran-src
+ , GenericPretty, ghc-prim, happy, hmatrix, hspec, hspec-discover
+ , lattices, lens, matrix, mmorph, mtl, optparse-applicative
+ , parallel, pipes, pretty, QuickCheck, sbv, silently, singletons
+ , strict, syb, syz, template-haskell, temporary, text, time
+ , transformers, uniplate, vector, verifiable-expressions, vinyl
}:
mkDerivation {
pname = "camfort";
- version = "0.906";
- sha256 = "164zrga458nmlyxaaa9wa0x1vamrlf1w1jisnwp87khkw8622nyi";
+ version = "1.0";
+ sha256 = "1lgsn1jin57677j8xia7ga4pdvs0yrs9spdmm9rbncxcz5c3nf52";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- array base binary bytestring containers directory fgl filepath
- fortran-src GenericPretty ghc-prim hmatrix lattices lens matrix
- mmorph mtl parallel pretty sbv singletons strict syb syz
- template-haskell text transformers uniplate vector
- verifiable-expressions vinyl writer-cps-morph writer-cps-mtl
- writer-cps-transformers
+ array base binary bytestring containers deepseq directory fgl
+ filepath fortran-src GenericPretty ghc-prim hmatrix lattices lens
+ matrix mmorph mtl parallel pipes pretty sbv singletons strict syb
+ syz template-haskell text transformers uniplate vector
+ verifiable-expressions vinyl
];
librarySystemDepends = [ flint ];
libraryToolDepends = [ alex happy ];
@@ -46493,8 +46617,8 @@ self: {
({ mkDerivation, arithmoi, array, base, containers, random }:
mkDerivation {
pname = "canon";
- version = "0.1.1.2";
- sha256 = "181c09kh76104b23hf52b049cc6clww1y9kffw1f0hnkxhds9n84";
+ version = "0.1.1.4";
+ sha256 = "1srixf1m7pzgr16y2xfckhi0xk9js68ps9zw8kvnw01c37x85f48";
libraryHaskellDepends = [ arithmoi array base containers random ];
description = "Arithmetic for Psychedelically Large Numbers";
license = stdenv.lib.licenses.mit;
@@ -46522,6 +46646,8 @@ self: {
pname = "canonical-json";
version = "0.6.0.0";
sha256 = "0lb847hvgkn49g6rvmavk14brvvpiy6q5fswk3cm9rc53hbq02zz";
+ revision = "1";
+ editedCabalFile = "18i3msxza5phvv5mz7gjqcygrm8rxd86pk2vqnsa715qrhsz88ch";
libraryHaskellDepends = [
base bytestring containers deepseq parsec pretty
];
@@ -47288,8 +47414,10 @@ self: {
({ mkDerivation, base, split, tasty, tasty-hunit }:
mkDerivation {
pname = "casing";
- version = "0.1.4.0";
- sha256 = "1mznhlbg8qd2yrjg23rq7s77bijn92nrfx7bvx9sw8sqxwqkd2lf";
+ version = "0.1.4.1";
+ sha256 = "1jpqni00kalydwzjh2ljpgry3w696wa52bkaxzr53da60b072qhh";
+ revision = "1";
+ editedCabalFile = "1n7w4w2icfppyvlmyzzmfivbx175ckqabs4my5qvvdvwlc89xrqb";
libraryHaskellDepends = [ base split ];
testHaskellDepends = [ base tasty tasty-hunit ];
description = "Convert between various source code casing conventions";
@@ -47506,19 +47634,17 @@ self: {
({ mkDerivation, array, attoparsec, base, bytestring, containers
, deepseq, hashable, HUnit, Only, QuickCheck, quickcheck-instances
, scientific, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text, text-short
+ , test-framework-quickcheck2, text, text-short, transformers
, unordered-containers, vector
}:
mkDerivation {
pname = "cassava";
- version = "0.5.1.0";
- sha256 = "0xs2c5lpy0g5lsmp2cx0dm5lnxij7cgry6xd5gsn3bfdlap8lb3n";
- revision = "2";
- editedCabalFile = "13mbhan3agzf8ki8hcac1xf50h9nbzx2b47zjqrch2050v6xa351";
+ version = "0.5.2.0";
+ sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk";
configureFlags = [ "-f-bytestring--lt-0_10_4" ];
libraryHaskellDepends = [
array attoparsec base bytestring containers deepseq hashable Only
- scientific text text-short unordered-containers vector
+ scientific text text-short transformers unordered-containers vector
];
testHaskellDepends = [
attoparsec base bytestring hashable HUnit QuickCheck
@@ -48730,23 +48856,23 @@ self: {
"cgrep" = callPackage
({ mkDerivation, aeson, ansi-terminal, array, async, base
, bytestring, cmdargs, containers, directory, dlist, either
- , exceptions, filepath, ghc-prim, mtl, process, regex-base
+ , exceptions, extra, filepath, ghc-prim, mtl, process, regex-base
, regex-pcre, regex-posix, safe, split, stm, stringsearch
, transformers, unicode-show, unix-compat, unordered-containers
, utf8-string, yaml
}:
mkDerivation {
pname = "cgrep";
- version = "6.6.25";
- sha256 = "0cary2b5jg8151n48a4vij32g68mrql791mhw43v44wvhlag8plw";
+ version = "6.6.30";
+ sha256 = "1ald0461mnd65g5czp3d8dzdvy8pmdxhzj35sghcnxi6qs18xp69";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
aeson ansi-terminal array async base bytestring cmdargs containers
- directory dlist either exceptions filepath ghc-prim mtl process
- regex-base regex-pcre regex-posix safe split stm stringsearch
- transformers unicode-show unix-compat unordered-containers
- utf8-string yaml
+ directory dlist either exceptions extra filepath ghc-prim mtl
+ process regex-base regex-pcre regex-posix safe split stm
+ stringsearch transformers unicode-show unix-compat
+ unordered-containers utf8-string yaml
];
description = "Command line tool";
license = stdenv.lib.licenses.gpl2;
@@ -49301,8 +49427,8 @@ self: {
({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
mkDerivation {
pname = "checkers";
- version = "0.5.0";
- sha256 = "1kbn71blf67jfncv4gia8ygyzh4bngq36vapq2vqrqrzhap3mqi7";
+ version = "0.5.2";
+ sha256 = "1mqfy6lrivc36kxbfr9zyp70pyq3k2xrmavkadznh999d54x11kq";
libraryHaskellDepends = [
array base QuickCheck random semigroupoids
];
@@ -49361,6 +49487,8 @@ self: {
pname = "chell";
version = "0.5";
sha256 = "1i845isfbk0yq852am9bqmxfpfkpnlha8nfidffsv4gw2p8gg6fg";
+ revision = "1";
+ editedCabalFile = "1q93wrw03ix4cmnkz3lzkixcvvizw6i2ia2zifdfak1dvxnblxk0";
libraryHaskellDepends = [
ansi-terminal base bytestring options patience random
template-haskell text transformers
@@ -50762,15 +50890,13 @@ self: {
, filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra
, ghc-typelits-knownnat, ghc-typelits-natnormalise, ghci, hashable
, haskeline, integer-gmp, lens, mtl, primitive, process, reflection
- , text, time, transformers, unbound-generics, uniplate, unix
- , unordered-containers, vector
+ , template-haskell, text, time, transformers, uniplate, unix
+ , unordered-containers, utf8-string, vector
}:
mkDerivation {
pname = "clash-ghc";
- version = "0.99.3";
- sha256 = "0gjbvh6w2yc8pk38h8pw2jqfbyjzadizszy7v24a851m2cg0yiw9";
- revision = "1";
- editedCabalFile = "0r86409nh73wcychmwh2j3qnbbjk9z2yxr5amx7gpc8gar4qb3qi";
+ version = "1.0.0";
+ sha256 = "1b216mvw4w0yhpr8bi5j6ra2lfhk6imys10r0pidrpfc8wh779lg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -50778,8 +50904,8 @@ self: {
concurrent-supply containers deepseq directory filepath ghc
ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat
ghc-typelits-natnormalise ghci hashable haskeline integer-gmp lens
- mtl primitive process reflection text time transformers
- unbound-generics uniplate unix unordered-containers vector
+ mtl primitive process reflection template-haskell text time
+ transformers uniplate unix unordered-containers utf8-string vector
];
executableHaskellDepends = [ base ];
description = "CAES Language for Synchronous Hardware";
@@ -50789,25 +50915,28 @@ self: {
}) {};
"clash-lib" = callPackage
- ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
- , bytestring, clash-prelude, concurrent-supply, containers
- , data-binary-ieee754, deepseq, directory, errors, fgl, filepath
- , ghc, hashable, integer-gmp, lens, mtl, parsers, prettyprinter
- , primitive, process, reducers, template-haskell, text, time
- , transformers, trifecta, unbound-generics, unordered-containers
- , vector
+ ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, attoparsec
+ , base, binary, bytestring, clash-prelude, concurrent-supply
+ , containers, data-binary-ieee754, deepseq, directory, errors
+ , exceptions, filepath, ghc, hashable, hint, integer-gmp
+ , interpolate, lens, mtl, parsers, prettyprinter, primitive
+ , process, reducers, template-haskell, temporary, text, text-show
+ , time, transformers, trifecta, unordered-containers, vector
+ , vector-binary-instances
}:
mkDerivation {
pname = "clash-lib";
- version = "0.99.3";
- sha256 = "1fnsffp2qr608sq7z243a772qisyqbndxmprwd43lbvg2v00yssm";
+ version = "1.0.0";
+ sha256 = "1mh6aj6987i80xkqxw1jrqf0jih7jlgsgf13p30mc1graibxbj95";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson ansi-wl-pprint attoparsec base bytestring clash-prelude
- concurrent-supply containers data-binary-ieee754 deepseq directory
- errors fgl filepath ghc hashable integer-gmp lens mtl parsers
- prettyprinter primitive process reducers template-haskell text time
- transformers trifecta unbound-generics unordered-containers vector
+ aeson ansi-terminal ansi-wl-pprint attoparsec base binary
+ bytestring clash-prelude concurrent-supply containers
+ data-binary-ieee754 deepseq directory errors exceptions filepath
+ ghc hashable hint integer-gmp interpolate lens mtl parsers
+ prettyprinter primitive process reducers template-haskell temporary
+ text text-show time transformers trifecta unordered-containers
+ vector vector-binary-instances
];
description = "CAES Language for Synchronous Hardware - As a Library";
license = stdenv.lib.licenses.bsd2;
@@ -50832,23 +50961,32 @@ self: {
}) {};
"clash-prelude" = callPackage
- ({ mkDerivation, array, base, bifunctors, constraints, criterion
- , data-binary-ieee754, data-default, deepseq, doctest, ghc-prim
+ ({ mkDerivation, array, base, bifunctors, binary, bytestring
+ , constraints, containers, criterion, data-binary-ieee754
+ , data-default-class, deepseq, doctest, ghc-prim
, ghc-typelits-extra, ghc-typelits-knownnat
- , ghc-typelits-natnormalise, half, integer-gmp, lens, QuickCheck
- , reflection, singletons, template-haskell, transformers, vector
+ , ghc-typelits-natnormalise, half, hashable, hint, integer-gmp
+ , lens, QuickCheck, reflection, singletons, tasty, tasty-hunit
+ , template-haskell, text, th-lift, th-orphans, time, transformers
+ , type-errors, vector
}:
mkDerivation {
pname = "clash-prelude";
- version = "0.99.3";
- sha256 = "1g3pidjpcpzhkgyxw1w58ck0ihpla58nxx3xgkrcfz903xkjhipg";
+ version = "1.0.0";
+ sha256 = "045818jkl8q3b5rp52fx5znb0d9ai3ny8avls0jmgf7aqbmcwr5k";
+ revision = "2";
+ editedCabalFile = "0l7scl33mrr0i2208yh5dqbz8afmh9crhf9wlvyz67j1l91sfaqc";
libraryHaskellDepends = [
- array base bifunctors constraints data-binary-ieee754 data-default
- deepseq ghc-prim ghc-typelits-extra ghc-typelits-knownnat
- ghc-typelits-natnormalise half integer-gmp lens QuickCheck
- reflection singletons template-haskell transformers vector
+ array base bifunctors binary bytestring constraints containers
+ data-binary-ieee754 data-default-class deepseq ghc-prim
+ ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise
+ half hashable integer-gmp lens QuickCheck reflection singletons
+ template-haskell text th-lift th-orphans time transformers
+ type-errors vector
+ ];
+ testHaskellDepends = [
+ base doctest ghc-typelits-knownnat hint tasty tasty-hunit
];
- testHaskellDepends = [ base doctest ];
benchmarkHaskellDepends = [
base criterion deepseq template-haskell
];
@@ -53033,6 +53171,8 @@ self: {
pname = "coercible-utils";
version = "0.0.0";
sha256 = "164cn0cs7fjfm599v2z8wsgsz599f97wky4h7vycf460rn34jqia";
+ revision = "1";
+ editedCabalFile = "1xbnkv6fqf4mizqkha8b073p0r84l1rx1kzdsd6nh8b0adrp6i4d";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
benchmarkHaskellDepends = [ base gauge ];
@@ -53040,6 +53180,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "coercible-utils_0_1_0" = callPackage
+ ({ mkDerivation, base, gauge }:
+ mkDerivation {
+ pname = "coercible-utils";
+ version = "0.1.0";
+ sha256 = "0nadwhr96nvwz1vxxr7814h22v02zrycqa9xijgvrakf0j174yls";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ benchmarkHaskellDepends = [ base gauge ];
+ description = "Utility functions for Coercible types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"coercion-extras" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -54623,8 +54777,8 @@ self: {
}:
mkDerivation {
pname = "composite-aeson";
- version = "0.5.5.0";
- sha256 = "1hmhnkfmdjm5q8lkvlyr7rzs1lfycnblz3q2y8aziy27j7pvnz6h";
+ version = "0.6.0.0";
+ sha256 = "0r15hc6kwg0dibxix2f5afg91qwc6fd5m9sijn0k0mq62f0ln7ki";
libraryHaskellDepends = [
aeson aeson-better-errors base composite-base containers
contravariant generic-deriving hashable lens mmorph mtl profunctors
@@ -54649,8 +54803,8 @@ self: {
}:
mkDerivation {
pname = "composite-aeson-refined";
- version = "0.5.5.0";
- sha256 = "0mm0dbsxqw5m78jgdn6vnbck2icqkzgwqyc3c3ghyz46cymd7pjz";
+ version = "0.6.0.0";
+ sha256 = "1plhqx0k0xab8fkip6v96rqnrdjq02ph1gmrk4r5zq5x4gc7gpps";
libraryHaskellDepends = [
aeson-better-errors base composite-aeson mtl refined
];
@@ -54667,8 +54821,8 @@ self: {
}:
mkDerivation {
pname = "composite-base";
- version = "0.5.5.0";
- sha256 = "0qlg979cwkdlfpcwh7r0qr9fjs525b3xly0invr358h2g1lgi0fm";
+ version = "0.6.0.0";
+ sha256 = "188za7x9069ah8sgf8laqwkg3yfzl7cm23iacbcnbw25jd7k6vy3";
libraryHaskellDepends = [
base exceptions lens monad-control mtl profunctors template-haskell
text transformers transformers-base unliftio-core vinyl
@@ -54689,8 +54843,8 @@ self: {
}:
mkDerivation {
pname = "composite-ekg";
- version = "0.5.5.0";
- sha256 = "0bawdcx21dd0szxnnxs2iinzz6h4w2phk7mfs26fxiqx3f375lm4";
+ version = "0.6.0.0";
+ sha256 = "065aah2jx6r8i8qgwfql90nc6avhrrhc3aq3zlrqimqwv4772pvj";
libraryHaskellDepends = [
base composite-base ekg-core lens text vinyl
];
@@ -54707,8 +54861,8 @@ self: {
}:
mkDerivation {
pname = "composite-opaleye";
- version = "0.5.5.0";
- sha256 = "0s54g9c1lm3jrdj44cvzxgbfaf7l2fdq2yy25vhqdmww50h8q1cx";
+ version = "0.6.0.0";
+ sha256 = "13hpvk6wx7yiz7klay7da8lllvszddlixk9xxyc8w9kqq48b4k92";
libraryHaskellDepends = [
base bytestring composite-base lens opaleye postgresql-simple
product-profunctors profunctors template-haskell text vinyl
@@ -54731,8 +54885,8 @@ self: {
}:
mkDerivation {
pname = "composite-swagger";
- version = "0.5.5.0";
- sha256 = "1qisvrs93jnrrjyhzdn0xwq54jc1mc8avpzq41a39ak5xdslzf6a";
+ version = "0.6.0.0";
+ sha256 = "1m0a77imgrs55vmzvfx7hy74siwnxpcgjg7cawsmsnarkymb1c5c";
libraryHaskellDepends = [
base composite-base insert-ordered-containers lens swagger2
template-haskell text vinyl
@@ -56188,8 +56342,8 @@ self: {
}:
mkDerivation {
pname = "conferer";
- version = "0.1.0.0";
- sha256 = "0y62yj2cm7q9qwxl3jfdq16rza2mrjg60lchx4s0gbwiw959a83n";
+ version = "0.1.0.1";
+ sha256 = "1g5kyvy067lll181xqd1lxpzl5965yj847kh6z2r0wvq01i4k467";
libraryHaskellDepends = [
base bytestring containers directory text
];
@@ -56317,6 +56471,8 @@ self: {
pname = "config-schema";
version = "1.1.0.0";
sha256 = "1nr1jyrgvvm1zlzvlfpz35zb5iydn1mpk89kljp0h1cvkl35mjkl";
+ revision = "1";
+ editedCabalFile = "0h828xld2dfjj43jwq1f98wd21nzvhn74wsx586a0kcd6q41pcs5";
libraryHaskellDepends = [
base config-value containers free kan-extensions pretty
semigroupoids text transformers
@@ -56349,8 +56505,8 @@ self: {
pname = "config-value";
version = "0.6.3.1";
sha256 = "0gfr9qcw8a7y1y9cn6635y8fgvrpkmcqx31bn2a070rbrmk3757z";
- revision = "1";
- editedCabalFile = "16h47yc8z3fkxs6gdyzfkahi9ibm7narkc72xcx67bmk309xb46c";
+ revision = "2";
+ editedCabalFile = "037hi6hrd3kk2zjsi8ly9jj4gc8xq5vnn8p09dm0hshd31fyhl52";
libraryHaskellDepends = [ array base pretty text ];
libraryToolDepends = [ alex happy ];
description = "Simple, layout-based value language similar to YAML or JSON";
@@ -56638,10 +56794,10 @@ self: {
}:
mkDerivation {
pname = "connection";
- version = "0.3.0";
- sha256 = "1f53bysp8zr8c8dhivrq2k9qmlwnk84d4c1s31sd62ws9yddcw34";
+ version = "0.3.1";
+ sha256 = "1nbmafhlg0wy4aa3p7amjddbamdz6avzrxn4py3lvhrjqn4raxax";
revision = "1";
- editedCabalFile = "0cm421anscv6h4nvhkaqvi5s3lwkc0f34p6z8lzap4wyc4gv578k";
+ editedCabalFile = "08f1n38zryd0jklyv3yillilp040zxfxha6jphrmf28haq2irnk5";
libraryHaskellDepends = [
base basement bytestring containers data-default-class network
socks tls x509 x509-store x509-system x509-validation
@@ -56768,6 +56924,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "constr-eq" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "constr-eq";
+ version = "0.1.0.0";
+ sha256 = "0vk3cz6897vjnn1q7y1sqxy42ii4pq5h7jxw1zyybi99p6c4vgm6";
+ libraryHaskellDepends = [ base ];
+ description = "Equality by only Constructor";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"constrained-categories" = callPackage
({ mkDerivation, base, contravariant, semigroups, tagged
, trivial-constraint, void
@@ -56925,18 +57094,18 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
- "constraints_0_11_1" = callPackage
+ "constraints_0_11_2" = callPackage
({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
, hspec-discover, mtl, semigroups, transformers
- , transformers-compat
+ , transformers-compat, type-equality
}:
mkDerivation {
pname = "constraints";
- version = "0.11.1";
- sha256 = "15768bcd8z70wq0b2igvz8mrl62bqaqad6cpdp9p4awyylba37y6";
+ version = "0.11.2";
+ sha256 = "10mnhg7p5gk4i3bzldl07qkrihnvmfkgsp32w7p9i7x8cmj5akjq";
libraryHaskellDepends = [
base binary deepseq ghc-prim hashable mtl semigroups transformers
- transformers-compat
+ transformers-compat type-equality
];
testHaskellDepends = [ base hspec ];
testToolDepends = [ hspec-discover ];
@@ -59560,26 +59729,28 @@ self: {
"criterion" = callPackage
({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
- , base-compat-batteries, binary, bytestring, cassava, code-page
- , containers, criterion-measurement, deepseq, directory, exceptions
- , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl
- , mwc-random, optparse-applicative, parsec, QuickCheck, statistics
- , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
- , transformers-compat, vector, vector-algorithms
+ , base-compat-batteries, binary, binary-orphans, bytestring
+ , cassava, code-page, containers, criterion-measurement, deepseq
+ , directory, exceptions, filepath, Glob, HUnit, js-flot, js-jquery
+ , microstache, mtl, mwc-random, optparse-applicative, parsec
+ , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck
+ , text, time, transformers, transformers-compat, vector
+ , vector-algorithms
}:
mkDerivation {
pname = "criterion";
- version = "1.5.5.0";
- sha256 = "1a5i9ghy4hr3355ml4b0rc3b94fa2ijfflh398ncn9sw1ivmx8pa";
+ version = "1.5.6.0";
+ sha256 = "1p8rw70k69bz33a8amn1ibdf6104hjphglyjlzsxa4w949d0ahp2";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson ansi-wl-pprint base base-compat-batteries binary bytestring
- cassava code-page containers criterion-measurement deepseq
- directory exceptions filepath Glob js-flot js-jquery microstache
- mtl mwc-random optparse-applicative parsec statistics text time
- transformers transformers-compat vector vector-algorithms
+ aeson ansi-wl-pprint base base-compat-batteries binary
+ binary-orphans bytestring cassava code-page containers
+ criterion-measurement deepseq directory exceptions filepath Glob
+ js-flot js-jquery microstache mtl mwc-random optparse-applicative
+ parsec statistics text time transformers transformers-compat vector
+ vector-algorithms
];
executableHaskellDepends = [
base base-compat-batteries optparse-applicative
@@ -59849,8 +60020,8 @@ self: {
pname = "crypt-sha512";
version = "0";
sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2";
- revision = "2";
- editedCabalFile = "071lxiwsf23ga1fkbjd47ykz7f5irhsh7q7zz2qczzjgnvzadadh";
+ revision = "3";
+ editedCabalFile = "1l8glrv7bhdi0p1m1xq9majlbh8n9agai9d4mldzi5bnp5m5b79q";
libraryHaskellDepends = [
attoparsec base bytestring cryptohash-sha512
];
@@ -60330,8 +60501,8 @@ self: {
pname = "cryptohash-md5";
version = "0.11.100.1";
sha256 = "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi";
- revision = "3";
- editedCabalFile = "0ld224mdmw9mgzcl20q82rqkyl7d5vmi1iknsyymq58gcvcwdi2m";
+ revision = "4";
+ editedCabalFile = "0gzaibjkipijwj9m9l6wrhfk5s3kdvfbhdl7cl1373cjfs41v0m3";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
base base16-bytestring bytestring pureMD5 tasty tasty-hunit
@@ -60350,8 +60521,8 @@ self: {
pname = "cryptohash-sha1";
version = "0.11.100.1";
sha256 = "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w";
- revision = "3";
- editedCabalFile = "0i30cc85732v27baibdjy2kjjkdfv335ib5sk5ggwvsysvvvr66l";
+ revision = "4";
+ editedCabalFile = "0qb2wasfc4dpf6f9ahvhlv8njb3p3p9iwblg4032ssi95cg85718";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -60392,8 +60563,8 @@ self: {
pname = "cryptohash-sha512";
version = "0.11.100.1";
sha256 = "1abi23dr3vzslkh0cx24cdn2gy88jjm4qr6rcm543ajyaywqns8h";
- revision = "3";
- editedCabalFile = "19m1fp0i7ba84aa72d5wf59c7j0p4yr1bc43in8pspgywhsr3lfl";
+ revision = "4";
+ editedCabalFile = "0iqs51a58w71j1zz3rn9kical63yvvqqqrc6971mh6wfscyi1gqr";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -60413,8 +60584,8 @@ self: {
pname = "cryptoids";
version = "0.5.1.0";
sha256 = "0ai7hg4r944hck9vq2ffwwjsxp3mjfvxwhfr8b8765n1bh86i466";
- revision = "4";
- editedCabalFile = "017fm7rcls5z2sjx4117h9bcc0szh2vs89gj2d8510vajq70yvwq";
+ revision = "5";
+ editedCabalFile = "1g2p5519rrbiizry5izdmqn47sayv7v7kqmj0w7abdn6b68di73j";
libraryHaskellDepends = [
base binary bytestring cryptoids-class cryptoids-types cryptonite
directory exceptions filepath memory
@@ -60463,8 +60634,8 @@ self: {
}:
mkDerivation {
pname = "cryptol";
- version = "2.7.0";
- sha256 = "14yk7qs7laxy5ranx9m911k1lxc4vh4pp83ywmsg1kf0cdfvmij6";
+ version = "2.8.0";
+ sha256 = "1fqhk7glh1y0a1f0iwdzrljh9k7v06pn0ybhlcs51ph9vs4byqdh";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -61175,6 +61346,8 @@ self: {
doHaddock = false;
description = "Haskell Implementation of Cuckoo Filters";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"cuckoo-filter" = callPackage
@@ -63337,10 +63510,8 @@ self: {
}:
mkDerivation {
pname = "data-interval";
- version = "1.3.0";
- sha256 = "1i00cci7lzvkxqd1l8dacn7i0mrnccbs23mdciz6nrhlvlgsfiy9";
- revision = "3";
- editedCabalFile = "0jfqgijikf11lqsvbj0rc2b9n2ym7gn4mhk5xpsginp0vy3bgpbp";
+ version = "1.3.1";
+ sha256 = "0x09h2a6ay0h6whmja1q5dqmmf3savyvpv8h14rrwqd87x04abl9";
libraryHaskellDepends = [
base containers deepseq extended-reals hashable lattices
];
@@ -64794,7 +64965,7 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
- "dbus_1_2_8" = callPackage
+ "dbus_1_2_9" = callPackage
({ mkDerivation, base, bytestring, cereal, conduit, containers
, criterion, deepseq, directory, exceptions, extra, filepath, lens
, network, parsec, process, QuickCheck, random, resourcet, split
@@ -64803,8 +64974,8 @@ self: {
}:
mkDerivation {
pname = "dbus";
- version = "1.2.8";
- sha256 = "1jk43ngc9z6wq5idhnzmvjy3psdvivzcpva62x83c6fnb10vg25f";
+ version = "1.2.9";
+ sha256 = "1q9qhl6hjbr9yxmr62md4ycadv04nqdkvsa8l5c0p724rz3faqw3";
libraryHaskellDepends = [
base bytestring cereal conduit containers deepseq exceptions
filepath lens network parsec random split template-haskell text
@@ -65596,6 +65767,8 @@ self: {
pname = "dec";
version = "0.0.3";
sha256 = "1y8bvlm2371dq2v0jv1srki98nbhbz091wh0g2x58wz78h971f6r";
+ revision = "1";
+ editedCabalFile = "09dkybwqmayf2a1sn94vmmma2xfvf07bw7grhcyjm7lq9jpxv8y0";
libraryHaskellDepends = [ base ];
description = "Decidable propositions";
license = stdenv.lib.licenses.bsd3;
@@ -66414,13 +66587,13 @@ self: {
}:
mkDerivation {
pname = "dependent-monoidal-map";
- version = "0.1.0.0";
- sha256 = "1gzqnxnbr9r1zny932pa9qbq4ygdpkmxhb9cflvh2vav548qfkv9";
+ version = "0.1.1.0";
+ sha256 = "0l5nj7jalyca6vv9aqsx0j799vrr65cm1jzh17fcnwkxair3lkgx";
libraryHaskellDepends = [
aeson base constraints constraints-extras dependent-map
dependent-sum dependent-sum-aeson-orphans
];
- description = "Data.Dependent.Map variant that appends conflicting entries when merging maps instead of discarding one side of the conflict.";
+ description = "Dependent map that uses semigroup mappend";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -66619,6 +66792,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "deque_0_4_3" = callPackage
+ ({ mkDerivation, base, hashable, mtl, QuickCheck
+ , quickcheck-instances, rerebase, strict-list, tasty, tasty-hunit
+ , tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "deque";
+ version = "0.4.3";
+ sha256 = "19apwmcykprz3a91wszmc1w3qcz4x3rq79gmik514fszi9yhwsmp";
+ libraryHaskellDepends = [ base hashable mtl strict-list ];
+ testHaskellDepends = [
+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+ tasty-quickcheck
+ ];
+ description = "Double-ended queues";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dequeue" = callPackage
({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck
, safe
@@ -66836,29 +67028,6 @@ self: {
}) {};
"deriving-compat" = callPackage
- ({ mkDerivation, base, base-compat, base-orphans, containers
- , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
- , template-haskell, th-abstraction, transformers
- , transformers-compat
- }:
- mkDerivation {
- pname = "deriving-compat";
- version = "0.5.6";
- sha256 = "1rsjq3s2m69x2h880r087qbiwp3173pwv2yihlb8aw7dmjybydmf";
- libraryHaskellDepends = [
- base containers ghc-boot-th ghc-prim template-haskell
- th-abstraction transformers transformers-compat
- ];
- testHaskellDepends = [
- base base-compat base-orphans hspec QuickCheck tagged
- template-haskell transformers transformers-compat
- ];
- testToolDepends = [ hspec-discover ];
- description = "Backports of GHC deriving extensions";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "deriving-compat_0_5_7" = callPackage
({ mkDerivation, base, base-compat, base-orphans, containers
, ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
, template-haskell, th-abstraction, transformers
@@ -66879,7 +67048,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Backports of GHC deriving extensions";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"derp" = callPackage
@@ -66925,8 +67093,8 @@ self: {
({ mkDerivation, base, bytestring, cereal, QuickCheck }:
mkDerivation {
pname = "describe";
- version = "0.1.0.0";
- sha256 = "0bbi6jih3d2fbsqhvmac8970jczwsq0zq61nlvrvr7nzgl2v07fl";
+ version = "0.1.2.1";
+ sha256 = "1k2ik717ab2wnffmkfqm7akp3irp3jsfsb8l49gqgn30wgrx3nk7";
libraryHaskellDepends = [ base bytestring cereal ];
testHaskellDepends = [ base bytestring cereal QuickCheck ];
description = "Combinators for describing binary data structures";
@@ -67337,6 +67505,8 @@ self: {
pname = "dhall";
version = "1.25.0";
sha256 = "0d8qx4fawvxykig628jfgqpa660mzzicysa7g3mda6zni9j4yq0h";
+ revision = "2";
+ editedCabalFile = "00jb0n07sa6v5ynzlyz39gc6zc0s0jlfck5w64pya1nmdbiijizz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -69573,8 +69743,8 @@ self: {
}:
mkDerivation {
pname = "discord-haskell";
- version = "1.0.0";
- sha256 = "1z0d46gd7rgwbh05ws6hcp4rikach0yg1fim6ni0ww4g0mksj8j3";
+ version = "1.1.0";
+ sha256 = "16n78p6g0rh670zy2pbk59c8nkg5srkhlbya0aknpz2s4smpn891";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -70605,8 +70775,8 @@ self: {
}:
mkDerivation {
pname = "distributive";
- version = "0.6";
- sha256 = "1m61ppv851nifid98fimvpml0z0j3ximj7nxd72hshrslr0i7bx4";
+ version = "0.6.1";
+ sha256 = "1wnayzzb4vk8rhh9gzhdpd9f64366k4vmbhximavmqqmp3cv2jbp";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [ base base-orphans tagged transformers ];
testHaskellDepends = [ base doctest generic-deriving hspec ];
@@ -70799,6 +70969,28 @@ self: {
broken = true;
}) {};
+ "dl-fedora_0_6" = callPackage
+ ({ mkDerivation, base, bytestring, directory, filepath
+ , http-directory, http-types, optparse-applicative, regex-posix
+ , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs
+ }:
+ mkDerivation {
+ pname = "dl-fedora";
+ version = "0.6";
+ sha256 = "1kq9hhpgh24kfgf9b25zppmfbylcqx0scs96dp0nbyj3rp6yl8rh";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring directory filepath http-directory http-types
+ optparse-applicative regex-posix simple-cmd simple-cmd-args text
+ unix xdg-userdirs
+ ];
+ description = "Fedora image download tool";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"dlist" = callPackage
({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
mkDerivation {
@@ -70831,8 +71023,8 @@ self: {
pname = "dlist-nonempty";
version = "0.1.1";
sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20";
- revision = "5";
- editedCabalFile = "01x05d62y8f3kippxawra3fdr7jdms3zcgd7c4n8wf39np9wy556";
+ revision = "7";
+ editedCabalFile = "0cp5v4zfkx7mz8cc8hgjx0v0a37y4fnld3r59i6mb00ilzrh1nhk";
libraryHaskellDepends = [
base base-compat deepseq dlist semigroupoids
];
@@ -71320,7 +71512,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "doctemplates_0_5" = callPackage
+ "doctemplates_0_6" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, criterion
, doclayout, filepath, Glob, mtl, parsec, safe, scientific, tasty
, tasty-golden, tasty-hunit, temporary, text, unordered-containers
@@ -71328,16 +71520,16 @@ self: {
}:
mkDerivation {
pname = "doctemplates";
- version = "0.5";
- sha256 = "0xdma2j1bim31mvkqc6362rbmv193fyznd3y4ipdgd113zkj7hy6";
+ version = "0.6";
+ sha256 = "1bimvksijpz3czx0si9wwiigi4knc3d4i7rl6fssmz3z9qs6rhxg";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base containers doclayout filepath mtl parsec safe scientific
text unordered-containers vector
];
testHaskellDepends = [
- aeson base bytestring filepath Glob tasty tasty-golden tasty-hunit
- temporary text
+ aeson base bytestring doclayout filepath Glob tasty tasty-golden
+ tasty-hunit temporary text
];
benchmarkHaskellDepends = [
aeson base containers criterion filepath mtl text
@@ -71348,34 +71540,6 @@ self: {
}) {};
"doctest" = callPackage
- ({ mkDerivation, base, base-compat, code-page, deepseq, directory
- , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
- , QuickCheck, setenv, silently, stringbuilder, syb, transformers
- }:
- mkDerivation {
- pname = "doctest";
- version = "0.16.1";
- sha256 = "1xnm1sbm9lpfxw5yav8qpqr85aap94k9df6n5kx70bp6h69qnrrq";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base base-compat code-page deepseq directory filepath ghc ghc-paths
- process syb transformers
- ];
- executableHaskellDepends = [
- base base-compat code-page deepseq directory filepath ghc ghc-paths
- process syb transformers
- ];
- testHaskellDepends = [
- base base-compat code-page deepseq directory filepath ghc ghc-paths
- hspec HUnit mockery process QuickCheck setenv silently
- stringbuilder syb transformers
- ];
- description = "Test interactive Haskell examples";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "doctest_0_16_2" = callPackage
({ mkDerivation, base, base-compat, code-page, deepseq, directory
, filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
, QuickCheck, setenv, silently, stringbuilder, syb, transformers
@@ -71401,7 +71565,6 @@ self: {
];
description = "Test interactive Haskell examples";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"doctest-discover" = callPackage
@@ -72844,8 +73007,8 @@ self: {
pname = "dual-tree";
version = "0.2.2";
sha256 = "1sx9p9yr06z7bi7pshjpswizs6bkmfzcpw8xlasriniry86df4kl";
- revision = "2";
- editedCabalFile = "0r8idr1haqixa9nlp8db5iw9vr9sdk6rcargkr7w7s6i99lm6jmh";
+ revision = "3";
+ editedCabalFile = "00gwdgzy80p9c5r4wafm1fiqnh2hy1xjsbl86h1qkk7xg33g2ssi";
libraryHaskellDepends = [
base monoid-extras newtype-generics semigroups
];
@@ -73647,8 +73810,8 @@ self: {
}:
mkDerivation {
pname = "dzen-dhall";
- version = "1.0.0";
- sha256 = "0im78kvjwanlbi097pyvvpj2isssf3iblqbbqsk2iccvdqjyqf5z";
+ version = "1.0.1";
+ sha256 = "16rkmiczdgknlq1f8m5n3ila8727z1db77g141sq5qqlgn7x37ww";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -73668,6 +73831,8 @@ self: {
];
description = "Configure dzen2 bars in Dhall language";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"dzen-utils" = callPackage
@@ -75219,6 +75384,8 @@ self: {
];
description = "Elliptic curve library";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"elm-bridge" = callPackage
@@ -75543,6 +75710,30 @@ self: {
license = stdenv.lib.licenses.mpl20;
}) {};
+ "elm-street_0_1_0_1" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, directory, filepath
+ , hspec, prettyprinter, servant, servant-server, text, time, wai
+ , warp
+ }:
+ mkDerivation {
+ pname = "elm-street";
+ version = "0.1.0.1";
+ sha256 = "1n02bxyva732dbnrzc6n6v8rsgpbjb6ndh4szwqj8zckj694mc77";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base directory filepath prettyprinter text time
+ ];
+ executableHaskellDepends = [
+ base directory filepath servant servant-server text wai warp
+ ];
+ testHaskellDepends = [ aeson base bytestring hspec ];
+ doHaddock = false;
+ description = "Crossing the road between Haskell and Elm";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"elm-websocket" = callPackage
({ mkDerivation, aeson, base, bytestring, concurrent-extra
, containers, directory, formatting, hspec, http-types, lens, mtl
@@ -75944,20 +76135,26 @@ self: {
}) {};
"emd" = callPackage
- ({ mkDerivation, base, binary, containers, data-default-class
- , finite-typelits, ghc-typelits-knownnat, ghc-typelits-natnormalise
- , HUnit, transformers, typelits-witnesses, vector, vector-sized
+ ({ mkDerivation, base, binary, containers, criterion
+ , data-default-class, deepseq, finite-typelits
+ , ghc-typelits-knownnat, ghc-typelits-natnormalise, HUnit
+ , mwc-random, statistics, transformers, typelits-witnesses, vector
+ , vector-sized
}:
mkDerivation {
pname = "emd";
- version = "0.1.4.0";
- sha256 = "0mrkyy6fn4jsy6h4acqjkkq1bvp7c8yjpw5zyk9ycnk2izb7a9zw";
+ version = "0.1.5.1";
+ sha256 = "06ii6yw9612dq3ryfv2n7yk5wic3lc3kyvmvbj19wwicwc7315bf";
libraryHaskellDepends = [
- base binary containers data-default-class finite-typelits
+ base binary containers data-default-class deepseq finite-typelits
ghc-typelits-knownnat ghc-typelits-natnormalise transformers
typelits-witnesses vector vector-sized
];
testHaskellDepends = [ base containers HUnit ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq ghc-typelits-knownnat mwc-random statistics
+ vector vector-sized
+ ];
description = "Empirical Mode Decomposition and Hilbert-Huang Transform";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -76091,8 +76288,6 @@ self: {
testHaskellDepends = [ base bytestring HUnit QuickCheck ];
description = "A library for various character encodings";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"encoding-io" = callPackage
@@ -76275,10 +76470,8 @@ self: {
}:
mkDerivation {
pname = "entropy";
- version = "0.4.1.4";
- sha256 = "1fgf47l9klwn1xssbcbq6by651vikd8hlfxhiwd5bqzxr1jnlgrf";
- revision = "1";
- editedCabalFile = "0h9wvpq4hw5ipn15ni0qdsrssjil0m59wm4l5hl607l3w2lif864";
+ version = "0.4.1.5";
+ sha256 = "0szf8hi1pi8g0kxnkcymh65gk1b0niyl1nnkckzdqyar87qal0jm";
setupHaskellDepends = [ base Cabal directory filepath process ];
libraryHaskellDepends = [ base bytestring unix ];
description = "A platform independent entropy source";
@@ -76929,21 +77122,19 @@ self: {
"equivalence" = callPackage
({ mkDerivation, base, containers, fail, mtl, QuickCheck
- , STMonadTrans, template-haskell, test-framework
- , test-framework-quickcheck2, transformers, transformers-compat
+ , STMonadTrans, template-haskell, transformers, transformers-compat
}:
mkDerivation {
pname = "equivalence";
- version = "0.3.4";
- sha256 = "02s24624xnwq790mip5pj6828an36j8jbdj5kvx9bv5a7ap3vzn1";
+ version = "0.3.5";
+ sha256 = "167njzd1cf32aa7br90rjafrxy6hw3fxkk8awifqbxjrcwm5maqp";
libraryHaskellDepends = [
base containers fail mtl STMonadTrans transformers
transformers-compat
];
testHaskellDepends = [
base containers fail mtl QuickCheck STMonadTrans template-haskell
- test-framework test-framework-quickcheck2 transformers
- transformers-compat
+ transformers transformers-compat
];
description = "Maintaining an equivalence relation implemented as union-find using STT";
license = stdenv.lib.licenses.bsd3;
@@ -78399,18 +78590,18 @@ self: {
({ mkDerivation, aeson, array, attoparsec, base, blaze-html
, bytestring, containers, file-embed, filepath, ghc-events
, hashtables, hvega, mtl, optparse-applicative, semigroups, text
- , time
+ , time, vector
}:
mkDerivation {
pname = "eventlog2html";
- version = "0.2.0";
- sha256 = "106jydjz8lg80xmj2ahllvqz57dfkf8qybm6nqib3hrw956igy4c";
+ version = "0.3.0";
+ sha256 = "1vg94x1f5wh20dvnqil3b3ipd8kajyplv7sv9f7zmrl73m5cgg9s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson array attoparsec base blaze-html bytestring containers
file-embed filepath ghc-events hashtables hvega mtl
- optparse-applicative semigroups text time
+ optparse-applicative semigroups text time vector
];
executableHaskellDepends = [ aeson base filepath text ];
description = "Visualise an eventlog";
@@ -78831,27 +79022,6 @@ self: {
}) {};
"exceptions" = callPackage
- ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
- , test-framework, test-framework-hunit, test-framework-quickcheck2
- , transformers, transformers-compat
- }:
- mkDerivation {
- pname = "exceptions";
- version = "0.10.2";
- sha256 = "0ajiq47xd1paingr7kksh69v6d072zsppfr6cy1gzjh3zg5jr34i";
- libraryHaskellDepends = [
- base mtl stm template-haskell transformers transformers-compat
- ];
- testHaskellDepends = [
- base mtl QuickCheck stm template-haskell test-framework
- test-framework-hunit test-framework-quickcheck2 transformers
- transformers-compat
- ];
- description = "Extensible optionally-pure exceptions";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "exceptions_0_10_3" = callPackage
({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
, test-framework, test-framework-hunit, test-framework-quickcheck2
, transformers, transformers-compat
@@ -78870,7 +79040,6 @@ self: {
];
description = "Extensible optionally-pure exceptions";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"exchangerates" = callPackage
@@ -79718,8 +79887,8 @@ self: {
pname = "extended-reals";
version = "0.2.3.0";
sha256 = "170nxxza6lkczh05qi2qxr8nbr3gmdjpfvl1m703gjq9xwrwg2kw";
- revision = "3";
- editedCabalFile = "0v80m6cnpx1d43cfykz5jbiqkk7l51vmrd48sb8s1h8f2pp9v3dq";
+ revision = "4";
+ editedCabalFile = "1gzi55w9kpfg51njyi3a28n7nc64chzgnv76m3xyrz7z0gbri93q";
libraryHaskellDepends = [ base deepseq hashable ];
testHaskellDepends = [
base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -80562,8 +80731,10 @@ self: {
}:
mkDerivation {
pname = "fast-logger";
- version = "2.4.16";
- sha256 = "090wv1as2ylr7f90dzhp5g9xzagg03zv0swy1zz08kar9qx3fwhc";
+ version = "2.4.17";
+ sha256 = "02mxb1ckvx1s2r2m11l5i2l5rdl7232p0f61af6773haykjp0qxk";
+ revision = "1";
+ editedCabalFile = "1yv4f6pbrgqqhc0z3chhjrzz1gs7idrmcbvmbl8pfyn547ci6brb";
libraryHaskellDepends = [
array auto-update base bytestring directory easy-file filepath text
unix-compat unix-time
@@ -82230,8 +82401,8 @@ self: {
pname = "file-embed-lzma";
version = "0";
sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78";
- revision = "2";
- editedCabalFile = "0dmg69gsj2k9lf112bvqw6z2w8hl0p1lx5zxdvlvk85bb3qz6304";
+ revision = "4";
+ editedCabalFile = "19z355zylpsqsfihldbda6lwrdj5divfhhnc24ryzvi384dw74lx";
libraryHaskellDepends = [
base base-compat bytestring directory filepath lzma
template-haskell text th-lift-instances transformers
@@ -82406,6 +82577,8 @@ self: {
pname = "filepath";
version = "1.4.2.1";
sha256 = "04jlcaaab4fvlkgpss2mfmr5ixnp1k8f8051nqf8avfg0qan6hqb";
+ revision = "1";
+ editedCabalFile = "1harx8x3g3badj3087c662sd15fk850jqzx0lz5h16zbsv438lqa";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base QuickCheck ];
description = "Library for manipulating FilePaths in a cross platform way";
@@ -82422,8 +82595,8 @@ self: {
pname = "filepath-crypto";
version = "0.1.0.0";
sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0";
- revision = "8";
- editedCabalFile = "1d4zrj5qqkqnx53fmdrw9dh2hwppc6mmykpxpddh4k84kln3mlym";
+ revision = "9";
+ editedCabalFile = "09a1y0m7jgchi8bmly49amzjrs25insvaf4ag3wys1ngb1cc2az0";
libraryHaskellDepends = [
base binary bytestring case-insensitive cryptoids cryptoids-class
cryptoids-types exceptions filepath sandi template-haskell
@@ -82643,6 +82816,8 @@ self: {
pname = "fin";
version = "0.1";
sha256 = "17nv26cznhslrfb1ajcgxa9g3zacvk3prmncr7f8d7rvh42g2gnn";
+ revision = "1";
+ editedCabalFile = "0kdhmjpifbl1r44jy2spj82gdadd849zz6i0y7mw1ii25w91yb50";
libraryHaskellDepends = [ base dec deepseq hashable ];
testHaskellDepends = [ base inspection-testing tagged ];
description = "Nat and Fin: peano naturals and finite numbers";
@@ -82816,6 +82991,26 @@ self: {
broken = true;
}) {};
+ "finitary" = callPackage
+ ({ mkDerivation, base, bitvec, coercible-utils, finite-typelits
+ , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
+ , monad-loops, mtl, template-haskell, vector-sized
+ }:
+ mkDerivation {
+ pname = "finitary";
+ version = "0.1.0.0";
+ sha256 = "0s42ja10hnv1czy75wh8bkz3mj9qwy0bsa90bnwnazf9q6xn9lyv";
+ libraryHaskellDepends = [
+ base bitvec coercible-utils finite-typelits ghc-typelits-knownnat
+ ghc-typelits-natnormalise mtl template-haskell vector-sized
+ ];
+ testHaskellDepends = [
+ base bitvec finite-typelits hedgehog monad-loops vector-sized
+ ];
+ description = "A better, more type-safe Enum";
+ license = stdenv.lib.licenses.gpl3Plus;
+ }) {};
+
"finite-field" = callPackage
({ mkDerivation, base, containers, deepseq, hashable, primes
, QuickCheck, singletons, tasty, tasty-hunit, tasty-quickcheck
@@ -84711,8 +84906,8 @@ self: {
pname = "foldl";
version = "1.4.5";
sha256 = "19qjmzc7gaxfwgqbgy0kq4vhbxvh3qjnwsxnc7pzwws2if5bv80b";
- revision = "3";
- editedCabalFile = "0ci6wq1lqmz0i5rlb4my21ic6ziq87kg35mkp3f9la9y32zbq600";
+ revision = "4";
+ editedCabalFile = "12qrmlazijyz5dn73p50klyny7x4vx8yw2isfmjikmrr12nhc5g0";
libraryHaskellDepends = [
base bytestring comonad containers contravariant hashable
mwc-random primitive profunctors semigroupoids semigroups text
@@ -85499,18 +85694,18 @@ self: {
}:
mkDerivation {
pname = "fortran-src";
- version = "0.3.0";
- sha256 = "03a1lk0c50v66jax2dya7qhjr3si2anp4yzx03vpf49am2kn2rxq";
+ version = "0.4.0";
+ sha256 = "1l66f9wcn5dp7i63wapzkx8bgiy22xrlxbfh3jbnhy7glhvk80ja";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- array base binary bytestring containers directory fgl filepath
- GenericPretty mtl pretty text uniplate
+ array base binary bytestring containers deepseq directory fgl
+ filepath GenericPretty mtl pretty text uniplate
];
libraryToolDepends = [ alex happy ];
executableHaskellDepends = [
- array base binary bytestring containers directory fgl filepath
- GenericPretty mtl pretty text uniplate
+ array base binary bytestring containers deepseq directory fgl
+ filepath GenericPretty mtl pretty text uniplate
];
testHaskellDepends = [
array base binary bytestring containers deepseq directory fgl
@@ -85623,8 +85818,10 @@ self: {
({ mkDerivation, base, basement, gauge, ghc-prim }:
mkDerivation {
pname = "foundation";
- version = "0.0.24";
- sha256 = "1yygliyg5dh06n7iyyrvy4iz2328hgb5igjp832wxrfa529pwqdk";
+ version = "0.0.25";
+ sha256 = "0q6kx57ygmznlpf8n499hid4x6mj3180paijx0a8dgi9hh7man61";
+ revision = "1";
+ editedCabalFile = "1ps5sk50sf4b5hd87k3jqykqrwcw2wzyp50rcy6pghd61h83cjg2";
libraryHaskellDepends = [ base basement ghc-prim ];
testHaskellDepends = [ base basement ];
benchmarkHaskellDepends = [ base basement gauge ];
@@ -85947,23 +86144,6 @@ self: {
}) {};
"free" = callPackage
- ({ mkDerivation, base, comonad, containers, distributive
- , exceptions, mtl, profunctors, semigroupoids, template-haskell
- , transformers, transformers-base
- }:
- mkDerivation {
- pname = "free";
- version = "5.1.1";
- sha256 = "0f33n7x4z0mc733ck4gg6ljcinfmm946a20g5irv90g77c6jmmak";
- libraryHaskellDepends = [
- base comonad containers distributive exceptions mtl profunctors
- semigroupoids template-haskell transformers transformers-base
- ];
- description = "Monads for free";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "free_5_1_2" = callPackage
({ mkDerivation, base, comonad, containers, distributive
, exceptions, mtl, profunctors, semigroupoids, template-haskell
, transformers, transformers-base
@@ -85978,7 +86158,6 @@ self: {
];
description = "Monads for free";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"free-algebras" = callPackage
@@ -86813,6 +86992,20 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "frotate" = callPackage
+ ({ mkDerivation, base, doctest, optparse-applicative, time }:
+ mkDerivation {
+ pname = "frotate";
+ version = "0.1.1";
+ sha256 = "1j8xh4k5kkix1aq79vg2kpzqb30pnggs8c6ksf4lqd8nmvzy47vc";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base optparse-applicative time ];
+ testHaskellDepends = [ base doctest ];
+ description = "Advanced rotation of backups and other things";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {};
+
"frown" = callPackage
({ mkDerivation, base, directory }:
mkDerivation {
@@ -87128,12 +87321,12 @@ self: {
({ mkDerivation, base, mtl, parsec }:
mkDerivation {
pname = "ft-generator";
- version = "1.0";
- sha256 = "1kgh8w1ny0zsrbf53vqabkap6zp6fmq2hx35nxw2hcfw7b0pvavk";
+ version = "1.0.1";
+ sha256 = "17lckkrzil8lznkzswjinh88pp8nm8ijsi2bh31ayjfaqg0m229b";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base mtl parsec ];
- description = "implementation accompanying a WFLP'19 submission";
+ description = "implementation accompanying a WFLP'19 paper";
license = stdenv.lib.licenses.publicDomain;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -87612,8 +87805,8 @@ self: {
pname = "functor-classes-compat";
version = "1";
sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg";
- revision = "4";
- editedCabalFile = "1531cmcfgcgry254dn5mx7h5l6nd4afxz6lhlcr0lbbm4y1v59mk";
+ revision = "5";
+ editedCabalFile = "0n823v0avzdwvmfm5fgw5gsmrlvd12pdx1clkislpd5yq4ffgjw7";
libraryHaskellDepends = [
base containers hashable unordered-containers vector
];
@@ -87910,21 +88103,21 @@ self: {
}) {};
"fused-effects" = callPackage
- ({ mkDerivation, base, criterion, deepseq, doctest, hspec
+ ({ mkDerivation, base, deepseq, doctest, gauge, hspec
, inspection-testing, MonadRandom, QuickCheck, random, transformers
, unliftio-core
}:
mkDerivation {
pname = "fused-effects";
- version = "0.5.0.0";
- sha256 = "1s1jvxdmwnjyxcx7zhspv1qkfy1dvcj0c92az2njqjibldbvqsa4";
+ version = "0.5.0.1";
+ sha256 = "0s6y34x29w31lzqlj7xf9sld9dmh3q1f0rl3zfmzd4kpp2ybc965";
libraryHaskellDepends = [
base deepseq MonadRandom random transformers unliftio-core
];
testHaskellDepends = [
base doctest hspec inspection-testing QuickCheck transformers
];
- benchmarkHaskellDepends = [ base criterion ];
+ benchmarkHaskellDepends = [ base gauge ];
description = "A fast, flexible, fused effect system";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -88009,6 +88202,8 @@ self: {
];
description = "An optimising compiler for a functional, array-oriented language";
license = stdenv.lib.licenses.isc;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"futun" = callPackage
@@ -88625,13 +88820,13 @@ self: {
}:
mkDerivation {
pname = "gauge";
- version = "0.2.4";
- sha256 = "1p8accsrv0njiqgybz2plwiglg90nazibggc270j7gmqxqna0zr9";
+ version = "0.2.5";
+ sha256 = "19zmnyyx7x6gf95dphqi1118avcp7w01scq12qmvzhchg1kzs86m";
libraryHaskellDepends = [
base basement deepseq directory process vector
];
testHaskellDepends = [
- base bytestring deepseq directory foundation
+ base basement bytestring deepseq directory foundation
];
benchmarkHaskellDepends = [ base ];
description = "small framework for performance measurement and analysis";
@@ -89332,8 +89527,8 @@ self: {
({ mkDerivation, base, HUnit, template-haskell, th-abstraction }:
mkDerivation {
pname = "generic-constraints";
- version = "1.1.1";
- sha256 = "0ifia4yw495ikkvjn70c386z3w40vyl2wracmcij025yc9bz4w9q";
+ version = "1.1.1.1";
+ sha256 = "1id341ih876qzq89cj6y3g87w4l3mfhv412l6czcs51r69s1770r";
libraryHaskellDepends = [ base template-haskell th-abstraction ];
testHaskellDepends = [ base HUnit ];
description = "Constraints via Generic";
@@ -89596,6 +89791,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "generic-random_1_3_0_0" = callPackage
+ ({ mkDerivation, base, deepseq, QuickCheck }:
+ mkDerivation {
+ pname = "generic-random";
+ version = "1.3.0.0";
+ sha256 = "1z62lvb0zjdy5ass2cvj442w0cbk0zi4cx6n4qm2ai4sbmgh5hzk";
+ libraryHaskellDepends = [ base QuickCheck ];
+ testHaskellDepends = [ base deepseq QuickCheck ];
+ description = "Generic random generators";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"generic-records" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -89770,6 +89978,8 @@ self: {
pname = "generics-sop-lens";
version = "0.2";
sha256 = "0cm3xnz5h1pxhvbgl8mm16fg8y339m6wvm6nlqmsm0jh37gvqc2a";
+ revision = "1";
+ editedCabalFile = "1ghgh91wd764firxc2s083jzr38w51fg0ry2b7s1wn71mnvzb893";
libraryHaskellDepends = [ base generics-sop lens ];
description = "Lenses for types in generics-sop";
license = stdenv.lib.licenses.bsd3;
@@ -90229,6 +90439,8 @@ self: {
typed-uuid uuid
];
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"genvalidity-path" = callPackage
@@ -90524,15 +90736,15 @@ self: {
"geoip2" = callPackage
({ mkDerivation, base, bytestring, cereal, containers, iproute
- , mmap, reinterpret-cast, text
+ , lens, mmap, reinterpret-cast, text
}:
mkDerivation {
pname = "geoip2";
- version = "0.3.1.1";
- sha256 = "0nq4kijjd0dmii5949xr7wf4w7fi2ffpbqr9bg7qklxhsrmwywb8";
+ version = "0.4.0.0";
+ sha256 = "1a2wxblnv611asfwkgm2ndam1jvm2xqajj3rk0ii9qi7j9s5w8v0";
libraryHaskellDepends = [
- base bytestring cereal containers iproute mmap reinterpret-cast
- text
+ base bytestring cereal containers iproute lens mmap
+ reinterpret-cast text
];
description = "Pure haskell interface to MaxMind GeoIP database";
license = stdenv.lib.licenses.bsd3;
@@ -90667,8 +90879,8 @@ self: {
}:
mkDerivation {
pname = "getopt-generics";
- version = "0.13.0.3";
- sha256 = "1202xsfvygd06h1d70v73ldwj32qv6sqadk5zl2979dgjx4841db";
+ version = "0.13.0.4";
+ sha256 = "1rszkcn1rg38wf35538ljk5bbqjc57y9sb3a0al7qxm82gy8yigr";
libraryHaskellDepends = [
base base-compat base-orphans generics-sop tagged
];
@@ -90798,14 +91010,14 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "ghc-boot_8_6_5" = callPackage
+ "ghc-boot_8_8_1" = callPackage
({ mkDerivation, base, binary, bytestring, directory, filepath
, ghc-boot-th
}:
mkDerivation {
pname = "ghc-boot";
- version = "8.6.5";
- sha256 = "1sxar25ji02a4yaz6s5hksf7b8pbl66vv9nb3bfc7fxq6gzj5n4b";
+ version = "8.8.1";
+ sha256 = "1f1701nkyn6cig2mh8wb5wn3vwddkfmfqz8lykh8k1sm76qx7yva";
libraryHaskellDepends = [
base binary bytestring directory filepath ghc-boot-th
];
@@ -90814,12 +91026,12 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "ghc-boot-th_8_6_5" = callPackage
+ "ghc-boot-th_8_8_1" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "ghc-boot-th";
- version = "8.6.5";
- sha256 = "18gjvxp3668np9n3c5l65q03nlqhgfjhh9wizvifmk673g0cl7n9";
+ version = "8.8.1";
+ sha256 = "14aa5jb5wz1yz12l0ixbbwiqj2rg1vgyd2rlfgm2ixsrryans4cb";
libraryHaskellDepends = [ base ];
description = "Shared functionality between GHC and the `template-haskell` library";
license = stdenv.lib.licenses.bsd3;
@@ -90843,8 +91055,8 @@ self: {
pname = "ghc-compact";
version = "0.1.0.0";
sha256 = "03sf8ap1ncjsibp9z7k9xgcsj9s0q3q6l4shf8k7p8dkwpjl1g2h";
- revision = "2";
- editedCabalFile = "1i775sc8sb89gali1w7qxs7l6y8vawp1mdd564d5mz95sxj4757b";
+ revision = "3";
+ editedCabalFile = "09l51r0nk7vj6a9crz7q5sv4962mnq18xb6zkxfl6cnm28v85nsk";
libraryHaskellDepends = [ base bytestring ghc-prim ];
description = "In memory storage of deeply evaluated data structure";
license = stdenv.lib.licenses.bsd3;
@@ -90904,8 +91116,8 @@ self: {
({ mkDerivation, base, deepseq, ghc-heap-view }:
mkDerivation {
pname = "ghc-datasize";
- version = "0.2.0";
- sha256 = "0wmlryqsw4mhk85wnril0p14gx2y0wjmq9iv9jjy0wl6gw5ps1yh";
+ version = "0.2.1";
+ sha256 = "0qsh4m6vif07nd0r5lbwggqrlykmlnspdx1jwzzhz6mk1hcf914d";
libraryHaskellDepends = [ base deepseq ghc-heap-view ];
description = "Determine the size of data structures in GHC's memory";
license = stdenv.lib.licenses.bsd3;
@@ -90996,8 +91208,8 @@ self: {
}:
mkDerivation {
pname = "ghc-events";
- version = "0.9.0";
- sha256 = "004dfjqhqy0lpmadjmvz270ja6k2dmwbprnispdxmlg8rc5y3m10";
+ version = "0.9.1";
+ sha256 = "1phq4jxhm05xj42y7aqpjj43vj5mixi3hhf3h5c0dh1vmsz9w3z1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -91082,6 +91294,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ghc-exactprint_0_6_2" = callPackage
+ ({ mkDerivation, base, bytestring, containers, Diff, directory
+ , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
+ , silently, syb
+ }:
+ mkDerivation {
+ pname = "ghc-exactprint";
+ version = "0.6.2";
+ sha256 = "1c36f7vjk3gapp761c7w1ncg9hyhx2kxwk51s0d9fvapi1bkxw9j";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring containers directory filepath free ghc ghc-boot
+ ghc-paths mtl syb
+ ];
+ testHaskellDepends = [
+ base bytestring containers Diff directory filemanip filepath ghc
+ ghc-boot ghc-paths HUnit mtl silently syb
+ ];
+ description = "ExactPrint for GHC";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-gc-tune" = callPackage
({ mkDerivation, base, directory, filepath, process }:
mkDerivation {
@@ -91557,6 +91793,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ghc-prof_1_4_1_6" = callPackage
+ ({ mkDerivation, attoparsec, base, containers, directory, filepath
+ , process, scientific, tasty, tasty-hunit, temporary, text, time
+ }:
+ mkDerivation {
+ pname = "ghc-prof";
+ version = "1.4.1.6";
+ sha256 = "1rypk644xpgvawymn8ib992n4qkc2fc796arf574hhikdffr5a14";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ attoparsec base containers scientific text time
+ ];
+ testHaskellDepends = [
+ attoparsec base containers directory filepath process tasty
+ tasty-hunit temporary text
+ ];
+ description = "Library for parsing GHC time and allocation profiling reports";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-prof-aeson" = callPackage
({ mkDerivation, aeson, base, bytestring, hspec, text, vector }:
mkDerivation {
@@ -91665,13 +91923,17 @@ self: {
}) {};
"ghc-source-gen" = callPackage
- ({ mkDerivation, base, ghc, ghc-paths, tasty, tasty-hunit }:
+ ({ mkDerivation, base, ghc, ghc-paths, QuickCheck, tasty
+ , tasty-hunit, tasty-quickcheck
+ }:
mkDerivation {
pname = "ghc-source-gen";
- version = "0.1.0.0";
- sha256 = "0sw62jjbd7h9i96hn0srl9m8p0qip6hnm1am6if7snqdm5b4ki3k";
+ version = "0.2.0.1";
+ sha256 = "1diz1vrhxx8ppj4jljzfwlrg059kdcz20ba635f7hq4kpp0blbjy";
libraryHaskellDepends = [ base ghc ];
- testHaskellDepends = [ base ghc ghc-paths tasty tasty-hunit ];
+ testHaskellDepends = [
+ base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
description = "Constructs Haskell syntax trees for the GHC API";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -91789,27 +92051,6 @@ self: {
}) {};
"ghc-typelits-extra" = callPackage
- ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
- , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
- , tasty, tasty-hunit, template-haskell, transformers
- }:
- mkDerivation {
- pname = "ghc-typelits-extra";
- version = "0.3";
- sha256 = "1khkchxic6i3sg3g3dzdg8dsdgk86xy5j5lnh5n5hr7fpdm9ppj7";
- libraryHaskellDepends = [
- base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat
- ghc-typelits-natnormalise integer-gmp transformers
- ];
- testHaskellDepends = [
- base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
- tasty-hunit template-haskell
- ];
- description = "Additional type-level operations on GHC.TypeLits.Nat";
- license = stdenv.lib.licenses.bsd2;
- }) {};
-
- "ghc-typelits-extra_0_3_1" = callPackage
({ mkDerivation, base, containers, ghc, ghc-prim
, ghc-tcplugins-extra, ghc-typelits-knownnat
, ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit
@@ -91830,7 +92071,6 @@ self: {
];
description = "Additional type-level operations on GHC.TypeLits.Nat";
license = stdenv.lib.licenses.bsd2;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ghc-typelits-knownnat" = callPackage
@@ -91862,6 +92102,8 @@ self: {
pname = "ghc-typelits-knownnat";
version = "0.7";
sha256 = "00f8m3kmp572r8jr246m8r6lwzxmiqj4hml06w09l9n3lzvjwv7b";
+ revision = "1";
+ editedCabalFile = "1jgwa66dbhqsav7764cfcmzs3p0f3csbdjbrnbilhv1bpqyhz8sm";
libraryHaskellDepends = [
base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise
template-haskell transformers
@@ -93831,8 +94073,8 @@ self: {
}:
mkDerivation {
pname = "git-brunch";
- version = "1.0.5.0";
- sha256 = "0bnag71l6vjygn5bbfav229pk44xn491jzj13n7m8xdc7nvh7zz1";
+ version = "1.0.6.0";
+ sha256 = "1zhmzw1vhdxcx69l97xlm8ylfk79f95g83c3nhp39g2lj7z0wqi0";
isLibrary = false;
isExecutable = true;
libraryHaskellDepends = [
@@ -94262,8 +94504,8 @@ self: {
}:
mkDerivation {
pname = "githash";
- version = "0.1.3.1";
- sha256 = "0vpwzbhnr0xwc7vkg3l5qy4awgsr1fkxj58lz6m56jayaad6hn7a";
+ version = "0.1.3.2";
+ sha256 = "0wn0pr7idx6nb6d7nkjx6dfncz15c9wbhpg6s5395pa1s8q7fx3j";
libraryHaskellDepends = [
base bytestring directory filepath process template-haskell
];
@@ -99909,8 +100151,8 @@ self: {
}:
mkDerivation {
pname = "graphql";
- version = "0.5.0.0";
- sha256 = "01466hfw3mkiz557r5ch3rn01w6wys38n580hdqmkhsqysgsqzqa";
+ version = "0.5.0.1";
+ sha256 = "03q5ip176ji0yn02mhgj5rh9vpsi8kwsq3zh3cr7ry6jajgfdq3l";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base megaparsec text transformers unordered-containers
@@ -99956,8 +100198,8 @@ self: {
({ mkDerivation, base, containers, json, text }:
mkDerivation {
pname = "graphql-w-persistent";
- version = "0.5.0.0";
- sha256 = "12z4fws4vz88j8xj1xvzl8jv6s4i3vnca7xln2q4ssn23a025fcg";
+ version = "0.6.0.0";
+ sha256 = "03m247xmj8gvvjs4bgsc06daz9avklza7ngs575psaqmkpxd8ga3";
libraryHaskellDepends = [ base containers json text ];
description = "GraphQL interface middleware for (SQL) databases";
license = stdenv.lib.licenses.isc;
@@ -100117,8 +100359,8 @@ self: {
}:
mkDerivation {
pname = "gray-extended";
- version = "1.5.7";
- sha256 = "0j2lzy15jiykz9b6cqzh7xhpf1idwxp8illvy3r50g1g4hc8zvyp";
+ version = "1.5.8";
+ sha256 = "1vli6dc0wc1an6vfhchai6s8xrg8rfds2k07x2xszaqg7r2njc9k";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base QuickCheck test-framework test-framework-quickcheck2
@@ -100354,8 +100596,8 @@ self: {
}:
mkDerivation {
pname = "grid";
- version = "7.8.12";
- sha256 = "1ax536wr6h8kcnmnnxyd7vcdkqbjlrhrx6jab526b3f2a88n5q6z";
+ version = "7.8.14";
+ sha256 = "11rnsl6bs6qpx90p8jzdigncv6m5wbn6sav8gb3mlbm40fpi3p93";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [
base QuickCheck test-framework test-framework-quickcheck2
@@ -100968,8 +101210,8 @@ self: {
}:
mkDerivation {
pname = "gscholar-rss";
- version = "0.2.2.0";
- sha256 = "1h8zg9yyyckyp5irw9gcbzfysav67hn2rlrkwakyh3ghb1rnl71k";
+ version = "0.2.3.1";
+ sha256 = "0iqrh6h2r7xr9xqk9w7yg1hilghcs0pp5mqq3s2rwmk2drp255l3";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -103571,8 +103813,8 @@ self: {
}:
mkDerivation {
pname = "hadolint";
- version = "1.17.1";
- sha256 = "199kpx6wfshky0slgjv0h6ckibrsywy3r3j393r9ln4wcjzs31yi";
+ version = "1.17.2";
+ sha256 = "0s9q0016j3y56sblkq12mai1j58h8w8cy8k2x1bzvhb95zpg1va9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -104036,14 +104278,14 @@ self: {
, lrucache, mtl, network-uri, optparse-applicative, pandoc
, pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
, resourcet, scientific, tagsoup, tasty, tasty-hunit
- , tasty-quickcheck, text, time, time-locale-compat
- , unordered-containers, utillinux, vector, wai, wai-app-static
- , warp, yaml
+ , tasty-quickcheck, template-haskell, text, time
+ , time-locale-compat, unordered-containers, utillinux, vector, wai
+ , wai-app-static, warp, yaml
}:
mkDerivation {
pname = "hakyll";
- version = "4.12.5.2";
- sha256 = "13dc8hj3xnnpyb395pbplwxb4pj4gzckdd8r5wcwg1ln0gd6w7d5";
+ version = "4.13.0.0";
+ sha256 = "1a7g79j7ai5l46nz205rl6zr3f57m5ngd46v60wll3dj6wkiaw6b";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -104052,7 +104294,7 @@ self: {
cryptohash data-default deepseq directory file-embed filepath
fsnotify http-conduit http-types lrucache mtl network-uri
optparse-applicative pandoc pandoc-citeproc parsec process random
- regex-tdfa resourcet scientific tagsoup text time
+ regex-tdfa resourcet scientific tagsoup template-haskell text time
time-locale-compat unordered-containers vector wai wai-app-static
warp yaml
];
@@ -104064,6 +104306,8 @@ self: {
testToolDepends = [ utillinux ];
description = "A static website compiler library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) utillinux;};
"hakyll-R" = callPackage
@@ -105721,22 +105965,20 @@ self: {
, filepath, hslogger, html, HUnit, monad-control, mtl, network
, network-uri, old-locale, parsec, process, semigroups, sendfile
, syb, system-filepath, template-haskell, text, threads, time
- , time-compat, transformers, transformers-base, transformers-compat
- , unix, utf8-string, xhtml, zlib
+ , transformers, transformers-base, transformers-compat, unix
+ , utf8-string, xhtml, zlib
}:
mkDerivation {
pname = "happstack-server";
- version = "7.5.1.3";
- sha256 = "0agxmrf2njd3whvgw4in0ixgss1qlmi6cdi9fglhs7nhykpkgllk";
- revision = "1";
- editedCabalFile = "15ira63nilqyq9ggl2jy5ip26aprw79sv5k1hp9n4wp9byhzzyjw";
+ version = "7.5.2";
+ sha256 = "1w5g5vf6jxb7fi3qg96x17y2i95mv5sbbzmjzy1m55qjqif568v1";
libraryHaskellDepends = [
base base64-bytestring blaze-html bytestring containers directory
exceptions extensible-exceptions filepath hslogger html
monad-control mtl network network-uri old-locale parsec process
semigroups sendfile syb system-filepath template-haskell text
- threads time time-compat transformers transformers-base
- transformers-compat unix utf8-string xhtml zlib
+ threads time transformers transformers-base transformers-compat
+ unix utf8-string xhtml zlib
];
testHaskellDepends = [
base bytestring containers HUnit parsec zlib
@@ -105894,16 +106136,14 @@ self: {
}) {};
"happy" = callPackage
- ({ mkDerivation, array, base, Cabal, containers, directory
- , filepath, mtl, process
- }:
+ ({ mkDerivation, array, base, containers, mtl, process }:
mkDerivation {
pname = "happy";
- version = "1.19.11";
- sha256 = "0xszsjl4943kp7cjzlpf7g5lx6yzqxj8xmgzy4s0m66vs2gd354h";
+ version = "1.19.12";
+ sha256 = "03xlmq6qmdx4zvzw8bp33kd9g7yvcq5cz4wg50xilw812kj276pv";
isLibrary = false;
isExecutable = true;
- setupHaskellDepends = [ base Cabal directory filepath ];
+ enableSeparateDataOutput = true;
executableHaskellDepends = [ array base containers mtl ];
testHaskellDepends = [ base process ];
description = "Happy is a parser generator for Haskell";
@@ -106110,21 +106350,21 @@ self: {
"harg" = callPackage
({ mkDerivation, aeson, barbies, base, bytestring, directory
- , higgledy, markdown-unlit, optparse-applicative, text, yaml
+ , higgledy, markdown-unlit, optparse-applicative, split, text, yaml
}:
mkDerivation {
pname = "harg";
- version = "0.1.0.1";
- sha256 = "11qkyx9axd8vybkb1kq7vs5v5xf594wgkbpbfpvj0hah7iw9wb95";
+ version = "0.2.0.0";
+ sha256 = "0zdngzz1p73dpfx4klxf59yhk4qf0r4ming2nw4yqfsyxqfwgw1i";
libraryHaskellDepends = [
aeson barbies base bytestring directory higgledy
- optparse-applicative text yaml
+ optparse-applicative split text yaml
];
testHaskellDepends = [
aeson barbies base higgledy optparse-applicative
];
testToolDepends = [ markdown-unlit ];
- description = "Haskell program configuration from multiple sources";
+ description = "Haskell program configuration using higher kinded data";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -106299,8 +106539,8 @@ self: {
}:
mkDerivation {
pname = "hasbolt";
- version = "0.1.3.4";
- sha256 = "06z47djpg6sar1cadzrn86cmn092jhf7cwnjv402sx00i4r2v5dh";
+ version = "0.1.3.5";
+ sha256 = "0qd5rh0jdwhkjcz5kg1bqwd5hpz5w9ph9k0vxaam1lnjjniw7zbj";
libraryHaskellDepends = [
base binary bytestring connection containers data-binary-ieee754
data-default mtl network text
@@ -106320,8 +106560,8 @@ self: {
}:
mkDerivation {
pname = "hasbolt-extras";
- version = "0.0.0.19";
- sha256 = "11g6rlgyxi57bvmr862ly7yfwiiph1kckr056b5khz8v8k6fhhpv";
+ version = "0.0.0.20";
+ sha256 = "0xqi3hb1xgbkkj8wmrvp39sh7zcj75v55xbha87nmkl2g56kaxw2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -107068,6 +107308,8 @@ self: {
pname = "haskeline";
version = "0.7.5.0";
sha256 = "1inyq7qwih0hnqlm6gy769vsxzjpvqx9ry390dmcvvql9520hrfj";
+ revision = "1";
+ editedCabalFile = "0i8fyhk7fvz2bxnh5xsmdw5rr7yywzc2wv115034q1g4sb018zrd";
configureFlags = [ "-fterminfo" ];
libraryHaskellDepends = [
base bytestring containers directory filepath process stm terminfo
@@ -107292,21 +107534,24 @@ self: {
}) {};
"haskell-ci" = callPackage
- ({ mkDerivation, ansi-terminal, base, base-compat, bytestring
- , Cabal, containers, deepseq, Diff, directory, filepath
- , generic-lens, HsYAML, microlens, optparse-applicative, parsec
- , pretty, ShellCheck, tasty, tasty-golden, text, transformers
+ ({ mkDerivation, aeson, ansi-terminal, base, base-compat
+ , bytestring, Cabal, containers, deepseq, Diff, directory
+ , exceptions, filepath, generic-lens, HsYAML, lattices, microlens
+ , mtl, optparse-applicative, parsec, pretty, process, ShellCheck
+ , tasty, tasty-golden, temporary, text, transformers
+ , unordered-containers
}:
mkDerivation {
pname = "haskell-ci";
- version = "0.2.1";
- sha256 = "07h99vq4bmphrpi1ggm7h06ard7hyxkmsxypicghvv24cgzl3c70";
+ version = "0.4";
+ sha256 = "0paw5jczmcayda2pjgp10p983g8kbly33hpabdv37b5mkrair9d8";
isLibrary = false;
isExecutable = true;
libraryHaskellDepends = [
- base base-compat bytestring Cabal containers deepseq directory
- filepath generic-lens HsYAML microlens optparse-applicative parsec
- pretty ShellCheck text transformers
+ aeson base base-compat bytestring Cabal containers deepseq
+ directory exceptions filepath generic-lens HsYAML lattices
+ microlens mtl optparse-applicative parsec pretty process ShellCheck
+ temporary text transformers unordered-containers
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
@@ -107315,7 +107560,7 @@ self: {
];
doHaddock = false;
description = "Cabal package script generator for Travis-CI";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
@@ -107836,8 +108081,10 @@ self: {
}:
mkDerivation {
pname = "haskell-lsp";
- version = "0.15.0.0";
- sha256 = "111c0hdlpnj979p3avlhswziyc6vh6apij5b2nhhi8wlfhqwrpcg";
+ version = "0.15.0.1";
+ sha256 = "0l11psgknqppisn102h2392y5jiyz026rv8v2dpq4bk50zibb7qb";
+ revision = "1";
+ editedCabalFile = "0rk44rxal0sm1ci7c0phwl7fpcby1vys3n3vpp4bgla2hrc6pwba";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -107856,6 +108103,36 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "haskell-lsp_0_16_0_0" = callPackage
+ ({ mkDerivation, aeson, async, attoparsec, base, bytestring
+ , containers, data-default, directory, filepath, hashable
+ , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl
+ , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay
+ , sorted-list, stm, temporary, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "haskell-lsp";
+ version = "0.16.0.0";
+ sha256 = "1s04lfnb3c0g9bkwp4j7j59yw8ypps63dq27ayybynrfci4bpj95";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson async attoparsec base bytestring containers data-default
+ directory filepath hashable haskell-lsp-types hslogger lens mtl
+ network-uri rope-utf16-splay sorted-list stm temporary text time
+ unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers data-default directory filepath
+ hashable hspec lens network-uri QuickCheck quickcheck-instances
+ rope-utf16-splay sorted-list stm text
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Haskell library for the Microsoft Language Server Protocol";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"haskell-lsp-client" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
, haskell-lsp, lens, process, text, unix
@@ -107885,8 +108162,10 @@ self: {
}:
mkDerivation {
pname = "haskell-lsp-types";
- version = "0.15.0.0";
- sha256 = "1ky20lpgbdiijh3z6ilf7jn7cyxl2kshqnm2p4dgabfh97gbf8bb";
+ version = "0.15.0.1";
+ sha256 = "07195h5qdmnkrr7v1yx8l398vi4zbcawbh7k6slyj3xs3zq9s6kx";
+ revision = "1";
+ editedCabalFile = "06naxwj75jxy9xvvlc229m1jn9bandqsxaavzm7zj9vw8sxygr0h";
libraryHaskellDepends = [
aeson base bytestring data-default deepseq filepath hashable lens
network-uri scientific text unordered-containers
@@ -107895,6 +108174,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "haskell-lsp-types_0_16_0_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, data-default, deepseq
+ , filepath, hashable, lens, network-uri, scientific, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "haskell-lsp-types";
+ version = "0.16.0.0";
+ sha256 = "14wlv54ydbddpw6cwgykcas3rb55w7m78q0s1wdbi594wg1bscqg";
+ libraryHaskellDepends = [
+ aeson base bytestring data-default deepseq filepath hashable lens
+ network-uri scientific text unordered-containers
+ ];
+ description = "Haskell library for the Microsoft Language Server Protocol, data types";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"haskell-menu" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -108335,6 +108632,8 @@ self: {
pname = "haskell-src";
version = "1.0.3.0";
sha256 = "1g4dj1f0j68bhn4ixfac63wjzy6gsp6kwgxryb1k5nl3i0g99d5l";
+ revision = "1";
+ editedCabalFile = "1pnrvh9wzdkhvkkky4rlq1imycl9k76x9rvgq7cmfp8rf1iwqi5q";
libraryHaskellDepends = [ array base pretty syb ];
libraryToolDepends = [ happy ];
description = "Support for manipulating Haskell source code";
@@ -108371,8 +108670,8 @@ self: {
}:
mkDerivation {
pname = "haskell-src-exts";
- version = "1.21.0";
- sha256 = "1wwzd6m5mm76fq7ql7k49b7ghg8ibq5qhqr3d8xs5psfha3w3nlm";
+ version = "1.21.1";
+ sha256 = "0q1y8n3d82gid9bcx8wxsqqmj9mq11fg3gp5yzpfbw958dhi3j9f";
libraryHaskellDepends = [ array base ghc-prim pretty ];
libraryToolDepends = [ happy ];
testHaskellDepends = [
@@ -108476,19 +108775,18 @@ self: {
"haskell-src-meta" = callPackage
({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty
- , syb, template-haskell, test-framework, test-framework-hunit
- , th-orphans
+ , syb, tasty, tasty-hunit, template-haskell, th-orphans
}:
mkDerivation {
pname = "haskell-src-meta";
- version = "0.8.2";
- sha256 = "0vqnq668c88x4amvbs34rxiwdpnxqxr40jy998fc4vd9z6gd4w3r";
+ version = "0.8.3";
+ sha256 = "17znnaqj2hnnfyc9p9xjzbs97h2jh1h4f4qbw648y3xa14wx5ra9";
libraryHaskellDepends = [
base haskell-src-exts pretty syb template-haskell th-orphans
];
testHaskellDepends = [
- base containers haskell-src-exts HUnit pretty syb template-haskell
- test-framework test-framework-hunit
+ base containers haskell-src-exts HUnit pretty syb tasty tasty-hunit
+ template-haskell
];
description = "Parse source to template-haskell abstract syntax";
license = stdenv.lib.licenses.bsd3;
@@ -110734,6 +111032,8 @@ self: {
pname = "hasmin";
version = "1.0.3";
sha256 = "0p9a1q8brymkd4y74gn4iiwihikn55wx2h9zz3mpd6ab53rsz43k";
+ revision = "1";
+ editedCabalFile = "19xr6zk72q5sqgaxfj6xwvd98jv26d54s80gjkkpwh1i2nnsgw4v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -111103,6 +111403,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hasql-transaction_1" = callPackage
+ ({ mkDerivation, async, base, bytestring, bytestring-tree-builder
+ , contravariant, contravariant-extras, hasql, mtl, rebase
+ , transformers
+ }:
+ mkDerivation {
+ pname = "hasql-transaction";
+ version = "1";
+ sha256 = "1k82b0bx4j2g7lhr2p4z4a365kx1i23dr6zikwg1yyhpvhl3xbcj";
+ libraryHaskellDepends = [
+ base bytestring bytestring-tree-builder contravariant
+ contravariant-extras hasql mtl transformers
+ ];
+ testHaskellDepends = [ async hasql rebase ];
+ description = "A composable abstraction over the retryable transactions for Hasql";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hastache" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, containers
, directory, filepath, HUnit, ieee754, mtl, process, syb, text
@@ -113058,16 +113377,16 @@ self: {
"hedgehog-classes" = callPackage
({ mkDerivation, aeson, base, binary, comonad, containers, hedgehog
- , pretty-show, semirings, silently, transformers
+ , pretty-show, primitive, semirings, silently, transformers
, wl-pprint-annotated
}:
mkDerivation {
pname = "hedgehog-classes";
- version = "0.2.3";
- sha256 = "0ww1ll557iapbxg6rwhimf5fh8gngk15zlm4mlrh3p3j3xx9f22p";
+ version = "0.2.4";
+ sha256 = "0cvaa8rrjwz00z377b0s6c2yyfyxka78cpw66bkrlzyihjqqg6gn";
libraryHaskellDepends = [
- aeson base binary comonad containers hedgehog pretty-show semirings
- silently transformers wl-pprint-annotated
+ aeson base binary comonad containers hedgehog pretty-show primitive
+ semirings silently transformers wl-pprint-annotated
];
testHaskellDepends = [
aeson base binary comonad containers hedgehog
@@ -113162,8 +113481,8 @@ self: {
}:
mkDerivation {
pname = "hedis";
- version = "0.12.7";
- sha256 = "1q59g99mv4axwm77f8m5fmlnq04qy04c6s1aj57jvfq7p31iq05a";
+ version = "0.12.8";
+ sha256 = "119j0g6b2ci04bax6xl2biwwf7cfk2vybypx3089fm69xgm8spcz";
libraryHaskellDepends = [
async base bytestring bytestring-lexing deepseq errors HTTP mtl
network network-uri resource-pool scanner stm text time tls
@@ -114343,6 +114662,8 @@ self: {
pname = "hex";
version = "0.1.2";
sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj";
+ revision = "1";
+ editedCabalFile = "0khmrdni6njr4wxgz15yz77l8ar4qm2jj6v0lvfnwqdms4s6i80y";
libraryHaskellDepends = [ base bytestring ];
description = "Convert strings into hexadecimal and back";
license = stdenv.lib.licenses.bsd3;
@@ -115480,6 +115801,66 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hie-bios" = callPackage
+ ({ mkDerivation, base, base16-bytestring, bytestring, containers
+ , cryptohash-sha1, deepseq, directory, extra, file-embed, filepath
+ , ghc, process, temporary, text, time, transformers, unix-compat
+ , unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "hie-bios";
+ version = "0.1.1";
+ sha256 = "119rqh12bq5gq5y708hxr0zci1dq8wf44xzxgxhhx4sb5zgj1l2p";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base base16-bytestring bytestring containers cryptohash-sha1
+ deepseq directory extra file-embed filepath ghc process temporary
+ text time transformers unix-compat unordered-containers vector yaml
+ ];
+ executableHaskellDepends = [ base directory filepath ghc ];
+ description = "Set up a GHC API session";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hie-core" = callPackage
+ ({ mkDerivation, aeson, async, base, binary, bytestring, containers
+ , data-default, deepseq, directory, extra, filepath, ghc, ghc-boot
+ , ghc-boot-th, ghc-paths, hashable, haskell-lsp, haskell-lsp-types
+ , hie-bios, lens, lsp-test, mtl, network-uri, optparse-applicative
+ , parser-combinators, prettyprinter, prettyprinter-ansi-terminal
+ , rope-utf16-splay, safe-exceptions, shake, sorted-list, stm, syb
+ , tasty, tasty-hunit, text, time, transformers, unix
+ , unordered-containers, utf8-string
+ }:
+ mkDerivation {
+ pname = "hie-core";
+ version = "0.0.1";
+ sha256 = "1fdg5vz5qr9y9xmqqb2qcxss8byz3m38d7zcfybq783fxqrcyfsc";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson async base binary bytestring containers data-default deepseq
+ directory extra filepath ghc ghc-boot ghc-boot-th hashable
+ haskell-lsp haskell-lsp-types mtl network-uri prettyprinter
+ prettyprinter-ansi-terminal rope-utf16-splay safe-exceptions shake
+ sorted-list stm syb text time transformers unix
+ unordered-containers utf8-string
+ ];
+ executableHaskellDepends = [
+ base containers data-default directory extra filepath ghc ghc-paths
+ haskell-lsp hie-bios optparse-applicative shake text
+ ];
+ testHaskellDepends = [
+ base containers extra filepath haskell-lsp-types lens lsp-test
+ parser-combinators tasty tasty-hunit text
+ ];
+ description = "The core of an IDE";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hieraclus" = callPackage
({ mkDerivation, base, containers, HUnit, mtl, multiset }:
mkDerivation {
@@ -116796,8 +117177,8 @@ self: {
pname = "hjsonpointer";
version = "1.5.0";
sha256 = "1bdr5jpc2vcx6bk724jmfz7nh3jgqwrmj4hab64h9pjdrl4vz00y";
- revision = "2";
- editedCabalFile = "1s43vdkl71msm8kppksn910prs40nwq4cz5klajr8apak77z4dzi";
+ revision = "3";
+ editedCabalFile = "1y9fhqb8kjgflsds8nkw7nr1b9ydyz5f3227b4k8b7ir97rzy5d0";
libraryHaskellDepends = [
aeson base hashable text unordered-containers vector
];
@@ -117071,7 +117452,7 @@ self: {
"hledger" = callPackage
({ mkDerivation, ansi-terminal, base, base-compat-batteries
, bytestring, cmdargs, containers, criterion, data-default, Decimal
- , Diff, directory, easytest, filepath, hashable, haskeline
+ , Diff, directory, easytest, extra, filepath, hashable, haskeline
, hledger-lib, html, lucid, math-functions, megaparsec, mtl
, mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa
, safe, shakespeare, split, tabular, temporary, terminfo
@@ -117081,38 +117462,39 @@ self: {
}:
mkDerivation {
pname = "hledger";
- version = "1.14.2";
- sha256 = "1si9zqparkdq77yji87lhcsrf11fr3gisqwsv82cabhrhc36x6l4";
+ version = "1.15.2";
+ sha256 = "16mpj58519p4ksd0iwwkd63xxcr21k99h015l4kgi6zd934v2qix";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
ansi-terminal base base-compat-batteries bytestring cmdargs
- containers data-default Decimal Diff directory easytest filepath
- hashable haskeline hledger-lib lucid math-functions megaparsec mtl
- mtl-compat old-time parsec pretty-show process regex-tdfa safe
- shakespeare split tabular temporary terminfo text time transformers
- unordered-containers utf8-string utility-ht wizards
+ containers data-default Decimal Diff directory easytest extra
+ filepath hashable haskeline hledger-lib lucid math-functions
+ megaparsec mtl mtl-compat old-time parsec pretty-show process
+ regex-tdfa safe shakespeare split tabular temporary terminfo text
+ time timeit transformers unordered-containers utf8-string
+ utility-ht wizards
];
executableHaskellDepends = [
ansi-terminal base base-compat-batteries bytestring cmdargs
- containers data-default Decimal directory easytest filepath
+ containers data-default Decimal directory easytest extra filepath
haskeline hledger-lib math-functions megaparsec mtl mtl-compat
old-time parsec pretty-show process regex-tdfa safe shakespeare
- split tabular temporary terminfo text time transformers
+ split tabular temporary terminfo text time timeit transformers
unordered-containers utf8-string utility-ht wizards
];
testHaskellDepends = [
ansi-terminal base base-compat-batteries bytestring cmdargs
- containers data-default Decimal directory easytest filepath
+ containers data-default Decimal directory easytest extra filepath
haskeline hledger-lib math-functions megaparsec mtl mtl-compat
old-time parsec pretty-show process regex-tdfa safe shakespeare
split tabular temporary terminfo test-framework
- test-framework-hunit text time transformers unordered-containers
- utf8-string utility-ht wizards
+ test-framework-hunit text time timeit transformers
+ unordered-containers utf8-string utility-ht wizards
];
benchmarkHaskellDepends = [
ansi-terminal base base-compat-batteries bytestring cmdargs
- containers criterion data-default Decimal directory easytest
+ containers criterion data-default Decimal directory easytest extra
filepath haskeline hledger-lib html math-functions megaparsec mtl
mtl-compat old-time parsec pretty-show process regex-tdfa safe
shakespeare split tabular temporary terminfo text time timeit
@@ -117284,31 +117666,33 @@ self: {
({ mkDerivation, ansi-terminal, array, base, base-compat-batteries
, blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec
, cmdargs, containers, data-default, Decimal, deepseq, directory
- , doctest, easytest, extra, file-embed, filepath, Glob, hashtables
- , megaparsec, mtl, mtl-compat, old-time, parsec, parser-combinators
- , pretty-show, regex-tdfa, safe, split, tabular, template-haskell
- , text, time, transformers, uglymemo, utf8-string
+ , doctest, easytest, extra, fgl, file-embed, filepath, Glob
+ , hashtables, megaparsec, mtl, mtl-compat, old-time, parsec
+ , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular
+ , template-haskell, text, time, timeit, transformers, uglymemo
+ , utf8-string
}:
mkDerivation {
pname = "hledger-lib";
- version = "1.14.1";
- sha256 = "1w6qp01cak6spnpldm01czlm6i5a2alw47w76875l2nagrc4rfp2";
+ version = "1.15.2";
+ sha256 = "0q6ppizyadilxma3l8bwlswa6syyzkdri0yq0bqfmdzxvh9s3bcm";
libraryHaskellDepends = [
ansi-terminal array base base-compat-batteries blaze-markup
bytestring call-stack cassava cassava-megaparsec cmdargs containers
- data-default Decimal deepseq directory easytest extra file-embed
- filepath Glob hashtables megaparsec mtl mtl-compat old-time parsec
- parser-combinators pretty-show regex-tdfa safe split tabular
- template-haskell text time transformers uglymemo utf8-string
+ data-default Decimal deepseq directory easytest extra fgl
+ file-embed filepath Glob hashtables megaparsec mtl mtl-compat
+ old-time parsec parser-combinators pretty-show regex-tdfa safe
+ split tabular template-haskell text time timeit transformers
+ uglymemo utf8-string
];
testHaskellDepends = [
ansi-terminal array base base-compat-batteries blaze-markup
bytestring call-stack cassava cassava-megaparsec cmdargs containers
- data-default Decimal deepseq directory doctest easytest extra
+ data-default Decimal deepseq directory doctest easytest extra fgl
file-embed filepath Glob hashtables megaparsec mtl mtl-compat
old-time parsec parser-combinators pretty-show regex-tdfa safe
- split tabular template-haskell text time transformers uglymemo
- utf8-string
+ split tabular template-haskell text time timeit transformers
+ uglymemo utf8-string
];
description = "Core data types, parsers and functionality for the hledger accounting tools";
license = stdenv.lib.licenses.gpl3;
@@ -117344,8 +117728,8 @@ self: {
}:
mkDerivation {
pname = "hledger-ui";
- version = "1.14.2";
- sha256 = "0bhixvzxv7d0kwb4ppv3sc98wjkc58kna9f91202s63sbikahlcr";
+ version = "1.15";
+ sha256 = "047ssmix7pxq61hknd40z983aw8110zxzh6z2ick8xkhdsnw3s1q";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -117390,8 +117774,8 @@ self: {
}:
mkDerivation {
pname = "hledger-web";
- version = "1.14.1";
- sha256 = "0w59nr7mj0nx8z44cvhy1rhlj5rmx0wq4p5nfl4dycfmp7jwvsm1";
+ version = "1.15";
+ sha256 = "1m54m8v1fzlazrh9hhv4ff7jrg95d03i8wx360l1y731gry54zw3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -118407,8 +118791,6 @@ self: {
];
description = "Haskell implementation of the Nix language";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hnix-store-core" = callPackage
@@ -118459,8 +118841,6 @@ self: {
];
description = "Remote hnix store";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hnn" = callPackage
@@ -120226,6 +120606,45 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hpack_0_32_0" = callPackage
+ ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
+ , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
+ , hspec-discover, http-client, http-client-tls, http-types, HUnit
+ , infer-license, interpolate, mockery, pretty, QuickCheck
+ , scientific, template-haskell, temporary, text, transformers
+ , unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "hpack";
+ version = "0.32.0";
+ sha256 = "11qfqyhcwihmx1z9pg5fhza1ww8wapr04wzyx8sknwpxs3hacm4z";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bifunctors bytestring Cabal containers cryptonite
+ deepseq directory filepath Glob http-client http-client-tls
+ http-types infer-license pretty scientific text transformers
+ unordered-containers vector yaml
+ ];
+ executableHaskellDepends = [
+ aeson base bifunctors bytestring Cabal containers cryptonite
+ deepseq directory filepath Glob http-client http-client-tls
+ http-types infer-license pretty scientific text transformers
+ unordered-containers vector yaml
+ ];
+ testHaskellDepends = [
+ aeson base bifunctors bytestring Cabal containers cryptonite
+ deepseq directory filepath Glob hspec http-client http-client-tls
+ http-types HUnit infer-license interpolate mockery pretty
+ QuickCheck scientific template-haskell temporary text transformers
+ unordered-containers vector yaml
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "A modern format for Haskell packages";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hpack-convert" = callPackage
({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
, Cabal, containers, deepseq, directory, filepath, Glob, hspec
@@ -120443,8 +120862,8 @@ self: {
pname = "hpc";
version = "0.6.0.3";
sha256 = "1am2fcxg7d3j3kpyhz48wzbpg83dk2jmzhqm4yiib649alzcgnhn";
- revision = "2";
- editedCabalFile = "0ywki1w4kld0m3z8v1i287g6hcsjgmyq4nxx8b9jij721ad9b9w3";
+ revision = "3";
+ editedCabalFile = "06dbiaf0sangq3zdyr3x9wkvs2fgyas3ipqkfwfmycax6j17jgyy";
libraryHaskellDepends = [
base containers directory filepath time
];
@@ -122257,29 +122676,6 @@ self: {
}) {};
"hsc2hs" = callPackage
- ({ mkDerivation, base, containers, directory, filepath, process
- , tasty, tasty-hspec
- }:
- mkDerivation {
- pname = "hsc2hs";
- version = "0.68.4";
- sha256 = "07qzyr1j76gxrrsds65vivm5cx33paxpifvxdlmkxprrm3s4z7z6";
- revision = "2";
- editedCabalFile = "178jimc9qwrjmiiz8f0kk7gv2jaf51vv1n40rp42ggmi8mvf0m4v";
- isLibrary = false;
- isExecutable = true;
- enableSeparateDataOutput = true;
- executableHaskellDepends = [
- base containers directory filepath process
- ];
- testHaskellDepends = [ base tasty tasty-hspec ];
- description = "A preprocessor that helps with writing Haskell bindings to C code";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {};
-
- "hsc2hs_0_68_6" = callPackage
({ mkDerivation, base, containers, directory, filepath, process
, tasty, tasty-hspec
}:
@@ -123564,6 +123960,8 @@ self: {
pname = "hslogger";
version = "1.3.0.0";
sha256 = "1gnnqyd5hr59agqjcbim3kys5zarwsj7b1kfdbhy5qmjjwnpyzs8";
+ revision = "1";
+ editedCabalFile = "0hvlixqc7vr66qq96flnh3l2p7a6pfmzxf9sn8f243yvsq867yah";
libraryHaskellDepends = [
base bytestring containers network network-bsd old-locale time unix
];
@@ -124736,6 +125134,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-wai_0_10_1" = callPackage
+ ({ mkDerivation, base, base-compat, bytestring, case-insensitive
+ , hspec, hspec-core, hspec-expectations, http-types, QuickCheck
+ , text, transformers, wai, wai-extra
+ }:
+ mkDerivation {
+ pname = "hspec-wai";
+ version = "0.10.1";
+ sha256 = "05jv0cz8r8bf63ma5byjb2gkj9vwgnls4n9mks99qc525n055ckz";
+ libraryHaskellDepends = [
+ base base-compat bytestring case-insensitive hspec-core
+ hspec-expectations http-types QuickCheck text transformers wai
+ wai-extra
+ ];
+ testHaskellDepends = [
+ base base-compat bytestring case-insensitive hspec hspec-core
+ hspec-expectations http-types QuickCheck text transformers wai
+ wai-extra
+ ];
+ description = "Experimental Hspec support for testing WAI applications";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-wai-json" = callPackage
({ mkDerivation, aeson, aeson-qq, base, bytestring
, case-insensitive, hspec, hspec-wai, template-haskell
@@ -124753,6 +125175,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-wai-json_0_10_1" = callPackage
+ ({ mkDerivation, aeson, aeson-qq, base, bytestring
+ , case-insensitive, hspec, hspec-wai, template-haskell
+ }:
+ mkDerivation {
+ pname = "hspec-wai-json";
+ version = "0.10.1";
+ sha256 = "04mpqij446ki5l6xwi3bjmlf3ggjia2nzv8j62mdy6ick96dqwk6";
+ libraryHaskellDepends = [
+ aeson aeson-qq base bytestring case-insensitive hspec-wai
+ template-haskell
+ ];
+ testHaskellDepends = [ base hspec hspec-wai ];
+ description = "Testing JSON APIs with hspec-wai";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-webdriver" = callPackage
({ mkDerivation, aeson, base, data-default, hashable, hspec
, hspec-core, HUnit, lifted-base, stm, text, transformers
@@ -126350,6 +126790,8 @@ self: {
pname = "http-api-data";
version = "0.4.1";
sha256 = "1ps4bvln43gz72dr9mc3c9n1rn38c4rz6m49vxzz9nz6jz1978rv";
+ revision = "2";
+ editedCabalFile = "14gvcqdxxs9s74r73i5f5g2819dfyp05m0p4s729ynwm7c20fzfs";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
attoparsec attoparsec-iso8601 base base-compat bytestring
@@ -126773,6 +127215,8 @@ self: {
pname = "http-directory";
version = "0.1.5";
sha256 = "075crysy7avf97vlskwlk8813q2bnqw9p3q29c5yb2yhmykrpwyn";
+ revision = "1";
+ editedCabalFile = "0ynm88f9v3h5dlyf2kzydqwr2l90gwjysffr6gbnlyqw9x46pb04";
libraryHaskellDepends = [
base bytestring html-conduit http-client http-client-tls http-date
http-types text time xml-conduit
@@ -126897,8 +127341,8 @@ self: {
pname = "http-io-streams";
version = "0.1.0.0";
sha256 = "0fxz7p5n7gd99xjq9rwm6x74qzpfp4wdmhj1hm08c7hkinizdvgv";
- revision = "1";
- editedCabalFile = "10fcy17ny5qvabm98md9j8r7vfklgzxvg89iinna7wm4v6q6j5w5";
+ revision = "2";
+ editedCabalFile = "0l6afs6bhf5q73nmlmc37qi0anr1dlrz1x10m9ipfssnkb5hp25k";
libraryHaskellDepends = [
attoparsec base base64-bytestring blaze-builder bytestring
case-insensitive containers directory HsOpenSSL io-streams mtl
@@ -127000,8 +127444,8 @@ self: {
pname = "http-media";
version = "0.8.0.0";
sha256 = "0lww5cxrc9jlvzsysjv99lca33i4rb7cll66p3c0rdpmvz8pk0ir";
- revision = "1";
- editedCabalFile = "01kb67m99jl3b8k06bp84sxiwxygz48ci5wkll42688qgsjb3rab";
+ revision = "2";
+ editedCabalFile = "0qvkhbxdz33lis5vca3jm1b44fkm7aalf4iz1gblr8xivnpmq885";
libraryHaskellDepends = [
base bytestring case-insensitive containers utf8-string
];
@@ -128239,6 +128683,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hvega_0_4_0_0" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+ , filepath, tasty, tasty-golden, text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "hvega";
+ version = "0.4.0.0";
+ sha256 = "1clq31aq8vgvvc1mcrz4al3f7kfb6crs2nkc07n87xykmrcjkdyq";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base text unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson aeson-pretty base bytestring containers filepath tasty
+ tasty-golden text
+ ];
+ description = "Create Vega-Lite visualizations (version 3) in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hvega-theme" = callPackage
({ mkDerivation, base, hvega, text }:
mkDerivation {
@@ -128428,8 +128894,8 @@ self: {
pname = "hw-dsv";
version = "0.3.5";
sha256 = "15dy96ah7frs79g102vvsrihzlk2qc5c773y7bqdcm66mjhin3x2";
- revision = "1";
- editedCabalFile = "1i67wr9yhks9bzpcr0dqhqgvv2i94izv4p6wrcb2vbjl7wzzgs1v";
+ revision = "2";
+ editedCabalFile = "0flmxhc1w38si89wdr9i6x70mc3sl07hrw2b77xabva8dgx7ph3q";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -128606,14 +129072,12 @@ self: {
}:
mkDerivation {
pname = "hw-hspec-hedgehog";
- version = "0.1.0.7";
- sha256 = "0445b5ycr622qjann2yyri8ghkhkw0vqaqn2rlar9wq2ni3b85rv";
- revision = "1";
- editedCabalFile = "0gcfhqasff8ij0xr5wq74blp90ldzgv992agadp63bs4ikg4rajm";
+ version = "0.1.0.8";
+ sha256 = "0c54mhzbmjfjvy5lyvr6xffrncqmbbr10lran2x9czbkhhbikrss";
libraryHaskellDepends = [
base call-stack hedgehog hspec HUnit transformers
];
- testHaskellDepends = [ base hedgehog hspec ];
+ testHaskellDepends = [ base call-stack hedgehog hspec HUnit ];
testToolDepends = [ hspec-discover ];
description = "Interoperability between hspec and hedgehog";
license = stdenv.lib.licenses.bsd3;
@@ -128831,6 +129295,8 @@ self: {
pname = "hw-json-standard-cursor";
version = "0.2.1.1";
sha256 = "0z0lxzciyw6b49w1s88yx9lcqgk0fjmh1zv7qs3jnn9sk0bqldh5";
+ revision = "1";
+ editedCabalFile = "15x23pa4im7ll4ipaykqavmh8frpnlmg8617g67c987f66lpyprr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -129074,6 +129540,8 @@ self: {
benchmarkHaskellDepends = [ base criterion vector ];
description = "Primitive support for bit manipulation";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hw-rankselect" = callPackage
@@ -129125,6 +129593,8 @@ self: {
pname = "hw-rankselect";
version = "0.13.2.0";
sha256 = "00k163jalapxdlcmcvi4ddk60bsj34f7ng05agvh1374kybqscb4";
+ revision = "1";
+ editedCabalFile = "0a0mlfbln3whziv2rp63qr1qjm4vxgrd8535irnlyy5ba0a0lad8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -133110,6 +133580,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "influxdb_1_7_1_1" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+ , cabal-doctest, clock, containers, doctest, foldl, http-client
+ , http-types, lens, network, optional-args, raw-strings-qq
+ , scientific, tagged, tasty, tasty-hunit, template-haskell, text
+ , time, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "influxdb";
+ version = "1.7.1.1";
+ sha256 = "15qzlbgnplxc53l5134igf6yplxg4fgblx0s8bl8hfjh0gbnn8x8";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring clock containers foldl http-client
+ http-types lens network optional-args scientific tagged text time
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base containers doctest raw-strings-qq tasty tasty-hunit
+ template-haskell time
+ ];
+ description = "Haskell client library for InfluxDB";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"informative" = callPackage
({ mkDerivation, base, containers, csv, highlighting-kate
, http-conduit, monad-logger, pandoc, persistent
@@ -133479,6 +133977,8 @@ self: {
pname = "insert-ordered-containers";
version = "0.2.2";
sha256 = "1ikjhg0pdfpnx1d645r92k2dwlk7y935j1w5lcsk23nzpwhbkxja";
+ revision = "1";
+ editedCabalFile = "1hlinc8nnjlzc6ds3wf8jvkihpcbhz2dk0rqxq1ns0c5zbbhnylq";
libraryHaskellDepends = [
aeson base base-compat hashable lens semigroupoids semigroups text
transformers unordered-containers
@@ -133528,8 +134028,8 @@ self: {
}:
mkDerivation {
pname = "inspection-testing";
- version = "0.4.2.1";
- sha256 = "1aw6yj7aikzlisjk5w0gfvby1hqdxm7vj5a65haxs41nxfyifrfd";
+ version = "0.4.2.2";
+ sha256 = "1bppz99p6ix6hah8lbr9mapl2zxgmkg9i7h6hk8wq6zf54hwz3yp";
libraryHaskellDepends = [
base containers ghc mtl template-haskell transformers
];
@@ -133770,8 +134270,8 @@ self: {
pname = "int-cast";
version = "0.2.0.0";
sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0";
- revision = "1";
- editedCabalFile = "111pac97pcrp01zphf96crdx22fnq7ha2s27av0mqki5421rghpm";
+ revision = "2";
+ editedCabalFile = "1fhc91170q9q9k628wc3dqzdvxfjs97jzg5x7g0ndaqnh60l8cy5";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base QuickCheck test-framework test-framework-quickcheck2
@@ -133917,6 +134417,25 @@ self: {
broken = true;
}) {intel_aes = null;};
+ "interactive-plot" = callPackage
+ ({ mkDerivation, base, containers, data-default-class, microlens
+ , microlens-th, MonadRandom, mtl, transformers, vty
+ }:
+ mkDerivation {
+ pname = "interactive-plot";
+ version = "0.1.0.0";
+ sha256 = "0iq7y0vxn7cqrlqd0iqfk6cy80sc4ijln9mwm5r24v94s8cq1rkn";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers data-default-class microlens microlens-th
+ MonadRandom mtl transformers vty
+ ];
+ executableHaskellDepends = [ base ];
+ description = "Interactive quick time series plotting";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"interchangeable" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -136647,8 +137166,8 @@ self: {
({ mkDerivation, base, Cabal }:
mkDerivation {
pname = "jailbreak-cabal";
- version = "1.3.4";
- sha256 = "0xvjdn61a8gxqj4jkdql9dyb3jk6lbx9i1w7hc27f2rqrwmfgq68";
+ version = "1.3.5";
+ sha256 = "1221gxggyk3pjqkc72wxx9gjl8dvqna1rn9nh9zkcmdpv5yww7wd";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base Cabal ];
@@ -137361,8 +137880,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "joint";
- version = "0.1.0";
- sha256 = "0hzbczwy1w1mw8c4lf52nm6ighjlpiyj91siy9fmqih4fv22a1p2";
+ version = "0.1.1";
+ sha256 = "1iq29qyi4ij7ffshvz1x9rpbrbpd4088nccdpjzpzgza73w4bqmp";
libraryHaskellDepends = [ base ];
description = "Trying to compose non-composable";
license = stdenv.lib.licenses.bsd3;
@@ -137607,6 +138126,8 @@ self: {
pname = "jsaddle-dom";
version = "0.9.3.2";
sha256 = "1qc135w1y4f2mbky36dmb0ggcbwkv1vnmszw5lkhkxhkcag2sf07";
+ revision = "1";
+ editedCabalFile = "0vhqqbcpbrsnbmix0wkkm1d21qwrpicbzjwy42p48g7whg0lf0d5";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
base base-compat exceptions jsaddle lens text transformers
@@ -137753,6 +138274,8 @@ self: {
pname = "json";
version = "0.9.3";
sha256 = "1z8s3mfg76p2flqqd2wqsi96l5bg8k8w8m58zlv81pw3k7h1vbwb";
+ revision = "2";
+ editedCabalFile = "0iqmwfq6s1fc8jj16yx2d7jpzf94scd1hc4yvz281zxj7kds2ms5";
libraryHaskellDepends = [
array base bytestring containers mtl parsec pretty syb text
];
@@ -139000,8 +139523,8 @@ self: {
}:
mkDerivation {
pname = "jvm-binary";
- version = "0.5.0";
- sha256 = "0v54x0015im3gbd2rsf87kmppkasd8780sb4pl8mqc82dbf4v18z";
+ version = "0.6.0";
+ sha256 = "1ipy0vy0pr9pbxjin0d86dwvdy70wxb1cmg1bqcdjdgrg2xbqxf8";
libraryHaskellDepends = [
attoparsec base binary bytestring containers data-binary-ieee754
deepseq deriving-compat mtl template-haskell text vector
@@ -139860,6 +140383,8 @@ self: {
];
description = "Fast concurrent queues much inspired by unagi-chan";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"kbq-gu" = callPackage
@@ -140756,8 +141281,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "kind-apply";
- version = "0.3.1.0";
- sha256 = "1rvm0zw5gxn4jfy7ndplrzi2k77mciiisylf9adppy1an8q4zw3d";
+ version = "0.3.2.0";
+ sha256 = "0wq0jfi8jdah6mwc6amrfjs5ld0bz86y53va9sm0hzvpiyb4bpcq";
libraryHaskellDepends = [ base ];
description = "Utilities to work with lists of types";
license = stdenv.lib.licenses.bsd3;
@@ -140774,6 +141299,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "kind-generics_0_4_0_0" = callPackage
+ ({ mkDerivation, base, kind-apply }:
+ mkDerivation {
+ pname = "kind-generics";
+ version = "0.4.0.0";
+ sha256 = "1w3rpvdvgfczsc86y00qbr9s9r8vmv442m4x975f3zcqs4algfhp";
+ libraryHaskellDepends = [ base kind-apply ];
+ description = "Generic programming in GHC style for arbitrary kinds and GADTs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"kind-generics-th" = callPackage
({ mkDerivation, base, kind-generics, template-haskell
, th-abstraction
@@ -140790,6 +141327,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "kind-generics-th_0_2_0_0" = callPackage
+ ({ mkDerivation, base, kind-generics, template-haskell
+ , th-abstraction
+ }:
+ mkDerivation {
+ pname = "kind-generics-th";
+ version = "0.2.0.0";
+ sha256 = "1vj2zbkv51fvcpjrkqqlsd685drnh2yalsplcb6sgrgq9dfdlw2h";
+ libraryHaskellDepends = [
+ base kind-generics template-haskell th-abstraction
+ ];
+ testHaskellDepends = [ base kind-generics ];
+ description = "Template Haskell support for generating `GenericK` instances";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"kinds" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -140833,8 +141387,8 @@ self: {
pname = "kleene";
version = "0.1";
sha256 = "00w1gywdhqyy2k3y238gfjs9h2w4pjanmi45bna5lj215n0jb0hg";
- revision = "1";
- editedCabalFile = "0cirgqhbwz849szrzmyvs47pzja9wnmz5rc2ccylgdikkv4mg3bb";
+ revision = "2";
+ editedCabalFile = "1kiaxmxhlv1pczw8bg5vhcbyxgl87qs5bgcdaipd29ml0z7sncsd";
libraryHaskellDepends = [
attoparsec base base-compat bytestring containers lattices MemoTrie
QuickCheck range-set-list regex-applicative semigroupoids
@@ -141305,6 +141859,17 @@ self: {
broken = true;
}) {};
+ "kuifje" = callPackage
+ ({ mkDerivation, base, boxes, containers, lens }:
+ mkDerivation {
+ pname = "kuifje";
+ version = "0.1.2.0";
+ sha256 = "0f7ldw506g4r6f7s803iwq49syfl1zmxdyyr62arbzg6h5qg81j7";
+ libraryHaskellDepends = [ base boxes containers lens ];
+ description = "A Quantitative Information Flow aware programming language";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"kure" = callPackage
({ mkDerivation, base, dlist, transformers }:
mkDerivation {
@@ -142057,8 +142622,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-xmpp";
- version = "0.1.0.0";
- sha256 = "1bn8gd2gxl44xqffiy8skh714hkvfv2d318v1qg9k52pp53al2ny";
+ version = "0.1.0.4";
+ sha256 = "0jgj1vyfw26asnj6zxlfzax6hs3syn29c0abp5b7blzl27iy5pdm";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -142588,8 +143153,8 @@ self: {
pname = "language-c";
version = "0.8.2";
sha256 = "05ff3ywh2lpxgd00nv6y3jnqpdl6bg0f2yn3csd043rv4srd6adp";
- revision = "1";
- editedCabalFile = "1xg49j4bykgdm6l14m65wyz8r3s4v4dqc7a9zjcsr12ffkiv8nam";
+ revision = "2";
+ editedCabalFile = "074mypdymg7543waq68c72viw912w94v94y1287sp67lzwpyiixd";
libraryHaskellDepends = [
array base bytestring containers deepseq directory filepath pretty
process syb
@@ -143137,8 +143702,8 @@ self: {
}:
mkDerivation {
pname = "language-lua";
- version = "0.11.0";
- sha256 = "1b65bfjdx7287d65s2ki05yfps8k0w6jfq4avna4z37cqssa0z59";
+ version = "0.11.0.1";
+ sha256 = "0712xbijag03n61d80bnd9xw94fzywc76l8ya9ijv684ls0qymy2";
libraryHaskellDepends = [
alex-tools array base bytestring deepseq text
];
@@ -143996,6 +144561,8 @@ self: {
pname = "lattices";
version = "2.0.1";
sha256 = "0c7n7fh89llg8ijylwc14ikqrg077vcqcgph5h9nar6i5dyaprfy";
+ revision = "1";
+ editedCabalFile = "1zfxq1gpfv0vb7arw0hw2nf61hyjwl8c72jng4v61xywvqh9i36q";
libraryHaskellDepends = [
base base-compat containers deepseq hashable integer-logarithms
QuickCheck semigroupoids tagged transformers universe-base
@@ -145002,6 +145569,47 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "lens_4_18" = callPackage
+ ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
+ , Cabal, cabal-doctest, call-stack, comonad, containers
+ , contravariant, criterion, deepseq, directory, distributive
+ , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
+ , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors
+ , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
+ , tagged, template-haskell, test-framework, test-framework-hunit
+ , test-framework-quickcheck2, test-framework-th, text
+ , th-abstraction, transformers, transformers-compat, type-equality
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "lens";
+ version = "4.18";
+ sha256 = "0wldr36bmlxddc6d874lfl4hwnh5bq5k89v437d7xw5ldj0fgws6";
+ setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
+ libraryHaskellDepends = [
+ array base base-orphans bifunctors bytestring call-stack comonad
+ containers contravariant distributive exceptions filepath free
+ ghc-prim hashable kan-extensions mtl parallel profunctors
+ reflection semigroupoids tagged template-haskell text
+ th-abstraction transformers transformers-compat type-equality
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base bytestring containers deepseq directory doctest filepath
+ generic-deriving HUnit mtl nats parallel QuickCheck semigroups
+ simple-reflect test-framework test-framework-hunit
+ test-framework-quickcheck2 test-framework-th text transformers
+ unordered-containers vector
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring comonad containers criterion deepseq
+ generic-deriving transformers unordered-containers vector
+ ];
+ description = "Lenses, Folds and Traversals";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"lens-accelerate" = callPackage
({ mkDerivation, accelerate, base, lens }:
mkDerivation {
@@ -145057,6 +145665,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "lens-aeson_1_1" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+ , cabal-doctest, doctest, generic-deriving, lens, scientific
+ , semigroups, simple-reflect, text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "lens-aeson";
+ version = "1.1";
+ sha256 = "03n9dkdyqkkf15h8k4c4bjwgjcbbs2an2cf6z8x54nvkjmprrg7p";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring lens scientific text
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base doctest generic-deriving semigroups simple-reflect
+ ];
+ description = "Law-abiding lenses for aeson";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"lens-datetime" = callPackage
({ mkDerivation, base, lens, time }:
mkDerivation {
@@ -145492,6 +146122,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "lenz_0_4_0_0" = callPackage
+ ({ mkDerivation, base, base-unicode-symbols, hs-functors
+ , transformers
+ }:
+ mkDerivation {
+ pname = "lenz";
+ version = "0.4.0.0";
+ sha256 = "1bfhs61i7ach2d8bbrcsch57w7imrn22hilv63hif9dmqjnlwvy5";
+ libraryHaskellDepends = [
+ base base-unicode-symbols hs-functors transformers
+ ];
+ description = "Van Laarhoven lenses";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"lenz-template" = callPackage
({ mkDerivation, base, base-unicode-symbols, containers, lenz
, template-haskell
@@ -146134,6 +146780,8 @@ self: {
librarySystemDepends = [ modbus ];
description = "Haskell bindings to the C modbus library";
license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {modbus = null;};
"libmolude" = callPackage
@@ -147715,23 +148363,24 @@ self: {
"linnet" = callPackage
({ mkDerivation, base, bytestring, bytestring-conversion
- , case-insensitive, either, exceptions, hspec, http-types
- , io-streams, mtl, QuickCheck, quickcheck-classes
- , quickcheck-instances, text, transformers, uri-encode, wai, warp
+ , case-insensitive, either, exceptions, hspec, http-media
+ , http-types, mtl, QuickCheck, quickcheck-classes
+ , quickcheck-instances, text, time, transformers, uri-encode, wai
+ , warp
}:
mkDerivation {
pname = "linnet";
- version = "0.1.0.1";
- sha256 = "074np5a8xx25k88c82spmvmwiwcm993pvfbwfhjjkcqjqxwwgglf";
+ version = "0.4.0.0";
+ sha256 = "0k64pnzs13rc68h4qpn0kd3qm3hsyzgd8d8r96vak8a0pbjkzgrq";
libraryHaskellDepends = [
base bytestring bytestring-conversion case-insensitive either
- exceptions http-types io-streams mtl text transformers uri-encode
- wai warp
+ exceptions http-media http-types mtl text time transformers
+ uri-encode wai warp
];
testHaskellDepends = [
base bytestring bytestring-conversion case-insensitive either
- exceptions hspec http-types io-streams mtl QuickCheck
- quickcheck-classes quickcheck-instances text transformers
+ exceptions hspec http-media http-types mtl QuickCheck
+ quickcheck-classes quickcheck-instances text time transformers
uri-encode wai warp
];
description = "Lightweight library for building HTTP API";
@@ -147744,8 +148393,8 @@ self: {
}:
mkDerivation {
pname = "linnet-aeson";
- version = "0.1.0.1";
- sha256 = "1syfi3ha3z2l1g8qdy5rpla6xafw6dqcwicgns1xy9q9d8jrcjs3";
+ version = "0.4.0.0";
+ sha256 = "1rpc3i32vywvhfndg9p3rd5qy1m1fv0zqxbhdyp36c8awm1q5086";
libraryHaskellDepends = [ aeson base bytestring linnet ];
testHaskellDepends = [
aeson base bytestring hspec linnet QuickCheck quickcheck-classes
@@ -147755,6 +148404,26 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "linnet-conduit" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, hspec, http-types
+ , linnet, QuickCheck, quickcheck-classes, quickcheck-instances, wai
+ , warp
+ }:
+ mkDerivation {
+ pname = "linnet-conduit";
+ version = "0.4.0.0";
+ sha256 = "1a29sahlmhl8k6xqyfm9ixf64k2x0k631z5jixvg1x1s6xpq3hyi";
+ libraryHaskellDepends = [
+ base bytestring conduit http-types linnet wai warp
+ ];
+ testHaskellDepends = [
+ base bytestring conduit hspec http-types linnet QuickCheck
+ quickcheck-classes quickcheck-instances wai warp
+ ];
+ description = "Conduit-backed support for streaming in Linnet";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"linode" = callPackage
({ mkDerivation, aeson, async, base, binary, bytestring, containers
, errors, lens, process, retry, safe, tasty, tasty-hunit
@@ -148311,6 +148980,17 @@ self: {
broken = true;
}) {};
+ "list-singleton" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "list-singleton";
+ version = "1.0.0.2";
+ sha256 = "0nl363fr751s2jlvkql96pdj5kvkzz3h0kbd02y5vqc3r13pchaq";
+ libraryHaskellDepends = [ base ];
+ description = "Easily and clearly create lists with only one element in them";
+ license = stdenv.lib.licenses.isc;
+ }) {};
+
"list-t" = callPackage
({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control
, mtl, mtl-prelude, transformers, transformers-base
@@ -148430,8 +149110,8 @@ self: {
({ mkDerivation, base, doctest, mtl }:
mkDerivation {
pname = "list-transformer";
- version = "1.0.4";
- sha256 = "0zia1b2phk4skv39q2k481jsagz1syd6rkgfcdra15i2s5dhzvyp";
+ version = "1.0.5";
+ sha256 = "192yx9y0sp729dk9xaym1b6kyw9gv7n3fp1dvxw7z2w04s92l1k4";
libraryHaskellDepends = [ base mtl ];
testHaskellDepends = [ base doctest ];
description = "List monad transformer";
@@ -149021,6 +149701,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {llvm-config = null;};
+ "llvm-hs_9_0_0" = callPackage
+ ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
+ , containers, exceptions, llvm-config, llvm-hs-pure, mtl
+ , pretty-show, process, QuickCheck, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, temporary, transformers
+ , utf8-string
+ }:
+ mkDerivation {
+ pname = "llvm-hs";
+ version = "9.0.0";
+ sha256 = "0sz1rhdf73v43jz8x7f5f7bjwrkvyyvf950gw9063aapbsdzm76h";
+ setupHaskellDepends = [ base Cabal containers ];
+ libraryHaskellDepends = [
+ array attoparsec base bytestring containers exceptions llvm-hs-pure
+ mtl template-haskell transformers utf8-string
+ ];
+ libraryToolDepends = [ llvm-config ];
+ testHaskellDepends = [
+ base bytestring containers llvm-hs-pure mtl pretty-show process
+ QuickCheck tasty tasty-hunit tasty-quickcheck temporary
+ transformers
+ ];
+ description = "General purpose LLVM bindings";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {llvm-config = null;};
+
"llvm-hs-pretty" = callPackage
({ mkDerivation, array, base, bytestring, directory, filepath
, llvm-hs, llvm-hs-pure, mtl, prettyprinter, tasty, tasty-golden
@@ -149063,6 +149770,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "llvm-hs-pure_9_0_0" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers, fail
+ , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+ , transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "llvm-hs-pure";
+ version = "9.0.0";
+ sha256 = "0pxb5ah8r5pzpz2ibqw3g9g1isigb4z7pbzfrwr8kmcjn74ab3kf";
+ libraryHaskellDepends = [
+ attoparsec base bytestring containers fail mtl template-haskell
+ transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ base containers mtl tasty tasty-hunit tasty-quickcheck transformers
+ ];
+ description = "Pure Haskell LLVM functionality (no FFI)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"llvm-ht" = callPackage
({ mkDerivation, base, bytestring, directory, mtl, process
, type-level
@@ -150805,8 +151533,8 @@ self: {
pname = "lrucaching";
version = "0.3.3";
sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma";
- revision = "8";
- editedCabalFile = "11ad87kg09s9md9lqzhbcw19kmzvii4v97nw49q0wb0rs0qizpki";
+ revision = "9";
+ editedCabalFile = "0rzrj9ziwly33lhkamf9rkrc3jqhid3adl0dv9621n4zzd6dnkb6";
libraryHaskellDepends = [
base base-compat deepseq hashable psqueues vector
];
@@ -150883,6 +151611,33 @@ self: {
broken = true;
}) {};
+ "lsp-test_0_7_0_0" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
+ , bytestring, conduit, conduit-parse, containers, data-default
+ , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl
+ , parser-combinators, process, rope-utf16-splay, text, transformers
+ , unix, unordered-containers
+ }:
+ mkDerivation {
+ pname = "lsp-test";
+ version = "0.7.0.0";
+ sha256 = "1lm299gbahrnwfrprhhpzxrmjljj33pps1gzz2wzmp3m9gzl1dx5";
+ libraryHaskellDepends = [
+ aeson aeson-pretty ansi-terminal async base bytestring conduit
+ conduit-parse containers data-default Diff directory filepath
+ haskell-lsp lens mtl parser-combinators process rope-utf16-splay
+ text transformers unix unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base data-default haskell-lsp hspec lens text
+ unordered-containers
+ ];
+ description = "Functional test framework for LSP servers";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"lss" = callPackage
({ mkDerivation, attoparsec, base, containers, directory, filepath
, hspec2, language-css, language-css-attoparsec, text, xmlhtml
@@ -151104,6 +151859,8 @@ self: {
pname = "lucid";
version = "2.9.11";
sha256 = "13xz21hf9ywbyqwm33z8pfrjq03rzffhqswi30xsi13rrawj99cc";
+ revision = "1";
+ editedCabalFile = "10k3x9cn4a23kqk909xiv8phkfgagf7p16qlfpr9swn1dn4xasgf";
libraryHaskellDepends = [
base blaze-builder bytestring containers hashable mmorph mtl text
transformers unordered-containers
@@ -151521,8 +152278,8 @@ self: {
pname = "lzma";
version = "0.0.0.3";
sha256 = "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg";
- revision = "3";
- editedCabalFile = "1sify6gnsalyp6dakfzi0mdy5jcz2kcp9jsdsgkmxd40nfzgd44m";
+ revision = "4";
+ editedCabalFile = "0f3zrjq4zxwacmlc934y873pvlqpmmcmhzhp34d8pvhi5c7dg47j";
libraryHaskellDepends = [ base bytestring ];
librarySystemDepends = [ lzma ];
testHaskellDepends = [
@@ -151726,6 +152483,8 @@ self: {
pname = "machines";
version = "0.6.4";
sha256 = "0s3pvdklanw6a41pyyqrplm3vid63dpy6vd6qhp86dnb4wp2ppkj";
+ revision = "2";
+ editedCabalFile = "1h0qq6kxv4kc0j0rmx7rhwhvfg1hc08r10q152km4p8kgshcwlig";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
adjunctions base comonad containers distributive mtl pointed
@@ -153693,8 +154452,8 @@ self: {
}:
mkDerivation {
pname = "massiv";
- version = "0.4.0.0";
- sha256 = "077w18fxgq50h1ylbalf6lbam2rcqp4a3b6qr21ac63514dyvyfz";
+ version = "0.4.1.0";
+ sha256 = "0h6rr5fx3kj5qs30zyfzmmvqnwn43fl4smjfd7qx4fhp48bq89nw";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base bytestring data-default-class deepseq exceptions primitive
@@ -153728,6 +154487,24 @@ self: {
broken = true;
}) {};
+ "massiv-io_0_1_7_0" = callPackage
+ ({ mkDerivation, base, bytestring, data-default-class, deepseq
+ , directory, filepath, JuicyPixels, massiv, netpbm, process, vector
+ }:
+ mkDerivation {
+ pname = "massiv-io";
+ version = "0.1.7.0";
+ sha256 = "0w3yffkrsjkgfqdfmhq42am2hpmkblnfg0prifr2ja5pfwr02l5c";
+ libraryHaskellDepends = [
+ base bytestring data-default-class deepseq directory filepath
+ JuicyPixels massiv netpbm process vector
+ ];
+ description = "Import/export of Image files into massiv Arrays";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"massiv-scheduler" = callPackage
({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest
, deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell
@@ -153882,8 +154659,8 @@ self: {
}:
mkDerivation {
pname = "math-functions";
- version = "0.3.1.0";
- sha256 = "0mb61yn7faxhpj5d6w5dzgawz2hbjbdqbxz3dkw4855r1bnfnh1k";
+ version = "0.3.2.0";
+ sha256 = "1798n8x3w3x4s058dph18g11k2hm7vcxkbr2rb2snlksjr59c2wa";
libraryHaskellDepends = [
base data-default-class deepseq primitive vector vector-th-unbox
];
@@ -153896,6 +154673,28 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "math-functions_0_3_2_1" = callPackage
+ ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit
+ , primitive, QuickCheck, test-framework, test-framework-hunit
+ , test-framework-quickcheck2, vector, vector-th-unbox
+ }:
+ mkDerivation {
+ pname = "math-functions";
+ version = "0.3.2.1";
+ sha256 = "1d1zgc9y3pgahpkn2vgzc2vh412z54i03gw98s95jpqclvl7fyck";
+ libraryHaskellDepends = [
+ base data-default-class deepseq primitive vector vector-th-unbox
+ ];
+ testHaskellDepends = [
+ base data-default-class deepseq erf HUnit primitive QuickCheck
+ test-framework test-framework-hunit test-framework-quickcheck2
+ vector vector-th-unbox
+ ];
+ description = "Collection of tools for numeric computations";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"math-grads" = callPackage
({ mkDerivation, aeson, array, base, containers, hspec, linear
, matrix, mtl, random, vector
@@ -154091,8 +154890,6 @@ self: {
];
description = "Bindings to Matplotlib; a Python plotting library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"matrices" = callPackage
@@ -155534,8 +156331,8 @@ self: {
pname = "memory";
version = "0.14.18";
sha256 = "01rmq3vagxzjmm96qnfxk4f0516cn12bp5m8inn8h5r918bqsigm";
- revision = "1";
- editedCabalFile = "0h4d0avv8kv3my4rim79lcamv2dyibld7w6ianq46nhwgr0h2lzm";
+ revision = "2";
+ editedCabalFile = "1kwlgsjxh4ncvc6x9rps82bm55qyzn8lvzg49s4rbyc7vjjsbmx6";
libraryHaskellDepends = [
base basement bytestring deepseq ghc-prim
];
@@ -155544,6 +156341,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "memory_0_15_0" = callPackage
+ ({ mkDerivation, base, basement, bytestring, deepseq, foundation
+ , ghc-prim
+ }:
+ mkDerivation {
+ pname = "memory";
+ version = "0.15.0";
+ sha256 = "0a9mxcddnqn4359hk59d6l2zbh0vp154yb5vs1a8jw4l38n8kzz3";
+ revision = "1";
+ editedCabalFile = "136qfj1cbg9571mlwywaqml75ijx3pcgvbpbgwxrqsl71ssj8w5y";
+ libraryHaskellDepends = [
+ base basement bytestring deepseq ghc-prim
+ ];
+ testHaskellDepends = [ base basement bytestring foundation ];
+ description = "memory and related abstraction stuff";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"memorypool" = callPackage
({ mkDerivation, base, containers, transformers, unsafe, vector }:
mkDerivation {
@@ -155612,6 +156428,8 @@ self: {
pname = "menshen";
version = "0.0.3";
sha256 = "0zx530ksb0zmczbl6k70xg6pxgr2wfga2pg0ghgmpgd9f307xrwb";
+ revision = "1";
+ editedCabalFile = "0hxj40q50pbl57dribvnk8ak907p15jnk3zycv6n9vj91la9js48";
libraryHaskellDepends = [ base regex-tdfa scientific text ];
testHaskellDepends = [
aeson base hspec QuickCheck regex-tdfa scientific text
@@ -156169,8 +156987,8 @@ self: {
pname = "microaeson";
version = "0.1.0.0";
sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz";
- revision = "1";
- editedCabalFile = "0pxgpmr0xv355rnpr8m7l07swbzsjbfiba3dxyz53bdjcc8ya9dq";
+ revision = "2";
+ editedCabalFile = "1n3jhbwic8c2pa6dcz36a6fgna4b854ml5d5n8qzzhjshb0v60ri";
libraryHaskellDepends = [
array base bytestring containers deepseq text
];
@@ -156283,6 +157101,8 @@ self: {
pname = "microlens";
version = "0.4.10";
sha256 = "1v277yyy4p9q57xr2lfp6qs24agglfczmcabrapxrzci3jfshmcw";
+ revision = "1";
+ editedCabalFile = "1qh5ifbwh62v14ygg3fj22wqimylph17ykng70vqv5x2rkp630jq";
libraryHaskellDepends = [ base ];
description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
license = stdenv.lib.licenses.bsd3;
@@ -156554,8 +157374,8 @@ self: {
pname = "microstache";
version = "1.0.1.1";
sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax";
- revision = "4";
- editedCabalFile = "0rkc0zmwi2vx47l4ssjkxlyd54fxz0w3xrgdhn7baf66gr90nrc7";
+ revision = "5";
+ editedCabalFile = "1dr1yqn42j6im1x333rpsqj57nhmagmhwkdfwx832cdsw9ry2gjz";
libraryHaskellDepends = [
aeson base bytestring containers deepseq directory filepath parsec
text transformers unordered-containers vector
@@ -156915,8 +157735,8 @@ self: {
}:
mkDerivation {
pname = "milena";
- version = "0.5.3.0";
- sha256 = "0n46w570i9nrh0c71gl58phbsb8g05b9gcxvkcdx94yms41wsjh1";
+ version = "0.5.4.0";
+ sha256 = "1ldjm2m1rbm74j7kygli6g6rcl5hqk0agh5xpah1i02n2f01i078";
libraryHaskellDepends = [
base bytestring cereal containers digest lens lifted-base
monad-control mtl murmur-hash network random resource-pool
@@ -158622,6 +159442,8 @@ self: {
pname = "monad-chronicle";
version = "1";
sha256 = "03x19683pm99zcw7gkipmdkrqwaspcyvy7yv68nlh6g4swl31a0l";
+ revision = "1";
+ editedCabalFile = "059qa4kb6x3vqw0pahbkp3i6v33cyaiizzkgxd1n36l9ybchwr4l";
libraryHaskellDepends = [
base data-default-class mtl semigroupoids these transformers
transformers-compat
@@ -160255,8 +161077,8 @@ self: {
pname = "monoid-extras";
version = "0.5";
sha256 = "172d1mfns7agd619rlbb1i9kw2y26kjvivkva06k1r14bar1lmy6";
- revision = "2";
- editedCabalFile = "1q73ghd12fd451zm4m045h8v3y61jmfhj6k890gnv6z7lyb7xwg2";
+ revision = "3";
+ editedCabalFile = "1f6yd2lzvcr983xh68wgvxibx2a8ldgkcvac48pqqcxl1ywx1iny";
libraryHaskellDepends = [ base groups semigroupoids semigroups ];
benchmarkHaskellDepends = [ base criterion semigroups ];
description = "Various extra monoid-related definitions and utilities";
@@ -160346,6 +161168,8 @@ self: {
pname = "monoidal-containers";
version = "0.4.0.0";
sha256 = "15mh2hx7a31gr5zb2g30h2fcnb3a2wvv2y8hvzzk5l9cr2nvhcm1";
+ revision = "1";
+ editedCabalFile = "18m2r5kfvkss8vh537vh2k4zbpncmwadg1g4pzsw0rdmkyn7lyjd";
libraryHaskellDepends = [
aeson base containers deepseq hashable lens newtype semigroups
unordered-containers
@@ -160362,6 +161186,8 @@ self: {
pname = "monoidal-containers";
version = "0.6";
sha256 = "1ii09s068g6bj2j10ig3g3ymv1ci6zg596pmmaw6als15j9bybc9";
+ revision = "1";
+ editedCabalFile = "1k4k8g5a7swaylcqnga7lyp0lly8j1fqzdwsnznmps8bwn1pn1kk";
libraryHaskellDepends = [
aeson base containers deepseq hashable lens newtype semialign
semigroups these unordered-containers
@@ -160736,8 +161562,8 @@ self: {
}:
mkDerivation {
pname = "morpheus-graphql";
- version = "0.2.1";
- sha256 = "1qdd21mwxsn3yw9c0vxcsmx6ixp90lpy2ghk6ix2s06cs4d5s3h9";
+ version = "0.2.2";
+ sha256 = "1cgf6l6p97dfgj49gyygbd088smah3ichryrr8xvl1mr6pjclq5b";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -161128,8 +161954,8 @@ self: {
}:
mkDerivation {
pname = "mpi-hs";
- version = "0.5.1.2";
- sha256 = "0v31d8i8z6ixg0vl2fk8wscnsl76y096a16650mfpbifwh9ax71m";
+ version = "0.5.3.0";
+ sha256 = "0z2m4xfk0w1zx29jb27xb6hs01xid0ghv93yhqx7zwiw01815krk";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -161138,8 +161964,11 @@ self: {
librarySystemDepends = [ openmpi ];
libraryToolDepends = [ c2hs ];
executableHaskellDepends = [ base binary ];
+ executableSystemDepends = [ openmpi ];
testHaskellDepends = [ base monad-loops ];
+ testSystemDepends = [ openmpi ];
benchmarkHaskellDepends = [ base criterion ];
+ benchmarkSystemDepends = [ openmpi ];
description = "MPI bindings for Haskell";
license = stdenv.lib.licenses.asl20;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -161527,8 +162356,8 @@ self: {
}:
mkDerivation {
pname = "mssql-simple";
- version = "0.5.0.0";
- sha256 = "0k0j87h37hya42fv045z44p9issic0a0wswy75ymclizsbip1fl4";
+ version = "0.5.0.1";
+ sha256 = "174qqm4y38b4x0nc4kfrafr0cqcqshdxgxj2amn58m5zvclhn3fs";
libraryHaskellDepends = [
base binary bytestring hostname ms-tds mtl network template-haskell
text time tls uuid-types
@@ -162139,6 +162968,8 @@ self: {
testHaskellDepends = [ base cryptonite doctest hedgehog ];
description = "Self-identifying hashes, implementation of ";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"multihash-serialise" = callPackage
@@ -164523,6 +165354,17 @@ self: {
broken = true;
}) {};
+ "natural-arithmetic" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "natural-arithmetic";
+ version = "0.1.0.0";
+ sha256 = "0h5ga04hw7v54xsxjj852238spl3px190g67qjqzxvnyn0f76jrp";
+ libraryHaskellDepends = [ base ];
+ description = "Arithmetic of natural numbers";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"natural-induction" = callPackage
({ mkDerivation, base, peano }:
mkDerivation {
@@ -165092,8 +165934,8 @@ self: {
}:
mkDerivation {
pname = "net-mqtt";
- version = "0.2.4.1";
- sha256 = "0s0drakh05ygwkvlcd8z0f5168hvk8qmvdq3mg2bk1p2fjd2hfb2";
+ version = "0.2.4.2";
+ sha256 = "1ygd0ncwzzy4i2m4n0ax02csyjdsn2y66amr9yilxn6x0yhbq9rj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -165405,8 +166247,8 @@ self: {
pname = "netrc";
version = "0.2.0.0";
sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls";
- revision = "5";
- editedCabalFile = "0v383hy7iw44xxnpdp2fla2dc8ivrhwgh2m303ps4z9fsw25cyka";
+ revision = "6";
+ editedCabalFile = "0mn0ar2xhjdsm50kmpw5ndvbyfmc30b3x0bx291d2ml7hqspnnsw";
libraryHaskellDepends = [ base bytestring deepseq parsec ];
testHaskellDepends = [
base bytestring tasty tasty-golden tasty-quickcheck
@@ -166343,8 +167185,8 @@ self: {
({ mkDerivation, base, network }:
mkDerivation {
pname = "network-run";
- version = "0.1.0";
- sha256 = "16n7d0vgzcp6qq3y2vs1wjlj81xdi3a1kyk9qncmj3h7djav3r5b";
+ version = "0.2.0";
+ sha256 = "1iabxk341yzsr28mpiam01wris20na4kbvbpxfzbcvlb1q2pjz5v";
libraryHaskellDepends = [ base network ];
description = "Simple network runner library";
license = stdenv.lib.licenses.bsd3;
@@ -167066,6 +167908,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "newtype-generics_0_5_4" = callPackage
+ ({ mkDerivation, base, gauge, hspec, hspec-discover, semigroups
+ , transformers
+ }:
+ mkDerivation {
+ pname = "newtype-generics";
+ version = "0.5.4";
+ sha256 = "0cprfg4n0z62cnix1qrbc79bfdd4s50b05fj9m9hk6vm1pc3szq0";
+ libraryHaskellDepends = [ base transformers ];
+ testHaskellDepends = [ base hspec ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [ base gauge semigroups ];
+ description = "A typeclass and set of functions for working with newtypes";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"newtype-th" = callPackage
({ mkDerivation, base, haskell-src-meta, newtype, syb
, template-haskell
@@ -167585,6 +168444,26 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {inherit (pkgs) nix;};
+ "nixfmt" = callPackage
+ ({ mkDerivation, base, cmdargs, directory, filepath, megaparsec
+ , parser-combinators, safe-exceptions, text, unix
+ }:
+ mkDerivation {
+ pname = "nixfmt";
+ version = "0.3.0";
+ sha256 = "0y9r7l2iwy6kqqli8bfcgrcr07pqvpaym895qn21d467ybcmgqih";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base megaparsec parser-combinators text
+ ];
+ executableHaskellDepends = [
+ base cmdargs directory filepath safe-exceptions text unix
+ ];
+ description = "An opinionated formatter for Nix";
+ license = stdenv.lib.licenses.mpl20;
+ }) {};
+
"nixfromnpm" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, bytestring
, classy-prelude, containers, curl, data-default, data-fix
@@ -170078,8 +170957,8 @@ self: {
}:
mkDerivation {
pname = "oeis2";
- version = "1.0.2";
- sha256 = "1pmyx9w3jg3wsfhqp4hby6px05g09a91s6fiazyvm9yxmhaaxhxd";
+ version = "1.0.3";
+ sha256 = "04dbly6ggadmy1bi10x9bbsa6dvynb5g1m5hdrlzv3mpyfahxvwp";
libraryHaskellDepends = [
aeson base containers http-conduit lens lens-aeson text vector
];
@@ -170650,6 +171529,8 @@ self: {
pname = "opaleye";
version = "0.6.7004.0";
sha256 = "1p897zswmxil3yrxgdnjszbafi01gib8rl0y9lay4vqj1mrwa14m";
+ revision = "1";
+ editedCabalFile = "0wxcygykflm06v7m0p3pi7i490c1mjbid8whc9dsc181hfzhr6wl";
libraryHaskellDepends = [
aeson base base16-bytestring bytestring case-insensitive
contravariant postgresql-simple pretty product-profunctors
@@ -170666,6 +171547,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "opaleye_0_6_7004_1" = callPackage
+ ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+ , case-insensitive, containers, contravariant, dotenv, hspec
+ , hspec-discover, multiset, postgresql-simple, pretty
+ , product-profunctors, profunctors, QuickCheck, scientific
+ , semigroups, text, time, time-locale-compat, transformers, uuid
+ , void
+ }:
+ mkDerivation {
+ pname = "opaleye";
+ version = "0.6.7004.1";
+ sha256 = "09jgdqkw8hp82b3x0fg9906gyxwl9gz3hifv2dvrj915fvgiybg1";
+ libraryHaskellDepends = [
+ aeson base base16-bytestring bytestring case-insensitive
+ contravariant postgresql-simple pretty product-profunctors
+ profunctors scientific semigroups text time time-locale-compat
+ transformers uuid void
+ ];
+ testHaskellDepends = [
+ aeson base containers contravariant dotenv hspec hspec-discover
+ multiset postgresql-simple product-profunctors profunctors
+ QuickCheck semigroups text time transformers uuid
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "An SQL-generating DSL targeting PostgreSQL";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"opaleye-classy" = callPackage
({ mkDerivation, base, bytestring, lens, mtl, opaleye
, postgresql-simple, product-profunctors, transformers
@@ -171766,14 +172676,103 @@ self: {
broken = true;
}) {};
+ "optics" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, criterion
+ , inspection-testing, lens, mtl, optics-core, optics-extra
+ , optics-th, random, tasty, tasty-hunit, template-haskell
+ , transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "optics";
+ version = "0.1";
+ sha256 = "1xkccyshhzbf8c7v1vi7cw4k1a1gfgw9yl2wfma4q36bv96qq2lk";
+ revision = "1";
+ editedCabalFile = "01hbhb642f596a8dwx6rxq53cqhf40vgr6c3xrbvs025by890mpi";
+ libraryHaskellDepends = [
+ array base containers mtl optics-core optics-extra optics-th
+ transformers
+ ];
+ testHaskellDepends = [
+ base containers inspection-testing mtl optics-core random tasty
+ tasty-hunit template-haskell
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring containers criterion lens transformers
+ unordered-containers vector
+ ];
+ description = "Optics as an abstract interface";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "optics-core" = callPackage
+ ({ mkDerivation, array, base, containers, transformers }:
+ mkDerivation {
+ pname = "optics-core";
+ version = "0.1";
+ sha256 = "0vyvvjlqps0sa03rxp0p2v9vjllff53adn3y6qfwrpc08kxwh7q1";
+ libraryHaskellDepends = [ array base containers transformers ];
+ description = "Optics as an abstract interface: core definitions";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "optics-extra" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, hashable, mtl
+ , optics-core, text, transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "optics-extra";
+ version = "0.1";
+ sha256 = "1z0blxm9gxbzqxxcm9bkj8jvf9apgn8abh0wdc4f220rs32c3v7g";
+ revision = "1";
+ editedCabalFile = "03n8pk423ckyk5rz8z8x9g0amxqpd75lsr90bjsjcp16qak4zjc7";
+ libraryHaskellDepends = [
+ array base bytestring containers hashable mtl optics-core text
+ transformers unordered-containers vector
+ ];
+ description = "Extra utilities and instances for optics-core";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "optics-th" = callPackage
+ ({ mkDerivation, base, containers, mtl, optics-core
+ , template-haskell, th-abstraction, transformers
+ }:
+ mkDerivation {
+ pname = "optics-th";
+ version = "0.1";
+ sha256 = "1fqaxp7divk2wj7mvnsyzclly99l895dss1ssk6dzfgdijjjipk6";
+ revision = "2";
+ editedCabalFile = "1m5wcl6h83hhiyic7khw6lylmb4rvbaskvpssrd52b2a73gpzm69";
+ libraryHaskellDepends = [
+ base containers mtl optics-core template-haskell th-abstraction
+ transformers
+ ];
+ testHaskellDepends = [ base optics-core ];
+ description = "Optics construction using TemplateHaskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "optics-vl" = callPackage
+ ({ mkDerivation, base, optics-core, profunctors }:
+ mkDerivation {
+ pname = "optics-vl";
+ version = "0.1";
+ sha256 = "03khw0aqv7wdlym5maasm1l20gj4y1jzci89y592hx3y07mzvapl";
+ revision = "1";
+ editedCabalFile = "06x99059qi5qhsq7cql2l0pk0d1kh8is320xsnxw6qjp2c4hild2";
+ libraryHaskellDepends = [ base optics-core profunctors ];
+ description = "Utilities for compatibility with van Laarhoven optics";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"optima" = callPackage
({ mkDerivation, attoparsec, attoparsec-data, base
, optparse-applicative, rerebase, text, text-builder
}:
mkDerivation {
pname = "optima";
- version = "0.3.0.3";
- sha256 = "1m6lbwy5y8nmgadqx6lax1laqgs90gbg9waffbd962n2xscbwbww";
+ version = "0.4";
+ sha256 = "0ryrz9739g1zql9ldll2ilfiyazgz5xixk31wajdqz0xdzqg3bbl";
libraryHaskellDepends = [
attoparsec attoparsec-data base optparse-applicative text
text-builder
@@ -172004,8 +173003,8 @@ self: {
pname = "optparse-generic";
version = "1.3.0";
sha256 = "13rr3hq26dpmbami8vb6d1ig9ywk6jia22sp5dkp6jkfc1c9k4l0";
- revision = "2";
- editedCabalFile = "1ldkzq0g70y2w69ywg2d5agrd74y7c4iblg3yflyvmzifr11d1ls";
+ revision = "3";
+ editedCabalFile = "0vszcjmxywblx5z9yvrz8c6yc104jgr1nv0sbv58ansd3rkjlzfn";
libraryHaskellDepends = [
base bytestring Only optparse-applicative semigroups
system-filepath text time transformers void
@@ -172240,6 +173239,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "orderly-workers" = callPackage
+ ({ mkDerivation, base, stm }:
+ mkDerivation {
+ pname = "orderly-workers";
+ version = "0.1.0.2";
+ sha256 = "0w032z05yxl7zqdganxvd8rklzli5k8bya2648hk8scl51q98390";
+ libraryHaskellDepends = [ base stm ];
+ description = "Fork concurrent worker threads and produce ordered results";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"orders" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -172714,6 +173724,27 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "overloaded" = callPackage
+ ({ mkDerivation, base, bytestring, containers, fin, generic-lens
+ , ghc, HUnit, lens, sop-core, split, syb, symbols, tasty
+ , tasty-hunit, text, vec
+ }:
+ mkDerivation {
+ pname = "overloaded";
+ version = "0.1";
+ sha256 = "0sb910gk8z3a97vqk9naa079sm84p24jh2jgm39lxagwhmz72w6a";
+ libraryHaskellDepends = [
+ base bytestring containers fin ghc sop-core split syb symbols text
+ vec
+ ];
+ testHaskellDepends = [
+ base bytestring containers fin generic-lens HUnit lens sop-core
+ symbols tasty tasty-hunit text vec
+ ];
+ description = "Overloaded pragmas as a plugin";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"overloaded-records" = callPackage
({ mkDerivation, base, data-default-class, HUnit, template-haskell
, test-framework, test-framework-hunit
@@ -173660,6 +174691,8 @@ self: {
];
description = "Pandoc filter to include CSV files";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"pandoc-plantuml-diagrams" = callPackage
@@ -173960,58 +174993,6 @@ self: {
}) {};
"pantry" = callPackage
- ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans
- , base64-bytestring, bytestring, Cabal, conduit, conduit-extra
- , containers, contravariant, cryptonite, cryptonite-conduit
- , deepseq, digest, directory, exceptions, filelock, filepath
- , generic-deriving, ghc-prim, hackage-security, hashable, hedgehog
- , hpack, hspec, http-client, http-client-tls, http-conduit
- , http-download, http-types, integer-gmp, memory, mono-traversable
- , mtl, network, network-uri, path, path-io, persistent
- , persistent-sqlite, persistent-template, primitive, QuickCheck
- , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint
- , safe, syb, tar-conduit, template-haskell, text, text-metrics
- , th-lift, th-lift-instances, th-orphans, th-reify-many
- , th-utilities, time, transformers, unix-compat, unliftio
- , unordered-containers, vector, yaml, zip-archive
- }:
- mkDerivation {
- pname = "pantry";
- version = "0.1.1.1";
- sha256 = "082p2shapgnv10qjm77bpn0y6p6582n38xcgirh2l8mhs1yqflyg";
- libraryHaskellDepends = [
- aeson ansi-terminal array base base-orphans base64-bytestring
- bytestring Cabal conduit conduit-extra containers contravariant
- cryptonite cryptonite-conduit deepseq digest directory filelock
- filepath generic-deriving ghc-prim hackage-security hashable hpack
- http-client http-client-tls http-conduit http-download http-types
- integer-gmp memory mono-traversable mtl network network-uri path
- path-io persistent persistent-sqlite persistent-template primitive
- resourcet rio rio-orphans rio-prettyprint safe syb tar-conduit
- template-haskell text text-metrics th-lift th-lift-instances
- th-orphans th-reify-many th-utilities time transformers unix-compat
- unliftio unordered-containers vector yaml zip-archive
- ];
- testHaskellDepends = [
- aeson ansi-terminal array base base-orphans base64-bytestring
- bytestring Cabal conduit conduit-extra containers contravariant
- cryptonite cryptonite-conduit deepseq digest directory exceptions
- filelock filepath generic-deriving ghc-prim hackage-security
- hashable hedgehog hpack hspec http-client http-client-tls
- http-conduit http-download http-types integer-gmp memory
- mono-traversable mtl network network-uri path path-io persistent
- persistent-sqlite persistent-template primitive QuickCheck
- raw-strings-qq resourcet rio rio-orphans rio-prettyprint safe syb
- tar-conduit template-haskell text text-metrics th-lift
- th-lift-instances th-orphans th-reify-many th-utilities time
- transformers unix-compat unliftio unordered-containers vector yaml
- zip-archive
- ];
- description = "Content addressable Haskell package management";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "pantry_0_1_1_2" = callPackage
({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans
, base64-bytestring, bytestring, Cabal, conduit, conduit-extra
, containers, contravariant, cryptonite, cryptonite-conduit
@@ -174061,7 +175042,6 @@ self: {
];
description = "Content addressable Haskell package management";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pantry-tmp" = callPackage
@@ -174620,6 +175600,8 @@ self: {
pname = "parallel";
version = "3.2.2.0";
sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p";
+ revision = "1";
+ editedCabalFile = "0a3kn7arck8f2gwm8cwfkplsw4q9v9j6ifbhj1l3bmclmkwcckcj";
libraryHaskellDepends = [ array base containers deepseq ghc-prim ];
description = "Parallel programming library";
license = stdenv.lib.licenses.bsd3;
@@ -175769,8 +176751,8 @@ self: {
}:
mkDerivation {
pname = "patat";
- version = "0.8.2.5";
- sha256 = "1hss18gb71xrjgncjr4g5935k7kcwxpxxb6j52i32ans43xavhiv";
+ version = "0.8.3.0";
+ sha256 = "1dldaqa1qbwdia6rcf0sb6bnqldcpgrimd3yx00idyjy0msl0xh6";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -177497,8 +178479,8 @@ self: {
pname = "persistent";
version = "2.7.3.1";
sha256 = "1jbvavdvr9qz5ld7vf6l1jgiadhmxx6zc4vqsdk9ivfq6d5wlg1p";
- revision = "1";
- editedCabalFile = "17kdzvhakjqkif1xxrbgh1lwjd0sfd0ikl1jxrjn4il16jy7gazz";
+ revision = "2";
+ editedCabalFile = "0yccajc9j8vih4slpm28dfz2ib1phalbvg7qci78d6vsz1jjilhp";
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring blaze-html blaze-markup
bytestring conduit containers exceptions fast-logger
@@ -177532,6 +178514,8 @@ self: {
pname = "persistent";
version = "2.9.2";
sha256 = "1wsa3kn427v88a6r0vwr6mz23snik2krbsgc8zqp18xajqn5szj9";
+ revision = "1";
+ editedCabalFile = "1v6ll8aggz6gvz53mzfrnb4jsc25dspk39x3vcxpzqkdp8rgz1am";
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring blaze-html blaze-markup
bytestring conduit containers fast-logger http-api-data
@@ -177562,6 +178546,8 @@ self: {
pname = "persistent";
version = "2.10.1";
sha256 = "1wwka7pxyym12hcvf45qr15n3ig9zyz5y2wl30vgcvwnhawmrsbg";
+ revision = "1";
+ editedCabalFile = "0b2ahki4wqb071rb329mz92gv8xnk0n8m1c39apcdq0pfqfx0a2z";
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring blaze-html bytestring
conduit containers fast-logger http-api-data monad-logger mtl
@@ -178630,8 +179616,8 @@ self: {
}:
mkDerivation {
pname = "pg-transact";
- version = "0.1.0.1";
- sha256 = "0zf9mfhpknaa0vggv60gpkfr0ak51n1xbw5lfqx8l8p1kqv3d0jr";
+ version = "0.1.2.0";
+ sha256 = "1xgma50c4pvvb9h2wksx8wl4sf0625ngbsb2c828xd0aqj171qmj";
libraryHaskellDepends = [
base bytestring exceptions monad-control postgresql-simple
transformers
@@ -178647,6 +179633,30 @@ self: {
broken = true;
}) {};
+ "pg-transact_0_2_0_1" = callPackage
+ ({ mkDerivation, base, bytestring, exceptions, hspec
+ , hspec-discover, hspec-expectations-lifted, monad-control
+ , postgresql-simple, tmp-postgres, transformers
+ }:
+ mkDerivation {
+ pname = "pg-transact";
+ version = "0.2.0.1";
+ sha256 = "1abv2h52x624wsrm8lhafsjdsmldghqjksww12b0g119msbsbdq9";
+ libraryHaskellDepends = [
+ base bytestring exceptions monad-control postgresql-simple
+ transformers
+ ];
+ testHaskellDepends = [
+ base bytestring exceptions hspec hspec-discover
+ hspec-expectations-lifted postgresql-simple tmp-postgres
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Another postgresql-simple transaction monad";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"pgdl" = callPackage
({ mkDerivation, base, binary, brick, bytestring, Cabal, conduit
, conduit-extra, configurator, containers, directory
@@ -179657,29 +180667,6 @@ self: {
}) {};
"pipes" = callPackage
- ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
- , optparse-applicative, QuickCheck, semigroups, test-framework
- , test-framework-quickcheck2, transformers, void
- }:
- mkDerivation {
- pname = "pipes";
- version = "4.3.11";
- sha256 = "0h70djd6x306rci8zp356klqj6376xry6mkhyr12301adfhag8vv";
- libraryHaskellDepends = [
- base exceptions mmorph mtl semigroups transformers void
- ];
- testHaskellDepends = [
- base mtl QuickCheck test-framework test-framework-quickcheck2
- transformers
- ];
- benchmarkHaskellDepends = [
- base criterion mtl optparse-applicative transformers
- ];
- description = "Compositional pipelines";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "pipes_4_3_12" = callPackage
({ mkDerivation, base, criterion, exceptions, mmorph, mtl
, optparse-applicative, QuickCheck, semigroups, test-framework
, test-framework-quickcheck2, transformers, void
@@ -179700,7 +180687,6 @@ self: {
];
description = "Compositional pipelines";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pipes-aeson" = callPackage
@@ -180154,6 +181140,8 @@ self: {
pname = "pipes-extras";
version = "1.0.15";
sha256 = "1cyb05bv5xkarab3090ikpjiqm79lr46n3nalplliz8jr4x67a82";
+ revision = "1";
+ editedCabalFile = "0xrd5zwkr1c7lswzi91gxl3ndra8y9g2b4j00sszyy3w187a2zwi";
libraryHaskellDepends = [ base foldl lens pipes transformers ];
testHaskellDepends = [
base HUnit pipes test-framework test-framework-hunit transformers
@@ -180464,13 +181452,13 @@ self: {
}) {};
"pipes-ordered-zip" = callPackage
- ({ mkDerivation, base, foldl, pipes }:
+ ({ mkDerivation, base, foldl, hspec, pipes, pipes-safe }:
mkDerivation {
pname = "pipes-ordered-zip";
- version = "1.0.1";
- sha256 = "10ywi5ykp398mghc3mvcy2alz1lp6kah0yxmn5pz1l6nbsv7wyk5";
- libraryHaskellDepends = [ base pipes ];
- testHaskellDepends = [ base foldl pipes ];
+ version = "1.1.0";
+ sha256 = "1fs0qyhc4a7xnglxl7b1d615s9ajml6pvch337ivny31cxrngcsa";
+ libraryHaskellDepends = [ base pipes pipes-safe ];
+ testHaskellDepends = [ base foldl hspec pipes pipes-safe ];
description = "merge two ordered Producers into a new Producer";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -180623,10 +181611,8 @@ self: {
}:
mkDerivation {
pname = "pipes-safe";
- version = "2.3.1";
- sha256 = "0dfdd3fccfd7wfn5228hbfj3h10xq01sddpy1v2ds63wlg84kwly";
- revision = "1";
- editedCabalFile = "0qyx585dvyvnpkb6hmdml4ndl8sk0d1z747d40gfr0m7c320wjzm";
+ version = "2.3.2";
+ sha256 = "10m6f52nahxwnl2zvgnbilllcvd3lpi0dxl3j6fk20lryjzmhyqc";
libraryHaskellDepends = [
base containers exceptions monad-control mtl pipes primitive
transformers transformers-base
@@ -181351,6 +182337,8 @@ self: {
];
description = "run a subprocess, combining stdout and stderr";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"plist" = callPackage
@@ -181630,14 +182618,15 @@ self: {
"plugins" = callPackage
({ mkDerivation, array, base, Cabal, containers, directory
, filepath, ghc, ghc-paths, ghc-prim, haskell-src, process, random
+ , split
}:
mkDerivation {
pname = "plugins";
- version = "1.5.7";
- sha256 = "1l9ymnsxvgjp7p2j5mvyygrsg7qf2yam1k4y3gz8s2l6kl78ri5f";
+ version = "1.6.0";
+ sha256 = "0wbmvcb2j4qi29yrmvjfhdf8251lam5yiqshk9gf6dlprz2kvww1";
libraryHaskellDepends = [
array base Cabal containers directory filepath ghc ghc-paths
- ghc-prim haskell-src process random
+ ghc-prim haskell-src process random split
];
description = "Dynamic linking for Haskell and C objects";
license = stdenv.lib.licenses.bsd3;
@@ -181948,8 +182937,8 @@ self: {
}:
mkDerivation {
pname = "pointfree-fancy";
- version = "1.1.1.13";
- sha256 = "0f761h5a8byfpkf8nby4wkhra64qv7fzs3rx6gf4v07w9b2s5ph8";
+ version = "1.1.1.14";
+ sha256 = "08b2dslkblxch8k6wlc6xx50lva8abdkdwibgfxdj2yw4mgdnhry";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -182397,7 +183386,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "polysemy_1_1_0_0" = callPackage
+ "polysemy_1_2_0_0" = callPackage
({ mkDerivation, async, base, containers, criterion, doctest
, first-class-families, free, freer-simple, hspec, hspec-discover
, inspection-testing, mtl, stm, syb, template-haskell
@@ -182406,8 +183395,8 @@ self: {
}:
mkDerivation {
pname = "polysemy";
- version = "1.1.0.0";
- sha256 = "1slc177ygphiaaxr301nmn47q7jl71rmzcw8h9q7az2s2f3gy83p";
+ version = "1.2.0.0";
+ sha256 = "14cl4h78vhi83c3ccz3hy1cbh21a7ry7n5z2i7m3zm2cyj4sbw4q";
libraryHaskellDepends = [
async base containers first-class-families mtl stm syb
template-haskell th-abstraction transformers type-errors
@@ -182459,8 +183448,8 @@ self: {
}:
mkDerivation {
pname = "polysemy-plugin";
- version = "0.2.2.0";
- sha256 = "1z8dyhcg2r9vb8m93khjzvmzc3lk7zaj64yjjdsnjmzzv13k8hl5";
+ version = "0.2.3.0";
+ sha256 = "1icaxdw2670svhns5g40d1kzxxx3yhcza660a0csdh83f3jzjy2w";
libraryHaskellDepends = [
base containers ghc ghc-tcplugins-extra polysemy syb transformers
];
@@ -182499,6 +183488,32 @@ self: {
broken = true;
}) {};
+ "polysemy-zoo_0_6_0_0" = callPackage
+ ({ mkDerivation, async, base, binary, bytestring, constraints
+ , containers, contravariant, ghc-prim, hedis, hspec, hspec-discover
+ , mtl, polysemy, polysemy-plugin, random, reflection, transformers
+ }:
+ mkDerivation {
+ pname = "polysemy-zoo";
+ version = "0.6.0.0";
+ sha256 = "1d8h1hmq59b4igxdym83rd4ggcq45jb5zb0sdyvacqiicy5rnzhz";
+ libraryHaskellDepends = [
+ async base binary bytestring constraints containers contravariant
+ ghc-prim hedis mtl polysemy polysemy-plugin random reflection
+ transformers
+ ];
+ testHaskellDepends = [
+ async base binary bytestring constraints containers contravariant
+ ghc-prim hedis hspec mtl polysemy polysemy-plugin random reflection
+ transformers
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Experimental, user-contributed effects and interpreters for polysemy";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"polyseq" = callPackage
({ mkDerivation, array, base, bytestring, cgi, containers
, free-theorems, haskell-src, mtl, network, old-locale, old-time
@@ -183260,12 +184275,12 @@ self: {
}) {};
"postgres-options" = callPackage
- ({ mkDerivation, base }:
+ ({ mkDerivation, base, bytestring }:
mkDerivation {
pname = "postgres-options";
- version = "0.1.0.0";
- sha256 = "17a2w4fb85mp9v1rghgkm0cvgzxvvahcvfi3vmlzrdqhlsm0si7c";
- libraryHaskellDepends = [ base ];
+ version = "0.1.0.1";
+ sha256 = "0pysvgg2p032j5a9qdysbndy0a0fzm41zgv070cwqk199w1lh3h7";
+ libraryHaskellDepends = [ base bytestring ];
description = "An Options type representing options for postgres connections";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -183674,8 +184689,8 @@ self: {
}:
mkDerivation {
pname = "postgresql-simple-named";
- version = "0.0.1.0";
- sha256 = "1lp7bq7w3l127cb4js3gmmp8c9nvxabs64c200c73lqg5mw9fkfp";
+ version = "0.0.2.0";
+ sha256 = "1bk6r67jy533zskwmg251vlb2imzyh60hx9lwag2rqclgb7fgplr";
libraryHaskellDepends = [
base bytestring mtl postgresql-simple text
];
@@ -183692,23 +184707,25 @@ self: {
"postgresql-simple-opts" = callPackage
({ mkDerivation, base, bytestring, data-default, either
, generic-deriving, hspec, optparse-applicative, optparse-generic
- , postgresql-simple, split, uri-bytestring
+ , postgres-options, postgresql-simple, split, uri-bytestring
}:
mkDerivation {
pname = "postgresql-simple-opts";
- version = "0.3.0.1";
- sha256 = "19jhrz2lghiycb81dzzz5g2kwzaahn27q7diw6nn9qmcpwgw3rly";
+ version = "0.4.0.0";
+ sha256 = "0zrmqd25xni2d51jna2a52l3bmdn6lpx9mbjzllnf6zn6ckw4ja8";
libraryHaskellDepends = [
base bytestring data-default either generic-deriving
- optparse-applicative optparse-generic postgresql-simple split
- uri-bytestring
+ optparse-applicative optparse-generic postgres-options
+ postgresql-simple split uri-bytestring
];
testHaskellDepends = [
base bytestring data-default hspec optparse-applicative
- postgresql-simple
+ postgres-options postgresql-simple
];
description = "An optparse-applicative parser for postgresql-simple's connection options";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"postgresql-simple-queue" = callPackage
@@ -184019,8 +185036,8 @@ self: {
pname = "postmaster";
version = "0.3.3";
sha256 = "05608xvaig1d67j3h8ykw7a11yr1mqkw98p0ii7gbp4mp3d9kncd";
- revision = "1";
- editedCabalFile = "00rp6mdds4kssvcyc9n6iz1asgkhv96050x50jwvg3wp3pp69fg2";
+ revision = "2";
+ editedCabalFile = "0jchzy502czxfm34v9b1jyfzzaiphvfqm5vdk9fz9d0vhqwr7jjg";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -185274,6 +186291,8 @@ self: {
pname = "prettyprinter";
version = "1.2.1.1";
sha256 = "1p9c3q55hba4c0zyxc624g5df7wgsclpsmd8wqpdnmib882q9d1v";
+ revision = "1";
+ editedCabalFile = "0p3qvc1fr2ayxq5s7ysm80nl6107xfkv27p3mcripffq1lqvmlma";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base text ];
@@ -185299,6 +186318,8 @@ self: {
pname = "prettyprinter";
version = "1.3.0";
sha256 = "1dc43z53s8pbrv6wf2mq6zvggd67lk415zqg8q9bcd1ld5m9h2x4";
+ revision = "1";
+ editedCabalFile = "0i5m6x3xsph343w2902xvv91l1raak4nz4q1py7vf95p0hbb72qq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base text ];
@@ -186447,8 +187468,8 @@ self: {
pname = "product-profunctors";
version = "0.10.0.0";
sha256 = "0s0ssl2900r16992mgl0idkryg3l7psp8nljyg9brr7fqa3pd3dd";
- revision = "2";
- editedCabalFile = "0sarkc9sch60f5j1xjy30yrgycvmp5bqx1iynmlsfzdx7rvk5s29";
+ revision = "3";
+ editedCabalFile = "09czbjfn7kwg18726401dhlpkd5gibkk96wzczn9lngpl730jhm9";
libraryHaskellDepends = [
base bifunctors contravariant profunctors tagged template-haskell
];
@@ -186592,14 +187613,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "profunctors_5_4" = callPackage
+ "profunctors_5_5" = callPackage
({ mkDerivation, base, base-orphans, bifunctors, comonad
, contravariant, distributive, tagged, transformers
}:
mkDerivation {
pname = "profunctors";
- version = "5.4";
- sha256 = "1b5hidvd3rd8ilzr5ipzw0mg0a2x0ldrrcx6bacalafg7407bfhh";
+ version = "5.5";
+ sha256 = "0z7kf8hkfk5wfxw80zs9jsh22mk3mjzfvqbdkihrw1wiyw4xkjfl";
libraryHaskellDepends = [
base base-orphans bifunctors comonad contravariant distributive
tagged transformers
@@ -188537,8 +189558,8 @@ self: {
}:
mkDerivation {
pname = "pure-zlib";
- version = "0.6.4";
- sha256 = "05rhvhvdn8ly5jldxg3q7ip6zflzqa1wyj8mlcl0scgsngn9lrzb";
+ version = "0.6.6";
+ sha256 = "1fby7dj8yp8yqycxzl1dr4s6i0isnx24zxbcan672wwrhdxh9s6y";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -190163,6 +191184,8 @@ self: {
pname = "quickcheck-classes";
version = "0.6.3.0";
sha256 = "0rbrxs79naffzp809523452xprh7z33j6p256qs0cnni9v9zfgjf";
+ revision = "1";
+ editedCabalFile = "1qm6zfmhil1wn1972hfdsvxlgzgps0ip8vdlgz3fz5a048l29ahq";
libraryHaskellDepends = [
aeson base base-orphans bifunctors containers contravariant fail
primitive primitive-addr QuickCheck quickcheck-classes-base
@@ -190227,8 +191250,8 @@ self: {
pname = "quickcheck-instances";
version = "0.3.22";
sha256 = "14asr9r7da3w7p4hjj51w2yb002nz8x0np8hdz9z4yjvi60vyrax";
- revision = "1";
- editedCabalFile = "1ln7zp6rx7ya7iwcbh8m1s1y1pdh28f64nga74f2lszmpmmd512w";
+ revision = "2";
+ editedCabalFile = "1ia5fjhpg7rz793552v88gv2iqx7hl9mi2g09m0llasy1cpzc9jr";
libraryHaskellDepends = [
array base base-compat bytestring case-insensitive containers
hashable old-time QuickCheck scientific splitmix tagged text time
@@ -192414,8 +193437,8 @@ self: {
}:
mkDerivation {
pname = "rattletrap";
- version = "9.0.1";
- sha256 = "0b6w0zb5vzm0zp5lv00n599dqsqmvxbm96zdlnw4y9gx579qxpc6";
+ version = "9.0.2";
+ sha256 = "14dnnaii24c9vh4jvdymnnhrhvgwzfr6al4qcm4bj9wk55jgj71r";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -193451,8 +194474,8 @@ self: {
}:
mkDerivation {
pname = "reanimate-svg";
- version = "0.9.0.0";
- sha256 = "0x4d06vsxz3845w05d4qnfbmws2bc7vxpny8hiqbv1wwgjwig327";
+ version = "0.9.1.0";
+ sha256 = "1hiinaz8swlg1lzm5narlwmkzqjxym4k3qn5izyhjjhx4ch0avr4";
libraryHaskellDepends = [
attoparsec base bytestring containers JuicyPixels lens linear mtl
scientific text transformers vector xml
@@ -193464,6 +194487,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "reanimate-svg_0_9_1_1" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers, hspec
+ , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text
+ , transformers, vector, xml
+ }:
+ mkDerivation {
+ pname = "reanimate-svg";
+ version = "0.9.1.1";
+ sha256 = "1y2q6nljgs4h05ga0v713z5bcjd8xrxvg6sf81di65rhdkksidx7";
+ libraryHaskellDepends = [
+ attoparsec base bytestring containers JuicyPixels lens linear mtl
+ scientific text transformers vector xml
+ ];
+ testHaskellDepends = [
+ attoparsec base hspec linear scientific svg-tree
+ ];
+ description = "SVG file loader and serializer";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"reason-export" = callPackage
({ mkDerivation, base, bytestring, containers, Diff, directory
, formatting, hashable, hspec, hspec-core, HUnit, mtl, QuickCheck
@@ -193854,8 +194898,8 @@ self: {
}:
mkDerivation {
pname = "red-black-record";
- version = "2.0.4.0";
- sha256 = "1wcg8a3aql1jmnfl7q5gzjgxl4z6780zgp8w10v3g52ilcdq4myn";
+ version = "2.1.0.2";
+ sha256 = "0xfvvhdqnhialxf13xw894mpsf8xj8jig5zipqj1hh6galb0b164";
libraryHaskellDepends = [ base sop-core ];
testHaskellDepends = [
aeson base bytestring doctest profunctors sop-core tasty
@@ -194326,19 +195370,6 @@ self: {
}) {};
"reflection" = callPackage
- ({ mkDerivation, base, template-haskell }:
- mkDerivation {
- pname = "reflection";
- version = "2.1.4";
- sha256 = "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj";
- revision = "1";
- editedCabalFile = "05ibi4ivvh87d96xl09yh0day08p5www5vp568mvn2dp37rxyngc";
- libraryHaskellDepends = [ base template-haskell ];
- description = "Reifies arbitrary terms into types that can be reflected back into terms";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "reflection_2_1_5" = callPackage
({ mkDerivation, base, hspec, hspec-discover, QuickCheck
, template-haskell
}:
@@ -194351,7 +195382,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Reifies arbitrary terms into types that can be reflected back into terms";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"reflection-extras" = callPackage
@@ -194750,18 +195780,19 @@ self: {
"reflex-vty" = callPackage
({ mkDerivation, base, bimap, containers, data-default
, dependent-map, dependent-sum, exception-transformers, mtl
- , primitive, ref-tf, reflex, stm, text, time, transformers, vty
+ , primitive, ref-tf, reflex, stm, text, text-icu, time
+ , transformers, vty
}:
mkDerivation {
pname = "reflex-vty";
- version = "0.1.1.1";
- sha256 = "1qhmpdfwavr4vip39p1ih3hz0yb1b308g3m24w80n3zw7xqnqz6j";
+ version = "0.1.2.0";
+ sha256 = "0g28vv0p5p9z7zrh8w5n0xkardg8kcpadqz7hs52y0xz68fi0akh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bimap containers data-default dependent-map dependent-sum
- exception-transformers mtl primitive ref-tf reflex stm text time
- transformers vty
+ exception-transformers mtl primitive ref-tf reflex stm text
+ text-icu time transformers vty
];
executableHaskellDepends = [
base containers reflex text time transformers vty
@@ -194965,8 +195996,8 @@ self: {
pname = "regex-applicative-text";
version = "0.1.0.1";
sha256 = "1ng2qhk4mvpzl8fx91ig7ldv09v9aqdsvn6yl9yjapc6h0ghb4xh";
- revision = "3";
- editedCabalFile = "1h911harqgfgkhdr22cndj2fdsl48sqhn8q0akgjngpf3p8z0bvv";
+ revision = "4";
+ editedCabalFile = "0ykzppl1v6k70idjl73m4w161f6lsax89v1gp100y4xgipf3yijj";
libraryHaskellDepends = [ base regex-applicative text ];
description = "regex-applicative on text";
license = stdenv.lib.licenses.bsd3;
@@ -195032,6 +196063,8 @@ self: {
pname = "regex-dfa";
version = "0.91";
sha256 = "1f846d86wg7yha29qinchpi3r5gv9795f384pqahbyc13wfky7dp";
+ revision = "1";
+ editedCabalFile = "089gzj8yih2f4ijyk9c49zyq6cws68z2rnklhiww9f3nb75lg6a9";
libraryHaskellDepends = [ base mtl parsec regex-base ];
description = "Replaces/Enhances Text.Regex";
license = stdenv.lib.licenses.bsd3;
@@ -195154,6 +196187,8 @@ self: {
pname = "regex-parsec";
version = "0.90";
sha256 = "0zf5cr10mxlxxd8fp4q4ix6ibxc5xx3ml3k043kx28f9vfdh2xnx";
+ revision = "1";
+ editedCabalFile = "19y0kgmqpcz4k0l3cfjbxirq844zqm71gaz7117pm399x8bz1df7";
libraryHaskellDepends = [ base parsec regex-base ];
description = "Replaces/Enhances Text.Regex";
license = stdenv.lib.licenses.bsd3;
@@ -195371,6 +196406,8 @@ self: {
pname = "regex-tre";
version = "0.91";
sha256 = "1b7x0y8q1fvipnzh06by48f8l9l5ypm6yblpl35fzf641z3m9b7j";
+ revision = "1";
+ editedCabalFile = "1xxxn1i6pgmba4p15hjw8achaiy4lfbib9gl0xz9z0jz9fmvfdab";
libraryHaskellDepends = [ base regex-base ];
librarySystemDepends = [ tre ];
description = "Replaces/Enhances Text.Regex";
@@ -196025,6 +197062,23 @@ self: {
broken = true;
}) {};
+ "releaser" = callPackage
+ ({ mkDerivation, base, Cabal, pretty-terminal, process, regex-pcre
+ }:
+ mkDerivation {
+ pname = "releaser";
+ version = "0.1.0.0";
+ sha256 = "04icyx42ya7l4h5923yji0170c3xl0gg9lvcmswh7lmrg8x9gvip";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base Cabal pretty-terminal process regex-pcre
+ ];
+ executableHaskellDepends = [ base ];
+ description = "Automation of Haskell package release process";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"relevant-time" = callPackage
({ mkDerivation, aeson, base, chronos, text, torsor }:
mkDerivation {
@@ -196715,16 +197769,40 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "replace-attoparsec" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, Cabal, criterion
+ , parsers, text
+ }:
+ mkDerivation {
+ pname = "replace-attoparsec";
+ version = "1.0.0.0";
+ sha256 = "0cyaqdlhjmpmw51h8k93gi21d1wkyajd2zyzfk787kg8hby0hkzi";
+ libraryHaskellDepends = [ attoparsec base bytestring text ];
+ testHaskellDepends = [
+ attoparsec base bytestring Cabal parsers text
+ ];
+ benchmarkHaskellDepends = [
+ attoparsec base bytestring criterion text
+ ];
+ description = "Stream editing with Attoparsec";
+ license = stdenv.lib.licenses.bsd2;
+ }) {};
+
"replace-megaparsec" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }:
+ ({ mkDerivation, base, bytestring, Cabal, criterion, megaparsec
+ , text
+ }:
mkDerivation {
pname = "replace-megaparsec";
- version = "1.0.1.0";
- sha256 = "18aipcrmic0xgfjg1cia6zs7m5a9xq7srm1r713qxri9pm5ynqd6";
+ version = "1.1.2.0";
+ sha256 = "154abc29xhc8qz3ilzrpnjn3a43rbiq7b60k4agv7zmsllihb0kk";
libraryHaskellDepends = [ base megaparsec ];
testHaskellDepends = [ base bytestring Cabal megaparsec text ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion megaparsec text
+ ];
description = "Stream editing with parsers";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.bsd2;
}) {};
"replica" = callPackage
@@ -198680,31 +199758,6 @@ self: {
}) {};
"rio" = callPackage
- ({ mkDerivation, base, bytestring, containers, deepseq, directory
- , exceptions, filepath, hashable, hspec, microlens, mtl, primitive
- , process, QuickCheck, text, time, typed-process, unix, unliftio
- , unliftio-core, unordered-containers, vector
- }:
- mkDerivation {
- pname = "rio";
- version = "0.1.11.0";
- sha256 = "17p3zr1fncwqc1rz181mfbxi9dlyd2cd8xcxhnxm3fgnq6i9cj4l";
- libraryHaskellDepends = [
- base bytestring containers deepseq directory exceptions filepath
- hashable microlens mtl primitive process text time typed-process
- unix unliftio unliftio-core unordered-containers vector
- ];
- testHaskellDepends = [
- base bytestring containers deepseq directory exceptions filepath
- hashable hspec microlens mtl primitive process QuickCheck text time
- typed-process unix unliftio unliftio-core unordered-containers
- vector
- ];
- description = "A standard library for Haskell";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "rio_0_1_12_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, exceptions, filepath, hashable, hspec, microlens, mtl, primitive
, process, QuickCheck, text, time, typed-process, unix, unliftio
@@ -198727,7 +199780,6 @@ self: {
];
description = "A standard library for Haskell";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"rio-orphans" = callPackage
@@ -199535,15 +200587,16 @@ self: {
"ron" = callPackage
({ mkDerivation, aeson, attoparsec, base, binary, bytestring
, containers, criterion, deepseq, hashable, integer-gmp, mtl
- , scientific, template-haskell, text, time, unordered-containers
+ , scientific, template-haskell, text, time, transformers
+ , unordered-containers
}:
mkDerivation {
pname = "ron";
- version = "0.8";
- sha256 = "1j5agf0367ldn3jb1jwgi9x9r4sss4jb93j6sgw5w9yzgqj23i8w";
+ version = "0.9";
+ sha256 = "0brjqb6lrcs711g5aqw3d5nidikmvjyyps8hcifzwpjanq0l8cvg";
libraryHaskellDepends = [
aeson attoparsec base binary bytestring containers hashable
- integer-gmp mtl scientific template-haskell text time
+ integer-gmp mtl scientific template-haskell text time transformers
unordered-containers
];
benchmarkHaskellDepends = [ base criterion deepseq integer-gmp ];
@@ -199557,8 +200610,8 @@ self: {
}:
mkDerivation {
pname = "ron-rdt";
- version = "0.8";
- sha256 = "1k8xyxi5s3c1q45j51s7ssghqq5m5ka3hn29z4wb7inyzllz6ifx";
+ version = "0.9.1";
+ sha256 = "1kx858d3pyj2dlpznd9n0aw6yhkq4ac9789kkan9yi8mf0vdbn3i";
libraryHaskellDepends = [
base containers Diff hashable integer-gmp mtl ron text time
transformers unordered-containers
@@ -199574,8 +200627,8 @@ self: {
}:
mkDerivation {
pname = "ron-schema";
- version = "0.8";
- sha256 = "1hqf9wpiwckaj25ljfyfl6dkp53jg31x3wyryc0vwfdy269v8lfb";
+ version = "0.9.1";
+ sha256 = "0pw398dq30bq554yfc9c6x43ng3bv5qx7mdw18ira92zlf5yh3qc";
libraryHaskellDepends = [
base bytestring containers hedn integer-gmp megaparsec mtl ron
ron-rdt template-haskell text transformers
@@ -199587,15 +200640,15 @@ self: {
"ron-storage" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
, integer-gmp, mtl, network-info, ron, ron-rdt, stm, text
- , transformers
+ , tf-random, transformers
}:
mkDerivation {
pname = "ron-storage";
- version = "0.9";
- sha256 = "0bvmy5mya2v64cj3sxvr0mlfp4zc0xy4q33qr6hk3r6k5jwdfqwx";
+ version = "0.10.1";
+ sha256 = "1wck9d188kinfzmz7ff8vw39ff5garfy6nw0cwkr4k3qdvcajj1r";
libraryHaskellDepends = [
base bytestring containers directory filepath integer-gmp mtl
- network-info ron ron-rdt stm text transformers
+ network-info ron ron-rdt stm text tf-random transformers
];
description = "RON Storage";
license = stdenv.lib.licenses.bsd3;
@@ -199874,16 +200927,17 @@ self: {
"rounded" = callPackage
({ mkDerivation, base, ghc-prim, gmp, hgmp, long-double, mpfr
- , reflection, singletons
+ , reflection
}:
mkDerivation {
pname = "rounded";
- version = "0.1.0.1";
- sha256 = "04abl192vq1xq7kf9fackcb17wjyxw4068fsks3pxm9dd4iymgls";
+ version = "1.0";
+ sha256 = "1vwy8sc457bxq3x8wzfsr5v01lp38ynwg8hp97likkckd13vkh7v";
libraryHaskellDepends = [
- base ghc-prim hgmp long-double reflection singletons
+ base ghc-prim hgmp long-double reflection
];
librarySystemDepends = [ gmp mpfr ];
+ libraryPkgconfigDepends = [ mpfr ];
testHaskellDepends = [ base long-double ];
description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
license = stdenv.lib.licenses.bsd3;
@@ -200897,8 +201951,8 @@ self: {
pname = "safe-exceptions";
version = "0.1.7.0";
sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q";
- revision = "4";
- editedCabalFile = "0fid41gishzsyb47wzxhd5falandfirqcp760hcja81qjpfmqd32";
+ revision = "5";
+ editedCabalFile = "0yghh99yg24pzhzrflvgi4ip56ln7a56871pl3q70sm8rszy8vbr";
libraryHaskellDepends = [ base deepseq exceptions transformers ];
testHaskellDepends = [ base hspec void ];
description = "Safe, consistent, and easy exception handling";
@@ -201012,6 +202066,32 @@ self: {
broken = true;
}) {};
+ "safe-json_1_0_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, dlist
+ , generic-arbitrary, hashable, quickcheck-instances, scientific
+ , tasty, tasty-hunit, tasty-quickcheck, temporary, text, time
+ , unordered-containers, uuid, uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "safe-json";
+ version = "1.0.0";
+ sha256 = "0i5wryhfiqdqxgzzk9ywnlh4y8hvanrm2mqa0niavf4jgvkkfalh";
+ libraryHaskellDepends = [
+ aeson base bytestring containers dlist hashable scientific tasty
+ tasty-hunit tasty-quickcheck text time unordered-containers
+ uuid-types vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers dlist generic-arbitrary hashable
+ quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
+ temporary text time unordered-containers uuid uuid-types vector
+ ];
+ description = "Automatic JSON format versioning";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"safe-lazy-io" = callPackage
({ mkDerivation, base, extensible-exceptions, parallel, strict-io
}:
@@ -201442,48 +202522,16 @@ self: {
"salak" = callPackage
({ mkDerivation, base, bytestring, containers, criterion
, data-default, directory, dlist, exceptions, filepath, hashable
- , heaps, hspec, hspec-discover, megaparsec, menshen, mtl
- , QuickCheck, random, scientific, text, time, unliftio-core
- , unordered-containers
+ , heaps, hspec, hspec-discover, megaparsec, mtl, QuickCheck, random
+ , scientific, text, time, unliftio-core, unordered-containers
}:
mkDerivation {
pname = "salak";
- version = "0.3.5.1";
- sha256 = "0g41h9a89cp24cm99q1lgiyz794szf85hinybbjz75s33a3lykgv";
+ version = "0.3.5.3";
+ sha256 = "0k6z2vjxg6za6rfhx1xgjdck7ainnsbhrvzav2ngwpvy8li5g02b";
libraryHaskellDepends = [
base bytestring containers data-default directory dlist exceptions
- filepath hashable heaps megaparsec menshen mtl scientific text time
- unliftio-core unordered-containers
- ];
- testHaskellDepends = [
- base bytestring containers data-default directory dlist exceptions
- filepath hashable heaps hspec megaparsec menshen mtl QuickCheck
- random scientific text time unliftio-core unordered-containers
- ];
- testToolDepends = [ hspec-discover ];
- benchmarkHaskellDepends = [
- base bytestring containers criterion data-default directory dlist
- exceptions filepath hashable heaps megaparsec menshen mtl
- scientific text time unliftio-core unordered-containers
- ];
- description = "Configuration (re)Loader and Parser";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "salak_0_3_5_2" = callPackage
- ({ mkDerivation, base, bytestring, containers, criterion
- , data-default, directory, dlist, exceptions, filepath, hashable
- , heaps, hspec, hspec-discover, megaparsec, menshen, mtl
- , QuickCheck, random, scientific, text, time, unliftio-core
- , unordered-containers
- }:
- mkDerivation {
- pname = "salak";
- version = "0.3.5.2";
- sha256 = "1zz1dy3350amn9mbkmpysk4ykz8x40bmhrbbkbswrqf5kaa2d7xn";
- libraryHaskellDepends = [
- base bytestring containers data-default directory dlist exceptions
- filepath hashable heaps megaparsec menshen mtl scientific text time
+ filepath hashable heaps megaparsec mtl scientific text time
unliftio-core unordered-containers
];
testHaskellDepends = [
@@ -201496,7 +202544,6 @@ self: {
];
description = "Configuration (re)Loader and Parser";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"salak-toml" = callPackage
@@ -201505,8 +202552,8 @@ self: {
}:
mkDerivation {
pname = "salak-toml";
- version = "0.3.5.1";
- sha256 = "1clgsr1aqz2zfnsazhql6m125161yxbfp6q0lc4dllbvdhjygmrf";
+ version = "0.3.5.3";
+ sha256 = "18spk2m75inddz9k0pwg58cr61rfbw1fnki56nnq7jng0wii376y";
libraryHaskellDepends = [
base salak text time tomland unordered-containers
];
@@ -201529,8 +202576,8 @@ self: {
}:
mkDerivation {
pname = "salak-yaml";
- version = "0.3.5.1";
- sha256 = "1qzpbv2g7ds3dbcfi90ncjrk66vm1kxdkkdx1i49jq9g2xcai9n6";
+ version = "0.3.5.3";
+ sha256 = "07wcwld58bdr8n5fdfq98x6c1xdr8rrx919y4f9y7abdnc4aj000";
libraryHaskellDepends = [ base conduit libyaml salak text ];
testHaskellDepends = [
base conduit exceptions hspec libyaml mtl QuickCheck salak text
@@ -202216,6 +203263,35 @@ self: {
broken = true;
}) {inherit (pkgs) z3;};
+ "sbv_8_4" = callPackage
+ ({ mkDerivation, array, async, base, bytestring, containers
+ , crackNum, deepseq, directory, doctest, filepath, generic-deriving
+ , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb
+ , tasty, tasty-golden, tasty-hunit, tasty-quickcheck
+ , template-haskell, time, transformers, z3
+ }:
+ mkDerivation {
+ pname = "sbv";
+ version = "8.4";
+ sha256 = "0fv1l99zw29vsfgzym0qvb8qcy1jb7gkd1yj48vy1w0ayg9w01i0";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ array async base containers crackNum deepseq directory filepath
+ generic-deriving ghc mtl pretty process QuickCheck random syb
+ template-haskell time transformers
+ ];
+ testHaskellDepends = [
+ base bytestring containers crackNum directory doctest filepath Glob
+ hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit
+ tasty-quickcheck template-haskell
+ ];
+ testSystemDepends = [ z3 ];
+ description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {inherit (pkgs) z3;};
+
"sbvPlugin" = callPackage
({ mkDerivation, base, containers, directory, filepath, ghc
, ghc-prim, mtl, process, sbv, tasty, tasty-golden
@@ -202693,6 +203769,8 @@ self: {
];
description = "Work stealing scheduler";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"schedyield" = callPackage
@@ -203129,10 +204207,8 @@ self: {
}:
mkDerivation {
pname = "scotty";
- version = "0.11.4";
- sha256 = "13z0zmginaa1y5iywbbygvb9q3cmfgjkv6n2drs8gfbv3sirrf7i";
- revision = "1";
- editedCabalFile = "1kzp19ff7mh30y6mdqrxngyv7ph3rc95sahlnjzv9wj8j2fb66vn";
+ version = "0.11.5";
+ sha256 = "1pyj7j3zk80lv1c62ccna7nrsql5wf7pi5jscmypr2zd5xgfffvg";
libraryHaskellDepends = [
aeson base blaze-builder bytestring case-insensitive
data-default-class exceptions fail http-types monad-control mtl
@@ -204200,6 +205276,29 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {inherit (pkgs) secp256k1;};
+ "secp256k1-legacy" = callPackage
+ ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal
+ , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions
+ , test-framework, test-framework-hunit, test-framework-quickcheck2
+ }:
+ mkDerivation {
+ pname = "secp256k1-legacy";
+ version = "0.5.4";
+ sha256 = "1sm0w29iwlhd1596h4x8dcqv5jz0jk6vfc41iqikdhgbn89xv6sd";
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [
+ base base16-bytestring bytestring cereal entropy mtl QuickCheck
+ string-conversions
+ ];
+ testHaskellDepends = [
+ base base16-bytestring bytestring cereal cryptohash entropy HUnit
+ mtl QuickCheck string-conversions test-framework
+ test-framework-hunit test-framework-quickcheck2
+ ];
+ description = "fork of secp256k1";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {};
+
"secret-santa" = callPackage
({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib
, haskell-qrencode, random
@@ -204581,6 +205680,8 @@ self: {
pname = "semialign";
version = "1";
sha256 = "004x0a80sqqdgvsyk4z0nasxpi6z3g1d8kgwj804bj9ka8dlc75m";
+ revision = "1";
+ editedCabalFile = "0qnqnyfng4kwy2h2anrcy5id2ijnawava3zcc5h5b8ri1y6ks6zi";
libraryHaskellDepends = [
base base-compat containers hashable semigroupoids tagged these
transformers unordered-containers vector
@@ -204597,11 +205698,13 @@ self: {
pname = "semialign-indexed";
version = "1";
sha256 = "0m37c4bfvph7w241cgr2adp3x13ffgnw2l66wyn7y9rdvm2983k2";
+ revision = "1";
+ editedCabalFile = "1m08sj2xd97ix5bkm5hpyyb7inqfqic9m5dmy5jyg0ws41077frg";
libraryHaskellDepends = [
base containers hashable lens semialign these unordered-containers
vector
];
- description = "SemialignWithIndex, i.e. izip and ialign";
+ description = "SemialignWithIndex, i.e. izipWith and ialignWith";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -204631,29 +205734,6 @@ self: {
}) {};
"semigroupoids" = callPackage
- ({ mkDerivation, base, base-orphans, bifunctors, Cabal
- , cabal-doctest, comonad, containers, contravariant, distributive
- , doctest, hashable, tagged, template-haskell, transformers
- , transformers-compat, unordered-containers
- }:
- mkDerivation {
- pname = "semigroupoids";
- version = "5.3.2";
- sha256 = "01cxdcflfzx674bhdclf6c7lwgjpbj5yqv8w1fi9dvipyhyj3a31";
- revision = "1";
- editedCabalFile = "1r88pi1bvc1w0nys810p3drra6na02zhbaf257dl4lyxl8iv5466";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- base base-orphans bifunctors comonad containers contravariant
- distributive hashable tagged template-haskell transformers
- transformers-compat unordered-containers
- ];
- testHaskellDepends = [ base doctest ];
- description = "Semigroupoids: Category sans id";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "semigroupoids_5_3_3" = callPackage
({ mkDerivation, base, base-orphans, bifunctors, Cabal
, cabal-doctest, comonad, containers, contravariant, distributive
, doctest, hashable, tagged, template-haskell, transformers
@@ -204672,7 +205752,6 @@ self: {
testHaskellDepends = [ base doctest ];
description = "Semigroupoids: Category sans id";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"semigroupoids-syntax" = callPackage
@@ -204827,6 +205906,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "semirings_0_5" = callPackage
+ ({ mkDerivation, base, containers, hashable, integer-gmp
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "semirings";
+ version = "0.5";
+ sha256 = "1xfmb017jjlas0lq4969d1dw7wifsym8m2qnadz7bywhjl96kzxh";
+ libraryHaskellDepends = [
+ base containers hashable integer-gmp unordered-containers
+ ];
+ description = "two monoids as one, in holy haskimony";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"semver" = callPackage
({ mkDerivation, attoparsec, base, criterion, deepseq, hashable
, tasty, tasty-hunit, text
@@ -205222,22 +206317,22 @@ self: {
"sequence-formats" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers, errors
- , exceptions, foldl, lens-family, pipes, pipes-attoparsec
+ , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec
, pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers
, vector
}:
mkDerivation {
pname = "sequence-formats";
- version = "1.3.2.1";
- sha256 = "0fl3sg4znmnil08vbjf50xcbs5blh9pvg1jakbhikj1aab68vpp5";
+ version = "1.4.0.1";
+ sha256 = "1inw4agbm722zjbxi1ys73pssx76k8pg1s3cyxl5v1czqlyjxppy";
libraryHaskellDepends = [
attoparsec base bytestring containers errors exceptions foldl
lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe
transformers vector
];
testHaskellDepends = [
- base bytestring containers foldl pipes pipes-safe tasty tasty-hunit
- transformers vector
+ base bytestring containers foldl hspec pipes pipes-safe tasty
+ tasty-hunit transformers vector
];
description = "A package with basic parsing utilities for several Bioinformatic data formats";
license = stdenv.lib.licenses.gpl3;
@@ -205245,6 +206340,36 @@ self: {
broken = true;
}) {};
+ "sequenceTools" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, base, bytestring, foldl, hspec
+ , lens-family, optparse-applicative, pipes, pipes-group
+ , pipes-ordered-zip, pipes-safe, random, rio, sequence-formats
+ , split, vector
+ }:
+ mkDerivation {
+ pname = "sequenceTools";
+ version = "1.4.0.2";
+ sha256 = "1s6g5n9rb9yk2rzjc2dvmw14ncjfrf66lkla8bcacdvqwa8hl7kr";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring optparse-applicative pipes random sequence-formats
+ vector
+ ];
+ executableHaskellDepends = [
+ ansi-wl-pprint base bytestring foldl lens-family
+ optparse-applicative pipes pipes-group pipes-ordered-zip pipes-safe
+ random rio sequence-formats split vector
+ ];
+ testHaskellDepends = [
+ base bytestring hspec pipes sequence-formats vector
+ ];
+ description = "A package with tools for processing DNA sequencing data";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"sequent-core" = callPackage
({ mkDerivation, base, bytestring, containers, ghc, transformers }:
mkDerivation {
@@ -205982,8 +207107,6 @@ self: {
];
description = "Checked exceptions for Servant APIs";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"servant-checked-exceptions-core" = callPackage
@@ -206683,8 +207806,8 @@ self: {
}:
mkDerivation {
pname = "servant-kotlin";
- version = "0.1.1.8";
- sha256 = "0w68sfsf7x0wvj67klbl464jzkibr8p78knxix5fqxxd5kb5d25r";
+ version = "0.1.1.9";
+ sha256 = "1wywp494wbhs32szyni294k5qf8fjbznydwss7lwxprnli1hh1qm";
libraryHaskellDepends = [
base containers directory formatting lens servant servant-foreign
text time wl-pprint-text
@@ -207125,8 +208248,8 @@ self: {
}:
mkDerivation {
pname = "servant-rawm";
- version = "0.3.1.0";
- sha256 = "055ys4gkywy1ld0d736fsmc39fix2b4ad4myb7qn0sbax6y9zn3q";
+ version = "0.3.2.0";
+ sha256 = "013d89zmlmwwwhgyc57xbzsd4phz347if5y6iz93wrw4lbvc341d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -207142,8 +208265,6 @@ self: {
];
description = "Embed a raw 'Application' in a Servant API";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"servant-reason" = callPackage
@@ -207696,8 +208817,8 @@ self: {
}:
mkDerivation {
pname = "servant-waargonaut";
- version = "0.6.0.0";
- sha256 = "17igh9s4bmzsx10qscrqpqd8djkmr2krfc660nhdsi7cx5hmlwl3";
+ version = "0.7.0.0";
+ sha256 = "0fn7ph0805n297nzi3ig9wfx27kz6bmn4r914ibx44927xifms59";
libraryHaskellDepends = [
base bytestring http-media lens servant text waargonaut
wl-pprint-annotated
@@ -208224,6 +209345,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "set-cover_0_1" = callPackage
+ ({ mkDerivation, array, base, containers, enummapset, non-empty
+ , prelude-compat, psqueues, QuickCheck, random, semigroups, timeit
+ , transformers, utility-ht
+ }:
+ mkDerivation {
+ pname = "set-cover";
+ version = "0.1";
+ sha256 = "1yidgc1nbhbkxpchd96vzfgkk95hdwgpvd9ys2b4xw2m1zyzi1kb";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base containers enummapset non-empty prelude-compat psqueues
+ semigroups transformers utility-ht
+ ];
+ testHaskellDepends = [
+ array base containers enummapset QuickCheck transformers utility-ht
+ ];
+ benchmarkHaskellDepends = [
+ array base containers enummapset QuickCheck random timeit
+ transformers utility-ht
+ ];
+ description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"set-extra" = callPackage
({ mkDerivation, base, containers, mtl, syb }:
mkDerivation {
@@ -209183,8 +210331,8 @@ self: {
}:
mkDerivation {
pname = "shakespeare";
- version = "2.0.20";
- sha256 = "00wybn9dcwi2y1cp87fyvhcqn8filvb8as7k78g1m1c5wpwby3pm";
+ version = "2.0.21";
+ sha256 = "1assgcinf9i9rm7mphqfymzvn7z1m2jjkm98z7l2pb76z53mcvgh";
libraryHaskellDepends = [
aeson base blaze-html blaze-markup bytestring containers directory
exceptions ghc-prim parsec process scientific template-haskell text
@@ -209755,6 +210903,36 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "shelly_1_9_0" = callPackage
+ ({ mkDerivation, async, base, bytestring, containers, directory
+ , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
+ , HUnit, lifted-async, lifted-base, monad-control, mtl, process
+ , text, time, transformers, transformers-base, unix, unix-compat
+ }:
+ mkDerivation {
+ pname = "shelly";
+ version = "1.9.0";
+ sha256 = "1kma77gixhyciimh19p64h1ndbcrs9qhk8fgyv71iqh5q57zvday";
+ revision = "1";
+ editedCabalFile = "0827p6wq8j92svrvmx02gdk961xx42g1ng4j6g7nflrfks9hw0zf";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ async base bytestring containers directory enclosed-exceptions
+ exceptions filepath lifted-async lifted-base monad-control mtl
+ process text time transformers transformers-base unix unix-compat
+ ];
+ testHaskellDepends = [
+ async base bytestring containers directory enclosed-exceptions
+ exceptions filepath hspec hspec-contrib HUnit lifted-async
+ lifted-base monad-control mtl process text time transformers
+ transformers-base unix unix-compat
+ ];
+ description = "shell-like (systems) programming in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"shelly-extra" = callPackage
({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore
, shelly, text
@@ -209797,8 +210975,8 @@ self: {
}:
mkDerivation {
pname = "shh";
- version = "0.7.0.4";
- sha256 = "10gnkk0645aznkry063kl5m68n7ip88m8cf97lwffj1y86iazk5b";
+ version = "0.7.0.5";
+ sha256 = "119b9rvvdsw1al0i4lqa25z7ykwwqi46xz22az1b8fi3xiijprs3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -211642,6 +212820,8 @@ self: {
pname = "singleton-bool";
version = "0.1.5";
sha256 = "17w9vv6arn7vvc7kykqcx81q2364ji43khrryl27r1cjx9yxapa0";
+ revision = "1";
+ editedCabalFile = "1g2dchvp5clg3hfdrp7hf5pbl9kcyhqhnqxqxd7n861nfd661wqd";
libraryHaskellDepends = [ base dec ];
description = "Type level booleans";
license = stdenv.lib.licenses.bsd3;
@@ -211661,17 +212841,6 @@ self: {
}) {};
"singleton-nats" = callPackage
- ({ mkDerivation, base, singletons }:
- mkDerivation {
- pname = "singleton-nats";
- version = "0.4.2";
- sha256 = "1wcwks2acnql5ihkjn2543hgdnlw049z8av8x5dp5r552fq6k0cg";
- libraryHaskellDepends = [ base singletons ];
- description = "Unary natural numbers relying on the singletons infrastructure";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "singleton-nats_0_4_3" = callPackage
({ mkDerivation, base, singletons }:
mkDerivation {
pname = "singleton-nats";
@@ -211680,7 +212849,6 @@ self: {
libraryHaskellDepends = [ base singletons ];
description = "Unary natural numbers relying on the singletons infrastructure";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"singleton-typelits" = callPackage
@@ -212761,22 +213929,26 @@ self: {
}) {};
"small-bytearray-builder" = callPackage
- ({ mkDerivation, base, byteslice, bytestring, gauge, primitive
- , primitive-offset, QuickCheck, run-st, tasty, tasty-quickcheck
+ ({ mkDerivation, base, byteslice, bytestring, gauge
+ , natural-arithmetic, primitive, primitive-offset, QuickCheck
+ , run-st, tasty, tasty-hunit, tasty-quickcheck, text, text-short
, vector
}:
mkDerivation {
pname = "small-bytearray-builder";
- version = "0.1.1.0";
- sha256 = "1i3b77mczfy9f0gp5ckqln1vdhnqflz8lajfiygx5spxf9kraf9d";
+ version = "0.2.1.0";
+ sha256 = "11r0nz8z16h75867xq4c62s69ic7vhwfwhl2c11441mkhbrk2nbw";
libraryHaskellDepends = [
- base byteslice primitive primitive-offset run-st vector
+ base byteslice bytestring natural-arithmetic primitive
+ primitive-offset run-st text-short vector
];
testHaskellDepends = [
- base byteslice bytestring primitive QuickCheck tasty
- tasty-quickcheck vector
+ base byteslice bytestring natural-arithmetic primitive QuickCheck
+ tasty tasty-hunit tasty-quickcheck text vector
+ ];
+ benchmarkHaskellDepends = [
+ base gauge natural-arithmetic primitive
];
- benchmarkHaskellDepends = [ base gauge primitive ];
description = "Serialize to a small byte arrays";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -215334,6 +216506,8 @@ self: {
pname = "socks";
version = "0.6.0";
sha256 = "10bkf2gw5l48j6g1i2slndcg4nzdqj8syrnbj21gjz6sms3zlqlp";
+ revision = "1";
+ editedCabalFile = "0a7p6gfcmxgrs3rx62qm7fi5hvn90r64px7wbqva4h6scrmywn50";
libraryHaskellDepends = [
base basement bytestring cereal network
];
@@ -216092,30 +217266,6 @@ self: {
}) {};
"sparse-tensor" = callPackage
- ({ mkDerivation, ad, base, bytestring, Cabal, cereal, containers
- , deepseq, ghc-typelits-knownnat, ghc-typelits-natnormalise
- , hmatrix, parallel, QuickCheck, tasty, tasty-hunit
- , tasty-quickcheck, tf-random, zlib
- }:
- mkDerivation {
- pname = "sparse-tensor";
- version = "0.2.1";
- sha256 = "10950cp07m1p011n3a14bka2rpfrmn20k0kjb1cvca7dnxn2iv2f";
- setupHaskellDepends = [ base Cabal ];
- libraryHaskellDepends = [
- ad base bytestring cereal containers deepseq ghc-typelits-knownnat
- ghc-typelits-natnormalise hmatrix parallel tf-random zlib
- ];
- testHaskellDepends = [
- base hmatrix QuickCheck tasty tasty-hunit tasty-quickcheck
- ];
- description = "typesafe tensor algebra library";
- license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {};
-
- "sparse-tensor_0_2_1_1" = callPackage
({ mkDerivation, ad, base, bytestring, Cabal, cereal, containers
, deepseq, ghc-typelits-knownnat, ghc-typelits-natnormalise
, hmatrix, parallel, QuickCheck, tasty, tasty-hunit
@@ -216819,8 +217969,8 @@ self: {
({ mkDerivation, base, invariant, lens, QuickCheck }:
mkDerivation {
pname = "split-morphism";
- version = "0.1.0.0";
- sha256 = "08mrnaj03j5z9ihayqikb06rw1fvrbjrqq0ysz28nlzawhz8x970";
+ version = "0.1.0.1";
+ sha256 = "0j7z4im0f0dblx8jzia21f3zg5qi2b3lpd9qf7w4ns8rhk4ycr58";
libraryHaskellDepends = [ base invariant lens ];
testHaskellDepends = [ base invariant lens QuickCheck ];
description = "Split Epimorphisms and Monomorphisms";
@@ -217111,8 +218261,8 @@ self: {
}:
mkDerivation {
pname = "sproxy2";
- version = "1.97.0";
- sha256 = "1in8sb41bl46xwk49904xkm3k5s59xikvmyyani1p60l0zfrb2jk";
+ version = "1.97.1";
+ sha256 = "1rbklqbmp0j9wy60j03bccbc0czd4s4ki8bl3l93p8mvkv55hcx4";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -219646,8 +220796,8 @@ self: {
pname = "step-function";
version = "0.2";
sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j";
- revision = "2";
- editedCabalFile = "074399mj4p0sk49rqc9a3fikpsly95mndnmm71ya7wy34nxyafzv";
+ revision = "3";
+ editedCabalFile = "0aa7x22n5ylvryd7bm1j9s12k5xcp9fp5fz9qy03hjicxzlhm07a";
libraryHaskellDepends = [
base base-compat-batteries containers deepseq QuickCheck
];
@@ -219751,6 +220901,8 @@ self: {
pname = "stm";
version = "2.5.0.0";
sha256 = "1illcj8zgzmpl91hzgk0j74ha436a379gw13siq4gifbcrf6iqsr";
+ revision = "1";
+ editedCabalFile = "189fxk75h7n27kw7ndyn8nkxm3117qdh1dpag1mcs487kxghff62";
libraryHaskellDepends = [ array base ];
description = "Software Transactional Memory";
license = stdenv.lib.licenses.bsd3;
@@ -220448,15 +221600,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "stratosphere_0_41_0" = callPackage
+ "stratosphere_0_42_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, hashable, hspec, hspec-discover, lens, template-haskell, text
, unordered-containers
}:
mkDerivation {
pname = "stratosphere";
- version = "0.41.0";
- sha256 = "1prwkvlc9qglc0465gibv26h1nd06bdiayp22i91dw3ws3mbhzs5";
+ version = "0.42.0";
+ sha256 = "1520dhfad9j1aa9sjxq56v6hivbfnm2vi19hjn7y0m6a80q2wawp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -220676,8 +221828,8 @@ self: {
pname = "streaming";
version = "0.2.2.0";
sha256 = "04fdw4f51yb16bv3b7z97vqxbns8rv2ag2aphglm29jsd527fsss";
- revision = "1";
- editedCabalFile = "1sq8blxh4s1lsvxkc64x7drxwn75kszxicjhvw4cg505fp9bfc7y";
+ revision = "2";
+ editedCabalFile = "0cfxibcf0lkzbbyxl96dpnmacxv39ljwrlr3935bxykihr83j9xf";
libraryHaskellDepends = [
base containers ghc-prim mmorph mtl semigroups transformers
transformers-base
@@ -221412,6 +222564,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "strict-list_0_1_5" = callPackage
+ ({ mkDerivation, base, hashable, QuickCheck, quickcheck-instances
+ , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "strict-list";
+ version = "0.1.5";
+ sha256 = "06mv208bspfl2mh1razi6af3fri8w7f5p3klkc3b9yx5ddv3hwxs";
+ libraryHaskellDepends = [ base hashable semigroupoids ];
+ testHaskellDepends = [
+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+ tasty-quickcheck
+ ];
+ description = "Strict linked list";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"strict-tuple" = callPackage
({ mkDerivation, base, deepseq, hashable }:
mkDerivation {
@@ -223262,6 +224432,8 @@ self: {
pname = "sv";
version = "1.4";
sha256 = "02ymnnknfppx59b922y62grkmarwsyy77iv6bmyp2bzm8vbvnvd5";
+ revision = "1";
+ editedCabalFile = "0lzl0602dbq8nih9ylqk18vqg3xgj3bnf8c6hkxhbc2mryszrhyj";
libraryHaskellDepends = [
attoparsec base bifunctors bytestring contravariant hw-dsv
semigroupoids sv-core transformers utf8-string validation
@@ -223340,6 +224512,8 @@ self: {
pname = "sv-core";
version = "0.5";
sha256 = "1x5gmv2pbn3hx1dhpkigivjkbg6n6xy7lc36wmccsw2qqn9r5qxa";
+ revision = "1";
+ editedCabalFile = "1vsd3g5kh50c7vrx9y04crrw6pfs3g74z3sr9s1dbapa9411pif8";
libraryHaskellDepends = [
attoparsec base bifunctors bytestring containers contravariant
deepseq double-conversion lens mtl parsec profunctors readable
@@ -223475,13 +224649,12 @@ self: {
}:
mkDerivation {
pname = "svgcairo";
- version = "0.13.1.1";
- sha256 = "0kx5qc2snrpml2figrq1f74fzj81zbibv1x9dp8z2kh8z6n659nd";
+ version = "0.13.2.0";
+ sha256 = "1h3phyq9g7lmw0mf75hlccvixgwffvkfnlyy1g34hwh9i5nj0aqw";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
libraryHaskellDepends = [ base cairo glib mtl text ];
libraryPkgconfigDepends = [ librsvg ];
- libraryToolDepends = [ gtk2hs-buildtools ];
description = "Binding to the libsvg-cairo library";
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) librsvg;};
@@ -223829,16 +225002,17 @@ self: {
}) {};
"syb-with-class" = callPackage
- ({ mkDerivation, array, base, bytestring, containers
+ ({ mkDerivation, array, base, bytestring, containers, HUnit
, template-haskell
}:
mkDerivation {
pname = "syb-with-class";
- version = "0.6.1.10";
- sha256 = "0fhkxzcvalaqv554cmjmc56b3h7vxai3k2dd1fsp7ca124ikyzm7";
+ version = "0.6.1.11";
+ sha256 = "0fgmcxhrhcjcv5nmb5irp6mqcwknpk15azzd0qhajwx8mqpw6b8l";
libraryHaskellDepends = [
array base bytestring containers template-haskell
];
+ testHaskellDepends = [ base HUnit ];
description = "Scrap Your Boilerplate With Class";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -224171,6 +225345,27 @@ self: {
broken = true;
}) {};
+ "symbiote" = callPackage
+ ({ mkDerivation, aeson, async, base, bytestring, cereal, containers
+ , monad-control, mtl, QuickCheck, quickcheck-instances, stm, tasty
+ , tasty-hunit, text
+ }:
+ mkDerivation {
+ pname = "symbiote";
+ version = "0.0.0";
+ sha256 = "1p38lblwd8cxbypnqy7f71ab2s7ia00xv6ysy24lh9xaqns43ad4";
+ libraryHaskellDepends = [
+ aeson async base bytestring cereal containers monad-control mtl
+ QuickCheck stm text
+ ];
+ testHaskellDepends = [
+ aeson async base bytestring cereal containers monad-control mtl
+ QuickCheck quickcheck-instances stm tasty tasty-hunit text
+ ];
+ description = "Data serialization, communication, and operation verification implementation";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"symbol" = callPackage
({ mkDerivation, base, containers, deepseq }:
mkDerivation {
@@ -224200,8 +225395,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "symbols";
- version = "0.2.0.1";
- sha256 = "00c28qy0g011acgf98981x7pw3d58dcsmb8iqfna5f6qmcya6393";
+ version = "0.3.0.0";
+ sha256 = "19hlvyq5s4lvqi8n4qwxy4fgi33y72n8h4lw5bbb35sbq9jlw69c";
libraryHaskellDepends = [ base ];
description = "Symbol manipulation";
license = stdenv.lib.licenses.bsd3;
@@ -226252,32 +227447,6 @@ self: {
}) {};
"tar" = callPackage
- ({ mkDerivation, array, base, bytestring, bytestring-handle
- , containers, criterion, deepseq, directory, filepath, QuickCheck
- , tasty, tasty-quickcheck, time
- }:
- mkDerivation {
- pname = "tar";
- version = "0.5.1.0";
- sha256 = "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8";
- revision = "1";
- editedCabalFile = "1lydbwsmccf2av0g61j07bx7r5mzbcfgwvmh0qwg3a91857x264x";
- libraryHaskellDepends = [
- array base bytestring containers deepseq directory filepath time
- ];
- testHaskellDepends = [
- array base bytestring bytestring-handle containers deepseq
- directory filepath QuickCheck tasty tasty-quickcheck time
- ];
- benchmarkHaskellDepends = [
- array base bytestring containers criterion deepseq directory
- filepath time
- ];
- description = "Reading, writing and manipulating \".tar\" archive files.";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "tar_0_5_1_1" = callPackage
({ mkDerivation, array, base, bytestring, bytestring-handle
, containers, criterion, deepseq, directory, filepath, QuickCheck
, tasty, tasty-quickcheck, time
@@ -226299,7 +227468,6 @@ self: {
];
description = "Reading, writing and manipulating \".tar\" archive files.";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tar-conduit" = callPackage
@@ -226611,10 +227779,8 @@ self: {
({ mkDerivation, base, tagged, tasty }:
mkDerivation {
pname = "tasty-expected-failure";
- version = "0.11.1.1";
- sha256 = "1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji";
- revision = "1";
- editedCabalFile = "1b3fn7d3zwhhwm3gp8cmmsdcrvn9dhshd665xrx1mk6cmy4m8k16";
+ version = "0.11.1.2";
+ sha256 = "175gdk1mkslcwjxajkbl4zmaigzf8h4svzd7va5qb519y0dxk28n";
libraryHaskellDepends = [ base tagged tasty ];
description = "Mark tasty tests as failure expected";
license = stdenv.lib.licenses.mit;
@@ -227109,6 +228275,8 @@ self: {
pname = "tasty-wai";
version = "0.1.1.0";
sha256 = "1ix1ksibdkqrycrcnyi6vablp17kg3ajw5kghff1ia7wd2nb9fbk";
+ revision = "1";
+ editedCabalFile = "1zwfdad5kp3l1lysz9x5hxwp0yphsdbhgbp33yczw8c8sai3l7xb";
libraryHaskellDepends = [
base bytestring http-types tasty wai wai-extra
];
@@ -227353,8 +228521,8 @@ self: {
pname = "tdigest";
version = "0.2.1";
sha256 = "0kmqmzjcs406hv2fv9bkfayxpsd41dbry8bpkhy4y1jdgh33hvnl";
- revision = "2";
- editedCabalFile = "1q517siz4l55l7ssrbc3rm0szf41k7wy4p26lch03i57lzldf2hf";
+ revision = "4";
+ editedCabalFile = "0830zzgbf5xffa1yqwcvy4xm1wzzydvy5wmy3sqk3a5n85v295by";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base base-compat binary deepseq reducers semigroupoids transformers
@@ -227687,12 +228855,12 @@ self: {
broken = true;
}) {};
- "template-haskell_2_14_0_0" = callPackage
+ "template-haskell_2_15_0_0" = callPackage
({ mkDerivation, base, ghc-boot-th, pretty }:
mkDerivation {
pname = "template-haskell";
- version = "2.14.0.0";
- sha256 = "1y8l2g95mhd2j09bq05q2rj6rn2ni86yhf4kgha3y5qig7j8lyy9";
+ version = "2.15.0.0";
+ sha256 = "16p8szb5by7gyk5r5cnrdp3b613vp5wasqj8dz63my17l2lsp2wl";
libraryHaskellDepends = [ base ghc-boot-th pretty ];
description = "Support library for Template Haskell";
license = stdenv.lib.licenses.bsd3;
@@ -228073,8 +229241,8 @@ self: {
}:
mkDerivation {
pname = "tensorflow";
- version = "0.2.0.0";
- sha256 = "0qlz4fxq2dv5l8krmi8q2g61ng1lhxjyzmv3bcxnc1nz4a1438dl";
+ version = "0.2.0.1";
+ sha256 = "16qwr72yyan6gvcx771p7dhp8d7m47j3l8q4dq86ljjzi2c9pswi";
libraryHaskellDepends = [
async attoparsec base bytestring containers data-default exceptions
fgl lens-family mainland-pretty mtl proto-lens semigroups split
@@ -228100,8 +229268,8 @@ self: {
}:
mkDerivation {
pname = "tensorflow-core-ops";
- version = "0.2.0.0";
- sha256 = "0ii5n2fxx6frkk6cscbn2fywx9yc914n6y9dp84rr4v3vr08ixf0";
+ version = "0.2.0.1";
+ sha256 = "1hdifal9bapc747c2w7bw2ai68sw0frhx4kvrjh0g8a19fqq95sa";
setupHaskellDepends = [
base bytestring Cabal directory filepath mainland-pretty proto-lens
tensorflow tensorflow-opgen text
@@ -228125,8 +229293,8 @@ self: {
}:
mkDerivation {
pname = "tensorflow-logging";
- version = "0.2.0.0";
- sha256 = "083jv105cx1kqc9krjp75ja8zhy860q7667l8z6fl5l9w5ilqnfs";
+ version = "0.2.0.1";
+ sha256 = "14gj6ykfrnqhzi12k3l3pvaa892bakxx3hhml117vfzgcz736gcr";
libraryHaskellDepends = [
base bytestring conduit data-default directory exceptions filepath
hostname lens-family proto-lens resourcet stm stm-chans stm-conduit
@@ -228187,8 +229355,8 @@ self: {
}:
mkDerivation {
pname = "tensorflow-opgen";
- version = "0.2.0.0";
- sha256 = "16d4bgc665synpwcapzffd1kqzvpwvfs97k0fwkxda0lzziy87xq";
+ version = "0.2.0.1";
+ sha256 = "0hlzw5l3a42q9ls8xmi9d9nybspizf1acl7ga4rzs4mw3qyadf2k";
libraryHaskellDepends = [
base bytestring containers filepath lens-family mainland-pretty
optparse-applicative proto-lens semigroups tensorflow-proto text
@@ -228209,8 +229377,8 @@ self: {
}:
mkDerivation {
pname = "tensorflow-ops";
- version = "0.2.0.0";
- sha256 = "12x37bh8172xkgnp5ahr87ykad8gbsnb4amchpjcwxap33n9h19c";
+ version = "0.2.0.1";
+ sha256 = "1v89yi2cm39aybhz4lvy2fqgpdslb1d0adxk9516f0xqz3k23ks6";
libraryHaskellDepends = [
base bytestring containers data-default fgl lens-family mtl
proto-lens tensorflow tensorflow-core-ops tensorflow-proto text
@@ -228232,15 +229400,15 @@ self: {
"tensorflow-proto" = callPackage
({ mkDerivation, base, Cabal, proto-lens, proto-lens-protobuf-types
- , proto-lens-protoc, protobuf
+ , proto-lens-runtime, proto-lens-setup, protobuf
}:
mkDerivation {
pname = "tensorflow-proto";
- version = "0.2.0.0";
- sha256 = "0s3gkis2m3ciia83ziz7rca61czzj77racmcb8si9jxxgw3rxhkc";
- setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+ version = "0.2.0.1";
+ sha256 = "1gc4gwfsy0b6ns79zmxyd0pg3g00jnfynmrnkp81cq3a170z7558";
+ setupHaskellDepends = [ base Cabal proto-lens-setup ];
libraryHaskellDepends = [
- base proto-lens proto-lens-protobuf-types proto-lens-protoc
+ base proto-lens proto-lens-protobuf-types proto-lens-runtime
];
libraryToolDepends = [ protobuf ];
description = "TensorFlow protocol buffers";
@@ -228315,8 +229483,8 @@ self: {
}:
mkDerivation {
pname = "term-rewriting";
- version = "0.4.0.1";
- sha256 = "14mgpwhpfa0w5xgwsqa5nklagw6scs51cjwin7d34gx8bkvw9m13";
+ version = "0.4.0.2";
+ sha256 = "0k0aylm6vzcqghp5zw461p68zgzjzr6k4ki7d00zl471lmbdbs8n";
libraryHaskellDepends = [
ansi-wl-pprint array base containers mtl multiset parsec
union-find-array
@@ -228657,8 +229825,8 @@ self: {
pname = "test-framework";
version = "0.8.2.0";
sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm";
- revision = "3";
- editedCabalFile = "0qg8zr0ga2kq8qrs9vckxmk11zrp105cbybcb9ra3dk4linngjw3";
+ revision = "4";
+ editedCabalFile = "1g1z9h55ii55b44gzgrjgi1lpk85yfi4yhrynvfy0199ywpckpd5";
libraryHaskellDepends = [
ansi-terminal ansi-wl-pprint base containers hostname old-locale
random regex-posix time xml
@@ -229945,6 +231113,8 @@ self: {
pname = "text-short";
version = "0.1.3";
sha256 = "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz";
+ revision = "1";
+ editedCabalFile = "0lb4papn54fbgjdqj4ladaf5q12dhlwkg5z2vc5qxlh35x82sw4a";
libraryHaskellDepends = [
base binary bytestring deepseq ghc-prim hashable text
];
@@ -229969,6 +231139,8 @@ self: {
pname = "text-show";
version = "3.8.2";
sha256 = "0n46q5gjlxz3g4flj5mn8s78dpdfd65fjl7b5174pykanwqsqqwz";
+ revision = "1";
+ editedCabalFile = "0fdlba9rmjk7irf376rglyyi9rbz49mhm5zyx112ah8nqgh50myi";
libraryHaskellDepends = [
array base base-compat-batteries bifunctors bytestring
bytestring-builder containers contravariant generic-deriving
@@ -229999,8 +231171,8 @@ self: {
}:
mkDerivation {
pname = "text-show-instances";
- version = "3.8.1";
- sha256 = "1z54vgw1rsck3lr6jnl5vdd0aq1hni1wy0fag985d6b73qmxlm1l";
+ version = "3.8.2";
+ sha256 = "075a2dzbdkh13q9a1w4v0dm40rqrv1wq8nsqh4g4872h29df5mka";
libraryHaskellDepends = [
base base-compat-batteries bifunctors binary containers directory
ghc-boot-th haskeline hpc old-locale old-time pretty random
@@ -230569,10 +231741,8 @@ self: {
({ mkDerivation, base, containers, syb, template-haskell }:
mkDerivation {
pname = "th-expand-syns";
- version = "0.4.4.0";
- sha256 = "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc";
- revision = "1";
- editedCabalFile = "1zbdg3hrqv7rzlsrw4a2vjr3g4nzny32wvjcpxamlvx77b1jvsw9";
+ version = "0.4.5.0";
+ sha256 = "1p4wfyycan8zsp9wi7npx36qwbfsbcgdyxi3ii51scf69dkrx42y";
libraryHaskellDepends = [ base containers syb template-haskell ];
testHaskellDepends = [ base template-haskell ];
description = "Expands type synonyms in Template Haskell ASTs";
@@ -230764,10 +231934,8 @@ self: {
}:
mkDerivation {
pname = "th-orphans";
- version = "0.13.7";
- sha256 = "0qqxrm04nqh062cw6a2p6grvvfpg0nxkj3aymmar29yky17y8vgy";
- revision = "1";
- editedCabalFile = "1gf2rmphwgnqbbk4qcwfiprmsqp2d30xqlcxgs9h9ymazkwlh203";
+ version = "0.13.8";
+ sha256 = "0f5rf8jr9g5pgnqv7i60ygmnycjq1qbfvccjpagc1xy4gbgjng41";
libraryHaskellDepends = [
base mtl template-haskell th-lift th-lift-instances th-reify-many
];
@@ -231130,6 +232298,8 @@ self: {
pname = "these";
version = "1.0.1";
sha256 = "1k0pi65g7cm9hzdw6my6bzz2zvddkmj1qs45ymqmi316bpiixk3r";
+ revision = "1";
+ editedCabalFile = "0923r86fnmgpx0msm68aszirh2n19nn5bccgjxfh2146jw4z7w3z";
libraryHaskellDepends = [
aeson assoc base base-compat binary deepseq hashable QuickCheck
semigroupoids unordered-containers
@@ -231144,11 +232314,26 @@ self: {
pname = "these-lens";
version = "1";
sha256 = "144ly13qng95mwnfis8dm7n3843z3w2vp4212qawbpw8hw921c7y";
+ revision = "1";
+ editedCabalFile = "1lrpq5a8ldddmsi7ckaqinamn2f7kkijq5jq05yzdx818b2563wn";
libraryHaskellDepends = [ base base-compat lens these ];
description = "Lenses for These";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "these-optics" = callPackage
+ ({ mkDerivation, base, optics-core, these }:
+ mkDerivation {
+ pname = "these-optics";
+ version = "1";
+ sha256 = "0gmsykzcjx5h6dbfny4dw3jrm33ykcw6rpngf5awwdpg3a4cfgi7";
+ revision = "1";
+ editedCabalFile = "1fvi4m04xy3mj22ajgi95bsbr7jhm5f8dnan6hihkplqbjgrjma3";
+ libraryHaskellDepends = [ base optics-core these ];
+ description = "Optics for These";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"these-skinny" = callPackage
({ mkDerivation, base, deepseq }:
mkDerivation {
@@ -231842,8 +233027,8 @@ self: {
}:
mkDerivation {
pname = "tidal-vis";
- version = "1.0.14";
- sha256 = "1l924nqv8ljd9ljpy05r18j0rc5if3k5lvpifv2g8fn967gi0nfs";
+ version = "1.0.15";
+ sha256 = "0h198v3p1z8bmn993w54a7pm4s445lvf7683h23wydpnfckxv06h";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -232212,6 +233397,8 @@ self: {
pname = "time-parsers";
version = "0.1.2.1";
sha256 = "102k6l9888kbgng045jk170qjbmdnwv2lbzlc12ncybfk2yk7wdv";
+ revision = "1";
+ editedCabalFile = "00063s6a75sy9fjg5507yix0wizdfx5vangn3yfmfvh3wgw8yj8c";
libraryHaskellDepends = [ base parsers template-haskell time ];
testHaskellDepends = [
attoparsec base bifunctors parsec parsers tasty tasty-hunit
@@ -233356,6 +234543,30 @@ self: {
broken = true;
}) {};
+ "tmp-postgres_0_3_0_1" = callPackage
+ ({ mkDerivation, async, base, bytestring, directory, hspec
+ , hspec-discover, mtl, network, port-utils, postgres-options
+ , postgresql-libpq, postgresql-simple, process, temporary, unix
+ }:
+ mkDerivation {
+ pname = "tmp-postgres";
+ version = "0.3.0.1";
+ sha256 = "1h0n3kd5wz4lhg2m4zkyd0vhynrpdvvwlrngyj62d27i1qk2livy";
+ libraryHaskellDepends = [
+ async base bytestring directory network port-utils postgres-options
+ postgresql-simple process temporary unix
+ ];
+ testHaskellDepends = [
+ base bytestring directory hspec hspec-discover mtl postgresql-libpq
+ postgresql-simple process temporary
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Start and stop a temporary postgres for testing";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"tmpl" = callPackage
({ mkDerivation, base, bytestring, directory, template, text }:
mkDerivation {
@@ -234103,6 +235314,8 @@ self: {
pname = "topograph";
version = "1";
sha256 = "0vm7ja5f677lpphfmggx68h144k0fzj0n6r6ypf5474da405xad7";
+ revision = "2";
+ editedCabalFile = "0sci2p1spsh7as4n7mp1hb4pwiq4wd69p60c71kwx56wpwiglp9i";
libraryHaskellDepends = [
base base-compat base-orphans containers vector
];
@@ -235439,6 +236652,8 @@ self: {
pname = "tree-diff";
version = "0.1";
sha256 = "1156nbqn0pn9lp4zjsy4vv5g5wmy4zxwmbqdgvq349rydynh3ng3";
+ revision = "1";
+ editedCabalFile = "1nxwbn3z4a2102r45yhk0i6vb8fyc5mb894daai7l3l16rjzkp5a";
libraryHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
bytestring-builder containers hashable parsec parsers pretty
@@ -235476,17 +236691,17 @@ self: {
}) {};
"tree-sitter" = callPackage
- ({ mkDerivation, aeson, base, bytestring, directory, filepath
- , fused-effects, hedgehog, hspec, split, template-haskell, text
- , unordered-containers
+ ({ mkDerivation, aeson, base, bytestring, containers, directory
+ , filepath, fused-effects, hedgehog, hspec, split, template-haskell
+ , text, unordered-containers
}:
mkDerivation {
pname = "tree-sitter";
- version = "0.1.0.0";
- sha256 = "16yanr4k3zc55xgm5yajka7wgy475x2aq9lfv4j5lmxk0z7m9n9m";
+ version = "0.2.0.0";
+ sha256 = "03xdyvmnpjswh0rkn718n1w8kqvly86s6k3cwqgb6r1ygd6kqmim";
libraryHaskellDepends = [
- aeson base bytestring directory filepath fused-effects hedgehog
- split template-haskell text unordered-containers
+ aeson base bytestring containers directory filepath fused-effects
+ hedgehog split template-haskell text unordered-containers
];
testHaskellDepends = [ base hedgehog hspec ];
description = "Unstable bindings for the tree-sitter parsing library";
@@ -235501,6 +236716,8 @@ self: {
pname = "tree-sitter-go";
version = "0.1.0.0";
sha256 = "0lpj6sphc8gfyy8yz4pkrykwvrly3vdhy7j9n7jiacjsxnbw33ag";
+ revision = "1";
+ editedCabalFile = "04cq0vlwk4b0kyjsdc8aykm2m173wxzlvm3pjwfshcg2d5kqcn8a";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for Go";
@@ -235515,6 +236732,8 @@ self: {
pname = "tree-sitter-haskell";
version = "0.1.0.0";
sha256 = "0jglvy6p4xwdwpk7jn9sh83j0zv51crvzfc45l10s8lflprydk1m";
+ revision = "1";
+ editedCabalFile = "0326iz5r9bz4qsmqpiih1h28hbr10lhfy810b4p1bwianj7735bp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base template-haskell tree-sitter ];
@@ -235531,6 +236750,8 @@ self: {
pname = "tree-sitter-java";
version = "0.1.0.0";
sha256 = "1npa7i8c24hb0ds52cphfhn5cw087f8iq5w56x5wsjkvm531zblr";
+ revision = "1";
+ editedCabalFile = "07b2pwnfn2smaq4x9zhh721r2vqf8ipcgr3m19s9bnsyd7pbqyiy";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for Java";
@@ -235545,6 +236766,8 @@ self: {
pname = "tree-sitter-json";
version = "0.1.0.0";
sha256 = "0agmr5nj4rjdlwcf64ijjwbmkpgl10gbgg26v8bpnx84cxhfjpa3";
+ revision = "1";
+ editedCabalFile = "14gyys09392bf46vnhv4skc817ghka0bbqzrzr6lamaszk9a02ax";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for JSON";
@@ -235557,8 +236780,8 @@ self: {
({ mkDerivation, base, template-haskell, tree-sitter }:
mkDerivation {
pname = "tree-sitter-php";
- version = "0.1.0.0";
- sha256 = "0a8sp6kvw2qxx5mmfyp08fgi65fvchizrw47ay985vbrkmmqgip5";
+ version = "0.1.0.1";
+ sha256 = "1wbslim9ps3pf29445cxjr5kb4haidb43zl3a87pk5gfbr2wj0r0";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for PHP";
@@ -235568,17 +236791,18 @@ self: {
}) {};
"tree-sitter-python" = callPackage
- ({ mkDerivation, aeson, base, directory, filepath, template-haskell
- , tree-sitter
+ ({ mkDerivation, aeson, base, bytestring, directory, filepath
+ , hedgehog, template-haskell, tree-sitter
}:
mkDerivation {
pname = "tree-sitter-python";
- version = "0.1.0.1";
- sha256 = "0pq4cl4fb14x9dfnc83glpvzq65li4bvl0jidbsji34v9hzkr2x1";
+ version = "0.2.0.0";
+ sha256 = "1grkz8i3d37cci1w4i1lvdr2bjp7ddhq1fbyf240132rbhx67pg8";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base directory filepath template-haskell tree-sitter
];
+ testHaskellDepends = [ base bytestring hedgehog tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for Python";
license = stdenv.lib.licenses.bsd3;
@@ -235592,6 +236816,8 @@ self: {
pname = "tree-sitter-ruby";
version = "0.1.0.0";
sha256 = "1rcaqib1ly4p54vqwm2mivijqirc031w18hgkccrnyv97yxrbhw9";
+ revision = "1";
+ editedCabalFile = "0vwhd6g77s0y0wxflsfvhxcb4hg527nm0h92xxkxk3f50rf2rp0z";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for Ruby";
@@ -235606,6 +236832,8 @@ self: {
pname = "tree-sitter-tsx";
version = "0.1.0.0";
sha256 = "0jsc5kx5dw4b686dfs7n3vdafyg8mpf94cq2mscwmcyv9w1f3gma";
+ revision = "1";
+ editedCabalFile = "0hfghgxa138m4krml12yf9s3zqnad14ryynzmyqdwb9j25302hb6";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for TSX";
@@ -235620,6 +236848,8 @@ self: {
pname = "tree-sitter-typescript";
version = "0.1.0.0";
sha256 = "1mpk1vhahbva8733anx624vl66fg3h6l9lsby87kf98yrp55ycbn";
+ revision = "1";
+ editedCabalFile = "0ahjxiz4jgym12490xmh2vsyvxly5gza01aasxblncf1h2q1nggi";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for TypeScript";
@@ -235872,8 +237102,8 @@ self: {
pname = "trifecta";
version = "2";
sha256 = "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk";
- revision = "2";
- editedCabalFile = "1ihw0dm0sjn7cql6rb3y0gb5kxy1ca3ggflm4lxlmhm3gfrj2sxc";
+ revision = "4";
+ editedCabalFile = "0xbwyvwl6f2zylk60f2akwgq03qv49113xil7b1z1s3vlwbn5aj1";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
@@ -235886,6 +237116,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "trifecta_2_1" = callPackage
+ ({ mkDerivation, ansi-terminal, array, base, blaze-builder
+ , blaze-html, blaze-markup, bytestring, Cabal, cabal-doctest
+ , charset, comonad, containers, deepseq, doctest, fingertree
+ , ghc-prim, hashable, lens, mtl, parsers, prettyprinter
+ , prettyprinter-ansi-terminal, profunctors, QuickCheck, reducers
+ , semigroups, transformers, unordered-containers, utf8-string
+ }:
+ mkDerivation {
+ pname = "trifecta";
+ version = "2.1";
+ sha256 = "0fr326lzf38m20h2g4189nsyml9w3128924zbd3cd93cgfqcc9bs";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ ansi-terminal array base blaze-builder blaze-html blaze-markup
+ bytestring charset comonad containers deepseq fingertree ghc-prim
+ hashable lens mtl parsers prettyprinter prettyprinter-ansi-terminal
+ profunctors reducers semigroups transformers unordered-containers
+ utf8-string
+ ];
+ testHaskellDepends = [ base doctest parsers QuickCheck ];
+ description = "A modern parser combinator library with convenient diagnostics";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"trigger" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, clock, directory
, exceptions, filepath, formatting, fsnotify, Glob, hspec, process
@@ -236350,8 +237606,8 @@ self: {
}:
mkDerivation {
pname = "ttl-hashtables";
- version = "1.3.1.0";
- sha256 = "0ny9iynlhpaqvqip7i9n5as21mk0kzm6akbcy7xgkams8dv76k5h";
+ version = "1.3.1.1";
+ sha256 = "14ammgggkfmc4divr1zykjadad5fzgspjnzpjfdzj3vwm1rf5gwv";
libraryHaskellDepends = [
base clock containers data-default failable hashable hashtables mtl
transformers
@@ -236643,6 +237899,22 @@ self: {
broken = true;
}) {};
+ "tuples" = callPackage
+ ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes
+ , tasty, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "tuples";
+ version = "0.1.0.0";
+ sha256 = "0kq12l0q7d9mdkmcp2sm7pjgfh00vqkhi0id32sny1lqcnavp415";
+ libraryHaskellDepends = [ base primitive ];
+ testHaskellDepends = [
+ base primitive QuickCheck quickcheck-classes tasty tasty-quickcheck
+ ];
+ description = "Small monomorphic tuples";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"tuples-homogenous-h98" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -236854,28 +238126,27 @@ self: {
}) {};
"tweet-hs" = callPackage
- ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
- , bytestring, composition-prelude, containers, criterion
- , data-default, directory, extra, hspec, htoml-megaparsec
- , http-client, http-client-tls, http-types, megaparsec, microlens
- , optparse-applicative, split, text, unordered-containers
+ ({ mkDerivation, ansi-wl-pprint, authenticate-oauth, base
+ , bytestring, composition-prelude, containers, criterion, directory
+ , extra, htoml-megaparsec, http-client, http-client-tls, http-types
+ , megaparsec, microlens, optparse-applicative, split, text
+ , unordered-containers
}:
mkDerivation {
pname = "tweet-hs";
- version = "1.0.1.43";
- sha256 = "10bxkllxiwm1xbvpz4wh1gd24qkz8y0b7z4ciwqk13jz5ha966x0";
+ version = "1.0.2.1";
+ sha256 = "0b277whd3jywb6w0gkaijmzadpwabmyxvxyg6fmsysq1kp3isrnm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson ansi-wl-pprint authenticate-oauth base bytestring
- composition-prelude containers data-default extra htoml-megaparsec
- http-client http-client-tls http-types megaparsec microlens split
- text unordered-containers
+ ansi-wl-pprint authenticate-oauth base bytestring
+ composition-prelude containers extra htoml-megaparsec http-client
+ http-client-tls http-types megaparsec microlens split text
+ unordered-containers
];
executableHaskellDepends = [
base bytestring directory optparse-applicative
];
- testHaskellDepends = [ base hspec ];
benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
description = "Command-line tool for twitter";
license = stdenv.lib.licenses.bsd3;
@@ -237650,10 +238921,10 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "type-equality";
- version = "0.1.2";
- sha256 = "06acqpkvyvalv5knjzzbgm40hzas6cdfsypvjxsbb0mhq4d80xwr";
+ version = "1";
+ sha256 = "1s4cl11rvvv7n95i3pq9lmmx08kwh4z7l3d1hbv4wi8il81baa27";
libraryHaskellDepends = [ base ];
- description = "Type equality, coercion/cast and other operations";
+ description = "Data.Type.Equality compat package";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -239206,6 +240477,8 @@ self: {
pname = "unagi-chan";
version = "0.4.1.2";
sha256 = "1lnl5n4jnjmm4chp461glcwkrrw63rjz3fvprwxcy3lkpbkrqvgn";
+ revision = "1";
+ editedCabalFile = "09pqi867wskwgc5lpn197f895mbn1174ydgllvcppcsmrz2b6yr6";
libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ];
testHaskellDepends = [
atomic-primops base containers ghc-prim primitive
@@ -239321,6 +240594,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "unbound-kind-generics" = callPackage
+ ({ mkDerivation, base, kind-generics, kind-generics-th
+ , unbound-generics
+ }:
+ mkDerivation {
+ pname = "unbound-kind-generics";
+ version = "0.2.0.0";
+ sha256 = "1hn78dixgd1p0pabh7pg0c7q607irs68vs3ggay8i1s72nc9lvj8";
+ libraryHaskellDepends = [
+ base kind-generics kind-generics-th unbound-generics
+ ];
+ description = "Support for programming with names and binders using kind-generics";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"unbounded-delays" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -239863,8 +241153,8 @@ self: {
pname = "union";
version = "0.1.2";
sha256 = "1i4fvlwkw1wx64a6l8342aqfqsdq7fqa4p24g3i5gn5704lxrsb3";
- revision = "3";
- editedCabalFile = "160jc4ykqvkzw79sb9j95mw7hsnknpfhkbbd75xmkpx08vnv4d76";
+ revision = "4";
+ editedCabalFile = "09b6wqnmv4g2pnjzl5k90yp78jcif8pk40c0spdrbr2vr5766clj";
libraryHaskellDepends = [
base deepseq hashable profunctors tagged vinyl
];
@@ -240264,6 +241554,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "universe_1_1_1" = callPackage
+ ({ mkDerivation, universe-base, universe-dependent-sum
+ , universe-instances-extended, universe-reverse-instances
+ }:
+ mkDerivation {
+ pname = "universe";
+ version = "1.1.1";
+ sha256 = "0jm5wi5blc21jn5hfgmx13ra006dc08dvl1sx7ciq8id87kwvxzg";
+ libraryHaskellDepends = [
+ universe-base universe-dependent-sum universe-instances-extended
+ universe-reverse-instances
+ ];
+ description = "A class for finite and recursively enumerable types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"universe-base" = callPackage
({ mkDerivation, base, containers, QuickCheck, tagged, transformers
}:
@@ -240271,6 +241578,8 @@ self: {
pname = "universe-base";
version = "1.1.1";
sha256 = "1a6yyvrzkz7jnjz4lyp8aw0r5hci1nx8c06v3dicgfqs3frk1v8x";
+ revision = "1";
+ editedCabalFile = "1l6vxapfjhm5mb6w25ah8sl78hdw1ia5s18cf40lm0vzb6ip4bkk";
libraryHaskellDepends = [ base containers tagged transformers ];
testHaskellDepends = [ base containers QuickCheck ];
description = "A class for finite and recursively enumerable types";
@@ -240285,8 +241594,8 @@ self: {
pname = "universe-dependent-sum";
version = "1.1.0.1";
sha256 = "1mfvfh7rnk8lnd5lgxbhi40y31sar11dmgh5s7g2kgsprzmg1qpi";
- revision = "1";
- editedCabalFile = "0mvb919ig57zpvhpmqjsznwjd2wzglwk16w7hkfxzp73p4a21821";
+ revision = "2";
+ editedCabalFile = "1vh93f1nq72fwnrhl9r8qwwiwr26l9pgcmdic56j2b2iz3imnfhc";
libraryHaskellDepends = [
base dependent-sum template-haskell th-abstraction transformers
universe-base
@@ -240324,6 +241633,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "universe-instances-extended_1_1_1" = callPackage
+ ({ mkDerivation, adjunctions, base, comonad, containers
+ , contravariant, universe-base
+ }:
+ mkDerivation {
+ pname = "universe-instances-extended";
+ version = "1.1.1";
+ sha256 = "1ppklq2rjcryld9d9kdzz55vfllfpxxgsvvkhpd1jrvhyj51yahh";
+ libraryHaskellDepends = [
+ adjunctions base comonad containers contravariant universe-base
+ ];
+ description = "Universe instances for types from selected extra packages";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"universe-instances-trans" = callPackage
({ mkDerivation, base, universe-base }:
mkDerivation {
@@ -240343,8 +241668,8 @@ self: {
pname = "universe-reverse-instances";
version = "1.1";
sha256 = "0pdmv146ap0dh38mxhjf11jx3fbr9im7mc0zxb3bsnwpfrv1kfqd";
- revision = "1";
- editedCabalFile = "1v8cqdx20b5a2lrmyyvig8fkwl4ljycmf78g8rap5gngvhfz30rk";
+ revision = "2";
+ editedCabalFile = "1ls6hss9mrdk535k9ssy4lv01gbw11pbqiikpv2m8sjmh65fjilx";
libraryHaskellDepends = [ base containers universe-base ];
description = "Instances of standard classes that are made possible by enumerations";
license = stdenv.lib.licenses.bsd3;
@@ -240402,6 +241727,34 @@ self: {
broken = true;
}) {};
+ "universum_1_6_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, doctest
+ , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
+ , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
+ , text, transformers, unordered-containers, utf8-string, vector
+ }:
+ mkDerivation {
+ pname = "universum";
+ version = "1.6.0";
+ sha256 = "12gz4hpwmykb73dplbd8j628f54ipk0pygrswy0k1k7j68awnjl6";
+ libraryHaskellDepends = [
+ base bytestring containers deepseq ghc-prim hashable microlens
+ microlens-mtl mtl safe-exceptions stm text transformers
+ unordered-containers utf8-string vector
+ ];
+ testHaskellDepends = [
+ base bytestring doctest Glob hedgehog tasty tasty-hedgehog text
+ utf8-string
+ ];
+ benchmarkHaskellDepends = [
+ base containers gauge text unordered-containers
+ ];
+ description = "Custom prelude used in Serokell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"unix_2_7_2_2" = callPackage
({ mkDerivation, base, bytestring, time }:
mkDerivation {
@@ -241224,6 +242577,22 @@ self: {
broken = true;
}) {};
+ "urbit-hob" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, containers, murmur3
+ , text
+ }:
+ mkDerivation {
+ pname = "urbit-hob";
+ version = "0.1.0";
+ sha256 = "01mrj3irlsqfxvswm00k893n6wybc6wxcqddd645wb9q5mpzdsqi";
+ libraryHaskellDepends = [
+ base bytestring cereal containers murmur3 text
+ ];
+ testHaskellDepends = [ base ];
+ description = "Hoon-style atom manipulation and printing functions";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"ureader" = callPackage
({ mkDerivation, ansi-wl-pprint, async, base, bytestring
, containers, curl, data-default, deepseq, directory, download-curl
@@ -242266,8 +243635,8 @@ self: {
pname = "uuid";
version = "1.3.13";
sha256 = "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z";
- revision = "2";
- editedCabalFile = "0m185q62jkfb5jsv358nxbnrkv8y8hd0qqvgvh22wvc5g9ipz0r9";
+ revision = "3";
+ editedCabalFile = "1p2srrapgx1f3zkdjjzm5g0dyfpg1h2g056la85xmpyjs77la2rq";
libraryHaskellDepends = [
base binary bytestring cryptohash-md5 cryptohash-sha1 entropy
network-info random text time uuid-types
@@ -243061,8 +244430,8 @@ self: {
}:
mkDerivation {
pname = "varying";
- version = "0.7.1.0";
- sha256 = "0lb76yqhb6jyfi046cy0axadi10n2h155dhi9c8sqrlwyc0n7hlx";
+ version = "0.7.1.1";
+ sha256 = "03k41nik9nl3qqb4xrwfrqwc58wpdcdfmjls84fp140n2pwgd5av";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base contravariant transformers ];
@@ -243340,6 +244709,8 @@ self: {
pname = "vec";
version = "0.1.1.1";
sha256 = "0gzypyi4vv5ajysbmnpicm8r2qh95nmmrj9l6hp30b95i36cb5as";
+ revision = "1";
+ editedCabalFile = "137f3zjj0fwn3dmynvjg7k4v7k9h24a1gzqfma36hd2svksg8c3d";
libraryHaskellDepends = [
adjunctions base base-compat deepseq distributive fin hashable lens
semigroupoids transformers
@@ -243473,6 +244844,8 @@ self: {
pname = "vector-binary-instances";
version = "0.2.5.1";
sha256 = "04n5cqm1v95pw1bp68l9drjkxqiy2vswxdq0fy1rqcgxisgvji9r";
+ revision = "1";
+ editedCabalFile = "1p7cbxdpix0rakvggnnb06kcrb787fyyqlzric6i4s3rn34547q8";
libraryHaskellDepends = [ base binary vector ];
testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
benchmarkHaskellDepends = [
@@ -243877,6 +245250,8 @@ self: {
pname = "vector-th-unbox";
version = "0.2.1.6";
sha256 = "0d82x55f5vvr1jvaia382m23rs690lg55pvavv8f4ph0y6kd91xy";
+ revision = "1";
+ editedCabalFile = "1bpxdliw7jmks1rkmb8hbr7hng3niz1pfc6n3s8ndj1acrksmfmv";
libraryHaskellDepends = [ base template-haskell vector ];
testHaskellDepends = [ base data-default vector ];
description = "Deriver for Data.Vector.Unboxed using Template Haskell";
@@ -243916,6 +245291,24 @@ self: {
broken = true;
}) {};
+ "vega-view" = callPackage
+ ({ mkDerivation, aeson, base, blaze-html, bytestring, directory
+ , filepath, http-types, scotty, text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "vega-view";
+ version = "0.2.0.2";
+ sha256 = "0r9l77xx0bdrpn0jj432cdrw6xw9ni09f08n70kik57raay04bnq";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson base blaze-html bytestring directory filepath http-types
+ scotty text unordered-containers
+ ];
+ description = "Easily view Vega or Vega-Lite visualizations";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"verbalexpressions" = callPackage
({ mkDerivation, base, regex-pcre }:
mkDerivation {
@@ -244083,8 +245476,8 @@ self: {
}:
mkDerivation {
pname = "versions";
- version = "3.5.1";
- sha256 = "1qbihyqw99wkdmslvxqkj6h8x0ih9w86h4s7k51maaicmgijm94w";
+ version = "3.5.1.1";
+ sha256 = "1cs004ixw6rp2zg9hyw4yf0n15rq3s1ns9yy18rr8sxmcsw6jb9g";
libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
testHaskellDepends = [
base base-prelude checkers megaparsec microlens QuickCheck tasty
@@ -244233,8 +245626,8 @@ self: {
}:
mkDerivation {
pname = "viewprof";
- version = "0.0.0.28";
- sha256 = "1l2cjisay7vbqb64xd4lkz594x2ji2gs249h9j4anbifzg6bbjb2";
+ version = "0.0.0.29";
+ sha256 = "1cy1p1dq6blval791x01rpf1ihqawyj1shfgz46hmmfx1f5dlcdv";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -244245,6 +245638,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "viewprof_0_0_0_30" = callPackage
+ ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
+ , scientific, text, vector, vector-algorithms, vty
+ }:
+ mkDerivation {
+ pname = "viewprof";
+ version = "0.0.0.30";
+ sha256 = "0l3hf7dj9y4zr6qzih3xl3yz56pjd4gy9jfk9aqypv2rcvwh1w17";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base brick containers directory ghc-prof lens scientific text
+ vector vector-algorithms vty
+ ];
+ description = "Text-based interactive GHC .prof viewer";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"views" = callPackage
({ mkDerivation, base, mtl }:
mkDerivation {
@@ -244652,18 +246064,18 @@ self: {
"visualize-cbn" = callPackage
({ mkDerivation, ansi-terminal, base, blaze-html, blaze-markup
- , containers, data-default, optparse-applicative, parsec
+ , containers, data-default, mtl, optparse-applicative, parsec
, template-haskell, text
}:
mkDerivation {
pname = "visualize-cbn";
- version = "0.1.0.1";
- sha256 = "0aj8s3gn2qha409n1sf9a5psh5mvb2qcmqax62c2miw5i79rh7ap";
+ version = "0.1.0.2";
+ sha256 = "1vlidljhy0ykflgf7k8gawlqazcrkvcs7r8wbv7h9x6wfnx0w334";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
ansi-terminal base blaze-html blaze-markup containers data-default
- optparse-applicative parsec template-haskell text
+ mtl optparse-applicative parsec template-haskell text
];
description = "Visualize CBN reduction";
license = stdenv.lib.licenses.bsd3;
@@ -245082,33 +246494,35 @@ self: {
({ mkDerivation, attoparsec, base, bifunctors, bytestring, Cabal
, cabal-doctest, containers, contravariant, digit, directory
, distributive, doctest, errors, filepath, generics-sop, hedgehog
- , hedgehog-fn, hoist-error, hw-balancedparens, hw-bits, hw-json
- , hw-prim, hw-rankselect, lens, mmorph, mtl, nats, natural, parsers
- , scientific, semigroupoids, semigroups, tagged, tasty
- , tasty-expected-failure, tasty-golden, tasty-hedgehog, tasty-hunit
- , template-haskell, text, transformers, unordered-containers
- , vector, witherable, wl-pprint-annotated, zippers
+ , hedgehog-fn, hoist-error, hw-balancedparens, hw-bits
+ , hw-json-standard-cursor, hw-prim, hw-rankselect, lens, mmorph
+ , mtl, nats, natural, parsers, records-sop, scientific
+ , semigroupoids, semigroups, tagged, tasty, tasty-expected-failure
+ , tasty-golden, tasty-hedgehog, tasty-hunit, template-haskell, text
+ , transformers, unordered-containers, vector, witherable
+ , wl-pprint-annotated, zippers
}:
mkDerivation {
pname = "waargonaut";
- version = "0.6.2.0";
- sha256 = "1s9il54r5hqp4fbxn5012f7l6ir6fy2v6xv5xf57zh1sz0ifxj2f";
+ version = "0.8.0.0";
+ sha256 = "1pvs379s1w5nzr5hb1c5fbbbjgvsnvggj3l1l5j6klm0zf1y7x4h";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
attoparsec base bifunctors bytestring containers contravariant
digit distributive errors generics-sop hoist-error
- hw-balancedparens hw-bits hw-json hw-prim hw-rankselect lens mmorph
- mtl nats natural parsers scientific semigroupoids semigroups tagged
- text transformers unordered-containers vector witherable
- wl-pprint-annotated zippers
+ hw-balancedparens hw-bits hw-json-standard-cursor hw-prim
+ hw-rankselect lens mmorph mtl nats natural parsers records-sop
+ scientific semigroupoids semigroups tagged text transformers
+ unordered-containers vector witherable wl-pprint-annotated zippers
];
testHaskellDepends = [
attoparsec base bytestring containers contravariant digit directory
distributive doctest filepath generics-sop hedgehog hedgehog-fn
- hw-balancedparens hw-bits hw-json hw-prim hw-rankselect lens mtl
- natural scientific semigroupoids semigroups tagged tasty
- tasty-expected-failure tasty-golden tasty-hedgehog tasty-hunit
- template-haskell text unordered-containers vector zippers
+ hw-balancedparens hw-bits hw-json-standard-cursor hw-prim
+ hw-rankselect lens mtl natural scientific semigroupoids semigroups
+ tagged tasty tasty-expected-failure tasty-golden tasty-hedgehog
+ tasty-hunit template-haskell text unordered-containers vector
+ zippers
];
description = "JSON wrangling";
license = stdenv.lib.licenses.bsd3;
@@ -247074,7 +248488,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "warp_3_3_0" = callPackage
+ "warp_3_3_1" = callPackage
({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
, bytestring, case-insensitive, containers, directory, gauge
, ghc-prim, hashable, hspec, http-client, http-date, http-types
@@ -247084,8 +248498,8 @@ self: {
}:
mkDerivation {
pname = "warp";
- version = "3.3.0";
- sha256 = "0dqh1rrrmhw343786337qwgjwap8yk91zrxc9vxdmal6mkf1q4dq";
+ version = "3.3.1";
+ sha256 = "0qay9h5cby5vcb1nkbrn4ch5xmj2i01g8f3psmvbgs854w2x0ygn";
libraryHaskellDepends = [
array async auto-update base bsb-http-chunked bytestring
case-insensitive containers ghc-prim hashable http-date http-types
@@ -247184,6 +248598,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "warp-tls_3_2_8" = callPackage
+ ({ mkDerivation, base, bytestring, cryptonite, data-default-class
+ , network, streaming-commons, tls, tls-session-manager, wai, warp
+ }:
+ mkDerivation {
+ pname = "warp-tls";
+ version = "3.2.8";
+ sha256 = "1z5jzl40x1gp249fk8h51gkw6m3hzxchm2bp3kbpqdgmw8r5im8y";
+ libraryHaskellDepends = [
+ base bytestring cryptonite data-default-class network
+ streaming-commons tls tls-session-manager wai warp
+ ];
+ description = "HTTP over TLS support for Warp via the TLS package";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"warp-tls-uid" = callPackage
({ mkDerivation, base, bytestring, data-default, network
, streaming-commons, tls, unix, wai, warp, warp-tls, x509
@@ -248815,6 +250246,17 @@ self: {
broken = true;
}) {};
+ "which" = callPackage
+ ({ mkDerivation, base, shelly, template-haskell, text }:
+ mkDerivation {
+ pname = "which";
+ version = "0.1.0.0";
+ sha256 = "0w1jik9bkndx8ssd00i1ii686kb0fd2sc0slr7ki561g5z1xa7dz";
+ libraryHaskellDepends = [ base shelly template-haskell text ];
+ description = "Determine the full path to an executable";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"while-lang-parser" = callPackage
({ mkDerivation, base, indents, parsec }:
mkDerivation {
@@ -249330,16 +250772,18 @@ self: {
}) {};
"witherable" = callPackage
- ({ mkDerivation, base, base-orphans, containers, hashable
+ ({ mkDerivation, base, base-orphans, containers, hashable, lens
, monoidal-containers, transformers, transformers-compat
, unordered-containers, vector
}:
mkDerivation {
pname = "witherable";
- version = "0.3.2";
- sha256 = "1iqf3kc9h599lbiym8rf9b4fhj31lqwm1cxqz6x02q9dxyrcprmi";
+ version = "0.3.3";
+ sha256 = "0pp2p2zhdjv3kq8dywcj9hcdaf0i37vihaxcxbs889iiw2cgy9hj";
+ revision = "1";
+ editedCabalFile = "1v10h2biv5k9amahw77755k60wgqp0d36d1rb2vy8qjh07gnnanr";
libraryHaskellDepends = [
- base base-orphans containers hashable monoidal-containers
+ base base-orphans containers hashable lens monoidal-containers
transformers transformers-compat unordered-containers vector
];
description = "filterable traversable";
@@ -251767,8 +253211,6 @@ self: {
benchmarkHaskellDepends = [ base bytestring criterion ];
description = "Simple and incomplete Excel file parser/writer";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"xlsx-tabular" = callPackage
@@ -252043,8 +253485,8 @@ self: {
}:
mkDerivation {
pname = "xml-hamlet";
- version = "0.5.0";
- sha256 = "18qmj14jzh379fni477h5hrzcy1x7dajfczx1s3w4wiyv2mc1kkv";
+ version = "0.5.0.1";
+ sha256 = "0jrhcjy7ww59dafg857f2g2df1fw2jmbwcs1q379ph0pc5rxj3lj";
libraryHaskellDepends = [
base containers parsec shakespeare template-haskell text
xml-conduit
@@ -252848,8 +254290,8 @@ self: {
({ mkDerivation, base, containers, dbus, X11 }:
mkDerivation {
pname = "xmonad-spotify";
- version = "0.1.1.0";
- sha256 = "1pihi0959wys3sd4r8r1rmh5vx84174wmjpanbyihzjhykvf7n2j";
+ version = "0.1.2.2";
+ sha256 = "0hps37yqn3grgg65wm3j41dh40fqi64ni12mgk0lfigw2fghfnvj";
libraryHaskellDepends = [ base containers dbus X11 ];
description = "Bind media keys to work with Spotify";
license = stdenv.lib.licenses.bsd3;
@@ -252901,6 +254343,8 @@ self: {
pname = "xmonad-volume";
version = "0.1.1.0";
sha256 = "0bc52vy142hn75k52zz8afjfxwv86p73kmqmi48rqiws10kpnclw";
+ revision = "2";
+ editedCabalFile = "1m1kcsvz3h8qfdbsr7xjibay9377jqq6pj5mgq08s0kmgqi4h0wn";
libraryHaskellDepends = [
alsa-mixer base composition-prelude containers X11
];
@@ -253497,6 +254941,8 @@ self: {
];
description = "A wrapper of servant";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"yam-app" = callPackage
@@ -253553,6 +254999,8 @@ self: {
];
description = "Yam DataSource Middleware";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"yam-job" = callPackage
@@ -253596,6 +255044,8 @@ self: {
];
description = "Yam Redis Middleware";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"yam-servant" = callPackage
@@ -253708,35 +255158,6 @@ self: {
}) {};
"yaml" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
- , conduit, containers, directory, filepath, hspec, HUnit, libyaml
- , mockery, mtl, raw-strings-qq, resourcet, scientific
- , template-haskell, temporary, text, transformers
- , unordered-containers, vector
- }:
- mkDerivation {
- pname = "yaml";
- version = "0.11.1.1";
- sha256 = "0zshpjggz3agzvqwirywpz79q4wq43vsz0pw1iq4dhf4ajjrmzrp";
- configureFlags = [ "-fsystem-libyaml" ];
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson attoparsec base bytestring conduit containers directory
- filepath libyaml mtl resourcet scientific template-haskell text
- transformers unordered-containers vector
- ];
- testHaskellDepends = [
- aeson attoparsec base base-compat bytestring conduit containers
- directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq
- resourcet scientific template-haskell temporary text transformers
- unordered-containers vector
- ];
- description = "Support for parsing and rendering YAML documents";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "yaml_0_11_1_2" = callPackage
({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
, conduit, containers, directory, filepath, hspec, HUnit, libyaml
, mockery, mtl, raw-strings-qq, resourcet, scientific
@@ -253763,7 +255184,6 @@ self: {
];
description = "Support for parsing and rendering YAML documents";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yaml-combinators" = callPackage
@@ -254618,8 +256038,8 @@ self: {
}:
mkDerivation {
pname = "yesod-auth";
- version = "1.6.7";
- sha256 = "0p9c26ic45bmsjvfb7kam87ja2vbd4m7qm27znvfrn9wvijhjzp9";
+ version = "1.6.8";
+ sha256 = "0d2nrzrqymbbp5hfwp7c6k6gr0vn6ladq0dl7wgwrybfx8nqgf65";
libraryHaskellDepends = [
aeson authenticate base base16-bytestring base64-bytestring binary
blaze-builder blaze-html blaze-markup bytestring conduit
@@ -254938,8 +256358,8 @@ self: {
}:
mkDerivation {
pname = "yesod-auth-oauth2";
- version = "0.6.1.1";
- sha256 = "19y5m94njn26vglnyrpzy59614dj7f7wbgnc354syr8qmdiliczp";
+ version = "0.6.1.2";
+ sha256 = "07jm60q1fbdk53ncirbi8clsimg28k9j12kaq0vx2apn2rlmdy2w";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -255197,8 +256617,8 @@ self: {
}:
mkDerivation {
pname = "yesod-core";
- version = "1.6.15";
- sha256 = "0rzmx9cx2lzlmhjrbczdpzv6divwr0n6h3330rsdh15kn8wjkfr8";
+ version = "1.6.16.1";
+ sha256 = "0a0yv7wkwvb0n6iia532y9nzrirgnm09pjc8hpm0lx4ff609pgd2";
libraryHaskellDepends = [
aeson auto-update base blaze-html blaze-markup bytestring
case-insensitive cereal clientsession conduit conduit-extra
@@ -255508,6 +256928,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "yesod-form_1_6_7" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+ , blaze-markup, byteable, bytestring, containers, data-default
+ , email-validate, hspec, network-uri, persistent, resourcet
+ , semigroups, shakespeare, text, time, transformers, wai
+ , xss-sanitize, yesod-core, yesod-persistent
+ }:
+ mkDerivation {
+ pname = "yesod-form";
+ version = "1.6.7";
+ sha256 = "0mny71dyp6cp5akyp5wvmrhmip5rkqi8ibdn3lipvmajx9h58r5d";
+ libraryHaskellDepends = [
+ aeson attoparsec base blaze-builder blaze-html blaze-markup
+ byteable bytestring containers data-default email-validate
+ network-uri persistent resourcet semigroups shakespeare text time
+ transformers wai xss-sanitize yesod-core yesod-persistent
+ ];
+ testHaskellDepends = [ base hspec text time ];
+ description = "Form handling support for Yesod Web Framework";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yesod-form-bootstrap4" = callPackage
({ mkDerivation, base, blaze-html, blaze-markup, shakespeare, text
, yesod-core, yesod-form
@@ -258469,23 +259912,6 @@ self: {
}) {};
"zlib" = callPackage
- ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
- , tasty-quickcheck, zlib
- }:
- mkDerivation {
- pname = "zlib";
- version = "0.6.2";
- sha256 = "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d";
- libraryHaskellDepends = [ base bytestring ];
- librarySystemDepends = [ zlib ];
- testHaskellDepends = [
- base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
- ];
- description = "Compression and decompression in the gzip and zlib formats";
- license = stdenv.lib.licenses.bsd3;
- }) {inherit (pkgs) zlib;};
-
- "zlib_0_6_2_1" = callPackage
({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
, tasty-quickcheck, zlib
}:
@@ -258500,7 +259926,6 @@ self: {
];
description = "Compression and decompression in the gzip and zlib formats";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) zlib;};
"zlib-bindings" = callPackage
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index c7fbab6ab88c..0bb930a8bb3a 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -57,11 +57,11 @@ stdenv.mkDerivation {
name = "hoogle-local-0.1";
buildInputs = [ghc hoogle];
- phases = [ "buildPhase" ];
-
inherit docPackages;
- buildPhase = ''
+ passAsFile = ["buildCommand"];
+
+ buildCommand = ''
${lib.optionalString (packages != [] -> docPackages == [])
("echo WARNING: localHoogle package list empty, even though"
+ " the following were specified: "
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index a88d07d1655f..8d93492209c6 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -11,14 +11,14 @@ revs = {
"8.2" = "8.2";
};
in stdenv.mkDerivation rec {
- name = "acl2-${version}";
+ pname = "acl2";
version = "8.2";
src = fetchFromGitHub {
owner = "acl2-devel";
repo = "acl2-devel";
- rev = revs."${version}";
- sha256 = hashes."${version}";
+ rev = revs.${version};
+ sha256 = hashes.${version};
};
buildInputs = [ sbcl
diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix
index 85794b09ae0b..744106bce5d0 100644
--- a/pkgs/development/interpreters/bats/default.nix
+++ b/pkgs/development/interpreters/bats/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, gnugrep }:
stdenv.mkDerivation rec {
- name = "bats-${version}";
+ pname = "bats";
version = "1.1.0";
src = fetchzip {
diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix
index 29d63f1d0048..cde9146f78c6 100644
--- a/pkgs/development/interpreters/ceptre/default.nix
+++ b/pkgs/development/interpreters/ceptre/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, mlton }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ceptre-2016-11-27";
src = fetchgit {
diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix
index b597ba6fe789..c70bfd9406e0 100644
--- a/pkgs/development/interpreters/clips/default.nix
+++ b/pkgs/development/interpreters/clips/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "6.30";
- name = "clips-${version}";
+ pname = "clips";
src = fetchurl {
url = "mirror://sourceforge/clipsrules/CLIPS/6.30/clips_core_source_630.tar.Z";
sha256 = "1r0m59l3mk9cwzq3nmyr5qxrlkzp3njls4hfv8ml85dmqh7n3ysy";
diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix
index 57ced325aad0..369d84708dc4 100644
--- a/pkgs/development/interpreters/clojure/clooj.nix
+++ b/pkgs/development/interpreters/clojure/clooj.nix
@@ -3,7 +3,8 @@
let version = "0.4.4"; in
stdenv.mkDerivation {
- name = "clooj-${version}";
+ pname = "clooj";
+ inherit version;
jar = fetchurl {
# mirrored as original mediafire.com source does not work without user interaction
diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix
index 16f3e7f73e20..0e9d81d5e959 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/default.nix
+++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix
@@ -126,9 +126,9 @@ let # packageJSON=./package.json;
getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar;
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit version;
- name = "lumo-${version}";
+ pname = "lumo";
src = fetchurl {
url = "https://github.com/anmonteiro/lumo/archive/${version}.tar.gz";
diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index fa8996f0fb56..02ac6bfbcde7 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -47,7 +47,8 @@ in
stdenv.mkDerivation {
- name = "dart-${version}";
+ pname = "dart";
+ inherit version;
nativeBuildInputs = [
unzip
diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix
index f79c30740a12..f968e04bbe99 100644
--- a/pkgs/development/interpreters/duktape/default.nix
+++ b/pkgs/development/interpreters/duktape/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "duktape-${version}";
+ pname = "duktape";
version = "2.4.0";
src = fetchurl {
url = "http://duktape.org/duktape-${version}.tar.xz";
diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix
index 258aebe81727..7c7cd9abb7e9 100644
--- a/pkgs/development/interpreters/eff/default.nix
+++ b/pkgs/development/interpreters/eff/default.nix
@@ -4,7 +4,8 @@ let version = "5.0"; in
stdenv.mkDerivation {
- name = "eff-${version}";
+ pname = "eff";
+ inherit version;
src = fetchFromGitHub {
owner = "matijapretnar";
diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix
index d32f91275652..229c42d9f7b2 100644
--- a/pkgs/development/interpreters/elixir/1.5.nix
+++ b/pkgs/development/interpreters/elixir/1.5.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "1.5.3";
sha256 = "00kgqcn9g6vflc551wniz9pwv7pszyf8v6smpkqs50j3kbliihy5";
minimumOTPVersion = "18";
diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix
index 73afcbd1597e..94dffd1f763d 100644
--- a/pkgs/development/interpreters/elixir/1.6.nix
+++ b/pkgs/development/interpreters/elixir/1.6.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "1.6.6";
sha256 = "1wl8rfpw0dxacq4f7xf6wjr8v2ww5691d0cfw9pzw7phd19vazgl";
minimumOTPVersion = "19";
diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix
index adbbbaff890b..10ebd5438a11 100644
--- a/pkgs/development/interpreters/elixir/1.7.nix
+++ b/pkgs/development/interpreters/elixir/1.7.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "1.7.4";
sha256 = "0f8j4pib13kffiihagdwl3xqs3a1ak19qz3z8fpyfxn9dnjiinla";
minimumOTPVersion = "19";
diff --git a/pkgs/development/interpreters/elixir/1.8.nix b/pkgs/development/interpreters/elixir/1.8.nix
index e240e1907e06..931fa50b1f72 100644
--- a/pkgs/development/interpreters/elixir/1.8.nix
+++ b/pkgs/development/interpreters/elixir/1.8.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "1.8.2";
sha256 = "1n77cpcl2b773gmj3m9s24akvj9gph9byqbmj2pvlsmby4aqwckq";
minimumOTPVersion = "20";
diff --git a/pkgs/development/interpreters/elixir/1.9.nix b/pkgs/development/interpreters/elixir/1.9.nix
index 41601eeaa118..b9b2400b78b9 100644
--- a/pkgs/development/interpreters/elixir/1.9.nix
+++ b/pkgs/development/interpreters/elixir/1.9.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "1.9.1";
sha256 = "106s2a3dykc5iwfrd5icqd737yfzaz1dw4x5v1j5z2fvf46h96dx";
minimumOTPVersion = "20";
diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix
index c263551de2da..11637868ed0f 100644
--- a/pkgs/development/interpreters/erlang/R16B02-basho.nix
+++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix
@@ -1,6 +1,6 @@
{ pkgs, mkDerivation }:
-mkDerivation rec {
+mkDerivation {
baseName = "erlang";
version = "16B02.basho10";
diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix
index 58b7fd71f0be..e9d9366851eb 100644
--- a/pkgs/development/interpreters/erlang/R18.nix
+++ b/pkgs/development/interpreters/erlang/R18.nix
@@ -21,7 +21,7 @@ let
sha256 = "1cj9fjhdng6yllajjm3gkk04ag9bwyb3n70hrb5nk6c292v8a45c";
};
-in mkDerivation rec {
+in mkDerivation {
version = "18.3.4.8";
sha256 = "16c0h25hh5yvkv436ks5jbd7qmxzb6ndvk64mr404347a20iib0g";
diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index 25a3f662565c..d5f3afe5f3df 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -1,6 +1,6 @@
{ mkDerivation, fetchpatch }:
-mkDerivation rec {
+mkDerivation {
version = "19.3.6.11";
sha256 = "0b02iv8dly1vkc2xnqqi030sdj34h4gji2h4qgilllajr1f868vm";
diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix
index 016e175d6b56..3a33e55767b4 100644
--- a/pkgs/development/interpreters/erlang/R20.nix
+++ b/pkgs/development/interpreters/erlang/R20.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "20.3.8.9";
sha256 = "0v2iiyzss8hiih98wvj0gi2qzdmmhh7bvc9p025wlfm4k7r1109a";
diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix
index e21bf6dafbff..fdd034fc6075 100644
--- a/pkgs/development/interpreters/erlang/R21.nix
+++ b/pkgs/development/interpreters/erlang/R21.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "21.3.8.3";
sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw";
diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix
index a8c05513c5a6..8b471f632471 100644
--- a/pkgs/development/interpreters/erlang/R22.nix
+++ b/pkgs/development/interpreters/erlang/R22.nix
@@ -1,6 +1,6 @@
{ mkDerivation }:
-mkDerivation rec {
+mkDerivation {
version = "22.0.4";
sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai";
diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix
index 857a1e5cd8df..39d4918a70bf 100644
--- a/pkgs/development/interpreters/falcon/default.nix
+++ b/pkgs/development/interpreters/falcon/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }:
-stdenv.mkDerivation rec {
- name = "falcon-${version}";
+stdenv.mkDerivation {
+ pname = "falcon";
version = "2013-09-19";
src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix
index a0d20b7ebe4f..71542046af91 100644
--- a/pkgs/development/interpreters/gauche/default.nix
+++ b/pkgs/development/interpreters/gauche/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "gauche-${version}";
+ pname = "gauche";
version = "0.9.8";
src = fetchurl {
diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index cd7dacf65279..94ec02443823 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, readline, gettext, ncurses }:
stdenv.mkDerivation rec {
- name = "gnu-apl-${version}";
+ pname = "gnu-apl";
version = "1.8";
src = fetchurl {
@@ -11,9 +11,13 @@ stdenv.mkDerivation rec {
buildInputs = [ readline gettext ncurses ];
- # Needed with GCC 7
- NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=int-in-bool-context"
- + stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=null-dereference";
+ # Needed with GCC 8
+ NIX_CFLAGS_COMPILE = with stdenv.lib; (optionals stdenv.cc.isGNU [
+ "-Wno-error=int-in-bool-context"
+ "-Wno-error=class-memaccess"
+ "-Wno-error=restrict"
+ "-Wno-error=format-truncation"
+ ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference";
patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h"
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index d5635fc22327..bdd138418969 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -3,7 +3,7 @@
# at runtime, need jdk
stdenv.mkDerivation rec {
- name = "groovy-${version}";
+ pname = "groovy";
version = "2.5.8";
src = fetchurl {
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index 24266d596765..af71d5cc80d7 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -122,6 +122,6 @@
(stdenv.lib.optionalAttrs (!stdenv.isLinux) {
# Work around .
- SHELL = "${stdenv.shell}";
- CONFIG_SHELL = "${stdenv.shell}";
+ SHELL = stdenv.shell;
+ CONFIG_SHELL = stdenv.shell;
})
diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix
index 56becd3d6c94..0d3fe100329c 100644
--- a/pkgs/development/interpreters/icon-lang/default.nix
+++ b/pkgs/development/interpreters/icon-lang/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libX11, libXt , withGraphics ? true }:
stdenv.mkDerivation rec {
- name = "icon-lang-${version}";
+ pname = "icon-lang";
version = "9.5.1";
src = fetchFromGitHub {
owner = "gtownsend";
diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index 11feb1170c2c..791ac6dd3381 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, readline, libedit, bc }:
stdenv.mkDerivation rec {
- name = "j-${version}";
+ pname = "j";
version = "807";
jtype = "release";
src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix
index 704e3eb4031a..91b4c0b9a9e6 100644
--- a/pkgs/development/interpreters/jimtcl/default.nix
+++ b/pkgs/development/interpreters/jimtcl/default.nix
@@ -4,7 +4,7 @@ let
makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL");
in stdenv.mkDerivation rec {
- name = "jimtcl-${version}";
+ pname = "jimtcl";
version = "0.78";
src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index ba65c00f1e9d..233900cadd03 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -1,27 +1,17 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
- name = "joker-${version}";
- version = "0.12.4";
-
- goPackagePath = "github.com/candid82/joker";
+buildGoModule rec {
+ pname = "joker";
+ version = "0.12.7";
src = fetchFromGitHub {
rev = "v${version}";
owner = "candid82";
repo = "joker";
- sha256 = "1swi991khmyhxn6w6xsdqp1wbyx3qmd9d7yhpwvqasyxp8gg3szm";
+ sha256 = "0panmhrg1i158xbvqvq3s3217smbj7ynwlaiks18pmss36xx9dk4";
};
- preBuild = "go generate ./...";
-
- postBuild = "rm go/bin/sum256dir";
-
- dontInstallSrc = true;
-
- excludedPackages = "gen"; # Do not install private generators.
-
- goDeps = ./deps.nix;
+ modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j";
meta = with stdenv.lib; {
homepage = https://github.com/candid82/joker;
diff --git a/pkgs/development/interpreters/joker/deps.nix b/pkgs/development/interpreters/joker/deps.nix
deleted file mode 100644
index 4eff988796b3..000000000000
--- a/pkgs/development/interpreters/joker/deps.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-[
- {
- goPackagePath = "github.com/chzyer/readline";
- fetch = {
- type = "git";
- url = "https://github.com/chzyer/readline";
- rev = "6a4bc7b4feaeff8feb63f87d5fb2cf3e3610a559";
- sha256 = "1ny3rws671sa9bj5phg6k1rprlgzys73kfdr14vxq4wnwz84zbrc";
- };
- }
- {
- goPackagePath = "github.com/pkg/profile";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/profile";
- rev = "5b67d428864e92711fcbd2f8629456121a56d91f";
- sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
- sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
- };
- }
-]
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 56c0f1f73e6c..6c4a9f20fa3e 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -4,7 +4,7 @@ let
# The version number here is whatever is reported by the RUBY_VERSION string
rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
jruby = stdenv.mkDerivation rec {
- name = "jruby-${version}";
+ pname = "jruby";
version = "9.2.8.0";
diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix
index f822fdd9c8f0..0e1734565f2f 100644
--- a/pkgs/development/interpreters/jython/default.nix
+++ b/pkgs/development/interpreters/jython/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- name = "jython-${version}";
+ pname = "jython";
version = "2.7.1";
diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix
index 03c836d9251a..a9922a387657 100644
--- a/pkgs/development/interpreters/kona/default.nix
+++ b/pkgs/development/interpreters/kona/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "kona-${version}";
+ pname = "kona";
version = "3.21";
src = fetchurl {
url = "https://github.com/kevinlawler/kona/archive/Win.${version}-64.tar.gz";
diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix
index 284773fe660f..3ef239e89a9a 100644
--- a/pkgs/development/interpreters/lolcode/default.nix
+++ b/pkgs/development/interpreters/lolcode/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "lolcode-${version}";
+ pname = "lolcode";
version = "0.11.2";
src = fetchurl {
diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix
index 07ce9347cf70..7e90c6dfb287 100644
--- a/pkgs/development/interpreters/love/0.10.nix
+++ b/pkgs/development/interpreters/love/0.10.nix
@@ -8,12 +8,12 @@ let
version = "0.10.2";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromBitbucket {
owner = "rude";
repo = "love";
- rev = "${version}";
+ rev = version;
sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym";
};
diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix
index 5fbb34bf213a..792fe299e4dd 100644
--- a/pkgs/development/interpreters/love/0.8.nix
+++ b/pkgs/development/interpreters/love/0.8.nix
@@ -5,9 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "love-0.8.0";
+ pname = "love";
+ version = "0.8.0";
+
src = fetchurl {
- url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz";
+ url = "https://bitbucket.org/rude/love/downloads/${pname}-${version}-linux-src.tar.gz";
sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi";
};
@@ -36,13 +38,14 @@ stdenv.mkDerivation rec {
} || true
'';
- NIX_CFLAGS_COMPILE = ''
- -I${SDL.dev}/include/SDL
- -I${freetype.dev}include/freetype2
- '';
+ NIX_CFLAGS_COMPILE = [
+ "-I${SDL.dev}/include/SDL"
+ "-I${freetype.dev}include/freetype2"
+ "-DGL_GLEXT_PROTOTYPES" # https://community.khronos.org/t/glgenbuffers-was-not-declared-in-this-scope/59283/2
+ ];
meta = {
- homepage = http://love2d.org;
+ homepage = "http://love2d.org";
description = "A Lua-based 2D game engine/scripting language";
license = stdenv.lib.licenses.zlib;
diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix
index 7adaca7b8656..478b147d1f3d 100644
--- a/pkgs/development/interpreters/love/11.1.nix
+++ b/pkgs/development/interpreters/love/11.1.nix
@@ -8,12 +8,12 @@ let
version = "11.2";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromBitbucket {
owner = "rude";
repo = "love";
- rev = "${version}";
+ rev = version;
sha256 = "0q1lsgc1621czrg49nmabq6am9sgxa9syxrwzlksqqr4dyzw4nmf";
};
diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix
index 7aa41e95cc9b..64050ea95f87 100644
--- a/pkgs/development/interpreters/lua-5/filesystem.nix
+++ b/pkgs/development/interpreters/lua-5/filesystem.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, lua5 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.6.2";
- name = "lua-filesystem-${version}";
+ pname = "lua-filesystem";
isLibrary = true;
src = fetchurl {
url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz";
diff --git a/pkgs/development/interpreters/lua-5/setup-hook.sh b/pkgs/development/interpreters/lua-5/setup-hook.sh
index 3989bedffdb1..f7e56b62ac90 100644
--- a/pkgs/development/interpreters/lua-5/setup-hook.sh
+++ b/pkgs/development/interpreters/lua-5/setup-hook.sh
@@ -1,47 +1,47 @@
# set -e
nix_print() {
- if [ ${NIX_DEBUG:-0} -ge $1 ]; then
- echo "$2"
- fi
+ if [ ${NIX_DEBUG:-0} -ge $1 ]; then
+ echo "$2"
+ fi
}
nix_debug() {
- nix_print 3 "$1"
+ nix_print 3 "$1"
}
addToLuaSearchPathWithCustomDelimiter() {
- local varName="$1"
- local absPattern="$2"
- # delete longest match starting from the lua placeholder '?'
- local topDir="${absPattern%%\?*}"
+ local varName="$1"
+ local absPattern="$2"
+ # delete longest match starting from the lua placeholder '?'
+ local topDir="${absPattern%%\?*}"
- # export only if the folder exists else LUA_PATH grows too big
- if [ ! -d "$topDir" ]; then return; fi
+ # export only if the folder exists else LUA_PATH/LUA_CPATH grow too large
+ if [[ ! -d "$topDir" ]]; then return; fi
- export "${varName}=${!varName:+${!varName};}${absPattern}"
+ # export only if we haven't already got this dir in the search path
+ if [[ ${!varName} == *"$absPattern"* ]]; then return; fi
+
+ export "${varName}=${!varName:+${!varName};}${absPattern}"
}
addToLuaPath() {
- local dir="$1"
+ local dir="$1"
- if [[ ! -d "$dir" ]]; then
- nix_debug "$dir not a directory abort"
- return 0
- fi
- cd "$dir"
- for pattern in @luapathsearchpaths@;
- do
- addToLuaSearchPathWithCustomDelimiter NIX_LUA_PATH "$PWD/$pattern"
- done
+ if [[ ! -d "$dir" ]]; then
+ nix_debug "$dir not a directory abort"
+ return 0
+ fi
+ cd "$dir"
+ for pattern in @luapathsearchpaths@; do
+ addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern"
+ done
- # LUA_CPATH
- for pattern in @luacpathsearchpaths@;
- do
- addToLuaSearchPathWithCustomDelimiter NIX_LUA_CPATH "$PWD/$pattern"
- done
- cd - >/dev/null
+ # LUA_CPATH
+ for pattern in @luacpathsearchpaths@; do
+ addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern"
+ done
+ cd - >/dev/null
}
addEnvHooks "$hostOffset" addToLuaPath
-
diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix
index d8a789e9209e..f0eb1becc578 100644
--- a/pkgs/development/interpreters/lua-5/sockets.nix
+++ b/pkgs/development/interpreters/lua-5/sockets.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, lua5 }:
stdenv.mkDerivation rec {
- name = "lua-sockets-${version}";
+ pname = "lua-sockets";
version = "2.0.2";
src = fetchurl {
url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz";
diff --git a/pkgs/development/interpreters/lua-5/wrap.sh b/pkgs/development/interpreters/lua-5/wrap.sh
index 545a0ae271c4..5941ff4a6b98 100644
--- a/pkgs/development/interpreters/lua-5/wrap.sh
+++ b/pkgs/development/interpreters/lua-5/wrap.sh
@@ -4,73 +4,72 @@
set -e
wrapLuaPrograms() {
- wrapLuaProgramsIn "$out/bin" "$out $luaPath"
+ wrapLuaProgramsIn "$out/bin" "$out $luaPath"
}
# Builds environment variables like LUA_PATH and PATH walking through closure
# of dependencies.
buildLuaPath() {
- local luaPath="$1"
- local path
+ local luaPath="$1"
+ local path
- # Create an empty table of paths (see doc on loadFromPropagatedInputs
- # for how this is used). Build up the program_PATH and program_LUA_PATH
- # variables.
- declare -A luaPathsSeen=()
- program_PATH=
- luaPathsSeen["@lua@"]=1
- addToSearchPath program_PATH @lua@/bin
- for path in $luaPath; do
- addToLuaPath "$path"
- done
+ # Create an empty table of paths (see doc on loadFromPropagatedInputs
+ # for how this is used). Build up the program_PATH and program_LUA_PATH
+ # variables.
+ declare -A luaPathsSeen=()
+ program_PATH=
+ luaPathsSeen["@lua@"]=1
+ addToSearchPath program_PATH @lua@/bin
+ for path in $luaPath; do
+ addToLuaPath "$path"
+ done
}
-
# with an executable shell script which will set some environment variables
# and then call into the original binary (which has been given a .wrapped suffix).
# luaPath is a list of directories
wrapLuaProgramsIn() {
- local dir="$1"
- local luaPath="$2"
- local f
+ local dir="$1"
+ local luaPath="$2"
+ local f
- buildLuaPath "$luaPath"
+ buildLuaPath "$luaPath"
- if [ ! -d "$dir" ]; then
- nix_debug "$dir not a directory"
- return
+ if [ ! -d "$dir" ]; then
+ nix_debug "$dir not a directory"
+ return
+ fi
+
+ nix_debug "wrapping programs in [$dir]"
+
+ # Find all regular files in the output directory that are executable.
+ find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do
+ # Rewrite "#! .../env lua" to "#! /nix/store/.../lua".
+ # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which
+ # Lua to use besides one with this hook anyway.
+ if head -n1 "$f" | grep -q '#!.*/env.*\(lua\)'; then
+ sed -i "$f" -e "1 s^.*/env[ ]*\(lua\)[^ ]*^#! @executable@^"
fi
- nix_debug "wrapping programs in [$dir]"
+ # wrapProgram creates the executable shell script described
+ # above. The script will set LUA_(C)PATH and PATH variables!
+ # (see pkgs/build-support/setup-hooks/make-wrapper.sh)
+ local -a wrap_args=("$f"
+ --prefix PATH ':' "$program_PATH"
+ --prefix LUA_PATH ';' "$LUA_PATH"
+ --prefix LUA_CPATH ';' "$LUA_CPATH"
+ )
- # Find all regular files in the output directory that are executable.
- find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do
- # Rewrite "#! .../env lua" to "#! /nix/store/.../lua".
- # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which
- # Lua to use besides one with this hook anyway.
- if head -n1 "$f" | grep -q '#!.*/env.*\(lua\)'; then
- sed -i "$f" -e "1 s^.*/env[ ]*\(lua\)[^ ]*^#! @executable@^"
- fi
+ # Add any additional arguments provided by makeWrapperArgs
+ # argument to buildLuaPackage.
+ # makeWrapperArgs
+ local -a user_args="($makeWrapperArgs)"
+ local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}")
- # wrapProgram creates the executable shell script described
- # above. The script will set LUA_(C)PATH and PATH variables!
- # (see pkgs/build-support/setup-hooks/make-wrapper.sh)
- local -a wrap_args=("$f"
- --prefix PATH ':' "$program_PATH"
- --prefix LUA_PATH ';' "$NIX_LUA_PATH"
- --prefix LUA_CPATH ';' "$NIX_LUA_CPATH"
- )
+ # see setup-hooks/make-wrapper.sh
+ wrapProgram "${wrapProgramArgs[@]}"
- # Add any additional arguments provided by makeWrapperArgs
- # argument to buildLuaPackage.
- # makeWrapperArgs
- local -a user_args="($makeWrapperArgs)"
- local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}")
-
- # see setup-hooks/make-wrapper.sh
- wrapProgram "${wrapProgramArgs[@]}"
-
- done
+ done
}
# Adds the lib and bin directories to the LUA_PATH and PATH variables,
@@ -78,22 +77,22 @@ wrapLuaProgramsIn() {
# `propagated-native-build-inputs`, while avoiding duplicating paths by
# flagging the directories it has visited in `luaPathsSeen`.
loadFromPropagatedInputs() {
- local dir="$1"
- # Stop if we've already visited here.
- if [ -n "${luaPathsSeen[$dir]}" ]; then
- return;
- fi
- luaPathsSeen[$dir]=1
+ local dir="$1"
+ # Stop if we've already visited here.
+ if [ -n "${luaPathsSeen[$dir]}" ]; then
+ return
+ fi
+ luaPathsSeen[$dir]=1
- addToLuaPath "$dir"
- addToSearchPath program_PATH $dir/bin
+ addToLuaPath "$dir"
+ addToSearchPath program_PATH $dir/bin
- # Inspect the propagated inputs (if they exist) and recur on them.
- local prop="$dir/nix-support/propagated-native-build-inputs"
- if [ -e "$prop" ]; then
- local new_path
- for new_path in $(cat $prop); do
- loadFromPropagatedInputs "$new_path"
- done
- fi
+ # Inspect the propagated inputs (if they exist) and recur on them.
+ local prop="$dir/nix-support/propagated-native-build-inputs"
+ if [ -e "$prop" ]; then
+ local new_path
+ for new_path in $(cat $prop); do
+ loadFromPropagatedInputs "$new_path"
+ done
+ fi
}
diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix
index 14bd4a416468..816744e61cff 100644
--- a/pkgs/development/interpreters/lua-5/wrapper.nix
+++ b/pkgs/development/interpreters/lua-5/wrapper.nix
@@ -43,7 +43,7 @@ let
rm -f "$out/bin/$prg"
if [ -x "$prg" ]; then
nix_debug "Making wrapper $prg"
- makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$NIX_LUA_PATH" --suffix LUA_CPATH ';' "$NIX_LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
+ makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
fi
fi
done
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index 30013946886b..e44209799a31 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -13,8 +13,9 @@ let
in
-stdenv.mkDerivation rec {
- name = "maude-${version}";
+stdenv.mkDerivation {
+ pname = "maude";
+ inherit version;
src = fetchurl {
url = "http://maude.cs.illinois.edu/w/images/d/d8/Maude-${version}.tar.gz";
diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix
index e8e23cee830a..686cfee19a6d 100644
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/pkgs/development/interpreters/metamath/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
-stdenv.mkDerivation rec {
- name = "metamath-${version}";
+stdenv.mkDerivation {
+ pname = "metamath";
version = "0.172";
buildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix
index ceea3932063a..aef23ad6881d 100644
--- a/pkgs/development/interpreters/mujs/default.nix
+++ b/pkgs/development/interpreters/mujs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, readline }:
stdenv.mkDerivation rec {
- name = "mujs-${version}";
+ pname = "mujs";
version = "1.0.6";
src = fetchurl {
diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix
index 277993339e23..bde2f5d9fa96 100644
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, pkgconfig, nix, git }: let
version = "4.1.6";
in stdenv.mkDerivation {
- name = "nix-exec-${version}";
+ pname = "nix-exec";
+ inherit version;
src = fetchurl {
url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index d3dda7655c2e..cc9f6fcc3c90 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -19,9 +19,9 @@ in
stdenv.mkDerivation rec {
version = "5.1.0";
- name = "octave-${version}";
+ pname = "octave";
src = fetchurl {
- url = "mirror://gnu/octave/${name}.tar.gz";
+ url = "mirror://gnu/octave/${pname}-${version}.tar.gz";
sha256 = "15blrldzwyxma16rnd4n01gnsrriii0dwmyca6m7qz62r8j12sz3";
};
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
# Keep a copy of the octave tests detailed results in the output
# derivation, because someone may care
postInstall = ''
- cp test/fntests.log $out/share/octave/${name}-fntests.log || true
+ cp test/fntests.log $out/share/octave/${pname}-${version}-fntests.log || true
'';
passthru = {
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index f65b4628e8c8..9a82868b7b3d 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -254,16 +254,16 @@ let
in {
php72 = generic {
- version = "7.2.21";
- sha256 = "1vqldc2namfblwyv87fgpfffkjpzawfpcp48f40nfdl3pshq6c9l";
+ version = "7.2.22";
+ sha256 = "12phn0rrd5r1j6xlz83h7v6gszmj4lb5gwj927psbbc6nn1rh2n1";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
};
php73 = generic {
- version = "7.3.8";
- sha256 = "1xbndimrfamf97m3vln842g9w1ikq071gjfkk15ai7sx2wqccrnm";
+ version = "7.3.9";
+ sha256 = "1i33v50rbqrfwjwch1d46mbpwbxrg1xfycs9mjl7xsy9m04rg753";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix
index 62ab7b02585e..6e57ad250bb4 100644
--- a/pkgs/development/interpreters/picoc/default.nix
+++ b/pkgs/development/interpreters/picoc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, readline }:
stdenv.mkDerivation rec {
- name = "picoc-${version}";
+ pname = "picoc";
version = "2015-05-04";
src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 5adf41a0f3b6..dc3b08acbd96 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -2,10 +2,10 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "picoLisp-${version}";
+ pname = "picoLisp";
version = "19.6";
src = fetchurl {
- url = "https://www.software-lab.de/${name}.tgz";
+ url = "https://www.software-lab.de/${pname}-${version}.tgz";
sha256 = "1ixxl6m5glhwqa4q3fb90pciv7jhhvn9pkh316d4wcv0m13l04gq";
};
buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk;
diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
index d1f2edce936d..02f6d34a0305 100644
--- a/pkgs/development/interpreters/pixie/default.nix
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -30,13 +30,13 @@ let
bin-path = stdenv.lib.concatStringsSep ":"
(map (p: "${p}/bin") [ gcc ]);
build = {flags, target}: stdenv.mkDerivation rec {
- name = "pixie-${version}";
+ pname = "pixie";
version = "0-r${commit-count}-${variant}";
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = libs;
PYTHON = if buildWithPypy
then "${pypy}/pypy-c/pypy-c"
- else "${python2.interpreter}";
+ else python2.interpreter;
unpackPhase = ''
cp -R ${pixie-src} pixie-src
mkdir pypy-src
diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix
index 009f9b48ea4e..30a601ef8dfd 100644
--- a/pkgs/development/interpreters/pyrex/0.9.5.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.5.nix
@@ -2,8 +2,9 @@
let version = "0.9.5.1.1"; in
-python2Packages.buildPythonPackage rec {
- name = "pyrex-${version}";
+python2Packages.buildPythonPackage {
+ pname = "pyrex";
+ inherit version;
src = fetchurl {
url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix
index d79cd58c1598..69a930891885 100644
--- a/pkgs/development/interpreters/pyrex/0.9.6.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.6.nix
@@ -2,8 +2,9 @@
let version = "0.9.6.4"; in
-python2Packages.buildPythonPackage rec {
- name = "pyrex-${version}";
+python2Packages.buildPythonPackage {
+ pname = "pyrex";
+ inherit version;
src = fetchurl {
url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
diff --git a/pkgs/development/interpreters/python/build-python-package-common.nix b/pkgs/development/interpreters/python/build-python-package-common.nix
deleted file mode 100644
index 0f8e088d434a..000000000000
--- a/pkgs/development/interpreters/python/build-python-package-common.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# This function provides generic bits to install a Python wheel.
-
-{ python
-}:
-
-{ buildInputs ? []
-# Additional flags to pass to "pip install".
-, installFlags ? []
-, ... } @ attrs:
-
-attrs // {
- buildInputs = buildInputs ++ [ python.pythonForBuild.pkgs.bootstrapped-pip ];
-
- configurePhase = attrs.configurePhase or ''
- runHook preConfigure
- runHook postConfigure
- '';
-
- installPhase = attrs.installPhase or ''
- runHook preInstall
-
- mkdir -p "$out/${python.sitePackages}"
- export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
-
- pushd dist
- ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache ${toString installFlags} --build tmpbuild
- popd
-
- runHook postInstall
- '';
-}
diff --git a/pkgs/development/interpreters/python/build-python-package-flit.nix b/pkgs/development/interpreters/python/build-python-package-flit.nix
deleted file mode 100644
index b0f9e0380211..000000000000
--- a/pkgs/development/interpreters/python/build-python-package-flit.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This function provides specific bits for building a flit-based Python package.
-
-{ python
-, flit
-}:
-
-{ ... } @ attrs:
-
-attrs // {
- nativeBuildInputs = [ flit ];
- buildPhase = attrs.buildPhase or ''
- runHook preBuild
- flit build --format wheel
- runHook postBuild
- '';
-
- # Flit packages, like setuptools packages, might have tests.
- installCheckPhase = attrs.checkPhase or ''
- ${python.interpreter} -m unittest discover
- '';
- doCheck = attrs.doCheck or true;
-}
diff --git a/pkgs/development/interpreters/python/build-python-package-pyproject.nix b/pkgs/development/interpreters/python/build-python-package-pyproject.nix
deleted file mode 100644
index 085db44f3e82..000000000000
--- a/pkgs/development/interpreters/python/build-python-package-pyproject.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-# This function provides specific bits for building a setuptools-based Python package.
-
-{ lib
-, python
-}:
-
-{
-# Global options passed to "python setup.py"
- setupPyGlobalFlags ? []
-# Build options passed to "build_ext"
-# https://github.com/pypa/pip/issues/881
-# Rename to `buildOptions` because it is not setuptools specific?
-, setupPyBuildFlags ? []
-# Execute before shell hook
-, preShellHook ? ""
-# Execute after shell hook
-, postShellHook ? ""
-, ... } @ attrs:
-
-let
- pipGlobalFlagsString = lib.concatMapStringsSep " " (option: "--global-option ${option}") setupPyGlobalFlags;
- pipBuildFlagsString = lib.concatMapStringsSep " " (option: "--build-option ${option}") setupPyBuildFlags;
-in attrs // {
- buildPhase = attrs.buildPhase or ''
- runHook preBuild
- mkdir -p dist
- echo "Creating a wheel..."
- ${python.pythonForBuild.interpreter} -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist ${pipGlobalFlagsString} ${pipBuildFlagsString} .
- echo "Finished creating a wheel..."
- runHook postBuild
- '';
-
- installCheckPhase = ''
- runHook preCheck
- echo "No checkPhase defined. Either provide a checkPhase or disable tests in case tests are not available."; exit 1
- runHook postCheck
- '';
-
- # With Python it's a common idiom to run the tests
- # after the software has been installed.
- doCheck = attrs.doCheck or true;
-
- shellHook = attrs.shellHook or ''
- ${preShellHook}
- # Long-term setup.py should be dropped.
- if [ -e pyproject.toml ]; then
- tmp_path=$(mktemp -d)
- export PATH="$tmp_path/bin:$PATH"
- export PYTHONPATH="$tmp_path/${python.pythonForBuild.sitePackages}:$PYTHONPATH"
- mkdir -p $tmp_path/${python.pythonForBuild.sitePackages}
- ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path >&2
- fi
- ${postShellHook}
- '';
-
-}
diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix
deleted file mode 100644
index 7738ea2f66a5..000000000000
--- a/pkgs/development/interpreters/python/build-python-package-setuptools.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-# This function provides specific bits for building a setuptools-based Python package.
-
-{ lib
-, python
-}:
-
-{
-# Global options passed to "python setup.py"
- setupPyGlobalFlags ? []
-# Build options passed to "python setup.py build_ext"
-# https://github.com/pypa/pip/issues/881
-, setupPyBuildFlags ? []
-# Execute before shell hook
-, preShellHook ? ""
-# Execute after shell hook
-, postShellHook ? ""
-, ... } @ attrs:
-
-let
- # use setuptools shim (so that setuptools is imported before distutils)
- # pip does the same thing: https://github.com/pypa/pip/pull/3265
- setuppy = ./run_setup.py;
-
- setupPyGlobalFlagsString = lib.concatStringsSep " " setupPyGlobalFlags;
- setupPyBuildExtString = lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags));
-
-in attrs // {
- # we copy nix_run_setup over so it's executed relative to the root of the source
- # many project make that assumption
- buildPhase = attrs.buildPhase or ''
- runHook preBuild
- cp ${setuppy} nix_run_setup
- ${python.pythonForBuild.interpreter} nix_run_setup ${setupPyGlobalFlagsString} ${setupPyBuildExtString} bdist_wheel
- runHook postBuild
- '';
-
- installCheckPhase = attrs.checkPhase or ''
- runHook preCheck
- ${python.pythonForBuild.interpreter} nix_run_setup test
- runHook postCheck
- '';
-
- # Python packages that are installed with setuptools
- # are typically distributed with tests.
- # With Python it's a common idiom to run the tests
- # after the software has been installed.
- doCheck = attrs.doCheck or true;
-
- shellHook = attrs.shellHook or ''
- ${preShellHook}
- if test -e setup.py; then
- tmp_path=$(mktemp -d)
- export PATH="$tmp_path/bin:$PATH"
- export PYTHONPATH="$tmp_path/${python.pythonForBuild.sitePackages}:$PYTHONPATH"
- mkdir -p $tmp_path/${python.pythonForBuild.sitePackages}
- ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path >&2
- fi
- ${postShellHook}
- '';
-}
diff --git a/pkgs/development/interpreters/python/build-python-package-wheel.nix b/pkgs/development/interpreters/python/build-python-package-wheel.nix
deleted file mode 100644
index e3c4e13c0e2d..000000000000
--- a/pkgs/development/interpreters/python/build-python-package-wheel.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This function provides specific bits for building a wheel-based Python package.
-
-{
-}:
-
-{ ... } @ attrs:
-
-attrs // {
- unpackPhase = ''
- mkdir dist
- cp "$src" "dist/$(stripHash "$src")"
- '';
-
- # Wheels are pre-compiled
- buildPhase = attrs.buildPhase or ":";
- installCheckPhase = attrs.checkPhase or ":";
-
- # Wheels don't have any checks to run
- doCheck = attrs.doCheck or false;
-}
\ No newline at end of file
diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix
deleted file mode 100644
index 61c1186cef9e..000000000000
--- a/pkgs/development/interpreters/python/build-python-package.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-# This function provides a generic Python package builder,
-# and can build packages that use distutils, setuptools or flit.
-
-{ lib
-, config
-, python
-, wrapPython
-, setuptools
-, unzip
-, ensureNewerSourcesForZipFilesHook
-, toPythonModule
-, namePrefix
-, flit
-, writeScript
-, update-python-libraries
-}:
-
-let
- setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python; };
- pyproject-specific = import ./build-python-package-pyproject.nix { inherit lib python; };
- flit-specific = import ./build-python-package-flit.nix { inherit python flit; };
- wheel-specific = import ./build-python-package-wheel.nix { };
- common = import ./build-python-package-common.nix { inherit python; };
- mkPythonDerivation = import ./mk-python-derivation.nix {
- inherit lib config python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook;
- inherit toPythonModule namePrefix update-python-libraries;
- };
-in
-
-{
-# Several package formats are supported.
-# "setuptools" : Install a common setuptools/distutils based package. This builds a wheel.
-# "wheel" : Install from a pre-compiled wheel.
-# "flit" : Install a flit package. This builds a wheel.
-# "other" : Provide your own buildPhase and installPhase.
-format ? "setuptools"
-, ... } @ attrs:
-
-let
- formatspecific =
- if format == "pyproject" then common (pyproject-specific attrs)
- else if format == "setuptools" then common (setuptools-specific attrs)
- else if format == "flit" then common (flit-specific attrs)
- else if format == "wheel" then common (wheel-specific attrs)
- else if format == "other" then {}
- else throw "Unsupported format ${format}";
-
-in mkPythonDerivation ( attrs // formatspecific )
diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
index 9e38e8250748..0b9ddc0bb345 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
@@ -12,7 +12,7 @@ let
in
stdenv.mkDerivation rec {
- name = "python-boot-${version}";
+ pname = "python-boot";
version = "2.7.12";
libPrefix = "python2.7";
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 60d067c1bf2c..32aa355d3aa2 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -129,8 +129,8 @@ in with passthru; stdenv.mkDerivation {
substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
'';
- CPPFLAGS = "${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}";
- LDFLAGS = "${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}";
+ CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs);
+ LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs);
LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}";
NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
# Determinism: We fix the hashes of str, bytes and datetime objects.
@@ -142,6 +142,8 @@ in with passthru; stdenv.mkDerivation {
"--without-ensurepip"
"--with-system-expat"
"--with-system-ffi"
+ ] ++ optionals (sqlite != null && isPy3k) [
+ "--enable-loadable-sqlite-extensions"
] ++ optionals (openssl != null) [
"--with-openssl=${openssl.dev}"
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
index 73d1e0ea9fd7..e27959c05e8d 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python27-docs-html-2.7.16";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-html.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
index 54c0954ae5d0..0226f7cd8809 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python27-docs-pdf-a4-2.7.16";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-a4.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
index 059908029c0b..88d1a6931668 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python27-docs-pdf-letter-2.7.16";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-letter.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
index 53c5aa3b629b..ea35e9fb6a35 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python27-docs-text-2.7.16";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-text.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix
index 5a6dcc63225e..45783eb82632 100644
--- a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python37-docs-html-3.7.2";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-html.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix
index a122d7519f5d..998af644c718 100644
--- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python37-docs-pdf-a4-3.7.2";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-a4.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix
index 4473f2e351c4..1c6aea5ee3c1 100644
--- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python37-docs-pdf-letter-3.7.2";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-letter.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix
index d9d21bfe3a57..32388780f6ff 100644
--- a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "python37-docs-text-3.7.2";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-text.tar.bz2;
diff --git a/pkgs/development/interpreters/python/cpython/docs/template.nix b/pkgs/development/interpreters/python/cpython/docs/template.nix
index 4a0c84fb272e..3cc0c2a9ee85 100644
--- a/pkgs/development/interpreters/python/cpython/docs/template.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/template.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "pythonMAJORMINOR-docs-TYPE-VERSION";
src = fetchurl {
url = URL;
diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix
new file mode 100644
index 000000000000..3a4b4a0ccadb
--- /dev/null
+++ b/pkgs/development/interpreters/python/hooks/default.nix
@@ -0,0 +1,96 @@
+# Hooks for building Python packages.
+{ python
+, callPackage
+, makeSetupHook
+}:
+
+let
+ pythonInterpreter = python.pythonForBuild.interpreter;
+ pythonSitePackages = python.sitePackages;
+ pythonCheckInterpreter = python.interpreter;
+ setuppy = ../run_setup.py;
+in rec {
+
+ flitBuildHook = callPackage ({ flit }:
+ makeSetupHook {
+ name = "flit-build-hook";
+ deps = [ flit ];
+ substitutions = {
+ inherit pythonInterpreter;
+ };
+ } ./flit-build-hook.sh) {};
+
+ pipBuildHook = callPackage ({ pip }:
+ makeSetupHook {
+ name = "pip-build-hook.sh";
+ deps = [ pip ];
+ substitutions = {
+ inherit pythonInterpreter pythonSitePackages;
+ };
+ } ./pip-build-hook.sh) {};
+
+ pipInstallHook = callPackage ({ pip }:
+ makeSetupHook {
+ name = "pip-install-hook";
+ deps = [ pip ];
+ substitutions = {
+ inherit pythonInterpreter pythonSitePackages;
+ };
+ } ./pip-install-hook.sh) {};
+
+ pytestCheckHook = callPackage ({ pytest }:
+ makeSetupHook {
+ name = "pytest-check-hook";
+ deps = [ pytest ];
+ substitutions = {
+ inherit pythonCheckInterpreter;
+ };
+ } ./pytest-check-hook.sh) {};
+
+ pythonCatchConflictsHook = callPackage ({ setuptools }:
+ makeSetupHook {
+ name = "python-catch-conflicts-hook";
+ deps = [ setuptools ];
+ substitutions = {
+ inherit pythonInterpreter;
+ catchConflicts=../catch_conflicts/catch_conflicts.py;
+ };
+ } ./python-catch-conflicts-hook.sh) {};
+
+ pythonImportsCheckHook = callPackage ({}:
+ makeSetupHook {
+ name = "python-imports-check-hook.sh";
+ substitutions = {
+ inherit pythonCheckInterpreter;
+ };
+ } ./python-imports-check-hook.sh) {};
+
+ pythonRemoveBinBytecodeHook = callPackage ({ }:
+ makeSetupHook {
+ name = "python-remove-bin-bytecode-hook";
+ } ./python-remove-bin-bytecode-hook.sh) {};
+
+ setuptoolsBuildHook = callPackage ({ setuptools, wheel }:
+ makeSetupHook {
+ name = "setuptools-setup-hook";
+ deps = [ setuptools wheel ];
+ substitutions = {
+ inherit pythonInterpreter pythonSitePackages setuppy;
+ };
+ } ./setuptools-build-hook.sh) {};
+
+ setuptoolsCheckHook = callPackage ({ setuptools }:
+ makeSetupHook {
+ name = "setuptools-check-hook";
+ deps = [ setuptools ];
+ substitutions = {
+ inherit pythonCheckInterpreter setuppy;
+ };
+ } ./setuptools-check-hook.sh) {};
+
+ wheelUnpackHook = callPackage ({ wheel }:
+ makeSetupHook {
+ name = "wheel-unpack-hook.sh";
+ deps = [ wheel ];
+ } ./wheel-unpack-hook.sh) {};
+}
diff --git a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh b/pkgs/development/interpreters/python/hooks/flit-build-hook.sh
new file mode 100644
index 000000000000..faa3f6e3075f
--- /dev/null
+++ b/pkgs/development/interpreters/python/hooks/flit-build-hook.sh
@@ -0,0 +1,15 @@
+# Setup hook for flit
+echo "Sourcing flit-build-hook"
+
+flitBuildPhase () {
+ echo "Executing flitBuildPhase"
+ preBuild
+ @pythonInterpreter@ -m flit build --format wheel
+ postBuild
+ echo "Finished executing flitBuildPhase"
+}
+
+if [ -z "$dontUseFlitBuild" ] && [ -z "$buildPhase" ]; then
+ echo "Using flitBuildPhase"
+ buildPhase=flitBuildPhase
+fi
diff --git a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
new file mode 100644
index 000000000000..6796d3efd0a1
--- /dev/null
+++ b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
@@ -0,0 +1,42 @@
+# Setup hook to use for pip projects
+echo "Sourcing pip-build-hook"
+
+pipBuildPhase() {
+ echo "Executing pipBuildPhase"
+ runHook preBuild
+
+ mkdir -p dist
+ echo "Creating a wheel..."
+ @pythonInterpreter@ -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist "$options" .
+ echo "Finished creating a wheel..."
+
+ runHook postBuild
+ echo "Finished executing pipBuildPhase"
+}
+
+pipShellHook() {
+ echo "Executing pipShellHook"
+ runHook preShellHook
+
+ # Long-term setup.py should be dropped.
+ if [ -e pyproject.toml ]; then
+ tmp_path=$(mktemp -d)
+ export PATH="$tmp_path/bin:$PATH"
+ export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH"
+ mkdir -p "$tmp_path/@pythonSitePackages@"
+ @pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" >&2
+ fi
+
+ runHook postShellHook
+ echo "Finished executing pipShellHook"
+}
+
+if [ -z "$dontUsePipBuild" ] && [ -z "$buildPhase" ]; then
+ echo "Using pipBuildPhase"
+ buildPhase=pipBuildPhase
+fi
+
+if [ -z "$shellHook" ]; then
+ echo "Using pipShellHook"
+ shellHook=pipShellHook
+fi
diff --git a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
new file mode 100644
index 000000000000..f528ec63cb8e
--- /dev/null
+++ b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
@@ -0,0 +1,24 @@
+# Setup hook for pip.
+echo "Sourcing pip-install-hook"
+
+declare -a pipInstallFlags
+
+pipInstallPhase() {
+ echo "Executing pipInstallPhase"
+ runHook preInstall
+
+ mkdir -p "$out/@pythonSitePackages@"
+ export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH"
+
+ pushd dist || return 1
+ @pythonInterpreter@ -m pip install ./*.whl --no-index --prefix="$out" --no-cache $pipInstallFlags --build tmpbuild
+ popd || return 1
+
+ runHook postInstall
+ echo "Finished executing pipInstallPhase"
+}
+
+if [ -z "$dontUsePipInstall" ] && [ -z "$installPhase" ]; then
+ echo "Using pipInstallPhase"
+ installPhase=pipInstallPhase
+fi
diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
new file mode 100644
index 000000000000..24510b9f9931
--- /dev/null
+++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
@@ -0,0 +1,49 @@
+# Setup hook for pytest
+echo "Sourcing pytest-check-hook"
+
+declare -ar disabledTests
+
+function _concatSep {
+ local result
+ local sep="$1"
+ local -n arr=$2
+ for index in ${!arr[*]}; do
+ if [ $index -eq 0 ]; then
+ result="${arr[index]}"
+ else
+ result+=" $sep ${arr[index]}"
+ fi
+ done
+ echo "$result"
+}
+
+function _pytestComputeDisabledTestsString () {
+ declare -a tests
+ local tests=($1)
+ local prefix="not "
+ prefixed=( "${tests[@]/#/$prefix}" )
+ result=$(_concatSep "and" prefixed)
+ echo "$result"
+}
+
+function pytestCheckPhase() {
+ echo "Executing pytestCheckPhase"
+ runHook preCheck
+
+ # Compose arguments
+ args=" -m pytest"
+ if [ -n "$disabledTests" ]; then
+ disabledTestsString=$(_pytestComputeDisabledTestsString "${disabledTests[@]}")
+ args+=" -k \""$disabledTestsString"\""
+ fi
+ args+=" ${pytestFlagsArray[@]}"
+ eval "@pythonCheckInterpreter@ $args"
+
+ runHook postCheck
+ echo "Finished executing pytestCheckPhase"
+}
+
+if [ -z "$dontUsePytestCheck" ] && [ -z "$installCheckPhase" ]; then
+ echo "Using pytestCheckPhase"
+ preDistPhases+=" pytestCheckPhase"
+fi
diff --git a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh
new file mode 100644
index 000000000000..e9065cf17934
--- /dev/null
+++ b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh
@@ -0,0 +1,10 @@
+# Setup hook for detecting conflicts in Python packages
+echo "Sourcing python-catch-conflicts-hook.sh"
+
+pythonCatchConflictsPhase() {
+ @pythonInterpreter@ @catchConflicts@
+}
+
+if [ -z "$dontUsePythonCatchConflicts" ]; then
+ preDistPhases+=" pythonCatchConflictsPhase"
+fi
diff --git a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
new file mode 100644
index 000000000000..7e2b3f69d6dd
--- /dev/null
+++ b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
@@ -0,0 +1,16 @@
+# Setup hook for checking whether Python imports succeed
+echo "Sourcing python-imports-check-hook.sh"
+
+pythonImportsCheckPhase () {
+ echo "Executing pythonImportsCheckPhase"
+
+ if [ -n "$pythonImportsCheck" ]; then
+ echo "Check whether the following modules can be imported: $pythonImportsCheck"
+ cd $out && eval "@pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ[\"pythonImportsCheck\"].split()))'"
+ fi
+}
+
+if [ -z "$dontUsePythonImportsCheck" ]; then
+ echo "Using pythonImportsCheckPhase"
+ preDistPhases+=" pythonImportsCheckPhase"
+fi
diff --git a/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh b/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh
new file mode 100644
index 000000000000..960de767be79
--- /dev/null
+++ b/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh
@@ -0,0 +1,17 @@
+# Setup hook for detecting conflicts in Python packages
+echo "Sourcing python-remove-bin-bytecode-hook.sh"
+
+# Check if we have two packages with the same name in the closure and fail.
+# If this happens, something went wrong with the dependencies specs.
+# Intentionally kept in a subdirectory, see catch_conflicts/README.md.
+
+pythonRemoveBinBytecodePhase () {
+ if [ -d "$out/bin" ]; then
+ rm -rf "$out/bin/__pycache__" # Python 3
+ find "$out/bin" -type f -name "*.pyc" -delete # Python 2
+ fi
+}
+
+if [ -z "$dontUsePythonRemoveBinBytecode" ]; then
+ preDistPhases+=" pythonRemoveBinBytecodePhase"
+fi
diff --git a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh
new file mode 100644
index 000000000000..db3e4225d293
--- /dev/null
+++ b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh
@@ -0,0 +1,47 @@
+# Setup hook for setuptools.
+echo "Sourcing setuptools-build-hook"
+
+setuptoolsBuildPhase() {
+ echo "Executing setuptoolsBuildPhase"
+ local args
+ runHook preBuild
+
+ cp -f @setuppy@ nix_run_setup
+ args=""
+ if [ -n "$setupPyGlobalFlags" ]; then
+ args+="$setupPyGlobalFlags"
+ fi
+ if [ -n "$setupPyBuildFlags" ]; then
+ args+="build_ext $setupPyBuildFlags"
+ fi
+ eval "@pythonInterpreter@ nix_run_setup $args bdist_wheel"
+
+ runHook postBuild
+ echo "Finished executing setuptoolsInstallPhase"
+}
+
+setuptoolsShellHook() {
+ echo "Executing setuptoolsShellHook"
+ runHook preShellHook
+
+ if test -e setup.py; then
+ tmp_path=$(mktemp -d)
+ export PATH="$tmp_path/bin:$PATH"
+ export PYTHONPATH="@pythonSitePackages@:$PYTHONPATH"
+ mkdir -p "$tmp_path/@pythonSitePackages@"
+ eval "@pythonInterpreter@ -m pip -e . --prefix $tmp_path >&2"
+ fi
+
+ runHook postShellHook
+ echo "Finished executing setuptoolsShellHook"
+}
+
+if [ -z "$dontUseSetuptoolsBuild" ] && [ -z "$buildPhase" ]; then
+ echo "Using setuptoolsBuildPhase"
+ buildPhase=setuptoolsBuildPhase
+fi
+
+if [ -z "$dontUseSetuptoolsShellHook" ] && [ -z "$shellHook" ]; then
+ echo "Using setuptoolsShellHook"
+ shellHook=setuptoolsShellHook
+fi
diff --git a/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh
new file mode 100644
index 000000000000..71bb036a91ad
--- /dev/null
+++ b/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh
@@ -0,0 +1,18 @@
+# Setup hook for setuptools.
+echo "Sourcing setuptools-check-hook"
+
+setuptoolsCheckPhase() {
+ echo "Executing setuptoolsCheckPhase"
+ runHook preCheck
+
+ cp -f @setuppy@ nix_run_setup
+ @pythonCheckInterpreter@ nix_run_setup test
+
+ runHook postCheck
+ echo "Finished executing setuptoolsCheckPhase"
+}
+
+if [ -z "$dontUseSetuptoolsCheck" ] && [ -z "$installCheckPhase" ]; then
+ echo "Using setuptoolsCheckPhase"
+ preDistPhases+=" setuptoolsCheckPhase"
+fi
diff --git a/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh b/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh
new file mode 100644
index 000000000000..6dd0c5be4cb2
--- /dev/null
+++ b/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh
@@ -0,0 +1,18 @@
+# Setup hook to use in case a wheel is fetched
+echo "Sourcing wheel setup hook"
+
+wheelUnpackPhase(){
+ echo "Executing wheelUnpackPhase"
+ runHook preUnpack
+
+ mkdir -p dist
+ cp "$src" "dist/$(stripHash "$src")"
+
+# runHook postUnpack # Calls find...?
+ echo "Finished executing wheelUnpackPhase"
+}
+
+if [ -z "$dontUseWheelUnpack" ] && [ -z "$unpackPhase" ]; then
+ echo "Using wheelUnpackPhase"
+ unpackPhase=wheelUnpackPhase
+fi
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 6a9e3d48bdb5..700894eda6de 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -4,13 +4,22 @@
, config
, python
, wrapPython
-, setuptools
, unzip
, ensureNewerSourcesForZipFilesHook
# Whether the derivation provides a Python module or not.
, toPythonModule
, namePrefix
, update-python-libraries
+, setuptools
+, flitBuildHook
+, pipBuildHook
+, pipInstallHook
+, pythonCatchConflictsHook
+, pythonImportsCheckHook
+, pythonRemoveBinBytecodeHook
+, setuptoolsBuildHook
+, setuptoolsCheckHook
+, wheelUnpackHook
}:
{ name ? "${attrs.pname}-${attrs.version}"
@@ -48,6 +57,11 @@
# Skip wrapping of python programs altogether
, dontWrapPythonPrograms ? false
+# Don't use Pip to install a wheel
+# Note this is actually a variable for the pipInstallPhase in pip's setupHook.
+# It's included here to prevent an infinite recursion.
+, dontUsePipInstall ? false
+
# Skip setting the PYTHONNOUSERSITE environment variable in wrapped programs
, permitUserSite ? false
@@ -57,6 +71,13 @@
# However, some packages do provide executables with extensions, and thus bytecode is generated.
, removeBinBytecode ? true
+# Several package formats are supported.
+# "setuptools" : Install a common setuptools/distutils based package. This builds a wheel.
+# "wheel" : Install from a pre-compiled wheel.
+# "flit" : Install a flit package. This builds a wheel.
+# "other" : Provide your own buildPhase and installPhase.
+, format ? "setuptools"
+
, meta ? {}
, passthru ? {}
@@ -71,26 +92,43 @@ if disabled
then throw "${name} not supported for interpreter ${python.executable}"
else
-let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
- "disabled" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts"
- ] // {
+let
+ inherit (python) stdenv;
+
+ self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [
+ "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format"
+ ]) // {
name = namePrefix + name;
nativeBuildInputs = [
python
wrapPython
- ensureNewerSourcesForZipFilesHook
- setuptools
-# ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools
+ ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)?
+ ] ++ lib.optionals catchConflicts [
+ setuptools pythonCatchConflictsHook
+ ] ++ lib.optionals removeBinBytecode [
+ pythonRemoveBinBytecodeHook
] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
unzip
+ ] ++ lib.optionals (format == "setuptools") [
+ setuptoolsBuildHook
+ ] ++ lib.optionals (format == "flit") [
+ flitBuildHook
+ ] ++ lib.optionals (format == "pyproject") [
+ pipBuildHook
+ ] ++ lib.optionals (format == "wheel") [
+ wheelUnpackHook
+ ] ++ lib.optionals (!(format == "other") || dontUsePipInstall) [
+ pipInstallHook
+ ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
+ # This is a test, however, it should be ran independent of the checkPhase and checkInputs
+ pythonImportsCheckHook
] ++ nativeBuildInputs;
buildInputs = buildInputs ++ pythonPath;
- # Propagate python and setuptools. We should stop propagating setuptools.
- propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ];
+ propagatedBuildInputs = propagatedBuildInputs ++ [ python ];
inherit strictDeps;
@@ -98,21 +136,17 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr
# Python packages don't have a checkPhase, only an installCheckPhase
doCheck = false;
- doInstallCheck = doCheck;
- installCheckInputs = checkInputs;
+ doInstallCheck = attrs.doCheck or true;
+ installCheckInputs = [
+ ] ++ lib.optionals (format == "setuptools") [
+ # Longer-term we should get rid of this and require
+ # users of this function to set the `installCheckPhase` or
+ # pass in a hook that sets it.
+ setuptoolsCheckHook
+ ] ++ checkInputs;
postFixup = lib.optionalString (!dontWrapPythonPrograms) ''
wrapPythonPrograms
- '' + lib.optionalString removeBinBytecode ''
- if [ -d "$out/bin" ]; then
- rm -rf "$out/bin/__pycache__" # Python 3
- find "$out/bin" -type f -name "*.pyc" -delete # Python 2
- fi
- '' + lib.optionalString catchConflicts ''
- # Check if we have two packages with the same name in the closure and fail.
- # If this happens, something went wrong with the dependencies specs.
- # Intentionally kept in a subdirectory, see catch_conflicts/README.md.
- ${python.pythonForBuild.interpreter} ${./catch_conflicts}/catch_conflicts.py
'' + attrs.postFixup or '''';
# Python packages built through cross-compilation are always for the host platform.
@@ -123,6 +157,10 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr
platforms = python.meta.platforms;
isBuildPythonPackage = python.meta.platforms;
} // meta;
+} // lib.optionalAttrs (attrs?checkPhase) {
+ # If given use the specified checkPhase, otherwise use the setup hook.
+ # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`.
+ installCheckPhase = attrs.checkPhase;
}));
passthru.updateScript = let
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 3e86ddef4ed4..8154a87f667d 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -17,7 +17,7 @@ with stdenv.lib;
let
isPy3k = substring 0 1 pythonVersion == "3";
- passthru = passthruFun rec {
+ passthru = passthruFun {
inherit self sourceVersion pythonVersion packageOverrides;
implementation = "pypy";
libPrefix = "pypy${pythonVersion}";
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix
index af933f0a4bd0..7ac8037293ff 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix
@@ -6,7 +6,7 @@
# Dependencies
, bzip2
, zlib
-, openssl
+, openssl_1_0_2
, expat
, libffi
, ncurses
@@ -27,7 +27,7 @@ with stdenv.lib;
let
isPy3k = majorVersion == "3";
- passthru = passthruFun rec {
+ passthru = passthruFun {
inherit self sourceVersion pythonVersion packageOverrides;
implementation = "pypy";
libPrefix = "pypy${pythonVersion}";
@@ -44,7 +44,7 @@ let
deps = [
bzip2
zlib
- openssl
+ openssl_1_0_2
expat
libffi
ncurses
diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix
index 779039c6d6aa..d49886da8f54 100644
--- a/pkgs/development/interpreters/qnial/default.nix
+++ b/pkgs/development/interpreters/qnial/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }:
-stdenv.mkDerivation rec {
- name = "qnial-${version}";
+stdenv.mkDerivation {
+ pname = "qnial";
version = "6.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index e37c43a0bd65..f13adc21d9e6 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -45,16 +45,16 @@ let
in
stdenv.mkDerivation rec {
- name = "racket-${version}";
+ pname = "racket";
version = "7.3"; # always change at once with ./minimal.nix
src = (stdenv.lib.makeOverridable ({ name, sha256 }:
- fetchurl rec {
+ fetchurl {
url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
inherit sha256;
}
)) {
- inherit name;
+ inherit ;name = "${pname}-${version}";
sha256 = "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl";
};
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 1244ad5ecd2e..ab5493e8a9d0 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
, CoreServices, ApplicationServices }:
stdenv.mkDerivation rec {
- name = "rakudo-star-${version}";
+ pname = "rakudo-star";
version = "2017.01";
src = fetchurl {
- url = "http://rakudo.org/downloads/star/${name}.tar.gz";
+ url = "http://rakudo.org/downloads/star/${pname}-${version}.tar.gz";
sha256 = "07zjqdzxm30pmjqwlnr669d75bsbimy09sk0dvgm0pnn3zr92fjq";
};
diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix
index 4d98f18eee4a..274b70b2c798 100644
--- a/pkgs/development/interpreters/rebol/default.nix
+++ b/pkgs/development/interpreters/rebol/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl, glibc, libX11, libXt, perl }:
stdenv.mkDerivation rec {
- name = "rebol-nightly-${version}";
+ pname = "rebol-nightly";
version = "3-alpha";
src = fetchFromGitHub {
rev = "bd45d0de512ff5953e098301c3d610f6024515d6";
diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix
index 56ff02831741..2121f54a3b11 100644
--- a/pkgs/development/interpreters/red/default.nix
+++ b/pkgs/development/interpreters/red/default.nix
@@ -1,7 +1,7 @@
{ stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }:
stdenv.mkDerivation rec {
- name = "red-${version}";
+ pname = "red";
version = "0.6.3";
src = fetchFromGitHub {
rev = "6a43c767fa2e85d668b83f749158a18e62c30f70";
@@ -55,13 +55,13 @@ stdenv.mkDerivation rec {
rm -rf $out/opt/red/rebol
install -Dm755 console $out/bin/red
install -Dm644 BSD-3-License.txt \
- $out/share/licenses/${name}/BSD-3-License.txt
+ $out/share/licenses/${pname}-${version}/BSD-3-License.txt
install -Dm644 BSL-License.txt \
- $out/share/licenses/${name}/BSL-License.txt
+ $out/share/licenses/${pname}-${version}/BSL-License.txt
install -Dm644 docs/red-system-quick-test.html \
- $out/share/doc/${name}/red-system-quick-test.html
+ $out/share/doc/${pname}-${version}/red-system-quick-test.html
install -Dm644 docs/red-system-specs.html \
- $out/share/doc/${name}/red-system-specs.html
+ $out/share/doc/${pname}-${version}/red-system-specs.html
# PathElf
patchelf --set-interpreter \
diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix
index 1d67193a73cf..ec19b0679f4b 100644
--- a/pkgs/development/interpreters/regina/default.nix
+++ b/pkgs/development/interpreters/regina/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "Regina-REXX-${version}";
+ pname = "Regina-REXX";
version = "3.9.1";
src = fetchurl {
- url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${pname}-${version}.tar.gz";
sha256 = "1vpksnjmg6y5zag9li6sxqxj2xapgalfz8krfxgg49vyk0kdy4sx";
};
diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index f438e9fb13ce..30ac6d2bd5b4 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -6,7 +6,7 @@
with pythonPackages;
stdenv.mkDerivation rec {
- name = "renpy-${version}";
+ pname = "renpy";
version = "7.3.2";
meta = with stdenv.lib; {
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
pythonPath = [ pygame_sdl2 tkinter ];
- RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [
+ RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [
SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU_combined fribidi zlib
]);
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 4e617ce67eb9..3494c8dee243 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -1,8 +1,9 @@
{ stdenv, buildPackages, lib
-, fetchurl, fetchFromSavannah, fetchFromGitHub
+, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
, zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison
, autoconf, libiconv, libobjc, libunwind, Foundation
, buildEnv, bundler, bundix
+, makeWrapper, buildRubyGem, defaultGemConfig
} @ args:
let
@@ -29,11 +30,13 @@ let
baseruby = self.override {
useRailsExpress = false;
docSupport = false;
+ rubygemsSupport = false;
};
self = lib.makeOverridable (
{ stdenv, buildPackages, lib
- , fetchurl, fetchFromSavannah, fetchFromGitHub
+ , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
, useRailsExpress ? true
+ , rubygemsSupport ? true
, zlib, zlibSupport ? true
, openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true
@@ -44,9 +47,11 @@ let
, autoreconfHook, bison, autoconf
, buildEnv, bundler, bundix
, libiconv, libobjc, libunwind, Foundation
+ , makeWrapper, buildRubyGem, defaultGemConfig
}:
stdenv.mkDerivation rec {
- name = "ruby-${version}";
+ pname = "ruby";
+ inherit version;
src = if useRailsExpress then fetchFromGitHub {
owner = "ruby";
@@ -85,12 +90,14 @@ let
patches =
(import ./patchsets.nix {
- inherit patchSet useRailsExpress ops;
+ inherit patchSet useRailsExpress ops fetchpatch;
patchLevel = ver.patchLevel;
- })."${ver.majMinTiny}";
+ }).${ver.majMinTiny};
- postUnpack = ''
- cp -r ${rubygems} $sourceRoot/rubygems
+ postUnpack = opString rubygemsSupport ''
+ rm -rf $sourceRoot/{lib,test}/rubygems*
+ cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib
+ cp -r ${rubygems}/test/rubygems $sourceRoot/test
'';
postPatch = if atLeast25 then ''
@@ -135,12 +142,6 @@ let
installFlags = stdenv.lib.optionalString docSupport "install-doc";
# Bundler tries to create this directory
postInstall = ''
- # Update rubygems
- pushd rubygems
- chmod +w bundler/bundler.gemspec
- ${buildRuby} setup.rb --destdir $GEM_HOME
- popd
-
# Remove unnecessary groff reference from runtime closure, since it's big
sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb
@@ -194,6 +195,12 @@ let
ruby = self;
};
+ inherit (import ../../ruby-modules/with-packages {
+ inherit lib stdenv makeWrapper buildRubyGem buildEnv;
+ gemConfig = defaultGemConfig;
+ ruby = self;
+ }) withPackages gems;
+
# deprecated 2016-09-21
majorVersion = ver.major;
minorVersion = ver.minor;
@@ -204,35 +211,27 @@ let
) args; in self;
in {
- ruby_2_3 = generic {
- version = rubyVersion "2" "3" "8" "";
- sha256 = {
- src = "1gwsqmrhpx1wanrfvrsj3j76rv888zh7jag2si2r14qf8ihns0dm";
- git = "0158fg1sx6l6applbq0831kl8kzx5jacfl9lfg0shfzicmjlys3f";
- };
- };
-
ruby_2_4 = generic {
- version = rubyVersion "2" "4" "5" "";
+ version = rubyVersion "2" "4" "7" "";
sha256 = {
- src = "162izk7c72y73vmdgcbsh8kqihrbm65xvp53r1s139pzwqd78dv7";
- git = "181za4h6bd2bkyzyknxc18i5gq0pnqag60ybc17p0ixw3q7pdj43";
+ src = "12cbyf7zai8mi3mxffm5ynq3mmkcbvs7kb1bbrs259m61irgqvnd";
+ git = "1dgch9xz4wdcncb6pf2dvijm10yk6mbw2wfdrj7d3wazrjzh305z";
};
};
ruby_2_5 = generic {
- version = rubyVersion "2" "5" "5" "";
+ version = rubyVersion "2" "5" "6" "";
sha256 = {
- src = "0k2in88jymqh727s88yjsv7wrqs2hdj9h2w9zh2bmrj0ygylba98";
- git = "0l7b7xv48gvvlqs27gghfi645qvc1nwiz8ym4j8w100rzzzfy6zz";
+ src = "19xy6rf138ys4qycv0ibsycqwbjmf1j6iv9plw9cs81hcxnd0zhx";
+ git = "067gyy7149m6vk9dfyx22mghm2gbgy7snfa7df4ddrvr1pqffqmz";
};
};
ruby_2_6 = generic {
- version = rubyVersion "2" "6" "3" "";
+ version = rubyVersion "2" "6" "4" "";
sha256 = {
- src = "1yw23hmllxsc4b7zqndn5l4d9503gdik6rsf3lfdkf12bxwx6zsp";
- git = "1h4k2kw0vr4jh2ra9l89i8lnddfh2qfw67y9cknjylf7kw2m1pmh";
+ src = "0dvrw4g2igvjclxk9bmb9pf6mzxwm22zqvqa0abkfnshfnxdihag";
+ git = "1h4z66amjykpzl6lxx6yad2yfpwnwix4sw19bd96jnwg248kviqf";
};
};
}
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 47d8397c9668..56164de5b5f2 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -1,22 +1,27 @@
-{ patchSet, useRailsExpress, ops, patchLevel }:
+{ patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:
-rec {
+{
"2.3.8" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
- "2.4.5" = ops useRailsExpress [
+ "2.4.7" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
- "2.5.5" = ops useRailsExpress [
+ "2.5.6" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
];
- "2.6.3" = ops useRailsExpress [
+ "2.6.4" = [
+ (fetchpatch {
+ url = "https://git.ruby-lang.org/ruby.git/patch/?id=ade1283ca276f7d589ffd3539fbc7b9817f682d5";
+ sha256 = "1vgrckmzz0ykyxgzyp8fcifa93xz2hvyfil79bw1gc3xx94wnnxd";
+ })
+ ] ++ ops useRailsExpress [
"${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch"
diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix
index b9548284355d..1042caa41ac5 100644
--- a/pkgs/development/interpreters/ruby/rubygems/default.nix
+++ b/pkgs/development/interpreters/ruby/rubygems/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "rubygems";
- version = "3.0.3";
+ version = "3.0.6";
src = fetchurl {
url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
- sha256 = "0b6b9ads8522804xv8b8498gqwsv4qawv13f81kyc7g966y7lfmy";
+ sha256 = "1ca1i4xmggizr59m6p28gprlvshczsbx30q8iyzxb2vj4jn8arzx";
};
patches = [
diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
index 95b38fc8ebd5..883987683b0a 100644
--- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
@@ -3,6 +3,6 @@
fetchFromGitHub {
owner = "skaes";
repo = "rvm-patchsets";
- rev = "e6e12c2c32ff184e0409d8f9f2a870f2dfbd06a3";
- sha256 = "0n71h2ip1k18icb3bcr1jz4161lh6vr6i3f7b45jswg77c4rrxcy";
+ rev = "58f72dccc8bb4dc9b1035f6af903d21f2465367a";
+ sha256 = "00gbrhvnf05g6zmfim472ld0l1lp100dy4pi3lixm6ry9iw9m4ag";
}
diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix
index 594bbc05b7ce..43f5758e4c49 100644
--- a/pkgs/development/interpreters/self/default.nix
+++ b/pkgs/development/interpreters/self/default.nix
@@ -1,6 +1,6 @@
{ fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
# The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self
# so that it can be written to when using the Self transposer. Running 'Self'
# after installation runs without an image. You can then build a Self image with:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# $ Self -s myimage.snap
#
version = "4.5.0";
- name = "self-${version}";
+ pname = "self";
src = fetchgit {
url = "https://github.com/russellallen/self";
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index 9c81b230ada2..8f9477c4c4ac 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }:
-stdenv.mkDerivation rec {
- name = "spidermonkey-${version}";
+stdenv.mkDerivation {
+ pname = "spidermonkey";
version = "1.8.5";
src = fetchurl {
diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix
index 2c45ba589767..89bbd713a5c6 100644
--- a/pkgs/development/interpreters/spidermonkey/38.nix
+++ b/pkgs/development/interpreters/spidermonkey/38.nix
@@ -5,7 +5,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "38.8.0";
- name = "spidermonkey-${version}";
+ pname = "spidermonkey";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2";
diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index 2ec5923b0e1f..238afd4bd040 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -2,8 +2,9 @@
let
version = "52.9.0";
-in stdenv.mkDerivation rec {
- name = "spidermonkey-${version}";
+in stdenv.mkDerivation {
+ pname = "spidermonkey";
+ inherit version;
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix
index 518fc5f77b72..f62638dd8386 100644
--- a/pkgs/development/interpreters/spidermonkey/60.nix
+++ b/pkgs/development/interpreters/spidermonkey/60.nix
@@ -5,8 +5,9 @@ with stdenv.lib;
let
version = "60.4.0";
-in stdenv.mkDerivation rec {
- name = "spidermonkey-${version}";
+in stdenv.mkDerivation {
+ pname = "spidermonkey";
+ inherit version;
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 057375182f53..b4ed92324521 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, alsaLib
+{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, alsaLib
, libjack2, libsndfile, fftw, curl, gcc
, libXt, qtbase, qttools, qtwebengine
, readline, qtwebsockets, useSCEL ? false, emacs
@@ -7,25 +7,27 @@
let optional = stdenv.lib.optional;
in
-stdenv.mkDerivation rec {
- name = "supercollider-${version}";
- version = "3.10.2";
+mkDerivation rec {
+ pname = "supercollider";
+ version = "3.10.3";
src = fetchurl {
- url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2";
- sha256 = "0ynz1ydcpsd5h57h1n4a7avm6p1cif5a8rkmz4qpr46pr8z9p6iq";
+ url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2";
+ sha256 = "1wvsrr4qcqmpxpn57wwrnwbnf3pflr3n4wkj9j6b9cdisp34kv5d";
};
hardeningDisable = [ "stackprotector" ];
- cmakeFlags = ''
- -DSC_WII=OFF
- -DSC_EL=${if useSCEL then "ON" else "OFF"}
- '';
+ cmakeFlags = [
+ "-DSC_WII=OFF"
+ "-DSC_EL=${if useSCEL then "ON" else "OFF"}"
+ ];
nativeBuildInputs = [ cmake pkgconfig qttools ];
+ enableParallelBuilding = true;
+
buildInputs = [
gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ]
++ optional (!stdenv.isDarwin) alsaLib
@@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Programming language for real time audio synthesis";
- homepage = http://supercollider.sourceforge.net/;
+ homepage = "https://supercollider.github.io";
maintainers = with maintainers; [ mrmebelman ];
license = licenses.gpl3;
platforms = [ "x686-linux" "x86_64-linux" ];
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index cd377e70cd9c..3c585c3f07fa 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -5,8 +5,9 @@
, ...
}:
-stdenv.mkDerivation rec {
- name = "tcl-${version}";
+stdenv.mkDerivation {
+ pname = "tcl";
+ inherit version;
inherit src;
diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix
index f2c5fd938cec..ca897ec692c1 100644
--- a/pkgs/development/interpreters/tinyscheme/default.nix
+++ b/pkgs/development/interpreters/tinyscheme/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "tinyscheme-${version}";
+ pname = "tinyscheme";
version = "1.41";
src = fetchurl {
- url = "mirror://sourceforge/tinyscheme/${name}.tar.gz";
+ url = "mirror://sourceforge/tinyscheme/${pname}-${version}.tar.gz";
sha256 = "168rk4zrlhsknbvldq2jsgabpwlqkx6la44gkqmijmf7jhs11h7a";
};
diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix
index 77154b54fd8f..bb4a2d01499d 100644
--- a/pkgs/development/interpreters/unicon-lang/default.nix
+++ b/pkgs/development/interpreters/unicon-lang/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip, libX11, libXt }:
-stdenv.mkDerivation rec {
- name = "unicon-lang-${version}";
+stdenv.mkDerivation {
+ pname = "unicon-lang";
version = "11.7";
src = fetchurl {
url = "http://unicon.org/dist/uni-2-4-2010.zip";
diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/pkgs/development/interpreters/wasm-gc/default.nix
index ac291668e2d9..44ac11be5400 100644
--- a/pkgs/development/interpreters/wasm-gc/default.nix
+++ b/pkgs/development/interpreters/wasm-gc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "wasm-gc-${version}";
+ pname = "wasm-gc";
version = "0.1.6";
src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index 90fc38afa061..b53b3ed9dbfb 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -1,6 +1,6 @@
{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
pname = "wasmtime";
version = "20190521";
diff --git a/pkgs/development/java-modules/apache/ant-launcher.nix b/pkgs/development/java-modules/apache/ant-launcher.nix
index e6a2b0cae99d..e5f4d5f6ee0f 100644
--- a/pkgs/development/java-modules/apache/ant-launcher.nix
+++ b/pkgs/development/java-modules/apache/ant-launcher.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
antLauncher_1_8_2 = map (obj: fetchMaven {
version = "1.8.2";
artifactId = "ant-launcher";
diff --git a/pkgs/development/java-modules/apache/ant.nix b/pkgs/development/java-modules/apache/ant.nix
index b4a6aa68f448..5de82b1703b3 100644
--- a/pkgs/development/java-modules/apache/ant.nix
+++ b/pkgs/development/java-modules/apache/ant.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
ant_1_8_2 = map (obj: fetchMaven {
version = "1.8.2";
artifactId = "ant";
diff --git a/pkgs/development/java-modules/apache/commons-cli.nix b/pkgs/development/java-modules/apache/commons-cli.nix
index 050d511b0a10..5cb25a0f379e 100644
--- a/pkgs/development/java-modules/apache/commons-cli.nix
+++ b/pkgs/development/java-modules/apache/commons-cli.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
commonsCli_1_0 = map (obj: fetchMaven {
version = "1.0";
artifactId = "commons-cli";
diff --git a/pkgs/development/java-modules/apache/commons-io.nix b/pkgs/development/java-modules/apache/commons-io.nix
index 70ce940ccf17..28bb9d381f9e 100644
--- a/pkgs/development/java-modules/apache/commons-io.nix
+++ b/pkgs/development/java-modules/apache/commons-io.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
commonsIo_2_1 = map (obj: fetchMaven {
version = "2.1";
artifactId = "commons-io";
diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/pkgs/development/java-modules/apache/commons-lang.nix
index a2d71e9db0c8..501da6d204d0 100644
--- a/pkgs/development/java-modules/apache/commons-lang.nix
+++ b/pkgs/development/java-modules/apache/commons-lang.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
commonsLang_2_1 = map (obj: fetchMaven {
version = "2.1";
artifactId = "commons-lang";
diff --git a/pkgs/development/java-modules/apache/commons-lang3.nix b/pkgs/development/java-modules/apache/commons-lang3.nix
index 63f68b925430..3bbbe9d2e39a 100644
--- a/pkgs/development/java-modules/apache/commons-lang3.nix
+++ b/pkgs/development/java-modules/apache/commons-lang3.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
commonsLang3_3_1 = map (obj: fetchMaven {
version = "3.1";
artifactId = "commons-lang3";
diff --git a/pkgs/development/java-modules/apache/commons-logging-api.nix b/pkgs/development/java-modules/apache/commons-logging-api.nix
index 47750abe4623..befb2003d01c 100644
--- a/pkgs/development/java-modules/apache/commons-logging-api.nix
+++ b/pkgs/development/java-modules/apache/commons-logging-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
commonsLoggingApi_1_1 = map (obj: fetchMaven {
version = "1.1";
artifactId = "commons-logging-api";
diff --git a/pkgs/development/java-modules/apache/xbean-reflect.nix b/pkgs/development/java-modules/apache/xbean-reflect.nix
index f0614ec99e36..8f7c35b716f9 100644
--- a/pkgs/development/java-modules/apache/xbean-reflect.nix
+++ b/pkgs/development/java-modules/apache/xbean-reflect.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
xbeanReflect_3_4 = map (obj: fetchMaven {
version = "3.4";
artifactId = "xbean-reflect";
diff --git a/pkgs/development/java-modules/beanshell/bsh.nix b/pkgs/development/java-modules/beanshell/bsh.nix
index 41756bb80d50..783fdc8679cc 100644
--- a/pkgs/development/java-modules/beanshell/bsh.nix
+++ b/pkgs/development/java-modules/beanshell/bsh.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
bsh_2_0_b4 = map (obj: fetchMaven {
version = "2.0b4";
artifactId = "bsh";
diff --git a/pkgs/development/java-modules/classworlds/classworlds.nix b/pkgs/development/java-modules/classworlds/classworlds.nix
index f8bbc07f1025..3561c0b6e5e1 100644
--- a/pkgs/development/java-modules/classworlds/classworlds.nix
+++ b/pkgs/development/java-modules/classworlds/classworlds.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
classworlds_1_1_alpha2 = map (obj: fetchMaven {
version = "1.1-alpha-2";
artifactId = "classworlds";
diff --git a/pkgs/development/java-modules/collections.nix b/pkgs/development/java-modules/collections.nix
index 39b274b5030a..83f7a95af81d 100644
--- a/pkgs/development/java-modules/collections.nix
+++ b/pkgs/development/java-modules/collections.nix
@@ -2,7 +2,7 @@
with pkgs.javaPackages;
-rec {
+{
mavenLibs_2_0_1 = [
mavenArtifact_2_0_1
mavenArtifactManager_2_0_1
diff --git a/pkgs/development/java-modules/eclipse/aether-util.nix b/pkgs/development/java-modules/eclipse/aether-util.nix
index 60aac560b9b2..6ebca58c44e5 100644
--- a/pkgs/development/java-modules/eclipse/aether-util.nix
+++ b/pkgs/development/java-modules/eclipse/aether-util.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
aetherUtil_0_9_0_M2 = map (obj: fetchMaven {
version = "0.9.0.M2";
artifactId = "aether-util";
diff --git a/pkgs/development/java-modules/findbugs/jsr305.nix b/pkgs/development/java-modules/findbugs/jsr305.nix
index 2e842410aafb..7816ab49d612 100644
--- a/pkgs/development/java-modules/findbugs/jsr305.nix
+++ b/pkgs/development/java-modules/findbugs/jsr305.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
findbugsJsr305_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "jsr305";
diff --git a/pkgs/development/java-modules/google/collections.nix b/pkgs/development/java-modules/google/collections.nix
index ec874c73e365..b5b4551dd97b 100644
--- a/pkgs/development/java-modules/google/collections.nix
+++ b/pkgs/development/java-modules/google/collections.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
googleCollections_1_0 = map (obj: fetchMaven {
version = "1.0";
artifactId = "google-collections";
diff --git a/pkgs/development/java-modules/hamcrest/all.nix b/pkgs/development/java-modules/hamcrest/all.nix
index bab9e1b115d0..73c27c4af8b1 100644
--- a/pkgs/development/java-modules/hamcrest/all.nix
+++ b/pkgs/development/java-modules/hamcrest/all.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
hamcrestAll_1_3 = map (obj: fetchMaven {
version = "1.3";
artifactId = "hamcrest-all";
diff --git a/pkgs/development/java-modules/hamcrest/core.nix b/pkgs/development/java-modules/hamcrest/core.nix
index 3842b8c5afa0..4145191fdd91 100644
--- a/pkgs/development/java-modules/hamcrest/core.nix
+++ b/pkgs/development/java-modules/hamcrest/core.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
hamcrestCore_1_3 = map (obj: fetchMaven {
version = "1.3";
artifactId = "hamcrest-core";
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index 36c4af5f4961..d179fb531789 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -15,8 +15,9 @@ in
sha256 = "00hybisjwqs88p24dds652bzrwbbmhn2dpx56kp4j6xpadkp33d0";
fetchSubmodules = true;
};
- in stdenv.mkDerivation rec {
- name = "jogl-${version}";
+ in stdenv.mkDerivation {
+ pname = "jogl";
+ inherit version;
src = fetchgit {
url = git://jogamp.org/srv/scm/jogl.git;
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index a7bfa545908a..6f86cede5120 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -6,7 +6,7 @@ let
poms = import (../poms.nix) { inherit fetchMaven; };
collections = import (../collections.nix) { inherit pkgs; };
in rec {
- junitGen = { mavenDeps, sha512, version }: mavenbuild rec {
+ junitGen = { mavenDeps, sha512, version }: mavenbuild {
inherit mavenDeps sha512 version;
name = "junit-${version}";
diff --git a/pkgs/development/java-modules/log4j/default.nix b/pkgs/development/java-modules/log4j/default.nix
index a8b1ea9f0217..e95c0847aacc 100644
--- a/pkgs/development/java-modules/log4j/default.nix
+++ b/pkgs/development/java-modules/log4j/default.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
log4j_1_2_12 = map (obj: fetchMaven {
version = "1.2.12";
artifactId = "log4j";
diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix
index 7ebe655580e5..3a289c9c9c4a 100644
--- a/pkgs/development/java-modules/m2install.nix
+++ b/pkgs/development/java-modules/m2install.nix
@@ -5,11 +5,11 @@ let
name = "${artifactId}-${version}";
m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}";
m2File = "${name}${suffix}.${type}";
- src = fetchurl rec {
+ src = fetchurl {
inherit sha512;
url = "mirror://maven/${m2Path}/${m2File}";
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit name m2Path m2File src;
installPhase = ''
diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix
index f3d5fb3e9342..b8e128ac728c 100644
--- a/pkgs/development/java-modules/maven-hello/default.nix
+++ b/pkgs/development/java-modules/maven-hello/default.nix
@@ -5,7 +5,7 @@ with pkgs.javaPackages;
let
poms = import ../poms.nix { inherit fetchMaven; };
in rec {
- mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild rec {
+ mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild {
inherit mavenDeps sha512 version skipTests quiet;
name = "maven-hello-${version}";
diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix
index f63c91cd360a..c1fab1e9bc97 100644
--- a/pkgs/development/java-modules/maven-minimal.nix
+++ b/pkgs/development/java-modules/maven-minimal.nix
@@ -8,7 +8,7 @@ let
fetchMaven = pkgs.callPackage ./m2install.nix { };
plugins = import ./mavenPlugins.nix { inherit pkgs; };
poms = import ./poms.nix { inherit fetchMaven; };
-in rec {
+in {
# Maven needs all of these to function
mavenMinimal = flatten
collections.mavenLibs_2_0_6
diff --git a/pkgs/development/java-modules/maven/archiver.nix b/pkgs/development/java-modules/maven/archiver.nix
index 14c5a99d42ff..9965f86f72bd 100644
--- a/pkgs/development/java-modules/maven/archiver.nix
+++ b/pkgs/development/java-modules/maven/archiver.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenArchiver_2_5 = map (obj: fetchMaven {
version = "2.5";
artifactId = "maven-archiver";
diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix
index 0796d0665103..5bf3ef01bc65 100644
--- a/pkgs/development/java-modules/maven/artifact-manager.nix
+++ b/pkgs/development/java-modules/maven/artifact-manager.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenArtifactManager_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-artifact-manager";
diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix
index bb0e578d5d63..80e3392abd2f 100644
--- a/pkgs/development/java-modules/maven/artifact.nix
+++ b/pkgs/development/java-modules/maven/artifact.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenArtifact_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-artifact";
diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix
index 948dbc3baf6c..8c3886679919 100644
--- a/pkgs/development/java-modules/maven/common-artifact-filters.nix
+++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenCommonArtifactFilters_1_2 = map (obj: fetchMaven {
version = "1.2";
artifactId = "maven-common-artifact-filters";
diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix
index 5b45f89e9d54..a1ea9292a513 100644
--- a/pkgs/development/java-modules/maven/core.nix
+++ b/pkgs/development/java-modules/maven/core.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenCore_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-core";
diff --git a/pkgs/development/java-modules/maven/dependency-tree.nix b/pkgs/development/java-modules/maven/dependency-tree.nix
index 00d089ea249b..aa3a93849c25 100644
--- a/pkgs/development/java-modules/maven/dependency-tree.nix
+++ b/pkgs/development/java-modules/maven/dependency-tree.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenDependencyTree_2_1 = map (obj: fetchMaven {
version = "2.1";
artifactId = "maven-dependency-tree";
diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/pkgs/development/java-modules/maven/doxia-sink-api.nix
index 9fa1051cd80b..8314abe4924f 100644
--- a/pkgs/development/java-modules/maven/doxia-sink-api.nix
+++ b/pkgs/development/java-modules/maven/doxia-sink-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenDoxiaSinkApi_1_0_alpha6 = map (obj: fetchMaven {
version = "1.0-alpha-6";
artifactId = "doxia-sink-api";
diff --git a/pkgs/development/java-modules/maven/enforcer.nix b/pkgs/development/java-modules/maven/enforcer.nix
index 014f678bc149..c7a1d212e0e5 100644
--- a/pkgs/development/java-modules/maven/enforcer.nix
+++ b/pkgs/development/java-modules/maven/enforcer.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenEnforcerApi_1_3_1 = map (obj: fetchMaven {
version = "1.3.1";
artifactId = "enforcer-api";
diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix
index 80cbf993a60d..f16f10462ff2 100644
--- a/pkgs/development/java-modules/maven/error-diagnostics.nix
+++ b/pkgs/development/java-modules/maven/error-diagnostics.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenErrorDiagnostics_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-error-diagnostics";
diff --git a/pkgs/development/java-modules/maven/filtering.nix b/pkgs/development/java-modules/maven/filtering.nix
index 963d6c6b646d..f1e2e551cee2 100644
--- a/pkgs/development/java-modules/maven/filtering.nix
+++ b/pkgs/development/java-modules/maven/filtering.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenFiltering_1_1 = map (obj: fetchMaven {
version = "1.1";
artifactId = "maven-filtering";
diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix
index 2ae3bfe6034c..147b15b6e400 100644
--- a/pkgs/development/java-modules/maven/model.nix
+++ b/pkgs/development/java-modules/maven/model.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenModel_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-model";
diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix
index ce6c7c176941..609745e94229 100644
--- a/pkgs/development/java-modules/maven/monitor.nix
+++ b/pkgs/development/java-modules/maven/monitor.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenMonitor_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-monitor";
diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix
index f852cc957a56..bf8d608488e8 100644
--- a/pkgs/development/java-modules/maven/plugin-annotations.nix
+++ b/pkgs/development/java-modules/maven/plugin-annotations.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenPluginAnnotations_3_1 = map (obj: fetchMaven {
version = "3.1";
artifactId = "maven-plugin-annotations";
diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix
index be9642b0e206..55fb0d2c5ddf 100644
--- a/pkgs/development/java-modules/maven/plugin-api.nix
+++ b/pkgs/development/java-modules/maven/plugin-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenPluginApi_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-plugin-api";
diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix
index dbdc09a46734..7f5c22fe3b3a 100644
--- a/pkgs/development/java-modules/maven/plugin-descriptor.nix
+++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenPluginDescriptor_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-plugin-descriptor";
diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
index 9e11c0f40829..4ff07574dc92 100644
--- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
+++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenPluginParameterDocumenter_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-plugin-parameter-documenter";
diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix
index f0074ef816ed..a7bb92e645d3 100644
--- a/pkgs/development/java-modules/maven/plugin-registry.nix
+++ b/pkgs/development/java-modules/maven/plugin-registry.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenPluginRegistry_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-plugin-registry";
diff --git a/pkgs/development/java-modules/maven/plugin-testing-harness.nix b/pkgs/development/java-modules/maven/plugin-testing-harness.nix
index a65f19620485..4cd32d508f33 100644
--- a/pkgs/development/java-modules/maven/plugin-testing-harness.nix
+++ b/pkgs/development/java-modules/maven/plugin-testing-harness.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenPluginTestingHarness_1_1 = map (obj: fetchMaven {
version = "1.1";
artifactId = "maven-plugin-testing-harness";
diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix
index 6940fafae821..c40f87f1c45d 100644
--- a/pkgs/development/java-modules/maven/profile.nix
+++ b/pkgs/development/java-modules/maven/profile.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenProfile_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-profile";
diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix
index 0b07d8b8679b..fad53a0250b3 100644
--- a/pkgs/development/java-modules/maven/project.nix
+++ b/pkgs/development/java-modules/maven/project.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenProject_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-project";
diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/pkgs/development/java-modules/maven/reporting-api.nix
index 8a508cf15053..87999d452fc4 100644
--- a/pkgs/development/java-modules/maven/reporting-api.nix
+++ b/pkgs/development/java-modules/maven/reporting-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenReportingApi_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-reporting-api";
diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix
index 443a1acd4513..0d8f55737b77 100644
--- a/pkgs/development/java-modules/maven/repository-metadata.nix
+++ b/pkgs/development/java-modules/maven/repository-metadata.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenRepositoryMetadata_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-repository-metadata";
diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix
index 6b42082cfd8a..09e0170945d5 100644
--- a/pkgs/development/java-modules/maven/settings.nix
+++ b/pkgs/development/java-modules/maven/settings.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenSettings_2_0_1 = map (obj: fetchMaven {
version = "2.0.1";
artifactId = "maven-settings";
diff --git a/pkgs/development/java-modules/maven/shared-incremental.nix b/pkgs/development/java-modules/maven/shared-incremental.nix
index 67c44986d0a0..9fa74f8bfe77 100644
--- a/pkgs/development/java-modules/maven/shared-incremental.nix
+++ b/pkgs/development/java-modules/maven/shared-incremental.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenSharedIncremental_1_1 = map (obj: fetchMaven {
version = "1.1";
artifactId = "maven-shared-incremental";
diff --git a/pkgs/development/java-modules/maven/shared-utils.nix b/pkgs/development/java-modules/maven/shared-utils.nix
index b3cfc9280914..38addcfe8aa9 100644
--- a/pkgs/development/java-modules/maven/shared-utils.nix
+++ b/pkgs/development/java-modules/maven/shared-utils.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenSharedUtils_0_1 = map (obj: fetchMaven {
version = "0.1";
artifactId = "maven-shared-utils";
diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix
index c1f7fcc3f76c..9ad284365d95 100644
--- a/pkgs/development/java-modules/maven/surefire-api.nix
+++ b/pkgs/development/java-modules/maven/surefire-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenSurefireApi_2_12_4 = map (obj: fetchMaven {
version = "2.12.4";
artifactId = "surefire-api";
diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/pkgs/development/java-modules/maven/surefire-booter.nix
index b62aa86bf45c..41f9848d5cd9 100644
--- a/pkgs/development/java-modules/maven/surefire-booter.nix
+++ b/pkgs/development/java-modules/maven/surefire-booter.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenSurefireBooter_2_12_4 = map (obj: fetchMaven {
version = "2.12.4";
artifactId = "surefire-booter";
diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/pkgs/development/java-modules/maven/surefire-common.nix
index bc0573f6b706..2f4617eff8c0 100644
--- a/pkgs/development/java-modules/maven/surefire-common.nix
+++ b/pkgs/development/java-modules/maven/surefire-common.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenSurefireCommon_2_12_4 = map (obj: fetchMaven {
version = "2.12.4";
artifactId = "maven-surefire-common";
diff --git a/pkgs/development/java-modules/maven/surefire-junit4.nix b/pkgs/development/java-modules/maven/surefire-junit4.nix
index 1374080d0874..d67177d80d23 100644
--- a/pkgs/development/java-modules/maven/surefire-junit4.nix
+++ b/pkgs/development/java-modules/maven/surefire-junit4.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenSurefireJunit4_2_12_4 = map (obj: fetchMaven {
version = "2.12.4";
artifactId = "surefire-junit4";
diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/pkgs/development/java-modules/maven/toolchain.nix
index 864d3b98f7ba..91f8fdb77a41 100644
--- a/pkgs/development/java-modules/maven/toolchain.nix
+++ b/pkgs/development/java-modules/maven/toolchain.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mavenToolchain_1_0 = map (obj: fetchMaven {
version = "1.0";
artifactId = "maven-toolchain";
diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix
index 8cc79dc1d228..e481f5d250a3 100644
--- a/pkgs/development/java-modules/mavenPlugins.nix
+++ b/pkgs/development/java-modules/mavenPlugins.nix
@@ -5,7 +5,7 @@ with pkgs.javaPackages;
let
fetchMaven = pkgs.callPackage ./m2install.nix { };
-in rec {
+in {
inherit fetchMaven;
animalSniffer_1_11 = map (obj: fetchMaven {
@@ -19,7 +19,7 @@ in rec {
{ type = "jar"; sha512 = "24dih4wp7p1rddvxcznlz42yxhqlln5ljdbvwnp75rsyf3ng25zv881ixk5qx8canr1lxx4kh22kwkaahz3qnw54fqn7w5z58m5768n"; }
];
- mavenClean_2_5 = map (obj: fetchMaven rec {
+ mavenClean_2_5 = map (obj: fetchMaven {
version = "2.5";
artifactId = "maven-clean-plugin";
groupId = "org.apache.maven.plugins";
@@ -30,7 +30,7 @@ in rec {
{ type = "jar"; sha512 = "2fprppwpmzyvaynadm6slk382khlpf5s8sbi5x249qcaw2vkg5n77q79lgq981v9kjlr5wighjzpjqv8gdig45m2p37mcfwsy3jsv89"; }
];
- mavenCompiler_3_1 = map (obj: fetchMaven rec {
+ mavenCompiler_3_1 = map (obj: fetchMaven {
version = "3.1";
artifactId = "maven-compiler-plugin";
groupId = "org.apache.maven.plugins";
@@ -41,7 +41,7 @@ in rec {
{ type = "jar"; sha512 = "1dvq13yc8yacxr66pkvwwd4cvx0jln8dv9fh5gmd5vir05h8l5j4y324r1bklnzpx0ancs5ad8z944zgmpaq3w195kfsarmndp0gv2y"; }
];
- mavenEnforcer_1_3_1 = map (obj: fetchMaven rec {
+ mavenEnforcer_1_3_1 = map (obj: fetchMaven {
version = "1.3.1";
artifactId = "maven-enforcer-plugin";
groupId = "org.apache.maven.plugins";
@@ -52,7 +52,7 @@ in rec {
{ type = "jar"; sha512 = "15sb9qmxgbq82nzc9x66152va121vf33nn0ah2g4z169cv6jnjq05gk1472k59imypvwsh9hd3hqi9q6g8d0sawgk5l1ax900cx7n25"; }
];
- mavenInstall_2_4 = map (obj: fetchMaven rec {
+ mavenInstall_2_4 = map (obj: fetchMaven {
version = "2.4";
artifactId = "maven-install-plugin";
groupId = "org.apache.maven.plugins";
@@ -63,7 +63,7 @@ in rec {
{ type = "jar"; sha512 = "35hbj5hbz085y1dxfmza6m207kn68q2g1k5a9mc75i9pj8fww7xm7xzcdv81xyxjm3r4qbqf1izlg16l99b93rfii9rg8kqz8mxqmb6"; }
];
- mavenJar_2_4 = map (obj: fetchMaven rec {
+ mavenJar_2_4 = map (obj: fetchMaven {
version = "2.4";
artifactId = "maven-jar-plugin";
groupId = "org.apache.maven.plugins";
@@ -74,7 +74,7 @@ in rec {
{ type = "jar"; sha512 = "0frbikq8jm5pynlmv51k349kiaipd9jsrh6970313s0g6n4i0ws9vi232wc1mjrc3d27k63xqmb97jzgbbc6q337ypv5vil1ql9wh0d"; }
];
- mavenReplacer_1_5_3 = map (obj: fetchMaven rec {
+ mavenReplacer_1_5_3 = map (obj: fetchMaven {
version = "1.5.3";
artifactId = "replacer";
groupId = "com.google.code.maven-replacer-plugin";
@@ -85,7 +85,7 @@ in rec {
{ type = "jar"; sha512 = "0f2rngcxpll0iigv115132fld5n6shjfn7m981sg7mdzlj75q2h5knd4x1ip33w60cm1j0rmqaxp1y6qn76ykvhprdyy9smiy667l9x"; }
];
- mavenResources_2_6 = map (obj: fetchMaven rec {
+ mavenResources_2_6 = map (obj: fetchMaven {
version = "2.6";
artifactId = "maven-resources-plugin";
groupId = "org.apache.maven.plugins";
@@ -96,7 +96,7 @@ in rec {
{ type = "jar"; sha512 = "3j8smsx6wk085iic5qhknrszixxna6szmvk2rn9zkn75ffjr7ham72hw9cmxf5160j73n8f2cmcbw1x462fqy12fqqpmzx08i1sbwcv"; }
];
- mavenSurefire_2_12_4 = map (obj: fetchMaven rec {
+ mavenSurefire_2_12_4 = map (obj: fetchMaven {
version = "2.12.4";
artifactId = "maven-surefire-plugin";
groupId = "org.apache.maven.plugins";
@@ -107,7 +107,7 @@ in rec {
{ type = "jar"; sha512 = "2sjq2l8i97h3ay8wwrsi75cfs9d1im5ar2sn2zv4q6xsv4v3hh5y481l9xwc5dnbcfdjs38ald0z60pxpcyiqrng6h69s2ws8fhb0mm"; }
];
- mavenSurefire_2_17 = map (obj: fetchMaven rec {
+ mavenSurefire_2_17 = map (obj: fetchMaven {
version = "2.17";
artifactId = "maven-surefire-plugin";
groupId = "org.apache.maven.plugins";
diff --git a/pkgs/development/java-modules/mojo/animal-sniffer.nix b/pkgs/development/java-modules/mojo/animal-sniffer.nix
index dd9b1d1b0aa5..221e59f766b9 100644
--- a/pkgs/development/java-modules/mojo/animal-sniffer.nix
+++ b/pkgs/development/java-modules/mojo/animal-sniffer.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mojoAnimalSniffer_1_11 = map (obj: fetchMaven {
version = "1.11";
artifactId = "animal-sniffer";
diff --git a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
index 245daa5fdb90..f6f7e490c7cf 100644
--- a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
+++ b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
mojoJavaBootClasspathDetector_1_11 = map (obj: fetchMaven {
version = "1.11";
artifactId = "java-boot-classpath-detector";
diff --git a/pkgs/development/java-modules/ow2/asm-all.nix b/pkgs/development/java-modules/ow2/asm-all.nix
index 08d18745ed7f..92418d8c6194 100644
--- a/pkgs/development/java-modules/ow2/asm-all.nix
+++ b/pkgs/development/java-modules/ow2/asm-all.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
ow2AsmAll_4_0 = map (obj: fetchMaven {
version = "4.0";
artifactId = "asm-all";
diff --git a/pkgs/development/java-modules/plexus/archiver.nix b/pkgs/development/java-modules/plexus/archiver.nix
index 384b92859762..41a334007e8f 100644
--- a/pkgs/development/java-modules/plexus/archiver.nix
+++ b/pkgs/development/java-modules/plexus/archiver.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusArchiver_1_0_alpha7 = map (obj: fetchMaven {
version = "1.0-alpha-7";
artifactId = "plexus-archiver";
diff --git a/pkgs/development/java-modules/plexus/build-api.nix b/pkgs/development/java-modules/plexus/build-api.nix
index c417c955b69b..b362f905091e 100644
--- a/pkgs/development/java-modules/plexus/build-api.nix
+++ b/pkgs/development/java-modules/plexus/build-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusBuildApi_0_0_4 = map (obj: fetchMaven {
version = "0.0.4";
artifactId = "plexus-build-api";
diff --git a/pkgs/development/java-modules/plexus/classworlds.nix b/pkgs/development/java-modules/plexus/classworlds.nix
index 6ff1755e8f53..7cb6c3dbf558 100644
--- a/pkgs/development/java-modules/plexus/classworlds.nix
+++ b/pkgs/development/java-modules/plexus/classworlds.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusClassworlds_2_2_2 = map (obj: fetchMaven {
version = "2.2.2";
artifactId = "plexus-classworlds";
diff --git a/pkgs/development/java-modules/plexus/compiler-api.nix b/pkgs/development/java-modules/plexus/compiler-api.nix
index 11baab0950d0..a1c6556a7699 100644
--- a/pkgs/development/java-modules/plexus/compiler-api.nix
+++ b/pkgs/development/java-modules/plexus/compiler-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusCompilerApi_2_2 = map (obj: fetchMaven {
version = "2.2";
artifactId = "plexus-compiler-api";
diff --git a/pkgs/development/java-modules/plexus/compiler-javac.nix b/pkgs/development/java-modules/plexus/compiler-javac.nix
index a42064a0e9e8..d86240b6d45b 100644
--- a/pkgs/development/java-modules/plexus/compiler-javac.nix
+++ b/pkgs/development/java-modules/plexus/compiler-javac.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusCompilerJavac_2_2 = map (obj: fetchMaven {
version = "2.2";
artifactId = "plexus-compiler-javac";
diff --git a/pkgs/development/java-modules/plexus/compiler-manager.nix b/pkgs/development/java-modules/plexus/compiler-manager.nix
index f7221a96627f..3f27981b1540 100644
--- a/pkgs/development/java-modules/plexus/compiler-manager.nix
+++ b/pkgs/development/java-modules/plexus/compiler-manager.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusCompilerManager_2_2 = map (obj: fetchMaven {
version = "2.2";
artifactId = "plexus-compiler-manager";
diff --git a/pkgs/development/java-modules/plexus/component-annotations.nix b/pkgs/development/java-modules/plexus/component-annotations.nix
index fd3fc80e7e05..89ae778e762f 100644
--- a/pkgs/development/java-modules/plexus/component-annotations.nix
+++ b/pkgs/development/java-modules/plexus/component-annotations.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusComponentAnnotations_1_5_5 = map (obj: fetchMaven {
version = "1.5.5";
artifactId = "plexus-component-annotations";
diff --git a/pkgs/development/java-modules/plexus/container-default.nix b/pkgs/development/java-modules/plexus/container-default.nix
index 375a1913afcd..79d8ac1087b4 100644
--- a/pkgs/development/java-modules/plexus/container-default.nix
+++ b/pkgs/development/java-modules/plexus/container-default.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusContainerDefault_1_0_alpha9 = map (obj: fetchMaven {
version = "1.0-alpha-9";
artifactId = "plexus-container-default";
diff --git a/pkgs/development/java-modules/plexus/digest.nix b/pkgs/development/java-modules/plexus/digest.nix
index be2013a26760..a9c80c146c9b 100644
--- a/pkgs/development/java-modules/plexus/digest.nix
+++ b/pkgs/development/java-modules/plexus/digest.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusDigest_1_0 = map (obj: fetchMaven {
version = "1.0";
artifactId = "plexus-digest";
diff --git a/pkgs/development/java-modules/plexus/i18n.nix b/pkgs/development/java-modules/plexus/i18n.nix
index 5b34cde0503c..0b016a7bd493 100644
--- a/pkgs/development/java-modules/plexus/i18n.nix
+++ b/pkgs/development/java-modules/plexus/i18n.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusI18n_1_0_beta6 = map (obj: fetchMaven {
version = "1.0-beta-6";
artifactId = "plexus-i18n";
diff --git a/pkgs/development/java-modules/plexus/interactivity-api.nix b/pkgs/development/java-modules/plexus/interactivity-api.nix
index 8ada106f48fd..378fa76d8c62 100644
--- a/pkgs/development/java-modules/plexus/interactivity-api.nix
+++ b/pkgs/development/java-modules/plexus/interactivity-api.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusInteractivityApi_1_0_alpha4 = map (obj: fetchMaven {
version = "1.0-alpha-4";
artifactId = "plexus-interactivity-api";
diff --git a/pkgs/development/java-modules/plexus/interpolation.nix b/pkgs/development/java-modules/plexus/interpolation.nix
index 90ff3de6a3fe..f2813e103f5c 100644
--- a/pkgs/development/java-modules/plexus/interpolation.nix
+++ b/pkgs/development/java-modules/plexus/interpolation.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusInterpolation_1_11 = map (obj: fetchMaven {
version = "1.11";
artifactId = "plexus-interpolation";
diff --git a/pkgs/development/java-modules/plexus/io.nix b/pkgs/development/java-modules/plexus/io.nix
index eee41f5ed2fd..e2cfd4b5882d 100644
--- a/pkgs/development/java-modules/plexus/io.nix
+++ b/pkgs/development/java-modules/plexus/io.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusIo_2_0_2 = map (obj: fetchMaven {
version = "2.0.2";
artifactId = "plexus-io";
diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix
index ce0537cea7d8..c52425342b0e 100644
--- a/pkgs/development/java-modules/plexus/utils.nix
+++ b/pkgs/development/java-modules/plexus/utils.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
plexusUtils_1_0_4 = map (obj: fetchMaven {
version = "1.0.4";
artifactId = "plexus-utils";
diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix
index 610f98a7e466..d93edb7aa4fd 100644
--- a/pkgs/development/java-modules/poms.nix
+++ b/pkgs/development/java-modules/poms.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
aether_0_9_0_M2 = fetchMaven {
version = "0.9.0.M2";
artifactId = "aether";
diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix
index c67d72705482..69cb24fc0b0c 100644
--- a/pkgs/development/java-modules/postgresql_jdbc/default.nix
+++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchMavenArtifact }:
stdenv.mkDerivation rec {
- name = "postgresql-jdbc-${version}";
+ pname = "postgresql-jdbc";
version = "42.2.5";
src = fetchMavenArtifact {
diff --git a/pkgs/development/java-modules/sisu/guice.nix b/pkgs/development/java-modules/sisu/guice.nix
index 51a004ed5451..e4d0e1f98d4a 100644
--- a/pkgs/development/java-modules/sisu/guice.nix
+++ b/pkgs/development/java-modules/sisu/guice.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
sisuGuice_2_9_4 = map (obj: fetchMaven {
version = "2.9.4";
artifactId = "sisu-guice";
diff --git a/pkgs/development/java-modules/sisu/inject-bean.nix b/pkgs/development/java-modules/sisu/inject-bean.nix
index bca16ccd114c..22d3582608a3 100644
--- a/pkgs/development/java-modules/sisu/inject-bean.nix
+++ b/pkgs/development/java-modules/sisu/inject-bean.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
sisuInjectBean_2_1_1 = map (obj: fetchMaven {
version = "2.1.1";
artifactId = "sisu-inject-bean";
diff --git a/pkgs/development/java-modules/sisu/inject-plexus.nix b/pkgs/development/java-modules/sisu/inject-plexus.nix
index 0a181dc1a1ec..aee624c551c9 100644
--- a/pkgs/development/java-modules/sisu/inject-plexus.nix
+++ b/pkgs/development/java-modules/sisu/inject-plexus.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
sisuInjectPlexus_2_1_1 = map (obj: fetchMaven {
version = "2.1.1";
artifactId = "sisu-inject-plexus";
diff --git a/pkgs/development/java-modules/xerces/impl.nix b/pkgs/development/java-modules/xerces/impl.nix
index 11295b3128fd..2ea05581d0d3 100644
--- a/pkgs/development/java-modules/xerces/impl.nix
+++ b/pkgs/development/java-modules/xerces/impl.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
xercesImpl_2_8_0 = map (obj: fetchMaven {
version = "2.8.0";
artifactId = "xercesImpl";
diff --git a/pkgs/development/java-modules/xml-apis/default.nix b/pkgs/development/java-modules/xml-apis/default.nix
index a96e3670b401..871629dbf3c2 100644
--- a/pkgs/development/java-modules/xml-apis/default.nix
+++ b/pkgs/development/java-modules/xml-apis/default.nix
@@ -1,6 +1,6 @@
{ fetchMaven }:
-rec {
+{
xmlApis_1_3_03 = map (obj: fetchMaven {
version = "1.3.03";
artifactId = "xml-apis";
diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix
index fcb708c829be..94b36b855f25 100644
--- a/pkgs/development/libraries/AntTweakBar/default.nix
+++ b/pkgs/development/libraries/AntTweakBar/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip, xorg, libGLU_combined }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "AntTweakBar-1.16";
buildInputs = [ unzip xorg.libX11 libGLU_combined ];
diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix
index fbf9615f88a2..f251d2bed0c5 100644
--- a/pkgs/development/libraries/CoinMP/default.nix
+++ b/pkgs/development/libraries/CoinMP/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "CoinMP-${version}";
+ pname = "CoinMP";
version = "1.8.4";
src = fetchurl {
- url = "https://www.coin-or.org/download/source/CoinMP/${name}.tgz";
+ url = "https://www.coin-or.org/download/source/CoinMP/${pname}-${version}.tgz";
sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l";
};
diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix
index 9522038df6af..418900ddeeb5 100644
--- a/pkgs/development/libraries/LASzip/default.nix
+++ b/pkgs/development/libraries/LASzip/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.2.0";
- name = "LASzip-${version}";
+ pname = "LASzip";
src = fetchurl {
url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index a8d5d608f895..610f1b768f24 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -14,11 +14,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "SDL-${version}";
+ pname = "SDL";
version = "1.2.15";
src = fetchurl {
- url = "https://www.libsdl.org/release/${name}.tar.gz";
+ url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz";
sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
};
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 94aca192852d..37e38e03b8cf 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -23,12 +23,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "SDL2-${version}";
- version = "2.0.9";
+ pname = "SDL2";
+ version = "2.0.10";
src = fetchurl {
- url = "https://www.libsdl.org/release/${name}.tar.gz";
- sha256 = "1c94ndagzkdfqaa838yqg589p1nnqln8mv0hpwfhrkbfczf8cl95";
+ url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz";
+ sha256 = "0mqxp6w5jhbq6y1j690g9r3gpzwjxh4czaglw8x05l7hl49nqrdl";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/development/libraries/SDL2/find-headers.patch
index a6114901055a..a6b10ddb7edf 100644
--- a/pkgs/development/libraries/SDL2/find-headers.patch
+++ b/pkgs/development/libraries/SDL2/find-headers.patch
@@ -1,12 +1,13 @@
diff -ru3 SDL2-2.0.4/sdl2-config.cmake.in SDL2-2.0.4-new/sdl2-config.cmake.in
--- SDL2-2.0.4/sdl2-config.cmake.in 2016-01-02 22:56:31.000000000 +0300
+++ SDL2-2.0.4-new/sdl2-config.cmake.in 2016-08-22 05:26:42.420397323 +0300
-@@ -6,5 +6,5 @@
+@@ -6,5 +6,6 @@
set(SDL2_PREFIX "@prefix@")
set(SDL2_EXEC_PREFIX "@prefix@")
set(SDL2_LIBDIR "@libdir@")
-set(SDL2_INCLUDE_DIRS "@includedir@/SDL2")
+set(SDL2_INCLUDE_DIRS "@includedir@/SDL2" $ENV{SDL2_PATH})
++separate_arguments(SDL2_INCLUDE_DIRS)
set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@")
diff -ru3 SDL2-2.0.4/sdl2-config.in SDL2-2.0.4-new/sdl2-config.in
--- SDL2-2.0.4/sdl2-config.in 2016-01-02 22:56:31.000000000 +0300
diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix
index 803cc97a8ae8..d57bb6cbc940 100644
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -1,12 +1,11 @@
{ stdenv, darwin, fetchurl, SDL2 }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "SDL2_gfx";
version = "1.0.4";
src = fetchurl {
- url = "http://www.ferzkopp.net/Software/${pname}/${name}.tar.gz";
+ url = "http://www.ferzkopp.net/Software/${pname}/${pname}-${version}.tar.gz";
sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33";
};
diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index ba33b1fbc1de..326d9d66264d 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libwebp, libXpm, zlib, Foundation }:
stdenv.mkDerivation rec {
- name = "SDL2_image-${version}";
+ pname = "SDL2_image";
version = "2.0.5";
src = fetchurl {
- url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
+ url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz";
sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx";
};
diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index 61e15d621bcd..826cf793cd2e 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -4,11 +4,11 @@
, enableNativeMidi ? false, fluidsynth ? null }:
stdenv.mkDerivation rec {
- name = "SDL2_mixer-${version}";
+ pname = "SDL2_mixer";
version = "2.0.4";
src = fetchurl {
- url = "https://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz";
+ url = "https://www.libsdl.org/projects/SDL_mixer/release/${pname}-${version}.tar.gz";
sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl";
};
diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix
index 1cb74ac1b2d3..309102e70b5e 100644
--- a/pkgs/development/libraries/SDL2_net/default.nix
+++ b/pkgs/development/libraries/SDL2_net/default.nix
@@ -1,11 +1,11 @@
{ stdenv, darwin, fetchurl, SDL2 }:
stdenv.mkDerivation rec {
- name = "SDL2_net-${version}";
+ pname = "SDL2_net";
version = "2.0.1";
src = fetchurl {
- url = "https://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz";
+ url = "https://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz";
sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm";
};
diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix
index b219922223fb..50e47bc1d362 100644
--- a/pkgs/development/libraries/SDL2_ttf/default.nix
+++ b/pkgs/development/libraries/SDL2_ttf/default.nix
@@ -1,11 +1,11 @@
{ stdenv, darwin, fetchurl, SDL2, freetype, libGL }:
stdenv.mkDerivation rec {
- name = "SDL2_ttf-${version}";
+ pname = "SDL2_ttf";
version = "2.0.15";
src = fetchurl {
- url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz";
+ url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz";
sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59";
};
diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix
index 68c8c16ed4e8..74a31d946874 100644
--- a/pkgs/development/libraries/SDL_gfx/default.nix
+++ b/pkgs/development/libraries/SDL_gfx/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, SDL }:
stdenv.mkDerivation rec {
- name = "SDL_gfx-${version}";
+ pname = "SDL_gfx";
version = "2.0.26";
src = fetchurl {
- url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz";
+ url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${pname}-${version}.tar.gz";
sha256 = "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw";
};
diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/pkgs/development/libraries/SDL_gpu/default.nix
index dc88b7b12ef3..f15009c2f5d9 100644
--- a/pkgs/development/libraries/SDL_gpu/default.nix
+++ b/pkgs/development/libraries/SDL_gpu/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "SDL_gpu-unstable";
version = "2019-01-24";
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
index 961a0a7f5aab..8e3078563e2b 100644
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/pkgs/development/libraries/SDL_image/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
stdenv.mkDerivation rec {
- name = "SDL_image-${version}";
+ pname = "SDL_image";
version = "1.2.12";
src = fetchurl {
- url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
+ url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz";
sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b";
};
diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix
index 887319062be9..427439f496e9 100644
--- a/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/pkgs/development/libraries/SDL_mixer/default.nix
@@ -3,10 +3,9 @@
stdenv.mkDerivation rec {
pname = "SDL_mixer";
version = "1.2.12";
- name = "${pname}-${version}";
src = fetchurl {
- url = "http://www.libsdl.org/projects/${pname}/release/${name}.tar.gz";
+ url = "http://www.libsdl.org/projects/${pname}/release/${pname}-${version}.tar.gz";
sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n";
};
diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix
index f1c5a5462d11..6ac91a6d129d 100644
--- a/pkgs/development/libraries/SDL_net/default.nix
+++ b/pkgs/development/libraries/SDL_net/default.nix
@@ -4,10 +4,8 @@ stdenv.mkDerivation rec {
pname = "SDL_net";
version = "1.2.8";
- name = "${pname}-${version}";
-
src = fetchurl {
- url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz";
+ url = "http://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz";
sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz";
};
diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix
index 6279bfcb4286..66fa8888fd19 100644
--- a/pkgs/development/libraries/SDL_sixel/default.nix
+++ b/pkgs/development/libraries/SDL_sixel/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, libsixel }:
-stdenv.mkDerivation rec {
- name = "SDL_sixel-${version}";
+stdenv.mkDerivation {
+ pname = "SDL_sixel";
version = "1.2-nightly";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix
index 0e717c530357..94534ecd6999 100644
--- a/pkgs/development/libraries/SDL_sound/default.nix
+++ b/pkgs/development/libraries/SDL_sound/default.nix
@@ -1,11 +1,11 @@
{ stdenv, lib, fetchurl, SDL, libvorbis, flac, libmikmod }:
stdenv.mkDerivation rec {
- name = "SDL_sound-${version}";
+ pname = "SDL_sound";
version = "1.0.3";
src = fetchurl {
- url = "https://icculus.org/SDL_sound/downloads/${name}.tar.gz";
+ url = "https://icculus.org/SDL_sound/downloads/${pname}-${version}.tar.gz";
sha256 = "1pz6g56gcy7pmmz3hhych3iq9jvinml2yjz15fjqjlj8pc5zv69r";
};
diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix
index 7f276387c834..9695d51ed897 100644
--- a/pkgs/development/libraries/SDL_stretch/default.nix
+++ b/pkgs/development/libraries/SDL_stretch/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, SDL }:
stdenv.mkDerivation rec {
- name = "SDL_stretch-${version}";
+ pname = "SDL_stretch";
version = "0.3.1";
src = fetchurl {
- url = "mirror://sourceforge/sdl-stretch/${version}/${name}.tar.bz2";
+ url = "mirror://sourceforge/sdl-stretch/${version}/${pname}-${version}.tar.bz2";
sha256 = "1mzw68sn4yxbp8429jg2h23h8xw2qjid51z1f5pdsghcn3x0pgvw";
};
diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix
index cf6b53021f79..96b60b1061fd 100644
--- a/pkgs/development/libraries/SDL_ttf/default.nix
+++ b/pkgs/development/libraries/SDL_ttf/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, SDL, freetype }:
stdenv.mkDerivation rec {
- name = "SDL_ttf-${version}";
+ pname = "SDL_ttf";
version = "2.0.11";
src = fetchurl {
- url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz";
+ url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz";
sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j";
};
diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix
index 4e1da8666227..b46963f4673e 100644
--- a/pkgs/development/libraries/abseil-cpp/default.nix
+++ b/pkgs/development/libraries/abseil-cpp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "abseil-cpp-${version}";
+ pname = "abseil-cpp";
date = "20190322";
rev = "eab2078b53c9e3d9d240135c09d27e3393acb50a";
version = "${date}-${rev}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "abseil";
repo = "abseil-cpp";
- rev = "${rev}";
+ rev = rev;
sha256 = "1bpz44hxq5fpkv6jlgphzk7mxjiiah526jgb63ih5pd1hd2cfw1r";
};
diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index a50c92924e9a..0aace12569a5 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmake }:
stdenv.mkDerivation rec {
- name = "accounts-qt-${version}";
+ pname = "accounts-qt";
version = "1.15";
src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 8713663ecca7..860ac3fde41f 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dadmin_group=wheel"
"-Dlocalstatedir=/var"
- "-Dsystemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
+ "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
];
postPatch = ''
diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index 75c942d4d487..04ab13314755 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libtool, perl }:
stdenv.mkDerivation rec {
- name = "ace-${version}";
+ pname = "ace";
version = "6.5.6";
src = fetchurl {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
patchPhase = ''substituteInPlace ./MPC/prj_install.pl \
--replace /usr/bin/perl "${perl}/bin/perl"'';
-
+
preConfigure = ''
export INSTALL_PREFIX=$out
export ACE_ROOT=$(pwd)
diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix
index 76e49768d53d..c9797b31eaa9 100644
--- a/pkgs/development/libraries/adns/default.nix
+++ b/pkgs/development/libraries/adns/default.nix
@@ -4,7 +4,8 @@ let
version = "1.5.1";
in
stdenv.mkDerivation {
- name = "adns-${version}";
+ pname = "adns";
+ inherit version;
src = fetchurl {
urls = [
diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix
index 5170e384f77b..f0d87c811330 100644
--- a/pkgs/development/libraries/afflib/default.nix
+++ b/pkgs/development/libraries/afflib/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "3.7.18";
- name = "afflib-${version}";
+ pname = "afflib";
src = fetchFromGitHub {
owner = "sshock";
diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix
index 22e91ee61d7a..a1d4c2259091 100644
--- a/pkgs/development/libraries/aften/default.nix
+++ b/pkgs/development/libraries/aften/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
- name = "aften-${version}";
+ pname = "aften";
version = "0.0.8";
src = fetchurl {
- url = "mirror://sourceforge/aften/${name}.tar.bz2";
+ url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2";
sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47";
};
diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix
index c0539aeed476..69517817b596 100644
--- a/pkgs/development/libraries/agg/default.nix
+++ b/pkgs/development/libraries/agg/default.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ autoconf automake libtool freetype SDL libX11 ];
+ postPatch = ''
+ substituteInPlace include/agg_renderer_outline_aa.h \
+ --replace 'line_profile_aa& profile() {' 'const line_profile_aa& profile() {'
+ '';
+
# fix build with new automake, from Gentoo ebuild
preConfigure = ''
sed -i '/^AM_C_PROTOTYPES/d' configure.in
diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index 5c25da920556..263acfed63a0 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec
{
- name = "alembic-${version}";
+ pname = "alembic";
version = "1.7.11";
src = fetchFromGitHub {
owner = "alembic";
repo = "alembic";
- rev = "${version}";
+ rev = version;
sha256 = "1lalbqn4cwf0vp4hiq72gwpd7kq501j21rnjb380mv26pk7r2ivz";
};
diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix
index f98c8fa480e1..407aa557ea2e 100644
--- a/pkgs/development/libraries/alkimia/default.nix
+++ b/pkgs/development/libraries/alkimia/default.nix
@@ -4,11 +4,11 @@
}:
mkDerivation rec {
- name = "alkimia-${version}";
+ pname = "alkimia";
version = "8.0.1";
src = fetchurl {
- url = "mirror://kde/stable/alkimia/${version}/${name}.tar.xz";
+ url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz";
sha256 = "059i6vn36sdq5zn2vqzh4asvvgdgs7n478nk9phvb5gdys01fq7m";
};
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index eca32b740e35..6b44ec1b598a 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -4,11 +4,11 @@
, libXxf86vm, openal, libGLU_combined }:
stdenv.mkDerivation rec {
- name = "allegro-${version}";
+ pname = "allegro";
version="4.4.2";
src = fetchurl {
- url = "https://github.com/liballeg/allegro5/releases/download/${version}/${name}.tar.gz";
+ url = "https://github.com/liballeg/allegro5/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v";
};
diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix
index 95828c44f851..a4f3b714e1cb 100644
--- a/pkgs/development/libraries/alure/default.nix
+++ b/pkgs/development/libraries/alure/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, openal }:
stdenv.mkDerivation rec {
- name = "alure-${version}";
+ pname = "alure";
version = "1.2";
src = fetchurl {
diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix
index 15331c22599b..7525b3baab09 100644
--- a/pkgs/development/libraries/amrwb/default.nix
+++ b/pkgs/development/libraries/amrwb/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "amrwb-${version}";
+ pname = "amrwb";
version = "11.0.0.0";
srcAmr = fetchurl {
diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix
index cb22c9ee790b..e8ecd0c0f1ef 100644
--- a/pkgs/development/libraries/amtk/default.nix
+++ b/pkgs/development/libraries/amtk/default.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/Amtk;
- description = "Actions, Menus and Toolbars Kit for GTK+ applications";
+ description = "Actions, Menus and Toolbars Kit for GTK applications";
maintainers = [ maintainers.manveru ];
license = licenses.lgpl21Plus;
platforms = platforms.linux;
diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix
index fc79cae36f83..9fc11555b697 100644
--- a/pkgs/development/libraries/apache-activemq/default.nix
+++ b/pkgs/development/libraries/apache-activemq/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "apache-activemq-${version}";
+ pname = "apache-activemq";
version = "5.14.5";
src = fetchurl {
sha256 = "0vm8z7rxb9n10xg5xjahy357704fw3q477hmpb83kd1zrc633g54";
- url = "mirror://apache/activemq/${version}/${name}-bin.tar.gz";
+ url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
};
phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index 429da8de8350..62d72844386f 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "appstream-${version}";
+ pname = "appstream";
version = "0.12.6";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix
index 0013764d7791..22f1566ad0ac 100644
--- a/pkgs/development/libraries/appstream/qt.nix
+++ b/pkgs/development/libraries/appstream/qt.nix
@@ -2,8 +2,8 @@
# TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here
-stdenv.mkDerivation rec {
- name = "appstream-qt-${version}";
+stdenv.mkDerivation {
+ pname = "appstream-qt";
inherit (appstream) version src prePatch;
buildInputs = appstream.buildInputs ++ [ appstream qtbase ];
diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix
index b26291469e75..8be98f061a84 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/pkgs/development/libraries/aqbanking/default.nix
@@ -5,14 +5,14 @@
let
inherit ((import ./sources.nix).aqbanking) sha256 releaseId version;
in stdenv.mkDerivation rec {
- name = "aqbanking-${version}";
+ pname = "aqbanking";
inherit version;
src = let
qstring = "package=03&release=${releaseId}&file=02";
mkURLs = map (base: "${base}/sites/download/download.php?${qstring}");
in fetchurl {
- name = "${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ];
inherit sha256;
};
diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
index bb337e471cfc..061ed77849f4 100644
--- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix
+++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
@@ -13,14 +13,14 @@
let
inherit ((import ./sources.nix).gwenhywfar) sha256 releaseId version;
in stdenv.mkDerivation rec {
- name = "gwenhywfar-${version}";
+ pname = "gwenhywfar";
inherit version;
src = let
qstring = "package=01&release=${releaseId}&file=02";
mkURLs = map (base: "${base}/sites/download/download.php?${qstring}");
in fetchurl {
- name = "${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ];
inherit sha256;
};
diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix
index 9a0b70e0d97f..23c300ab48a3 100644
--- a/pkgs/development/libraries/aqbanking/libchipcard.nix
+++ b/pkgs/development/libraries/aqbanking/libchipcard.nix
@@ -3,14 +3,14 @@
let
inherit ((import ./sources.nix).libchipcard) sha256 releaseId version;
in stdenv.mkDerivation rec {
- name = "libchipcard-${version}";
+ pname = "libchipcard";
inherit version;
src = let
qstring = "package=02&release=${releaseId}&file=01";
mkURLs = map (base: "${base}/sites/download/download.php?${qstring}");
in fetchurl {
- name = "${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ];
inherit sha256;
};
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index eb58003a5f63..d3e18aa776fc 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -1,12 +1,11 @@
{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "arb";
version = "2.16.0";
src = fetchFromGitHub {
owner = "fredrik-johansson";
- repo = "${pname}";
- rev = "${version}";
+ repo = pname;
+ rev = version;
sha256 = "0478671wfwy3gl26sbxh1jq1ih36z4k72waa8y2y2lvn649gb7cd";
};
buildInputs = [mpir gmp mpfr flint];
diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix
index 4b8093f74031..17093deae00f 100644
--- a/pkgs/development/libraries/argp-standalone/default.nix
+++ b/pkgs/development/libraries/argp-standalone/default.nix
@@ -19,7 +19,7 @@ let
sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "argp-standalone-1.3";
src = fetchurl {
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 3b93a351f7f9..127c2f3ae311 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
stdenv.mkDerivation rec {
+ pname = "armadillo";
version = "9.600.6";
- name = "armadillo-${version}";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 7660ea81eaf8..f763f98799d0 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -10,7 +10,7 @@ let
in
stdenv.mkDerivation rec {
- name = "arrow-cpp-${version}";
+ pname = "arrow-cpp";
version = "0.14.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix
index 72305cb633fb..b8d166507a90 100644
--- a/pkgs/development/libraries/asio/generic.nix
+++ b/pkgs/development/libraries/asio/generic.nix
@@ -5,7 +5,8 @@
with stdenv.lib;
stdenv.mkDerivation {
- name = "asio-${version}";
+ pname = "asio";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/asio/asio-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index 992119faf65e..fa9a45f1ed3c 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -160,7 +160,7 @@ in rec {
### Languages
- af = buildOfficialDict rec {
+ af = buildOfficialDict {
language = "af";
version = "0.50-0";
fullName = "Afrikaans";
@@ -168,7 +168,7 @@ in rec {
sha256 = "00p6k2ndi0gzfr5fkbvx4hkcpj223pidjvmxg0r384arrap00q4x";
};
- am = buildOfficialDict rec {
+ am = buildOfficialDict {
language = "am";
version = "0.03-1";
fullName = "Amharic";
@@ -176,7 +176,7 @@ in rec {
sha256 = "11ylp7gjq94wfacyawvp391lsq26rl1b84f268rjn7l7z0hxs9xz";
};
- ar = buildOfficialDict rec {
+ ar = buildOfficialDict {
language = "ar";
version = "1.2-0";
fullName = "Arabic";
@@ -184,7 +184,7 @@ in rec {
sha256 = "1avw40bp8yi5bnkq64ihm2rldgw34lk89yz281q9bmndh95a47h4";
};
- ast = buildOfficialDict rec {
+ ast = buildOfficialDict {
language = "ast";
version = "0.01";
fullName = "Asturian";
@@ -192,7 +192,7 @@ in rec {
sha256 = "14hg85mxcyvdigf96yvslk7f3v9ngdsxn85qpgwkg31k3k83xwj3";
};
- az = buildOfficialDict rec {
+ az = buildOfficialDict {
language = "az";
version = "0.02-0";
fullName = "Azerbaijani";
@@ -200,7 +200,7 @@ in rec {
sha256 = "1hs4h1jscpxf9f9iyk6mvjqsnhkf0yslkbjhjkasqqcx8pn7cc86";
};
- be = buildOfficialDict rec {
+ be = buildOfficialDict {
language = "be";
version = "0.01";
fullName = "Belarusian";
@@ -208,7 +208,7 @@ in rec {
sha256 = "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm";
};
- bg = buildOfficialDict rec {
+ bg = buildOfficialDict {
language = "bg";
version = "4.1-0";
fullName = "Bulgarian";
@@ -216,7 +216,7 @@ in rec {
sha256 = "1alacmgpfk0yrgq83y23d16fhav1bxmb98kg8d2a5r9bvh2h0mvl";
};
- bn = buildOfficialDict rec {
+ bn = buildOfficialDict {
language = "bn";
version = "0.01.1-1";
fullName = "Bengali";
@@ -224,7 +224,7 @@ in rec {
sha256 = "1nc02jd67iggirwxnhdvlvaqm0xfyks35c4psszzj3dhzv29qgxh";
};
- br = buildOfficialDict rec {
+ br = buildOfficialDict {
language = "br";
version = "0.50-2";
fullName = "Breton";
@@ -232,7 +232,7 @@ in rec {
sha256 = "0fradnm8424bkq9a9zhpl2132dk7y95xmw45sy1c0lx6rinjl4n2";
};
- ca = buildOfficialDict rec {
+ ca = buildOfficialDict {
language = "ca";
version = "2.1.5-1";
fullName = "Catalan";
@@ -240,7 +240,7 @@ in rec {
sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb";
};
- cs = buildOfficialDict rec {
+ cs = buildOfficialDict {
language = "cs";
version = "20040614-1";
fullName = "Czech";
@@ -248,7 +248,7 @@ in rec {
sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01";
};
- csb = buildOfficialDict rec {
+ csb = buildOfficialDict {
language = "csb";
version = "0.02-0";
fullName = "Kashubian";
@@ -256,7 +256,7 @@ in rec {
sha256 = "1612ypkm684wjvc7n081i87mlrrzif9simc7kyn177hfsl3ssrn1";
};
- cy = buildOfficialDict rec {
+ cy = buildOfficialDict {
language = "cy";
version = "0.50-3";
fullName = "Welsh";
@@ -264,7 +264,7 @@ in rec {
sha256 = "15vq601lzz1gi311xym4bv9lv1k21xcfn50jmzamw7h6f36rsffm";
};
- da = buildOfficialDict rec {
+ da = buildOfficialDict {
language = "da";
version = "1.4.42-1";
fullName = "Danish";
@@ -272,7 +272,7 @@ in rec {
sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp";
};
- de = buildOfficialDict rec {
+ de = buildOfficialDict {
language = "de";
version = "20030222-1";
fullName = "German";
@@ -280,7 +280,7 @@ in rec {
sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s";
};
- de-alt = buildOfficialDict rec {
+ de-alt = buildOfficialDict {
language = "de-alt";
version = "2.1-1";
fullName = "German - Old Spelling";
@@ -288,7 +288,7 @@ in rec {
sha256 = "0wwc2l29svv3fv041fh6vfa5m3hi9q9pkbxibzq1ysrsfin3rl9n";
};
- el = buildOfficialDict rec {
+ el = buildOfficialDict {
language = "el";
version = "0.08-0";
fullName = "Greek";
@@ -296,7 +296,7 @@ in rec {
sha256 = "1ljcc30zg2v2h3w5h5jr5im41mw8jbsgvvhdd2cii2yzi8d0zxja";
};
- en = buildOfficialDict rec {
+ en = buildOfficialDict {
language = "en";
version = "2018.04.16-0";
fullName = "English";
@@ -304,7 +304,7 @@ in rec {
sha256 = "0bxxdzkk9g27plg22y9qzsx9cfjw3aa29w5bmzs561qc9gkp247i";
};
- eo = buildOfficialDict rec {
+ eo = buildOfficialDict {
language = "eo";
version = "2.1.20000225a-2";
fullName = "Esperanto";
@@ -312,7 +312,7 @@ in rec {
sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1";
};
- es = buildOfficialDict rec {
+ es = buildOfficialDict {
language = "es";
version = "1.11-2";
fullName = "Spanish";
@@ -320,7 +320,7 @@ in rec {
sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd";
};
- et = buildOfficialDict rec {
+ et = buildOfficialDict {
language = "et";
version = "0.1.21-1";
fullName = "Estonian";
@@ -328,7 +328,7 @@ in rec {
sha256 = "0jdjfa2fskirhnb70fy86xryp9r6gkl729ib8qcjmsma7nm5gs5i";
};
- fa = buildOfficialDict rec {
+ fa = buildOfficialDict {
language = "fa";
version = "0.11-0";
fullName = "Persian";
@@ -336,7 +336,7 @@ in rec {
sha256 = "0nz1ybwv56q7nl9ip12hfmdch1vyyq2j55bkjcns13lshzm2cba8";
};
- fi = buildOfficialDict rec {
+ fi = buildOfficialDict {
language = "fi";
version = "0.7-0";
fullName = "Finnish";
@@ -344,7 +344,7 @@ in rec {
sha256 = "07d5s08ba4dd89cmwy9icc01i6fjdykxlb9ravmhdrhi8mxz1mzq";
};
- fo = buildOfficialDict rec {
+ fo = buildOfficialDict {
language = "fo";
version = "0.2.16-1";
fullName = "Faroese";
@@ -352,7 +352,7 @@ in rec {
sha256 = "022yz5lll20xrzizcyb7wksm3fgwklnvgnir5la5qkxv770dvq7p";
};
- fr = buildOfficialDict rec {
+ fr = buildOfficialDict {
language = "fr";
version = "0.50-3";
fullName = "French";
@@ -360,7 +360,7 @@ in rec {
sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr";
};
- fy = buildOfficialDict rec {
+ fy = buildOfficialDict {
language = "fy";
version = "0.12-0";
fullName = "Frisian";
@@ -368,7 +368,7 @@ in rec {
sha256 = "1almi6n4ni91d0rzrk8ig0473m9ypbwqmg56hchz76j51slwyirl";
};
- ga = buildOfficialDict rec {
+ ga = buildOfficialDict {
language = "ga";
version = "4.5-0";
fullName = "Irish";
@@ -376,7 +376,7 @@ in rec {
sha256 = "0y869mmvfb3bzadfgajwa2rfb0xfhi6m9ydwgxkb9v2claydnps5";
};
- gd = buildOfficialDict rec {
+ gd = buildOfficialDict {
language = "gd";
version = "0.1.1-1";
fullName = "Scottish Gaelic";
@@ -384,7 +384,7 @@ in rec {
sha256 = "0a89irv5d65j5m9sb0k36851x5rs0wij12gb2m6hv2nsfn5a05p3";
};
- gl = buildOfficialDict rec {
+ gl = buildOfficialDict {
language = "gl";
version = "0.5a-2";
fullName = "Galician";
@@ -392,7 +392,7 @@ in rec {
sha256 = "12pwghmy18fcdvf9hvhb4q6shi339hb1kwxpkz0bhw0yjxjwzkdk";
};
- grc = buildOfficialDict rec {
+ grc = buildOfficialDict {
language = "grc";
version = "0.02-0";
fullName = "Ancient Greek";
@@ -400,7 +400,7 @@ in rec {
sha256 = "1zxr8958v37v260fkqd4pg37ns5h5kyqm54hn1hg70wq5cz8h512";
};
- gu = buildOfficialDict rec {
+ gu = buildOfficialDict {
language = "gu";
version = "0.03-0";
fullName = "Gujarati";
@@ -408,7 +408,7 @@ in rec {
sha256 = "04c38jnl74lpj2jhjz4zpqbs2623vwc71m6wc5h4b1karid14b23";
};
- gv = buildOfficialDict rec {
+ gv = buildOfficialDict {
language = "gv";
version = "0.50-0";
fullName = "Manx Gaelic";
@@ -416,7 +416,7 @@ in rec {
sha256 = "1rknf4yaw9s29c77sdzg98nhnmjwpicdb69igmz1n768npz2drmv";
};
- he = buildOfficialDict rec {
+ he = buildOfficialDict {
language = "he";
version = "1.0-0";
fullName = "Hebrew";
@@ -424,7 +424,7 @@ in rec {
sha256 = "13bhbghx5b8g0119g3wxd4n8mlf707y41vlf59irxjj0kynankfn";
};
- hi = buildOfficialDict rec {
+ hi = buildOfficialDict {
language = "hi";
version = "0.02-0";
fullName = "Hindi";
@@ -432,7 +432,7 @@ in rec {
sha256 = "0drs374qz4419zx1lf2k281ydxf2750jk5ailafj1x0ncz27h1ys";
};
- hil = buildOfficialDict rec {
+ hil = buildOfficialDict {
language = "hil";
version = "0.11-0";
fullName = "Hiligaynon";
@@ -440,7 +440,7 @@ in rec {
sha256 = "1s482fsfhzic9qa80al4418q3ni3gfn2bkwkd2y46ydrs17kf2jp";
};
- hr = buildOfficialDict rec {
+ hr = buildOfficialDict {
language = "hr";
version = "0.51-0";
fullName = "Croatian";
@@ -448,7 +448,7 @@ in rec {
sha256 = "09aafyf1vqhaxvcf3jfzf365k394b5pf0iivsr2ix5npah1h7i1a";
};
- hsb = buildOfficialDict rec {
+ hsb = buildOfficialDict {
language = "hsb";
version = "0.02-0";
fullName = "Upper Sorbian";
@@ -456,7 +456,7 @@ in rec {
sha256 = "0bi2vhz7n1vmg43wbbh935pmzihv80iyz9z65j94lxf753j2m7wd";
};
- hu = buildOfficialDict rec {
+ hu = buildOfficialDict {
language = "hu";
version = "0.99.4.2-0";
fullName = "Hungarian";
@@ -464,7 +464,7 @@ in rec {
sha256 = "1d9nybip2k1dz69zly3iv0npbi3yxgfznh1py364nxzrbjsafd9k";
};
- hus = buildOfficialDict rec {
+ hus = buildOfficialDict {
language = "hus";
version = "0.03-1";
fullName = "Huastec";
@@ -472,7 +472,7 @@ in rec {
sha256 = "09glipfpkz9xch17z11zw1yn2z7jx1f2svfmjn9l6wm1s5qz6a3d";
};
- hy = buildOfficialDict rec {
+ hy = buildOfficialDict {
language = "hy";
version = "0.10.0-0";
fullName = "Armenian";
@@ -480,7 +480,7 @@ in rec {
sha256 = "1w5wq8lfl2xp1nid30b1j5qmya4vjyidq0vpr4y3gf53jc08vsid";
};
- ia = buildOfficialDict rec {
+ ia = buildOfficialDict {
language = "ia";
version = "0.50-1";
fullName = "Interlingua";
@@ -488,7 +488,7 @@ in rec {
sha256 = "0bqcpgsa72pga24fv4fkw38b4qqdvqsw97jvzvw7q03dc1cwp5sp";
};
- id = buildOfficialDict rec {
+ id = buildOfficialDict {
language = "id";
version = "1.2-0";
fullName = "Indonesian";
@@ -496,7 +496,7 @@ in rec {
sha256 = "023knfg0q03f7y5w6xnwa1kspnrcvcnky8xvdms93n2850414faj";
};
- is = buildOfficialDict rec {
+ is = buildOfficialDict {
language = "is";
version = "0.51.1-0";
fullName = "Icelandic";
@@ -504,7 +504,7 @@ in rec {
sha256 = "1mp3248lhbr13cj7iq9zs7h5ix0dcwlprp5cwrkcwafrv8lvsd9h";
};
- it = buildOfficialDict rec {
+ it = buildOfficialDict {
language = "it";
version = "2.2_20050523-0";
fullName = "Italian";
@@ -512,7 +512,7 @@ in rec {
sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v";
};
- kn = buildOfficialDict rec {
+ kn = buildOfficialDict {
language = "kn";
version = "0.01-1";
fullName = "Kannada";
@@ -520,7 +520,7 @@ in rec {
sha256 = "10sk0wx4x4ds1403kf9dqxv9yjvh06w8qqf4agx57y0jlws0n0fb";
};
- ku = buildOfficialDict rec {
+ ku = buildOfficialDict {
language = "ku";
version = "0.20-1";
fullName = "Kurdi";
@@ -528,7 +528,7 @@ in rec {
sha256 = "09va98krfbgdaxl101nmd85j3ysqgg88qgfcl42c07crii0pd3wn";
};
- ky = buildOfficialDict rec {
+ ky = buildOfficialDict {
language = "ky";
version = "0.01-0";
fullName = "Kirghiz";
@@ -536,7 +536,7 @@ in rec {
sha256 = "0kzv2syjnnn6pnwx0d578n46hg2l0j62977al47y6wabnhjjy3z1";
};
- la = buildOfficialDict rec {
+ la = buildOfficialDict {
language = "la";
version = "20020503-0";
fullName = "Latin";
@@ -544,7 +544,7 @@ in rec {
sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl";
};
- lt = buildOfficialDict rec {
+ lt = buildOfficialDict {
language = "lt";
version = "1.2.1-0";
fullName = "Lithuanian";
@@ -552,7 +552,7 @@ in rec {
sha256 = "1asjck911l96q26zj36lmz0jp4b6pivvrf3h38zgc8lc85p3pxgn";
};
- lv = buildOfficialDict rec {
+ lv = buildOfficialDict {
language = "lv";
version = "0.5.5-1";
fullName = "Latvian";
@@ -560,7 +560,7 @@ in rec {
sha256 = "12pvs584a6437ijndggdqpp5s7d0w607cimpkxsjwasnx83f4c1w";
};
- mg = buildOfficialDict rec {
+ mg = buildOfficialDict {
language = "mg";
version = "0.03-0";
fullName = "Malagasy";
@@ -568,7 +568,7 @@ in rec {
sha256 = "0hdhbk9b5immjp8l5h4cy82gwgsqzcqbb0qsf7syw333w4rgi0ji";
};
- mi = buildOfficialDict rec {
+ mi = buildOfficialDict {
language = "mi";
version = "0.50-0";
fullName = "Maori";
@@ -576,7 +576,7 @@ in rec {
sha256 = "12bxplpd348yx8d2q8qvahi9dlp7qf28qmanzhziwc7np8rixvmy";
};
- mk = buildOfficialDict rec {
+ mk = buildOfficialDict {
language = "mk";
version = "0.50-0";
fullName = "Macedonian";
@@ -584,7 +584,7 @@ in rec {
sha256 = "0wcr9n882xi5b7a7ln1hnhq4vfqd5gpqqp87v01j0gb7zf027z0m";
};
- ml = buildOfficialDict rec {
+ ml = buildOfficialDict {
language = "ml";
version = "0.03-1";
fullName = "Malayalam";
@@ -592,7 +592,7 @@ in rec {
sha256 = "1zcn4114gwia085fkz77qk13z29xrbp53q2qvgj2cvcbalg5bkg4";
};
- mn = buildOfficialDict rec {
+ mn = buildOfficialDict {
language = "mn";
version = "0.06-2";
fullName = "Mongolian";
@@ -600,7 +600,7 @@ in rec {
sha256 = "150j9y5c9pw80fwp5rzl5q31q9vjbxixaqljkfwxjb5q93fnw6rg";
};
- mr = buildOfficialDict rec {
+ mr = buildOfficialDict {
language = "mr";
version = "0.10-0";
fullName = "Marathi";
@@ -608,7 +608,7 @@ in rec {
sha256 = "0cvgb2l40sppqbi842ivpznsh2xzp1d4hxc371dll8z0pr05m8yk";
};
- ms = buildOfficialDict rec {
+ ms = buildOfficialDict {
language = "ms";
version = "0.50-0";
fullName = "Malay";
@@ -616,7 +616,7 @@ in rec {
sha256 = "0vr4vhipcfhsxqfs8dim2ph7iiixn22gmlmlb375bx5hgd9y7i1w";
};
- mt = buildOfficialDict rec {
+ mt = buildOfficialDict {
language = "mt";
version = "0.50-0";
fullName = "Maltese";
@@ -624,7 +624,7 @@ in rec {
sha256 = "1d2rl1nlfjq6rfywblvx8m88cyy2x0mzc0mshzbgw359c2nwl3z0";
};
- nb = buildOfficialDict rec {
+ nb = buildOfficialDict {
language = "nb";
version = "0.50.1-0";
fullName = "Norwegian Bokmal";
@@ -632,7 +632,7 @@ in rec {
sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77";
};
- nds = buildOfficialDict rec {
+ nds = buildOfficialDict {
language = "nds";
version = "0.01-0";
fullName = "Low Saxon";
@@ -640,7 +640,7 @@ in rec {
sha256 = "1nkjhwzn45dizi89d19q4bqyd87cim8xyrgr655fampgkn31wf6f";
};
- nl = buildOfficialDict rec {
+ nl = buildOfficialDict {
language = "nl";
version = "0.50-2";
fullName = "Dutch";
@@ -652,7 +652,7 @@ in rec {
'';
};
- nn = buildOfficialDict rec {
+ nn = buildOfficialDict {
language = "nn";
version = "0.50.1-1";
fullName = "Norwegian Nynorsk";
@@ -660,7 +660,7 @@ in rec {
sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc";
};
- ny = buildOfficialDict rec {
+ ny = buildOfficialDict {
language = "ny";
version = "0.01-0";
fullName = "Chichewa";
@@ -668,7 +668,7 @@ in rec {
sha256 = "0gjb92vcg60sfgvrm2f6i89sfkgb179ahvwlgs649fx3dc7rfvqp";
};
- or = buildOfficialDict rec {
+ or = buildOfficialDict {
language = "or";
version = "0.03-1";
fullName = "Oriya";
@@ -676,7 +676,7 @@ in rec {
sha256 = "0kzj9q225z0ccrlbkijsrafy005pbjy14qcnxb6p93ciz1ls7zyn";
};
- pa = buildOfficialDict rec {
+ pa = buildOfficialDict {
language = "pa";
version = "0.01-1";
fullName = "Punjabi";
@@ -684,7 +684,7 @@ in rec {
sha256 = "0if93zk10pyrs38wwj3vpcdm01h51m5z9gm85h3jxrpgqnqspwy7";
};
- pl = buildOfficialDict rec {
+ pl = buildOfficialDict {
language = "pl";
version = "6.0_20061121-0";
fullName = "Polish";
@@ -692,7 +692,7 @@ in rec {
sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1";
};
- pt_BR = buildOfficialDict rec {
+ pt_BR = buildOfficialDict {
language = "pt_BR";
version = "20090702-0";
fullName = "Brazilian Portuguese";
@@ -700,7 +700,7 @@ in rec {
sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p";
};
- pt_PT = buildOfficialDict rec {
+ pt_PT = buildOfficialDict {
language = "pt_PT";
version = "20070510-0";
fullName = "Portuguese";
@@ -708,7 +708,7 @@ in rec {
sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq";
};
- qu = buildOfficialDict rec {
+ qu = buildOfficialDict {
language = "qu";
version = "0.02-0";
fullName = "Quechua";
@@ -716,7 +716,7 @@ in rec {
sha256 = "009z0zsvzq7r3z3m30clyibs94v77b92h5lmzmzxlns2p0lpd5w0";
};
- ro = buildOfficialDict rec {
+ ro = buildOfficialDict {
language = "ro";
version = "3.3-2";
fullName = "Romanian";
@@ -724,7 +724,7 @@ in rec {
sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk";
};
- ru = buildOfficialDict rec {
+ ru = buildOfficialDict {
language = "ru";
version = "0.99f7-1";
fullName = "Russian";
@@ -732,7 +732,7 @@ in rec {
sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw";
};
- rw = buildOfficialDict rec {
+ rw = buildOfficialDict {
language = "rw";
version = "0.50-0";
fullName = "Kinyarwanda";
@@ -740,7 +740,7 @@ in rec {
sha256 = "10gh8g747jbrvfk2fn3pjxy1nhcfdpwgmnvkmrp4nd1k1qp101il";
};
- sc = buildOfficialDict rec {
+ sc = buildOfficialDict {
language = "sc";
version = "1.0";
fullName = "Sardinian";
@@ -748,7 +748,7 @@ in rec {
sha256 = "0hl7prh5rccsyljwrv3m1hjcsphyrrywk2qvnj122irbf4py46jr";
};
- sk = buildOfficialDict rec {
+ sk = buildOfficialDict {
language = "sk";
version = "2.01-2";
fullName = "Slovak";
@@ -756,7 +756,7 @@ in rec {
sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66";
};
- sl = buildOfficialDict rec {
+ sl = buildOfficialDict {
language = "sl";
version = "0.50-0";
fullName = "Slovenian";
@@ -764,7 +764,7 @@ in rec {
sha256 = "1l9kc5g35flq8kw9jhn2n0bjb4sipjs4qkqzgggs438kywkx2rp5";
};
- sr = buildOfficialDict rec {
+ sr = buildOfficialDict {
language = "sr";
version = "0.02";
fullName = "Serbian";
@@ -772,7 +772,7 @@ in rec {
sha256 = "12cj01p4nj80cpf7m3s4jsaf0rsfng7s295j9jfchcq677xmhpkh";
};
- sv = buildOfficialDict rec {
+ sv = buildOfficialDict {
language = "sv";
version = "0.51-0";
fullName = "Swedish";
@@ -780,7 +780,7 @@ in rec {
sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v";
};
- sw = buildOfficialDict rec {
+ sw = buildOfficialDict {
language = "sw";
version = "0.50-0";
fullName = "Swahili";
@@ -788,7 +788,7 @@ in rec {
sha256 = "15zjh7hdj2b4dgm5bc12w1ims9q357p1q3gjalspnyn5gl81zmby";
};
- ta = buildOfficialDict rec {
+ ta = buildOfficialDict {
language = "ta";
version = "20040424-1";
fullName = "Tamil";
@@ -796,7 +796,7 @@ in rec {
sha256 = "0sj8ygjsyvnr93cs6324y7az7k2vyw7rjxdc9vnm7z60lbqm5xaj";
};
- te = buildOfficialDict rec {
+ te = buildOfficialDict {
language = "te";
version = "0.01-2";
fullName = "Telugu";
@@ -804,7 +804,7 @@ in rec {
sha256 = "0pgcgxz7dz34zxp9sb85jjzbg3ky6il5wmhffz6ayrbsfn5670in";
};
- tet = buildOfficialDict rec {
+ tet = buildOfficialDict {
language = "tet";
version = "0.1.1";
fullName = "Tetum";
@@ -812,7 +812,7 @@ in rec {
sha256 = "17n0y4fhjak47j9qnqf4m4z6zra6dn72rwhp7ig0hhlgqk4ldmcx";
};
- tk = buildOfficialDict rec {
+ tk = buildOfficialDict {
language = "tk";
version = "0.01-0";
fullName = "Turkmen";
@@ -820,7 +820,7 @@ in rec {
sha256 = "02vad4jqhr0xpzqi5q5z7z0xxqccbn8j0c5dhpnm86mnr84l5wl6";
};
- tl = buildOfficialDict rec {
+ tl = buildOfficialDict {
language = "tl";
version = "0.02-1";
fullName = "Tagalog";
@@ -828,7 +828,7 @@ in rec {
sha256 = "1kca6k7qnpfvvwjnq5r1n242payqsjy96skmw78m7ww6d0n5vdj8";
};
- tn = buildOfficialDict rec {
+ tn = buildOfficialDict {
language = "tn";
version = "1.0.1-0";
fullName = "Setswana";
@@ -836,7 +836,7 @@ in rec {
sha256 = "0q5x7c6z88cn0kkpk7q1craq34g4g03v8x3xcj5a5jia3l7c5821";
};
- tr = buildOfficialDict rec {
+ tr = buildOfficialDict {
language = "tr";
version = "0.50-0";
fullName = "Turkish";
@@ -844,7 +844,7 @@ in rec {
sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb";
};
- uk = buildOfficialDict rec {
+ uk = buildOfficialDict {
language = "uk";
version = "1.4.0-0";
fullName = "Ukrainian";
@@ -852,7 +852,7 @@ in rec {
sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m";
};
- uz = buildOfficialDict rec {
+ uz = buildOfficialDict {
language = "uz";
version = "0.6-0";
fullName = "Uzbek";
@@ -860,7 +860,7 @@ in rec {
sha256 = "0sg3wlyply1idpq5ypyj7kgnaadaiskci1sqs811yhg2gzyc3092";
};
- vi = buildOfficialDict rec {
+ vi = buildOfficialDict {
language = "vi";
version = "0.01.1-1";
fullName = "Vietnamese";
@@ -868,7 +868,7 @@ in rec {
sha256 = "05vwgvf1cj45azhflywx69javqdvqd1f20swrc2d3c32pd9mvn1w";
};
- wa = buildOfficialDict rec {
+ wa = buildOfficialDict {
language = "wa";
version = "0.50-0";
fullName = "Walloon";
@@ -876,7 +876,7 @@ in rec {
sha256 = "1r1zwz7xkx40dga9vf5wc9ja3jwk1dkpcr1kaa7wryvslf5al5ss";
};
- yi = buildOfficialDict rec {
+ yi = buildOfficialDict {
language = "yi";
version = "0.01.1-1";
fullName = "Yiddish";
@@ -884,7 +884,7 @@ in rec {
sha256 = "0mi842l4038bx3ll2wx9nz44nqrg1x46h5b02zigi1hbbddd6ycq";
};
- zu = buildOfficialDict rec {
+ zu = buildOfficialDict {
language = "zu";
version = "0.50-0";
fullName = "Zulu";
@@ -894,7 +894,7 @@ in rec {
### Jargons
- en-computers = buildTxtDict rec {
+ en-computers = buildTxtDict {
shortName = "en-computers";
fullName = "English Computer Jargon";
@@ -913,7 +913,7 @@ in rec {
};
};
- en-science = buildTxtDict rec {
+ en-science = buildTxtDict {
shortName = "en-science";
fullName = "English Scientific Jargon";
diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix
index 24e06b0d65a9..d5a98b0ce92e 100644
--- a/pkgs/development/libraries/assimp/default.nix
+++ b/pkgs/development/libraries/assimp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, boost, zlib }:
stdenv.mkDerivation rec {
- name = "assimp-${version}";
+ pname = "assimp";
version = "4.1.0";
src = fetchFromGitHub{
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index 2268d4389026..a805949bf119 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -16,12 +16,11 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "at-spi2-atk";
version = "2.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b";
};
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 47c8c090d08f..e7cea235ceb4 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -5,6 +5,8 @@
, ninja
, pkgconfig
, gobject-introspection
+, gsettings-desktop-schemas
+, makeWrapper
, dbus
, glib
@@ -17,30 +19,42 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "at-spi2-core";
version = "2.32.1";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw";
};
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]
+ nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ]
# Fixup rpaths because of meson, remove with meson-0.47
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ dbus glib libX11 libXtst libXi ];
doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?"
+ # Provide dbus-daemon fallback when it is not already running when
+ # at-spi2-bus-launcher is executed. This allows us to avoid
+ # including the entire dbus closure in libraries linked with
+ # the at-spi2-core libraries.
+ mesonFlags = [ "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon" ];
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
+ postFixup = ''
+ # Cannot use wrapGAppsHook'due to a dependency cycle
+ wrapProgram $out/libexec/at-spi-bus-launcher \
+ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \
+ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}
+ '';
+
meta = with stdenv.lib; {
description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus";
homepage = https://gitlab.gnome.org/GNOME/at-spi2-core;
diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix
index b79d85bcd7c9..02409d6ace06 100644
--- a/pkgs/development/libraries/audio/jamomacore/default.nix
+++ b/pkgs/development/libraries/audio/jamomacore/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.0-beta.1";
- name = "JamomaCore-${version}";
+ pname = "JamomaCore";
src = fetchFromGitHub {
owner = "jamoma";
diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix
index 3a4c363e23c8..2fde40327e96 100644
--- a/pkgs/development/libraries/audio/libbs2b/default.nix
+++ b/pkgs/development/libraries/audio/libbs2b/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libsndfile }:
stdenv.mkDerivation rec {
- name = "libbs2b-${version}";
+ pname = "libbs2b";
version = "3.1.0";
src = fetchurl {
- url = "mirror://sourceforge/bs2b/${name}.tar.bz2";
+ url = "mirror://sourceforge/bs2b/${pname}-${version}.tar.bz2";
sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7";
};
diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix
index ac6f0470a0a8..b8f1a5c088ac 100644
--- a/pkgs/development/libraries/audio/libgme/default.nix
+++ b/pkgs/development/libraries/audio/libgme/default.nix
@@ -2,7 +2,8 @@
let
version = "0.6.2";
in stdenv.mkDerivation {
- name = "libgme-${version}";
+ pname = "libgme";
+ inherit version;
meta = with stdenv.lib; {
description = "A collection of video game music chip emulators";
diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix
index 0f9f5f5aac68..0e0f0c5d425d 100644
--- a/pkgs/development/libraries/audio/libmysofa/default.nix
+++ b/pkgs/development/libraries/audio/libmysofa/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, zlib }:
stdenv.mkDerivation rec {
- name = "libmysofa-${version}";
+ pname = "libmysofa";
version = "0.7";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix
index fe0e0854a327..1c5a5302d71c 100644
--- a/pkgs/development/libraries/audio/libsmf/default.nix
+++ b/pkgs/development/libraries/audio/libsmf/default.nix
@@ -2,9 +2,9 @@
stdenv.mkDerivation rec {
version = "1.3";
- name = "libsmf-${version}";
+ pname = "libsmf";
src = fetchurl {
- url = "https://github.com/stump/libsmf/archive/${name}.tar.gz";
+ url = "https://github.com/stump/libsmf/archive/${pname}-${version}.tar.gz";
sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n";
};
diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 373d50a0a434..04752fd29519 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom, wafHook }:
stdenv.mkDerivation rec {
- name = "lilv-${version}";
+ pname = "lilv";
version = "0.24.4";
src = fetchurl {
- url = "https://download.drobilla.net/${name}.tar.bz2";
+ url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3";
};
diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index d026dd258bc7..50593cab6476 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
- name = "lv2-${version}";
+ pname = "lv2";
version = "1.16.0";
src = fetchurl {
- url = "http://lv2plug.in/spec/${name}.tar.bz2";
+ url = "http://lv2plug.in/spec/${pname}-${version}.tar.bz2";
sha256 = "1ppippbpdpv13ibs06b0bixnazwfhiw0d0ja6hx42jnkgdyp5hyy";
};
diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix
index 81cc868f52ca..6f10283b07bf 100644
--- a/pkgs/development/libraries/audio/lv2/unstable.nix
+++ b/pkgs/development/libraries/audio/lv2/unstable.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }:
-stdenv.mkDerivation rec {
- name = "lv2-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "lv2-unstable";
version = "2017-07-08";
src = fetchgit {
diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix
index 78763ca29e2a..826c36db1a63 100644
--- a/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/pkgs/development/libraries/audio/lvtk/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
- name = "lvtk-${version}";
+ pname = "lvtk";
version = "1.2.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix
index ddd3940098a4..c4c931ecadef 100644
--- a/pkgs/development/libraries/audio/ntk/default.nix
+++ b/pkgs/development/libraries/audio/ntk/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }:
stdenv.mkDerivation rec {
- name = "ntk-${version}";
+ pname = "ntk";
version = "1.3.1000";
src = fetchFromGitHub {
owner = "original-male";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Fork of FLTK 1.3.0 with additional functionality";
- version = "${version}";
+ version = version;
homepage = http://non.tuxfamily.org/;
license = stdenv.lib.licenses.lgpl21;
maintainers = with stdenv.lib.maintainers; [ magnetophon nico202 ];
diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix
index 2adec665e1c0..f26f2b07e71a 100644
--- a/pkgs/development/libraries/audio/rtaudio/default.nix
+++ b/pkgs/development/libraries/audio/rtaudio/default.nix
@@ -1,30 +1,30 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, rtmidi }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pulseaudio, rtmidi }:
stdenv.mkDerivation rec {
version = "5.1.0";
- name = "rtaudio-${version}";
+ pname = "rtaudio";
src = fetchFromGitHub {
owner = "thestk";
repo = "rtaudio";
- rev = "${version}";
+ rev = version;
sha256 = "1pglnjz907ajlhnlnig3p0sx7hdkpggr8ss7b3wzf1lykzgv9l52";
};
enableParallelBuilding = true;
- buildInputs = [ autoconf automake libtool libjack2 alsaLib rtmidi ];
+ buildInputs = [ autoconf automake libtool libjack2 alsaLib pulseaudio rtmidi ];
preConfigure = ''
./autogen.sh --no-configure
./configure
'';
- meta = {
+ meta = with stdenv.lib; {
description = "A set of C++ classes that provide a cross platform API for realtime audio input/output";
homepage = http://www.music.mcgill.ca/~gary/rtaudio/;
- license = stdenv.lib.licenses.mit;
- maintainers = [ stdenv.lib.maintainers.magnetophon ];
- platforms = with stdenv.lib.platforms; linux ++ darwin;
+ license = licenses.mit;
+ maintainers = [ maintainers.magnetophon ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix
index 41bb9ca9f11b..16527a763c92 100644
--- a/pkgs/development/libraries/audio/rtmidi/default.nix
+++ b/pkgs/development/libraries/audio/rtmidi/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "4.0.0";
- name = "rtmidi-${version}";
+ pname = "rtmidi";
src = fetchFromGitHub {
owner = "thestk";
repo = "rtmidi";
- rev = "${version}";
+ rev = version;
sha256 = "1g31p6a96djlbk9jh5r4pjly3x76lhccva9hrw6xzdma8dsjzgyq";
};
diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix
index 09a6230184af..21d6cdfb5d4d 100644
--- a/pkgs/development/libraries/audio/sratom/default.nix
+++ b/pkgs/development/libraries/audio/sratom/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, wafHook }:
stdenv.mkDerivation rec {
- name = "sratom-${version}";
+ pname = "sratom";
version = "0.6.2";
src = fetchurl {
- url = "https://download.drobilla.net/${name}.tar.bz2";
+ url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a";
};
diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix
index f8b1006d2eb7..2ac3115af2aa 100644
--- a/pkgs/development/libraries/audio/vamp/default.nix
+++ b/pkgs/development/libraries/audio/vamp/default.nix
@@ -3,7 +3,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }:
-rec {
+{
vampSDK = stdenv.mkDerivation {
name = "vamp-sdk-2.7.1";
diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
index 320fc41f76c5..debe7d56f7b0 100644
--- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
+++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl , alsaLib, }:
stdenv.mkDerivation rec {
- name = "zita-alsa-pcmi-${version}";
+ pname = "zita-alsa-pcmi";
version = "0.3.2";
src = fetchurl {
- url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+ url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s";
};
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
meta = {
description = "The successor of clalsadrv, provides easy access to ALSA PCM devices";
- version = "${version}";
+ version = version;
homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.magnetophon ];
diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix
index 4fc5c12ccc4c..93bd18abaaef 100644
--- a/pkgs/development/libraries/audio/zita-convolver/default.nix
+++ b/pkgs/development/libraries/audio/zita-convolver/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, fftwFloat }:
stdenv.mkDerivation rec {
- name = "zita-convolver-${version}";
+ pname = "zita-convolver";
version = "4.0.3";
src = fetchurl {
- url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+ url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
sha256 = "0prji66p86z2bzminywkwchr5bfgxcg2i8y803pydd1hzf2198cs";
};
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Convolution library by Fons Adriaensen";
- version = "${version}";
+ version = version;
homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.magnetophon ];
diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix
index e9cccab39f02..b0b0186af88c 100644
--- a/pkgs/development/libraries/audio/zita-resampler/default.nix
+++ b/pkgs/development/libraries/audio/zita-resampler/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "zita-resampler-${version}";
+ pname = "zita-resampler";
version = "1.6.2";
src = fetchurl {
- url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+ url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
sha256 = "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3";
};
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Resample library by Fons Adriaensen";
- version = "${version}";
+ version = version;
homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.magnetophon ];
diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix
index 11c66db70752..a2fdb66d7e95 100644
--- a/pkgs/development/libraries/avro-c++/default.nix
+++ b/pkgs/development/libraries/avro-c++/default.nix
@@ -3,7 +3,8 @@
let version = "1.8.2"; in
stdenv.mkDerivation {
- name = "avro-c++-${version}";
+ pname = "avro-c++";
+ inherit version;
src = fetchurl {
url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";
diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix
index cbd29a095d45..f66d9369c20a 100644
--- a/pkgs/development/libraries/avro-c/default.nix
+++ b/pkgs/development/libraries/avro-c/default.nix
@@ -2,8 +2,9 @@
let
version = "1.9.0";
-in stdenv.mkDerivation rec {
- name = "avro-c-${version}";
+in stdenv.mkDerivation {
+ pname = "avro-c";
+ inherit version;
src = fetchurl {
url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 7233a187053e..1cc65b53b3e9 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -8,7 +8,7 @@
}:
stdenv.mkDerivation rec {
- name = "aws-sdk-cpp-${version}";
+ pname = "aws-sdk-cpp";
version = "1.7.90";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index d95797d5a5f6..c4b1d36ce701 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -35,8 +35,6 @@ stdenv.mkDerivation rec {
lcms2
];
- doCheck = !stdenv.isDarwin;
-
meta = with stdenv.lib; {
description = "Image pixel format conversion library";
homepage = http://gegl.org/babl/;
diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix
index 42621a1792cc..af727e394d16 100644
--- a/pkgs/development/libraries/backward-cpp/default.nix
+++ b/pkgs/development/libraries/backward-cpp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "backward-${version}";
+ pname = "backward";
version = "1.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index 9d5063d8f07d..b1fb17b08fa9 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -3,7 +3,7 @@
, xorgserver, dbus, python2, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "bamf-${version}";
+ pname = "bamf";
version = "0.5.4";
outputs = [ "out" "dev" "devdoc" ];
@@ -55,8 +55,8 @@ stdenv.mkDerivation rec {
# fix paths
makeFlags = [
- "INTROSPECTION_GIRDIR=${placeholder ''dev''}/share/gir-1.0/"
- "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0"
+ "INTROSPECTION_GIRDIR=${placeholder "dev"}/share/gir-1.0/"
+ "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
];
preConfigure = ''
diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix
index 5439c7657e08..2730696344e0 100644
--- a/pkgs/development/libraries/bctoolbox/default.nix
+++ b/pkgs/development/libraries/bctoolbox/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
buildInputs = [cmake mbedtls bcunit srtp];
src = fetchFromGitHub {
owner = "BelledonneCommunications";
- repo = "${baseName}";
- rev = "${version}";
+ repo = baseName;
+ rev = version;
sha256 = "1cxx243wyzkd4xnvpyqf97n0rjhfckpvw1vhwnbwshq3q6fra909";
};
diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix
index 05ff5593205a..af0053519e3d 100644
--- a/pkgs/development/libraries/beignet/default.nix
+++ b/pkgs/development/libraries/beignet/default.nix
@@ -18,7 +18,7 @@
}:
stdenv.mkDerivation rec {
- name = "beignet-${version}";
+ pname = "beignet";
version = "unstable-2018.08.20";
src = fetchFromGitHub {
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
python3
];
- passthru.utests = stdenv.mkDerivation rec {
- name = "beignet-utests-${version}";
+ passthru.utests = stdenv.mkDerivation {
+ pname = "beignet-utests";
inherit version src;
preConfigure = ''
diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix
index 093bb811489f..aa6cb8513ae4 100644
--- a/pkgs/development/libraries/belcard/default.nix
+++ b/pkgs/development/libraries/belcard/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "BelledonneCommunications";
- repo = "${baseName}";
- rev = "${version}";
+ repo = baseName;
+ rev = version;
sha256 = "1pwji83vpsdrfma24rnj3rz1x0a0g6zk3v4xjnip7zf2ys3zcnlk";
};
diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix
index 09ca4908d789..d4420e40ab69 100644
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "BelledonneCommunications";
- repo = "${baseName}";
- rev = "${version}";
+ repo = baseName;
+ rev = version;
sha256 = "0q70db1klvhca1af29bm9paka3gyii5hfbzrj4178gclsg7cj8fk";
};
@@ -18,7 +18,11 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib ];
- NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+ NIX_CFLAGS_COMPILE = [
+ "-Wno-error=deprecated-declarations"
+ "-Wno-error=format-truncation"
+ "-Wno-error=cast-function-type"
+ ];
propagatedBuildInputs = [ antlr3_4 libantlr3c polarssl bctoolbox ];
@@ -26,7 +30,8 @@ stdenv.mkDerivation rec {
"--with-polarssl=${polarssl}"
];
- enableParallelBuilding = true;
+ # Fails to build with lots of parallel jobs
+ enableParallelBuilding = false;
meta = with stdenv.lib; {
homepage = http://www.linphone.org/index.php/eng;
diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix
index 736c9a2f9e0c..f0557b0379f2 100644
--- a/pkgs/development/libraries/belr/default.nix
+++ b/pkgs/development/libraries/belr/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "BelledonneCommunications";
- repo = "${baseName}";
- rev = "${version}";
+ repo = baseName;
+ rev = version;
sha256 = "0mf8lsyq1z3b5p47c00lnwc8n7v9nzs1fd2g9c9hnz6fjd2ka44w";
};
diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix
index e6702d0db640..16be4600ec61 100644
--- a/pkgs/development/libraries/biblesync/default.nix
+++ b/pkgs/development/libraries/biblesync/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec{
- name = "biblesync-${version}";
+ pname = "biblesync";
version = "1.1.2";
src = fetchurl{
- url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${name}.tar.gz";
+ url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${pname}-${version}.tar.gz";
sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8";
};
diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix
index 503e4b0fa43b..fd0da496fa40 100644
--- a/pkgs/development/libraries/blitz/default.nix
+++ b/pkgs/development/libraries/blitz/default.nix
@@ -22,7 +22,7 @@ let
inherit (stdenv.lib) optional optionals;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "blitz++-0.10";
src = fetchurl {
url = mirror://sourceforge/blitz/blitz-0.10.tar.gz;
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--enable-shared"
- "--disable-static"
"--enable-fortran"
"--enable-optimize"
"--with-pic=yes"
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index 812ad546f866..c7520c89ef54 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -3,7 +3,7 @@
, utillinux, yodl }:
stdenv.mkDerivation rec {
- name = "bobcat-${version}";
+ pname = "bobcat";
version = "4.08.03";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix
index 68f5d7afcf49..c2b5c7b60626 100644
--- a/pkgs/development/libraries/boehm-gc/7.6.6.nix
+++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "boehm-gc-${version}";
+ pname = "boehm-gc";
version = "7.6.6";
src = fetchurl {
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index a241b42e1878..cf76d9e7d24c 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "boehm-gc-${version}";
+ pname = "boehm-gc";
version = "8.0.4";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix
index 0a38f35af753..bcb452ea4f86 100644
--- a/pkgs/development/libraries/boost/1.55.nix
+++ b/pkgs/development/libraries/boost/1.55.nix
@@ -1,6 +1,6 @@
{ callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.55.0";
patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ];
diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix
index f4931dfe5474..fb65e49c500c 100644
--- a/pkgs/development/libraries/boost/1.59.nix
+++ b/pkgs/development/libraries/boost/1.59.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.59.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.60.nix b/pkgs/development/libraries/boost/1.60.nix
index b6d74234f799..646f4652f77d 100644
--- a/pkgs/development/libraries/boost/1.60.nix
+++ b/pkgs/development/libraries/boost/1.60.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.60.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.62.nix b/pkgs/development/libraries/boost/1.62.nix
index 871ef392c1ae..a1b3c51d0e69 100644
--- a/pkgs/development/libraries/boost/1.62.nix
+++ b/pkgs/development/libraries/boost/1.62.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.62.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.63.nix b/pkgs/development/libraries/boost/1.63.nix
index c4749bc3ee41..a8b459f4b12f 100644
--- a/pkgs/development/libraries/boost/1.63.nix
+++ b/pkgs/development/libraries/boost/1.63.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.63.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.64.nix b/pkgs/development/libraries/boost/1.64.nix
index 1cf9bfa51f4b..32632f79d225 100644
--- a/pkgs/development/libraries/boost/1.64.nix
+++ b/pkgs/development/libraries/boost/1.64.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.64.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.65.nix b/pkgs/development/libraries/boost/1.65.nix
index 9837e1c69193..922c09ba7fe9 100644
--- a/pkgs/development/libraries/boost/1.65.nix
+++ b/pkgs/development/libraries/boost/1.65.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.65.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix
index b44c1a3823a9..0a99717a7997 100644
--- a/pkgs/development/libraries/boost/1.66.nix
+++ b/pkgs/development/libraries/boost/1.66.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.66.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix
index 406e63b9622b..a2fe9447c125 100644
--- a/pkgs/development/libraries/boost/1.67.nix
+++ b/pkgs/development/libraries/boost/1.67.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.67.0";
patches = [
diff --git a/pkgs/development/libraries/boost/1.68.nix b/pkgs/development/libraries/boost/1.68.nix
index cd980439b710..4d98172c6d05 100644
--- a/pkgs/development/libraries/boost/1.68.nix
+++ b/pkgs/development/libraries/boost/1.68.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.68.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.69.nix b/pkgs/development/libraries/boost/1.69.nix
index 959fa851fe22..95c4aa854a46 100644
--- a/pkgs/development/libraries/boost/1.69.nix
+++ b/pkgs/development/libraries/boost/1.69.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.69.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/boost/1.70.nix b/pkgs/development/libraries/boost/1.70.nix
index 5f7b39c1189e..45a8bdb93185 100644
--- a/pkgs/development/libraries/boost/1.70.nix
+++ b/pkgs/development/libraries/boost/1.70.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.70.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix
index 3c27281571af..9283f37a8c47 100644
--- a/pkgs/development/libraries/bootil/default.nix
+++ b/pkgs/development/libraries/bootil/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchpatch, premake4 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "bootil-unstable-2015-12-17";
meta = {
diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix
index ee62d5423a15..67e2794c8a29 100644
--- a/pkgs/development/libraries/boringssl/default.nix
+++ b/pkgs/development/libraries/boringssl/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchgit, cmake, perl, go }:
# reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md
-stdenv.mkDerivation rec {
- name = "boringssl-${version}";
+stdenv.mkDerivation {
+ pname = "boringssl";
version = "2017-02-23";
src = fetchgit {
diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index 2580b959bf2a..18b1b47f6d38 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -8,7 +8,7 @@
}:
stdenv.mkDerivation rec {
- name = "botan-${version}";
+ pname = "botan";
version = "${baseVersion}.${revision}";
src = fetchurl {
diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix
index 102e7bfcc12b..328ac434d85a 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -2,7 +2,7 @@
, libXi, pkgconfig }:
stdenv.mkDerivation rec {
- name = "box2d-${version}";
+ pname = "box2d";
version = "2.3.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix
index b4a57396cc8b..7710747d8004 100644
--- a/pkgs/development/libraries/brigand/default.nix
+++ b/pkgs/development/libraries/brigand/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
-stdenv.mkDerivation rec {
- name = "brigand-${version}";
+stdenv.mkDerivation {
+ pname = "brigand";
version = "1.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index b4a2133f7d8f..f6041802a9c5 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "bullet-${version}";
+ pname = "bullet";
version = "2.87";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix
index 12fc1834e905..8b0901832d11 100644
--- a/pkgs/development/libraries/bullet/roboschool-fork.nix
+++ b/pkgs/development/libraries/bullet/roboschool-fork.nix
@@ -2,8 +2,8 @@
, Cocoa, OpenGL
}:
-stdenv.mkDerivation rec {
- name = "bullet-${version}";
+stdenv.mkDerivation {
+ pname = "bullet";
version = "2019-03-27";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/bulletml/default.nix b/pkgs/development/libraries/bulletml/default.nix
index b61ac1dcb09f..f64090bd53a3 100644
--- a/pkgs/development/libraries/bulletml/default.nix
+++ b/pkgs/development/libraries/bulletml/default.nix
@@ -10,7 +10,8 @@ let
};
in stdenv.mkDerivation {
- name = "bulletml-${version}";
+ pname = "bulletml";
+ inherit version;
srcs = [
(fetchurl {
diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix
index 1e2bda285a70..e763afc4a430 100644
--- a/pkgs/development/libraries/bwidget/default.nix
+++ b/pkgs/development/libraries/bwidget/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, tcl }:
stdenv.mkDerivation rec {
- name = "bwidget-${version}";
+ pname = "bwidget";
version = "1.9.13";
src = fetchurl {
diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix
index 11b94a0181a1..b2dc295db5b7 100644
--- a/pkgs/development/libraries/bzrtp/default.nix
+++ b/pkgs/development/libraries/bzrtp/default.nix
@@ -7,14 +7,16 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "BelledonneCommunications";
- repo = "${baseName}";
- rev = "${version}";
+ repo = baseName;
+ rev = version;
sha256 = "0438zzxp82bj5fmvqnwlljkgrz9ab5qm5lgpwwgmg1cp78bp2l45";
};
buildInputs = [ bctoolbox sqlite ];
nativeBuildInputs = [ cmake ];
+ NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
+
meta = with stdenv.lib; {
description = "BZRTP is an opensource implementation of ZRTP keys exchange protocol";
homepage = https://github.com/BelledonneCommunications/bzrtp;
diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix
index 3603667fbf21..396e419406ae 100644
--- a/pkgs/development/libraries/c-blosc/default.nix
+++ b/pkgs/development/libraries/c-blosc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "c-blosc-${version}";
+ pname = "c-blosc";
version = "1.16.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index 4a1ea3942077..3ebc0b36679c 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "actor-framework-${version}";
+ pname = "actor-framework";
version = "0.17.0";
src = fetchFromGitHub {
owner = "actor-framework";
repo = "actor-framework";
- rev = "${version}";
+ rev = version;
sha256 = "10dcpmdsfq6r7hpvg413pqi1q3rjvgn7f87c17ghyz30x6rjhaic";
};
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index e388b3af5f67..82570fbf7b40 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -16,10 +16,11 @@ let
version = "1.16.0";
inherit (stdenv.lib) optional optionals;
in stdenv.mkDerivation rec {
- name = "cairo-${version}";
+ pname = "cairo";
+ inherit version;
src = fetchurl {
- url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
+ url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz";
sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy";
};
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index b175250872f3..9020ccf08b5b 100644
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/pkgs/development/libraries/capnproto/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "capnproto-${version}";
+ pname = "capnproto";
version = "0.7.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index c02633d880c4..956fd74da585 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig }:
stdenv.mkDerivation rec {
- name = "capstone-${version}";
+ pname = "capstone";
version = "4.0.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
index d83060fc24d8..92e5c04e0322 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/pkgs/development/libraries/catch/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "catch-${version}";
+ pname = "catch";
version = "1.12.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix
index 2d0fd4cb1bcf..d7876affe2f9 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/pkgs/development/libraries/catch2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "catch2-${version}";
+ pname = "catch2";
version = "2.8.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix
index 832b070c8837..5897f84efff0 100644
--- a/pkgs/development/libraries/cctz/default.nix
+++ b/pkgs/development/libraries/cctz/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, darwin }:
stdenv.mkDerivation rec {
- name = "cctz-${version}";
+ pname = "cctz";
version = "2.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix
index 68d34c75c010..d84cda5b7501 100644
--- a/pkgs/development/libraries/cddlib/default.nix
+++ b/pkgs/development/libraries/cddlib/default.nix
@@ -6,12 +6,12 @@
}:
stdenv.mkDerivation rec {
- name = "cddlib-${version}";
+ pname = "cddlib";
version = "0.94j";
src = fetchFromGitHub {
owner = "cddlib";
repo = "cddlib";
- rev = "${version}";
+ rev = version;
sha256 = "1z03ljy3rrr0qq5gq54vynnif6fn0xhn05g90nnv0dpyc3ps8lzp";
};
buildInputs = [gmp];
diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix
index 4c311f07e017..8487435981ca 100644
--- a/pkgs/development/libraries/cdk/default.nix
+++ b/pkgs/development/libraries/cdk/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "cdk-${version}";
+ pname = "cdk";
version ="5.0-20190224";
buildInputs = [
diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix
index 7e5c768036fc..eaeb6bf8e43f 100644
--- a/pkgs/development/libraries/cegui/default.nix
+++ b/pkgs/development/libraries/cegui/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, ogre, freetype, boost, expat }:
stdenv.mkDerivation rec {
- name = "cegui-${version}";
+ pname = "cegui";
version = "0.8.7";
src = fetchurl {
- url = "mirror://sourceforge/crayzedsgui/${name}.tar.bz2";
+ url = "mirror://sourceforge/crayzedsgui/${pname}-${version}.tar.bz2";
sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk";
};
diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix
index 6bf7975034b5..3b7e870b4fe9 100644
--- a/pkgs/development/libraries/celt/generic.nix
+++ b/pkgs/development/libraries/celt/generic.nix
@@ -6,8 +6,9 @@
# The celt codec has been deprecated and is now a part of the opus codec
-stdenv.mkDerivation rec {
- name = "celt-${version}";
+stdenv.mkDerivation {
+ pname = "celt";
+ inherit version;
inherit src;
diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix
index 52e0f06eeec4..3ce8c4ef080a 100644
--- a/pkgs/development/libraries/ceres-solver/default.nix
+++ b/pkgs/development/libraries/ceres-solver/default.nix
@@ -11,7 +11,7 @@
assert runTests -> gflags != null;
stdenv.mkDerivation rec {
- name = "ceres-solver-${version}";
+ pname = "ceres-solver";
version = "1.14.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix
index df75d3a1f1da..39ed74d00750 100644
--- a/pkgs/development/libraries/cgui/default.nix
+++ b/pkgs/development/libraries/cgui/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, texinfo, allegro, perl, libX11 }:
stdenv.mkDerivation rec {
- name = "cgui-${version}";
+ pname = "cgui";
version="2.1.0";
src = fetchurl {
- url = "mirror://sourceforge/project/cgui/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/cgui/${version}/${pname}-${version}.tar.gz";
sha256 = "1pp1hvidpilq37skkmbgba4lvzi01rasy04y0cnas9ck0canv00s";
};
diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix
index ae8b6ca18df3..08610d1e9aff 100644
--- a/pkgs/development/libraries/check/default.nix
+++ b/pkgs/development/libraries/check/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "check-${version}";
+ pname = "check";
version = "0.12.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix
index f460b69a4f84..76f722f31aa7 100644
--- a/pkgs/development/libraries/chipmunk/default.nix
+++ b/pkgs/development/libraries/chipmunk/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "chipmunk-${version}";
+ pname = "chipmunk";
majorVersion = "7";
version = "${majorVersion}.0.1";
diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
index 02420735ff76..fd868884f986 100644
--- a/pkgs/development/libraries/chromaprint/default.nix
+++ b/pkgs/development/libraries/chromaprint/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, boost, ffmpeg }:
stdenv.mkDerivation rec {
- name = "chromaprint-${version}";
+ pname = "chromaprint";
version = "1.3.2";
src = fetchurl {
- url = "https://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz";
+ url = "https://bitbucket.org/acoustid/chromaprint/downloads/${pname}-${version}.tar.gz";
sha256 = "0lln8dh33gslb9cbmd1hcv33pr6jxdwipd8m8gbsyhksiq6r1by3";
};
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index 3e6e62e5a967..6181122aa7f1 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -1,13 +1,12 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
-
- name = "cimg-${version}";
- version = "2.7.0";
+ pname = "cimg";
+ version = "2.7.1";
src = fetchurl {
url = "http://cimg.eu/files/CImg_${version}.zip";
- sha256 = "1la6332cppyciyn3pflbchxa3av72a70p0n1c9sm1hgfbjlydqnv";
+ sha256 = "1lw1hjk65zyd5x9w113yrqyy8db45jdzzkqslkipaiskl9f81y9z";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix
index 1890d2b25a0d..a7d7a0ea982b 100644
--- a/pkgs/development/libraries/cl/default.nix
+++ b/pkgs/development/libraries/cl/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.2.4";
- name = "cl-${version}";
+ pname = "cl";
src = fetchFromGitHub {
owner = "tonyrog";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
# 'cp' line taken from Arch recipe
# https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/erlang-sdl
installPhase = ''
- DIR=$out/lib/erlang/lib/${name}
+ DIR=$out/lib/erlang/lib/${pname}-${version}
mkdir -p $DIR
cp -ruv c_src doc ebin include priv src $DIR
'';
diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix
index d329b1945fc7..ff8e1ca6759c 100644
--- a/pkgs/development/libraries/classads/default.nix
+++ b/pkgs/development/libraries/classads/default.nix
@@ -3,7 +3,8 @@
let version = "1.0.10"; in
stdenv.mkDerivation {
- name = "classads-${version}";
+ pname = "classads";
+ inherit version;
src = fetchurl {
url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz";
diff --git a/pkgs/development/libraries/clipp/clipp.pc b/pkgs/development/libraries/clipp/clipp.pc
new file mode 100644
index 000000000000..38c07e5ba162
--- /dev/null
+++ b/pkgs/development/libraries/clipp/clipp.pc
@@ -0,0 +1,9 @@
+prefix=@out@
+includedir=${prefix}/include
+
+Name: @pname@
+Description: Easy to use, powerful and expressive command line argument \
+handling for C++11/14/17
+URL: https://github.com/muellan/clipp
+Version: @version@
+Cflags: -I${includedir}
diff --git a/pkgs/development/libraries/clipp/default.nix b/pkgs/development/libraries/clipp/default.nix
new file mode 100644
index 000000000000..f7c8f90e8686
--- /dev/null
+++ b/pkgs/development/libraries/clipp/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "clipp";
+ version = "1.2.3";
+
+ src = fetchFromGitHub {
+ owner = "muellan";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0rq80ba2krwzvcg4r2g1al88453c7lz6ziri2s1ygv8inp9r775s";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/pkgconfig
+ cp -r include $out/
+ substitute ${./clipp.pc} $out/share/pkgconfig/clipp.pc \
+ --subst-var out \
+ --subst-var pname \
+ --subst-var version
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Easy to use, powerful and expressive command line argument handling for C++11/14/17";
+ homepage = "https://github.com/muellan/clipp";
+ license = licenses.mit;
+ maintainers = with maintainers; [ xbreak ];
+ platforms = with platforms; all;
+ };
+}
diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/development/libraries/clipper/default.nix
index 086816655d3b..117524239061 100644
--- a/pkgs/development/libraries/clipper/default.nix
+++ b/pkgs/development/libraries/clipper/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "6.4.2";
- name = "Clipper-${version}";
+ pname = "Clipper";
src = fetchurl {
url = "mirror://sourceforge/polyclipping/clipper_ver${version}.zip";
sha256 = "09q6jc5k7p9y5d75qr2na5d1gm0wly5cjnffh127r04l47c20hx1";
diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index 7764e9c67ed2..7adc2a365c5b 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gmp }:
stdenv.mkDerivation rec {
- name = "cln-${version}";
+ pname = "cln";
version = "1.3.4";
src = fetchurl {
- url = "${meta.homepage}${name}.tar.bz2";
+ url = "${meta.homepage}${pname}-${version}.tar.bz2";
sha256 = "0j5p18hwbbrchsdbnc8d2bf9ncslhflri4i950gdnq7v6g2dg69d";
};
diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix
index ede2049b6ee9..e7c02312b66e 100644
--- a/pkgs/development/libraries/cmark/default.nix
+++ b/pkgs/development/libraries/cmark/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.29.0";
- name = "cmark-${version}";
+ pname = "cmark";
src = fetchFromGitHub {
owner = "jgm";
diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix
index 8044d7165f75..11e719b36df4 100644
--- a/pkgs/development/libraries/cmrt/default.nix
+++ b/pkgs/development/libraries/cmrt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libdrm, libva }:
stdenv.mkDerivation rec {
- name = "cmrt-${version}";
+ pname = "cmrt";
version = "1.0.6";
src = fetchurl {
diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix
index 9f4c4c3b6b36..7c42a7479b1a 100644
--- a/pkgs/development/libraries/codec2/default.nix
+++ b/pkgs/development/libraries/codec2/default.nix
@@ -4,7 +4,8 @@ let
version = "0.8";
in stdenv.mkDerivation {
- name = "codec2-${version}";
+ pname = "codec2";
+ inherit version;
src = fetchsvn {
url = "https://svn.code.sf.net/p/freetel/code/codec2/branches/${version}";
diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix
index 80b6480323be..74fd12ffea26 100644
--- a/pkgs/development/libraries/coin3d/default.nix
+++ b/pkgs/development/libraries/coin3d/default.nix
@@ -1,6 +1,6 @@
{ fetchFromBitbucket, stdenv, boost, cmake, libGLU_combined }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "coin";
version = "unstable-2019-06-12";
diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix
index 29ce216cadf1..cc42407433c5 100644
--- a/pkgs/development/libraries/concurrencykit/default.nix
+++ b/pkgs/development/libraries/concurrencykit/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "concurrencykit-${version}";
+ pname = "concurrencykit";
version = "0.6.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/coprthr/default.nix b/pkgs/development/libraries/coprthr/default.nix
index 5630daa0d933..86f4485a900d 100644
--- a/pkgs/development/libraries/coprthr/default.nix
+++ b/pkgs/development/libraries/coprthr/default.nix
@@ -2,7 +2,7 @@
, bison, flex }:
stdenv.mkDerivation rec {
- name = "coprthr-${version}";
+ pname = "coprthr";
version = "1.6";
src = fetchurl {
diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix
index c2f3ce9b9b4a..d172ab55fa3c 100644
--- a/pkgs/development/libraries/cpp-hocon/default.nix
+++ b/pkgs/development/libraries/cpp-hocon/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
stdenv.mkDerivation rec {
- name = "cpp-hocon-${version}";
+ pname = "cpp-hocon";
version = "0.2.1";
src = fetchFromGitHub {
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
owner = "puppetlabs";
};
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ];
+
nativeBuildInputs = [ cmake ];
buildInputs = [ boost curl leatherman ];
diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix
index c13b32a67b06..dfebccc88e35 100644
--- a/pkgs/development/libraries/cpp-ipfs-api/default.nix
+++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }:
-stdenv.mkDerivation rec {
- name = "cpp-ipfs-api-${version}";
+stdenv.mkDerivation {
+ pname = "cpp-ipfs-api";
version = "2017-01-04";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix
index a2493e55fb0b..7bb2bad9689d 100644
--- a/pkgs/development/libraries/cppcms/default.nix
+++ b/pkgs/development/libraries/cppcms/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, pcre, zlib, python, openssl }:
stdenv.mkDerivation rec {
- name = "cppcms-${version}";
+ pname = "cppcms";
version = "1.2.1";
src = fetchurl {
- url = "mirror://sourceforge/cppcms/${name}.tar.bz2";
+ url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2";
sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh";
};
diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix
index 3423b29d76c8..737122c57bfe 100644
--- a/pkgs/development/libraries/cppdb/default.nix
+++ b/pkgs/development/libraries/cppdb/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }:
stdenv.mkDerivation rec {
- name = "cppdb-${version}";
+ pname = "cppdb";
version = "0.3.1";
src = fetchurl {
- url = "mirror://sourceforge/cppcms/${name}.tar.bz2";
+ url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2";
sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn";
};
diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix
index 3f8b2d896ac6..76fd6db18b05 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/pkgs/development/libraries/cppunit/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "cppunit-${version}";
+ pname = "cppunit";
version = "1.14.0";
src = fetchurl {
- url = "https://dev-www.libreoffice.org/src/${name}.tar.gz";
+ url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.gz";
sha256 = "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix";
};
diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/development/libraries/cpputest/default.nix
index 2dce60d4b2c4..28ab31a08ccd 100644
--- a/pkgs/development/libraries/cpputest/default.nix
+++ b/pkgs/development/libraries/cpputest/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "3.8";
- name = "cpputest-${version}";
+ pname = "cpputest";
src = fetchurl {
- url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${name}.tar.gz";
+ url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0mk48xd3klyqi7wf3f4wn4zqxxzmvrhhl32r25jzrixzl72wq7f8";
};
diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index 5bffda607ee1..2328bd533629 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, zeromq }:
stdenv.mkDerivation rec {
- name = "cppzmq-${version}";
+ pname = "cppzmq";
version = "4.4.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix
index d8130d0b8f91..a4313fa94d36 100644
--- a/pkgs/development/libraries/cre2/default.nix
+++ b/pkgs/development/libraries/cre2/default.nix
@@ -2,8 +2,8 @@
libtool, pkgconfig, re2, texinfo }:
stdenv.mkDerivation rec {
- name = "cre2-${version}";
- version = "0.3.6";
+ pname = "cre2";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "marcomaggi";
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index 61a825cd3745..cb481fc7084e 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -1,7 +1,7 @@
{ fetchFromGitHub, stdenv }:
stdenv.mkDerivation rec {
- name = "crypto++-${version}";
+ pname = "crypto++";
majorVersion = "5.6";
version = "${majorVersion}.5";
diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix
index 9b74ecdb0f7e..506aa5f475d6 100644
--- a/pkgs/development/libraries/csfml/default.nix
+++ b/pkgs/development/libraries/csfml/default.nix
@@ -5,7 +5,8 @@ let
in
stdenv.mkDerivation {
- name = "csfml-${version}";
+ pname = "csfml";
+ inherit version;
src = fetchFromGitHub {
owner = "SFML";
repo = "CSFML";
diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix
index fd81de5139d6..5696684e91d2 100644
--- a/pkgs/development/libraries/ctpl/default.nix
+++ b/pkgs/development/libraries/ctpl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, glib }:
stdenv.mkDerivation rec {
- name = "ctpl-${version}";
+ pname = "ctpl";
version = "0.3.4";
src = fetchurl {
diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix
index 5a2a53ef24d5..ea2230909a2c 100644
--- a/pkgs/development/libraries/ctpp2/default.nix
+++ b/pkgs/development/libraries/ctpp2/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
- name = "ctpp2-${version}";
+ pname = "ctpp2";
version = "2.8.3";
src = fetchurl {
- url = "http://ctpp.havoc.ru/download/${name}.tar.gz";
+ url = "http://ctpp.havoc.ru/download/${pname}-${version}.tar.gz";
sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8";
};
diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix
index a2188f687d13..6f5314142427 100644
--- a/pkgs/development/libraries/curlcpp/default.nix
+++ b/pkgs/development/libraries/curlcpp/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, cmake, curl }:
stdenv.mkDerivation rec {
- name = "curlcpp-${version}";
+ pname = "curlcpp";
version = "1.1";
src = fetchFromGitHub {
owner = "JosephP91";
repo = "curlcpp";
- rev = "${version}";
+ rev = version;
sha256 = "025qg5hym73xrvyhalv3jgbf9jqnnzkdjs3zwsgbpqx58zyd5bg5";
};
diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/development/libraries/curlpp/default.nix
index 58f88e6d8ebf..490f472a0662 100644
--- a/pkgs/development/libraries/curlpp/default.nix
+++ b/pkgs/development/libraries/curlpp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, curl }:
stdenv.mkDerivation rec {
- name = "curlpp-${version}";
+ pname = "curlpp";
version = "0.8.1";
src = fetchFromGitHub {
owner = "jpbarrette";
diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix
index ba1d02380e29..1658f8a6fa7a 100644
--- a/pkgs/development/libraries/cutee/default.nix
+++ b/pkgs/development/libraries/cutee/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "cutee";
version = "0.4.2";
- name = "${pname}-${version}";
src = fetchurl {
url = "http://www.codesink.org/download/${pname}-${version}.tar.gz";
diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix
index 216b644b38e1..e84fbe89aa95 100644
--- a/pkgs/development/libraries/cutelyst/default.nix
+++ b/pkgs/development/libraries/cutelyst/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "cutelyst-${version}";
+ pname = "cutelyst";
version = "2.8.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/development/libraries/cxx-prettyprint/default.nix
index 8be68a314e3d..e668e6534777 100644
--- a/pkgs/development/libraries/cxx-prettyprint/default.nix
+++ b/pkgs/development/libraries/cxx-prettyprint/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "cxx-prettyprint-unstable-${version}";
+ pname = "cxx-prettyprint-unstable";
version = "2016-04-30";
rev = "9ab26d228f2960f50b38ad37fe0159b7381f7533";
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix
index aa0708daaa7f..9b6407715df5 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/pkgs/development/libraries/cxxtest/default.nix
@@ -3,7 +3,7 @@
let
pname = "cxxtest";
version = "4.4";
-in python2Packages.buildPythonApplication rec {
+in python2Packages.buildPythonApplication {
name = "${pname}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix
index 77b27640fd77..4c572cf781a6 100644
--- a/pkgs/development/libraries/cxxtools/default.nix
+++ b/pkgs/development/libraries/cxxtools/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "2.2.1";
- name = "cxxtools-${version}";
+ pname = "cxxtools";
src = fetchurl {
- url = "http://www.tntnet.org/download/${name}.tar.gz";
+ url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz";
sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc";
};
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 0bdaf1be9551..a050dd8d9cac 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -4,13 +4,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "cyrus-sasl-${version}";
+ pname = "cyrus-sasl";
version = "2.1.27";
src = fetchurl {
urls =
- [ "http://www.cyrusimap.org/releases/${name}.tar.gz"
- "http://www.cyrusimap.org/releases/old/${name}.tar.gz"
+ [ "http://www.cyrusimap.org/releases/${pname}-${version}.tar.gz"
+ "http://www.cyrusimap.org/releases/old/${pname}-${version}.tar.gz"
];
sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6";
};
diff --git a/pkgs/development/libraries/czmq/3.x.nix b/pkgs/development/libraries/czmq/3.x.nix
index d418b879d1dd..73a51cd27310 100644
--- a/pkgs/development/libraries/czmq/3.x.nix
+++ b/pkgs/development/libraries/czmq/3.x.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "3.0.2";
- name = "czmq-${version}";
+ pname = "czmq";
src = fetchurl {
- url = "http://download.zeromq.org/${name}.tar.gz";
+ url = "http://download.zeromq.org/${pname}-${version}.tar.gz";
sha256 = "16k9awrhdsymx7dnmvqcnkaq8lz8x8zppy6sh7ls8prpd6mkkjlb";
};
diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix
index 13cee8fe86ba..05e499c73d0c 100644
--- a/pkgs/development/libraries/czmq/4.x.nix
+++ b/pkgs/development/libraries/czmq/4.x.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "4.2.0";
- name = "czmq-${version}";
+ pname = "czmq";
src = fetchurl {
- url = "https://github.com/zeromq/czmq/releases/download/v${version}/${name}.tar.gz";
+ url = "https://github.com/zeromq/czmq/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "1szciz62sk3fm4ga9qjpxz0n0lazvphm32km95bq92ncng12kayg";
};
diff --git a/pkgs/development/libraries/czmqpp/default.nix b/pkgs/development/libraries/czmqpp/default.nix
index 0c026b9f47a5..079eb0806d2c 100644
--- a/pkgs/development/libraries/czmqpp/default.nix
+++ b/pkgs/development/libraries/czmqpp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }:
stdenv.mkDerivation rec {
- name = "czmqpp-${version}";
+ pname = "czmqpp";
version = "1.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix
index 76e30e921ba1..dc668a233b06 100644
--- a/pkgs/development/libraries/db/db-4.8.nix
+++ b/pkgs/development/libraries/db/db-4.8.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ... } @ args:
-import ./generic.nix (args // rec {
+import ./generic.nix (args // {
version = "4.8.30";
sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ];
diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix
index 7894e4c73262..1223cb897e86 100644
--- a/pkgs/development/libraries/db/db-5.3.nix
+++ b/pkgs/development/libraries/db/db-5.3.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ... } @ args:
-import ./generic.nix (args // rec {
+import ./generic.nix (args // {
version = "5.3.28";
sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
extraPatches = [ ./clang-5.3.patch ./CVE-2017-10140-cwd-db_config.patch ];
diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix
index bafca3bd52d2..642054b5a018 100644
--- a/pkgs/development/libraries/db/db-6.0.nix
+++ b/pkgs/development/libraries/db/db-6.0.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ... } @ args:
-import ./generic.nix (args // rec {
+import ./generic.nix (args // {
version = "6.0.20";
sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0";
license = stdenv.lib.licenses.agpl3;
diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix
index 96f7668aa903..dee07a9637e6 100644
--- a/pkgs/development/libraries/db/db-6.2.nix
+++ b/pkgs/development/libraries/db/db-6.2.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ... } @ args:
-import ./generic.nix (args // rec {
+import ./generic.nix (args // {
version = "6.2.23";
sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7";
license = stdenv.lib.licenses.agpl3;
diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix
index 163b0f4be883..2609f47b2760 100644
--- a/pkgs/development/libraries/dbus-cplusplus/default.nix
+++ b/pkgs/development/libraries/dbus-cplusplus/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, dbus, glib, pkgconfig, expat }:
stdenv.mkDerivation rec {
- name = "dbus-cplusplus-${version}";
+ pname = "dbus-cplusplus";
version = "0.9.0";
src = fetchurl {
url = "mirror://sourceforge/dbus-cplusplus/dbus-c%2B%2B/0.9.0/libdbus-c%2B%2B-0.9.0.tar.gz";
- name = "${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw";
};
diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
index 0f897d97467f..22c0a9137cae 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, dbus-sharp-1_0 }:
stdenv.mkDerivation rec {
- name = "dbus-sharp-glib-${version}";
+ pname = "dbus-sharp-glib";
version = "0.5";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix
index cd020317f4c2..496a109b58f1 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/default.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, mono, dbus-sharp-2_0, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "dbus-sharp-glib-${version}";
+ pname = "dbus-sharp-glib";
version = "0.6";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
index 18ea3ad3ecb7..084beae59727 100644
--- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "dbus-sharp-${version}";
+ pname = "dbus-sharp";
version = "0.7";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix
index 14db5baea3fb..0fd638dbf8eb 100644
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/pkgs/development/libraries/dbus-sharp/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "dbus-sharp-${version}";
+ pname = "dbus-sharp";
version = "0.8.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index abc32b90c6b8..616ad869d57c 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -1,92 +1,105 @@
-{ stdenv, lib, fetchurl, pkgconfig, expat, systemd
-, libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }:
+{ stdenv
+, lib
+, fetchurl
+, pkgconfig
+, expat
+, systemd
+, libX11 ? null
+, libICE ? null
+, libSM ? null
+, x11Support ? (stdenv.isLinux || stdenv.isDarwin)
+, dbus
+}:
-assert x11Support -> libX11 != null
- && libICE != null
- && libSM != null;
+assert
+ x11Support ->
+ libX11 != null && libICE != null && libSM != null;
-let
+stdenv.mkDerivation rec {
+ pname = "dbus";
version = "1.12.16";
- sha256 = "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl";
-self = stdenv.mkDerivation {
- name = "dbus-${version}";
- inherit version;
-
- src = fetchurl {
- url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
- inherit sha256;
- };
-
- patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
- postPatch = ''
- substituteInPlace tools/Makefile.in \
- --replace 'install-localstatelibDATA:' 'disabled:' \
- --replace 'install-data-local:' 'disabled:' \
- --replace 'installcheck-local:' 'disabled:'
- substituteInPlace bus/Makefile.in \
- --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':'
- '' + /* cleanup of runtime references */ ''
- substituteInPlace ./dbus/dbus-sysdeps-unix.c \
- --replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\""
- substituteInPlace ./tools/dbus-launch.c \
- --replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"'
- '';
-
- outputs = [ "out" "dev" "lib" "doc" ];
-
- nativeBuildInputs = [ pkgconfig ];
- propagatedBuildInputs = [ expat ];
- buildInputs = lib.optional stdenv.isLinux systemd
- ++ lib.optionals x11Support [ libX11 libICE libSM ];
- # ToDo: optional selinux?
-
- configureFlags = [
- "--localstatedir=/var"
- "--sysconfdir=/etc"
- "--with-session-socket-dir=/tmp"
- "--with-system-pid-file=/run/dbus/pid"
- "--with-system-socket=/run/dbus/system_bus_socket"
- "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
- "--with-systemduserunitdir=$(out)/etc/systemd/user"
- "--enable-user-session"
- "--datadir=/etc"
- "--libexecdir=$(out)/libexec"
- ] ++ lib.optional (!x11Support) "--without-x";
-
- # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11
- # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands.
- # problems building without x11Support so disabled in that case for now
- NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
- NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed";
-
- enableParallelBuilding = true;
-
- doCheck = true;
-
- installFlags = [ "sysconfdir=$(out)/etc" "datadir=$(out)/share" ];
-
- postInstall = ''
- mkdir -p "$out/share/xml/dbus"
- cp doc/*.dtd "$out/share/xml/dbus"
- '';
-
- # it's executed from $lib by absolute path
- postFixup = ''
- moveToOutput bin/dbus-launch "$lib"
- ln -s "$lib/bin/dbus-launch" "$out/bin/"
- '';
-
- passthru = {
- dbus-launch = "${self.lib}/bin/dbus-launch";
- daemon = self.out;
- };
-
- meta = with stdenv.lib; {
- description = "Simple interprocess messaging system";
- homepage = http://www.freedesktop.org/wiki/Software/dbus/;
- license = licenses.gpl2Plus; # most is also under AFL-2.1
- platforms = platforms.unix;
- };
+ src = fetchurl {
+ url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
+ sha256 = "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl";
};
-in self
+
+ patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
+
+ postPatch = ''
+ substituteInPlace tools/Makefile.in \
+ --replace 'install-localstatelibDATA:' 'disabled:' \
+ --replace 'install-data-local:' 'disabled:' \
+ --replace 'installcheck-local:' 'disabled:'
+ substituteInPlace bus/Makefile.in \
+ --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':'
+ '' + /* cleanup of runtime references */ ''
+ substituteInPlace ./dbus/dbus-sysdeps-unix.c \
+ --replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\""
+ substituteInPlace ./tools/dbus-launch.c \
+ --replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"'
+ '';
+
+ outputs = [ "out" "dev" "lib" "doc" ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ ];
+
+ propagatedBuildInputs = [
+ expat
+ ];
+
+ buildInputs = lib.optionals x11Support [
+ libX11
+ libICE
+ libSM
+ ] ++ lib.optional stdenv.isLinux systemd;
+ # ToDo: optional selinux?
+
+ configureFlags = [
+ "--enable-user-session"
+ "--libexecdir=${placeholder ''out''}/libexec"
+ "--localstatedir=/var"
+ "--runstatedir=/run"
+ "--sysconfdir=/etc"
+ "--with-session-socket-dir=/tmp"
+ "--with-system-pid-file=/run/dbus/pid"
+ "--with-system-socket=/run/dbus/system_bus_socket"
+ "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
+ "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user"
+ ] ++ lib.optional (!x11Support) "--without-x";
+
+ # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11
+ # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands.
+ # problems building without x11Support so disabled in that case for now
+ NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
+ NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed";
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+
+ installFlags = [
+ "sysconfdir=${placeholder ''out''}/etc"
+ "datadir=${placeholder ''out''}/share"
+ ];
+
+ # it's executed from $lib by absolute path
+ postFixup = ''
+ moveToOutput bin/dbus-launch "$lib"
+ ln -s "$lib/bin/dbus-launch" "$out/bin/"
+ '';
+
+ passthru = {
+ dbus-launch = "${dbus.lib}/bin/dbus-launch";
+ daemon = dbus.out;
+ };
+
+ meta = with stdenv.lib; {
+ description = "Simple interprocess messaging system";
+ homepage = http://www.freedesktop.org/wiki/Software/dbus/;
+ license = licenses.gpl2Plus; # most is also under AFL-2.1
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix
index 5d441c5d1331..e714b96b7e9f 100644
--- a/pkgs/development/libraries/dbus/make-dbus-conf.nix
+++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix
@@ -22,7 +22,7 @@ runCommand "dbus-1"
+ rewritePrefix="file://${dbus}/share/xml/dbus-1/"/>
'';
nativeBuildInputs = [ libxslt.bin ];
diff --git a/pkgs/development/libraries/dbus/make-session-conf.xsl b/pkgs/development/libraries/dbus/make-session-conf.xsl
index 9544aa13db56..6a19ee14a22c 100644
--- a/pkgs/development/libraries/dbus/make-session-conf.xsl
+++ b/pkgs/development/libraries/dbus/make-session-conf.xsl
@@ -24,6 +24,7 @@
/share/dbus-1/services
/etc/dbus-1/session.d
+ /share/dbus-1/session.d
diff --git a/pkgs/development/libraries/dbus/systemd.patch b/pkgs/development/libraries/dbus/systemd.patch
deleted file mode 100644
index 7e6cb1f87d07..000000000000
--- a/pkgs/development/libraries/dbus/systemd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 24fcc9e..98e0459 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1167,7 +1167,8 @@ else
- PKG_CHECK_MODULES(SYSTEMD,
- [libsystemd-login >= 32, libsystemd-daemon >= 32],
- have_systemd=yes,
-- have_systemd=no)
-+ have_systemd=yes)
-+ AC_MSG_NOTICE([NixOS: do not care whether we found systemd or not])
- fi
-
- if test x$have_systemd = xyes; then
diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix
index da7549aeea36..b940315aed83 100644
--- a/pkgs/development/libraries/dbxml/default.nix
+++ b/pkgs/development/libraries/dbxml/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, db62, xercesc, xqilla }:
stdenv.mkDerivation rec {
- name = "dbxml-${version}";
+ pname = "dbxml";
version = "6.1.4";
src = fetchurl {
- url = "http://download.oracle.com/berkeley-db/${name}.tar.gz";
+ url = "http://download.oracle.com/berkeley-db/${pname}-${version}.tar.gz";
sha256 = "a8fc8f5e0c3b6e42741fa4dfc3b878c982ff8f5e5f14843f6a7e20d22e64251a";
};
diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix
index 04ecadadefa0..093cc2bdf058 100644
--- a/pkgs/development/libraries/dee/default.nix
+++ b/pkgs/development/libraries/dee/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--disable-gtk-doc"
- "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
+ "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
];
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix
index 5b05d64f0727..93e5da5b792d 100644
--- a/pkgs/development/libraries/dirac/default.nix
+++ b/pkgs/development/libraries/dirac/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.0.2";
- name = "dirac-${version}";
+ pname = "dirac";
src = fetchurl {
- url = "mirror://sourceforge/dirac/${name}.tar.gz";
+ url = "mirror://sourceforge/dirac/${pname}-${version}.tar.gz";
sha256 = "1z803yzp17cj69wn11iyb13swqdd9xdzr58dsk6ghpr3ipqicsw1";
};
diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix
index d52f1b6a2cff..643e7d3cc5d7 100644
--- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix
+++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix
@@ -2,7 +2,6 @@
stdenv.mkDerivation rec {
pname = "dleyna-connector-dbus";
- name = "${pname}-${version}";
version = "0.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index 97d74e1ed3c8..dfa5509fb98e 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -6,8 +6,8 @@
}:
stdenv.mkDerivation rec {
+ pname = "dlib";
version = "19.17";
- name = "dlib-${version}";
src = fetchFromGitHub {
owner = "davisking";
diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix
index 83466b693f59..59578ef796ec 100644
--- a/pkgs/development/libraries/docopt_cpp/default.nix
+++ b/pkgs/development/libraries/docopt_cpp/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.6.2";
- name = "docopt.cpp-${version}";
+ pname = "docopt.cpp";
src = fetchFromGitHub {
owner = "docopt";
diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index 095697762ddd..bc4bc8b23524 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "double-conversion-${version}";
+ pname = "double-conversion";
version = "3.1.5";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix
index c85f6de0405c..756a03503b35 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/pkgs/development/libraries/drumstick/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "drumstick-${version}";
+ pname = "drumstick";
version = "1.1.2";
src = fetchurl {
- url = "mirror://sourceforge/drumstick/${version}/${name}.tar.bz2";
+ url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2";
sha256 = "0kljqyqj7s1i2z52i24x7ail1bywn6dcxxfbad5c59drm8wv94bp";
};
diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix
index 9be19f51e7e8..779e6b077625 100644
--- a/pkgs/development/libraries/dssi/default.nix
+++ b/pkgs/development/libraries/dssi/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "dssi-${version}";
+ pname = "dssi";
version = "1.1.1";
src = fetchurl {
- url = "mirror://sourceforge/project/dssi/dssi/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/dssi/dssi/${version}/${pname}-${version}.tar.gz";
sha256 = "0kl1hzhb7cykzkrqcqgq1dk4xcgrcxv0jja251aq4z4l783jpj7j";
};
diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix
index 832b013123dd..8d8b41e0609b 100644
--- a/pkgs/development/libraries/dxflib/default.nix
+++ b/pkgs/development/libraries/dxflib/default.nix
@@ -2,9 +2,9 @@
stdenv.mkDerivation rec {
version = "3.12.2";
- name = "dxflib-${version}";
+ pname = "dxflib";
src = fetchurl {
- url = "http://www.qcad.org/archives/dxflib/${name}.src.tar.gz";
+ url = "http://www.qcad.org/archives/dxflib/${pname}-${version}.src.tar.gz";
sha256 = "20ad9991eec6b0f7a3cc7c500c044481a32110cdc01b65efa7b20d5ff9caefa9";
};
diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix
index 704f5c51c9c9..cfc95de15552 100644
--- a/pkgs/development/libraries/dyncall/default.nix
+++ b/pkgs/development/libraries/dyncall/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
- name = "dyncall-${version}";
+stdenv.mkDerivation {
+ pname = "dyncall";
version = "1.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix
index 4ca9eab51bbe..028cd221614b 100644
--- a/pkgs/development/libraries/easyloggingpp/default.nix
+++ b/pkgs/development/libraries/easyloggingpp/default.nix
@@ -3,7 +3,7 @@
# add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc)
{ stdenv, fetchFromGitHub, cmake, gtest }:
stdenv.mkDerivation rec {
- name = "easyloggingpp-${version}";
+ pname = "easyloggingpp";
version = "9.96.7";
src = fetchFromGitHub {
owner = "muflihun";
diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 78f80d2baf42..a9a77f6a9daf 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -5,7 +5,7 @@
, enableOpenMPThreads ? false}:
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "eccodes-${version}";
+ pname = "eccodes";
version = "2.12.5";
src = fetchurl {
diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix
index 62f04e061cfa..6aaefd8a2cc6 100644
--- a/pkgs/development/libraries/eclib/default.nix
+++ b/pkgs/development/libraries/eclib/default.nix
@@ -13,7 +13,6 @@
assert withFlint -> flint != null;
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "eclib";
version = "20190226"; # upgrade might break the sage interface
# sage tests to run:
@@ -22,7 +21,7 @@ stdenv.mkDerivation rec {
# ping @timokau for more info
src = fetchFromGitHub {
owner = "JohnCremona";
- repo = "${pname}";
+ repo = pname;
rev = "v${version}";
sha256 = "1910np1xzyjzszay24xn4b81qhpsvhp5aix9vdpknplni2mq8kwb";
};
diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix
index 6dfd4edd0716..5f9c72f04afe 100644
--- a/pkgs/development/libraries/editline/default.nix
+++ b/pkgs/development/libraries/editline/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "editline-${version}";
+ pname = "editline";
version = "1.16.1";
src = fetchFromGitHub {
owner = "troglobit";
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 6aec15f976bb..63e2707917a5 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -4,7 +4,8 @@ let
version = "3.3.7";
in
stdenv.mkDerivation {
- name = "eigen-${version}";
+ pname = "eigen";
+ inherit version;
src = fetchurl {
url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix
index 710338842f8d..13617d67bf57 100644
--- a/pkgs/development/libraries/elementary-cmake-modules/default.nix
+++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig }:
-stdenv.mkDerivation rec {
- name = "elementary-cmake-modules-${version}";
+stdenv.mkDerivation {
+ pname = "elementary-cmake-modules";
version = "0.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix
index c973c2bd9449..e968e09459a0 100644
--- a/pkgs/development/libraries/embree/2.x.nix
+++ b/pkgs/development/libraries/embree/2.x.nix
@@ -2,8 +2,8 @@
openimageio, libjpeg, libpng, libpthreadstubs, libX11
}:
-stdenv.mkDerivation rec {
- name = "embree-${version}";
+stdenv.mkDerivation {
+ pname = "embree";
version = "2.17.4";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/enchant/1.x.nix b/pkgs/development/libraries/enchant/1.x.nix
index b7303468cbaf..ed91f791149d 100644
--- a/pkgs/development/libraries/enchant/1.x.nix
+++ b/pkgs/development/libraries/enchant/1.x.nix
@@ -1,12 +1,11 @@
{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
version = "1.6.1";
pname = "enchant";
src = fetchurl {
- url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${name}.tar.gz";
+ url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${pname}-${version}.tar.gz";
sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y";
};
diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index 8b559bd03c82..92e34145abde 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -1,23 +1,50 @@
-{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }:
+{ stdenv
+, fetchurl
+, aspell
+, pkgconfig
+, glib
+, hunspell
+, hspell
+, unittest-cpp
+}:
-let
- version = "2.2.3";
+stdenv.mkDerivation rec {
pname = "enchant";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ version = "2.2.5";
outputs = [ "out" "dev" ];
src = fetchurl {
- url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${name}.tar.gz";
- sha256 = "0v87p1ls0gym95qirijpclk650sjbkcjjl6ssk059zswcwaykn5b";
+ url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
+ sha256 = "0r41qjz3104h5raiwlw5ywwybafbxdjz12j1bnq3kq60jlr6d2pf";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ glib hunspell ];
- propagatedBuildInputs = [ hspell aspell ]; # libtool puts it to la file
+ nativeBuildInputs = [
+ pkgconfig
+ ];
- doCheck = false; # fails to compile with with "UnitTest++.h: No such file or directory"
+ buildInputs = [
+ glib
+ hunspell
+ ];
+
+ checkInputs = [
+ unittest-cpp
+ ];
+
+ # libtool puts these to .la files
+ propagatedBuildInputs = [
+ hspell
+ aspell
+ ];
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+
+ configureFlags = [
+ "--enable-relocatable" # needed for tests
+ ];
meta = with stdenv.lib; {
description = "Generic spell checking library";
diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index c4285eadabc0..aa7b2ee9a059 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -5,13 +5,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "epoxy-${version}";
+ pname = "epoxy";
version = "1.5.3";
src = fetchFromGitHub {
owner = "anholt";
repo = "libepoxy";
- rev = "${version}";
+ rev = version;
sha256 = "03nrmf161xyj3q9zsigr5qj5vx5dsfxxyjva73cm1mgqqc5d60px";
};
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index ec6f07f0953a..21f63e07335d 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
pname = "exiv2";
version = "0.27.2";
- src = fetchFromGitHub rec {
+ src = fetchFromGitHub {
owner = "exiv2";
repo = "exiv2";
rev = "v${version}";
diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix
index 332504e46b54..4968c38bfd33 100644
--- a/pkgs/development/libraries/exosip/default.nix
+++ b/pkgs/development/libraries/exosip/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libosip, openssl, pkgconfig, fetchpatch }:
stdenv.mkDerivation rec {
- name = "libexosip2-${version}";
+ pname = "libexosip2";
version = "4.1.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index c568a670f553..7a5afd8e8018 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -7,11 +7,11 @@ assert mp4v2Support -> (mp4v2 != null);
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "faac-${version}";
+ pname = "faac";
version = "1.29.9.2";
src = fetchurl {
- url = "mirror://sourceforge/faac/${name}.tar.gz";
+ url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz";
sha256 = "0wf781vp7rzmxkx5h0w8j2i4xc63iixxikgbvvkdljbwhffj0pyl";
};
diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix
index e7e4835d2ed3..29c0252482ea 100644
--- a/pkgs/development/libraries/faad2/default.nix
+++ b/pkgs/development/libraries/faad2/default.nix
@@ -4,11 +4,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "faad2-${version}";
+ pname = "faad2";
version = "2.8.8";
src = fetchurl {
- url = "mirror://sourceforge/faac/${name}.tar.gz";
+ url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz";
sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl";
};
diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix
index c23fc0bc59f6..a29cbb9bbd11 100644
--- a/pkgs/development/libraries/farbfeld/default.nix
+++ b/pkgs/development/libraries/farbfeld/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }:
stdenv.mkDerivation rec {
- name = "farbfeld-${version}";
+ pname = "farbfeld";
version = "4";
src = fetchgit {
diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix
index bac867978f43..75d9146c3357 100644
--- a/pkgs/development/libraries/fastjson/default.nix
+++ b/pkgs/development/libraries/fastjson/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.99.8";
- name = "fastjson-${version}";
+ pname = "fastjson";
src = fetchFromGitHub {
repo = "libfastjson";
owner = "rsyslog";
diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix
index de78647dc483..5eb7e3866ce6 100644
--- a/pkgs/development/libraries/fcgi/default.nix
+++ b/pkgs/development/libraries/fcgi/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
- name = "fcgi-${version}";
+ pname = "fcgi";
version = "2.4.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix
index 9b7cea3ebbcb..70269002e2fe 100644
--- a/pkgs/development/libraries/fdk-aac/default.nix
+++ b/pkgs/development/libraries/fdk-aac/default.nix
@@ -4,11 +4,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "fdk-aac-${version}";
+ pname = "fdk-aac";
version = "2.0.0";
src = fetchurl {
- url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz";
+ url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz";
sha256 = "0v6rbyw9f9lpfvcg3v1qyapga5hqfnb3wp3x5yaxpwcgjw7ydmpp";
};
diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix
index eae0326c832f..4a276db12c02 100644
--- a/pkgs/development/libraries/fflas-ffpack/1.nix
+++ b/pkgs/development/libraries/fflas-ffpack/1.nix
@@ -1,6 +1,5 @@
{stdenv, fetchurl, autoreconfHook, givaro_3_7, pkgconfig, openblas, gmpxx}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "fflas-ffpack";
version = "1.6.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index a67210e860cd..d46d997f6447 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -2,15 +2,14 @@
, gmpxx
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "fflas-ffpack";
- version = "2.4.0";
+ version = "2.4.3";
src = fetchFromGitHub {
owner = "linbox-team";
- repo = "${pname}";
- rev = "v${version}";
- sha256 = "1q1ala88ysz14pb5cn2kskv829nc1qif7zfzjwzhd5nnzwyivmc4";
+ repo = pname;
+ rev = version;
+ sha256 = "1ynbjd72qrwp0b4kpn0p5d7gddpvj8dlb5fwdxajr5pvkvi3if74";
};
checkInputs = [
@@ -31,14 +30,14 @@ stdenv.mkDerivation rec {
"--with-lapack-libs=-l${blas.linkName}"
] ++ stdenv.lib.optionals stdenv.isx86_64 {
# disable SIMD instructions (which are enabled *when available* by default)
- "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "haswell" = [ "--disable-fma4" ];
- "broadwell" = [ "--disable-fma4" ];
- "skylake" = [ "--disable-fma4" ];
- "skylake-avx512" = [ "--disable-fma4" ];
+ default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ haswell = [ "--disable-fma4" ];
+ broadwell = [ "--disable-fma4" ];
+ skylake = [ "--disable-fma4" ];
+ skylake-avx512 = [ "--disable-fma4" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"};
doCheck = true;
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 28ab53feebdd..45a4f48fd337 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -237,7 +237,7 @@ assert openglExtlib -> libGLU_combined != null;
assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
stdenv.mkDerivation rec {
- name = "ffmpeg-full-${version}";
+ pname = "ffmpeg-full";
version = "4.2";
src = fetchurl {
@@ -272,7 +272,7 @@ stdenv.mkDerivation rec {
* Build flags
*/
# On some ARM platforms --enable-thumb
- "--enable-shared --disable-static"
+ "--enable-shared"
(enableFeature true "pic")
(if stdenv.cc.isClang then "--cc=clang" else null)
(enableFeature smallBuild "small")
diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix
index 4607d3e2f197..f5ef8e850ddc 100644
--- a/pkgs/development/libraries/ffmpeg-sixel/default.nix
+++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
- name = "ffmpeg-sixel-${version}";
+ pname = "ffmpeg-sixel";
version = "nightly-2.3.x";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix
index 5db1e0a47cfc..bea367b2554e 100644
--- a/pkgs/development/libraries/ffmpeg/3.4.nix
+++ b/pkgs/development/libraries/ffmpeg/3.4.nix
@@ -5,7 +5,7 @@
}@args:
callPackage ./generic.nix (args // rec {
- version = "${branch}";
+ version = branch;
branch = "3.4.6";
sha256 = "1s20wzgxxrm56gckyb8cf1lh36hdnkdxvmmnnvdxvia4zb3grf1b";
darwinFrameworks = [ Cocoa CoreMedia ];
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
index 8fd2ce704982..670f51000a6b 100644
--- a/pkgs/development/libraries/ffmpeg/4.nix
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -5,7 +5,7 @@
}@args:
callPackage ./generic.nix (args // rec {
- version = "${branch}";
+ version = branch;
branch = "4.2";
sha256 = "1f3glany3p2j832a9wia5vj8ds9xpm0xxlyia91y17hy85gxwsrh";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 72929e127bcc..4c0ca0210cc8 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
-, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers
+, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d
, openglSupport ? false, libGLU_combined ? null
# Build options
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@@ -65,11 +65,11 @@ assert openglSupport -> libGLU_combined != null;
stdenv.mkDerivation rec {
- name = "ffmpeg-${version}";
+ pname = "ffmpeg";
inherit version;
src = fetchurl {
- url = "https://www.ffmpeg.org/releases/${name}.tar.bz2";
+ url = "https://www.ffmpeg.org/releases/${pname}-${version}.tar.bz2";
inherit sha256;
};
@@ -89,7 +89,6 @@ stdenv.mkDerivation rec {
"--enable-version3"
# Build flags
"--enable-shared"
- "--disable-static"
(ifMinVer "0.6" "--enable-pic")
(enableFeature runtimeCpuDetectBuild "runtime-cpudetect")
"--enable-hardcoded-tables"
@@ -145,6 +144,7 @@ stdenv.mkDerivation rec {
(ifMinVer "2.8" "--enable-libopus")
"--enable-libspeex"
(ifMinVer "2.8" "--enable-libx265")
+ (ifMinVer "4.2" (enableFeature (dav1d != null) "libdav1d"))
# Developer flags
(enableFeature debugDeveloper "debug")
(enableFeature optimizationsDeveloper "optimizations")
@@ -170,7 +170,8 @@ stdenv.mkDerivation rec {
++ optional isLinux alsaLib
++ optionals isDarwin darwinFrameworks
++ optional vdpauSupport libvdpau
- ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL);
+ ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL)
+ ++ optional (reqMin "4.2") dav1d;
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
index a1cc11fb8c1e..45238690fe03 100644
--- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix
+++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
@@ -2,7 +2,7 @@
}:
stdenv.mkDerivation rec {
- name = "ffmpegthumbnailer-${version}";
+ pname = "ffmpegthumbnailer";
version = "2.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index 1ad861fc63d8..c404a12f3dfd 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, zlib, ffmpeg, pkgconfig }:
stdenv.mkDerivation rec {
- name = "ffms-${version}";
+ pname = "ffms";
version = "2.23";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index bc5de5f9730f..c9577436c300 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -9,7 +9,7 @@ let
withDoc = stdenv.cc.isGNU;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "fftw-${precision}-${version}";
src = fetchurl {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
outputBin = "dev"; # fftw-wisdom
configureFlags =
- [ "--enable-shared" "--disable-static"
+ [ "--enable-shared"
"--enable-threads"
]
++ optional (precision != "double") "--enable-${precision}"
diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix
index 4a2bed6b4979..07f1c7ec917a 100644
--- a/pkgs/development/libraries/filter-audio/default.nix
+++ b/pkgs/development/libraries/filter-audio/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "filter-audio-${version}";
+ pname = "filter-audio";
version = "0.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix
index 504b58b6aa4d..d96ceb5d26b8 100644
--- a/pkgs/development/libraries/flatbuffers/default.nix
+++ b/pkgs/development/libraries/flatbuffers/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "flatbuffers-${version}";
+ pname = "flatbuffers";
version = "1.10.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix
index d92a0c61aab8..20a80119b136 100644
--- a/pkgs/development/libraries/flint/default.nix
+++ b/pkgs/development/libraries/flint/default.nix
@@ -12,7 +12,7 @@
assert withBlas -> openblas != null;
stdenv.mkDerivation rec {
- name = "flint-${version}";
+ pname = "flint";
version = "2.5.2"; # remove libflint.so.MAJOR patch when updating
src = fetchurl {
url = "http://www.flintlib.org/flint-${version}.tar.gz";
diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix
index 0b4172cdc764..4ac8150274cf 100644
--- a/pkgs/development/libraries/flite/default.nix
+++ b/pkgs/development/libraries/flite/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, alsaLib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "flite-2.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix
index cad4419a26cc..eebe119d142f 100644
--- a/pkgs/development/libraries/fltk/1.4.nix
+++ b/pkgs/development/libraries/fltk/1.4.nix
@@ -8,7 +8,8 @@ let
in
stdenv.mkDerivation {
- name = "fltk-${version}";
+ pname = "fltk";
+ inherit version;
src = fetchurl {
url = "http://fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz";
diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix
index bb9f8fe76c9d..a22b5eef8d2e 100644
--- a/pkgs/development/libraries/fltk/default.nix
+++ b/pkgs/development/libraries/fltk/default.nix
@@ -8,7 +8,8 @@ let
in
stdenv.mkDerivation {
- name = "fltk-${version}";
+ pname = "fltk";
+ inherit version;
src = fetchurl {
url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index 2cfc87d6a2e5..796861a30654 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "5.3.0";
- name = "fmt-${version}";
+ pname = "fmt";
src = fetchFromGitHub {
owner = "fmtlib";
repo = "fmt";
- rev = "${version}";
+ rev = version;
sha256 = "1hl9s69a5ql5nckc0ifh2fzlgsgv1wsn6yhqkpnrhasqkhj0hgv4";
};
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index a2c3d41d35d1..b072df506a99 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -2,7 +2,7 @@
, gflags, libiberty, openssl }:
stdenv.mkDerivation rec {
- name = "folly-${version}";
+ pname = "folly";
version = "2019.08.05.00";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/pkgs/development/libraries/fontconfig-ultimate/default.nix
index 9aeb12344ece..b95d6dd559d4 100644
--- a/pkgs/development/libraries/fontconfig-ultimate/default.nix
+++ b/pkgs/development/libraries/fontconfig-ultimate/default.nix
@@ -2,7 +2,8 @@
let version = "2016-04-23"; in
stdenv.mkDerivation {
- name = "fontconfig-ultimate-${version}";
+ pname = "fontconfig-ultimate";
+ inherit version;
src = fetchFromGitHub {
sha256 = "1rd2n60l8bamx84q3l91pd9a0wz9h7p6ajvx1dw22qn8rah4h498";
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index f730e3e3408f..5c9a0ecc71b7 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -17,11 +17,11 @@ let
configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations
in
stdenv.mkDerivation rec {
- name = "fontconfig-${version}";
+ pname = "fontconfig";
version = "2.12.6";
src = fetchurl {
- url = "http://fontconfig.org/release/${name}.tar.bz2";
+ url = "http://fontconfig.org/release/${pname}-${version}.tar.bz2";
sha256 = "05zh65zni11kgnhg726gjbrd55swspdvhqbcnj5a5xh8gn03036g";
};
@@ -30,6 +30,9 @@ stdenv.mkDerivation rec {
src = ./config-compat.patch;
inherit configVersion;
})
+
+ # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/67
+ ./fix-joypixels.patch
];
outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
diff --git a/pkgs/development/libraries/fontconfig/fix-joypixels.patch b/pkgs/development/libraries/fontconfig/fix-joypixels.patch
new file mode 100644
index 000000000000..d5654063fe89
--- /dev/null
+++ b/pkgs/development/libraries/fontconfig/fix-joypixels.patch
@@ -0,0 +1,23 @@
+--- a/conf.d/45-generic.conf
++++ b/conf.d/45-generic.conf
+@@ -5,6 +5,10 @@
+
+
+
++
++ JoyPixels
++ emoji
++
+
+ Emoji Two
+ emoji
+--- a/conf.d/60-generic.conf
++++ b/conf.d/60-generic.conf
+@@ -29,6 +29,7 @@
+
+ emoji
+
++ JoyPixels
+ Emoji Two
+ Emoji One
+
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
index 2ee0af8cfc13..5b98d6523b9a 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@@ -1,7 +1,7 @@
{ runCommand, lib, fontconfig, fontDirectories }:
runCommand "fc-cache"
- rec {
+ {
buildInputs = [ fontconfig.bin ];
preferLocalBuild = true;
allowSubstitutes = false;
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index 40430f34334c..fa4a8c23e2fb 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@@ -2,11 +2,11 @@
, CoreServices ? null }:
stdenv.mkDerivation rec {
- name = "fox-${version}";
+ pname = "fox";
version = "1.7.9";
src = fetchurl {
- url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
+ url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz";
sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg";
};
diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
index 4f1e0eaee7fb..af387b7232f4 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -7,10 +7,11 @@ let
in
stdenv.mkDerivation rec {
- name = "fox-${version}";
+ pname = "fox";
+ inherit version;
src = fetchurl {
- url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
+ url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz";
sha256 = "08w98m6wjadraw1pi13igzagly4b2nfa57kdqdnkjfhgkvg1bvv5";
};
diff --git a/pkgs/development/libraries/fplll/20160331.nix b/pkgs/development/libraries/fplll/20160331.nix
index 952ecb0eadeb..aabbfd14a78b 100644
--- a/pkgs/development/libraries/fplll/20160331.nix
+++ b/pkgs/development/libraries/fplll/20160331.nix
@@ -2,12 +2,11 @@
, gmp, mpfr
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "fplll";
version = "20160331";
src = fetchFromGitHub {
- owner = "${pname}";
- repo = "${pname}";
+ owner = pname;
+ repo = pname;
rev = "11dea26c2f9396ffb7a7191aa371343f1f74c5c3";
sha256 = "1clxch9hbr30w6s84m2mprxv58adhg5qw6sa2p3jr1cy4r7r59ib";
};
diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
index 063217a45047..a70e9934520a 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -2,13 +2,12 @@
, gmp, mpfr
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "fplll";
version = "5.2.1";
src = fetchFromGitHub {
- owner = "${pname}";
- repo = "${pname}";
- rev = "${version}";
+ owner = pname;
+ repo = pname;
+ rev = version;
sha256 = "015qmrd7nfaysbv1hbwiprz9g6hnww1y1z1xw8f43ysb7k1b5nbg";
};
nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook];
diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix
index e15626a160e2..feccfd1bfd2b 100644
--- a/pkgs/development/libraries/frame/default.nix
+++ b/pkgs/development/libraries/frame/default.nix
@@ -2,10 +2,10 @@
, stdenv, fetchurl, pkgconfig, xorg }:
stdenv.mkDerivation rec {
- name = "frame-${version}";
+ pname = "frame";
version = "2.5.0";
src = fetchurl {
- url = "https://launchpad.net/frame/trunk/v${version}/+download/${name}.tar.xz";
+ url = "https://launchpad.net/frame/trunk/v${version}/+download/${pname}-${version}.tar.xz";
sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a";
};
diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix
index c34d9591d386..8412248b6170 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -2,7 +2,8 @@
let version = "3.0.0";
in stdenv.mkDerivation {
- name = "freeglut-${version}";
+ pname = "freeglut";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz";
diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix
index b2c66ad346d0..188543bf7bf7 100644
--- a/pkgs/development/libraries/freeimage/default.nix
+++ b/pkgs/development/libraries/freeimage/default.nix
@@ -1,65 +1,46 @@
-{ stdenv, fetchurl, unzip, darwin }:
+{ lib, stdenv, fetchurl, unzip, darwin }:
stdenv.mkDerivation {
- name = "freeimage-3.17.0";
+ name = "freeimage-3.18.0";
src = fetchurl {
- url = mirror://sourceforge/freeimage/FreeImage3170.zip;
- sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v";
+ url = mirror://sourceforge/freeimage/FreeImage3180.zip;
+ sha256 = "1z9qwi9mlq69d5jipr3v2jika2g0kszqdzilggm99nls5xl7j4zl";
};
- patches = let
- patchURL = https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches;
- in [
- (fetchurl {
- url = patchURL + "/Fix-CVE-2015-0852.patch";
- sha256 = "1vxdck4i5qi5j6i3cjja0gfy79mmbf0lq2qdrnqdsl4kclbvw2c8";
- })
- (fetchurl {
- url = patchURL + "/Fix-CVE-2016-5684.patch";
- sha256 = "14ffgqbnwg28r6sjvm3z89zbnnm9ghbc81hdhrzxlyk3vwvd6cw3";
- })
- (fetchurl {
- url = https://raw.githubusercontent.com/buildroot/buildroot/2018.05/package/libfreeimage/0005-Manage-powf64-with-glibc.patch;
- sha256 = "1lis479ad5cfkhqm044nk4x97wfwm3hry3bvij1w5xkndnlfppc2";
- })
- ];
+ patches = lib.optional stdenv.isDarwin ./dylib.patch;
- buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
+ buildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin darwin.cctools;
- prePatch = if stdenv.isDarwin
- then ''
- sed -e 's/gcc-4.0/clang/g' \
- -e 's/g++-4.0/clang++/g' \
- -e 's/COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS/COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__/' \
+ prePatch = if stdenv.isDarwin then ''
+ sed -e 's/$(shell xcrun -find clang)/clang/g' \
+ -e 's/$(shell xcrun -find clang++)/clang++/g' \
-e "s|PREFIX = /usr/local|PREFIX = $out|" \
- -e 's|-Wl,-syslibroot /Developer/SDKs/MacOSX10.5.sdk||g' \
- -e 's|-Wl,-syslibroot /Developer/SDKs/MacOSX10.6.sdk||g' \
- -e 's|-isysroot /Developer/SDKs/MacOSX10.6.sdk||g' \
- -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||g' \
- -e 's| $(STATICLIB)-ppc $(STATICLIB)-i386||g' \
- -e 's| $(SHAREDLIB)-ppc $(SHAREDLIB)-i386||g' \
+ -e 's|-Wl,-syslibroot $(MACOSX_SYSROOT)||g' \
+ -e 's|-isysroot $(MACOSX_SYSROOT)||g' \
-e 's| install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR)||' \
-e 's| -m 644 -o root -g wheel||g' \
-i ./Makefile.osx
# Fix LibJXR performance timers
sed 's|^SRCS = \(.*\)$|SRCS = \1 Source/LibJXR/image/sys/perfTimerANSI.c|' -i ./Makefile.srcs
- ''
- else ''
+ '' else ''
sed -e s@/usr/@$out/@ \
-e 's@-o root -g root@@' \
-e 's@ldconfig@echo not running ldconfig@' \
-i Makefile.gnu Makefile.fip
- # Fix gcc 5.1 macro problems
- # https://chromium.googlesource.com/webm/libwebp/+/eebaf97f5a1cb713d81d311308d8a48c124e5aef%5E!/
- sed -i -e 's/"\(#[^"]*\)"/" \1 "/g' Source/LibWebP/src/dsp/*
'';
- postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip";
- preInstall = "mkdir -p $out/include $out/lib";
- postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip install";
+ postBuild = lib.optionalString (!stdenv.isDarwin) ''
+ make -f Makefile.fip
+ '';
- NIX_CFLAGS_COMPILE = "-Wno-narrowing";
+ preInstall = ''
+ mkdir -p $out/include $out/lib
+ '';
+
+ postInstall = lib.optionalString (!stdenv.isDarwin) ''
+ make -f Makefile.fip install
+ '';
enableParallelBuilding = true;
@@ -67,7 +48,7 @@ stdenv.mkDerivation {
description = "Open Source library for accessing popular graphics image file formats";
homepage = http://freeimage.sourceforge.net/;
license = "GPL";
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; unix;
+ maintainers = with lib.maintainers; [viric];
+ platforms = with lib.platforms; unix;
};
}
diff --git a/pkgs/development/libraries/freeimage/dylib.patch b/pkgs/development/libraries/freeimage/dylib.patch
new file mode 100644
index 000000000000..0d8188aca707
--- /dev/null
+++ b/pkgs/development/libraries/freeimage/dylib.patch
@@ -0,0 +1,16 @@
+--- a/Makefile.osx
++++ b/Makefile.osx
+@@ -60,1 +60,1 @@
+-FreeImage: $(STATICLIB)
++FreeImage: $(STATICLIB) $(SHAREDLIB)
+@@ -87,7 +87,7 @@
+-$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64
+- $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB)
++#$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64
++# $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB)
+
+ $(SHAREDLIB)-i386: $(MODULES_I386)
+ $(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386)
+
+-$(SHAREDLIB)-x86_64: $(MODULES_X86_64)
++$(SHAREDLIB): $(MODULES_X86_64)
diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
index 3771880d3608..41480789a08a 100644
--- a/pkgs/development/libraries/freenect/default.nix
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "freenect-${version}";
+ pname = "freenect";
version = "0.5.7";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index ee63ce2f2f9e..0ff9cea3d27c 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -7,11 +7,11 @@ assert odbcSupport -> unixODBC != null;
# Work is in progress to move to cmake so revisit that later
stdenv.mkDerivation rec {
- name = "freetds-${version}";
+ pname = "freetds";
version = "1.1.6";
src = fetchurl {
- url = "https://www.freetds.org/files/stable/${name}.tar.bz2";
+ url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
sha256 = "18rry59npbhxpzjb0l3ib7zlnlzj43srb5adcm65wyklklsh0gn2";
};
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index eb26a241d1cd..6eaf1bbcc2f4 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" "--enable-freetype-config" ];
+ configureFlags = [ "--bindir=$(dev)/bin" "--enable-freetype-config" ];
# native compiler to generate building tool
CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc";
diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix
index cdeddd82b71d..560855c908b1 100644
--- a/pkgs/development/libraries/frei0r/default.nix
+++ b/pkgs/development/libraries/frei0r/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoconf, cairo, opencv, pkgconfig }:
stdenv.mkDerivation rec {
- name = "frei0r-plugins-${version}";
+ pname = "frei0r-plugins";
version = "1.6.1";
src = fetchurl {
- url = "https://files.dyne.org/frei0r/releases/${name}.tar.gz";
+ url = "https://files.dyne.org/frei0r/releases/${pname}-${version}.tar.gz";
sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0";
};
diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index b60f4be245e2..9798347eaddf 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -1,7 +1,6 @@
{ stdenv
, fetchurl
, fetchpatch
-
, meson
, ninja
, pkgconfig
@@ -10,7 +9,6 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "fribidi";
version = "1.0.5";
@@ -18,7 +16,7 @@ stdenv.mkDerivation rec {
# NOTE: 2018-06-06 v1.0.5: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
src = fetchurl {
- url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2";
+ url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a";
};
@@ -33,10 +31,11 @@ stdenv.mkDerivation rec {
patchShebangs test
'';
- nativeBuildInputs = [ meson ninja pkgconfig ];
- buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+ nativeBuildInputs = [ meson ninja pkgconfig ]
+ ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
- checkInptus = [ python3 ];
+ doCheck = true;
+ checkInputs = [ python3 ];
meta = with stdenv.lib; {
homepage = https://github.com/fribidi/fribidi;
diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix
index 68f3c9d0ee59..5e8197d5e81a 100644
--- a/pkgs/development/libraries/fstrcmp/default.nix
+++ b/pkgs/development/libraries/fstrcmp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, libtool, ghostscript, groff }:
stdenv.mkDerivation rec {
- name = "fstrcmp-${version}";
+ pname = "fstrcmp";
version = "0.7";
src = fetchzip {
diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix
index 3fcf218d6b56..380f64cf523f 100644
--- a/pkgs/development/libraries/fstrm/default.nix
+++ b/pkgs/development/libraries/fstrm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, openssl }:
stdenv.mkDerivation rec {
- name = "fstrm-${version}";
+ pname = "fstrm";
version = "0.5.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix
index 100c00eea497..04903cc5e9ee 100644
--- a/pkgs/development/libraries/funambol/default.nix
+++ b/pkgs/development/libraries/funambol/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "funambol-client-cpp-9.0.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix
index 909c504870f0..21975766e74e 100644
--- a/pkgs/development/libraries/g2o/default.nix
+++ b/pkgs/development/libraries/g2o/default.nix
@@ -25,14 +25,14 @@ stdenv.mkDerivation rec {
"-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer"
"-DG2O_BUILD_EXAMPLES=OFF"
] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ {
- "default" = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ];
- "westmere" = [ "-DDISABLE_SSE4_A=ON" ];
- "sandybridge" = [ "-DDISABLE_SSE4_A=ON" ];
- "ivybridge" = [ "-DDISABLE_SSE4_A=ON" ];
- "haswell" = [ "-DDISABLE_SSE4_A=ON" ];
- "broadwell" = [ "-DDISABLE_SSE4_A=ON" ];
- "skylake" = [ "-DDISABLE_SSE4_A=ON" ];
- "skylake-avx512" = [ "-DDISABLE_SSE4_A=ON" ];
+ default = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ];
+ westmere = [ "-DDISABLE_SSE4_A=ON" ];
+ sandybridge = [ "-DDISABLE_SSE4_A=ON" ];
+ ivybridge = [ "-DDISABLE_SSE4_A=ON" ];
+ haswell = [ "-DDISABLE_SSE4_A=ON" ];
+ broadwell = [ "-DDISABLE_SSE4_A=ON" ];
+ skylake = [ "-DDISABLE_SSE4_A=ON" ];
+ skylake-avx512 = [ "-DDISABLE_SSE4_A=ON" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"});
postInstall = ''
diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix
index 7e35ed2e5309..a990da4b010e 100644
--- a/pkgs/development/libraries/gbenchmark/default.nix
+++ b/pkgs/development/libraries/gbenchmark/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, gtest }:
stdenv.mkDerivation rec {
- name = "gbenchmark-${version}";
+ pname = "gbenchmark";
version = "1.5.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix
index 4762d1fb119f..2589b6cfa16b 100644
--- a/pkgs/development/libraries/gcc/libstdc++/5.nix
+++ b/pkgs/development/libraries/gcc/libstdc++/5.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch, flex, bison, file }:
stdenv.mkDerivation rec {
- name = "libstdc++5-${version}";
+ pname = "libstdc++5";
version = "3.3.6";
src = [
diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix
index 5ceded0546c5..6f57d735980d 100644
--- a/pkgs/development/libraries/gd/default.nix
+++ b/pkgs/development/libraries/gd/default.nix
@@ -11,11 +11,11 @@
}:
stdenv.mkDerivation rec {
- name = "gd-${version}";
+ pname = "gd";
version = "2.2.5";
src = fetchurl {
- url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz";
+ url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz";
sha256 = "0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c";
};
diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix
index 14113d8b87eb..baf847d4e0a2 100644
--- a/pkgs/development/libraries/gdal/2.4.0.nix
+++ b/pkgs/development/libraries/gdal/2.4.0.nix
@@ -8,11 +8,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "gdal-${version}";
+ pname = "gdal";
version = "2.4.0";
src = fetchurl {
- url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz";
+ url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz";
sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3";
};
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 0db16e2efe3a..413d4e19dde7 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -8,7 +8,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "gdal-${version}";
+ pname = "gdal";
version = "3.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix
index 40308a957915..a65740534146 100644
--- a/pkgs/development/libraries/gdal/gdal-1_11.nix
+++ b/pkgs/development/libraries/gdal/gdal-1_11.nix
@@ -3,11 +3,11 @@
, libpng }:
stdenv.mkDerivation rec {
- name = "gdal-${version}";
+ pname = "gdal";
version = "1.11.5";
src = fetchurl {
- url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz";
+ url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz";
sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl";
};
diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix
index a9b79dac7b88..1a3447f6674f 100644
--- a/pkgs/development/libraries/gdata-sharp/default.nix
+++ b/pkgs/development/libraries/gdata-sharp/default.nix
@@ -2,8 +2,8 @@
let
newtonsoft-json = dotnetPackages.NewtonsoftJson;
-in stdenv.mkDerivation rec {
- name = "gdata-sharp-${version}";
+in stdenv.mkDerivation {
+ pname = "gdata-sharp";
version = "2.2.0.0";
src = fetchsvn {
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index fa99dbe1d9fa..29a30a1b157d 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "3.0.1";
- name = "gdcm-${version}";
+ pname = "gdcm";
src = fetchurl {
- url = "mirror://sourceforge/gdcm/${name}.tar.bz2";
+ url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2";
sha256 = "1n206rr28f9ysd5yns6hc6vxwhwj1ck59p2j1wqyclm60zr84isq";
};
diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix
index 32e1163e0f07..0d96b9b5a924 100644
--- a/pkgs/development/libraries/gecode/3.nix
+++ b/pkgs/development/libraries/gecode/3.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, bash, perl }:
stdenv.mkDerivation rec {
- name = "gecode-${version}";
+ pname = "gecode";
version = "3.7.3";
src = fetchurl {
- url = "http://www.gecode.org/download/${name}.tar.gz";
+ url = "http://www.gecode.org/download/${pname}-${version}.tar.gz";
sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77";
};
diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix
index 9a6b5d9cf273..454e811447a1 100644
--- a/pkgs/development/libraries/gecode/default.nix
+++ b/pkgs/development/libraries/gecode/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }:
stdenv.mkDerivation rec {
- name = "gecode-${version}";
+ pname = "gecode";
version = "6.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 4b9f67b7aaf8..97b9ba087e28 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -21,11 +21,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "geis-${version}";
+ pname = "geis";
version = "2.2.17";
src = fetchurl {
- url = "https://launchpad.net/geis/trunk/${version}/+download/${name}.tar.xz";
+ url = "https://launchpad.net/geis/trunk/${version}/+download/${pname}-${version}.tar.xz";
sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a";
};
diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix
index 22e7d216e6cd..0e0477cd24da 100644
--- a/pkgs/development/libraries/getdata/default.nix
+++ b/pkgs/development/libraries/getdata/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, libtool }:
stdenv.mkDerivation rec {
- name = "getdata-${version}";
+ pname = "getdata";
version = "0.10.0";
src = fetchurl {
- url = "mirror://sourceforge/getdata/${name}.tar.xz";
+ url = "mirror://sourceforge/getdata/${pname}-${version}.tar.xz";
sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym";
};
diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix
index 0493071ee228..721245ceb6d7 100644
--- a/pkgs/development/libraries/getdns/default.nix
+++ b/pkgs/development/libraries/getdns/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "getdns";
- name = "${pname}-${version}";
- version = "1.5.1";
+ version = "1.5.2";
+ versionRewrite = builtins.splitVersion version;
src = fetchurl {
- url = "https://getdnsapi.net/releases/${pname}-1-5-1/${pname}-${version}.tar.gz";
- sha256 = "5686e61100599c309ce03535f9899a5a3d94a82cc08d10718e2cd73ad3dc28af";
+ url = "https://getdnsapi.net/releases/${pname}-${builtins.concatStringsSep "-" versionRewrite}/${pname}-${version}.tar.gz";
+ sha256 = "1h4l0sbkpiahpx2pd5lby10yi22mdxgx5xf1y80r77pa46iac9hq";
};
nativeBuildInputs = [ libtool m4 autoreconfHook automake file ];
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 6eb8bae435be..9547c6c31ada 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -2,11 +2,11 @@
let allowBisonDependency = !stdenv.isDarwin; in
stdenv.mkDerivation rec {
- name = "gettext-${version}";
+ pname = "gettext";
version = "0.19.8.1";
src = fetchurl {
- url = "mirror://gnu/gettext/${name}.tar.gz";
+ url = "mirror://gnu/gettext/${pname}-${version}.tar.gz";
sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z";
};
patches = [
diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix
index a00e07376c7b..b1a2524065a5 100644
--- a/pkgs/development/libraries/gf2x/default.nix
+++ b/pkgs/development/libraries/gf2x/default.nix
@@ -4,7 +4,7 @@
, optimize ? false # impure hardware optimizations
}:
stdenv.mkDerivation rec {
- name = "gf2x-${version}";
+ pname = "gf2x";
version = "1.2"; # remember to also update the url
src = fetchurl {
diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix
index b0a115eb4a51..affd57c06bc1 100644
--- a/pkgs/development/libraries/gio-sharp/default.nix
+++ b/pkgs/development/libraries/gio-sharp/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp-2_0 }:
stdenv.mkDerivation rec {
- name = "gio-sharp-${version}";
+ pname = "gio-sharp";
version = "0.3";
src = fetchFromGitHub {
owner = "mono";
repo = "gio-sharp";
- rev = "${version}";
+ rev = version;
sha256 = "13pc529pjabj7lq23dbndc26ssmg5wkhc7lfvwapm87j711m0zig";
};
diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix
index 3101bc64333e..debddc6723fb 100644
--- a/pkgs/development/libraries/givaro/3.7.nix
+++ b/pkgs/development/libraries/givaro/3.7.nix
@@ -1,6 +1,5 @@
{stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "givaro";
version = "3.7.2";
src = fetchurl {
diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix
index d73a448f1662..efed0926bb32 100644
--- a/pkgs/development/libraries/givaro/3.nix
+++ b/pkgs/development/libraries/givaro/3.nix
@@ -1,6 +1,5 @@
{stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "givaro";
version = "3.8.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix
index 1a97150aa48c..6011dd03a46c 100644
--- a/pkgs/development/libraries/givaro/default.nix
+++ b/pkgs/development/libraries/givaro/default.nix
@@ -1,11 +1,10 @@
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "givaro";
version = "4.1.1";
src = fetchFromGitHub {
owner = "linbox-team";
- repo = "${pname}";
+ repo = pname;
rev = "v${version}";
sha256 = "11wz57q6ijsvfs5r82masxgr319as92syi78lnl9lgdblpc6xigk";
};
@@ -19,14 +18,14 @@ stdenv.mkDerivation rec {
"--disable-optimization"
] ++ stdenv.lib.optionals stdenv.isx86_64 {
# disable SIMD instructions (which are enabled *when available* by default)
- "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "haswell" = [ "--disable-fma4" ];
- "broadwell" = [ "--disable-fma4" ];
- "skylake" = [ "--disable-fma4" ];
- "skylake-avx512" = [ "--disable-fma4" ];
+ default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ haswell = [ "--disable-fma4" ];
+ broadwell = [ "--disable-fma4" ];
+ skylake = [ "--disable-fma4" ];
+ skylake-avx512 = [ "--disable-fma4" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"};
# On darwin, tests are linked to dylib in the nix store, so we need to make
diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix
index aadc6986f5ad..8b522c6e92b0 100644
--- a/pkgs/development/libraries/gl2ps/default.nix
+++ b/pkgs/development/libraries/gl2ps/default.nix
@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
version = "1.4.0";
- name = "gl2ps-${version}";
+ pname = "gl2ps";
src = fetchurl {
- url = "http://geuz.org/gl2ps/src/${name}.tgz";
+ url = "http://geuz.org/gl2ps/src/${pname}-${version}.tgz";
sha256 = "1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3";
};
diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix
index d12b8a7c11d0..6498419bc27d 100644
--- a/pkgs/development/libraries/glbinding/default.nix
+++ b/pkgs/development/libraries/glbinding/default.nix
@@ -1,6 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "glbinding";
version = "3.1.0";
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index 6944d5b9292c..6532d6f81b54 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
version = "3.2.1";
- name = "glfw-${version}";
+ pname = "glfw";
src = fetchFromGitHub {
owner = "glfw";
repo = "GLFW";
- rev = "${version}";
+ rev = version;
sha256 = "0gq6ad38b3azk0w2yy298yz2vmg2jmf9g0ydidqbmiswpk25ills";
};
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 4f853e9821ff..ae386f46bffc 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -1,21 +1,40 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gettext, python3, gnutls, p11-kit, libproxy, gnome3
-, gsettings-desktop-schemas }:
+{ stdenv
+, fetchurl
+, substituteAll
+, meson
+, ninja
+, nixosTests
+, pkgconfig
+, glib
+, gettext
+, makeWrapper
+, python3
+, gnutls
+, p11-kit
+, libproxy
+, gnome3
+, gsettings-desktop-schemas
+}:
-let
+stdenv.mkDerivation rec {
pname = "glib-networking";
version = "2.60.3";
-in
-stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+
+ outputs = [ "out" "installedTests" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1mfw44qpmwvz6yzj8c6spx6z357wrmkk15byrkc5byagd82860fm";
};
- outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
+ patches = [
+ (substituteAll {
+ src = ./hardcode-gsettings.patch;
+ gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas;
+ })
- PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "${placeholder "out"}/lib/gio/modules";
+ ./installed-tests-path.patch
+ ];
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
@@ -23,27 +42,52 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
- meson ninja pkgconfig gettext
- python3 # install_script
+ meson
+ ninja
+ pkgconfig
+ gettext
+ makeWrapper
+ python3 # for install_script
];
- propagatedBuildInputs = [ glib gnutls p11-kit libproxy gsettings-desktop-schemas ];
- mesonFlags = [
- # Default auto detection doesn't work
- "-Dgnutls=enabled"
+ buildInputs = [
+ glib
+ gnutls
+ p11-kit
+ libproxy
+ gsettings-desktop-schemas
];
doCheck = false; # tests need to access the certificates (among other things)
+ mesonFlags = [
+ "-Dinstalled_tests=true"
+ "-Dinstalled_test_prefix=${placeholder "installedTests"}"
+ ];
+
+ postFixup = ''
+ find "$installedTests/libexec" "$out/libexec" -type f -executable -print0 \
+ | while IFS= read -r -d "" file; do
+ echo "Wrapping program '$file'"
+ wrapProgram "$file" --prefix GIO_EXTRA_MODULES : "$out/lib/gio/modules"
+ done
+ '';
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
+
+ tests = {
+ installedTests = nixosTests.glib-networking;
+ };
};
meta = with stdenv.lib; {
description = "Network-related giomodules for glib";
- license = licenses.lgpl2Plus;
+ homepage = https://gitlab.gnome.org/GNOME/glib-networking;
+ license = licenses.lgpl21Plus;
+ maintainers = gnome3.maintainers;
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/glib-networking/hardcode-gsettings.patch b/pkgs/development/libraries/glib-networking/hardcode-gsettings.patch
new file mode 100644
index 000000000000..0a091b2344dc
--- /dev/null
+++ b/pkgs/development/libraries/glib-networking/hardcode-gsettings.patch
@@ -0,0 +1,341 @@
+diff --git a/proxy/gnome/gproxyresolvergnome.c b/proxy/gnome/gproxyresolvergnome.c
+index 50b63cd..4364116 100644
+--- a/proxy/gnome/gproxyresolvergnome.c
++++ b/proxy/gnome/gproxyresolvergnome.c
+@@ -156,23 +156,79 @@
+
+ resolver->base_resolver = g_simple_proxy_resolver_new (NULL, NULL);
+
+- resolver->proxy_settings = g_settings_new (GNOME_PROXY_SETTINGS_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA,
++ FALSE);
++ resolver->proxy_settings = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_signal_connect (resolver->proxy_settings, "changed",
+ G_CALLBACK (gsettings_changed), resolver);
+- resolver->http_settings = g_settings_get_child (resolver->proxy_settings,
+- GNOME_PROXY_HTTP_CHILD_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_HTTP_CHILD_SCHEMA,
++ FALSE);
++ resolver->http_settings = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_signal_connect (resolver->http_settings, "changed",
+ G_CALLBACK (gsettings_changed), resolver);
+- resolver->https_settings = g_settings_get_child (resolver->proxy_settings,
+- GNOME_PROXY_HTTPS_CHILD_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_HTTPS_CHILD_SCHEMA,
++ FALSE);
++ resolver->https_settings = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_signal_connect (resolver->https_settings, "changed",
+ G_CALLBACK (gsettings_changed), resolver);
+- resolver->ftp_settings = g_settings_get_child (resolver->proxy_settings,
+- GNOME_PROXY_FTP_CHILD_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_FTP_CHILD_SCHEMA,
++ FALSE);
++ resolver->ftp_settings = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_signal_connect (resolver->ftp_settings, "changed",
+ G_CALLBACK (gsettings_changed), resolver);
+- resolver->socks_settings = g_settings_get_child (resolver->proxy_settings,
+- GNOME_PROXY_SOCKS_CHILD_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_SOCKS_CHILD_SCHEMA,
++ FALSE);
++ resolver->socks_settings = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_signal_connect (resolver->socks_settings, "changed",
+ G_CALLBACK (gsettings_changed), resolver);
+
+diff --git a/proxy/tests/gnome.c b/proxy/tests/gnome.c
+index f76b094..54751e3 100644
+--- a/proxy/tests/gnome.c
++++ b/proxy/tests/gnome.c
+@@ -55,26 +55,86 @@
+ {
+ GSettings *settings, *child;
+
+- settings = g_settings_new (GNOME_PROXY_SETTINGS_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA,
++ FALSE);
++ settings = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_settings_reset (settings, GNOME_PROXY_MODE_KEY);
+ g_settings_reset (settings, GNOME_PROXY_USE_SAME_PROXY_KEY);
+
+- child = g_settings_get_child (settings, GNOME_PROXY_HTTP_CHILD_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_HTTP_CHILD_SCHEMA,
++ FALSE);
++ child = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_settings_reset (child, GNOME_PROXY_HTTP_HOST_KEY);
+ g_settings_reset (child, GNOME_PROXY_HTTP_PORT_KEY);
+ g_object_unref (child);
+
+- child = g_settings_get_child (settings, GNOME_PROXY_HTTPS_CHILD_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_HTTPS_CHILD_SCHEMA,
++ FALSE);
++ child = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_settings_reset (child, GNOME_PROXY_HTTPS_HOST_KEY);
+ g_settings_reset (child, GNOME_PROXY_HTTPS_PORT_KEY);
+ g_object_unref (child);
+
+- child = g_settings_get_child (settings, GNOME_PROXY_FTP_CHILD_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_FTP_CHILD_SCHEMA,
++ FALSE);
++ child = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_settings_reset (child, GNOME_PROXY_FTP_HOST_KEY);
+ g_settings_reset (child, GNOME_PROXY_FTP_PORT_KEY);
+ g_object_unref (child);
+
+- child = g_settings_get_child (settings, GNOME_PROXY_SOCKS_CHILD_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_SOCKS_CHILD_SCHEMA,
++ FALSE);
++ child = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_settings_reset (child, GNOME_PROXY_SOCKS_HOST_KEY);
+ g_settings_reset (child, GNOME_PROXY_SOCKS_PORT_KEY);
+ g_object_unref (child);
+@@ -88,21 +148,69 @@
+ {
+ GSettings *settings, *child;
+
+- settings = g_settings_new (GNOME_PROXY_SETTINGS_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA,
++ FALSE);
++ settings = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_settings_set_enum (settings, GNOME_PROXY_MODE_KEY, G_DESKTOP_PROXY_MODE_MANUAL);
+ g_settings_set_boolean (settings, GNOME_PROXY_USE_SAME_PROXY_KEY, TRUE);
+
+- child = g_settings_get_child (settings, GNOME_PROXY_HTTP_CHILD_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_HTTP_CHILD_SCHEMA,
++ FALSE);
++ child = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_settings_set_string (child, GNOME_PROXY_HTTP_HOST_KEY, "proxy.example.com");
+ g_settings_set_int (child, GNOME_PROXY_HTTP_PORT_KEY, 8080);
+ g_object_unref (child);
+
+- child = g_settings_get_child (settings, GNOME_PROXY_HTTPS_CHILD_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_HTTPS_CHILD_SCHEMA,
++ FALSE);
++ child = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_settings_set_string (child, GNOME_PROXY_HTTPS_HOST_KEY, "proxy-s.example.com");
+ g_settings_set_int (child, GNOME_PROXY_HTTPS_PORT_KEY, 7070);
+ g_object_unref (child);
+
+- child = g_settings_get_child (settings, GNOME_PROXY_FTP_CHILD_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_FTP_CHILD_SCHEMA,
++ FALSE);
++ child = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_settings_set_string (child, GNOME_PROXY_FTP_HOST_KEY, "proxy-f.example.com");
+ g_settings_set_int (child, GNOME_PROXY_FTP_PORT_KEY, 6060);
+ g_object_unref (child);
+@@ -119,12 +227,36 @@
+ GSettings *settings, *child;
+ const gchar *ignore_hosts[2] = { "127.0.0.1", NULL };
+
+- settings = g_settings_new (GNOME_PROXY_SETTINGS_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA,
++ FALSE);
++ settings = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_settings_set_enum (settings, GNOME_PROXY_MODE_KEY, G_DESKTOP_PROXY_MODE_MANUAL);
+ g_settings_set (settings, GNOME_PROXY_IGNORE_HOSTS_KEY,
+ "@as", g_variant_new_strv (ignore_hosts, -1));
+
+- child = g_settings_get_child (settings, GNOME_PROXY_SOCKS_CHILD_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_SOCKS_CHILD_SCHEMA,
++ FALSE);
++ child = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_settings_set_string (child, GNOME_PROXY_SOCKS_HOST_KEY, "proxy.example.com");
+ g_settings_set_int (child, GNOME_PROXY_SOCKS_PORT_KEY, 1234);
+ g_object_unref (child);
+@@ -139,12 +271,36 @@
+ {
+ GSettings *settings, *http;
+
+- settings = g_settings_new (GNOME_PROXY_SETTINGS_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA,
++ FALSE);
++ settings = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_settings_set_enum (settings, GNOME_PROXY_MODE_KEY, G_DESKTOP_PROXY_MODE_MANUAL);
+ g_settings_set (settings, GNOME_PROXY_IGNORE_HOSTS_KEY,
+ "@as", g_variant_new_strv (ignore_hosts, n_ignore_hosts));
+
+- http = g_settings_get_child (settings, GNOME_PROXY_HTTP_CHILD_SCHEMA);
++ {
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *schema;
++ schema_source = g_settings_schema_source_new_from_directory("@gds_gsettings_path@",
++ g_settings_schema_source_get_default(),
++ TRUE, NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ GNOME_PROXY_SETTINGS_SCHEMA "." GNOME_PROXY_HTTP_CHILD_SCHEMA,
++ FALSE);
++ http = g_settings_new_full(schema, NULL, NULL);
++ g_settings_schema_source_unref(schema_source);
++ g_settings_schema_unref(schema);
++ }
+ g_settings_set_string (http, GNOME_PROXY_HTTP_HOST_KEY, "localhost");
+ g_settings_set_int (http, GNOME_PROXY_HTTP_PORT_KEY, 8080);
+
diff --git a/pkgs/development/libraries/glib-networking/installed-tests-path.patch b/pkgs/development/libraries/glib-networking/installed-tests-path.patch
new file mode 100644
index 000000000000..942ca053dd4f
--- /dev/null
+++ b/pkgs/development/libraries/glib-networking/installed-tests-path.patch
@@ -0,0 +1,25 @@
+diff --git a/meson.build b/meson.build
+index 4d91677..aaaeb2b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -12,8 +12,8 @@
+ libexecdir = join_paths(prefix, get_option('libexecdir'))
+ localedir = join_paths(prefix, get_option('localedir'))
+
+-installed_tests_metadir = join_paths(datadir, 'installed-tests', meson.project_name())
+-installed_tests_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name())
++installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
++installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
+
+ cc = meson.get_compiler('c')
+ host_system = host_machine.system()
+diff --git a/meson_options.txt b/meson_options.txt
+index 3a525dd..fc86302 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -3,4 +3,5 @@
+ option('libproxy', type: 'feature', value: 'auto', description: 'support for libproxy proxy configration')
+ option('gnome_proxy', type: 'feature', value: 'auto', description: 'support for GNOME desktop proxy configuration')
+ option('installed_tests', type: 'boolean', value: false, description: 'enable installed tests')
++option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
+ option('static_modules', type: 'boolean', value: false, description: 'build static modules')
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index ecbcbea13941..de7505e6cde1 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -46,15 +46,15 @@ let
'';
binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
- version = "2.60.4";
in
stdenv.mkDerivation rec {
- name = "glib-${version}";
+ pname = "glib";
+ version = "2.60.7";
src = fetchurl {
- url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1p9k8z83272mkm4d4fhm5jhwhyw2basrwbz47yl5wbmrvk2ix51b";
+ url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "0433m0na8nc4cf0gidf4gfzz8k5d3dsssmh541qkpzcsaspw04lb";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch
@@ -98,8 +98,12 @@ stdenv.mkDerivation rec {
LC_ALL = "en_US.UTF-8";
- NIX_CFLAGS_COMPILE = (optional stdenv.isSunOS "-DBSD_COMP")
- ++ [ "-Wno-error=nonnull" ];
+ NIX_CFLAGS_COMPILE = [
+ "-Wno-error=nonnull"
+ # Default for release buildtype but passed manually because
+ # we're using plain
+ "-DG_DISABLE_CAST_CHECKS"
+ ];
postPatch = ''
# substitute fix-gio-launch-desktop-path.patch
@@ -135,7 +139,7 @@ stdenv.mkDerivation rec {
sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
# This file is *included* in gtk3 and would introduce runtime reference via __FILE__.
- sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
+ sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
-i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
'' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
cp -r ${buildPackages.glib.devdoc} $devdoc
@@ -144,7 +148,7 @@ stdenv.mkDerivation rec {
checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ];
preCheck = optionalString doCheck ''
- export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"
+ export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs:$LD_LIBRARY_PATH"
export TZDIR="${tzdata}/share/zoneinfo"
export XDG_CACHE_HOME="$TMP"
export XDG_RUNTIME_HOME="$TMP"
@@ -169,8 +173,10 @@ stdenv.mkDerivation rec {
inherit doCheck;
- passthru = {
+ passthru = rec {
gioModuleDir = "lib/gio/modules";
+ makeSchemaPath = dir: name: "${dir}/share/gsettings-schemas/${name}/glib-2.0/schemas";
+ getSchemaPath = pkg: makeSchemaPath pkg pkg.name;
inherit flattenInclude;
updateScript = gnome3.updateScript { packageName = "glib"; };
};
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 444d6c458fb6..eda71af59783 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -40,6 +40,8 @@ callPackage ./common.nix { inherit stdenv; } {
# limit rebuilds by only disabling pie w/musl
++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie";
+ NIX_CFLAGS_COMPILE = if withGd then "-Wno-error=stringop-truncation" else null;
+
# When building glibc from bootstrap-tools, we need libgcc_s at RPATH for
# any program we run, because the gcc will have been placed at a new
# store path than that determined when built (as a source for the
diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix
index 319a0359c581..e7d4c934db81 100644
--- a/pkgs/development/libraries/glm/default.nix
+++ b/pkgs/development/libraries/glm/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.9.8.5";
- name = "glm-${version}";
+ pname = "glm";
src = fetchzip {
- url = "https://github.com/g-truc/glm/releases/download/${version}/${name}.zip";
+ url = "https://github.com/g-truc/glm/releases/download/${version}/${pname}-${version}.zip";
sha256 = "0dkfj4hin3am9fxgcvwr5gj0h9y52x7wa03lfwb3q0bvaj1rsly2";
};
diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix
index 269071434d57..9cb5dda507d2 100644
--- a/pkgs/development/libraries/globalarrays/default.nix
+++ b/pkgs/development/libraries/globalarrays/default.nix
@@ -6,7 +6,8 @@ let
version = "5.7";
in stdenv.mkDerivation {
- name = "globalarrays-${version}";
+ pname = "globalarrays";
+ inherit version;
src = fetchFromGitHub {
owner = "GlobalArrays";
diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix
index f01fb13c3c3e..b3cf36107afa 100644
--- a/pkgs/development/libraries/globalplatform/default.nix
+++ b/pkgs/development/libraries/globalplatform/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, zlib, openssl_1_0_2, pcsclite }:
stdenv.mkDerivation rec {
- name = "globalplatform-${version}";
+ pname = "globalplatform";
version = "6.0.0";
src = fetchurl {
- url = "mirror://sourceforge/globalplatform/${name}.tar.gz";
+ url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz";
sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy";
};
diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
index 87addaa99919..e01deea11752 100644
--- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
+++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, globalplatform, openssl_1_0_2, pcsclite }:
stdenv.mkDerivation rec {
- name = "gppcscconnectionplugin-${version}";
+ pname = "gppcscconnectionplugin";
version = "1.1.0";
src = fetchurl {
- url = "mirror://sourceforge/globalplatform/${name}.tar.gz";
+ url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz";
sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad";
};
diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix
index 9ae181e94530..6aa300e2b627 100644
--- a/pkgs/development/libraries/glog/default.nix
+++ b/pkgs/development/libraries/glog/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, perl }:
stdenv.mkDerivation rec {
- name = "glog-${version}";
+ pname = "glog";
version = "0.4.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix
index d532e906a510..51e981a2a338 100644
--- a/pkgs/development/libraries/gloox/default.nix
+++ b/pkgs/development/libraries/gloox/default.nix
@@ -13,8 +13,9 @@ with stdenv.lib;
let
version = "1.0.22";
in
-stdenv.mkDerivation rec {
- name = "gloox-${version}";
+stdenv.mkDerivation {
+ pname = "gloox";
+ inherit version;
src = fetchurl {
url = "https://camaya.net/download/gloox-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index 1d35c0696d27..84a7aff71076 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -14,10 +14,10 @@ assert withGmp -> gmp != null;
stdenv.mkDerivation rec {
version = "4.65";
- name = "glpk-${version}";
+ pname = "glpk";
src = fetchurl {
- url = "mirror://gnu/glpk/${name}.tar.gz";
+ url = "mirror://gnu/glpk/${pname}-${version}.tar.gz";
sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2";
};
diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix
index b373095a8148..3b4ad1393d0e 100644
--- a/pkgs/development/libraries/gmime/2.nix
+++ b/pkgs/development/libraries/gmime/2.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "2.6.23";
- name = "gmime-${version}";
+ pname = "gmime";
src = fetchurl {
- url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz";
+ url = "mirror://gnome/sources/gmime/2.6/${pname}-${version}.tar.xz";
sha256 = "0slzlzcr3h8jikpz5a5amqd0csqh2m40gdk910ws2hnaf5m6hjbi";
};
diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index 699d2854f3db..81546e5c1272 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "3.2.3";
- name = "gmime-${version}";
+ pname = "gmime";
src = fetchurl {
- url = "mirror://gnome/sources/gmime/3.2/${name}.tar.xz";
+ url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz";
sha256 = "04bk7rqs5slpvlvqf11i6s37s8b2xn6acls8smyl9asjnpp7a23a";
};
diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix
index 6423e1fce981..63d9d8c27626 100644
--- a/pkgs/development/libraries/gmm/default.nix
+++ b/pkgs/development/libraries/gmm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "gmm-${version}";
+ pname = "gmm";
version = "5.3";
src = fetchurl {
- url = "mirror://savannah/getfem/stable/${name}.tar.gz";
+ url = "mirror://savannah/getfem/stable/${pname}-${version}.tar.gz";
sha256 = "0lkjd3n0298w1dli446z320sn7mqdap8h9q31nydkbw2k7b4db46";
};
diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix
index 0fac97aaa439..10d584c6ccb0 100644
--- a/pkgs/development/libraries/gmtk/default.nix
+++ b/pkgs/development/libraries/gmtk/default.nix
@@ -2,7 +2,7 @@
, libpulseaudio, mplayer, gnome_mplayer }:
stdenv.mkDerivation rec {
- name = "gmtk-${version}";
+ pname = "gmtk";
version = "1.0.9";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix
index 501fe4d0849f..f6ff3a2ea4ad 100644
--- a/pkgs/development/libraries/gnome-menus/default.nix
+++ b/pkgs/development/libraries/gnome-menus/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
};
makeFlags = [
- "INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/"
- "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0"
+ "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0/"
+ "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
];
nativeBuildInputs = [ pkgconfig gettext ];
diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix
index 5e525ad46af4..fa762c3a02e8 100644
--- a/pkgs/development/libraries/gnome-sharp/default.nix
+++ b/pkgs/development/libraries/gnome-sharp/default.nix
@@ -13,13 +13,13 @@
}:
stdenv.mkDerivation rec {
- name = "gnome-sharp-${version}";
+ pname = "gnome-sharp";
version = "2.24.4";
src = fetchFromGitHub {
owner = "mono";
repo = "gnome-sharp";
- rev = "${version}";
+ rev = version;
sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z";
};
diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix
index 7918fb7b9c4b..638d483b60e9 100644
--- a/pkgs/development/libraries/gnu-config/default.nix
+++ b/pkgs/development/libraries/gnu-config/default.nix
@@ -13,8 +13,8 @@ let
sha256 = "0i699axqfkxk9mgv1hlms5r44pf0s642yz75ajjjpwzhw4d5pnv4";
};
in
-stdenv.mkDerivation rec {
- name = "gnu-config-${version}";
+stdenv.mkDerivation {
+ pname = "gnu-config";
version = "2019-04-15";
buildCommand = ''
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index 036863c9c0bf..af225cc50f24 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pciutils }: with stdenv.lib;
stdenv.mkDerivation rec {
- name = "gnu-efi-${version}";
+ pname = "gnu-efi";
version = "3.0.9";
src = fetchurl {
- url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2";
+ url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2";
sha256 = "1w3p4aqlc5j93q44la7dc8cr3hky20zvsd0h0k2lyzhwmrzfl5b7";
};
diff --git a/pkgs/development/libraries/gnutls-kdh/3.5.nix b/pkgs/development/libraries/gnutls-kdh/3.5.nix
index e245496c63ac..015163b32931 100644
--- a/pkgs/development/libraries/gnutls-kdh/3.5.nix
+++ b/pkgs/development/libraries/gnutls-kdh/3.5.nix
@@ -1,6 +1,6 @@
{ callPackage, fetchFromGitHub, autoreconfHook, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix
index 75c71632aebc..cb81b52b7301 100644
--- a/pkgs/development/libraries/gnutls-kdh/generic.nix
+++ b/pkgs/development/libraries/gnutls-kdh/generic.nix
@@ -15,7 +15,8 @@ let
doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4";
in
stdenv.mkDerivation {
- name = "gnutls-kdh-${version}";
+ pname = "gnutls-kdh";
+ inherit version;
inherit src patches;
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index a14c40e6d87e..a18bdb177449 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
};
meta = {
- description = "A Glib/GTK+ set of document centric objects and utilities";
+ description = "A Glib/GTK set of document centric objects and utilities";
longDescription = ''
There are common operations for document centric applications that are
diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix
index 99b1307179a5..1440d3f6aa04 100644
--- a/pkgs/development/libraries/goocanvas/2.x.nix
+++ b/pkgs/development/libraries/goocanvas/2.x.nix
@@ -3,12 +3,13 @@
let
version = "2.0.4";
in stdenv.mkDerivation rec {
- name = "goocanvas-${version}";
+ pname = "goocanvas";
+ inherit version;
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/goocanvas/2.0/${name}.tar.xz";
+ url = "mirror://gnome/sources/goocanvas/2.0/${pname}-${version}.tar.xz";
sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67";
};
@@ -22,7 +23,7 @@ in stdenv.mkDerivation rec {
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0";
meta = with stdenv.lib; {
- description = "Canvas widget for GTK+ based on the the Cairo 2D library";
+ description = "Canvas widget for GTK based on the the Cairo 2D library";
homepage = https://wiki.gnome.org/Projects/GooCanvas;
license = licenses.lgpl2;
maintainers = with maintainers; [ ];
diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix
index 435c1f30bace..024ac363af18 100644
--- a/pkgs/development/libraries/goocanvas/default.nix
+++ b/pkgs/development/libraries/goocanvas/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
- description = "Canvas widget for GTK+ based on the the Cairo 2D library";
+ description = "Canvas widget for GTK based on the the Cairo 2D library";
homepage = "https://wiki.gnome.org/Projects/GooCanvas";
license = licenses.lgpl2;
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index c462f2e685a2..26d5e9c88c75 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
- name = "gpgme-${version}";
+ pname = "gpgme";
version = "1.13.1";
src = fetchurl {
- url = "mirror://gnupg/gpgme/${name}.tar.bz2";
+ url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2";
sha256 = "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4";
};
diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix
index a48490ffae57..722fb79d5d61 100644
--- a/pkgs/development/libraries/grail/default.nix
+++ b/pkgs/development/libraries/grail/default.nix
@@ -2,11 +2,11 @@
stdenv, fetchurl, pkgconfig, xorg, python3, frame }:
stdenv.mkDerivation rec {
- name = "grail-${version}";
+ pname = "grail";
version = "3.1.1";
src = fetchurl {
- url = "https://launchpad.net/grail/trunk/${version}/+download/${name}.tar.bz2";
+ url = "https://launchpad.net/grail/trunk/${version}/+download/${pname}-${version}.tar.bz2";
sha256 = "1wwx5ibjdz5pyd0f5cd1n91y67r68dymxpm2lgd829041xjizvay";
};
diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index 52c087b19147..45096e031d37 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -1,15 +1,14 @@
{ mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }:
mkDerivation rec {
- name = "grantlee-${version}";
+ pname = "grantlee";
version = "5.1.0";
- grantleeCompatVersion = "5.1";
- grantleePluginPrefix = "lib/grantlee/${grantleeCompatVersion}";
+ grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}";
src = fetchurl {
url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz";
sha256 = "1lf9rkv0i0kd7fvpgg5l8jb87zw8dzcwd1liv6hji7g4wlpmfdiq";
- name = "${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
};
buildInputs = [ qtbase qtscript ];
diff --git a/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch b/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch
new file mode 100644
index 000000000000..d049d6c96f81
--- /dev/null
+++ b/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch
@@ -0,0 +1,24 @@
+From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid
+Date: Sat, 20 Jul 2019 17:35:30 +0200
+Subject: [PATCH] Fix compile with newer Qt/cmake combination
+
+Without this i get huge errors about Qt needing C++11 support
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6d51110..0859788 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,9 @@ endif()
+
+ project(Grantlee)
+
++set (CMAKE_CXX_STANDARD 11)
++set (CMAKE_CXX_EXTENSIONS OFF)
++
+ # Workaround for http://public.kitware.com/Bug/view.php?id=12301
+ if (MINGW)
+ if(NOT CMAKE_BUILD_TYPE)
diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series
index 9c4015a1c197..19850b2e7e43 100644
--- a/pkgs/development/libraries/grantlee/5/series
+++ b/pkgs/development/libraries/grantlee/5/series
@@ -1,2 +1,3 @@
grantlee-nix-profiles.patch
grantlee-no-canonicalize-filepath.patch
+grantlee-cxx11.patch
diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix
index 3e21f3c229fa..66c5d8eb061a 100644
--- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix
+++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "graphene-hardened-malloc-${version}";
+ pname = "graphene-hardened-malloc";
version = "2";
src = fetchurl {
diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix
index c439e763e73d..f1a9dacd4e2b 100644
--- a/pkgs/development/libraries/graphene/default.nix
+++ b/pkgs/development/libraries/graphene/default.nix
@@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "graphene";
- version = "1.9.6";
+ version = "1.10.0";
outputs = [ "out" "devdoc" "installedTests" ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "ebassi";
repo = pname;
rev = version;
- sha256 = "0hb7s6g00l7zlf4hlfda55krn0pls9ajz0hcqrh8m656zr18ddwa";
+ sha256 = "16vqwih5bfxv7r3mm7iiha804rpsxzxjfrs4kx76d9q5yg2hayxr";
};
patches = [
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dgtk_doc=true"
- "-Dinstalled_test_datadir=${placeholder ''installedTests''}/share"
- "-Dinstalled_test_bindir=${placeholder ''installedTests''}/libexec"
+ "-Dinstalled_test_datadir=${placeholder "installedTests"}/share"
+ "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec"
];
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix
index 224cd125dce6..38243ce5a6d8 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/pkgs/development/libraries/grib-api/default.nix
@@ -3,7 +3,7 @@
enablePython ? false, pythonPackages }:
stdenv.mkDerivation rec{
- name = "grib-api-${version}";
+ pname = "grib-api";
version = "1.28.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 78335e073edc..d45aba1cb378 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.23.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
- name = "grpc-${version}";
+ pname = "grpc";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
index d454ca63fd7f..ffb8be85d3ac 100644
--- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
+++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
@@ -6,11 +6,11 @@
, gnome3 }:
stdenv.mkDerivation rec {
- name = "gsettings-desktop-schemas-${version}";
+ pname = "gsettings-desktop-schemas";
version = "3.32.0";
src = fetchurl {
- url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d";
};
diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix
index 744d9eb6de90..8b118fe94834 100644
--- a/pkgs/development/libraries/gsettings-qt/default.nix
+++ b/pkgs/development/libraries/gsettings-qt/default.nix
@@ -3,8 +3,8 @@
, glib, gobject-introspection
}:
-stdenv.mkDerivation rec {
- name = "gsettings-qt-${version}";
+stdenv.mkDerivation {
+ pname = "gsettings-qt";
version = "0.1.20170824";
src = fetchbzr {
diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
index 7c15e10620a5..ebaf694f04e9 100644
--- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix
+++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }:
-stdenv.mkDerivation rec {
- name = "gsignond-plugin-lastfm-${version}";
+stdenv.mkDerivation {
+ pname = "gsignond-plugin-lastfm";
version = "2018-05-07";
src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix
index 887376d31874..a140859b6931 100644
--- a/pkgs/development/libraries/gsignond/plugins/oauth.nix
+++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix
@@ -2,8 +2,8 @@
, json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45
, docbook_xsl, glibcLocales, gobject-introspection }:
-stdenv.mkDerivation rec {
- name = "gsignond-plugin-oauth-${version}";
+stdenv.mkDerivation {
+ pname = "gsignond-plugin-oauth";
version = "2018-10-15";
src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix
index 655f73931f67..af57950ac653 100644
--- a/pkgs/development/libraries/gsignond/plugins/sasl.nix
+++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, gsasl, check
, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }:
-stdenv.mkDerivation rec {
- name = "gsignond-plugin-sasl-${version}";
+stdenv.mkDerivation {
+ pname = "gsignond-plugin-sasl";
version = "2018-10-15";
src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index c8846509d004..1fd086ca23c7 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
- name = "gsl-2.5";
+ name = "gsl-2.6";
src = fetchurl {
url = "mirror://gnu/gsl/${name}.tar.gz";
- sha256 = "1395y9hlhqadn5g9j8q22224fds5sd92jxi9czfavjj24myasq04";
+ sha256 = "1a460zj9xmbgvcymkdhqh313c4l29mn9cffbi5vf33x3qygk70mp";
};
# do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html)
diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix
index 33583a4c6bb3..1405d4782ad3 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/pkgs/development/libraries/gsm/default.nix
@@ -8,11 +8,11 @@ let
in
stdenv.mkDerivation rec {
- name = "gsm-${version}";
+ pname = "gsm";
version = "1.0.18";
src = fetchurl {
- url = "http://www.quut.com/gsm/${name}.tar.gz";
+ url = "http://www.quut.com/gsm/${pname}-${version}.tar.gz";
sha256 = "041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4";
};
diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix
index f099d3fabc04..a1a0da51017b 100644
--- a/pkgs/development/libraries/gsoap/default.nix
+++ b/pkgs/development/libraries/gsoap/default.nix
@@ -4,7 +4,7 @@ let
majorVersion = "2.8";
in stdenv.mkDerivation rec {
- name = "gsoap-${version}";
+ pname = "gsoap";
version = "${majorVersion}.53";
src = fetchurl {
diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix
index 776125a7537d..fd6b12ccaac1 100644
--- a/pkgs/development/libraries/gspell/default.nix
+++ b/pkgs/development/libraries/gspell/default.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
- description = "A spell-checking library for GTK+ applications";
+ description = "A spell-checking library for GTK applications";
homepage = https://wiki.gnome.org/Projects/gspell;
license = licenses.lgpl21Plus;
maintainers = gnome3.maintainers;
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 2ae0ad2b453b..735ab4e6e18e 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -51,7 +51,7 @@ let
inherit (stdenv.lib) optional optionals;
in
stdenv.mkDerivation rec {
- name = "gst-plugins-bad-${version}";
+ pname = "gst-plugins-bad";
version = "1.16.0";
meta = with stdenv.lib; {
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
- url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
+ url = "${meta.homepage}/src/gst-plugins-bad/${pname}-${version}.tar.xz";
sha256 = "019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2";
};
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 87bbef227de8..81d914581321 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -6,6 +6,7 @@
, libjpeg
, libvisual
, tremor # provides 'virbisidec'
+, libGL
, gtk-doc, docbook_xsl, docbook_xml_dtd_412
, enableX11 ? stdenv.isLinux, libXv
, enableWayland ? stdenv.isLinux, wayland
@@ -14,7 +15,7 @@
, enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }:
stdenv.mkDerivation rec {
- name = "gst-plugins-base-${version}";
+ pname = "gst-plugins-base";
version = "1.16.0";
meta = with lib; {
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
};
src = fetchurl {
- url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
+ url = "${meta.homepage}/src/gst-plugins-base/${pname}-${version}.tar.xz";
sha256 = "1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0";
};
@@ -75,7 +76,7 @@ stdenv.mkDerivation rec {
++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled"
;
- buildInputs = [ orc libtheora libintl libopus isocodes libjpeg tremor ]
+ buildInputs = [ orc libtheora libintl libopus isocodes libjpeg tremor libGL ]
++ lib.optional (!stdenv.isDarwin) libvisual
++ lib.optional enableAlsa alsaLib
++ lib.optionals enableX11 [ libXv pango ]
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index fa838d5ff773..f0f01a977fd1 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -11,7 +11,7 @@
}:
stdenv.mkDerivation rec {
- name = "gstreamer-${version}";
+ pname = "gstreamer";
version = "1.16.0";
meta = with lib ;{
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
};
src = fetchurl {
- url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
+ url = "${meta.homepage}/src/gstreamer/${pname}-${version}.tar.xz";
sha256 = "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf";
};
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 703fcb58898a..810cee650ca8 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "gstreamer-editing-services-${version}";
+ pname = "gstreamer-editing-services";
version = "1.16.0";
meta = with stdenv.lib; {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
src = fetchurl {
- url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
+ url = "${meta.homepage}/src/gstreamer-editing-services/${pname}-${version}.tar.xz";
sha256 = "1las94jkx83sxmzi5w6b0xm89dqqwzpdsb6h9w9ixndhnbpzm8w2";
};
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 557e3caa7220..c801684b0659 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -25,7 +25,7 @@ let
inherit (stdenv.lib) optional optionals;
in
stdenv.mkDerivation rec {
- name = "gst-plugins-good-${version}";
+ pname = "gst-plugins-good";
version = "1.16.0";
meta = with stdenv.lib; {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
};
src = fetchurl {
- url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
+ url = "${meta.homepage}/src/gst-plugins-good/${pname}-${version}.tar.xz";
sha256 = "1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5";
};
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
index 8acaefcedf46..27036ad86edf 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
@@ -4,7 +4,7 @@ let
ver_maj = "0.10";
ver_min = "11";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "gstreamermm-${ver_maj}.${ver_min}";
src = fetchurl {
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 297c8ada884e..1847b8d0c12b 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -9,7 +9,7 @@
assert withSystemLibav -> libav != null;
stdenv.mkDerivation rec {
- name = "gst-libav-${version}";
+ pname = "gst-libav";
version = "1.16.0";
meta = {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
};
src = fetchurl {
- url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
+ url = "${meta.homepage}/src/gst-libav/${pname}-${version}.tar.xz";
sha256 = "16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z";
};
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index c4620a29e945..5c571fa4a1e7 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "gst-rtsp-server-${version}";
+ pname = "gst-rtsp-server";
version = "1.16.0";
meta = with stdenv.lib; {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
};
src = fetchurl {
- url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz";
+ url = "${meta.homepage}/src/gst-rtsp-server/${pname}-${version}.tar.xz";
sha256 = "069zy159izy50blci9fli1i2r8jh91qkmgrz1n0xqciy3bn9x3hr";
};
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 5c3a56814bad..552ab1ec2921 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -7,7 +7,7 @@
}:
stdenv.mkDerivation rec {
- name = "gst-plugins-ugly-${version}";
+ pname = "gst-plugins-ugly";
version = "1.16.0";
meta = with lib; {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
};
src = fetchurl {
- url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
+ url = "${meta.homepage}/src/gst-plugins-ugly/${pname}-${version}.tar.xz";
sha256 = "1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3";
};
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index c0541857e8b7..adb495689e33 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland
, libdrm, udev, xorg, libGLU_combined, gstreamer, gst-plugins-bad, nasm
-, libvpx, python
+, libvpx, python, fetchpatch
}:
stdenv.mkDerivation rec {
- name = "gst-vaapi-${version}";
+ pname = "gst-vaapi";
version = "1.16.0";
src = fetchurl {
@@ -12,6 +12,15 @@ stdenv.mkDerivation rec {
sha256 = "07qpynamiz0lniqajcaijh3n7ixs4lfk9a5mfk50sng0dricwzsf";
};
+ patches = [
+ # See: https://mail.gnome.org/archives/distributor-list/2019-September/msg00000.html
+ # Note that the patch has now been actually accepted upstream.
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/commit/a90daabb84f983d2fa05ff3159f7ad59aa648b55.patch";
+ sha256 = "0p2qygq6b5h6nxjdfnlzbsyih43hjq5c94ag8sbyyb8pmnids9rb";
+ })
+ ];
+
outputs = [ "out" "dev" ];
nativeBuildInputs = [ meson ninja pkgconfig bzip2 ];
@@ -28,8 +37,6 @@ stdenv.mkDerivation rec {
'';
mesonFlags = [
- # Enables all features, so that we know when new dependencies are necessary.
- "-Dauto_features=enabled"
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
];
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index 06d275078f30..ad013d1570e1 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "gst-validate-${version}";
+ pname = "gst-validate";
version = "1.16.0";
meta = {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
src = fetchurl {
- url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";
+ url = "${meta.homepage}/src/gst-validate/${pname}-${version}.tar.xz";
sha256 = "1jfnd0g9hmdbqfxsx96yc9vpf1w6m33hqwrr6lj4i83kl54awcck";
};
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index 9ceb571983e2..5fecd45b7da1 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -2,7 +2,7 @@
, static ? false }:
stdenv.mkDerivation rec {
- name = "gtest-${version}";
+ pname = "gtest";
version = "1.8.1";
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix
index 6588b8ab4407..04d7c8d8f4d4 100644
--- a/pkgs/development/libraries/gthree/default.nix
+++ b/pkgs/development/libraries/gthree/default.nix
@@ -17,26 +17,17 @@
stdenv.mkDerivation rec {
pname = "gthree";
- version = "unstable-2019-08-21";
+ version = "0.2.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchFromGitHub {
owner = "alexlarsson";
repo = "gthree";
- rev = "dac46b0f35e29319c004c7e17b5f345ef4c04cb8";
- sha256 = "16ixis2g04000zffm44s7ir64vn3byz9a793g2s76aasqybl86i2";
+ rev = version;
+ sha256 = "16ap1ampnzsyhrs84b168d6889lh8sjr2j5sqv9mdbnnhy72p5cd";
};
- patches = [
- # correctly declare json-glib in .pc file
- # https://github.com/alexlarsson/gthree/pull/61
- (fetchpatch {
- url = https://github.com/alexlarsson/gthree/commit/784b1f20e0b6eb15f113a51f74c2cba871249861.patch;
- sha256 = "07vxafaxris5a98w751aw04nlw0l45np1lba08xd16wdzmkadz0x";
- })
- ];
-
nativeBuildInputs = [
ninja
meson
@@ -64,7 +55,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "GObject/GTK port of three.js";
- homepage = https://github.com/alexlarsson/gthree;
+ homepage = "https://github.com/alexlarsson/gthree";
license = licenses.mit;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix
index 26d0b5c35958..2281055c62b7 100644
--- a/pkgs/development/libraries/gtk-mac-integration/default.nix
+++ b/pkgs/development/libraries/gtk-mac-integration/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobject-introspection }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "gtk-mac-integration-2.0.8";
src = fetchFromGitHub {
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- description = "Provides integration for Gtk+ applications into the Mac desktop";
+ description = "Provides integration for GTK applications into the Mac desktop";
license = licenses.lgpl21;
- homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Integration;
+ homepage = https://wiki.gnome.org/Projects/GTK/OSX/Integration;
maintainers = [ maintainers.matthewbauer ];
platforms = platforms.darwin;
diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix
index 7f35f088da2b..2b83a8ef52e2 100644
--- a/pkgs/development/libraries/gtk-sharp-beans/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp-2_0, gio-sharp }:
stdenv.mkDerivation rec {
- name = "gtk-sharp-beans-${version}";
+ pname = "gtk-sharp-beans";
version = "2.14.0";
src = fetchFromGitHub {
owner = "mono";
repo = "gtk-sharp-beans";
- rev = "${version}";
+ rev = version;
sha256 = "04sylwdllb6gazzs2m4jjfn14mil9l3cny2q0xf0zkhczzih6ah1";
};
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
dontStrip = true;
meta = with stdenv.lib; {
- description = "Binds some API from Gtk+ that isn't in Gtk# 2.12.x";
+ description = "Binds some API from GTK that isn't in GTK# 2.12.x";
platforms = platforms.linux;
license = licenses.lgpl21;
};
diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix
index 659dc14800e1..615ea66f4d99 100644
--- a/pkgs/development/libraries/gtk-sharp/2.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/2.0.nix
@@ -23,7 +23,7 @@
}:
stdenv.mkDerivation rec {
- name = "gtk-sharp-${version}";
+ pname = "gtk-sharp";
version = "2.12.45";
builder = ./builder.sh;
diff --git a/pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch b/pkgs/development/libraries/gtk/01-build-Fix-path-handling-in-pkgconfig.patch
similarity index 100%
rename from pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch
rename to pkgs/development/libraries/gtk/01-build-Fix-path-handling-in-pkgconfig.patch
diff --git a/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch b/pkgs/development/libraries/gtk/2.0-darwin-x11.patch
similarity index 100%
rename from pkgs/development/libraries/gtk+/2.0-darwin-x11.patch
rename to pkgs/development/libraries/gtk/2.0-darwin-x11.patch
diff --git a/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch b/pkgs/development/libraries/gtk/2.0-immodules.cache.patch
similarity index 100%
rename from pkgs/development/libraries/gtk+/2.0-immodules.cache.patch
rename to pkgs/development/libraries/gtk/2.0-immodules.cache.patch
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix
similarity index 91%
rename from pkgs/development/libraries/gtk+/2.x.nix
rename to pkgs/development/libraries/gtk/2.x.nix
index 886f0aefafb8..f1a53390467a 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk/2.x.nix
@@ -83,13 +83,13 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
longDescription = ''
- GTK+ is a highly usable, feature rich toolkit for creating
+ GTK is a highly usable, feature rich toolkit for creating
graphical user interfaces which boasts cross platform
- compatibility and an easy to use API. GTK+ it is written in C,
+ compatibility and an easy to use API. GTK it is written in C,
but has bindings to many other popular programming languages
- such as C++, Python and C# among others. GTK+ is licensed
+ such as C++, Python and C# among others. GTK is licensed
under the GNU LGPL 2.1 allowing development of both free and
- proprietary software with GTK+ without any license fees or
+ proprietary software with GTK without any license fees or
royalties.
'';
};
diff --git a/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch b/pkgs/development/libraries/gtk/3.0-darwin-x11.patch
similarity index 100%
rename from pkgs/development/libraries/gtk+/3.0-darwin-x11.patch
rename to pkgs/development/libraries/gtk/3.0-darwin-x11.patch
diff --git a/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch b/pkgs/development/libraries/gtk/3.0-immodules.cache.patch
similarity index 100%
rename from pkgs/development/libraries/gtk+/3.0-immodules.cache.patch
rename to pkgs/development/libraries/gtk/3.0-immodules.cache.patch
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
similarity index 89%
rename from pkgs/development/libraries/gtk+/3.x.nix
rename to pkgs/development/libraries/gtk/3.x.nix
index 94b745794f1e..aee97d9bad00 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -77,6 +77,13 @@ stdenv.mkDerivation rec {
"-Dtests=false"
];
+ # These are the defines that'd you'd get with --enable-debug=minimum (default).
+ # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
+ NIX_CFLAGS_COMPILE = [
+ "-DG_ENABLE_DEBUG"
+ "-DG_DISABLE_CAST_CHECKS"
+ ];
+
postPatch = ''
files=(
build-aux/meson/post-install.py
@@ -174,13 +181,13 @@ stdenv.mkDerivation rec {
meta = {
description = "A multi-platform toolkit for creating graphical user interfaces";
longDescription = ''
- GTK+ is a highly usable, feature rich toolkit for creating
+ GTK is a highly usable, feature rich toolkit for creating
graphical user interfaces which boasts cross platform
- compatibility and an easy to use API. GTK+ it is written in C,
+ compatibility and an easy to use API. GTK it is written in C,
but has bindings to many other popular programming languages
- such as C++, Python and C# among others. GTK+ is licensed
+ such as C++, Python and C# among others. GTK is licensed
under the GNU LGPL 2.1 allowing development of both free and
- proprietary software with GTK+ without any license fees or
+ proprietary software with GTK without any license fees or
royalties.
'';
homepage = https://www.gtk.org/;
diff --git a/pkgs/development/libraries/gtk+/gtk2-theme-paths.patch b/pkgs/development/libraries/gtk/gtk2-theme-paths.patch
similarity index 100%
rename from pkgs/development/libraries/gtk+/gtk2-theme-paths.patch
rename to pkgs/development/libraries/gtk/gtk2-theme-paths.patch
diff --git a/pkgs/development/libraries/gtk+/gtk3-setup-hook.sh b/pkgs/development/libraries/gtk/gtk3-setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/gtk+/gtk3-setup-hook.sh
rename to pkgs/development/libraries/gtk/gtk3-setup-hook.sh
diff --git a/pkgs/development/libraries/gtk+/setup-hook.sh b/pkgs/development/libraries/gtk/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/gtk+/setup-hook.sh
rename to pkgs/development/libraries/gtk/setup-hook.sh
diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index c2f05b51a65e..31a3242cdef5 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -4,7 +4,7 @@
let
inherit (gst_all_1) gstreamer gst-plugins-base;
in stdenv.mkDerivation rec {
- name = "gtkd-${version}";
+ pname = "gtkd";
version = "3.8.5";
src = fetchzip {
@@ -87,7 +87,7 @@ in stdenv.mkDerivation rec {
installFlags = "prefix=$(out)";
meta = with stdenv.lib; {
- description = "D binding and OO wrapper for GTK+";
+ description = "D binding and OO wrapper for GTK";
homepage = https://gtkd.org;
license = licenses.lgpl3Plus;
platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix
index 1caac3914a58..54054270c3c6 100644
--- a/pkgs/development/libraries/gtkdatabox/default.nix
+++ b/pkgs/development/libraries/gtkdatabox/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ gtk2 ];
meta = {
- description = "Gtk+ widget for displaying large amounts of numerical data";
+ description = "GTK widget for displaying large amounts of numerical data";
license = stdenv.lib.licenses.lgpl2;
diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix
index d6d32c26a509..babcaa993340 100644
--- a/pkgs/development/libraries/gtkimageview/default.nix
+++ b/pkgs/development/libraries/gtkimageview/default.nix
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://wiki.gnome.org/Projects/GTK%2B/GtkImageView";
- description = "Image viewer widget for GTK+";
+ description = "Image viewer widget for GTK";
longDescription =
- '' GtkImageView is a simple image viewer widget for GTK+. Similar to
+ '' GtkImageView is a simple image viewer widget for GTK. Similar to
the image viewer panes in gThumb or Eye of Gnome. It makes writing
image viewing and editing applications easy. Among its features
are: mouse and keyboard zooming; scrolling and dragging; adjustable
diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix
index 69fd3f30e92d..523c5b50d283 100644
--- a/pkgs/development/libraries/gtkmm/2.x.nix
+++ b/pkgs/development/libraries/gtkmm/2.x.nix
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
- description = "C++ interface to the GTK+ graphical user interface library";
+ description = "C++ interface to the GTK graphical user interface library";
longDescription = ''
gtkmm is the official C++ interface for the popular GUI library
- GTK+. Highlights include typesafe callbacks, and a
+ GTK. Highlights include typesafe callbacks, and a
comprehensive set of widgets that are easily extensible via
inheritance. You can create user interfaces either in code or
with the Glade User Interface designer, using libglademm.
diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
index 1a5b0fe62875..f977af046ca2 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
- description = "C++ interface to the GTK+ graphical user interface library";
+ description = "C++ interface to the GTK graphical user interface library";
longDescription = ''
gtkmm is the official C++ interface for the popular GUI library
- GTK+. Highlights include typesafe callbacks, and a
+ GTK. Highlights include typesafe callbacks, and a
comprehensive set of widgets that are easily extensible via
inheritance. You can create user interfaces either in code or
with the Glade User Interface designer, using libglademm.
diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index 9d1751afaf91..1b35221f066b 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -2,11 +2,11 @@
, libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
stdenv.mkDerivation rec {
- name = "gtksourceview-${version}";
+ pname = "gtksourceview";
version = "3.24.11";
src = fetchurl {
- url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9";
};
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index 553e9fd9cbb6..fde94e79f056 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -2,11 +2,11 @@
, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
stdenv.mkDerivation rec {
- name = "gtksourceview-${version}";
+ pname = "gtksourceview";
version = "4.2.0";
src = fetchurl {
- url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4";
};
diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix
index 455cc4d4b81e..1b66bfd031fc 100644
--- a/pkgs/development/libraries/gtksourceviewmm/default.nix
+++ b/pkgs/development/libraries/gtksourceviewmm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }:
stdenv.mkDerivation rec {
- name = "gtksourceviewmm-${version}";
+ pname = "gtksourceviewmm";
version = "3.21.3";
src = fetchurl {
- url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v";
};
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index f0baecb19904..54b4b001d817 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobject-introspection, vala}:
stdenv.mkDerivation rec {
- name = "gtkspell-${version}";
+ pname = "gtkspell";
version = "3.0.10";
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix
index cb141f8c5569..97f1a12c1785 100644
--- a/pkgs/development/libraries/gtkspellmm/default.nix
+++ b/pkgs/development/libraries/gtkspellmm/default.nix
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
- name = "gtkspellmm-${version}";
+ pname = "gtkspellmm";
version = "3.0.5";
src = fetchurl {
url = "mirror://sourceforge/project/gtkspell/gtkspellmm/" +
- "${name}.tar.xz";
+ "${pname}-${version}.tar.xz";
sha256 = "0i8mxwyfv5mskachafa4qlh315q0cfph7s66s1s34nffadbmm1sv";
};
diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix
index d0da7f8cef61..9cc079d61030 100644
--- a/pkgs/development/libraries/gts/default.nix
+++ b/pkgs/development/libraries/gts/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
- name = "gts-${version}";
+ pname = "gts";
version = "0.7.6";
src = fetchurl {
- url = "mirror://sourceforge/gts/${name}.tar.gz";
+ url = "mirror://sourceforge/gts/${pname}-${version}.tar.gz";
sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705";
};
diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix
index 17ca323a5fef..2db8c1e67398 100644
--- a/pkgs/development/libraries/gumbo/default.nix
+++ b/pkgs/development/libraries/gumbo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool }:
stdenv.mkDerivation rec {
- name = "gumbo-${version}";
+ pname = "gumbo";
version = "0.10.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index 78a2d365033e..2f39b03898d1 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -3,7 +3,7 @@
, glib, systemd, libusb1, vala, hwdata
}:
stdenv.mkDerivation rec {
- name = "gusb-${version}";
+ pname = "gusb";
version = "0.3.0";
outputs = [ "bin" "out" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 60188d77962b..8b3bc30a6616 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -1,20 +1,49 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, dbus
-, glib, libgudev, udisks2, libgcrypt, libcap, polkit
-, libgphoto2, avahi, libarchive, fuse, libcdio
-, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
-, gnomeSupport ? false, gnome, gcr, wrapGAppsHook
-, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
-, libsecret, libgdata, python3
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, gettext
+, dbus
+, glib
+, libgudev
+, udisks2
+, libgcrypt
+, libcap
+, polkit
+, libgphoto2
+, avahi
+, libarchive
+, fuse
+, libcdio
+, libxml2
+, libxslt
+, docbook_xsl
+, docbook_xml_dtd_42
+, samba
+, libmtp
+, gnomeSupport ? false
+, gnome3
+, gcr
+, glib-networking
+, gnome-online-accounts
+, wrapGAppsHook
+, libimobiledevice
+, libbluray
+, libcdio-paranoia
+, libnfs
+, openssh
+, libsecret
+, libgdata
+, python3
}:
-let
+stdenv.mkDerivation rec {
pname = "gvfs";
version = "1.40.2";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx";
};
@@ -26,28 +55,56 @@ in stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
- meson ninja python3
- pkgconfig gettext wrapGAppsHook
- libxml2 libxslt docbook_xsl docbook_xml_dtd_42
+ meson
+ ninja
+ python3
+ pkgconfig
+ gettext
+ wrapGAppsHook
+ libxml2
+ libxslt
+ docbook_xsl
+ docbook_xml_dtd_42
];
buildInputs = [
- glib libgudev udisks2 libgcrypt dbus
- libgphoto2 avahi libarchive fuse libcdio
- samba libmtp libcap polkit libimobiledevice libbluray
- libcdio-paranoia libnfs openssh
- # ToDo: a ligther version of libsoup to have FTP/HTTP support?
- ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
- libsoup gcr
+ glib
+ libgudev
+ udisks2
+ libgcrypt
+ dbus
+ libgphoto2
+ avahi
+ libarchive
+ fuse
+ libcdio
+ samba
+ libmtp
+ libcap
+ polkit
+ libimobiledevice
+ libbluray
+ libcdio-paranoia
+ libnfs
+ openssh
+ # TODO: a ligther version of libsoup to have FTP/HTTP support?
+ ] ++ stdenv.lib.optionals gnomeSupport [
+ gnome3.libsoup
+ gcr
glib-networking # TLS support
- gnome-online-accounts libsecret libgdata
- ]);
+ gnome-online-accounts
+ libsecret
+ libgdata
+ ];
mesonFlags = [
"-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
"-Dtmpfilesdir=no"
] ++ stdenv.lib.optionals (!gnomeSupport) [
- "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
+ "-Dgcr=false"
+ "-Dgoa=false"
+ "-Dkeyring=false"
+ "-Dhttp=false"
"-Dgoogle=false"
] ++ stdenv.lib.optionals (samba == null) [
# Xfce don't want samba
diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/development/libraries/half/default.nix
index d235c6cb0869..063d416a8fc5 100644
--- a/pkgs/development/libraries/half/default.nix
+++ b/pkgs/development/libraries/half/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.12.0";
- name = "half-${version}";
+ pname = "half";
src = fetchzip {
url = "mirror://sourceforge/half/${version}/half-${version}.zip";
diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix
index b9cd31432fc3..000af7fd74e4 100644
--- a/pkgs/development/libraries/hamlib/default.nix
+++ b/pkgs/development/libraries/hamlib/default.nix
@@ -4,10 +4,9 @@
stdenv.mkDerivation rec {
pname = "hamlib";
version = "3.3";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+ url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9";
};
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 26a3428f6793..3f7d1a2c3526 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,7 +8,7 @@
}:
let
- version = "2.5.3";
+ version = "2.6.1";
inherit (stdenv.lib) optional optionals optionalString;
in
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.xz";
- sha256 = "0p45xk5bblsw8lfs7y7z80b4rvda9f2hlpr28flkrfmpjz3hvl7y";
+ sha256 = "0kw4c04jd8c8ili3j1glgv0wsr207313fs3jh2rawf53m8zznlf6";
};
postPatch = ''
diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix
index a5f8f00a6bfd..ec86db036e98 100644
--- a/pkgs/development/libraries/herqq/default.nix
+++ b/pkgs/development/libraries/herqq/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.1.0";
- name = "herqq-${version}";
+ pname = "herqq";
nativeBuildInputs = [ qt5.qmake ];
buildInputs = [ qt5.qtbase unzip qtmultimedia ];
diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix
index 13f7c4219069..6dc3871e1c18 100644
--- a/pkgs/development/libraries/hiredis/default.nix
+++ b/pkgs/development/libraries/hiredis/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "hiredis-${version}";
+ pname = "hiredis";
version = "0.14.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix
index 37f01372005c..ca547faa2abb 100644
--- a/pkgs/development/libraries/hivex/default.nix
+++ b/pkgs/development/libraries/hivex/default.nix
@@ -2,11 +2,11 @@
, perlPackages, libxml2, libiconv }:
stdenv.mkDerivation rec {
- name = "hivex-${version}";
+ pname = "hivex";
version = "1.3.18";
src = fetchurl {
- url = "http://libguestfs.org/download/hivex/${name}.tar.gz";
+ url = "http://libguestfs.org/download/hivex/${pname}-${version}.tar.gz";
sha256 = "0ibl186l6rd9qj4rqccfwbg1nnx6z07vspkhk656x6zav67ph7la";
};
diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix
index 99777bbd6f0f..11b6df37fc0c 100644
--- a/pkgs/development/libraries/hpx/default.nix
+++ b/pkgs/development/libraries/hpx/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkgconfig, python }:
stdenv.mkDerivation rec {
- name = "hpx-${version}";
+ pname = "hpx";
version = "1.3.0";
src = fetchFromGitHub {
owner = "STEllAR-GROUP";
repo = "hpx";
- rev = "${version}";
+ rev = version;
sha256 = "0yzxb8520qh9rvzsa190yzx21jn3d8rl8ac5v01767ygd0413hfk";
};
diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix
index 1537f9cc480b..f0968c47822c 100644
--- a/pkgs/development/libraries/htmlcxx/default.nix
+++ b/pkgs/development/libraries/htmlcxx/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "htmlcxx-${version}";
+ pname = "htmlcxx";
version = "0.86";
src = fetchurl {
- url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${pname}-${version}.tar.gz";
sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07";
};
diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index 68bf4ebec347..76173bc5b998 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -3,7 +3,8 @@
let
version = "2.9.2";
in stdenv.mkDerivation {
- name = "http-parser-${version}";
+ pname = "http-parser";
+ inherit version;
src = fetchFromGitHub {
owner = "nodejs";
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index 18e32585ce2a..a8dcea0059a2 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.7.0";
- name = "hunspell-${version}";
+ pname = "hunspell";
src = fetchurl {
url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index 4fa369e299d2..3e1799d82cde 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -6,7 +6,7 @@
let
mkDict =
{ name, readmeFile, dictFileName, ... }@args:
- stdenv.mkDerivation (rec {
+ stdenv.mkDerivation ({
inherit name;
installPhase = ''
# hunspell dicts
@@ -141,11 +141,12 @@ let
};
mkDictFromWordlist =
- { shortName, shortDescription, dictFileName, src }:
+ { shortName, shortDescription, srcFileName, dictFileName, src }:
mkDict rec {
- inherit src dictFileName;
+ inherit src srcFileName dictFileName;
version = "2018.04.16";
name = "hunspell-dict-${shortName}-wordlist-${version}";
+ srcReadmeFile = "README_" + srcFileName + ".txt";
readmeFile = "README_" + dictFileName + ".txt";
meta = with stdenv.lib; {
description = "Hunspell dictionary for ${shortDescription} from Wordlist";
@@ -158,7 +159,12 @@ let
phases = "unpackPhase installPhase";
sourceRoot = ".";
unpackCmd = ''
- unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile}
+ unzip $src ${srcFileName}.dic ${srcFileName}.aff ${srcReadmeFile}
+ '';
+ postUnpack = ''
+ mv ${srcFileName}.dic ${dictFileName}.dic || true
+ mv ${srcFileName}.aff ${dictFileName}.aff || true
+ mv ${srcReadmeFile} ${readmeFile} || true
'';
};
@@ -294,6 +300,7 @@ in rec {
en-us = mkDictFromWordlist {
shortName = "en-us";
shortDescription = "English (United States)";
+ srcFileName = "en_US";
dictFileName = "en_US";
src = fetchurl {
url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-2018.04.16.zip;
@@ -301,10 +308,23 @@ in rec {
};
};
+ en_US-large = en-us-large;
+ en-us-large = mkDictFromWordlist {
+ shortName = "en-us-large";
+ shortDescription = "English (United States) Large";
+ srcFileName = "en_US-large";
+ dictFileName = "en_US";
+ src = fetchurl {
+ url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-large-2018.04.16.zip;
+ sha256 = "1xm9jgqbivp5cb78ykjxg47vzq1yqj82l7r4q5cjpivrv99s49qc";
+ };
+ };
+
en_CA = en-ca;
en-ca = mkDictFromWordlist {
shortName = "en-ca";
shortDescription = "English (Canada)";
+ srcFileName = "en_CA";
dictFileName = "en_CA";
src = fetchurl {
url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-2018.04.16.zip;
@@ -312,24 +332,50 @@ in rec {
};
};
+ en_CA-large = en-ca-large;
+ en-ca-large = mkDictFromWordlist {
+ shortName = "en-ca-large";
+ shortDescription = "English (Canada) Large";
+ srcFileName = "en_CA-large";
+ dictFileName = "en_CA";
+ src = fetchurl {
+ url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-large-2018.04.16.zip;
+ sha256 = "1200xxyvv6ni8nk52v3059c367817vnrkm0cdh38rhiigb5flfha";
+ };
+ };
+
+ en_AU = en-au;
en-au = mkDictFromWordlist {
shortName = "en-au";
shortDescription = "English (Australia)";
+ srcFileName = "en_AU";
dictFileName = "en_AU";
src = fetchurl {
url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-2018.04.16.zip;
sha256 = "1kp06npl1kd05mm9r52cg2iwc13x02zwqgpibdw15b6x43agg6f5";
};
};
- en_AU = en-au;
+
+ en_AU-large = en-au-large;
+ en-au-large = mkDictFromWordlist {
+ shortName = "en-au-large";
+ shortDescription = "English (Australia) Large";
+ srcFileName = "en_AU-large";
+ dictFileName = "en_AU";
+ src = fetchurl {
+ url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-large-2018.04.16.zip;
+ sha256 = "14l1w4dpk0k1js2wwq5ilfil89ni8cigph95n1rh6xi4lzxj7h6g";
+ };
+ };
en_GB-ise = en-gb-ise;
en-gb-ise = mkDictFromWordlist {
shortName = "en-gb-ise";
shortDescription = "English (United Kingdom, 'ise' ending)";
- dictFileName = "en_GB-ise";
+ srcFileName = "en_GB-ise";
+ dictFileName = "en_GB";
src = fetchurl {
- url = mirror://sourceforge/wordlist/speller//hunspell-en_GB-ise-2018.04.16.zip;
+ url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ise-2018.04.16.zip;
sha256 = "0ylg1zvfvsawamymcc9ivrqcb9qhlpgpnizm076xc56jz554xc2l";
};
};
@@ -338,13 +384,26 @@ in rec {
en-gb-ize = mkDictFromWordlist {
shortName = "en-gb-ize";
shortDescription = "English (United Kingdom, 'ize' ending)";
- dictFileName = "en_GB-ize";
+ srcFileName = "en_GB-ize";
+ dictFileName = "en_GB";
src = fetchurl {
- url = mirror://sourceforge/wordlist/speller//hunspell-en_GB-ize-2018.04.16.zip;
+ url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ize-2018.04.16.zip;
sha256 = "1rmwy6sxmd400cwjf58az6g14sq28p18f5mlq8ybg8y33q9m42ps";
};
};
+ en_GB-large = en-gb-large;
+ en-gb-large = mkDictFromWordlist {
+ shortName = "en-gb-large";
+ shortDescription = "English (United Kingdom) Large";
+ srcFileName = "en_GB-large";
+ dictFileName = "en_GB";
+ src = fetchurl {
+ url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-large-2018.04.16.zip;
+ sha256 = "1y4d7x5vvi1qh1s3i09m0vvqrpdzzqhsdngr8nsh7hc5bnlm37mi";
+ };
+ };
+
/* SPANISH */
es_ANY = es-any;
@@ -542,7 +601,7 @@ in rec {
/* ITALIAN */
it_IT = it-it;
- it-it = mkDictFromLinguistico rec {
+ it-it = mkDictFromLinguistico {
shortName = "it-it";
dictFileName = "it_IT";
shortDescription = "Hunspell dictionary for 'Italian (Italy)' from Linguistico";
@@ -598,7 +657,7 @@ in rec {
/* SWEDISH */
sv_SE = sv-se;
- sv-se = mkDictFromDSSO rec {
+ sv-se = mkDictFromDSSO {
shortName = "sv-se";
dictFileName = "sv_SE";
shortDescription = "Swedish (Sweden)";
@@ -606,7 +665,7 @@ in rec {
# Finlandian Swedish (hello Linus Torvalds)
sv_FI = sv-fi;
- sv-fi = mkDictFromDSSO rec {
+ sv-fi = mkDictFromDSSO {
shortName = "sv-fi";
dictFileName = "sv_FI";
shortDescription = "Swedish (Finland)";
diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix
index d4ebb5534d9c..3d00d20f1700 100644
--- a/pkgs/development/libraries/idnkit/default.nix
+++ b/pkgs/development/libraries/idnkit/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libiconv }:
stdenv.mkDerivation rec {
- name = "idnkit-${version}";
+ pname = "idnkit";
version = "2.3";
src = fetchurl {
- url = "https://jprs.co.jp/idn/${name}.tar.bz2";
+ url = "https://jprs.co.jp/idn/${pname}-${version}.tar.bz2";
sha256 = "0zp9yc84ff5s0g2i6v9yfyza2n2x4xh0kq7hjd3anhh0clbp3l16";
};
diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix
index 867ce024d2fe..3a642c8837a3 100644
--- a/pkgs/development/libraries/ignition-math/default.nix
+++ b/pkgs/development/libraries/ignition-math/default.nix
@@ -3,8 +3,9 @@
let
version = "2.6.0";
in
-stdenv.mkDerivation rec {
- name = "ign-math2-${version}";
+stdenv.mkDerivation {
+ pname = "ign-math2";
+ inherit version;
src = fetchurl {
url = "http://gazebosim.org/distributions/ign-math/releases/ignition-math2-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix
index 8abff4c5f059..0e7603db5856 100644
--- a/pkgs/development/libraries/ignition-transport/generic.nix
+++ b/pkgs/development/libraries/ignition-transport/generic.nix
@@ -5,8 +5,9 @@
, ...
}:
-stdenv.mkDerivation rec {
- name = "ign-transport-${version}";
+stdenv.mkDerivation {
+ pname = "ign-transport";
+ inherit version;
inherit src;
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index a5b226ee9c74..98a34477e4f1 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook ];
- configureFlags = [ "--disable-static" "--enable-shared" ];
+ configureFlags = [ "--enable-shared" ];
meta = with stdenv.lib; {
homepage = https://www.openprinting.org/download/ijs/;
diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix
index b97f62dcf25c..6330347cd275 100644
--- a/pkgs/development/libraries/iksemel/default.nix
+++ b/pkgs/development/libraries/iksemel/default.nix
@@ -1,7 +1,7 @@
{ stdenv, autoreconfHook, libtool, pkgconfig, gnutls, fetchFromGitHub, texinfo }:
stdenv.mkDerivation rec {
- name = "iksemel-${version}";
+ pname = "iksemel";
version = "1.4.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 2d22788e1ecd..5cc0f7c1f46d 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which }:
stdenv.mkDerivation rec {
- name = "ilmbase-${version}";
+ pname = "ilmbase";
version = "2.3.0";
src = fetchurl {
- url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz";
+ url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5";
};
diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix
index b55d13ecc3f4..5ad3e249fc32 100644
--- a/pkgs/development/libraries/iml/default.nix
+++ b/pkgs/development/libraries/iml/default.nix
@@ -1,6 +1,6 @@
{stdenv, autoreconfHook, fetchurl, gmp, openblas}:
stdenv.mkDerivation rec {
- name = "iml-${version}";
+ pname = "iml";
version = "1.0.5";
src = fetchurl {
url = "http://www.cs.uwaterloo.ca/~astorjoh/iml-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix
index a4a009c66580..f74477eab384 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, tcl}:
-stdenv.mkDerivation rec {
- name = "incrtcl-${version}";
+stdenv.mkDerivation {
+ pname = "incrtcl";
version = "4.0.4";
src = fetchurl {
diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix
index 36b637c62bb2..16a21382d857 100644
--- a/pkgs/development/libraries/indicator-application/gtk2.nix
+++ b/pkgs/development/libraries/indicator-application/gtk2.nix
@@ -6,7 +6,7 @@
with lib;
stdenv.mkDerivation rec {
- name = "indicator-application-gtk2-${version}";
+ pname = "indicator-application-gtk2";
version = "12.10.0.1";
src = fetchurl {
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
];
meta = {
- description = "Indicator to take menus from applications and place them in the panel (GTK+ 2 library for Xfce/LXDE)";
+ description = "Indicator to take menus from applications and place them in the panel (GTK 2 library for Xfce/LXDE)";
homepage = https://launchpad.net/indicators-gtk2;
license = licenses.gpl3;
platforms = platforms.linux;
diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix
index 8beda8663c5c..51c6728e8b00 100644
--- a/pkgs/development/libraries/iniparser/default.nix
+++ b/pkgs/development/libraries/iniparser/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "iniparser-${version}";
+ pname = "iniparser";
version = "4.1";
src = fetchFromGitHub {
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
mkdir -p $out/include
cp src/*.h $out/include
- mkdir -p $out/share/doc/${name}
+ mkdir -p $out/share/doc/${pname}-${version}
for i in AUTHORS INSTALL LICENSE README.md; do
- bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2;
+ bzip2 -c -9 $i > $out/share/doc/${pname}-${version}/$i.bz2;
done;
- cp -r html $out/share/doc/${name}
+ cp -r html $out/share/doc/${pname}-${version}
cp libiniparser.a $out/lib
cp libiniparser.so.1 $out/lib
diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index 1212d3817d4c..53b89f17ea5c 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
- name = "intel-gmmlib-${version}";
+ pname = "intel-gmmlib";
version = "19.2.3";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "0hki53czv1na7h5b06fcwkd8bhn690ywg6dwjfs3x9fa4g48kqjb";
};
diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
index e549067b11f0..e3dbfa52db22 100644
--- a/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "intel-media-driver-${version}";
+ pname = "intel-media-driver";
version = "19.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix
index 274058b7ec99..67bee86bfa93 100644
--- a/pkgs/development/libraries/intel-media-sdk/default.nix
+++ b/pkgs/development/libraries/intel-media-sdk/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "intel-media-sdk-${version}";
+ pname = "intel-media-sdk";
version = "19.1.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix
index a48908f41dd4..50ae63f2d0d6 100644
--- a/pkgs/development/libraries/ip2location-c/default.nix
+++ b/pkgs/development/libraries/ip2location-c/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "ip2location-c-${version}";
+ pname = "ip2location-c";
version = "7.0.2"; # meta.homepage might change after a major update
src = fetchurl {
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index d28ae012e574..35ef14cbc135 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
- name = "irrlicht-${version}";
+ pname = "irrlicht";
version = "1.8.4";
src = fetchzip {
- url = "mirror://sourceforge/irrlicht/${name}.zip";
+ url = "mirror://sourceforge/irrlicht/${pname}-${version}.zip";
sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f";
};
diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix
index 20a60f1a102d..13c71dc8f704 100644
--- a/pkgs/development/libraries/isl/0.11.1.nix
+++ b/pkgs/development/libraries/isl/0.11.1.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, gmp }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08.
src = fetchurl {
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index 43ab20da8ae0..37d6c0643c73 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl, gettext, python3}:
stdenv.mkDerivation rec {
- name = "iso-codes-${version}";
- version = "3.79";
+ pname = "iso-codes";
+ version = "4.3";
src = fetchurl {
- url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${name}.tar.xz";
- sha256 = "08i8hjy0qjlw9kd9i87jx967ihwh45l2xi55q1aa5265sind7byb";
+ url = "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/${pname}-${version}/${pname}-${pname}-${version}.tar.bz2";
+ sha256 = "11n3sccwapfr7npxad8m3xmc7w8i11kk70ffbz25gj82bn8rylvb";
};
patchPhase = ''
diff --git a/pkgs/development/libraries/itk/4.x.nix b/pkgs/development/libraries/itk/4.x.nix
new file mode 100644
index 000000000000..df016d9fcac0
--- /dev/null
+++ b/pkgs/development/libraries/itk/4.x.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }:
+
+stdenv.mkDerivation rec {
+ name = "itk-4.13.1";
+
+ src = fetchurl {
+ url = mirror://sourceforge/itk/InsightToolkit-4.13.1.tar.xz;
+ sha256 = "0p4cspgbnjsnkjz8nfg092yaxz8qkqi2nkxjdv421d0zrmi0i2al";
+ };
+
+ cmakeFlags = [
+ "-DBUILD_TESTING=OFF"
+ "-DBUILD_EXAMPLES=OFF"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DModule_ITKMINC=ON"
+ "-DModule_ITKIOMINC=ON"
+ "-DModule_ITKIOTransformMINC=ON"
+ "-DModule_ITKVtkGlue=ON"
+ "-DModule_ITKReview=ON"
+ ];
+
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [ cmake xz ];
+ buildInputs = [ libX11 libuuid vtk ];
+
+ meta = {
+ description = "Insight Segmentation and Registration Toolkit";
+ homepage = http://www.itk.org/;
+ license = stdenv.lib.licenses.asl20;
+ maintainers = with stdenv.lib.maintainers; [viric];
+ platforms = with stdenv.lib.platforms; linux ++ darwin;
+ };
+}
diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix
index 29fabdbb3b63..26ec06fad7bf 100644
--- a/pkgs/development/libraries/jama/default.nix
+++ b/pkgs/development/libraries/jama/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, unzip, tnt}:
stdenv.mkDerivation rec {
- name = "jama-${version}";
+ pname = "jama";
version = "1.2.5";
src = fetchurl {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ tnt ];
unpackPhase = ''
- mkdir "${name}"
+ mkdir "${pname}-${version}"
unzip "$src"
'';
installPhase = ''
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 946bc17e7643..1bad3394b6ac 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, libjpeg, cmake }:
stdenv.mkDerivation rec {
- name = "jasper-${version}";
+ pname = "jasper";
version = "2.0.16";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix
index 8d9b4e54fe8d..4a2b030a3dbf 100644
--- a/pkgs/development/libraries/java/commons/bcel/default.nix
+++ b/pkgs/development/libraries/java/commons/bcel/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "5.2";
- name = "commons-bcel-${version}";
+ pname = "commons-bcel";
src = fetchurl {
url = "mirror://apache/commons/bcel/binaries/bcel-${version}.tar.gz";
diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix
index 3c729f42320a..d418145e1b5f 100644
--- a/pkgs/development/libraries/java/commons/compress/default.nix
+++ b/pkgs/development/libraries/java/commons/compress/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.18";
- name = "commons-compress-${version}";
+ pname = "commons-compress";
src = fetchurl {
- url = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz";
+ url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz";
sha256 = "0ciwzq134rqh1fp7qba091rajf2pdagfb665rarni7glb2x4lha1";
};
diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix
index 6fddc3cfe0c3..0aca6bf8baaa 100644
--- a/pkgs/development/libraries/java/commons/fileupload/default.nix
+++ b/pkgs/development/libraries/java/commons/fileupload/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.3.1";
- name = "commons-fileupload-${version}";
+ pname = "commons-fileupload";
src = fetchurl {
- url = "mirror://apache/commons/fileupload/binaries/${name}-bin.tar.gz";
+ url = "mirror://apache/commons/fileupload/binaries/${pname}-${version}-bin.tar.gz";
sha256 = "1jy7w2j2ay56mpq4ij3331cf9zgpkm832ydr63svb35j0ymnky72";
};
installPhase = ''
diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix
index 03b083328da4..c545ad68e727 100644
--- a/pkgs/development/libraries/java/commons/io/default.nix
+++ b/pkgs/development/libraries/java/commons/io/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "2.6";
- name = "commons-io-${version}";
+ pname = "commons-io";
src = fetchurl {
- url = "mirror://apache/commons/io/binaries/${name}-bin.tar.gz";
+ url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz";
sha256 = "1nzkv8gi56l1m4h7s8bcvqm0naq3bhh7fazcmgdhcr2zkjs5zfmn";
};
diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix
index 322cb486e93e..675265ed4e32 100644
--- a/pkgs/development/libraries/java/commons/lang/default.nix
+++ b/pkgs/development/libraries/java/commons/lang/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "3.9";
- name = "commons-lang-${version}";
+ pname = "commons-lang";
src = fetchurl {
url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz";
diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix
index 10c39f037890..7c4fc5c632e2 100644
--- a/pkgs/development/libraries/java/commons/math/default.nix
+++ b/pkgs/development/libraries/java/commons/math/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "3.6.1";
- name = "commons-math-${version}";
+ pname = "commons-math";
src = fetchurl {
url = "mirror://apache/commons/math/binaries/commons-math3-${version}-bin.tar.gz";
diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix
index de031a08fe8c..e485eabe1cbf 100644
--- a/pkgs/development/libraries/java/cup/default.nix
+++ b/pkgs/development/libraries/java/cup/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jdk, ant } :
stdenv.mkDerivation rec {
- name = "java-cup-${version}";
+ pname = "java-cup";
version = "11b-20160615";
src = fetchurl {
diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix
index 7d1fac39b1cb..1f2aeda80cfe 100644
--- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix
+++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix
@@ -1,7 +1,7 @@
{ fetchgit, stdenv, ant, jdk }:
-stdenv.mkDerivation rec {
- name = "hydra-ant-logger-${version}";
+stdenv.mkDerivation {
+ pname = "hydra-ant-logger";
version = "2010.2";
src = fetchgit {
diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix
index 402f893034b6..e25106e22c6c 100644
--- a/pkgs/development/libraries/java/jzmq/default.nix
+++ b/pkgs/development/libraries/java/jzmq/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zeromq3, jdk }:
stdenv.mkDerivation rec {
- name = "jzmq-${version}";
+ pname = "jzmq";
version = "3.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix
index 691b9905b04f..c0eabe51657d 100644
--- a/pkgs/development/libraries/java/lucene/default.nix
+++ b/pkgs/development/libraries/java/lucene/default.nix
@@ -1,13 +1,13 @@
{stdenv, fetchurl} :
stdenv.mkDerivation rec {
- name = "lucene-${version}";
+ pname = "lucene";
version = "1.4.3";
builder = ./builder.sh;
src = fetchurl {
- url = "https://archive.apache.org/dist/jakarta/lucene/${name}.tar.gz";
+ url = "https://archive.apache.org/dist/jakarta/lucene/${pname}-${version}.tar.gz";
sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh";
};
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix
index 544f0f4c4e91..0fdce1bceed0 100644
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/pkgs/development/libraries/java/rhino/default.nix
@@ -10,7 +10,8 @@ let
in
stdenv.mkDerivation {
- name = "rhino-${version}";
+ pname = "rhino";
+ inherit version;
src = fetchurl {
url = "mirror://mozilla/js/rhino1_7R2.zip";
diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
index c2acd2348938..a93d77742915 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -5,13 +5,13 @@
let
platformMap = {
- "x86_64-linux" =
+ x86_64-linux =
{ platform = "gtk-linux-x86_64";
sha256 = "1qq0pjll6030v4ml0hifcaaik7sx3fl7ghybfdw95vsvxafwp2ff"; };
- "i686-linux" =
+ i686-linux =
{ platform = "gtk-linux-x86";
sha256 = "03mhzraikcs4fsz7d3h5af9pw1bbcfd6dglsvbk2ciwimy9zj30q"; };
- "x86_64-darwin" =
+ x86_64-darwin =
{ platform = "cocoa-macosx-x86_64";
sha256 = "00k1mfbncvyh8klgmk0891w8jwnd5niqb16j1j8yacrm2smmlb05"; };
};
@@ -21,7 +21,7 @@ let
in stdenv.mkDerivation rec {
version = "4.5";
fullVersion = "${version}-201506032000";
- name = "swt-${version}";
+ pname = "swt";
hardeningDisable = [ "format" ];
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
# releases of SWT. So we just grab a binary release and extract
# "src.zip" from that.
src = fetchurl {
- url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${name}-${metadata.platform}.zip";
+ url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${pname}-${version}-${metadata.platform}.zip";
sha256 = metadata.sha256;
};
diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix
index c14ac7c65abd..128910e00f21 100644
--- a/pkgs/development/libraries/jemalloc/common.nix
+++ b/pkgs/development/libraries/jemalloc/common.nix
@@ -12,11 +12,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "jemalloc-${version}";
+ pname = "jemalloc";
inherit version;
src = fetchurl {
- url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2";
+ url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${pname}-${version}.tar.bz2";
inherit sha256;
};
@@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
configureFlags = []
++ optional stripPrefix "--with-jemalloc-prefix="
++ optional disableInitExecTls "--disable-initial-exec-tls"
+ # jemalloc is unable to correctly detect transparent hugepage support on
+ # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default
+ # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support
+ ++ optionals (stdenv.isAarch32 && versionOlder version "5") [
+ "--disable-thp"
+ "je_cv_thp=no"
+ ]
;
doCheck = true;
diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix
index 175097ef7855..726e00b58bba 100644
--- a/pkgs/development/libraries/jitterentropy/default.nix
+++ b/pkgs/development/libraries/jitterentropy/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "jitterentropy-${version}";
+ pname = "jitterentropy";
version = "2.1.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index fa2b45ae948e..c62f1e2de3f3 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "jsoncpp";
- version = "1.9.0";
+ version = "1.9.1";
src = fetchFromGitHub {
owner = "open-source-parsers";
repo = "jsoncpp";
rev = version;
- sha256 = "10wnwlq92gp32f5p55kjcc12jfsl0yq6f2y4abb0si6wym12krw9";
+ sha256 = "00g356iv3kcp0gadj7gbyzf9jn9avvx9vxbxc7c2i5nnry8z72wj";
};
/* During darwin bootstrap, we have a cp that doesn't understand the
diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix
index 47c87da065ba..bc5be3172ec8 100644
--- a/pkgs/development/libraries/jxrlib/default.nix
+++ b/pkgs/development/libraries/jxrlib/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, python }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "jxrlib";
version = "1.1";
diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix
index 0cd8ab503566..4a403a19964e 100644
--- a/pkgs/development/libraries/kdb/default.nix
+++ b/pkgs/development/libraries/kdb/default.nix
@@ -7,10 +7,9 @@
mkDerivation rec {
pname = "kdb";
version = "3.2.0";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+ url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz";
sha256 = "0s909x34a56n3xwhqz27irl2gbzidax0685w2kf34f0liny872cg";
};
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 7745d78f8fca..ef1171b17601 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -64,7 +64,7 @@ let
let
inherit (args) name;
- inherit (srcs."${name}") src version;
+ inherit (srcs.${name}) src version;
outputs = args.outputs or [ "bin" "dev" "out" ];
hasSeparateDev = lib.elem "dev" outputs;
@@ -77,7 +77,7 @@ let
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
- maintainers = [ lib.maintainers.ttuegel ];
+ maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
platforms = lib.platforms.linux;
} // (args.meta or {});
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index afab8a4e9a43..096376ca6712 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.58/ )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.61/ )
diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
index b7dcfb7fe64c..9f682b449752 100644
--- a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
@@ -8,4 +8,7 @@ mkDerivation {
buildInputs = [ kconfig kcoreaddons kio kparts ];
propagatedBuildInputs = [ qtwebkit ];
outputs = [ "out" "dev" ];
+ cmakeFlags = [
+ "-DBUILD_DESIGNERPLUGIN=OFF"
+ ];
}
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch b/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
index 75e632d41292..89145e3e1dde 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
+++ b/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
@@ -2,15 +2,13 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp
===================================================================
--- kinit-5.32.0.orig/src/kdeinit/kinit.cpp
+++ kinit-5.32.0/src/kdeinit/kinit.cpp
-@@ -96,11 +96,9 @@ static const char *extra_libs[] = {
+@@ -96,9 +96,9 @@ static const char *extra_libs[] = {
"libKF5Parts.5.dylib",
"libKF5Plasma.5.dylib"
#else
- "libKF5KIOCore.so.5",
- "libKF5Parts.so.5",
--//#ifdef __KDE_HAVE_GCC_VISIBILITY // Removed for KF5, we'll see.
- "libKF5Plasma.so.5"
--//#endif
+ NIXPKGS_KF5_KIOCORE,
+ NIXPKGS_KF5_PARTS,
+ NIXPKGS_KF5_PLASMA
diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix
index ee19b39bd159..c19836ed7a72 100644
--- a/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, propagateBin,
extra-cmake-modules,
- qtbase, wayland
+ qtbase, wayland, wayland-protocols
}:
mkDerivation {
@@ -11,7 +11,7 @@ mkDerivation {
broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
- buildInputs = [ wayland ];
+ buildInputs = [ wayland wayland-protocols ];
propagatedBuildInputs = [ qtbase ];
setupHook = propagateBin; # XDG_CONFIG_DIRS
}
diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix
index 147c4123a105..1484b2d04891 100644
--- a/pkgs/development/libraries/kde-frameworks/purpose.nix
+++ b/pkgs/development/libraries/kde-frameworks/purpose.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib, extra-cmake-modules, qtbase
-, qtdeclarative, kconfig, kcoreaddons, ki18n, kio
+, qtdeclarative, kconfig, kcoreaddons, ki18n, kio, kirigami2
}:
mkDerivation {
@@ -9,6 +9,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
qtbase qtdeclarative kconfig kcoreaddons
- ki18n kio
+ ki18n kio kirigami2
];
}
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 17473db9eebd..549f99a55886 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,635 +3,635 @@
{
attica = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/attica-5.58.0.tar.xz";
- sha256 = "edba3f94705f904edb0bddd5bab491575bb15ee8f278b92b41272d6f566cad2a";
- name = "attica-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/attica-5.61.0.tar.xz";
+ sha256 = "9d3ad34c17223333b5a77144cc5a9d941cbb7baa01ab4a2ffe34ae9398c90dde";
+ name = "attica-5.61.0.tar.xz";
};
};
baloo = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/baloo-5.58.0.tar.xz";
- sha256 = "a1e9340f1046f2df1568da6cd07b26bac9361725cd32b46fd69c370aab0c7227";
- name = "baloo-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/baloo-5.61.0.tar.xz";
+ sha256 = "dd559e06237843f51d68eb5001b835037d4b2f6d62b7dc4d040961f9863632f1";
+ name = "baloo-5.61.0.tar.xz";
};
};
bluez-qt = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/bluez-qt-5.58.0.tar.xz";
- sha256 = "530dc2f89ca26cda23a6383ccfdb00584083d2fbee3b437e5337a77f51513da0";
- name = "bluez-qt-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/bluez-qt-5.61.0.tar.xz";
+ sha256 = "0ea647de61fcc18a85c660fa8e05fe93072a713a8d00a018ba8e99ea790e5d27";
+ name = "bluez-qt-5.61.0.tar.xz";
};
};
breeze-icons = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/breeze-icons-5.58.0.tar.xz";
- sha256 = "536d2790a143bf0d8cc9ee4de74dea0924eb7d3ac4888fece7bf7c7038066491";
- name = "breeze-icons-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/breeze-icons-5.61.0.tar.xz";
+ sha256 = "1d260a01a2617f5f755d2eb38423af19bf4a1a2ccfa9339b441b4f6be6381c30";
+ name = "breeze-icons-5.61.0.tar.xz";
};
};
extra-cmake-modules = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/extra-cmake-modules-5.58.0.tar.xz";
- sha256 = "514011c12eeb2ac99d3118975832a279af2c2eea5e8b36b49c81962930b2ecc7";
- name = "extra-cmake-modules-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/extra-cmake-modules-5.61.0.tar.xz";
+ sha256 = "a86a3b12c8a540af822131a8d65586d985267b1d642c29b4815b6c7870bc126c";
+ name = "extra-cmake-modules-5.61.0.tar.xz";
};
};
frameworkintegration = {
- version = "5.58.1";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/frameworkintegration-5.58.1.tar.xz";
- sha256 = "30a9e6c4bde295a031f94ea622ce2324b8a98536f51f0a008b148ea11c44a274";
- name = "frameworkintegration-5.58.1.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/frameworkintegration-5.61.0.tar.xz";
+ sha256 = "a1a2bbb15d287b67643750cb5414ceb10c6583861dd5c00118010d409f106efb";
+ name = "frameworkintegration-5.61.0.tar.xz";
};
};
kactivities = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kactivities-5.58.0.tar.xz";
- sha256 = "5295cfdc392a8146ca9c3822f1250ceaf5b54990d69c2e3dec4b072519a5ce5b";
- name = "kactivities-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kactivities-5.61.0.tar.xz";
+ sha256 = "0d7d7e5bd68541ad1dcf1f96c7205330cb7b075c6ff0d8b46774e781eff84af5";
+ name = "kactivities-5.61.0.tar.xz";
};
};
kactivities-stats = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kactivities-stats-5.58.0.tar.xz";
- sha256 = "5f3bde50ffe0c23ad5f28c7327d375f223535f139ff014c5d53aef2f41e80611";
- name = "kactivities-stats-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kactivities-stats-5.61.0.tar.xz";
+ sha256 = "9062eb0f189f1b50674e65a7db9a4b821c628acd1ac650000cebbf1f7bdf0068";
+ name = "kactivities-stats-5.61.0.tar.xz";
};
};
kapidox = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kapidox-5.58.0.tar.xz";
- sha256 = "8635b09f7d0daa8554f228d471bbb1147cf412b779e3a8ab7c2bf7c24ec85165";
- name = "kapidox-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kapidox-5.61.0.tar.xz";
+ sha256 = "3c948c87c7f7b16a3835f7df8387c110efe5fefecf8a7d6ffa1cae647be0669f";
+ name = "kapidox-5.61.0.tar.xz";
};
};
karchive = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/karchive-5.58.0.tar.xz";
- sha256 = "cd5a42101e5cc50f026f48002dc8125e0c898b148fea5fba4451023ec1e181ad";
- name = "karchive-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/karchive-5.61.0.tar.xz";
+ sha256 = "457ed420449630625cb161fcc9bedc7c6a16527f48d6db4008aea76cdb948387";
+ name = "karchive-5.61.0.tar.xz";
};
};
kauth = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kauth-5.58.0.tar.xz";
- sha256 = "8c004199f1e7aa14f9244299bb8b288f6d077e5c2557f089a530d0c1cd072f4f";
- name = "kauth-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kauth-5.61.0.tar.xz";
+ sha256 = "b04458f32046b2dd61b48118646180df63d2c843cb2d53560aaa15168df087f1";
+ name = "kauth-5.61.0.tar.xz";
};
};
kbookmarks = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kbookmarks-5.58.0.tar.xz";
- sha256 = "9b34f49703101e4d9f6338b66edded7b2c1b7826938a81025ede85a7edc71b02";
- name = "kbookmarks-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kbookmarks-5.61.0.tar.xz";
+ sha256 = "24f87ff1acc5f0c257518f67af277b454566e607f82eb09e75b4a6ed02403377";
+ name = "kbookmarks-5.61.0.tar.xz";
};
};
kcmutils = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kcmutils-5.58.0.tar.xz";
- sha256 = "2eec73ffca93eb5fc9975a96e072c565a4907b05c161f49877684f4ab252fd9d";
- name = "kcmutils-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kcmutils-5.61.0.tar.xz";
+ sha256 = "b8b79ef2f4513fbe5e4c61cf4726ed33b95efffabdd512fcc2dcff23c23cdfa7";
+ name = "kcmutils-5.61.0.tar.xz";
};
};
kcodecs = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kcodecs-5.58.0.tar.xz";
- sha256 = "6e5b3c2083c840947e255d58b338128a5e498a4176969f6ac724d56ca3cae8ef";
- name = "kcodecs-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kcodecs-5.61.0.tar.xz";
+ sha256 = "4604323e44c1be7547f25b43b71bd541048c3d036a7fc5ca74e5ece9792ff5ee";
+ name = "kcodecs-5.61.0.tar.xz";
};
};
kcompletion = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kcompletion-5.58.0.tar.xz";
- sha256 = "4f5be9d3a70183e0580126c6395d34e3e4141d6e6f852f5f0bb578b20205f5dd";
- name = "kcompletion-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kcompletion-5.61.0.tar.xz";
+ sha256 = "68697be65d6c9e0053fc3e504170d23c3162c05a0a9027249c575bc6dc8bd3ec";
+ name = "kcompletion-5.61.0.tar.xz";
};
};
kconfig = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kconfig-5.58.0.tar.xz";
- sha256 = "6f464a63079f43f11deb7f1661dadaa12539b8a8c75e3fa7476dae8ab6886a5e";
- name = "kconfig-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kconfig-5.61.0.tar.xz";
+ sha256 = "94c0e292a5d57e014aa745be6b59a989118ead1252d56c768f2719b5c6471372";
+ name = "kconfig-5.61.0.tar.xz";
};
};
kconfigwidgets = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kconfigwidgets-5.58.0.tar.xz";
- sha256 = "8d68cf5618b7123a39e62a8ee52a01af7f95325b1d7b7bcac097c0d723c054c0";
- name = "kconfigwidgets-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kconfigwidgets-5.61.0.tar.xz";
+ sha256 = "4cc1e55c5f994abbec03b32bef73bdf54c2613199a446ad63f4ced6e3a0e2165";
+ name = "kconfigwidgets-5.61.0.tar.xz";
};
};
kcoreaddons = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kcoreaddons-5.58.0.tar.xz";
- sha256 = "f01f3d8b8086085e034a530821a929e56943e33002091d29ab45e0772b6f8e5e";
- name = "kcoreaddons-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kcoreaddons-5.61.0.tar.xz";
+ sha256 = "6a4ea2eca77944c24fe63d2f7111913db721533d5971497cb5bdd2cac896e813";
+ name = "kcoreaddons-5.61.0.tar.xz";
};
};
kcrash = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kcrash-5.58.0.tar.xz";
- sha256 = "cf921f0ced115107a57a4f15e95ea2d0478b56baf23102abc2470ecd6b8e3c44";
- name = "kcrash-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kcrash-5.61.0.tar.xz";
+ sha256 = "83e6333ea0cd7d1ded3fa84f126e3c86a010d7bdb7fd183e7c5d42a8b8e74db8";
+ name = "kcrash-5.61.0.tar.xz";
};
};
kdbusaddons = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kdbusaddons-5.58.0.tar.xz";
- sha256 = "42f176b737f81e120d2fa78c20891b3b7e3f182c6e144ec9c99935a32d63f9b1";
- name = "kdbusaddons-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kdbusaddons-5.61.0.tar.xz";
+ sha256 = "f24fadc71670591bb679cde68147e53819f6c3d56126ecbafe59688fc47b347d";
+ name = "kdbusaddons-5.61.0.tar.xz";
};
};
kdeclarative = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kdeclarative-5.58.0.tar.xz";
- sha256 = "267d1dbe55ca65c74289e56200b51de95bcbc231b2d4a2867cb6735d04783bec";
- name = "kdeclarative-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kdeclarative-5.61.0.tar.xz";
+ sha256 = "464a77f88cce72c1616654c371068c11d51e484e0de5c0c5e032126d71afedaa";
+ name = "kdeclarative-5.61.0.tar.xz";
};
};
kded = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kded-5.58.0.tar.xz";
- sha256 = "c8ca04174ff9997ccedb382fce7bc4573670ac5dabc69c0d6594589098ab6dc1";
- name = "kded-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kded-5.61.0.tar.xz";
+ sha256 = "ca970111cb2d0073305a226cc005e2085952c2a02703168a775f954d27d723bc";
+ name = "kded-5.61.0.tar.xz";
};
};
kdelibs4support = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/portingAids/kdelibs4support-5.58.0.tar.xz";
- sha256 = "c86db5d334c022d804cd9473f893b462904e336aad1ce2c350a1c87039d9473a";
- name = "kdelibs4support-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/portingAids/kdelibs4support-5.61.0.tar.xz";
+ sha256 = "ae6f7c10e1fe67ded687f38a8ab3c8d483ae06ae69344bd1e683af752cf40b5c";
+ name = "kdelibs4support-5.61.0.tar.xz";
};
};
kdesignerplugin = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kdesignerplugin-5.58.0.tar.xz";
- sha256 = "c80a88a525c25fb699412e5c4a4a142ae388ab056aa826a9f5433e78da9c6e6b";
- name = "kdesignerplugin-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kdesignerplugin-5.61.0.tar.xz";
+ sha256 = "6b204dffbb4897f51143650d75383b5a3ddf4254455e5827d316c7b4ee7b3f33";
+ name = "kdesignerplugin-5.61.0.tar.xz";
};
};
kdesu = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kdesu-5.58.0.tar.xz";
- sha256 = "9121dd13a37e0fe5d5d42bbc164d4e20228f85a9ed745829393d3292f7c8183b";
- name = "kdesu-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kdesu-5.61.0.tar.xz";
+ sha256 = "398e74bdfe695ec2d7b57ce78f9fce3e19bb447a8eb5924441718a8f7384f888";
+ name = "kdesu-5.61.0.tar.xz";
};
};
kdewebkit = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kdewebkit-5.58.0.tar.xz";
- sha256 = "9f0629902e60717ee455f0a3e1201c735794f9c60e2fb6ec55b5983f532a2cbc";
- name = "kdewebkit-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/portingAids/kdewebkit-5.61.0.tar.xz";
+ sha256 = "1ee2a00ee3d95df9270e8c3d434568cda8f42151e361bc07fe374bf0f7afe211";
+ name = "kdewebkit-5.61.0.tar.xz";
};
};
kdnssd = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kdnssd-5.58.0.tar.xz";
- sha256 = "d3b6ee64f4ed491120351732abf99712e64d43deb1b796d4b701e28df9efad05";
- name = "kdnssd-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kdnssd-5.61.0.tar.xz";
+ sha256 = "02d70e5ee18697867c1a12373c1dbe31e1efba1fcb1e26bba3c75472cd3b271d";
+ name = "kdnssd-5.61.0.tar.xz";
};
};
kdoctools = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kdoctools-5.58.0.tar.xz";
- sha256 = "5c0b915d0f054098b47c5c1ef6ee0d174a9a607405f23c3921276189cefd48f4";
- name = "kdoctools-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kdoctools-5.61.0.tar.xz";
+ sha256 = "e48d8f8f075171c6b83189999a10552c772c6a7e9a115a2643414f9ecec77c6f";
+ name = "kdoctools-5.61.0.tar.xz";
};
};
kemoticons = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kemoticons-5.58.0.tar.xz";
- sha256 = "a34159566511f4c012186c52ae203c033d0cb81eef349fd89dbdc225f89b98bd";
- name = "kemoticons-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kemoticons-5.61.0.tar.xz";
+ sha256 = "cfc17de43320fbb353be30ae8d5b448b88da6f83bd23e29d678cd95a4bd7a380";
+ name = "kemoticons-5.61.0.tar.xz";
};
};
kfilemetadata = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kfilemetadata-5.58.0.tar.xz";
- sha256 = "76665ba8ba6ab90cc0e8d682a5c5421fde7c436f5521c614d0b63c5277fabf9c";
- name = "kfilemetadata-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kfilemetadata-5.61.0.tar.xz";
+ sha256 = "15f20af053c71c1e5ba6c6ade90b7cce27645b27ee30f1e6e73038e81a2c958e";
+ name = "kfilemetadata-5.61.0.tar.xz";
};
};
kglobalaccel = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kglobalaccel-5.58.0.tar.xz";
- sha256 = "4fd49052697d4659f793b8f7d678a9333a850ed6cf17472eaba9c023430b5bbf";
- name = "kglobalaccel-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kglobalaccel-5.61.0.tar.xz";
+ sha256 = "ad6bd2648e39854369555dd8a0823b08d9631f3638472627eb80e01d9902150e";
+ name = "kglobalaccel-5.61.0.tar.xz";
};
};
kguiaddons = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kguiaddons-5.58.0.tar.xz";
- sha256 = "d6d5884f31072fe93804ecad72c8f612fa03d6841318211ad8f6ebf1f5f020f3";
- name = "kguiaddons-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kguiaddons-5.61.0.tar.xz";
+ sha256 = "40cefa421b5ad5cf211875a35408ba526a5fb34e5ba19ebbda718dbf6b742520";
+ name = "kguiaddons-5.61.0.tar.xz";
};
};
kholidays = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kholidays-5.58.0.tar.xz";
- sha256 = "ec05faf5290a83d2450be6e1a68c086e4d2da934b3aaf61d578e3cda72295eef";
- name = "kholidays-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kholidays-5.61.0.tar.xz";
+ sha256 = "ce3d879824a3e429b468008c1ccec5de44c07299d412ea32f9a2a814c27c08c1";
+ name = "kholidays-5.61.0.tar.xz";
};
};
khtml = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/portingAids/khtml-5.58.0.tar.xz";
- sha256 = "f75635e4d0ad9816953bbd0f8c18aea7cd470dc130a6294fa1d32c37bd66dcff";
- name = "khtml-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/portingAids/khtml-5.61.0.tar.xz";
+ sha256 = "5d8612b584eecf96959d56bb75b1470b3b34ff7176cef7a0a15bc2531b21720b";
+ name = "khtml-5.61.0.tar.xz";
};
};
ki18n = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/ki18n-5.58.0.tar.xz";
- sha256 = "ea0181b15ff47b34ae7dd7a3a419c461cf05554f9014886d8b8b2ab2ec243977";
- name = "ki18n-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/ki18n-5.61.0.tar.xz";
+ sha256 = "d8c0594268b386ee42823360aa937c664cf04eedac8232bc18a653a9c52491d9";
+ name = "ki18n-5.61.0.tar.xz";
};
};
kiconthemes = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kiconthemes-5.58.0.tar.xz";
- sha256 = "ec12602159b7115c91b30373321ab631f75b12f814769166b4ee2e3abd83c480";
- name = "kiconthemes-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kiconthemes-5.61.0.tar.xz";
+ sha256 = "341741abd0b8aeeec8a2a87fe781b4ec1ab593563b1c063cdfdccead3706cdd7";
+ name = "kiconthemes-5.61.0.tar.xz";
};
};
kidletime = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kidletime-5.58.0.tar.xz";
- sha256 = "86d8c4ff13b864c07f98d0475683838708c43e4ba6275e05f21766e2a79cfd90";
- name = "kidletime-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kidletime-5.61.0.tar.xz";
+ sha256 = "8fb302dcc5b891ac2f06b5278bd6e08043772f3325bc209175c945280621fca2";
+ name = "kidletime-5.61.0.tar.xz";
};
};
kimageformats = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kimageformats-5.58.0.tar.xz";
- sha256 = "deb5b18c8289e2ce1988769f6b87dd7ad57dde6c15e51a474e51eef76568a9d9";
- name = "kimageformats-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kimageformats-5.61.0.tar.xz";
+ sha256 = "5a81359a043e201b29e205dd93559de077e0317d26712cb1c07e624d76aeb207";
+ name = "kimageformats-5.61.0.tar.xz";
};
};
kinit = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kinit-5.58.0.tar.xz";
- sha256 = "22c2adb9b1b52d0f90db9c36bd0313250d986a207f781c0582e85c4805297e53";
- name = "kinit-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kinit-5.61.0.tar.xz";
+ sha256 = "1806bba9cc3f4d9c5ed23f49eca30707e8f74a99d35f5022130a46a395f2858f";
+ name = "kinit-5.61.0.tar.xz";
};
};
kio = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kio-5.58.0.tar.xz";
- sha256 = "14c74959824a288d7fae17acbd2786eee1f0a2545cb9bf39c43bbd862ec55069";
- name = "kio-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kio-5.61.0.tar.xz";
+ sha256 = "1fa35126f8167bdbe029e515d01c8d4b91a07556ce6d5c9418e0ea10d7c2e44e";
+ name = "kio-5.61.0.tar.xz";
};
};
kirigami2 = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kirigami2-5.58.0.tar.xz";
- sha256 = "ad54e15c03807181313e29013057cf89cb70113f74a26ab7aec6420cdc18d9b3";
- name = "kirigami2-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kirigami2-5.61.0.tar.xz";
+ sha256 = "afdbe922f0627330319f22834d6631af13edb0081c687422d36acb8697a88c30";
+ name = "kirigami2-5.61.0.tar.xz";
};
};
kitemmodels = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kitemmodels-5.58.0.tar.xz";
- sha256 = "f861844a6d24ecdddd7b2b29d47dc03bccbd5dc2c8053f5c3a839a5ff59cd491";
- name = "kitemmodels-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kitemmodels-5.61.0.tar.xz";
+ sha256 = "47db271ba24904933629ed00f7a4f916a19969967dcfbfd59ae5e98f08f89d68";
+ name = "kitemmodels-5.61.0.tar.xz";
};
};
kitemviews = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kitemviews-5.58.0.tar.xz";
- sha256 = "bb073f96236102a953a2298039d0c380458c0a2393d7dc7bb657ee4e2ea9b6e6";
- name = "kitemviews-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kitemviews-5.61.0.tar.xz";
+ sha256 = "0447b361444a853409f65e2fb5650cc95eb799ca54a5d7e15cd6d8ca527002da";
+ name = "kitemviews-5.61.0.tar.xz";
};
};
kjobwidgets = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kjobwidgets-5.58.0.tar.xz";
- sha256 = "d43ea4eede2d88edd1753f4d1b6808bf04bf1e67ab58f00ef70b6a20b9607133";
- name = "kjobwidgets-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kjobwidgets-5.61.0.tar.xz";
+ sha256 = "5246c2a230e3b4e9d7ba87c5a6b13b5f96fef6af0d1262f27f91fa0c619cf378";
+ name = "kjobwidgets-5.61.0.tar.xz";
};
};
kjs = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/portingAids/kjs-5.58.0.tar.xz";
- sha256 = "9e95cb54f4323f31f88e3fb5946b4f990d8a5f1ba8fecf166844af672037a60c";
- name = "kjs-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/portingAids/kjs-5.61.0.tar.xz";
+ sha256 = "968e1592c98ee260d80644bf4631bf09479512e48fa878887ee3b9d6d57d3d17";
+ name = "kjs-5.61.0.tar.xz";
};
};
kjsembed = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/portingAids/kjsembed-5.58.0.tar.xz";
- sha256 = "ffbcd9de767d62497db146acd7bcaeaa59b3f6b418616d4562d1a2269048131d";
- name = "kjsembed-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/portingAids/kjsembed-5.61.0.tar.xz";
+ sha256 = "d8e0afad638574c31c89d716d78456ce51ffe6dd03eae6787bc9b4f8b52d5b44";
+ name = "kjsembed-5.61.0.tar.xz";
};
};
kmediaplayer = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/portingAids/kmediaplayer-5.58.0.tar.xz";
- sha256 = "1cc831eae5f0e71375118c01b72e7961d42888fca0726800ce8c42bf4e1f21ea";
- name = "kmediaplayer-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/portingAids/kmediaplayer-5.61.0.tar.xz";
+ sha256 = "ae15a4a39e6530b505d699fb1b1ab3fd5f0e64d87dd758db17702463e44ce181";
+ name = "kmediaplayer-5.61.0.tar.xz";
};
};
knewstuff = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/knewstuff-5.58.0.tar.xz";
- sha256 = "06d3ee09652f166ad66e003523bafe43741a99d2cd5dca3268ac7a13498cefbd";
- name = "knewstuff-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/knewstuff-5.61.0.tar.xz";
+ sha256 = "87f8ec030223f5f0e4e39de8407fc0d28542e48e057c1752adb2466c55fe365b";
+ name = "knewstuff-5.61.0.tar.xz";
};
};
knotifications = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/knotifications-5.58.0.tar.xz";
- sha256 = "5a388e05ae3416a5120c268e48fa505e6666403772e8f03fe4670ab1d0bb0469";
- name = "knotifications-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/knotifications-5.61.0.tar.xz";
+ sha256 = "f72ce6394465316a5324e38afb07f4f71d5f8e281d09b5cf340246c9905568ac";
+ name = "knotifications-5.61.0.tar.xz";
};
};
knotifyconfig = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/knotifyconfig-5.58.0.tar.xz";
- sha256 = "a40555d9645c4ed283e61a9e5718d5476359124e23d52a838e30fca7e089dc01";
- name = "knotifyconfig-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/knotifyconfig-5.61.0.tar.xz";
+ sha256 = "bbd2260a98f70779415369ca1d99807bc3e57f618024b9663d2a462a74169bee";
+ name = "knotifyconfig-5.61.0.tar.xz";
};
};
kpackage = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kpackage-5.58.0.tar.xz";
- sha256 = "41deff40eb17b3f667fd03f4a30dcf734ca060ebd7e2320eb38ff36ed6a9ce90";
- name = "kpackage-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kpackage-5.61.0.tar.xz";
+ sha256 = "8ff82d14fe0dd92ac774d5cd9cd6334b01574f0f5c584266f97359dde5db9a5f";
+ name = "kpackage-5.61.0.tar.xz";
};
};
kparts = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kparts-5.58.0.tar.xz";
- sha256 = "6fe1ca552f14dd262cf33e60d0c85536ca04617757e39f91dbfe061abf624bb4";
- name = "kparts-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kparts-5.61.0.tar.xz";
+ sha256 = "f223b38f34f009bb25511ce7d97c607102cbb0a1bd0253ec1b7d1fe1b7c81436";
+ name = "kparts-5.61.0.tar.xz";
};
};
kpeople = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kpeople-5.58.0.tar.xz";
- sha256 = "2588f7a4df4c03fe756d9e766120e35b0f991df5c8e5f75c3a507cc5739ded32";
- name = "kpeople-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kpeople-5.61.0.tar.xz";
+ sha256 = "549edacd7b63d704dd165bc803ae03f8d9e8c1ba31f8dbaea3f7e12c466b4298";
+ name = "kpeople-5.61.0.tar.xz";
};
};
kplotting = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kplotting-5.58.0.tar.xz";
- sha256 = "4d46b4c78abcaf171132f4a17f35d28f7bd89b346fbe7b2e494f5212ee2cc81b";
- name = "kplotting-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kplotting-5.61.0.tar.xz";
+ sha256 = "95781b50bef0e081e48b472b4fcbbcd3301ec45245498261e4a3ec8e42b892ba";
+ name = "kplotting-5.61.0.tar.xz";
};
};
kpty = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kpty-5.58.0.tar.xz";
- sha256 = "808a9f159e3d34630ae16d13c3ed6310c07fc9a38737110190892dcc903d5017";
- name = "kpty-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kpty-5.61.0.tar.xz";
+ sha256 = "b91a88c00d3387927d1f6886a04e6e5bcc615ee1d0e72f647d51320ebf73471c";
+ name = "kpty-5.61.0.tar.xz";
};
};
kross = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/portingAids/kross-5.58.0.tar.xz";
- sha256 = "b71c521718acd9829124264e97990222c458eca4a2e0be471a853db55b07d872";
- name = "kross-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/portingAids/kross-5.61.0.tar.xz";
+ sha256 = "103837799febbd62365a6445db046a2ee4add13d7d250abf925872cac642986e";
+ name = "kross-5.61.0.tar.xz";
};
};
krunner = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/krunner-5.58.0.tar.xz";
- sha256 = "d83220210980117459e49a44b2173063faa70ea5524c744cde4ca3dc031a6c8c";
- name = "krunner-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/krunner-5.61.0.tar.xz";
+ sha256 = "f32ea603a9bcb9c2e39231f99bfc6079d118eebbf2c72e0818e2a9cd060543be";
+ name = "krunner-5.61.0.tar.xz";
};
};
kservice = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kservice-5.58.0.tar.xz";
- sha256 = "03e1d69b1558c4d38946e1ffdec4249e58d8a0f15575ce984c751d93b3ff1395";
- name = "kservice-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kservice-5.61.0.tar.xz";
+ sha256 = "4489ac4553522bb76604e284338ab37a7a2369eea45dadd96a955fedf8ca99f9";
+ name = "kservice-5.61.0.tar.xz";
};
};
ktexteditor = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/ktexteditor-5.58.0.tar.xz";
- sha256 = "dc28916db7eb8a24f89b6570358d576b73e1ca60f7364871a0ef67f9fd62db8e";
- name = "ktexteditor-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/ktexteditor-5.61.0.tar.xz";
+ sha256 = "ae99eacb445f8bc27af379d1ec54e8df4d25f601fc12053bc2928a8c639ad0cb";
+ name = "ktexteditor-5.61.0.tar.xz";
};
};
ktextwidgets = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/ktextwidgets-5.58.0.tar.xz";
- sha256 = "056601d7c1aa412a9628fae8eb6ca6cf51d0f0fab03345bb4be8e7072827fed7";
- name = "ktextwidgets-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/ktextwidgets-5.61.0.tar.xz";
+ sha256 = "a2fddad3dda750ea6bdb104c460e50586946ded3e1f46a8729dbd304016a0b5a";
+ name = "ktextwidgets-5.61.0.tar.xz";
};
};
kunitconversion = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kunitconversion-5.58.0.tar.xz";
- sha256 = "5716474c4d031d9b5fdb3fe460957d4ceecd1d9c4e441df81a42bfbb993232fa";
- name = "kunitconversion-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kunitconversion-5.61.0.tar.xz";
+ sha256 = "e5ffa3ff954c46b2416823467fcecd37c6ddb8304529703bc9cc3a24b74b6c24";
+ name = "kunitconversion-5.61.0.tar.xz";
};
};
kwallet = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kwallet-5.58.0.tar.xz";
- sha256 = "5203765ba2061727d0280bf7e9cbbade462ba2c5e7389f4f8d78afc522ba2030";
- name = "kwallet-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kwallet-5.61.0.tar.xz";
+ sha256 = "628ded35a8f44750a770bf10bba9a763994660923a689eee05f8dfb7e92baec8";
+ name = "kwallet-5.61.0.tar.xz";
};
};
kwayland = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kwayland-5.58.0.tar.xz";
- sha256 = "a273a64ac06698e7c7d297da05c3b4889893c8b4179b01aa7ae1c2fb8681a4f1";
- name = "kwayland-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kwayland-5.61.0.tar.xz";
+ sha256 = "42d3bc629710e09074006af288986b00683853660648c9364fb09d49db3f0e07";
+ name = "kwayland-5.61.0.tar.xz";
};
};
kwidgetsaddons = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kwidgetsaddons-5.58.0.tar.xz";
- sha256 = "f4bcb1e22d8dfec214f4f55dbf4492229c4cb6ab63031f826ef68896c27ca6c0";
- name = "kwidgetsaddons-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kwidgetsaddons-5.61.0.tar.xz";
+ sha256 = "5abc169f431fba18418f23ff1749414d8318baff868a7b821916cc44508c6891";
+ name = "kwidgetsaddons-5.61.0.tar.xz";
};
};
kwindowsystem = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kwindowsystem-5.58.0.tar.xz";
- sha256 = "0b25d55bc9be6329c5cf91328c4414b547f26496a1af83f9454c0e5d85a10129";
- name = "kwindowsystem-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kwindowsystem-5.61.0.tar.xz";
+ sha256 = "17958b612e751e838aa7a0d4f8c7a8a8d83d3f4ace5498fe1f2b8650a2d8f984";
+ name = "kwindowsystem-5.61.0.tar.xz";
};
};
kxmlgui = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kxmlgui-5.58.0.tar.xz";
- sha256 = "ab08ed118f6806154fe10414d81dace413ecf80df3a561811f41879b48b7179f";
- name = "kxmlgui-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kxmlgui-5.61.0.tar.xz";
+ sha256 = "867ff1c3ad464bb6268d00ca290569ef1da7659d3fd2f6349015bc3e2562836b";
+ name = "kxmlgui-5.61.0.tar.xz";
};
};
kxmlrpcclient = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/kxmlrpcclient-5.58.0.tar.xz";
- sha256 = "53f647bb8d9165ddf6326703486470c7e9fc4ef392991501319e5c69f25f0ea3";
- name = "kxmlrpcclient-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/kxmlrpcclient-5.61.0.tar.xz";
+ sha256 = "382b4730e4b32c1d300f8fdb6269e40995ec282ebe1cbb044ab1a2b2b68c3a1a";
+ name = "kxmlrpcclient-5.61.0.tar.xz";
};
};
modemmanager-qt = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/modemmanager-qt-5.58.0.tar.xz";
- sha256 = "cec892b58603fd95656b2cac356e8076a65122d110e3f5175bbabfaa296b16cb";
- name = "modemmanager-qt-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/modemmanager-qt-5.61.0.tar.xz";
+ sha256 = "c9883a3aac7415045a03f0bda435a2a5ff7523538868b72dffa8e4b40e88502a";
+ name = "modemmanager-qt-5.61.0.tar.xz";
};
};
networkmanager-qt = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/networkmanager-qt-5.58.0.tar.xz";
- sha256 = "113f48b1ed07b7541bc205220197e245f547e0a08382c3aeb29b0c02e6ec4abe";
- name = "networkmanager-qt-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/networkmanager-qt-5.61.0.tar.xz";
+ sha256 = "1ded63af93957a04292e965ecce06388f183d3adc555b4f3d33337ee15d858c3";
+ name = "networkmanager-qt-5.61.0.tar.xz";
};
};
oxygen-icons5 = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/oxygen-icons5-5.58.0.tar.xz";
- sha256 = "0e6a6fd611893c870901b78f601caf8ae9afd2a666088a5a167f3cbf815bd3e7";
- name = "oxygen-icons5-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/oxygen-icons5-5.61.0.tar.xz";
+ sha256 = "1ca8f6e42186d069cb4f0581914b147cabc3be3e720c382e77048be134bb1b26";
+ name = "oxygen-icons5-5.61.0.tar.xz";
};
};
plasma-framework = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/plasma-framework-5.58.0.tar.xz";
- sha256 = "0b0826a2292612112e78198938d660e913756f8712d1f2c71eafbead42605cad";
- name = "plasma-framework-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/plasma-framework-5.61.0.tar.xz";
+ sha256 = "873d604aadbe21ba38cdb12b778d3baf121a54e6155596f0ebee1840138060fe";
+ name = "plasma-framework-5.61.0.tar.xz";
};
};
prison = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/prison-5.58.0.tar.xz";
- sha256 = "2bd97bf19e70b67cac49eaefb89a0fe8bd506e710e10df41f9b7c65d9dc30b1d";
- name = "prison-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/prison-5.61.0.tar.xz";
+ sha256 = "9ebab1755e9d7cb01b2aa6e8b63640eb112d8557073423abdb94faecb42d87ab";
+ name = "prison-5.61.0.tar.xz";
};
};
purpose = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/purpose-5.58.0.tar.xz";
- sha256 = "8acbf11af0d9f149ca52c15d07a62107d83b02306102af9e37ee32aeaef831df";
- name = "purpose-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/purpose-5.61.0.tar.xz";
+ sha256 = "810a660d0a4d6de41e1b4d00fcb039d3b099ceae65ec96261ca8dd1fba458d08";
+ name = "purpose-5.61.0.tar.xz";
};
};
qqc2-desktop-style = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/qqc2-desktop-style-5.58.0.tar.xz";
- sha256 = "71b2c94aece8c0f4cda33170a84240d1f7ed9ec774dcf5bd292bda861bda46a3";
- name = "qqc2-desktop-style-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/qqc2-desktop-style-5.61.0.tar.xz";
+ sha256 = "26042c4f939b94caa559cba3ef171ef7bb1490f57c9907f5e4b30a701659abb4";
+ name = "qqc2-desktop-style-5.61.0.tar.xz";
};
};
solid = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/solid-5.58.0.tar.xz";
- sha256 = "7d7f2daaffe8536ee9373375b866c94b949e58f0365990dfe16f9cc05f98bd00";
- name = "solid-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/solid-5.61.0.tar.xz";
+ sha256 = "c3a032086eacbb836fc102bd77236285ad5a808c0537ff55dbacda539ba3eacf";
+ name = "solid-5.61.0.tar.xz";
};
};
sonnet = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/sonnet-5.58.0.tar.xz";
- sha256 = "e67ffab7674175588883a9b444973e9edef2257e025f99657bb13d09e72bf823";
- name = "sonnet-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/sonnet-5.61.0.tar.xz";
+ sha256 = "4c8818897ea5dac25e0120acfd4e15c44adf2ee76749870b8f70178f1a3d8b29";
+ name = "sonnet-5.61.0.tar.xz";
};
};
syndication = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/syndication-5.58.0.tar.xz";
- sha256 = "48d321fdefd57ef9380492652c765ded047d4a54ba6aed5abb1434e30e327643";
- name = "syndication-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/syndication-5.61.0.tar.xz";
+ sha256 = "2803b2960dd23492ad002e0f23563c9f06500ddc144dd0be2e3e0ef2f6c1f576";
+ name = "syndication-5.61.0.tar.xz";
};
};
syntax-highlighting = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/syntax-highlighting-5.58.0.tar.xz";
- sha256 = "b97e58e9fe64bc21368d18c57b69dd5696328a0722c01ae2e113826e2e35ba76";
- name = "syntax-highlighting-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/syntax-highlighting-5.61.0.tar.xz";
+ sha256 = "475392c03534d7b5301ff2e02461444e463ad4def985da81ad4b315660416721";
+ name = "syntax-highlighting-5.61.0.tar.xz";
};
};
threadweaver = {
- version = "5.58.0";
+ version = "5.61.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.58/threadweaver-5.58.0.tar.xz";
- sha256 = "d9f95ed3a5ccedaa10ae086c82d8794a9ae9e82e094c352869bc6459ead8409d";
- name = "threadweaver-5.58.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.61/threadweaver-5.61.0.tar.xz";
+ sha256 = "e7a0cecfaa60c7a8e4bdd4dfe842fb54a344d331a6c62316c147d8dc2a5e5843";
+ name = "threadweaver-5.61.0.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index d2283f5c1d57..2eb9262d189e 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -6,7 +6,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "heimdal-${version}";
+ pname = "heimdal";
version = "7.7.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 208f294aef7e..124c961b96ac 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -15,7 +15,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "${type}krb5-${version}";
majorVersion = "1.17";
- version = "${majorVersion}";
+ version = majorVersion;
src = fetchurl {
url = "https://kerberos.org/dist/krb5/${majorVersion}/krb5-${version}.tar.gz";
diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
index abbb2457f6ae..0a130c017c09 100644
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -5,11 +5,11 @@
let
inherit (python2Packages) python pygtk;
in stdenv.mkDerivation rec {
- name = "keybinder-${version}";
+ pname = "keybinder";
version = "0.3.0";
src = fetchurl {
- name = "${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
url = "https://github.com/engla/keybinder/archive/v${version}.tar.gz";
sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf";
};
diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix
index 91ad59ad27a0..ed2dd341f45e 100644
--- a/pkgs/development/libraries/keybinder3/default.nix
+++ b/pkgs/development/libraries/keybinder3/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "keybinder3-${version}";
+ pname = "keybinder3";
version = "0.3.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix
index 1ebf2c2e21e5..21e3c4d3424e 100644
--- a/pkgs/development/libraries/kinetic-cpp-client/default.nix
+++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix
@@ -8,7 +8,7 @@ let
sha256 = "0406pp0sdf0rg6s5g18r2d8si2rin7p6qbzp7c6pma5hyzsygz48";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "kinetic-cpp-client-2015-04-14";
src = fetchgit {
diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix
index d3733ea5f720..71e88559dee6 100644
--- a/pkgs/development/libraries/kmsxx/default.nix
+++ b/pkgs/development/libraries/kmsxx/default.nix
@@ -1,9 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "kmsxx";
version = "2018-10-23";
- name = pname + "-" + version;
src = fetchFromGitHub {
owner = "tomba";
diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix
index c49402b74e86..991fd4d27a74 100644
--- a/pkgs/development/libraries/kproperty/default.nix
+++ b/pkgs/development/libraries/kproperty/default.nix
@@ -8,10 +8,9 @@
mkDerivation rec {
pname = "kproperty";
version = "3.2.0";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+ url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz";
sha256 = "1yldfsdamk4dag8dyryjn5n9j2pzi42s79kkafymfnbifhnhrbv7";
};
diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix
index fc9c77e8fd61..46d55b1f550d 100644
--- a/pkgs/development/libraries/kreport/default.nix
+++ b/pkgs/development/libraries/kreport/default.nix
@@ -7,10 +7,9 @@
mkDerivation rec {
pname = "kreport";
version = "3.2.0";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+ url = "mirror://kde/stable/${pname}/src/${pname}-${version}.tar.xz";
sha256 = "1mycsvkz5rphi9df2i4ch4ykvprd4m76acsdzs3zis2ljrqnsw92";
};
diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix
index 2f713cb59775..933d51b9575c 100644
--- a/pkgs/development/libraries/lame/default.nix
+++ b/pkgs/development/libraries/lame/default.nix
@@ -22,11 +22,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "lame-${version}";
+ pname = "lame";
version = "3.100";
src = fetchurl {
- url = "mirror://sourceforge/lame/${name}.tar.gz";
+ url = "mirror://sourceforge/lame/${pname}-${version}.tar.gz";
sha256 = "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx";
};
diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix
index e93467fba0a2..f401f231de2e 100644
--- a/pkgs/development/libraries/lasso/default.nix
+++ b/pkgs/development/libraries/lasso/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "lasso-${version}";
+ pname = "lasso";
version = "2.6.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix
index 839f0a75156b..ae8fc1e22dbc 100644
--- a/pkgs/development/libraries/ldacbt/default.nix
+++ b/pkgs/development/libraries/ldacbt/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "ldacBT-${version}";
+ pname = "ldacBT";
version = "2.0.2.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index 82496a54aea7..1aa208c2044f 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -4,10 +4,8 @@ stdenv.mkDerivation rec {
pname = "ldns";
version = "1.7.0";
- name = "${pname}-${version}";
-
src = fetchurl {
- url = "https://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz";
+ url = "https://www.nlnetlabs.nl/downloads/ldns/${pname}-${version}.tar.gz";
sha256 = "1k56jw4hz8njspfxcfw0czf1smg0n48ylia89ziwyx5k9wdmp7y1";
};
diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index a085899d6e2b..a84e6b5c08df 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, boost, cmake, curl, ruby }:
stdenv.mkDerivation rec {
- name = "leatherman-${version}";
+ pname = "leatherman";
version = "1.7.1";
src = fetchFromGitHub {
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
owner = "puppetlabs";
};
- buildInputs = [ boost cmake curl ruby ];
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=ignored-qualifiers" "-Wno-error=class-memaccess" "-Wno-error=catch-value" ];
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ boost curl ruby ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index f4018cbf9614..6137638222ef 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.3.95";
- name = "lensfun-${version}";
+ pname = "lensfun";
src = fetchurl {
- url = "mirror://sourceforge/lensfun/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/lensfun/${version}/${pname}-${version}.tar.gz";
sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2";
};
diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix
index dd3c42e8b7f5..62c01e4f3560 100644
--- a/pkgs/development/libraries/leptonica/default.nix
+++ b/pkgs/development/libraries/leptonica/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "leptonica-${version}";
+ pname = "leptonica";
version = "1.78.0";
src = fetchurl {
- url = "http://www.leptonica.org/source/${name}.tar.gz";
+ url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz";
sha256 = "122s9b8hi93va4lgwnwrbma50x5fp740npy0s92xybd2wy0jxvg2";
};
diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index b18af4cf8344..17a754a027ab 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "leveldb-${version}";
+ pname = "leveldb";
version = "1.20";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
index 0d67c6b4dcb2..bda7d560fcde 100644
--- a/pkgs/development/libraries/libaacs/default.nix
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -8,11 +8,11 @@
# https://wiki.archlinux.org/index.php/BluRay
stdenv.mkDerivation rec {
- name = "libaacs-${version}";
+ pname = "libaacs";
version = "0.9.0";
src = fetchurl {
- url = "http://get.videolan.org/libaacs/${version}/${name}.tar.bz2";
+ url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2";
sha256 = "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27";
};
diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix
index 6df7bc22772f..11b31d62b5d6 100644
--- a/pkgs/development/libraries/libaal/default.nix
+++ b/pkgs/development/libraries/libaal/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.0.6";
- name = "libaal-${version}";
+ pname = "libaal";
src = fetchurl {
- url = "mirror://sourceforge/reiser4/${name}.tar.gz";
+ url = "mirror://sourceforge/reiser4/${pname}-${version}.tar.gz";
sha256 = "176f2sns6iyxv3h9zyirdinjwi05gdak48zqarhib2s38rvm98di";
};
diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix
index aa4a40cf32dd..f953c170ab50 100644
--- a/pkgs/development/libraries/libabw/default.nix
+++ b/pkgs/development/libraries/libabw/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, boost, doxygen, gperf, pkgconfig, librevenge, libxml2, perl }:
stdenv.mkDerivation rec {
- name = "libabw-${version}";
+ pname = "libabw";
version = "0.1.2";
src = fetchurl {
- url = "https://dev-www.libreoffice.org/src/libabw/${name}.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/libabw/${pname}-${version}.tar.xz";
sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb";
};
diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix
index 525ec6e35f60..07e0a3500a76 100644
--- a/pkgs/development/libraries/libaccounts-glib/default.nix
+++ b/pkgs/development/libraries/libaccounts-glib/default.nix
@@ -2,7 +2,7 @@
, libxml2, libxslt, pkgconfig, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }:
stdenv.mkDerivation rec {
- name = "libaccounts-glib-${version}";
+ pname = "libaccounts-glib";
version = "1.24";
outputs = [ "out" "dev" "devdoc" "py" ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
# See: https://gitlab.com/accounts-sso/libaccounts-glib/merge_requests/22
patches = [ ./py-override.patch ];
- nativeBuildInputs = [
+ nativeBuildInputs = [
check
docbook_xml_dtd_43
docbook_xsl
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
LC_ALL = "en_US.UTF-8";
mesonFlags = [
- "-Dpy-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
+ "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
];
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix
index 49e5bcdd9058..48fb0f1153e7 100644
--- a/pkgs/development/libraries/libagar/default.nix
+++ b/pkgs/development/libraries/libagar/default.nix
@@ -4,8 +4,8 @@
}:
let srcs = import ./srcs.nix { inherit fetchurl; }; in
-stdenv.mkDerivation rec {
- name = "libagar-${version}";
+stdenv.mkDerivation {
+ pname = "libagar";
inherit (srcs) version src;
preConfigure = ''
diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix
index c1e9ba7d1c73..4295971d5a0b 100644
--- a/pkgs/development/libraries/libagar/libagar_test.nix
+++ b/pkgs/development/libraries/libagar/libagar_test.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }:
let srcs = import ./srcs.nix { inherit fetchurl; }; in
-stdenv.mkDerivation rec {
- name = "libagar-test-${version}";
+stdenv.mkDerivation {
+ pname = "libagar-test";
inherit (srcs) version src;
sourceRoot = "agar-1.5.0/tests";
diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix
index cc6c9464de36..325a7d71598b 100644
--- a/pkgs/development/libraries/libamqpcpp/default.nix
+++ b/pkgs/development/libraries/libamqpcpp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, openssl }:
stdenv.mkDerivation rec {
- name = "libamqpcpp-${version}";
+ pname = "libamqpcpp";
version = "4.1.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 826f72b1f5fb..f67b3cee607b 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
version = "1.2.2";
- name = "libao-${version}";
+ pname = "libao";
# the github mirror is more up to date than downloads.xiph.org
src = fetchFromGitHub {
owner = "xiph";
repo = "libao";
- rev = "${version}";
+ rev = version;
sha256 = "0svgk4sc9kdhcsfyvbvgm5vpbg3sfr6z5rliflrw49v3x2i4vxq5";
};
diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index 62e0a850bad3..2d9a9f18fa27 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/pkgs/development/libraries/libaom/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3 }:
stdenv.mkDerivation rec {
- name = "libaom-${version}";
+ pname = "libaom";
version = "1.0.0-errata1";
src = fetchgit {
diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix
index dd3320005a41..6cf395d7e74e 100644
--- a/pkgs/development/libraries/libaosd/default.nix
+++ b/pkgs/development/libraries/libaosd/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
version = "0.2.7-9-g177589f";
- name = "libaosd-${version}";
+ pname = "libaosd";
src = fetchFromGitHub {
owner = "atheme-legacy";
repo = "libaosd";
- rev = "${version}";
+ rev = version;
sha256 = "1cn7k0n74p6jp25kxwcyblhmbdvgw3mikvj0m2jh4c6xccfrgb9a";
};
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 3cf8a6da7367..e3927f34fab9 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -9,7 +9,7 @@
assert xarSupport -> libxml2 != null;
stdenv.mkDerivation rec {
- name = "libarchive-${version}";
+ pname = "libarchive";
version = "3.4.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix
index a06ae978d515..0c8f82138e7f 100644
--- a/pkgs/development/libraries/libasr/default.nix
+++ b/pkgs/development/libraries/libasr/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libevent, openssl }:
stdenv.mkDerivation rec {
- name = "libasr-${version}";
+ pname = "libasr";
version= "1.0.2";
src = fetchurl {
- url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
+ url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
sha256 = "0d4blm0kzdhb75fq8sbcpvkc25lv5dbjaxa2ldniaf39633d3xd6";
};
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index d7ebf781a049..41406ce18eae 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -18,11 +18,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "libass-${version}";
+ pname = "libass";
version = "0.14.0";
src = fetchurl {
- url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz";
+ url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8";
};
diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix
index 313cb7f8d5dc..348cfa9ed5b4 100644
--- a/pkgs/development/libraries/libast/default.nix
+++ b/pkgs/development/libraries/libast/default.nix
@@ -2,11 +2,11 @@
, pkgconfig }:
stdenv.mkDerivation rec {
- name = "libast-${version}";
+ pname = "libast";
version = "0.7.1";
src = fetchurl {
- url = "http://www.eterm.org/download/${name}.tar.gz";
+ url = "http://www.eterm.org/download/${pname}-${version}.tar.gz";
sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj";
};
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index 0df8ed0f9699..b576896876e4 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoconf, automake, libtool }:
stdenv.mkDerivation rec {
- name = "libatomic_ops-${version}";
+ pname = "libatomic_ops";
version = "7.6.10";
src = fetchurl {
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 1ef453f24cdb..feeb4de15e1b 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -33,10 +33,11 @@ let
};
libavFun = version : sha1 : stdenv.mkDerivation rec {
- name = "libav-${version}";
+ pname = "libav";
+ inherit version;
src = fetchurl {
- url = "${meta.homepage}/releases/${name}.tar.xz";
+ url = "${meta.homepage}/releases/${pname}-${version}.tar.xz";
inherit sha1; # upstream directly provides sha1 of releases over https
};
diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix
index 6a7720b99bcc..d39c12d58d55 100644
--- a/pkgs/development/libraries/libb2/default.nix
+++ b/pkgs/development/libraries/libb2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }:
stdenv.mkDerivation rec {
- name = "libb2-${version}";
+ pname = "libb2";
version = "0.98.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix
index 09c5444a6446..3c9a97684275 100644
--- a/pkgs/development/libraries/libb64/default.nix
+++ b/pkgs/development/libraries/libb64/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "libb64-${version}";
+ pname = "libb64";
version = "1.2";
src = fetchurl {
diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix
index 2a129bc648f0..9aedde923f0b 100644
--- a/pkgs/development/libraries/libbap/default.nix
+++ b/pkgs/development/libraries/libbap/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook,
which }:
-stdenv.mkDerivation rec {
- name = "libbap-${version}";
+stdenv.mkDerivation {
+ pname = "libbap";
version = "master-2019-04-05";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix
index 3a1b77525143..3af98a578f20 100644
--- a/pkgs/development/libraries/libbdplus/default.nix
+++ b/pkgs/development/libraries/libbdplus/default.nix
@@ -8,11 +8,11 @@
# https://wiki.archlinux.org/index.php/BluRay
stdenv.mkDerivation rec {
- name = "libbdplus-${version}";
+ pname = "libbdplus";
version = "0.1.2";
src = fetchurl {
- url = "http://get.videolan.org/libbdplus/${version}/${name}.tar.bz2";
+ url = "http://get.videolan.org/libbdplus/${version}/${pname}-${version}.tar.bz2";
sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6";
};
diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix
index 64b3832d3353..89ca984767b3 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/pkgs/development/libraries/libbfd/default.nix
@@ -3,8 +3,8 @@
, libiberty, zlib
}:
-stdenv.mkDerivation rec {
- name = "libbfd-${version}";
+stdenv.mkDerivation {
+ pname = "libbfd";
inherit (binutils-unwrapped) version src;
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix
index d22518e96d42..c8c58315b648 100644
--- a/pkgs/development/libraries/libbladeRF/default.nix
+++ b/pkgs/development/libraries/libbladeRF/default.nix
@@ -13,7 +13,8 @@ let
version = "2.2.0";
in stdenv.mkDerivation {
- name = "libbladeRF-${version}";
+ pname = "libbladeRF";
+ inherit version;
src = fetchFromGitHub {
owner = "Nuand";
diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix
index d8f2426e477b..d9639cf5c145 100644
--- a/pkgs/development/libraries/libbluedevil/default.nix
+++ b/pkgs/development/libraries/libbluedevil/default.nix
@@ -1,14 +1,13 @@
{ stdenv, fetchurl, cmake, qt4 }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "libbluedevil";
# bluedevil must have the same major version (x.y) as libbluedevil!
# do not update this package without checking bluedevil
version = "2.1";
src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+ url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c";
};
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index b7ca9dda1ea7..517251e137ef 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -18,11 +18,11 @@ assert withFonts -> freetype != null;
# https://wiki.archlinux.org/index.php/BluRay
stdenv.mkDerivation rec {
- name = "libbluray-${version}";
+ pname = "libbluray";
version = "1.1.2";
src = fetchurl {
- url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2";
+ url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2";
sha256 = "0hhbgkm11fw4pwbrklm76aiy54r6d7hk06yhl2fxq05i74i4bpd3";
};
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index a8d1925e5c0d..fe4af163a542 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "libbsd-${version}";
+ pname = "libbsd";
version = "0.9.1";
src = fetchurl {
- url = "https://libbsd.freedesktop.org/releases/${name}.tar.xz";
+ url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz";
sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n";
};
diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix
index 6244c3a351e7..5bd6b11ac7af 100644
--- a/pkgs/development/libraries/libbson/default.nix
+++ b/pkgs/development/libraries/libbson/default.nix
@@ -1,7 +1,7 @@
{ fetchFromGitHub, perl, stdenv, cmake }:
stdenv.mkDerivation rec {
- name = "libbson-${version}";
+ pname = "libbson";
version = "1.9.5";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix
index f68141ef3b47..01588187936c 100644
--- a/pkgs/development/libraries/libburn/default.nix
+++ b/pkgs/development/libraries/libburn/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libburn-${version}";
+ pname = "libburn";
version = "1.5.0";
src = fetchurl {
- url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
+ url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
sha256 = "1gg2kgnqvaa2fwghai62prxz6slpak1f6bvgjh8m4dn16v114asq";
};
diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix
index 18593f80799c..4fea84723f99 100644
--- a/pkgs/development/libraries/libbytesize/default.nix
+++ b/pkgs/development/libraries/libbytesize/default.nix
@@ -6,7 +6,8 @@
let
version = "2.1";
in stdenv.mkDerivation rec {
- name = "libbytesize-${version}";
+ pname = "libbytesize";
+ inherit version;
src = fetchFromGitHub {
owner = "storaged-project";
diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix
index 62d709733759..2e134c5bb639 100644
--- a/pkgs/development/libraries/libcacard/default.nix
+++ b/pkgs/development/libraries/libcacard/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, nss }:
stdenv.mkDerivation rec {
- name = "libcacard-${version}";
+ pname = "libcacard";
version = "2.7.0";
src = fetchurl {
- url = "https://www.spice-space.org/download/libcacard/${name}.tar.xz";
+ url = "https://www.spice-space.org/download/libcacard/${pname}-${version}.tar.xz";
sha256 = "0vyvkk4b6xjwq1ccggql13c1x7g4y90clpkqw28257azgn2a1c8n";
};
diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix
index 6838362c7942..42a49713a0b4 100644
--- a/pkgs/development/libraries/libcangjie/default.nix
+++ b/pkgs/development/libraries/libcangjie/default.nix
@@ -1,7 +1,7 @@
{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }:
stdenv.mkDerivation rec {
- name = "libcangjie-${version}";
+ pname = "libcangjie";
version = "1.4_rev_${rev}";
rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d";
diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index e016484e6779..2688881e66d3 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -3,7 +3,8 @@
let version = "4.0.4"; in
stdenv.mkDerivation {
- name = "libcec-${version}";
+ pname = "libcec";
+ inherit version;
src = fetchurl {
url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix
index 0005525a7cd2..e43cfb10a378 100644
--- a/pkgs/development/libraries/libcec/platform.nix
+++ b/pkgs/development/libraries/libcec/platform.nix
@@ -3,7 +3,8 @@
let version = "2.1.0.1"; in
stdenv.mkDerivation {
- name = "p8-platform-${version}";
+ pname = "p8-platform";
+ inherit version;
src = fetchurl {
url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index ecba18cd58c8..e161948db404 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -13,7 +13,7 @@ let
];
in
stdenv.mkDerivation rec {
- name = "cef-binary-${version}";
+ pname = "cef-binary";
version = "3.3497.1833.g13f506f";
src = fetchurl {
url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2";
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 1a0be52dbbe5..519c94dd9956 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
longDescription = ''
libchamplain is a C library providing a ClutterActor to display
- maps. It also provides a Gtk+ widget to display maps in Gtk+
+ maps. It also provides a GTK widget to display maps in GTK
applications. Python and Perl bindings are also available. It
supports numerous free map sources such as OpenStreetMap,
OpenCycleMap, OpenAerialMap, and Maps for free.
diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix
index 410c83953aa9..11617a0107cf 100644
--- a/pkgs/development/libraries/libchardet/default.nix
+++ b/pkgs/development/libraries/libchardet/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, perl }:
stdenv.mkDerivation rec {
- name = "libchardet-${version}";
+ pname = "libchardet";
version = "1.0.5";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix
index d3ef799ef605..3c234d780eff 100644
--- a/pkgs/development/libraries/libchewing/default.nix
+++ b/pkgs/development/libraries/libchewing/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, sqlite }:
stdenv.mkDerivation rec{
- name = "libchewing-${version}";
+ pname = "libchewing";
version = "0.5.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix
index f101eb223106..d896cf637330 100644
--- a/pkgs/development/libraries/libcli/default.nix
+++ b/pkgs/development/libraries/libcli/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl }:
stdenv.mkDerivation rec {
- name = "libcli-${version}";
+ pname = "libcli";
version = "1.9.7";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix
index a2f6858a05c9..325afc56ae79 100644
--- a/pkgs/development/libraries/libclthreads/default.nix
+++ b/pkgs/development/libraries/libclthreads/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libclthreads-${version}";
+ pname = "libclthreads";
version = "2.4.2";
src = fetchurl {
diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix
index 49bc2347ba77..d6e2ad398d77 100644
--- a/pkgs/development/libraries/libclxclient/default.nix
+++ b/pkgs/development/libraries/libclxclient/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }:
stdenv.mkDerivation rec {
- name = "libclxclient-${version}";
+ pname = "libclxclient";
version = "3.9.2";
src = fetchurl {
diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index f247c48821f7..8eb7ff303de7 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "libcommuni-${version}";
+ pname = "libcommuni";
version = "3.5.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix
index ee3f511d4359..cfef09c480a2 100644
--- a/pkgs/development/libraries/libconfuse/default.nix
+++ b/pkgs/development/libraries/libconfuse/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, flex }:
stdenv.mkDerivation rec {
- name = "libconfuse-${version}";
+ pname = "libconfuse";
version = "3.2.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 894faf0b9102..23b39bca1f3a 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}:
stdenv.mkDerivation rec {
- name = "libcouchbase-${version}";
+ pname = "libcouchbase";
version = "2.10.4";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix
index fff31a96ce77..ba9a6325b07d 100644
--- a/pkgs/development/libraries/libcrafter/default.nix
+++ b/pkgs/development/libraries/libcrafter/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, autoconf, automake, libtool, libpcap }:
stdenv.mkDerivation rec {
- name = "libcrafter-${version}";
+ pname = "libcrafter";
version = "0.3";
src = fetchzip {
diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix
index 10a4c276ebd5..bfc7fe1d9498 100644
--- a/pkgs/development/libraries/libcredis/default.nix
+++ b/pkgs/development/libraries/libcredis/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libcredis-0.2.3";
src = fetchurl {
diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix
index 3d32f4d0b953..4bf26bde228d 100644
--- a/pkgs/development/libraries/libcsptr/default.nix
+++ b/pkgs/development/libraries/libcsptr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "libcsptr-${version}";
+ pname = "libcsptr";
version = "2.0.4";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix
index 94dc733a69b0..f4e2e621c286 100644
--- a/pkgs/development/libraries/libctemplate/default.nix
+++ b/pkgs/development/libraries/libctemplate/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, python2 }:
stdenv.mkDerivation rec {
- name = "ctemplate-${version}";
+ pname = "ctemplate";
version = "2.3";
diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix
index e50b8a13b950..8ebab123524b 100644
--- a/pkgs/development/libraries/libcue/default.nix
+++ b/pkgs/development/libraries/libcue/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, bison, flex }:
stdenv.mkDerivation rec {
- name = "libcue-${version}";
+ pname = "libcue";
version = "2.2.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
index 86d14fe79740..df2e4c367bfb 100644
--- a/pkgs/development/libraries/libdap/default.nix
+++ b/pkgs/development/libraries/libdap/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
version = "3.20.4";
- name = "libdap-${version}";
+ pname = "libdap";
nativeBuildInputs = [ bison flex ];
buildInputs = [ libuuid curl libxml2 ];
src = fetchurl {
- url = "https://www.opendap.org/pub/source/${name}.tar.gz";
+ url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz";
sha256 = "0x44igs389b49nb2psd656wpvmbx9bwmla2l5ahfa09vxb314s5i";
};
diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
index f7e0a987b063..5b6d92d629dc 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A library to delight your users with fancy features";
longDescription = ''
- The libdazzle library is a companion library to GObject and Gtk+. It
+ The libdazzle library is a companion library to GObject and GTK. It
provides various features that we wish were in the underlying library but
cannot for various reasons. In most cases, they are wildly out of scope
for those libraries. In other cases, our design isn't quite generic
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
index 32b0c9758f73..2ae4eec99ecc 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, cmake, qtbase }:
stdenv.mkDerivation rec {
- name = "libdbusmenu-qt-${version}";
+ pname = "libdbusmenu-qt";
version = "0.9.3+16";
src = fetchgit {
diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix
index e064084f695e..a7bfe7f17a24 100644
--- a/pkgs/development/libraries/libdbusmenu/default.nix
+++ b/pkgs/development/libraries/libdbusmenu/default.nix
@@ -49,9 +49,9 @@ stdenv.mkDerivation rec {
doCheck = false; # generates shebangs in check phase, too lazy to fix
installFlags = [
- "sysconfdir=${placeholder ''out''}/etc"
+ "sysconfdir=${placeholder "out"}/etc"
"localstatedir=\${TMPDIR}"
- "typelibdir=${placeholder ''out''}/lib/girepository-1.0"
+ "typelibdir=${placeholder "out"}/lib/girepository-1.0"
];
meta = {
diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix
index 86b9fcd0bef3..0f2ba019d3fe 100644
--- a/pkgs/development/libraries/libdc1394/default.nix
+++ b/pkgs/development/libraries/libdc1394/default.nix
@@ -2,11 +2,11 @@
, libusb1, CoreServices }:
stdenv.mkDerivation rec {
- name = "libdc1394-${version}";
+ pname = "libdc1394";
version = "2.2.6";
src = fetchurl {
- url = "mirror://sourceforge/libdc1394/${name}.tar.gz";
+ url = "mirror://sourceforge/libdc1394/${pname}-${version}.tar.gz";
sha256 = "1v8gq54n1pg8izn7s15yylwjf8r1l1dmzbm2yvf6pv2fmb4mz41b";
};
diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix
index 6c9fabf5cae7..3c31ba805d89 100644
--- a/pkgs/development/libraries/libde265/default.nix
+++ b/pkgs/development/libraries/libde265/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.0.3";
- name = "libde265-${version}";
+ pname = "libde265";
src = fetchFromGitHub {
owner = "strukturag";
diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix
index a5b178caf825..b06a0a9450ab 100644
--- a/pkgs/development/libraries/libdeflate/default.nix
+++ b/pkgs/development/libraries/libdeflate/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "libdeflate-${version}";
+ pname = "libdeflate";
version = "1.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix
index 78e7490cd992..afbff3dc0cff 100644
--- a/pkgs/development/libraries/libdevil/default.nix
+++ b/pkgs/development/libraries/libdevil/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
- name = "libdevil-${version}";
+ pname = "libdevil";
version = "1.7.8";
src = fetchurl {
diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix
index 7fe7319ff15e..06ba10904a7d 100644
--- a/pkgs/development/libraries/libdigidoc/default.nix
+++ b/pkgs/development/libraries/libdigidoc/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "3.10.4";
- name = "libdigidoc-${version}";
+ pname = "libdigidoc";
src = fetchurl {
url = "https://github.com/open-eid/libdigidoc/releases/download/v${version}/libdigidoc-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index e3172c2fc1f8..4aec6fdef917 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "3.13.7";
- name = "libdigidocpp-${version}";
+ pname = "libdigidocpp";
src = fetchurl {
url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix
index 287494b6b1fd..d7d88b383865 100644
--- a/pkgs/development/libraries/libdiscid/default.nix
+++ b/pkgs/development/libraries/libdiscid/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, pkgconfig, darwin }:
stdenv.mkDerivation rec {
- name = "libdiscid-${version}";
+ pname = "libdiscid";
version = "0.6.2";
nativeBuildInputs = [ cmake pkgconfig ];
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];
src = fetchurl {
- url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz";
+ url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz";
sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r";
};
diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix
index c94806b50c10..5598e6b2fa78 100644
--- a/pkgs/development/libraries/libdivecomputer/default.nix
+++ b/pkgs/development/libraries/libdivecomputer/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libdivecomputer-${version}";
+ pname = "libdivecomputer";
version = "0.6.0";
src = fetchurl {
- url = "https://www.libdivecomputer.org/releases/${name}.tar.gz";
+ url = "https://www.libdivecomputer.org/releases/${pname}-${version}.tar.gz";
sha256 = "0nm1mcscpxb9dv4p0lidd6rf5xg4vmcbigj6zqxvgn7pwnvpbzm0";
};
diff --git a/pkgs/development/libraries/libdrm/cross-build-nm-path.patch b/pkgs/development/libraries/libdrm/cross-build-nm-path.patch
new file mode 100644
index 000000000000..478534e65e51
--- /dev/null
+++ b/pkgs/development/libraries/libdrm/cross-build-nm-path.patch
@@ -0,0 +1,48 @@
+From 9e05fece7918edce9c6aa5a1f1ea375108e5b2be Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?=
+Date: Fri, 2 Aug 2019 10:26:37 +0100
+Subject: [PATCH] meson: support for custom nm path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When cross-compiling target toolchains i.e. binutils are often
+prefixed by its target architecture. This patch gives the user
+to option to specify the nm used during the build process.
+
+Signed-off-by: Jörg Thalheim
+---
+ meson.build | 2 +-
+ meson_options.txt | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e292554a..64607139 100644
+--- a/meson.build
++++ b/meson.build
+@@ -327,7 +327,7 @@ pkg.generate(
+ )
+
+ env_test = environment()
+-env_test.set('NM', find_program('nm').path())
++env_test.set('NM', find_program(get_option('nm-path')).path())
+
+ if with_libkms
+ subdir('libkms')
+diff --git a/meson_options.txt b/meson_options.txt
+index 8af33f1c..b4f46a52 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -141,3 +141,9 @@ option(
+ value : false,
+ description : 'Enable support for using udev instead of mknod.',
+ )
++option(
++ 'nm-path',
++ type : 'string',
++ description : 'path to nm',
++ value : 'nm'
++)
+--
+2.22.0
+
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index bdc191fe8a38..11fb21fe52e2 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess, valgrind-light }:
+{ stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess
+, withValgrind ? valgrind-light.meta.available, valgrind-light
+}:
stdenv.mkDerivation rec {
pname = "libdrm";
@@ -12,7 +14,10 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "bin" ];
nativeBuildInputs = [ pkgconfig meson ninja ];
- buildInputs = [ libpthreadstubs libpciaccess valgrind-light ];
+ buildInputs = [ libpthreadstubs libpciaccess ]
+ ++ lib.optional withValgrind valgrind-light;
+
+ patches = [ ./cross-build-nm-path.patch ];
postPatch = ''
for a in */*-symbol-check ; do
@@ -20,12 +25,14 @@ stdenv.mkDerivation rec {
done
'';
- mesonFlags =
- [ "-Dinstall-test-programs=true" ]
- ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64)
- [ "-Dtegra=true" "-Detnaviv=true" ]
- ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false"
- ;
+ mesonFlags = [
+ "-Dnm-path=${stdenv.cc.targetPrefix}nm"
+ "-Dinstall-test-programs=true"
+ "-Domap=true"
+ ] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [
+ "-Dtegra=true"
+ "-Detnaviv=true"
+ ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false";
enableParallelBuilding = true;
@@ -33,6 +40,6 @@ stdenv.mkDerivation rec {
homepage = https://dri.freedesktop.org/libdrm/;
description = "Library for accessing the kernel's Direct Rendering Manager";
license = "bsd";
- platforms = stdenv.lib.platforms.unix;
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix
index 0984eb6e00bf..aed6f05fec4f 100644
--- a/pkgs/development/libraries/libdvbpsi/default.nix
+++ b/pkgs/development/libraries/libdvbpsi/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "libdvbpsi-${version}";
+ pname = "libdvbpsi";
version = "1.3.2";
src = fetchurl {
- url = "http://get.videolan.org/libdvbpsi/${version}/${name}.tar.bz2";
+ url = "http://get.videolan.org/libdvbpsi/${version}/${pname}-${version}.tar.bz2";
sha256 = "1zn5hfv4qbahmydbwh59a3b480s3m5ss27r6ml35gqdip7r3jkmc";
};
diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index f18e0622d0cc..fd89077a256a 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -1,13 +1,13 @@
{stdenv, fetchurl, IOKit}:
stdenv.mkDerivation rec {
- name = "libdvdcss-${version}";
+ pname = "libdvdcss";
version = "1.4.2";
buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit;
src = fetchurl {
- url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2";
+ url = "http://get.videolan.org/libdvdcss/${version}/${pname}-${version}.tar.bz2";
sha256 = "0x957zzpf4w2cp8zlk29prj8i2q6hay3lzdzsyz8y3cwxivyvhkq";
};
diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix
index b0dfd1e8fc12..45a73a624883 100644
--- a/pkgs/development/libraries/libdvdnav/default.nix
+++ b/pkgs/development/libraries/libdvdnav/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, pkgconfig, libdvdread}:
stdenv.mkDerivation rec {
- name = "libdvdnav-${version}";
+ pname = "libdvdnav";
version = "6.0.0";
src = fetchurl {
- url = "http://get.videolan.org/libdvdnav/${version}/${name}.tar.bz2";
+ url = "http://get.videolan.org/libdvdnav/${version}/${pname}-${version}.tar.bz2";
sha256 = "062njcksmpgw9yv3737qkf93r2pzhaxi9szqjabpa8d010dp38ph";
};
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 5f0f08275035..c133c0ba6f92 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, libdvdcss}:
stdenv.mkDerivation rec {
- name = "libdvdread-${version}";
+ pname = "libdvdread";
version = "6.0.1";
src = fetchurl {
- url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2";
+ url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2";
sha256 = "1gfmh8ii3s2fw1c8vn57piwxc0smd3va4h7xgp9s8g48cc04zki8";
};
diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index 1a4da7713af4..352d2b17406b 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -16,8 +16,9 @@ let
};
in rec {
- libdwarf = stdenv.mkDerivation rec {
- name = "libdwarf-${version}";
+ libdwarf = stdenv.mkDerivation {
+ pname = "libdwarf";
+ inherit version;
configureFlags = [ "--enable-shared" "--disable-nonshared" ];
@@ -36,8 +37,9 @@ in rec {
inherit meta src;
};
- dwarfdump = stdenv.mkDerivation rec {
- name = "dwarfdump-${version}";
+ dwarfdump = stdenv.mkDerivation {
+ pname = "dwarfdump";
+ inherit version;
preConfigure = ''
cd dwarfdump
diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix
index 93ece69cf056..249f3f4f21a4 100644
--- a/pkgs/development/libraries/libdynd/default.nix
+++ b/pkgs/development/libraries/libdynd/default.nix
@@ -2,7 +2,8 @@
let version = "0.7.2"; in
stdenv.mkDerivation {
- name = "libdynd-${version}";
+ pname = "libdynd";
+ inherit version;
src = fetchFromGitHub {
owner = "libdynd";
@@ -19,6 +20,9 @@ stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = [
"-Wno-error=implicit-fallthrough"
"-Wno-error=nonnull"
+ "-Wno-error=tautological-compare"
+ "-Wno-error=class-memaccess"
+ "-Wno-error=parentheses"
];
buildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/development/libraries/libeb/default.nix
index 293b1c28e932..2fdb1d071b62 100644
--- a/pkgs/development/libraries/libeb/default.nix
+++ b/pkgs/development/libraries/libeb/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, perl, zlib }:
stdenv.mkDerivation rec {
- name = "libeb-${version}";
+ pname = "libeb";
version = "4.4.3";
src = fetchurl {
diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix
index 6a4078f92cf3..16624a780797 100644
--- a/pkgs/development/libraries/libebur128/default.nix
+++ b/pkgs/development/libraries/libebur128/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.2.4";
- name = "libebur128-${version}";
+ pname = "libebur128";
src = fetchFromGitHub {
owner = "jiixyj";
diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix
index be9f5e772d91..855386114c1c 100644
--- a/pkgs/development/libraries/libechonest/default.nix
+++ b/pkgs/development/libraries/libechonest/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, qt4, qjson, doxygen, boost }:
stdenv.mkDerivation rec {
- name = "libechonest-${version}";
+ pname = "libechonest";
version = "2.3.0";
src = fetchurl {
- url = "http://files.lfranchi.com/${name}.tar.bz2";
+ url = "http://files.lfranchi.com/${pname}-${version}.tar.bz2";
sha1 = "cf1b279c96f15c87c36fdeb23b569a60cdfb01db";
};
diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix
index 26fe2d90963a..1835b924ec1a 100644
--- a/pkgs/development/libraries/libelf-freebsd/default.nix
+++ b/pkgs/development/libraries/libelf-freebsd/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation (rec {
version = "3258";
- name = "libelf-freebsd-${version}";
+ pname = "libelf-freebsd";
src = fetchsvn {
url = svn://svn.code.sf.net/p/elftoolchain/code/trunk;
diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix
index 980cee2e6879..9650f540fcfb 100644
--- a/pkgs/development/libraries/libesmtp/default.nix
+++ b/pkgs/development/libraries/libesmtp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
- name = "libESMTP-${version}";
+stdenv.mkDerivation {
+ pname = "libESMTP";
version = "1.0.6";
src = fetchurl {
diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix
index 365c128239d8..56710945ecb1 100644
--- a/pkgs/development/libraries/libev/default.nix
+++ b/pkgs/development/libraries/libev/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libev-${version}";
+ pname = "libev";
version="4.27";
src = fetchurl {
- url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz";
+ url = "http://dist.schmorp.de/libev/Attic/${pname}-${version}.tar.gz";
sha256 = "0kil23cgsp0r5shvnwwbsy7fzxb62sxqzqbkbkfp5w54ipy2cm9d";
};
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 611287b9aaa8..a94b6d1dc2a6 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -5,12 +5,12 @@
assert sslSupport -> openssl != null;
stdenv.mkDerivation rec {
- name = "libevent-${version}";
- version = "2.1.10";
+ pname = "libevent";
+ version = "2.1.11";
src = fetchurl {
url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz";
- sha256 = "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78";
+ sha256 = "0g988zqm45sj1hlhhz4il5z4dpi5dl74hzjwzl4md37a09iaqnx6";
};
# libevent_openssl is moved into its own output, so that openssl isn't present
diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix
index d150d4a00330..fd1e203ed37f 100644
--- a/pkgs/development/libraries/libewf/default.nix
+++ b/pkgs/development/libraries/libewf/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "20171104";
- name = "libewf-${version}";
+ pname = "libewf";
src = fetchurl {
url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix
index a61d51aa6b72..2eee9bafe44b 100644
--- a/pkgs/development/libraries/libexecinfo/default.nix
+++ b/pkgs/development/libraries/libexecinfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
- name = "libexecinfo-${version}";
+ pname = "libexecinfo";
version = "1.1";
src = fetchurl {
- url = "http://distcache.freebsd.org/local-distfiles/itetcu/${name}.tar.bz2";
+ url = "http://distcache.freebsd.org/local-distfiles/itetcu/${pname}-${version}.tar.bz2";
sha256 = "07wvlpc1jk1sj4k5w53ml6wagh0zm9kv2l1jngv8xb7xww9ik8n9";
};
diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index 43e6abe1a39f..8fd01dbd506a 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
};
patches = [
+ ./fix-gcc8-build.patch
# Fixes build with exiv2 0.27
(fetchpatch {
name = "libextractor-exiv2-0.27.patch";
diff --git a/pkgs/development/libraries/libextractor/fix-gcc8-build.patch b/pkgs/development/libraries/libextractor/fix-gcc8-build.patch
new file mode 100644
index 000000000000..e04d09be8998
--- /dev/null
+++ b/pkgs/development/libraries/libextractor/fix-gcc8-build.patch
@@ -0,0 +1,16 @@
+diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c
+index 072ffc5..a105840 100644
+--- a/src/plugins/ole2_extractor.c
++++ b/src/plugins/ole2_extractor.c
+@@ -345,9 +345,8 @@ process_star_office (GsfInput *src,
+ gsf_input_read (src, size, (unsigned char*) buf);
+ if ( (buf[0] != 0x0F) ||
+ (buf[1] != 0x0) ||
+- (0 != strncmp (&buf[2],
+- "SfxDocumentInfo",
+- strlen ("SfxDocumentInfo"))) ||
++ (0 != strcmp (&buf[2],
++ "SfxDocumentInfo")) ||
+ (buf[0x11] != 0x0B) ||
+ (buf[0x13] != 0x00) || /* pw protected! */
+ (buf[0x12] != 0x00) )
diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix
index e36c4ee12b94..196f0e50bef8 100644
--- a/pkgs/development/libraries/libfakekey/default.nix
+++ b/pkgs/development/libraries/libfakekey/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xorgproto }:
stdenv.mkDerivation rec {
- name = "libfakekey-${version}";
+ pname = "libfakekey";
version = "0.1";
src = fetchurl {
- url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${name}.tar.gz";
+ url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${pname}-${version}.tar.gz";
sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k";
};
diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix
index f553afdfc709..10e9efed26ab 100644
--- a/pkgs/development/libraries/libfaketime/default.nix
+++ b/pkgs/development/libraries/libfaketime/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
- name = "libfaketime-${version}";
+ pname = "libfaketime";
version = "0.9.7";
src = fetchurl {
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
PREFIX = placeholder "out";
LIBDIRNAME = "/lib";
+ NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type -Wno-error=format-truncation";
+
checkInputs = [ perl ];
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/development/libraries/libfann/default.nix
index 5ac7a244df20..5e1c985fe2c4 100644
--- a/pkgs/development/libraries/libfann/default.nix
+++ b/pkgs/development/libraries/libfann/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "libfann-${version}";
+ pname = "libfann";
version = "2.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix
index 513a4dc3d384..8d11cd86c45f 100644
--- a/pkgs/development/libraries/libffcall/default.nix
+++ b/pkgs/development/libraries/libffcall/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libffcall-${version}";
+ pname = "libffcall";
version = "2.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix
index 4b02d651929b..e007ab2f95af 100644
--- a/pkgs/development/libraries/libfive/default.nix
+++ b/pkgs/development/libraries/libfive/default.nix
@@ -2,8 +2,8 @@
zlib, libpng, boost, qt5, guile
}:
-stdenv.mkDerivation rec {
- name = "libfive-${version}";
+stdenv.mkDerivation {
+ pname = "libfive";
version = "2018-07-01";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix
index 2d2d56dda4f2..9c9b6c8034c4 100644
--- a/pkgs/development/libraries/libfixposix/default.nix
+++ b/pkgs/development/libraries/libfixposix/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
stdenv.mkDerivation rec {
- name="libfixposix-${version}";
+ pname = "libfixposix";
version="0.4.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix
index cfae74b4b9e3..8ddce0aa98c6 100644
--- a/pkgs/development/libraries/libfreefare/default.nix
+++ b/pkgs/development/libraries/libfreefare/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, pkgconfig, libnfc, openssl
, libobjc ? null }:
-stdenv.mkDerivation rec {
- name = "libfreefare-${version}";
+stdenv.mkDerivation {
+ pname = "libfreefare";
version = "0.4.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/development/libraries/libfsm/default.nix
index 5491fab3edf2..ce7d615f4d31 100644
--- a/pkgs/development/libraries/libfsm/default.nix
+++ b/pkgs/development/libraries/libfsm/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "libfsm-${version}";
+ pname = "libfsm";
version = "0.1pre1869_${builtins.substring 0 7 src.rev}";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix
index a6fe2bc1435f..d83b43a782e9 100644
--- a/pkgs/development/libraries/libgaminggear/default.nix
+++ b/pkgs/development/libraries/libgaminggear/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "libgaminggear-${version}";
+ pname = "libgaminggear";
version = "0.15.1";
src = fetchurl {
- url = "mirror://sourceforge/libgaminggear/${name}.tar.bz2";
+ url = "mirror://sourceforge/libgaminggear/${pname}-${version}.tar.bz2";
sha256 = "0jf5i1iv8j842imgiixbhwcr6qcwa93m27lzr6gb01ri5v35kggz";
};
diff --git a/pkgs/development/libraries/libgap/default.nix b/pkgs/development/libraries/libgap/default.nix
deleted file mode 100644
index 42e812ec1f53..000000000000
--- a/pkgs/development/libraries/libgap/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv
-, fetchurl
-, gmp
-}:
-# will probably be obsolte (or at leat built from the upstream gap sources) soon (gap 4.9?). See
-# - https://github.com/gap-system/gap/projects/5#card-6239828
-# - https://github.com/markuspf/gap/issues/2
-# - https://trac.sagemath.org/ticket/22626
-stdenv.mkDerivation rec {
- name = "libgap-${version}";
- # Has to be the same version as "gap"
- version = "4.8.6";
- src = fetchurl {
- url = "mirror://sageupstream/libgap/libgap-${version}.tar.gz";
- sha256 = "1h5fx5a55857w583ql7ly2jl49qyx9mvs7j5abys00ra9gzrpn5v";
- };
- buildInputs = [gmp];
- meta = {
- inherit version;
- description = ''A library-packaged fork of the GAP kernel'';
- license = stdenv.lib.licenses.gpl3Plus;
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 4d8a7eac27c8..75d8e6710e09 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -5,12 +5,12 @@
assert enableCapabilities -> stdenv.isLinux;
stdenv.mkDerivation rec {
- name = "libgcrypt-${version}";
- version = "1.8.4";
+ pname = "libgcrypt";
+ version = "1.8.5";
src = fetchurl {
- url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
- sha256 = "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n";
+ url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2";
+ sha256 = "1hvsazms1bfd769q0ngl0r9g5i4m9mpz9jmvvrdzyzk3rfa2ljiv";
};
outputs = [ "out" "dev" "info" ];
diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix
index f61283aec4a0..c7ff6d10da39 100644
--- a/pkgs/development/libraries/libgdata/default.nix
+++ b/pkgs/development/libraries/libgdata/default.nix
@@ -1,9 +1,9 @@
{ stdenv
, fetchurl
-, fetchpatch
, pkgconfig
, meson
, ninja
+, nixosTests
, vala
, gettext
, libxml2
@@ -22,32 +22,17 @@
stdenv.mkDerivation rec {
pname = "libgdata";
- version = "0.17.10";
+ version = "0.17.11";
outputs = [ "out" "dev" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "04mh2p5x2iidfx0d1cablxbi3hvna8cmlddc1mm4387n0grx3ly1";
+ sha256 = "11m99sh2k679rnsvqsi95s1l0r8lkvj61dmwg1pnxvsd5q91g6bb";
};
patches = [
./installed-tests-path.patch
- (fetchpatch {
- # Meson fixes
- url = "https://gitlab.gnome.org/GNOME/libgdata/commit/f6d0e3f3b6fa8e8ee9569372c5709c1fb84af2c1.diff";
- sha256 = "00yrppn0s21i41r9mwzvrrv7j5dida09kh7i44kv8hrbrlfag7bm";
- })
- (fetchpatch {
- # Meson minor fixes
- url = "https://gitlab.gnome.org/GNOME/libgdata/commit/b653f602b3c2b518101c5d909e1651534c22757a.diff";
- sha256 = "1bn0rffsvkzjl59aw8dmq1wil58x1fshz0m6xabpn79ffvbjld8j";
- })
- (fetchpatch {
- # Meson: Fix G_LOG_DOMAIN
- url = "https://gitlab.gnome.org/GNOME/libgdata/commit/5d318e0bf905d0f1a8b3fe1e47ee7847739082e3.diff";
- sha256 = "11i2blq811d53433kdq4hhsscgkrq5f50d9ih4ixgs3j47hg7b1w";
- })
];
nativeBuildInputs = [
@@ -77,8 +62,8 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dgtk_doc=false"
- "-Dinstalled_test_bindir=${placeholder ''installedTests''}/libexec"
- "-Dinstalled_test_datadir=${placeholder ''installedTests''}/share"
+ "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec"
+ "-Dinstalled_test_datadir=${placeholder "installedTests"}/share"
"-Dinstalled_tests=true"
];
@@ -87,6 +72,10 @@ stdenv.mkDerivation rec {
packageName = pname;
versionPolicy = "none"; # Stable version has not been updated for a long time.
};
+
+ tests = {
+ installedTests = nixosTests.libgdata;
+ };
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libgdata/installed-tests-path.patch b/pkgs/development/libraries/libgdata/installed-tests-path.patch
index 18669817cfed..f8c0a1293a1f 100644
--- a/pkgs/development/libraries/libgdata/installed-tests-path.patch
+++ b/pkgs/development/libraries/libgdata/installed-tests-path.patch
@@ -1,5 +1,5 @@
diff --git a/gdata/tests/meson.build b/gdata/tests/meson.build
-index 52154e7a..1a44d1d8 100644
+index 05184deb..3a9392d4 100644
--- a/gdata/tests/meson.build
+++ b/gdata/tests/meson.build
@@ -1,5 +1,12 @@
@@ -17,17 +17,17 @@ index 52154e7a..1a44d1d8 100644
tests_sources = files(
'common.c',
-@@ -48,7 +55,7 @@ foreach test_name, extra_args: tests
+@@ -49,7 +56,7 @@ foreach test_name, extra_args: tests
dependencies: common_deps + extra_args.get('dependencies', []),
sources: tests_sources,
- install: install_tests,
+ install: install_tests and not should_fail,
- install_dir: tests_execdir,
+ install_dir: tests_bindir,
)
test(
-@@ -63,7 +70,7 @@ if install_tests
- foreach test_name, extra_args: tests
+@@ -65,7 +72,7 @@ if install_tests
+ should_fail = extra_args.get('should_fail', false)
tests_conf = {
'TEST_TYPE': 'session',
- 'TEST_ABS_PATH': gdata_prefix / tests_execdir / test_name,
@@ -35,10 +35,10 @@ index 52154e7a..1a44d1d8 100644
}
configure_file (
-@@ -71,13 +78,13 @@ if install_tests
+@@ -73,13 +80,13 @@ if install_tests
output: test_name + '.test',
configuration: tests_conf,
- install: true,
+ install: not should_fail,
- install_dir: tests_metadir,
+ install_dir: tests_datadir,
)
@@ -51,7 +51,7 @@ index 52154e7a..1a44d1d8 100644
)
test_data = [
-@@ -96,6 +103,6 @@ if install_tests
+@@ -98,6 +105,6 @@ if install_tests
install_data(
test_data,
@@ -60,7 +60,7 @@ index 52154e7a..1a44d1d8 100644
)
endif
diff --git a/meson.build b/meson.build
-index 7d2f5254..bed3e189 100644
+index 50441abb..5fc773b1 100644
--- a/meson.build
+++ b/meson.build
@@ -20,9 +20,9 @@ gdata_api_version_minor = 0
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index ba9eab432029..9ba3cdbd09aa 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -2,7 +2,7 @@
, libtiff, giflib, libjpeg, libpng
, libXrender, libexif, autoreconfHook, fetchpatch }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libgdiplus-5.6.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix
index 260c3a3d97bf..b9e1d668cd3e 100644
--- a/pkgs/development/libraries/libgee/default.nix
+++ b/pkgs/development/libraries/libgee/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libgee";
- version = "0.20.1";
+ version = "0.20.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v";
+ sha256 = "0g1mhl7nidg82v4cikkk8dakzc18hg7wv0dsf2pbyijzfm5mq0wy";
};
doCheck = true;
diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix
index 51520eb0fe38..db75ff1784f5 100644
--- a/pkgs/development/libraries/libgeotiff/default.nix
+++ b/pkgs/development/libraries/libgeotiff/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.5.1";
- name = "libgeotiff-${version}";
+ pname = "libgeotiff";
src = fetchFromGitHub {
owner = "OSGeo";
diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix
index 56f160838e66..279392382785 100644
--- a/pkgs/development/libraries/libgig/default.nix
+++ b/pkgs/development/libraries/libgig/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }:
stdenv.mkDerivation rec {
- name = "libgig-${version}";
+ pname = "libgig";
version = "4.2.0";
src = fetchurl {
- url = "https://download.linuxsampler.org/packages/${name}.tar.bz2";
+ url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
sha256 = "1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn";
};
diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index 9bec00b9f52d..24052ea40585 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -6,10 +6,9 @@
stdenv.mkDerivation rec {
version = "2.0.12";
pname = "libgksu";
- name = "${pname}-${version}";
src = fetchurl {
- url = "http://people.debian.org/~kov/gksu/${name}.tar.gz";
+ url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz";
sha256 = "1brz9j3nf7l2gd3a5grbp0s3nksmlrp6rxmgp5s6gjvxcb1wzy92";
};
diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix
index 62c6b45c5d45..b976c9c36b83 100644
--- a/pkgs/development/libraries/libglvnd/default.nix
+++ b/pkgs/development/libraries/libglvnd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }:
stdenv.mkDerivation rec {
- name = "libglvnd-${version}";
+ pname = "libglvnd";
version = "1.0.0";
src = fetchFromGitHub {
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
"-UDEFAULT_EGL_VENDOR_CONFIG_DIRS"
# FHS paths are added so that non-NixOS applications can find vendor files.
"-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${addOpenGLRunpath.driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\""
+
+ "-Wno-error=array-bounds"
] ++ lib.optional stdenv.cc.isClang "-Wno-error";
# Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268
@@ -43,10 +45,11 @@ stdenv.mkDerivation rec {
});
outputs = [ "out" "dev" ];
- # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found.
- # See the explanation in addOpenGLRunpath.
+ # Set RUNPATH so that libGLX can find driver libraries in /run/opengl-driver(-32)/lib.
+ # Note that libEGL does not need it because it uses driver config files which should
+ # contain absolute paths to libraries.
postFixup = ''
- addOpenGLRunpath $out/lib/libGLX.so $out/lib/libEGL.so
+ addOpenGLRunpath $out/lib/libGLX.so
'';
passthru = { inherit (addOpenGLRunpath) driverLink; };
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index f3e1b8b0f997..d7fb35897dc4 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPackages, fetchurl, gettext
+{ stdenv, lib, buildPackages, fetchurl, gettext, fetchpatch
, genPosixLockObjOnly ? false
}: let
genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly {
@@ -24,7 +24,18 @@ in stdenv.mkDerivation (rec {
sha256 = "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds";
};
+ # Remove gawk buildfix on > 1.36
+ patches = [
+ (fetchpatch {
+ url = "https://dev.gnupg.org/rE7865041c77f4f7005282f10f9b6666b19072fbdf?diff=1";
+ sha256 = "0hs4rpwqq2afpsbqliq451jjaysq2iyzxvd9sx3992b4vnllgqqq";
+ })
+ ];
+
postPatch = ''
+ # Remove on > 1.36 release: gawk upgrade fix didn't include Makefile regeneration
+ sed 's/-v namespace=errnos_/-v pkg_namespace=errnos_/' -i src/Makefile.in
+
sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
'' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) ''
ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index cbedd97b2eec..6203b8c7b712 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "gphoto";
repo = "libgphoto2";
- rev = "${meta.tag}";
+ rev = meta.tag;
sha256 = "1sc2ycx11khf0qzp1cqxxx1qymv6bjfbkx3vvbwz6wnbyvsigxz2";
};
diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix
index 23f46ad2a0cf..782c0a8857a4 100644
--- a/pkgs/development/libraries/libgpiod/default.nix
+++ b/pkgs/development/libraries/libgpiod/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-tools=${if enable-tools then "yes" else "no"}"
"--enable-bindings-cxx"
- "--prefix=${placeholder ''out''}"
+ "--prefix=${placeholder "out"}"
];
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix
index 89fcfdfde8da..76d7ebcc8cc2 100644
--- a/pkgs/development/libraries/libgringotts/default.nix
+++ b/pkgs/development/libraries/libgringotts/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, zlib, bzip2, libmcrypt, libmhash }:
stdenv.mkDerivation rec {
- name = "libgringotts-${version}";
+ pname = "libgringotts";
version = "1.2.1";
src = fetchurl {
- url = "https://sourceforge.net/projects/gringotts.berlios/files/${name}.tar.bz2";
+ url = "https://sourceforge.net/projects/gringotts.berlios/files/${pname}-${version}.tar.bz2";
sha256 = "1ldz1lyl1aml5ci1mpnys8dg6n7khpcs4zpycak3spcpgdsnypm7";
};
diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix
index bd5a5f068515..511af0b613b8 100644
--- a/pkgs/development/libraries/libgroove/default.nix
+++ b/pkgs/development/libraries/libgroove/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "4.3.0";
- name = "libgroove-${version}";
+ pname = "libgroove";
src = fetchFromGitHub {
owner = "andrewrk";
repo = "libgroove";
- rev = "${version}";
+ rev = version;
sha256 = "1la9d9kig50mc74bxvhx6hzqv0nrci9aqdm4k2j4q0s1nlfgxipd";
};
diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index d3dea766cbbb..b52a2b1e0fa9 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -1,16 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, udev, glib, gobject-introspection, gnome3 }:
+{ stdenv
+, fetchurl
+, pkgconfig
+, udev
+, glib
+, gobject-introspection
+, gnome3
+}:
-let
+stdenv.mkDerivation rec {
pname = "libgudev";
-in stdenv.mkDerivation rec {
- name = "libgudev-${version}";
- version = "232";
+ version = "233";
outputs = [ "out" "dev" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "00xvva04lgqamhnf277lg32phjn971wgpc9cxvgf5x13xdq4jz2q";
};
nativeBuildInputs = [ pkgconfig gobject-introspection ];
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index e3d7741ba869..9b50ddd4b7f4 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -10,7 +10,7 @@ assert appliance == null || stdenv.lib.isDerivation appliance;
assert javaSupport -> jdk != null;
stdenv.mkDerivation rec {
- name = "libguestfs-${version}";
+ pname = "libguestfs";
version = "1.38.6";
src = fetchurl {
diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix
index d5d35678b4fb..f1483c38c154 100644
--- a/pkgs/development/libraries/libgumath/default.nix
+++ b/pkgs/development/libraries/libgumath/default.nix
@@ -4,8 +4,8 @@
, libxnd
}:
-stdenv.mkDerivation rec {
- name = "libgumath-${version}";
+stdenv.mkDerivation {
+ pname = "libgumath";
version = "unstable-2018-11-27";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index 4883b39b7cf7..c4f353fb6d51 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -5,11 +5,9 @@
, hicolor-icon-theme
}:
-let
+stdenv.mkDerivation rec {
pname = "libhandy";
version = "0.0.11";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
outputs = [ "out" "dev" "devdoc" "glade" ];
outputBin = "dev";
@@ -49,7 +47,7 @@ in stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "A library full of GTK+ widgets for mobile phones";
+ description = "A library full of GTK widgets for mobile phones";
homepage = https://source.puri.sm/Librem5/libhandy;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ jtojnar ];
diff --git a/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch b/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch
deleted file mode 100644
index 2ea1b124ce7b..000000000000
--- a/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adapted from upstream commit 995a4283d8ed2d0d2c1ceb1a577b993df2f0e014
---- a/libheif/heif_context.cc
-+++ b/libheif/heif_context.cc
-@@ -571,6 +571,11 @@
- image->set_is_alpha_channel_of(refs[0]);
-
- auto master_iter = m_all_images.find(refs[0]);
-+ if (master_iter == m_all_images.end()) {
-+ return Error(heif_error_Invalid_input,
-+ heif_suberror_Nonexisting_item_referenced,
-+ "Non-existing alpha image referenced");
-+ }
- master_iter->second->set_alpha_channel(image);
- }
-
diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix
index 3182345bfd48..02c4dd334813 100644
--- a/pkgs/development/libraries/libheif/default.nix
+++ b/pkgs/development/libraries/libheif/default.nix
@@ -1,18 +1,16 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }:
stdenv.mkDerivation rec {
- version = "1.4.0";
- name = "libheif-${version}";
+ pname = "libheif";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "strukturag";
repo = "libheif";
rev = "v${version}";
- sha256 = "0vbjknkb2ccmw3xh2j8ljz5sj9i8wv92iw7zghcc5wn64sk1xkk2";
+ sha256 = "1nvfjmnha06689imm8v24nlc011814gc9xq3x54cnmqvh5gn98ah";
};
- patches = [ ./1.4.0-CVE-2019-11471.patch ];
-
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libde265 x265 libpng libjpeg ];
diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix
index ab1858c51a61..08a88bfee459 100644
--- a/pkgs/development/libraries/libiberty/default.nix
+++ b/pkgs/development/libraries/libiberty/default.nix
@@ -2,7 +2,7 @@
let inherit (buildPackages.buildPackages) gcc; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libiberty-${gcc.cc.version}";
inherit (gcc.cc) src;
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index b86a48ecd1ba..050cba5460d9 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -1,34 +1,64 @@
-{ stdenv, fetchFromGitHub, perl, pkgconfig, cmake, ninja, vala, gobject-introspection
-, python3, tzdata, glib, libxml2, icu }:
+{ stdenv
+, fetchFromGitHub
+, cmake
+, glib
+, gobject-introspection
+, icu
+, libxml2
+, ninja
+, perl
+, pkgconfig
+, python3
+, tzdata
+, vala
+}:
stdenv.mkDerivation rec {
- name = "libical-${version}";
- version = "3.0.4";
+ pname = "libical";
+ version = "3.0.5";
- outputs = [ "out" "dev" ]; #"devdoc" ];
+ outputs = [ "out" "dev" ]; # "devdoc" ];
src = fetchFromGitHub {
owner = "libical";
repo = "libical";
rev = "v${version}";
- sha256 = "1qgpbdjd6jsivw87v5w52268kqp0rv780kli8cgb3ndlv592wlbm";
+ sha256 = "03kjc4s1svmzkmzkr0irgczq37aslhj4bxnvjqav0jwa2zrynhra";
};
nativeBuildInputs = [
- perl pkgconfig cmake ninja vala gobject-introspection
- (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests
-# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
-# gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
+ cmake
+ gobject-introspection
+ ninja
+ perl
+ pkgconfig
+ vala
+ # Docs building fails:
+ # https://github.com/NixOS/nixpkgs/pull/67204
+ # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
+ # gtk-doc docbook_xsl docbook_xml_dtd_43 # for docs
+ ];
+ installCheckInputs = [
+ # running libical-glib tests
+ (python3.withPackages (pkgs: with pkgs; [
+ pygobject3
+ ]))
+ ];
+
+ buildInputs = [
+ glib
+ libxml2
+ icu
];
- buildInputs = [ glib libxml2 icu ];
cmakeFlags = [
"-DGOBJECT_INTROSPECTION=True"
+ "-DENABLE_GTK_DOC=False"
"-DICAL_GLIB_VAPI=True"
];
patches = [
- # TODO: upstream this patch
+ # Will appear in 3.1.0
# https://github.com/libical/libical/issues/350
./respect-env-tzdir.patch
];
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index c5379692ad30..7dc90d9ae3e4 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -6,11 +6,11 @@
# assert !stdenv.hostPlatform.isLinux || stdenv.hostPlatform != stdenv.buildPlatform; # TODO: improve on cross
stdenv.mkDerivation rec {
- name = "libiconv-${version}";
+ pname = "libiconv";
version = "1.16";
src = fetchurl {
- url = "mirror://gnu/libiconv/${name}.tar.gz";
+ url = "mirror://gnu/libiconv/${pname}-${version}.tar.gz";
sha256 = "016c57srqr0bza5fxjxfrx6aqxkqy0s3gkhcg7p7fhk5i6sv38g6";
};
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix
index 4b7d9bdc2e32..674862d694c7 100644
--- a/pkgs/development/libraries/libid3tag/default.nix
+++ b/pkgs/development/libraries/libid3tag/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, zlib, gperf}:
stdenv.mkDerivation rec {
- name = "libid3tag-${version}";
+ pname = "libid3tag";
version = "0.15.1b";
src = fetchurl {
diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index 5ec5b8e04dd0..7e7b691e3c19 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "libidn2-${version}";
+ pname = "libidn2";
version = "2.2.0";
src = fetchurl {
- url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
+ url = "mirror://gnu/gnu/libidn/${pname}-${version}.tar.gz";
sha256 = "1zl1cc2xgxw31pdhvhr5ij36x4vvpy16jq667rspin06nlr4fwzw";
};
diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix
index 4fa3addc0a66..936d165a6cfc 100644
--- a/pkgs/development/libraries/libiec61883/default.nix
+++ b/pkgs/development/libraries/libiec61883/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.2.0";
- name = "libiec61883-${version}";
+ pname = "libiec61883";
src = fetchurl {
url = "mirror://debian/pool/main/libi/libiec61883/libiec61883_${version}.orig.tar.gz";
diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
index df5035461afd..9392061a269e 100644
--- a/pkgs/development/libraries/libiio/default.nix
+++ b/pkgs/development/libraries/libiio/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "libiio-${version}";
+ pname = "libiio";
version = "0.18";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index 6464e4e58201..7eccfc37363c 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -5,8 +5,6 @@ stdenv.mkDerivation rec {
pname = "libimobiledevice";
version = "2019-04-04";
- name = "${pname}-${version}";
-
src = fetchFromGitHub {
owner = pname;
repo = pname;
diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix
index c57590aad218..9be58ac537ad 100644
--- a/pkgs/development/libraries/libinfinity/default.nix
+++ b/pkgs/development/libraries/libinfinity/default.nix
@@ -12,10 +12,10 @@ let
mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature;
self = stdenv.mkDerivation rec {
- name = "libinfinity-${version}";
+ pname = "libinfinity";
version = "0.7.1";
src = fetchurl {
- url = "http://releases.0x539.de/libinfinity/${name}.tar.gz";
+ url = "http://releases.0x539.de/libinfinity/${pname}-${version}.tar.gz";
sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2";
};
diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix
index 6fc507daf641..75cd1a005072 100644
--- a/pkgs/development/libraries/libinotify-kqueue/default.nix
+++ b/pkgs/development/libraries/libinotify-kqueue/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "libinotify-kqueue-${version}";
+ pname = "libinotify-kqueue";
version = "20180201";
src = fetchzip {
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 0c759835183b..044ef2dd6a79 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -26,12 +26,12 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "libinput-${version}";
- version = "1.13.4";
+ pname = "libinput";
+ version = "1.14.1";
src = fetchurl {
- url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
- sha256 = "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk";
+ url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
+ sha256 = "0w7fas37mp2k06f12i3lnj717lw73asziknj6z51kh1m50ja6cz3";
};
outputs = [ "bin" "out" "dev" ];
diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix
index fea5a86da446..fccf4b3d50f2 100644
--- a/pkgs/development/libraries/libipfix/default.nix
+++ b/pkgs/development/libraries/libipfix/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
- name = "libipfix-${version}";
+stdenv.mkDerivation {
+ pname = "libipfix";
version = "110209";
src = fetchurl {
url = "mirror://sourceforge/libipfix/files/libipfix/libipfix_110209.tgz";
diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix
new file mode 100644
index 000000000000..c61053ff6932
--- /dev/null
+++ b/pkgs/development/libraries/libipt/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ pname = "libipt";
+ version = "2.0.1";
+
+ src = fetchFromGitHub {
+ owner = "intel";
+ repo = "libipt";
+ rev = "v${version}";
+ sha256 = "19y1lk5z1rf8xmr08m8zrpjkgr5as83b96xyaxwn67m2wz58mpmh";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with stdenv.lib; {
+ description = "Intel Processor Trace decoder library";
+ homepage = https://github.com/intel/libipt;
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ orivej ];
+ };
+}
diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix
index 71238dda1620..561a52482788 100644
--- a/pkgs/development/libraries/libircclient/default.nix
+++ b/pkgs/development/libraries/libircclient/default.nix
@@ -1,12 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
version = "1.10";
pname = "libircclient";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "0b9wa0h3xc31wpqlvgxgnvqp5wgx3kwsf5s9432m5cj8ycx6zcmv";
};
diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix
index 32a2971b3e36..be05f120e13a 100644
--- a/pkgs/development/libraries/libirecovery/default.nix
+++ b/pkgs/development/libraries/libirecovery/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
# as only the `idevicerestore` binary was tested so far (which worked
# without further configuration).
configureFlags = [
- "--with-udevrulesdir=${placeholder ''out''}/lib/udev/rules.d"
+ "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
''--with-udevrule="OWNER=\"root\", GROUP=\"myusergroup\", MODE=\"0660\""''
];
diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix
index ce2028e805dc..cefce19d4659 100644
--- a/pkgs/development/libraries/libisoburn/default.nix
+++ b/pkgs/development/libraries/libisoburn/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }:
stdenv.mkDerivation rec {
- name = "libisoburn-${version}";
+ pname = "libisoburn";
version = "1.5.0";
src = fetchurl {
- url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
+ url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
sha256 = "1r8xbhw21bmcp3jhfmvadivh0fa7f4k6larv8lvg4ka0kiigbhfs";
};
diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix
index d52814483870..59726094c4ae 100644
--- a/pkgs/development/libraries/libisofs/default.nix
+++ b/pkgs/development/libraries/libisofs/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, acl, attr, zlib }:
stdenv.mkDerivation rec {
- name = "libisofs-${version}";
+ pname = "libisofs";
version = "1.5.0";
src = fetchurl {
- url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
+ url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
sha256 = "001l3akf3wb6msl9man776w560iqyvsbwwzs7d7y7msx13irspys";
};
diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 0b00cf90ba00..73801102ba38 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libconfuse }:
stdenv.mkDerivation rec {
- name = "libite-${version}";
+ pname = "libite";
version = "2.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix
index 51b2dd7c7bd6..bd1432b8a21b 100644
--- a/pkgs/development/libraries/libivykis/default.nix
+++ b/pkgs/development/libraries/libivykis/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, file, protobufc }:
stdenv.mkDerivation rec {
- name = "libivykis-${version}";
+ pname = "libivykis";
version = "0.42.3";
diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix
index 68835c1414c3..1790f3f68b2a 100644
--- a/pkgs/development/libraries/libixp-hg/default.nix
+++ b/pkgs/development/libraries/libixp-hg/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
rev = "148";
version = "hg-2012-12-02";
- name = "libixp-${version}";
+ pname = "libixp";
src = fetchurl {
url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/libixp/source-archive.zip;
diff --git a/pkgs/development/libraries/libjpeg-drop/default.nix b/pkgs/development/libraries/libjpeg-drop/default.nix
index 0f2c9dce28a2..4e9c165e71fb 100644
--- a/pkgs/development/libraries/libjpeg-drop/default.nix
+++ b/pkgs/development/libraries/libjpeg-drop/default.nix
@@ -2,7 +2,7 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libjpeg-drop-9b";
srcs = [
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index 191c375f3be8..cb32b22f45e4 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "libjpeg-turbo";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
- sha256 = "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c";
+ sha256 = "1ds16bnj17v6hzd43w8pzijz3imd9am4hw75ir0fxm240m8dwij2";
};
patches =
diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix
index 2167b4477034..9e81c9324057 100644
--- a/pkgs/development/libraries/libjreen/default.nix
+++ b/pkgs/development/libraries/libjreen/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, qt4, pkgconfig, gsasl }:
stdenv.mkDerivation rec {
- name = "libjreen-${version}";
+ pname = "libjreen";
version = "1.2.0";
src = fetchurl {
- url = "https://qutim.org/dwnl/73/${name}.tar.bz2";
+ url = "https://qutim.org/dwnl/73/${pname}-${version}.tar.bz2";
sha256 = "14nwwk40xx8w6x7yaysgcr0lgzhs7l064f7ikp32s5y9a8mmp582";
};
diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
index f352c8e9ed19..a7c9427080d8 100644
--- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix
+++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "libjson-rpc-cpp-${version}";
+ pname = "libjson-rpc-cpp";
version = "0.7.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix
index c83143dd6b13..b62f0f116a09 100644
--- a/pkgs/development/libraries/libjson/default.nix
+++ b/pkgs/development/libraries/libjson/default.nix
@@ -1,8 +1,9 @@
{ stdenv, fetchurl, unzip }:
let
version = "7.6.1";
-in stdenv.mkDerivation rec {
- name = "libjson-${version}";
+in stdenv.mkDerivation {
+ pname = "libjson";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/libjson/libjson_${version}.zip";
sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7";
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index 93f3b2a4f84d..12205a6a63b3 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fftw, qtbase, qmake }:
stdenv.mkDerivation rec {
- name = "libkeyfinder-${version}";
+ pname = "libkeyfinder";
version = "2.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix
index 92e7d26f5afa..b4e9f2bdf885 100644
--- a/pkgs/development/libraries/libksi/default.nix
+++ b/pkgs/development/libraries/libksi/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libksi-2015-07-03";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix
index 8b5f189a9e1e..04dabf14100c 100644
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/pkgs/development/libraries/libktorrent/default.nix
@@ -4,14 +4,15 @@
}:
let
- mainVersion = "5.1";
+ mainVersion = "5.1.2";
in stdenv.mkDerivation rec {
- name = "libktorrent-2.1";
+ pname = "libktorrent";
+ version = "2.1.1";
src = fetchurl {
- url = "mirror://kde/stable/ktorrent/${mainVersion}/${name}.tar.xz";
- sha256 = "0vz2dwc4xd80q56g6r5bx5wqdl9fxcibxmw2irahqhbkxk7drvry";
+ url = "mirror://kde/stable/ktorrent/${mainVersion}/${pname}-${version}.tar.xz";
+ sha256 = "0051zh8bb4p9wmcfn5ql987brhsaiw9880xdck7b5dm1a05mri2w";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix
index 24dd34d7a6a3..1c5c39ac8989 100644
--- a/pkgs/development/libraries/liblangtag/default.nix
+++ b/pkgs/development/libraries/liblangtag/default.nix
@@ -3,14 +3,13 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "liblangtag";
version = "0.6.1";
src = fetchFromBitbucket {
owner = "tagoh";
- repo = "${pname}";
- rev = "${version}";
+ repo = pname;
+ rev = version;
sha256 = "19dk2qsg7f3ig9xz8d73jvikmf5kvrwi008wrz2psxinbdml442g";
};
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index 767485a75154..ff1a39fc2049 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -4,12 +4,13 @@
let version = "1.1.0"; in
stdenv.mkDerivation rec {
- name = "liblastfm-${version}";
+ pname = "liblastfm";
+ inherit version;
# Upstream does not package git tags as tarballs. Get tarball from github.
src = fetchurl {
url = "https://github.com/lastfm/liblastfm/tarball/${version}";
- name = "${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x";
};
diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix
index d9f460d44e8c..c51cb9baead6 100644
--- a/pkgs/development/libraries/liblastfmSF/default.nix
+++ b/pkgs/development/libraries/liblastfmSF/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, curl, openssl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "liblastfm-SF-0.5";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix
index cafd6a66aa00..f185a44380ab 100644
--- a/pkgs/development/libraries/liblaxjson/default.nix
+++ b/pkgs/development/libraries/liblaxjson/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "1.0.5";
- name = "liblaxjson-${version}";
+ pname = "liblaxjson";
src = fetchFromGitHub {
owner = "andrewrk";
repo = "liblaxjson";
- rev = "${version}";
+ rev = version;
sha256 = "01iqbpbhnqfifhv82m6hi8190w5sdim4qyrkss7z1zyv3gpchc5s";
};
diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix
index 9870e024687c..fe513d378cd8 100644
--- a/pkgs/development/libraries/liblcf/default.nix
+++ b/pkgs/development/libraries/liblcf/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, expat, icu }:
stdenv.mkDerivation rec {
- name = "liblcf-${version}";
+ pname = "liblcf";
version = "0.6.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix
index 1a177dc22374..e8d8e971bc54 100644
--- a/pkgs/development/libraries/liblinear/default.nix
+++ b/pkgs/development/libraries/liblinear/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "liblinear-${version}";
+ pname = "liblinear";
version = "2.30";
src = fetchurl {
diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index c2731e44efbc..0f73be7ebcea 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -1,25 +1,36 @@
-{ fetchFromGitHub, stdenv, autoreconfHook, pkgconfig, gettext, python3
-, texinfo, help2man, libyaml, perl
+{ fetchFromGitHub
+, stdenv
+, autoreconfHook
+, pkgconfig
+, gettext
+, python3
+, texinfo
+, help2man
+, libyaml
+, perl
}:
-let
- version = "3.10.0";
-in stdenv.mkDerivation rec {
- name = "liblouis-${version}";
+stdenv.mkDerivation rec {
+ pname = "liblouis";
+ version = "3.11.0";
src = fetchFromGitHub {
owner = "liblouis";
repo = "liblouis";
rev = "v${version}";
- sha256 = "1wimv2wfl566jp8hhrxr91dmx20hldqzj70dar8i9k3hzq1kmb4q";
+ sha256 = "1y0pypgxchxczdnjkblibbvvy4gdk2pf8dzpqmbf824c7zpy8z5r";
};
outputs = [ "out" "dev" "man" "info" "doc" ];
nativeBuildInputs = [
- autoreconfHook pkgconfig gettext python3
+ autoreconfHook
+ pkgconfig
+ gettext
+ python3
# Docs, man, info
- texinfo help2man
+ texinfo
+ help2man
];
buildInputs = [
diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix
index 1a5a4baf8086..471f277fb523 100644
--- a/pkgs/development/libraries/liblscp/default.nix
+++ b/pkgs/development/libraries/liblscp/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig }:
stdenv.mkDerivation rec {
- name = "liblscp-${version}";
+ pname = "liblscp";
version = "0.6.0";
src = fetchurl {
- url = "https://download.linuxsampler.org/packages/${name}.tar.gz";
+ url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.gz";
sha256 = "1rl7ssdzj0z3658yvdijmb27n2lcwmplx4qxg5mwrm07pvs7i75k";
};
diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix
index 8ff02b49e584..3786c5e77d3a 100644
--- a/pkgs/development/libraries/libmatchbox/default.nix
+++ b/pkgs/development/libraries/libmatchbox/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}:
stdenv.mkDerivation rec {
- name = "libmatchbox-${version}";
+ pname = "libmatchbox";
version = "1.11";
buildInputs = [ libXft libICE pango libjpeg ];
diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix
index 0f43c0d46164..7f5c8b4c4c25 100644
--- a/pkgs/development/libraries/libmatheval/default.nix
+++ b/pkgs/development/libraries/libmatheval/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
version = "1.1.11";
- name = "libmatheval-${version}";
+ pname = "libmatheval";
nativeBuildInputs = [ pkgconfig autoconf flex ];
buildInputs = [ guile ];
src = fetchurl {
- url = "https://ftp.gnu.org/gnu/libmatheval/${name}.tar.gz";
+ url = "https://ftp.gnu.org/gnu/libmatheval/${pname}-${version}.tar.gz";
sha256 = "474852d6715ddc3b6969e28de5e1a5fbaff9e8ece6aebb9dc1cc63e9e88e89ab";
};
diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix
index f1b15a91ccac..46ed250b7b19 100644
--- a/pkgs/development/libraries/libmaxminddb/default.nix
+++ b/pkgs/development/libraries/libmaxminddb/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libmaxminddb-${version}";
+ pname = "libmaxminddb";
version = "1.3.2";
src = fetchurl {
- url = meta.homepage + "/releases/download/${version}/${name}.tar.gz";
+ url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "1w60yq26x3yr3abxk7fwqqaggw8dc98595jdliaa3kyqdfm83y76";
};
diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix
index 406b88ea8c1b..7a7bd1153280 100644
--- a/pkgs/development/libraries/libmbim/default.nix
+++ b/pkgs/development/libraries/libmbim/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ];
configureFlags = [
- "--with-udev-base-dir=${placeholder ''out''}/lib/udev"
+ "--with-udev-base-dir=${placeholder "out"}/lib/udev"
];
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix
index 2ce11b998a1a..4a4074e2f229 100644
--- a/pkgs/development/libraries/libmcrypt/default.nix
+++ b/pkgs/development/libraries/libmcrypt/default.nix
@@ -2,7 +2,7 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libmcrypt-2.5.8";
src = fetchurl {
diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix
index de8baa7ad198..a38e71bb540e 100644
--- a/pkgs/development/libraries/libmd/default.nix
+++ b/pkgs/development/libraries/libmd/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "libmd";
version = "1.0.1";
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index bf6aa0d23fb7..adf856544c48 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "19.07";
- name = "libmediainfo-${version}";
+ pname = "libmediainfo";
src = fetchurl {
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
sha256 = "0k3d7mha1lay2s09crc9z9zr970l617lb0c3b35wl44flkqf7jss";
diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix
index d2fba5cddd82..57053103417a 100644
--- a/pkgs/development/libraries/libmemcached/default.nix
+++ b/pkgs/development/libraries/libmemcached/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libmemcached-1.0.18";
src = fetchurl {
diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix
index e46eb9208de6..7ec06b51e8cb 100644
--- a/pkgs/development/libraries/libmesode/default.nix
+++ b/pkgs/development/libraries/libmesode/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, expat, pkgconfig, check }:
stdenv.mkDerivation rec {
- name = "libmesode-${version}";
+ pname = "libmesode";
version = "0.9.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix
index d3f30a752732..598f0b7f7898 100644
--- a/pkgs/development/libraries/libmhash/default.nix
+++ b/pkgs/development/libraries/libmhash/default.nix
@@ -3,10 +3,9 @@
stdenv.mkDerivation rec {
pname = "mhash";
version = "0.9.9.9";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+ url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "1w7yiljan8gf1ibiypi6hm3r363imm3sxl1j8hapjdq3m591qljn";
};
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index f75d32c4313e..f8f4439a3dfe 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl }:
stdenv.mkDerivation rec {
- name = "libmicrohttpd-${version}";
- version = "0.9.64";
+ pname = "libmicrohttpd";
+ version = "0.9.66";
src = fetchurl {
- url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
- sha256 = "03imzkd1hl2mkkpi84vg5xq9x6b58gwsv86ym85km0lhb7nxi4p7";
+ url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz";
+ sha256 = "06xblz77bnn29y7sl43avxbcrjbw486x3416plpr3x3l2pdx8rjf";
};
outputs = [ "out" "dev" "devdoc" "info" ];
diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix
index aa606e2a177e..3eb688f95721 100644
--- a/pkgs/development/libraries/libmilter/default.nix
+++ b/pkgs/development/libraries/libmilter/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, m4 }:
stdenv.mkDerivation rec {
- name = "libmilter-${version}";
+ pname = "libmilter";
version = "8.15.2";
src = fetchurl {
diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix
index 9c89d2e8d7b8..8b659c46792f 100644
--- a/pkgs/development/libraries/libmkv/default.nix
+++ b/pkgs/development/libraries/libmkv/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, libtool, autoconf, automake }:
stdenv.mkDerivation rec {
- name = "libmkv-${version}";
+ pname = "libmkv";
version = "0.6.5.1";
src = fetchgit {
diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix
index 858004910160..231f18377e48 100644
--- a/pkgs/development/libraries/libmodplug/default.nix
+++ b/pkgs/development/libraries/libmodplug/default.nix
@@ -3,7 +3,8 @@
let
version = "0.8.9.0";
in stdenv.mkDerivation rec {
- name = "libmodplug-${version}";
+ pname = "libmodplug";
+ inherit version;
meta = with stdenv.lib; {
description = "MOD playing library";
@@ -14,7 +15,7 @@ in stdenv.mkDerivation rec {
};
src = fetchurl {
- url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${pname}-${version}.tar.gz";
sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25";
};
}
diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix
index 512add5616a0..99f04bc09de7 100644
--- a/pkgs/development/libraries/libmowgli/default.nix
+++ b/pkgs/development/libraries/libmowgli/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libmowgli-${version}";
+ pname = "libmowgli";
version = "2.1.3";
src = fetchurl {
diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix
index 4df38a9cc3c9..e8392f88ac7a 100644
--- a/pkgs/development/libraries/libmpack/default.nix
+++ b/pkgs/development/libraries/libmpack/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libtool }:
stdenv.mkDerivation rec {
- name = "libmpack-${version}";
+ pname = "libmpack";
version = "1.0.5";
src = fetchFromGitHub {
owner = "tarruda";
diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix
index 106f6fe6c37c..9ffbc95b1fd1 100644
--- a/pkgs/development/libraries/libmpc/default.nix
+++ b/pkgs/development/libraries/libmpc/default.nix
@@ -5,8 +5,9 @@
let
version = "1.1.0";
in
-stdenv.mkDerivation rec {
- name = "libmpc-${version}"; # to avoid clash with the MPD client
+stdenv.mkDerivation {
+ pname = "libmpc";
+ inherit version; # to avoid clash with the MPD client
src = fetchurl {
url = "mirror://gnu/mpc/mpc-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix
index dac7cf48aac7..4c886078aa8b 100644
--- a/pkgs/development/libraries/libmpeg2/default.nix
+++ b/pkgs/development/libraries/libmpeg2/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.5.1";
- name = "libmpeg2-${version}";
+ pname = "libmpeg2";
src = fetchurl {
- url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz";
+ url = "http://libmpeg2.sourceforge.net/files/${pname}-${version}.tar.gz";
sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny";
};
diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix
index 2b59adf8f922..05532df1abd4 100644
--- a/pkgs/development/libraries/libmusicbrainz/5.x.nix
+++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "5.1.0";
- name = "libmusicbrainz-${version}";
+ pname = "libmusicbrainz";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake neon libdiscid libxml2 ];
diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix
index 6653025eb056..483c5ff1ff7f 100644
--- a/pkgs/development/libraries/libmx/default.nix
+++ b/pkgs/development/libraries/libmx/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "libmx-${version}";
+ pname = "libmx";
version = "1.4.7";
src = fetchurl {
diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
index 8719f19acc1d..91e0b5ef0722 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -1,30 +1,45 @@
-{stdenv, autoconf, automake, fetchFromGitHub, fetchpatch, glib, intltool, json_c, libtool, pkgconfig}:
+{ stdenv
+, autoconf
+, automake
+, fetchFromGitHub
+, glib
+, intltool
+, json_c
+, libtool
+, pkgconfig
+, python2
+}:
-let
- version = "1.3.0";
-in stdenv.mkDerivation rec {
- name = "libmypaint-${version}";
+stdenv.mkDerivation rec {
+ pname = "libmypaint";
+ version = "1.4.0";
+
+ outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "mypaint";
repo = "libmypaint";
rev = "v${version}";
- sha256 = "0b7aynr6ggigwhjkfzi8x3dwz15blj4grkg9hysbgjh6lvzpy9jc";
+ sha256 = "1ynm2g2wdb9zsymncndlgs6gpcbsa122n52d11161jrj5nrdliaq";
};
- patches = [
- # build with automake 1.16
- (fetchpatch {
- url = https://github.com/mypaint/libmypaint/commit/40d9077a80be13942476f164bddfabe842ab2a45.patch;
- sha256 = "1dclh7apgvr2bvzy9z3rgas3hk9pf2hpf5h52q94kmx8s4a47qpi";
- })
+ nativeBuildInputs = [
+ autoconf
+ automake
+ intltool
+ libtool
+ pkgconfig
+ python2
];
- nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ];
+ buildInputs = [
+ glib
+ ];
- buildInputs = [ glib ];
-
- propagatedBuildInputs = [ json_c ]; # for libmypaint.pc
+ # for libmypaint.pc
+ propagatedBuildInputs = [
+ json_c
+ ];
doCheck = true;
diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
index 2b7258031c33..166ff2ef5a02 100644
--- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
+++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, boost, mysql }:
stdenv.mkDerivation rec {
- name = "libmysqlconnectorcpp-${version}";
+ pname = "libmysqlconnectorcpp";
version = "1.1.9";
src = fetchurl {
diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix
index b461bfb3ddfe..9414ebdcc2a0 100644
--- a/pkgs/development/libraries/libnabo/default.nix
+++ b/pkgs/development/libraries/libnabo/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.0.7";
- name = "libnabo-${version}";
+ pname = "libnabo";
src = fetchFromGitHub {
owner = "ethz-asl";
diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix
index 17626bb23e13..695d46ba38ff 100644
--- a/pkgs/development/libraries/libnatpmp/default.nix
+++ b/pkgs/development/libraries/libnatpmp/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libnatpmp-${version}";
+ pname = "libnatpmp";
version = "20150609";
src = fetchurl {
- name = "${name}.tar.gz";
- url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
+ url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz";
sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1";
};
diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix
index 38c6bb008634..bfff0c845225 100644
--- a/pkgs/development/libraries/libndctl/default.nix
+++ b/pkgs/development/libraries/libndctl/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "libndctl-${version}";
+ pname = "libndctl";
version = "66";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix
index 51e4deed462c..a522c72fc766 100644
--- a/pkgs/development/libraries/libndtypes/default.nix
+++ b/pkgs/development/libraries/libndtypes/default.nix
@@ -2,8 +2,8 @@
, fetchFromGitHub
}:
-stdenv.mkDerivation rec {
- name = "libndtypes-${version}";
+stdenv.mkDerivation {
+ pname = "libndtypes";
version = "unstable-2018-11-27";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix
index ba116e20177f..75cea0041435 100644
--- a/pkgs/development/libraries/libnet/default.nix
+++ b/pkgs/development/libraries/libnet/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libnet-${version}";
+ pname = "libnet";
version = "1.2-rc3";
src = fetchurl {
- url = "mirror://sourceforge/libnet-dev/${name}.tar.gz";
+ url = "mirror://sourceforge/libnet-dev/${pname}-${version}.tar.gz";
sha256 = "0qsapqa7dzq9f6lb19kzilif0pj82b64fjv5bq086hflb9w81hvj";
};
diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix
index 95533696ddf2..328688612b63 100644
--- a/pkgs/development/libraries/libnetfilter_acct/default.nix
+++ b/pkgs/development/libraries/libnetfilter_acct/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.0.3";
- name = "libnetfilter_acct-${version}";
+ pname = "libnetfilter_acct";
src = fetchurl {
- url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${name}.tar.bz2";
+ url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${pname}-${version}.tar.bz2";
sha256 = "06lsjndgfjsgfjr43px2n2wk3nr7whz6r405mks3887y7vpwwl22";
};
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index 41245e6539f4..85fbf458ac20 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
stdenv.mkDerivation rec {
- name = "libnetfilter_conntrack-${version}";
+ pname = "libnetfilter_conntrack";
version = "1.0.7";
src = fetchurl {
- url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
+ url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${pname}-${version}.tar.bz2";
sha256 = "1dl9z50yny04xi5pymlykwmy6hcfc9p4nd7m47697zwxw98m6s1k";
};
diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
index a680e009ab6a..563843cca469 100644
--- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libmnl }:
stdenv.mkDerivation rec {
- name = "libnetfilter_cthelper-${version}";
+ pname = "libnetfilter_cthelper";
version = "1.0.0";
src = fetchurl {
- url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2";
+ url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${pname}-${version}.tar.bz2";
sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d";
};
diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
index d16155374ca8..9f706d619c3a 100644
--- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libmnl }:
stdenv.mkDerivation rec {
- name = "libnetfilter_cttimeout-${version}";
+ pname = "libnetfilter_cttimeout";
version = "1.0.0";
src = fetchurl {
- url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2";
+ url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${pname}-${version}.tar.bz2";
sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba";
};
diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix
index 0d8de14513ed..2b932bc08097 100644
--- a/pkgs/development/libraries/libnetfilter_log/default.nix
+++ b/pkgs/development/libraries/libnetfilter_log/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
stdenv.mkDerivation rec {
- name = "libnetfilter_log-${version}";
+ pname = "libnetfilter_log";
version = "1.0.1";
src = fetchurl {
- url = "https://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2";
+ url = "https://netfilter.org/projects/libnetfilter_log/files/${pname}-${version}.tar.bz2";
sha256 = "089vjcfxl5qjqpswrbgklf4wflh44irmw6sk2k0kmfixfmszxq3l";
};
diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix
index 94b3dc90a0b6..5f84bc03f82f 100644
--- a/pkgs/development/libraries/libnetfilter_queue/default.nix
+++ b/pkgs/development/libraries/libnetfilter_queue/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.0.3";
- name = "libnetfilter_queue-${version}";
+ pname = "libnetfilter_queue";
src = fetchurl {
- url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${name}.tar.bz2";
+ url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${pname}-${version}.tar.bz2";
sha256 = "0x77m1fvbqzz5z64jz59fb6j8dvv8b9pg4fmznqwax4x6imjcncq";
};
diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix
index bef977caa28e..3d069d7a168d 100644
--- a/pkgs/development/libraries/libnfc/default.nix
+++ b/pkgs/development/libraries/libnfc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libusb, readline }:
-stdenv.mkDerivation rec {
- name = "libnfc-${version}";
+stdenv.mkDerivation {
+ pname = "libnfc";
version = "1.7.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix
index 8ed6dfa8ac0d..d2848d9a1e9b 100644
--- a/pkgs/development/libraries/libnfs/default.nix
+++ b/pkgs/development/libraries/libnfs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "libnfs-${version}";
+ pname = "libnfs";
version = "4.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix
index ad51ac8d6dbb..815ed3a6bd40 100644
--- a/pkgs/development/libraries/libnftnl/default.nix
+++ b/pkgs/development/libraries/libnftnl/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, libmnl }:
stdenv.mkDerivation rec {
- version = "1.1.3";
+ version = "1.1.4";
pname = "libnftnl";
src = fetchurl {
url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
- sha256 = "03xszkcpqk3s1rqc6vh7g5j13kh3d3yjnvjhk5scds3an39rgp92";
+ sha256 = "087dfc2n4saf2k68hyi4byvgz5grwpw5kfjvmkpn3wmd8y1riiy8";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix
index c6348b7b2e67..d9b2df6148aa 100644
--- a/pkgs/development/libraries/libngspice/default.nix
+++ b/pkgs/development/libraries/libngspice/default.nix
@@ -3,7 +3,7 @@
# Note that this does not provide the ngspice command-line utility. For that see
# the ngspice derivation.
stdenv.mkDerivation rec {
- name = "libngspice-${version}";
+ pname = "libngspice";
version = "30";
src = fetchurl {
diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix
index a4b0b26a345b..4049a18145c7 100644
--- a/pkgs/development/libraries/libnih/default.nix
+++ b/pkgs/development/libraries/libnih/default.nix
@@ -2,8 +2,9 @@
let version = "1.0.3"; in
-stdenv.mkDerivation rec {
- name = "libnih-${version}";
+stdenv.mkDerivation {
+ pname = "libnih";
+ inherit version;
src = fetchurl {
url = "https://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix
index be1daa0505a0..d4ac3ae8dc9e 100644
--- a/pkgs/development/libraries/libnotify/default.nix
+++ b/pkgs/development/libraries/libnotify/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
- # disable tests as we don't need to depend on gtk+(2/3)
+ # disable tests as we don't need to depend on GTK (2/3)
"-Dtests=false"
"-Ddocbook_docs=disabled"
"-Dgtk_doc=false"
diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix
index 8131420cfd65..7dc23aa1e8ae 100644
--- a/pkgs/development/libraries/libofa/default.nix
+++ b/pkgs/development/libraries/libofa/default.nix
@@ -5,10 +5,11 @@ let
deb_patch = "5";
in
stdenv.mkDerivation rec {
- name = "libofa-${version}";
+ pname = "libofa";
+ inherit version;
src = fetchurl {
- url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${name}.tar.gz";
+ url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${pname}-${version}.tar.gz";
sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2";
};
diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix
index d53b1dc08308..4d45c6872e4c 100644
--- a/pkgs/development/libraries/libomxil-bellagio/default.nix
+++ b/pkgs/development/libraries/libomxil-bellagio/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libomxil-bellagio-${version}";
+ pname = "libomxil-bellagio";
version = "0.9.3";
src = fetchurl {
- url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${pname}-${version}.tar.gz";
sha256 = "0k6p6h4npn8p1qlgq6z3jbfld6n1bqswzvxzndki937gr0lhfg2r";
};
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
doCheck = false; # fails
+ # Fix for #40213, probably permanent, because upstream doesn't seem to be
+ # developed anymore. Alternatively, gcc7Stdenv could be used.
+ NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds";
+
meta = with stdenv.lib; {
homepage = https://sourceforge.net/projects/omxil/;
description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components";
diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix
index 450b9058d0b9..aa307f68ca00 100644
--- a/pkgs/development/libraries/libopcodes/default.nix
+++ b/pkgs/development/libraries/libopcodes/default.nix
@@ -3,8 +3,8 @@
, libiberty, libbfd
}:
-stdenv.mkDerivation rec {
- name = "libopcodes-${version}";
+stdenv.mkDerivation {
+ pname = "libopcodes";
inherit (binutils-unwrapped) version src;
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/development/libraries/libopenaptx/default.nix
index a29f8dc4a804..4ad1e2b77358 100644
--- a/pkgs/development/libraries/libopenaptx/default.nix
+++ b/pkgs/development/libraries/libopenaptx/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "libopenaptx-${version}";
+ pname = "libopenaptx";
version = "0.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix
index ca026811d69b..ff8f200a3bba 100644
--- a/pkgs/development/libraries/liboping/default.nix
+++ b/pkgs/development/libraries/liboping/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b";
};
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ];
+
buildInputs = [ ncurses perl ];
configureFlags = stdenv.lib.optional (perl == null) "--with-perl-bindings=no";
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 10d438500a63..01da76749bab 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -4,8 +4,9 @@
let
version = "1.3.1";
in
-stdenv.mkDerivation rec {
- name = "libopus-${version}";
+stdenv.mkDerivation {
+ pname = "libopus";
+ inherit version;
src = fetchurl {
url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix
index 4ca0849447f3..9b91e32f2285 100644
--- a/pkgs/development/libraries/libopusenc/default.nix
+++ b/pkgs/development/libraries/libopusenc/default.nix
@@ -3,8 +3,9 @@
let
version = "0.2.1";
in
-stdenv.mkDerivation rec {
- name = "libopusenc-${version}";
+stdenv.mkDerivation {
+ pname = "libopusenc";
+ inherit version;
src = fetchurl {
url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix
index 885880c54c36..eeb8fec5f930 100644
--- a/pkgs/development/libraries/libosmium/default.nix
+++ b/pkgs/development/libraries/libosmium/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost }:
stdenv.mkDerivation rec {
- name = "libosmium-${version}";
+ pname = "libosmium";
version = "2.15.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix
index 54ee86f0a39a..4be744e7ba93 100644
--- a/pkgs/development/libraries/libosmpbf/default.nix
+++ b/pkgs/development/libraries/libosmpbf/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, protobuf}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libosmpbf-1.3.3";
src = fetchurl {
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix
index 952509acc2ee..47d9c4215fdf 100644
--- a/pkgs/development/libraries/libossp-uuid/default.nix
+++ b/pkgs/development/libraries/libossp-uuid/default.nix
@@ -3,7 +3,8 @@
let version = "1.6.2"; in
stdenv.mkDerivation {
- name = "libossp-uuid-${version}";
+ pname = "libossp-uuid";
+ inherit version;
src = fetchurl {
url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix
index 7797061a71aa..fa0db0cd4ffc 100644
--- a/pkgs/development/libraries/libow/default.nix
+++ b/pkgs/development/libraries/libow/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "3.2p1";
- name = "libow-${version}";
+ pname = "libow";
src = fetchFromGitHub {
owner = "owfs";
diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix
index 774019de0d5b..903aa66ce60d 100644
--- a/pkgs/development/libraries/libp11/default.nix
+++ b/pkgs/development/libraries/libp11/default.nix
@@ -2,13 +2,13 @@
, openssl }:
stdenv.mkDerivation rec {
- name = "libp11-${version}";
+ pname = "libp11";
version = "0.4.10";
src = fetchFromGitHub {
owner = "OpenSC";
repo = "libp11";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "1m4aw45bqichhx7cn78d8l1r1v0ccvwzlfj09fay2l9rfic5jgfz";
};
diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix
index b4b72e5a36d3..3c37cf824959 100644
--- a/pkgs/development/libraries/libpaper/default.nix
+++ b/pkgs/development/libraries/libpaper/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.1.24";
- name = "libpaper-${version}";
+ pname = "libpaper";
src = fetchurl {
url = "mirror://debian/pool/main/libp/libpaper/libpaper_${version}.tar.gz";
diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix
index cf97744069b3..bbdce71bad6a 100644
--- a/pkgs/development/libraries/libpar2/default.nix
+++ b/pkgs/development/libraries/libpar2/default.nix
@@ -3,10 +3,11 @@
let version = "0.4"; in
stdenv.mkDerivation rec {
- name = "libpar2-${version}";
+ pname = "libpar2";
+ inherit version;
src = fetchurl {
- url = "https://launchpad.net/libpar2/trunk/${version}/+download/${name}.tar.gz";
+ url = "https://launchpad.net/libpar2/trunk/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i";
};
diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix
index bf1d26cf90d0..d0572de537eb 100644
--- a/pkgs/development/libraries/libpfm/default.nix
+++ b/pkgs/development/libraries/libpfm/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "4.10.1";
- name = "libpfm-${version}";
+ pname = "libpfm";
src = fetchurl {
- url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz";
+ url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz";
sha256 = "0jabhjx77yppr7x38bkfww6n2a480gj62rw0qp7prhdmg19mf766";
};
diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix
index f8c91df64683..b3dae0c60eaa 100644
--- a/pkgs/development/libraries/libpgf/default.nix
+++ b/pkgs/development/libraries/libpgf/default.nix
@@ -6,7 +6,8 @@ let
version = "6.14.12";
in
stdenv.mkDerivation {
- name = "libpgf-${version}";
+ pname = "libpgf";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/libpgf/libpgf-src-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix
index bf516b33d02a..63035f74ea0e 100644
--- a/pkgs/development/libraries/libpinyin/default.nix
+++ b/pkgs/development/libraries/libpinyin/default.nix
@@ -12,7 +12,7 @@ let
};
in
stdenv.mkDerivation rec {
- name = "libpinyin-${version}";
+ pname = "libpinyin";
version = "2.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index d622584c9da4..19b700ca5e30 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -7,8 +7,6 @@ stdenv.mkDerivation rec {
pname = "libplist";
version = "2019-04-04";
- name = "${pname}-${version}";
-
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 3b050c3dc6a0..844d626f49e3 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -1,9 +1,25 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib, fetchpatch
-, dbus, networkmanager, spidermonkey_38, pcre, python2, python3
-, SystemConfiguration, CoreFoundation, JavaScriptCore }:
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, cmake
+, zlib
+, fetchpatch
+, dbus
+, networkmanager
+, spidermonkey_38
+, pcre
+, gsettings-desktop-schemas
+, glib
+, makeWrapper
+, python2
+, python3
+, SystemConfiguration
+, CoreFoundation
+, JavaScriptCore
+}:
stdenv.mkDerivation rec {
- name = "libproxy-${version}";
+ pname = "libproxy";
version = "0.4.15";
src = fetchFromGitHub {
@@ -13,28 +29,47 @@ stdenv.mkDerivation rec {
sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs";
};
- outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
+ outputs = [ "out" "dev" "py2" "py3" ];
- nativeBuildInputs = [ pkgconfig cmake ];
+ nativeBuildInputs = [
+ pkgconfig
+ cmake
+ makeWrapper
+ ];
- buildInputs = [ pcre python2 python3 zlib ]
- ++ (if stdenv.hostPlatform.isDarwin
- then [ SystemConfiguration CoreFoundation JavaScriptCore ]
- else [ spidermonkey_38 dbus networkmanager ]);
+ buildInputs = [
+ pcre
+ python2
+ python3
+ zlib
+ ] ++ (if stdenv.hostPlatform.isDarwin then [
+ SystemConfiguration
+ CoreFoundation
+ JavaScriptCore
+ ] else [
+ glib
+ spidermonkey_38
+ dbus
+ networkmanager
+ ]);
- preConfigure = ''
- cmakeFlagsArray+=(
- "-DWITH_MOZJS=ON"
- "-DPYTHON2_SITEPKG_DIR=$out/${python2.sitePackages}"
- "-DPYTHON3_SITEPKG_DIR=$out/${python3.sitePackages}"
- )
- '';
+ cmakeFlags = [
+ "-DWITH_MOZJS=ON"
+ "-DPYTHON2_SITEPKG_DIR=${placeholder "py2"}/${python2.sitePackages}"
+ "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}"
+ ];
- patches = stdenv.lib.optional stdenv.isDarwin
+ patches = stdenv.lib.optionals stdenv.isDarwin [
(fetchpatch {
url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch";
sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1";
- });
+ })
+ ];
+
+ postFixup = ''
+ # config_gnome3 uses the helper to find GNOME proxy settings
+ wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
+ '';
doCheck = false; # fails 1 out of 10 tests
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index 7e2443d31e92..15aa7c9e22d1 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
- "--disable-static"
# "--enable-gtk-doc"
"--enable-man"
"--enable-valgrind-tests"
diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix
index 7d697ee10f17..60c01565e63e 100644
--- a/pkgs/development/libraries/libpwquality/default.nix
+++ b/pkgs/development/libraries/libpwquality/default.nix
@@ -1,13 +1,13 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python }:
stdenv.mkDerivation rec {
- name = "libpwquality-${version}";
+ pname = "libpwquality";
version = "1.4.0";
src = fetchFromGitHub {
owner = "libpwquality";
repo = "libpwquality";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "0k564hj2q13z5ag8cj6rnkzm1na7001k4chz4f736p6aqvspv0bd";
};
diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix
index f175bb6ea6d9..41a2a1b669d8 100644
--- a/pkgs/development/libraries/libqmatrixclient/default.nix
+++ b/pkgs/development/libraries/libqmatrixclient/default.nix
@@ -2,8 +2,9 @@
, qtbase, qtmultimedia }:
let
- generic = version: sha256: prefix: stdenv.mkDerivation rec {
- name = "libqmatrixclient-${version}";
+ generic = version: sha256: prefix: stdenv.mkDerivation {
+ pname = "libqmatrixclient";
+ inherit version;
src = fetchFromGitHub {
owner = "QMatrixClient";
diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
index 8a2390483908..930eafc96759 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" ];
configureFlags = [
- "--with-udev-base-dir=${placeholder ''out''}/lib/udev"
+ "--with-udev-base-dir=${placeholder "out"}/lib/udev"
];
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix
index 048ba48bb674..22245f5fa2ab 100644
--- a/pkgs/development/libraries/libqtav/default.nix
+++ b/pkgs/development/libraries/libqtav/default.nix
@@ -8,7 +8,7 @@
with lib;
mkDerivation rec {
- name = "libqtav-${version}";
+ pname = "libqtav";
version = "1.12.0";
nativeBuildInputs = [ extra-cmake-modules qttools ];
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 5eb8049437c9..360b2c15a632 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, lcms2, jasper, pkgconfig }:
stdenv.mkDerivation rec {
- name = "libraw-${version}";
+ pname = "libraw";
version = "0.19.3";
src = fetchurl {
diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix
index d92b017712d4..5b39940bb3f7 100644
--- a/pkgs/development/libraries/librdf/default.nix
+++ b/pkgs/development/libraries/librdf/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
version = "0.5.0";
- name = "liblrdf-${version}";
+ pname = "liblrdf";
src = fetchurl {
url = "https://github.com/swh/LRDF/archive/${version}.tar.gz";
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index c9debe61743d..e365ec7a01ac 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, zlib, openssl}:
stdenv.mkDerivation rec {
version = "0.6.0";
- name = "libre-${version}";
+ pname = "libre";
src = fetchurl {
url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
sha256 = "0cc1x6pm1nz09046bfzgvp2p3wjbgm6f53d71a9dd14grjsvr5qf";
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 3805965d11ca..468bcfb0a18f 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, libusb, ninja, pkgconfig}:
stdenv.mkDerivation rec {
- name = "librealsense-${version}";
+ pname = "librealsense";
version = "2.25.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index 50c20d12ccc8..aeda663342e4 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, zlib, openssl, libre}:
stdenv.mkDerivation rec {
version = "0.6.0";
- name = "librem-${version}";
+ pname = "librem";
src=fetchurl {
url = "http://www.creytiv.com/pub/rem-${version}.tar.gz";
sha256 = "0b17wma5w9acizk02isk5k83vv47vf1cf9zkmsc1ail677d20xj1";
diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix
index 2f78222cebb1..43f80076328e 100644
--- a/pkgs/development/libraries/librep/default.nix
+++ b/pkgs/development/libraries/librep/default.nix
@@ -6,7 +6,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "librep-${version}";
+ pname = "librep";
version = "0.92.7";
sourceName = "librep_${version}";
@@ -19,10 +19,6 @@ stdenv.mkDerivation rec {
buildInputs = [ readline texinfo ];
propagatedBuildInputs = [ gdbm gmp libffi ];
- configureFlags = [
- "--disable-static"
- ];
-
setupHook = ./setup-hook.sh;
meta = {
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 7fbe25addc03..71b8d2bb20e6 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -3,11 +3,11 @@
let
generic = { version, sha256 }: stdenv.mkDerivation rec {
- name = "libressl-${version}";
+ pname = "libressl";
inherit version;
src = fetchurl {
- url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
+ url = "mirror://openbsd/LibreSSL/${pname}-${version}.tar.gz";
inherit sha256;
};
diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix
index e1d0a51a6685..a9a17eca786a 100644
--- a/pkgs/development/libraries/librime/default.nix
+++ b/pkgs/development/libraries/librime/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "rime";
repo = "librime";
- rev = "${version}";
+ rev = version;
sha256 = "0xskhdhk7dgpc71r39pfzxi5vrlzy90aqj1gzv8nnapq91p2awhv";
};
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index a911524a9acd..4653b8b86a26 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -5,14 +5,14 @@
let
pname = "librsvg";
- version = "2.44.14";
+ version = "2.44.15";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "00z3qimpk909pcqq0jlsis5sskc6kn7cqia20smd9k9rhs3ag1ba";
+ sha256 = "1p4cifnxppz2qwsk2wvn2a6c7dpvgfrsf5vlhdkmsd373czm9396";
};
outputs = [ "out" "dev" "installedTests" ];
diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix
index e4e96df86c16..79b05619ac59 100644
--- a/pkgs/development/libraries/librsync/default.nix
+++ b/pkgs/development/libraries/librsync/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }:
stdenv.mkDerivation rec {
- name = "librsync-${version}";
+ pname = "librsync";
version = "2.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix
index 479da52f8d9b..b9ae1f829a1b 100644
--- a/pkgs/development/libraries/libscrypt/default.nix
+++ b/pkgs/development/libraries/libscrypt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "libscrypt-${version}";
+ pname = "libscrypt";
version = "1.21";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
index 785dac4aef29..b2a799674771 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "3.1.0";
- name = "libsearpc-${version}";
+ pname = "libsearpc";
src = fetchFromGitHub {
owner = "haiwen";
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 6b38bcf2c778..8c9c6ac107ce 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, getopt, makeWrapper, utillinux }:
stdenv.mkDerivation rec {
- name = "libseccomp-${version}";
+ pname = "libseccomp";
version = "2.4.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/libsexy/default.nix b/pkgs/development/libraries/libsexy/default.nix
index 49cdb2c95ba0..cb22d9f97bc7 100644
--- a/pkgs/development/libraries/libsexy/default.nix
+++ b/pkgs/development/libraries/libsexy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig
, glib, gtk2, libxml2, pango
}:
-
+
stdenv.mkDerivation {
name = "libsexy-0.1.11";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
buildInputs = [ glib gtk2 libxml2 pango ];
meta = with stdenv.lib; {
- description = "A collection of GTK+ widgets";
+ description = "A collection of GTK widgets";
homepage = https://blog.chipx86.com/tag/libsexy/;
license = licenses.lgpl21;
maintainers = with maintainers; [ ];
diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix
index 82caacf93e6a..970c4aff246e 100644
--- a/pkgs/development/libraries/libsidplayfp/default.nix
+++ b/pkgs/development/libraries/libsidplayfp/default.nix
@@ -9,10 +9,9 @@ stdenv.mkDerivation rec {
minor = "8";
level = "7";
version = "${major}.${minor}.${level}";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${name}.tar.gz";
+ url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${pname}-${version}.tar.gz";
sha256 = "14k1sbdcbhykwfcadq5lbpnm9xp2r7vs7fyi84h72g89y8pjg0da";
};
diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix
index 2da5d68d1174..bc34318d0a91 100644
--- a/pkgs/development/libraries/libsieve/default.nix
+++ b/pkgs/development/libraries/libsieve/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
version = "2.3.1";
- name = "libsieve-${version}";
+ pname = "libsieve";
src = fetchurl {
url = "https://github.com/downloads/sodabrew/libsieve/libsieve-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix
index 34d959423a36..561b547a8d7a 100644
--- a/pkgs/development/libraries/libsixel/default.nix
+++ b/pkgs/development/libraries/libsixel/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub}:
stdenv.mkDerivation rec {
version = "1.8.2";
- name = "libsixel-${version}";
+ pname = "libsixel";
src = fetchFromGitHub {
repo = "libsixel";
diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix
index 19ebbd363e1e..d0f822a23f5a 100644
--- a/pkgs/development/libraries/libskk/default.nix
+++ b/pkgs/development/libraries/libskk/default.nix
@@ -4,7 +4,7 @@
libgee, json-glib, skk-dicts, libxkbcommon }:
stdenv.mkDerivation rec {
- name = "libskk-${version}";
+ pname = "libskk";
version = "1.0.5";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix
index 25f2a1e0846b..208aa6c9d616 100644
--- a/pkgs/development/libraries/libsmi/default.nix
+++ b/pkgs/development/libraries/libsmi/default.nix
@@ -1,11 +1,11 @@
{ stdenv , fetchurl }:
stdenv.mkDerivation rec {
- name = "libsmi-${version}";
+ pname = "libsmi";
version = "0.5.0";
src = fetchurl {
- url = "https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${name}.tar.gz";
+ url = "https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${pname}-${version}.tar.gz";
sha256 = "1lslaxr2qcj6hf4naq5n5mparfhmswsgq4wa7zm2icqvvgdcq6pj";
};
diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index 8ffae53be196..263623c3d37c 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.7.5";
- name = "libsolv-${version}";
+ pname = "libsolv";
src = fetchFromGitHub {
owner = "openSUSE";
diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix
index f53db7241cf7..62e5601b73c4 100644
--- a/pkgs/development/libraries/libsoundio/default.nix
+++ b/pkgs/development/libraries/libsoundio/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "2.0.0";
- name = "libsoundio-${version}";
+ pname = "libsoundio";
src = fetchFromGitHub {
owner = "andrewrk";
repo = "libsoundio";
- rev = "${version}";
+ rev = version;
sha256 = "12l4rvaypv87vigdrmjz48d4d6sq4gfxf5asvnc4adyabxb73i4x";
};
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 52a52e7e7324..5f88ba80cd6a 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -3,12 +3,11 @@
, libpsl, python3 }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "libsoup";
version = "2.66.2";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx";
};
diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix
index 8018b84a52be..d85c9e94ebdf 100644
--- a/pkgs/development/libraries/libspatialindex/default.nix
+++ b/pkgs/development/libraries/libspatialindex/default.nix
@@ -2,8 +2,9 @@
let version = "1.8.5"; in
-stdenv.mkDerivation rec {
- name = "libspatialindex-${version}";
+stdenv.mkDerivation {
+ pname = "libspatialindex";
+ inherit version;
src = fetchurl {
url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix
index 00579600cb76..5f547a973707 100644
--- a/pkgs/development/libraries/libspiro/default.nix
+++ b/pkgs/development/libraries/libspiro/default.nix
@@ -1,10 +1,10 @@
{stdenv, pkgconfig, fetchurl}:
stdenv.mkDerivation rec {
- name = "libspiro-${version}";
+ pname = "libspiro";
version = "0.5.20150702";
src = fetchurl {
- url = "https://github.com/fontforge/libspiro/releases/download/${version}/${name}.tar.gz";
+ url = "https://github.com/fontforge/libspiro/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "0z4zpxd3nwwchqdsbmmjbp13aw5jg8v5p1993190bpykkrjlh6nv";
};
diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix
index 5bae04a88f94..9ef3d6654138 100644
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@@ -8,7 +8,8 @@ in
if (stdenv.hostPlatform.system != "x86_64-linux" && stdenv.hostPlatform.system != "x86_64-darwin" && stdenv.hostPlatform.system != "i686-linux")
then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here"
else stdenv.mkDerivation {
- name = "libspotify-${version}";
+ pname = "libspotify";
+ inherit version;
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -61,7 +62,8 @@ else stdenv.mkDerivation {
then throw ''
Please visit ${libspotify.meta.homepage} to get an api key then set config.libspotify.apiKey accordingly
'' else stdenv.mkDerivation {
- name = "libspotify-samples-${version}";
+ pname = "libspotify-samples";
+ inherit version;
src = libspotify.src;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libspotify readline ]
diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix
index 7d9ea25e9d26..f8fc6a446d18 100644
--- a/pkgs/development/libraries/libsrs2/default.nix
+++ b/pkgs/development/libraries/libsrs2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
- name = "libsrs2-${version}";
+ pname = "libsrs2";
version = "1.0.18";
src = fetchurl {
diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/development/libraries/libstemmer/default.nix
index 67d6d8d42ead..2f6b2835c4e3 100644
--- a/pkgs/development/libraries/libstemmer/default.nix
+++ b/pkgs/development/libraries/libstemmer/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "libstemmer-2017-03-02";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix
index c1e6a1f7fb89..0ef96f675055 100644
--- a/pkgs/development/libraries/libstrophe/default.nix
+++ b/pkgs/development/libraries/libstrophe/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, openssl, expat, pkgconfig, check }:
stdenv.mkDerivation rec {
- name = "libstrophe-${version}";
+ pname = "libstrophe";
version = "0.9.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix
index 6eb8b6b1a8e9..fcd010b46cc3 100644
--- a/pkgs/development/libraries/libsvm/default.nix
+++ b/pkgs/development/libraries/libsvm/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "libsvm-${version}";
+ pname = "libsvm";
version = "3.23";
src = fetchurl {
diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix
index 29d83bcd9d70..ca0407bd0aa0 100644
--- a/pkgs/development/libraries/libtap/default.nix
+++ b/pkgs/development/libraries/libtap/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec{
- name = "libtap-${version}";
+ pname = "libtap";
version = "1.12.0";
src = fetchurl {
- url = "https://web-cpan.shlomifish.org/downloads/${name}.tar.bz2";
+ url = "https://web-cpan.shlomifish.org/downloads/${pname}-${version}.tar.bz2";
sha256 = "1ms1770cx8c6q3lhn1chkzy12vzmjgvlms7cqhd2d3260j2wwv5s";
};
diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix
index f2cb879b3e07..c4614103b3fe 100644
--- a/pkgs/development/libraries/libtar/default.nix
+++ b/pkgs/development/libraries/libtar/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.2.20";
- name = "libtar-${version}";
+ pname = "libtar";
# Maintenance repo for libtar (Arch Linux uses this)
src = fetchgit {
diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 302400388437..004d2ef0dd5b 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, texinfo }:
stdenv.mkDerivation rec {
- name = "libtasn1-4.13";
+ name = "libtasn1-4.14";
src = fetchurl {
url = "mirror://gnu/libtasn1/${name}.tar.gz";
- sha256 = "1jlc1iahj8k3haz28j55nzg7sgni5h41vqy461i1bpbx6668wlky";
+ sha256 = "025sqnlzji78ss2fi78dajc0v0h5fi02wp39hws41sn8qnjlnq4y";
};
outputs = [ "out" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix
index 4e859c282276..6d95d81e5d9c 100644
--- a/pkgs/development/libraries/libtcod/default.nix
+++ b/pkgs/development/libraries/libtcod/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromBitbucket, cmake, SDL, libGLU_combined, upx, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
- name = "libtcod-${version}";
+ pname = "libtcod";
version = "1.5.1";
src = fetchFromBitbucket {
diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix
index 0bc619051c69..043acee0cfeb 100644
--- a/pkgs/development/libraries/libtelnet/default.nix
+++ b/pkgs/development/libraries/libtelnet/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }:
-stdenv.mkDerivation rec {
- name = "libtelnet-${version}";
+stdenv.mkDerivation {
+ pname = "libtelnet";
version = "0.21+45f2d5c";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix
index 7261fb7b6b74..38a09218dd1d 100644
--- a/pkgs/development/libraries/libtermkey/default.nix
+++ b/pkgs/development/libraries/libtermkey/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchzip, libtool, pkgconfig, ncurses }:
stdenv.mkDerivation rec {
- name = "libtermkey-${version}";
+ pname = "libtermkey";
version = "0.20";
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 55c747540f77..093d6a185443 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
version = "4.0.10";
- name = "libtiff-${version}";
+ pname = "libtiff";
src = fetchurl {
url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix
index f9e7f9684bac..6520ddd0a9e2 100644
--- a/pkgs/development/libraries/libtomcrypt/default.nix
+++ b/pkgs/development/libraries/libtomcrypt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libtool }:
stdenv.mkDerivation rec {
- name = "libtomcrypt-${version}";
+ pname = "libtomcrypt";
version = "1.18.2";
src = fetchurl {
diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix
index a90377dad34a..8ce82bcf07c7 100644
--- a/pkgs/development/libraries/libtommath/default.nix
+++ b/pkgs/development/libraries/libtommath/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libtool }:
stdenv.mkDerivation rec {
- name = "libtommath-${version}";
+ pname = "libtommath";
version = "1.1.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 046229e8f1d7..26605eb41dbd 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -11,7 +11,8 @@ let
boostPython = boost.override { enablePython = true; inherit python; };
in stdenv.mkDerivation {
- name = "libtorrent-rasterbar-${version}";
+ pname = "libtorrent-rasterbar";
+ inherit version;
src = fetchFromGitHub {
owner = "arvidn";
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 50fdbf2a81f7..e9267df5047b 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -3,8 +3,9 @@
let
generic = { version, sha256 }:
- stdenv.mkDerivation rec {
- name = "libtoxcore-${version}";
+ stdenv.mkDerivation {
+ pname = "libtoxcore";
+ inherit version;
src = fetchFromGitHub {
owner = "TokTok";
@@ -41,7 +42,7 @@ let
};
};
-in rec {
+in {
libtoxcore_0_1 = generic {
version = "0.1.11";
sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij";
diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix
index c3981f5c58ea..6cd5f9122a4f 100644
--- a/pkgs/development/libraries/libtoxcore/new-api.nix
+++ b/pkgs/development/libraries/libtoxcore/new-api.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus
, libvpx, check, libconfig, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "tox-core-new-20160727";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix
index b0be3cb3c12d..5ac456a60f61 100644
--- a/pkgs/development/libraries/libtxc_dxtn/default.nix
+++ b/pkgs/development/libraries/libtxc_dxtn/default.nix
@@ -3,10 +3,11 @@
let version = "1.0.1"; in
stdenv.mkDerivation rec {
- name = "libtxc_dxtn-${version}";
+ pname = "libtxc_dxtn";
+ inherit version;
src = fetchurl {
- url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2";
+ url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${pname}-${version}.tar.bz2";
sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5";
};
diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
index aad8ae00c114..4959674f0ad2 100644
--- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
+++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
@@ -2,8 +2,9 @@
let version = "1.0"; in
-stdenv.mkDerivation rec {
- name = "libtxc_dxtn_s2tc-${version}";
+stdenv.mkDerivation {
+ pname = "libtxc_dxtn_s2tc";
+ inherit version;
src = fetchurl {
url = "https://github.com/divVerent/s2tc/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/development/libraries/libuecc/default.nix
index 3b45d4de8842..7080edcd7380 100644
--- a/pkgs/development/libraries/libuecc/default.nix
+++ b/pkgs/development/libraries/libuecc/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "7";
- name = "libuecc-${version}";
+ pname = "libuecc";
src = fetchgit {
url = "git://git.universe-factory.net/libuecc";
diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix
index 446d30c609ee..e333e73de3ff 100644
--- a/pkgs/development/libraries/libui/default.nix
+++ b/pkgs/development/libraries/libui/default.nix
@@ -6,7 +6,7 @@ let
backend = if stdenv.isDarwin then "darwin" else "unix";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${shortName}-${version}";
src = fetchgit {
url = "https://github.com/andlabs/libui.git";
diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix
index e21f9400848d..35ec5dfed7cd 100644
--- a/pkgs/development/libraries/libunarr/default.nix
+++ b/pkgs/development/libraries/libunarr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
- name = "libunarr-${version}";
+ pname = "libunarr";
version = "1.0.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix
index 50bc05395895..7e75954fb45e 100644
--- a/pkgs/development/libraries/libunibreak/default.nix
+++ b/pkgs/development/libraries/libunibreak/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libunibreak-${version}";
+ pname = "libunibreak";
version = "1.1";
src = fetchurl {
- url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${pname}-${version}.tar.gz";
sha256 = "02657l426bk5d8h42b9ixxy1clc50mx4bzwg02nkdhs09wqw32wn";
};
diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix
index b302e1d0ba03..b315d0f16b04 100644
--- a/pkgs/development/libraries/libunique/3.x.nix
+++ b/pkgs/development/libraries/libunique/3.x.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
majorVer = "3.0";
minorVer = "2";
version = "${majorVer}.${minorVer}";
- name = "libunique3-${version}";
+ pname = "libunique3";
srcName = "libunique-${version}";
src = fetchurl {
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index e066c0723679..e02e5228aa49 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, libiconv }:
stdenv.mkDerivation rec {
- name = "libunistring-${version}";
+ pname = "libunistring";
version = "0.9.10";
src = fetchurl {
- url = "mirror://gnu/libunistring/${name}.tar.gz";
+ url = "mirror://gnu/libunistring/${pname}-${version}.tar.gz";
sha256 = "02v17za10mxnj095x4pvm80jxyqwk93kailfc2j8xa1r6crmnbm8";
};
diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix
index a0ec3b74cc17..2baaa14b88ea 100644
--- a/pkgs/development/libraries/libunity/default.nix
+++ b/pkgs/development/libraries/libunity/default.nix
@@ -12,7 +12,7 @@
, autoreconfHook
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libunity";
version = "unstable-2019-03-19";
@@ -48,8 +48,7 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
- "--disable-static"
- "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
+ "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
];
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 9bea14bd8e85..70e6b698ec5d 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, xz }:
stdenv.mkDerivation rec {
- name = "libunwind-${version}";
+ pname = "libunwind";
version = "1.3.1";
src = fetchurl {
- url = "mirror://savannah/libunwind/${name}.tar.gz";
+ url = "mirror://savannah/libunwind/${pname}-${version}.tar.gz";
sha256 = "1y0l08k6ak1mqbfj6accf9s5686kljwgsl4vcqpxzk5n74wpm6a3";
};
diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
index 90be77401141..3ed45e788c40 100644
--- a/pkgs/development/libraries/liburcu/default.nix
+++ b/pkgs/development/libraries/liburcu/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.11.1";
- name = "liburcu-${version}";
+ pname = "liburcu";
src = fetchurl {
url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix
index 7d595db85dd1..855c6ce280ec 100644
--- a/pkgs/development/libraries/liburing/default.nix
+++ b/pkgs/development/libraries/liburing/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "liburing-${version}";
+ pname = "liburing";
version = "0.1";
src = fetchgit {
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 0620163bb320..19a8025359a0 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, withStatic ? false }:
stdenv.mkDerivation (rec {
- name = "libusb-1.0.22";
+ pname = "libusb";
+ version = "1.0.23";
src = fetchurl {
- url = "mirror://sourceforge/libusb/${name}.tar.bz2";
- sha256 = "0mw1a5ss4alg37m6bd4k44v35xwrcwp5qm4s686q1nsgkbavkbkm";
+ url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
+ sha256 = "13dd2a9x290d1q8nb1lqiaf36grcvns5ripk5k2xm0lajmpc04fv";
};
outputs = [ "out" "dev" ]; # get rid of propagating systemd closure
diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix
index d9e008af9770..debccb9087d6 100644
--- a/pkgs/development/libraries/libusbmuxd/default.nix
+++ b/pkgs/development/libraries/libusbmuxd/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
pname = "libusbmuxd";
version = "2019-03-23";
- name = "${pname}-${version}";
-
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/development/libraries/libutempter/default.nix
index f9703e3c5932..ff2044242b9f 100644
--- a/pkgs/development/libraries/libutempter/default.nix
+++ b/pkgs/development/libraries/libutempter/default.nix
@@ -3,7 +3,7 @@
with lib;
stdenv.mkDerivation rec {
- name = "libutempter-${version}";
+ pname = "libutempter";
version = "1.1.6";
src = fetchurl {
diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix
index 9883de59feb1..c604ce71cb72 100644
--- a/pkgs/development/libraries/libva-utils/default.nix
+++ b/pkgs/development/libraries/libva-utils/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "libva-utils-${version}";
+ pname = "libva-utils";
inherit (libva) version;
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix
index 6a0672445430..9b12f83bcb83 100644
--- a/pkgs/development/libraries/libva/1.0.0.nix
+++ b/pkgs/development/libraries/libva/1.0.0.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "libva-${version}";
+ pname = "libva";
version = "1.7.3";
src = fetchurl {
- url = "https://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
+ url = "https://www.freedesktop.org/software/vaapi/releases/libva/${pname}-${version}.tar.bz2";
sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12";
};
diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix
index 50b995a03568..039e3308f887 100644
--- a/pkgs/development/libraries/libvdpau-va-gl/default.nix
+++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix
@@ -2,7 +2,7 @@
, libXext, libvdpau, glib, libva, ffmpeg, libGLU }:
stdenv.mkDerivation rec {
- name = "libvdpau-va-gl-${version}";
+ pname = "libvdpau-va-gl";
version = "0.4.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index d68422260144..792a31bcf9f9 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, xorg, mesa }:
stdenv.mkDerivation rec {
- name = "libvdpau-${version}";
+ pname = "libvdpau";
version = "1.2";
src = fetchurl {
- url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${name}.tar.bz2";
+ url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${pname}-${version}.tar.bz2";
sha256 = "6a499b186f524e1c16b4f5b57a6a2de70dfceb25c4ee546515f26073cd33fa06";
};
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 125259a6bee9..0556e311736a 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -16,13 +16,13 @@ with stdenv.lib;
let
buildFromTarball = stdenv.isDarwin;
in stdenv.mkDerivation rec {
- name = "libvirt-${version}";
+ pname = "libvirt";
version = "5.4.0";
src =
if buildFromTarball then
fetchurl {
- url = "http://libvirt.org/sources/${name}.tar.xz";
+ url = "http://libvirt.org/sources/${pname}-${version}.tar.xz";
sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw";
}
else
diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix
index 5cb1c673be50..b807691671fd 100644
--- a/pkgs/development/libraries/libvisio/default.nix
+++ b/pkgs/development/libraries/libvisio/default.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
- name = "libvisio-${version}";
+ pname = "libvisio";
version = "0.1.7";
outputs = [ "out" "bin" "dev" "doc" ];
src = fetchurl {
- url = "https://dev-www.libreoffice.org/src/libvisio/${name}.tar.xz";
+ url = "https://dev-www.libreoffice.org/src/libvisio/${pname}-${version}.tar.xz";
sha256 = "0k7adcbbf27l7n453cca1m6s9yj6qvb5j6bsg2db09ybf3w8vbwg";
};
diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix
index 44b2a81b2d3c..e49ab9b38a04 100644
--- a/pkgs/development/libraries/libvmi/default.nix
+++ b/pkgs/development/libraries/libvmi/default.nix
@@ -13,7 +13,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "libvmi-${version}";
+ pname = "libvmi";
version = "0.12.0";
libVersion = "0.0.12";
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index cd0cc9798fa0..d80fe6a998c9 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -55,7 +55,7 @@ assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport);
assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
stdenv.mkDerivation rec {
- name = "libvpx-${version}";
+ pname = "libvpx";
version = "1.7.0";
src = fetchFromGitHub {
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
(if isDarwin || isCygwin then
"--enable-static --disable-shared"
else
- "--disable-static --enable-shared")
+ "--enable-shared")
(enableFeature smallSupport "small")
(enableFeature postprocVisualizerSupport "postproc-visualizer")
(enableFeature unitTestsSupport "unit-tests")
diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix
index 75e935d18d90..48dbc5f395c8 100644
--- a/pkgs/development/libraries/libvterm-neovim/default.nix
+++ b/pkgs/development/libraries/libvterm-neovim/default.nix
@@ -4,7 +4,7 @@
, libtool
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libvterm-neovim";
version = "2018-11-26";
diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index a1e10b6d003d..a4f0a44e60bf 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, glib, pkgconfig, udev, libgudev }:
stdenv.mkDerivation rec {
- name = "libwacom-${version}";
+ pname = "libwacom";
version = "0.33";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index c11f70290a4a..fc9932567cfa 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -26,11 +26,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "libwebp-${version}";
+ pname = "libwebp";
version = "1.0.3";
src = fetchurl {
- url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz";
+ url = "http://downloads.webmproject.org/releases/webp/${pname}-${version}.tar.gz";
sha256 = "0kxk4sic34bln3k09mml7crvrmhj97swdk7b1ahbp5w6bj30f2p2";
};
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index 144bde9a23a9..a297bf61f786 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -1,7 +1,7 @@
{ fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }:
stdenv.mkDerivation rec {
- name = "libwebsockets-${version}";
+ pname = "libwebsockets";
version = "3.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix
index 2af550c7d99a..cafd25ede0ae 100644
--- a/pkgs/development/libraries/libwhereami/default.nix
+++ b/pkgs/development/libraries/libwhereami/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }:
stdenv.mkDerivation rec {
- name = "libwhereami-${version}";
+ pname = "libwhereami";
version = "0.2.2";
src = fetchFromGitHub {
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
owner = "puppetlabs";
};
- # post gcc7, upstream bug: https://tickets.puppetlabs.com/browse/FACT-1828
- NIX_CFLAGS_COMPILE = "-Wno-error=deprecated";
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ];
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix
index 76ac946d6187..e8f397548853 100644
--- a/pkgs/development/libraries/libwps/default.nix
+++ b/pkgs/development/libraries/libwps/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, boost, pkgconfig, librevenge, zlib }:
stdenv.mkDerivation rec {
- name = "libwps-${version}";
+ pname = "libwps";
version = "0.4.10";
src = fetchurl {
- url = "mirror://sourceforge/libwps/${name}.tar.bz2";
+ url = "mirror://sourceforge/libwps/${pname}-${version}.tar.bz2";
sha256 = "1adx2wawl0i16p8df80m6k6a137h709ip4zc0zlzr6wal8gpn0i4";
};
diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix
index d56c20cb75af..271823ace288 100644
--- a/pkgs/development/libraries/libx86/default.nix
+++ b/pkgs/development/libraries/libx86/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libx86-${version}";
+ pname = "libx86";
version = "1.1";
src = fetchurl {
- url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${name}.tar.gz";
+ url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${pname}-${version}.tar.gz";
sha256 = "0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav";
};
patches = [./constants.patch ./non-x86.patch ];
diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix
index 2e00b5b5ab9c..f361b3e1b1f7 100644
--- a/pkgs/development/libraries/libx86emu/default.nix
+++ b/pkgs/development/libraries/libx86emu/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, perl }:
stdenv.mkDerivation rec {
- name = "libx86emu-${version}";
+ pname = "libx86emu";
version = "2.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix
index 7bd89b44d889..fede13fcd9b4 100644
--- a/pkgs/development/libraries/libxc/default.nix
+++ b/pkgs/development/libraries/libxc/default.nix
@@ -4,7 +4,8 @@ let
version = "4.3.4";
in stdenv.mkDerivation {
- name = "libxc-${version}";
+ pname = "libxc";
+ inherit version;
src = fetchurl {
url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz";
sha256 = "0dw356dfwn2bwjdfwwi4h0kimm69aql2f4yk9f2kk4q7qpfkgvm8";
diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index b4ad501c2efe..fb1f4b29423f 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libjpeg, libpng, libX11, zlib }:
stdenv.mkDerivation rec {
- name = "libxcomp-${version}";
+ pname = "libxcomp";
version = "3.5.99.16";
src = fetchurl {
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index 773389e60f54..9408b0c45877 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -5,11 +5,12 @@ let
version = "5.4";
in
stdenv.mkDerivation rec {
- name = "libxklavier-${version}";
+ pname = "libxklavier";
+ inherit version;
src = fetchgit {
url = "git://anongit.freedesktop.org/git/libxklavier";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a";
};
diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix
index a2a576edc0f7..126589966464 100644
--- a/pkgs/development/libraries/libxls/default.nix
+++ b/pkgs/development/libraries/libxls/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "libxls-${version}";
+ pname = "libxls";
version = "1.5.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 33f818f7d62c..04954f3e1f5f 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -10,11 +10,11 @@ let
python = python2;
in stdenv.mkDerivation rec {
- name = "libxml2-${version}";
+ pname = "libxml2";
version = "2.9.9";
src = fetchurl {
- url = "http://xmlsoft.org/sources/${name}.tar.gz";
+ url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz";
sha256 = "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl";
};
diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix
index cb93ec63e670..eb031eb2a9d7 100644
--- a/pkgs/development/libraries/libxnd/default.nix
+++ b/pkgs/development/libraries/libxnd/default.nix
@@ -4,8 +4,8 @@
, libndtypes
}:
-stdenv.mkDerivation rec {
- name = "libxnd-${version}";
+stdenv.mkDerivation {
+ pname = "libxnd";
version = "unstable-2018-11-27";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 2dde7fe32efb..1a3efee176a0 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -11,10 +11,9 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "libxslt";
version = "1.1.33";
- name = pname + "-" + version;
src = fetchurl {
- url = "http://xmlsoft.org/sources/${name}.tar.gz";
+ url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz";
sha256 = "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf";
};
diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index af665c6d9a4a..fbc4b4bcec57 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "libyaml-cpp-${version}";
+ pname = "libyaml-cpp";
version = "0.6.2";
src = fetchFromGitHub {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
- cmakeFlags = "-DBUILD_SHARED_LIBS=ON";
+ cmakeFlags = "-DBUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TESTS=OFF";
meta = with stdenv.lib; {
inherit (src.meta) homepage;
diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix
index 9aa189586f05..e1bf4fca7b55 100644
--- a/pkgs/development/libraries/libykclient/default.nix
+++ b/pkgs/development/libraries/libykclient/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, curl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libykclient";
version = "unstable-2019-03-18";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix
index 710e7a3f0729..e46064ae56e9 100644
--- a/pkgs/development/libraries/libytnef/default.nix
+++ b/pkgs/development/libraries/libytnef/default.nix
@@ -3,7 +3,7 @@
with lib;
stdenv.mkDerivation rec {
- name = "libytnef-${version}";
+ pname = "libytnef";
version = "1.9.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix
index f3cbddf1ec41..b16d897fb5f2 100644
--- a/pkgs/development/libraries/libzdb/default.nix
+++ b/pkgs/development/libraries/libzdb/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec
{
version = "3.1";
- name = "libzdb-${version}";
+ pname = "libzdb";
src = fetchurl
{
diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix
index afa7696aca99..fbbfb5364b0a 100644
--- a/pkgs/development/libraries/libzen/default.nix
+++ b/pkgs/development/libraries/libzen/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.4.37";
- name = "libzen-${version}";
+ pname = "libzen";
src = fetchurl {
url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2";
sha256 = "1hcsrmn85b0xp0mp33aazk7g071q1v3f163nnhv8b0mv9c4bgsfn";
diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index 50ed00711df7..43a5f7dc8413 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/pkgs/development/libraries/libzip/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, zlib }:
stdenv.mkDerivation rec {
- name = "libzip-${version}";
+ pname = "libzip";
version = "1.3.0";
src = fetchurl {
- url = "https://www.nih.at/libzip/${name}.tar.gz";
+ url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz";
sha256 = "1633dvjc08zwwhzqhnv62rjf1abx8y5njmm8y16ik9iwd07ka6d9";
};
diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix
index 1413da4a18db..85b9308237fe 100644
--- a/pkgs/development/libraries/libzmf/default.nix
+++ b/pkgs/development/libraries/libzmf/default.nix
@@ -1,12 +1,11 @@
{stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkgconfig, cppunit}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "libzmf";
version = "0.0.2";
src = fetchurl {
- url = "http://dev-www.libreoffice.org/src/libzmf/${name}.tar.xz";
+ url = "http://dev-www.libreoffice.org/src/libzmf/${pname}-${version}.tar.xz";
sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197";
};
diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 3f963c7ca19a..8a5026e307f6 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "lightning-${version}";
+ pname = "lightning";
version = "2.1.2";
src = fetchurl {
- url = "mirror://gnu/lightning/${name}.tar.gz";
+ url = "mirror://gnu/lightning/${pname}-${version}.tar.gz";
sha256 = "0sbs2lm8b9in2m8d52zf0x9gpp40x6r7sl6sha92yq3pr78rwa4v";
};
diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
index ab0e51bae261..7f82d49462c5 100644
--- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
+++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
@@ -15,7 +15,7 @@ let
in
stdenv.mkDerivation rec {
- name = "lightstep-tracer-cpp-${version}";
+ pname = "lightstep-tracer-cpp";
version = "0.8.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
index 9af0c20d7014..70320ead5d11 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -9,14 +9,13 @@
, withSage ? false # sage support
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "linbox";
version = "1.6.3";
src = fetchFromGitHub {
owner = "linbox-team";
- repo = "${pname}";
+ repo = pname;
rev = "v${version}";
sha256 = "10j6dspbsq7d2l4q3y0c1l1xwmaqqba2fxg59q5bhgk9h5d7q571";
};
@@ -38,14 +37,14 @@ stdenv.mkDerivation rec {
"--disable-optimization"
] ++ stdenv.lib.optionals stdenv.isx86_64 {
# disable SIMD instructions (which are enabled *when available* by default)
- "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
- "haswell" = [ "--disable-fma4" ];
- "broadwell" = [ "--disable-fma4" ];
- "skylake" = [ "--disable-fma4" ];
- "skylake-avx512" = [ "--disable-fma4" ];
+ default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ];
+ haswell = [ "--disable-fma4" ];
+ broadwell = [ "--disable-fma4" ];
+ skylake = [ "--disable-fma4" ];
+ skylake-avx512 = [ "--disable-fma4" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"}
++ stdenv.lib.optionals withSage [
"--enable-sage"
diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix
index 5fa1035868d1..b105aa64bff9 100644
--- a/pkgs/development/libraries/linenoise-ng/default.nix
+++ b/pkgs/development/libraries/linenoise-ng/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "linenoise-ng-${version}";
+ pname = "linenoise-ng";
version = "1.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix
index 6bbcc725f22f..0098116563ae 100644
--- a/pkgs/development/libraries/linenoise/default.nix
+++ b/pkgs/development/libraries/linenoise/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "linenoise-${version}";
+stdenv.mkDerivation {
+ pname = "linenoise";
version = "1.0.10"; # Its version 1.0 plus 10 commits
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix
index 99ea6343d70f..8c691f775916 100644
--- a/pkgs/development/libraries/liquid-dsp/default.nix
+++ b/pkgs/development/libraries/liquid-dsp/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, autoreconfHook }:
-stdenv.mkDerivation rec {
- name = "liquid-dsp-${version}";
+stdenv.mkDerivation {
+ pname = "liquid-dsp";
version = "20170307";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix
index 9c1815f840b4..2df7ef94cf36 100644
--- a/pkgs/development/libraries/liquidfun/default.nix
+++ b/pkgs/development/libraries/liquidfun/default.nix
@@ -8,7 +8,7 @@ let
hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
src = requireFile {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index ff77cd71265e..57dcb3ee6a6a 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -2,7 +2,7 @@
# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
stdenv.mkDerivation rec {
- name = "live555-${version}";
+ pname = "live555";
version = "2019.08.16";
src = fetchurl { # the upstream doesn't provide a stable URL
diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index 690a42cfb306..830ec7bdaee2 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "lmdb-${version}";
+ pname = "lmdb";
version = "0.9.24";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix
index 232a67c23f3b..95d8f45eec46 100644
--- a/pkgs/development/libraries/lmdbxx/default.nix
+++ b/pkgs/development/libraries/lmdbxx/default.nix
@@ -3,13 +3,13 @@
, lmdb }:
stdenv.mkDerivation rec {
- name = "lmdbxx-${version}";
+ pname = "lmdbxx";
version = "0.9.14.0";
src = fetchFromGitHub {
owner = "drycpp";
repo = "lmdbxx";
- rev = "${version}";
+ rev = version;
sha256 = "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6";
};
diff --git a/pkgs/development/libraries/loadcaffe/default.nix b/pkgs/development/libraries/loadcaffe/default.nix
index f0904726eedf..c4e55b14407c 100644
--- a/pkgs/development/libraries/loadcaffe/default.nix
+++ b/pkgs/development/libraries/loadcaffe/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, cmake, torch, protobuf, protobufc}:
stdenv.mkDerivation rec {
- name = "loadcaffe-${version}";
+ pname = "loadcaffe";
version = "0.0pre2016.08.01";
buildInputs = [cmake torch protobuf protobufc];
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix
index 8e8541564245..04b91e5d80fb 100644
--- a/pkgs/development/libraries/log4cxx/default.nix
+++ b/pkgs/development/libraries/log4cxx/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "log4cxx-${version}";
+ pname = "log4cxx";
version = "0.10.0";
src = fetchurl {
- url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${name}.tar.gz";
+ url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${pname}-${version}.tar.gz";
sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d";
};
diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix
index b2fba7df509b..ccf246c044e9 100644
--- a/pkgs/development/libraries/log4shib/default.nix
+++ b/pkgs/development/libraries/log4shib/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, autoreconfHook }:
-stdenv.mkDerivation rec {
- name = "log4shib-${version}";
+stdenv.mkDerivation {
+ pname = "log4shib";
version = "1.0.9";
src = fetchgit {
diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix
index 2ff927048ad5..631233f0ecbe 100644
--- a/pkgs/development/libraries/loki/default.nix
+++ b/pkgs/development/libraries/loki/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "loki-${version}";
+ pname = "loki";
version = "0.1.7";
src = fetchurl {
diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix
index cad5d0d7ecad..e00fc07480e2 100644
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.5.3";
- name = "loudmouth-${version}";
+ pname = "loudmouth";
src = fetchurl {
- url = "https://mcabber.com/files/loudmouth/${name}.tar.bz2";
+ url = "https://mcabber.com/files/loudmouth/${pname}-${version}.tar.bz2";
sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl";
};
diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix
index 50baad6a7a0b..7ca7456f7897 100644
--- a/pkgs/development/libraries/luabind/default.nix
+++ b/pkgs/development/libraries/luabind/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, boost-build, lua, boost}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "luabind-0.9.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix
index c45fa6bc61aa..32eec84e69ef 100644
--- a/pkgs/development/libraries/lucene++/default.nix
+++ b/pkgs/development/libraries/lucene++/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, boost, gtest }:
stdenv.mkDerivation rec {
- name = "lucene++-${version}";
+ pname = "lucene++";
version = "3.0.7";
src = fetchurl {
diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix
index 8a8a004a5e69..7355248b5c58 100644
--- a/pkgs/development/libraries/mac/default.nix
+++ b/pkgs/development/libraries/mac/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch, yasm }:
stdenv.mkDerivation rec {
- name = "mac-${version}";
+ pname = "mac";
version = "4.11-u4-b5-s7";
src = fetchurl {
diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix
index c7794b1a8bfb..04f2208a35da 100644
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/pkgs/development/libraries/mailcore2/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "mailcore2-${version}";
+ pname = "mailcore2";
version = "0.6.3";
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 3a90a4cdf33e..1feea915c025 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -7,7 +7,7 @@
}:
stdenv.mkDerivation rec {
- name = "mapnik-${version}";
+ pname = "mapnik";
version = "3.0.22";
src = fetchzip {
diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix
index 064f04f220cd..cec9e5adc296 100644
--- a/pkgs/development/libraries/martyr/default.nix
+++ b/pkgs/development/libraries/martyr/default.nix
@@ -1,10 +1,10 @@
{stdenv, fetchurl, ant, jdk}:
stdenv.mkDerivation rec {
- name = "martyr-${version}";
+ pname = "martyr";
version = "0.3.9";
src = fetchurl {
- url = "mirror://sourceforge/martyr/${name}.tar.gz";
+ url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz";
sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59";
};
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index a72d5a825c6a..a06d082b2269 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -10,13 +10,13 @@
}:
stdenv.mkDerivation rec {
- name = "mbedtls-${version}";
+ pname = "mbedtls";
version = "2.17.0";
src = fetchFromGitHub {
owner = "ARMmbed";
repo = "mbedtls";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "1mk3xv61wvqqrzd6jnrz8csyfnwwwwpjzywj3fsfy99p51d7wqgw";
};
diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix
index 8f0a6317a257..04ebfced52e8 100644
--- a/pkgs/development/libraries/medfile/default.nix
+++ b/pkgs/development/libraries/medfile/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, hdf5 }:
stdenv.mkDerivation rec {
- name = "medfile-${version}";
+ pname = "medfile";
version = "4.0.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 4b69d5d0aafe..93e73a44bc9c 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "BelledonneCommunications";
- repo = "${baseName}";
- rev = "${version}";
+ repo = baseName;
+ rev = version;
sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j";
};
@@ -34,8 +34,12 @@ stdenv.mkDerivation rec {
openssl
];
- NIX_CFLAGS_COMPILE = " -DGIT_VERSION=\"v2.14.0\" -Wno-error=deprecated-declarations ";
- NIX_LDFLAGS = " -lXext -lssl ";
+ NIX_CFLAGS_COMPILE = [
+ "-DGIT_VERSION=\"v2.14.0\""
+ "-Wno-error=deprecated-declarations"
+ "-Wno-error=cast-function-type"
+ ];
+ NIX_LDFLAGS = "-lXext -lssl";
meta = with stdenv.lib; {
description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications";
diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix
index b8a8c64011ca..38261bd1e53a 100644
--- a/pkgs/development/libraries/mediastreamer/msopenh264.nix
+++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix
@@ -2,8 +2,8 @@
, fetchgit, cmake
}:
-stdenv.mkDerivation rec {
- name = "mediastreamer-openh264-${version}";
+stdenv.mkDerivation {
+ pname = "mediastreamer-openh264";
version = "0.0pre20160801";
src = fetchgit {
diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix
index 94622b8a8f94..dd2091c8a796 100644
--- a/pkgs/development/libraries/mesa-glu/default.nix
+++ b/pkgs/development/libraries/mesa-glu/default.nix
@@ -1,16 +1,13 @@
{ stdenv, fetchurl, pkgconfig, libGL, ApplicationServices }:
stdenv.mkDerivation rec {
- name = "glu-${version}";
- version = "9.0.0";
+ pname = "glu";
+ version = "9.0.1";
src = fetchurl {
- url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${name}.tar.bz2";
- sha256 = "04nzlil3a6fifcmb95iix3yl8mbxdl66b99s62yzq8m7g79x0yhz";
+ url = "ftp://ftp.freedesktop.org/pub/mesa/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "1g2m634p73mixkzv1qz1d0flwm390ydi41bwmchiqvdssqnlqnpv";
};
- postPatch = ''
- echo 'Cflags: -I''${includedir}' >> glu.pc.in
- '';
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ libGL ]
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 7b1b5a3cfa96..cf1bdaf64323 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -8,7 +8,7 @@
, galliumDrivers ? ["auto"]
, driDrivers ? ["auto"]
, vulkanDrivers ? ["auto"]
-, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
+, eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
, OpenGL, Xplugin
, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
}:
@@ -27,11 +27,11 @@
with stdenv.lib;
let
- version = "19.1.3";
+ version = "19.1.5";
branch = head (splitString "." version);
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "mesa";
inherit version;
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
];
- sha256 = "1q5p4mw7zrklwx1is09knnb762zzk33xwhwp99fw25ax4ar60m44";
+ sha256 = "1d3frncljickn5yi2ch1w2phwxhxpi6diyac3cbin9f76m7f2m3v";
};
prePatch = "patchShebangs .";
diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix
index 788d2c5d6188..dffe6fa30590 100644
--- a/pkgs/development/libraries/microsoft_gsl/default.nix
+++ b/pkgs/development/libraries/microsoft_gsl/default.nix
@@ -5,7 +5,7 @@ let
nativeBuild = stdenv.hostPlatform == stdenv.buildPlatform;
in
stdenv.mkDerivation rec {
- name = "microsoft_gsl-${version}";
+ pname = "microsoft_gsl";
version = "2.0.0";
src = fetchFromGitHub {
@@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ catch cmake ];
buildPhase = if nativeBuild then "make" else "true";
+ # https://github.com/microsoft/GSL/issues/806
+ cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-Wno-catch-value" ];
+
installPhase = ''
mkdir -p $out/include
mv ../include/ $out/
diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix
index 7a06f9277c95..5f4dc5eedde5 100644
--- a/pkgs/development/libraries/mimetic/default.nix
+++ b/pkgs/development/libraries/mimetic/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "mimetic";
version = "0.9.8";
- name = "${pname}-${version}";
src = fetchurl {
url = "http://www.codesink.org/download/${pname}-${version}.tar.gz";
diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix
index 791cc9f3f911..287241a75c92 100644
--- a/pkgs/development/libraries/miniball/default.nix
+++ b/pkgs/development/libraries/miniball/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
- name = "miniball-${version}";
+stdenv.mkDerivation {
+ pname = "miniball";
version = "3.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix
index 972cc3e738c7..5bdacbba11d3 100644
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/pkgs/development/libraries/minixml/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "mxml-${version}";
+ pname = "mxml";
version = "3.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index a56deff66e44..5099991c117f 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "mlt-${version}";
+ pname = "mlt";
version = "6.16.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix
index f46ec57197fb..f017e4452a64 100644
--- a/pkgs/development/libraries/mlt/qt-5.nix
+++ b/pkgs/development/libraries/mlt/qt-5.nix
@@ -6,7 +6,7 @@
let inherit (stdenv.lib) getDev; in
stdenv.mkDerivation rec {
- name = "mlt-${version}";
+ pname = "mlt";
version = "6.16.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix
index 9519e295213b..f590653df6ba 100644
--- a/pkgs/development/libraries/mm-common/default.nix
+++ b/pkgs/development/libraries/mm-common/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
- description = "Common build files of GLib/GTK+ C++ bindings";
+ description = "Common build files of GLib/GTK C++ bindings";
longDescription = ''
The mm-common module provides the build infrastructure and utilities
shared among the GNOME C++ binding libraries. It is only a required
diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
index 2a933ef78401..49116c349a86 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "mongoc-${version}";
+ pname = "mongoc";
version = "1.8.0";
src = fetchzip {
diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix
index 58905cce82ab..2bba61975f9d 100644
--- a/pkgs/development/libraries/mono-addins/default.nix
+++ b/pkgs/development/libraries/mono-addins/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, gtk-sharp-2_0 }:
stdenv.mkDerivation rec {
- name = "mono-addins-${version}";
+ pname = "mono-addins";
version = "1.3.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix
index ba9e2a741e40..89db7344f995 100644
--- a/pkgs/development/libraries/mono-zeroconf/default.nix
+++ b/pkgs/development/libraries/mono-zeroconf/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, which, pkgconfig, mono }:
stdenv.mkDerivation rec {
- name = "mono-zeroconf-${version}";
+ pname = "mono-zeroconf";
version = "0.9.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix
index 51591c9d8e8b..ba61cb8414a1 100644
--- a/pkgs/development/libraries/motif/default.nix
+++ b/pkgs/development/libraries/motif/default.nix
@@ -8,11 +8,11 @@
# refer to the gentoo package
stdenv.mkDerivation rec {
- name = "motif-${version}";
+ pname = "motif";
version = "2.3.6";
src = fetchurl {
- url = "mirror://sourceforge/motif/${name}.tar.gz";
+ url = "mirror://sourceforge/motif/${pname}-${version}.tar.gz";
sha256 = "1ksqbp0bzdw6wcrx8s4hj4ivvxmw54hz85l2xfigb87cxmmhx0gs";
};
diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index 96444ea4a23c..8162d3bb911d 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }:
stdenv.mkDerivation rec {
- name = "movit-${version}";
+ pname = "movit";
version = "1.6.3";
src = fetchurl {
- url = "https://movit.sesse.net/${name}.tar.gz";
+ url = "https://movit.sesse.net/${pname}-${version}.tar.gz";
sha256 = "164lm5sg95ca6k546zf775g3s79mgff0az96wl6hbmlrxh4z26gb";
};
diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix
index 6b607e94bd49..baefab487e52 100644
--- a/pkgs/development/libraries/mpfi/default.nix
+++ b/pkgs/development/libraries/mpfi/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, mpfr}:
stdenv.mkDerivation rec {
- name = "mpfi-${version}";
+ pname = "mpfi";
version = "1.5.3";
file_nr = "37331";
src = fetchurl {
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index e32c83af8a75..a91d220be33e 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "4.0.2";
- name = "mpfr-${version}";
+ pname = "mpfr";
src = fetchurl {
urls = [
#"https://www.mpfr.org/${name}/${name}.tar.xz"
- "mirror://gnu/mpfr/${name}.tar.xz"
+ "mirror://gnu/mpfr/${pname}-${version}.tar.xz"
];
sha256 = "12m3amcavhpqygc499s3fzqlb8f2j2rr7fkqsm10xbjfc04fffqx";
};
diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix
index 1c6b8df15114..2232bfb9a38b 100644
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/pkgs/development/libraries/mpich/default.nix
@@ -3,7 +3,7 @@
} :
stdenv.mkDerivation rec {
- name = "mpich-${version}";
+ pname = "mpich";
version = "3.3.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix
index fe9cd6f492e5..3b40f02c01c3 100644
--- a/pkgs/development/libraries/mpir/default.nix
+++ b/pkgs/development/libraries/mpir/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, m4, which, yasm }:
stdenv.mkDerivation rec {
- name = "mpir-${version}";
+ pname = "mpir";
version = "3.0.0";
nativeBuildInputs = [ m4 which yasm ];
diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix
index 1430a3dfca15..ec3b4e201477 100644
--- a/pkgs/development/libraries/mps/default.nix
+++ b/pkgs/development/libraries/mps/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, sqlite }:
stdenv.mkDerivation rec {
- name = "mps-${version}";
+ pname = "mps";
version = "1.117.0";
src = fetchurl {
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [
"-Wno-implicit-fallthrough"
"-Wno-error=clobbered"
+ "-Wno-error=cast-function-type"
];
diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix
index 29ec205d7a11..c8ea3315f8b7 100644
--- a/pkgs/development/libraries/msgpack/generic.nix
+++ b/pkgs/development/libraries/msgpack/generic.nix
@@ -3,8 +3,9 @@
, ...
}:
-stdenv.mkDerivation rec {
- name = "msgpack-${version}";
+stdenv.mkDerivation {
+ pname = "msgpack";
+ inherit version;
inherit src patches;
diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix
index e177694e894e..0ce4870272c3 100644
--- a/pkgs/development/libraries/msgpuck/default.nix
+++ b/pkgs/development/libraries/msgpuck/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
stdenv.mkDerivation rec {
- name = "msgpuck-${version}";
+ pname = "msgpuck";
version = "2.0";
src = fetchFromGitHub {
owner = "rtsisyk";
repo = "msgpuck";
- rev = "${version}";
+ rev = version;
sha256 = "0cjq86kncn3lv65vig9cqkqqv2p296ymcjjbviw0j1s85cfflps0";
};
diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix
index ef8525cf54d7..da41aceeef52 100644
--- a/pkgs/development/libraries/mtxclient/default.nix
+++ b/pkgs/development/libraries/mtxclient/default.nix
@@ -2,7 +2,7 @@
, boost, openssl, zlib, libsodium, olm, nlohmann_json }:
stdenv.mkDerivation rec {
- name = "mtxclient-${version}";
+ pname = "mtxclient";
version = "0.2.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mumlib/default.nix b/pkgs/development/libraries/mumlib/default.nix
index 7117599d15ec..f936fc8b3df6 100644
--- a/pkgs/development/libraries/mumlib/default.nix
+++ b/pkgs/development/libraries/mumlib/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
, boost, openssl, log4cpp, libopus, protobuf }:
-with lib; stdenv.mkDerivation rec {
+with lib; stdenv.mkDerivation {
pname = "mumlib";
version = "unstable-2018-12-12";
diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix
index 53f348f93f8e..d058322660cf 100644
--- a/pkgs/development/libraries/muparser/default.nix
+++ b/pkgs/development/libraries/muparser/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec {
- name = "muparser-${version}";
+ pname = "muparser";
version = "2.2.3";
url-version = stdenv.lib.replaceChars ["."] ["_"] version;
diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix
index 423a93b69a80..37bfb05c4eef 100644
--- a/pkgs/development/libraries/mutest/default.nix
+++ b/pkgs/development/libraries/mutest/default.nix
@@ -4,7 +4,7 @@
, ninja
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "mutest";
version = "unstable-2019-08-26";
diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix
index f4a869255f8c..0907f0174c99 100644
--- a/pkgs/development/libraries/mygui/default.nix
+++ b/pkgs/development/libraries/mygui/default.nix
@@ -4,7 +4,7 @@
let
renderSystem = if withOgre then "3" else "4";
in stdenv.mkDerivation rec {
- name = "mygui-${version}";
+ pname = "mygui";
version = "3.2.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix
index 140dbcc937b5..3dac7c93e84b 100644
--- a/pkgs/development/libraries/mypaint-brushes/default.nix
+++ b/pkgs/development/libraries/mypaint-brushes/default.nix
@@ -3,7 +3,7 @@
let
pname = "mypaint-brushes";
version = "1.3.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix
index 6ec288f985b0..8164f4ec9729 100644
--- a/pkgs/development/libraries/mysocketw/default.nix
+++ b/pkgs/development/libraries/mysocketw/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, openssl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "mysocketw-031026";
src = fetchurl {
url = http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz;
diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix
index f29fb9564f31..5c0238fe41ea 100644
--- a/pkgs/development/libraries/nanoflann/default.nix
+++ b/pkgs/development/libraries/nanoflann/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.3.0";
- name = "nanoflann-${version}";
+ pname = "nanoflann";
src = fetchFromGitHub {
owner = "jlblancoc";
diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix
index 8f72b333aa48..94bc8186f30c 100644
--- a/pkgs/development/libraries/nanomsg/default.nix
+++ b/pkgs/development/libraries/nanomsg/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.1.5";
- name = "nanomsg-${version}";
+ pname = "nanomsg";
src = fetchFromGitHub {
owner = "nanomsg";
diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix
index 55e9f44eae31..c842eac4311e 100644
--- a/pkgs/development/libraries/nco/default.nix
+++ b/pkgs/development/libraries/nco/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "4.8.1";
- name = "nco-${version}";
+ pname = "nco";
buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr which curl flex ];
diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix
index cbe1f9840593..7f08d0a75351 100644
--- a/pkgs/development/libraries/ndn-cxx/default.nix
+++ b/pkgs/development/libraries/ndn-cxx/default.nix
@@ -4,7 +4,8 @@ let
version = "0.6.3";
in
stdenv.mkDerivation {
- name = "ndn-cxx-${version}";
+ pname = "ndn-cxx";
+ inherit version;
src = fetchFromGitHub {
owner = "named-data";
repo = "ndn-cxx";
diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix
index 913a4a087a97..d813d6c519ca 100644
--- a/pkgs/development/libraries/ndpi/default.nix
+++ b/pkgs/development/libraries/ndpi/default.nix
@@ -2,13 +2,14 @@
let version = "2.8"; in
-stdenv.mkDerivation rec {
- name = "ndpi-${version}";
+stdenv.mkDerivation {
+ pname = "ndpi";
+ inherit version;
src = fetchFromGitHub {
owner = "ntop";
repo = "nDPI";
- rev = "${version}";
+ rev = version;
sha256 = "0lc4vga89pm954vf92g9fa6xwsjkb13jd6wrcc35zy5j04nf9rzf";
};
diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix
index 65679c7e2825..a79c42a1c8f4 100644
--- a/pkgs/development/libraries/neardal/default.nix
+++ b/pkgs/development/libraries/neardal/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "neardal-0.7-post-git-20150930";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix
index 87f9b5effacd..fbffb138e969 100644
--- a/pkgs/development/libraries/neon/0.29.nix
+++ b/pkgs/development/libraries/neon/0.29.nix
@@ -15,10 +15,10 @@ in
stdenv.mkDerivation rec {
version = "0.29.6";
- name = "neon-${version}";
+ pname = "neon";
src = fetchurl {
- url = "http://www.webdav.org/neon/${name}.tar.gz";
+ url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz";
sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w";
};
diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix
index 61a40753a56f..ffefc8e51c4d 100644
--- a/pkgs/development/libraries/neon/default.nix
+++ b/pkgs/development/libraries/neon/default.nix
@@ -15,10 +15,10 @@ in
stdenv.mkDerivation rec {
version = "0.30.2";
- name = "neon-${version}";
+ pname = "neon";
src = fetchurl {
- url = "http://www.webdav.org/neon/${name}.tar.gz";
+ url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz";
sha256 = "1jpvczcx658vimqm7c8my2q41fnmjaf1j03g7bsli6rjxk6xh2yv";
};
diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix
index a57884912bae..665145a92ac4 100644
--- a/pkgs/development/libraries/netcdf-cxx4/default.nix
+++ b/pkgs/development/libraries/netcdf-cxx4/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, netcdf, hdf5, curl }:
stdenv.mkDerivation rec {
- name = "netcdf-cxx4-${version}";
+ pname = "netcdf-cxx4";
version = "4.3.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix
index bb621a3eda6c..c9c52636a5b7 100644
--- a/pkgs/development/libraries/netcdf-fortran/default.nix
+++ b/pkgs/development/libraries/netcdf-fortran/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, netcdf, hdf5, curl, gfortran }:
stdenv.mkDerivation rec {
- name = "netcdf-fortran-${version}";
+ pname = "netcdf-fortran";
version = "4.4.5";
src = fetchurl {
diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix
index d78a31d65cd3..064ef3443980 100644
--- a/pkgs/development/libraries/nettle/generic.nix
+++ b/pkgs/development/libraries/nettle/generic.nix
@@ -4,7 +4,7 @@
, version, src
, ...}:
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
name = "nettle-${version}";
inherit src;
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index d6fcfb411491..d02247196b1a 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -18,11 +18,11 @@ let inherit (stdenv.lib) optional; in
stdenv.mkDerivation rec {
pname = "nghttp2";
- version = "1.39.1";
+ version = "1.39.2";
src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
- sha256 = "1vzmkh3pky3l3w6iaffhikh7hslp8zp0jsdqpd6knbflsmzp511a";
+ sha256 = "1l51q8xqg7d7y9413z8l0scxgbbl1qkwgq4f09jqb31j492kx8lj";
};
outputs = [ "bin" "out" "dev" "lib" ];
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index cc5a115ed71e..442fcf2e7615 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }:
let version = "6.0.0"; in
stdenv.mkDerivation {
- name = "nix-plugins-${version}";
+ pname = "nix-plugins";
+ inherit version;
src = fetchFromGitHub {
owner = "shlevy";
diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix
index 3c5ae8537a41..403b0326bb5a 100644
--- a/pkgs/development/libraries/notify-sharp/default.nix
+++ b/pkgs/development/libraries/notify-sharp/default.nix
@@ -2,14 +2,14 @@
, mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }:
stdenv.mkDerivation rec {
- name = "notify-sharp-${version}";
+ pname = "notify-sharp";
version = "3.0.3";
src = fetchFromGitHub {
owner = "GNOME";
repo = "notify-sharp";
- rev = "${version}";
+ rev = version;
sha256 = "1vm7mnmxdwrgy4mr07lfva8sa6a32f2ah5x7w8yzcmahaks3sj5m";
};
diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix
index 43732406064e..2cbf88633e7b 100644
--- a/pkgs/development/libraries/npapi-sdk/default.nix
+++ b/pkgs/development/libraries/npapi-sdk/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "npapi-sdk-${version}";
+ pname = "npapi-sdk";
version = "0.27.2";
src = fetchurl {
- url = "https://bitbucket.org/mgorny/npapi-sdk/downloads/${name}.tar.bz2";
+ url = "https://bitbucket.org/mgorny/npapi-sdk/downloads/${pname}-${version}.tar.bz2";
sha256 = "0xxfcsjmmgbbyl9zwpzdshbx27grj5fnzjfmldmm9apws2yk9gq1";
};
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 4772f1111aca..b62fa1cb704f 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -5,7 +5,8 @@
let version = "4.21"; in
stdenv.mkDerivation {
- name = "nspr-${version}";
+ pname = "nspr";
+ inherit version;
src = fetchurl {
url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index b410686865f2..b6b1d406eacd 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -5,16 +5,16 @@ let
url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
- version = "3.44.1";
+ version = "3.46";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in stdenv.mkDerivation rec {
- name = "nss-${version}";
+ pname = "nss";
inherit version;
src = fetchurl {
- url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz";
- sha256 = "1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w";
+ url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
+ sha256 = "1vqcl6wxn2nsm2fmlwzmxyagrsj1p1y9bc54b2i2nq45s94rcsbb";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix
index dac65e1c2f9a..5ea43097b8ca 100644
--- a/pkgs/development/libraries/ntbtls/default.nix
+++ b/pkgs/development/libraries/ntbtls/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "ntbtls-${version}";
+ pname = "ntbtls";
version = "0.1.2";
src = fetchurl {
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index 12d3c9ad9420..e83fe2e7e7b6 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -13,7 +13,7 @@
assert withGf2x -> gf2x != null;
stdenv.mkDerivation rec {
- name = "ntl-${version}";
+ pname = "ntl";
version = "11.3.2";
src = fetchurl {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
perl # needed for ./configure
];
- sourceRoot = "${name}/src";
+ sourceRoot = "${pname}-${version}/src";
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index c0a73fa984e7..b79f940affa3 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -5,10 +5,11 @@ let
in
stdenv.mkDerivation rec {
- name = "ntrack-${version}";
+ pname = "ntrack";
+ inherit version;
src = fetchurl {
- url = "https://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz";
+ url = "https://launchpad.net/ntrack/main/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "037ig5y0mp327m0hh4pnfr3vmsk3wrxgfjy3645q4ws9vdhx807w";
};
diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix
index 91318c802d8f..db542ec93a92 100644
--- a/pkgs/development/libraries/nuspell/default.nix
+++ b/pkgs/development/libraries/nuspell/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, ronn }:
stdenv.mkDerivation rec {
- name = "nuspell-${version}";
+ pname = "nuspell";
version = "2.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix
index 77167361ff20..73b5e3fe772e 100644
--- a/pkgs/development/libraries/nvidia-texture-tools/default.nix
+++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "nvidia-texture-tools-${version}";
+ pname = "nvidia-texture-tools";
version = "2.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix
index 798f9d3a3965..b7d46cd5537d 100644
--- a/pkgs/development/libraries/nvidia-video-sdk/default.nix
+++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "nvidia-video-sdk-6.0.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix
index abdc7502052b..84205253554c 100644
--- a/pkgs/development/libraries/ocl-icd/default.nix
+++ b/pkgs/development/libraries/ocl-icd/default.nix
@@ -1,15 +1,15 @@
{stdenv, fetchurl, ruby, opencl-headers, addOpenGLRunpath }:
stdenv.mkDerivation rec {
- name = "ocl-icd-${version}";
+ pname = "ocl-icd";
version = "2.2.10";
src = fetchurl {
- url = "https://forge.imag.fr/frs/download.php/810/${name}.tar.gz";
+ url = "https://forge.imag.fr/frs/download.php/810/${pname}-${version}.tar.gz";
sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2";
};
- nativeBuildInputs = [ ruby addOpenGLRunpath ];
+ nativeBuildInputs = [ ruby ];
buildInputs = [ opencl-headers ];
@@ -17,12 +17,6 @@ stdenv.mkDerivation rec {
sed -i 's,"/etc/OpenCL/vendors","${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c
'';
- # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found.
- # See the explanation in addOpenGLRunpath.
- postFixup = ''
- addOpenGLRunpath $out/lib/libOpenCL.so
- '';
-
meta = with stdenv.lib; {
description = "OpenCL ICD Loader for ${opencl-headers.name}";
homepage = https://forge.imag.fr/projects/ocl-icd/;
diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix
index aa1886508609..a540d89ed3b7 100644
--- a/pkgs/development/libraries/ode/default.nix
+++ b/pkgs/development/libraries/ode/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ode-${version}";
+ pname = "ode";
version = "0.12";
src = fetchurl {
diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix
index 42babc32ecdb..2855d1139c3d 100644
--- a/pkgs/development/libraries/ogre/1.9.x.nix
+++ b/pkgs/development/libraries/ogre/1.9.x.nix
@@ -11,7 +11,6 @@
stdenv.mkDerivation rec {
pname = "ogre";
version = "1.9.1";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "OGRECave";
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index f1b6060e1663..dc3bf8cf0097 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -10,7 +10,7 @@
, withSamples ? false }:
stdenv.mkDerivation rec {
- name = "ogre-${version}";
+ pname = "ogre";
version = "1.12.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix
index e4045bcd5dc4..0844c44c8a8b 100644
--- a/pkgs/development/libraries/ogrepaged/default.nix
+++ b/pkgs/development/libraries/ogrepaged/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, ois, ogre, libX11, boost }:
stdenv.mkDerivation rec {
- name = "ogre-paged-${version}";
+ pname = "ogre-paged";
version = "1.2.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix
index 253d185fa0cd..15e83cf9d769 100644
--- a/pkgs/development/libraries/ois/default.nix
+++ b/pkgs/development/libraries/ois/default.nix
@@ -7,7 +7,7 @@ let
in
stdenv.mkDerivation rec {
- name = "ois-${version}";
+ pname = "ois";
version = "${majorVersion}.${minorVersion}";
src = fetchurl {
diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index 49daff30e7b5..dd3f83a0130d 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "olm-${version}";
+ pname = "olm";
version = "3.0.0";
meta = {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
src = fetchurl {
- url = "https://matrix.org/git/olm/snapshot/${name}.tar.gz";
+ url = "https://matrix.org/git/olm/snapshot/${pname}-${version}.tar.gz";
sha256 = "1iivxjk458v9lhqgzp0c4k5azligsh9k3rk6irf9ssj29wzgjm2c";
};
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index e64d21c87ed0..8a1e1d37c1d5 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "onig-${version}";
+ pname = "onig";
version = "6.9.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix
index b60a53e55ca1..32b131159572 100644
--- a/pkgs/development/libraries/opae/default.nix
+++ b/pkgs/development/libraries/opae/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "opae-${version}";
+ pname = "opae";
version = "1.0.0";
# the tag has a silly name for some reason. drop this in the future if
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index 3c082926e06c..89ac85b752b7 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -11,12 +11,12 @@ assert pulseSupport -> libpulseaudio != null;
stdenv.mkDerivation rec {
version = "1.19.1";
- name = "openal-soft-${version}";
+ pname = "openal-soft";
src = fetchFromGitHub {
owner = "kcat";
repo = "openal-soft";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "0b0g0q1c36nfb289xcaaj3cmyfpiswvvgky3qyalsf9n4dj7vnzi";
};
diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix
index 81754ffad4d2..26bcf3d20ff6 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/pkgs/development/libraries/openbabel/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }:
stdenv.mkDerivation rec {
- name = "openbabel-${version}";
+ pname = "openbabel";
version = "2.4.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix
index 4d3e9e9a04eb..4d4505c3e703 100644
--- a/pkgs/development/libraries/openbr/default.nix
+++ b/pkgs/development/libraries/openbr/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.5";
- name = "openbr-${version}";
+ pname = "openbr";
src = fetchFromGitHub {
owner = "biometrics";
diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix
index 2b2fc3ff4d5c..25e7267b3c9f 100644
--- a/pkgs/development/libraries/openbsm/default.nix
+++ b/pkgs/development/libraries/openbsm/default.nix
@@ -2,13 +2,12 @@
stdenv.mkDerivation rec {
pname = "openbsm";
- name = "${pname}-${version}";
version = "1.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
- rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] name)}";
+ rev = lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] "${pname}-${version}");
sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1";
};
diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix
index 613aeddd77be..5ed2dd5e23d2 100644
--- a/pkgs/development/libraries/opencl-clhpp/default.nix
+++ b/pkgs/development/libraries/opencl-clhpp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, python, opencl-headers }:
stdenv.mkDerivation rec {
- name = "opencl-clhpp-${version}";
+ pname = "opencl-clhpp";
version = "2.0.10";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix
index 9ce8bb618bf9..d0cc6396b8d8 100644
--- a/pkgs/development/libraries/opencl-headers/default.nix
+++ b/pkgs/development/libraries/opencl-headers/default.nix
@@ -2,7 +2,7 @@
, version # "12" for "1.2", "22" for "2.2" and so on
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "opencl-headers-${version}-2017-07-18";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix
index cd3da4a7960f..9bd25bfb93a8 100644
--- a/pkgs/development/libraries/opencollada/default.nix
+++ b/pkgs/development/libraries/opencollada/default.nix
@@ -2,7 +2,7 @@
, darwin}:
stdenv.mkDerivation rec {
- name = "opencollada-${version}";
+ pname = "opencollada";
version = "1.6.68";
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index 3081c6c839c8..cbd05848173a 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -3,7 +3,7 @@
with lib;
stdenv.mkDerivation rec {
- name = "opencolorio-${version}";
+ pname = "opencolorio";
version = "1.1.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix
index 9a8787ad7f49..e2d34ae5f07b 100644
--- a/pkgs/development/libraries/opencore-amr/default.nix
+++ b/pkgs/development/libraries/opencore-amr/default.nix
@@ -4,7 +4,8 @@ let
version = "0.1.5";
in
stdenv.mkDerivation {
- name = "opencore-amr-${version}";
+ pname = "opencore-amr";
+ inherit version;
src = fetchurl {
url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz";
sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c";
diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix
index 11c66f0d497b..1fdddf930cfd 100644
--- a/pkgs/development/libraries/opencsg/default.nix
+++ b/pkgs/development/libraries/opencsg/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "1.4.2";
- name = "opencsg-${version}";
+ pname = "opencsg";
src = fetchurl {
url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz";
sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr";
diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix
index 5ad7eecace1b..5f1c2b5c6f60 100644
--- a/pkgs/development/libraries/openct/default.nix
+++ b/pkgs/development/libraries/openct/default.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
- name = "openct-${version}";
+ pname = "openct";
version = "0.6.20";
src = fetchFromGitHub {
owner = "OpenSC";
repo = "openct";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "09wxq0jxdxhci3zr7jd3zcxjkl3j0r1v00k3q8gqrg9gighh8nk2";
};
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index d5dc716c4a8f..d8946dae095b 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -14,7 +14,8 @@
, enableOpenblas ? true, openblas
, enableContrib ? true
-, enableCuda ? config.cudaSupport or false, cudatoolkit
+, enableCuda ? (config.cudaSupport or false) &&
+ stdenv.hostPlatform.isx86_64, cudatoolkit
, enableUnfree ? false
, enableIpp ? false
@@ -139,8 +140,8 @@ let
printEnabled = enabled : if enabled then "ON" else "OFF";
in
-stdenv.mkDerivation rec {
- name = "opencv-${version}";
+stdenv.mkDerivation {
+ pname = "opencv";
inherit version src;
postUnpack = lib.optionalString buildContrib ''
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 3fdc392e92b8..aa4c7afa4dbe 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -14,7 +14,8 @@
, enableOpenblas ? true, openblas
, enableContrib ? true
-, enableCuda ? config.cudaSupport or false, cudatoolkit
+, enableCuda ? (config.cudaSupport or false) &&
+ stdenv.hostPlatform.isx86_64, cudatoolkit
, enableUnfree ? false
, enableIpp ? false
@@ -152,8 +153,8 @@ let
printEnabled = enabled : if enabled then "ON" else "OFF";
in
-stdenv.mkDerivation rec {
- name = "opencv-${version}";
+stdenv.mkDerivation {
+ pname = "opencv";
inherit version src;
postUnpack = lib.optionalString buildContrib ''
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 784071c6e4d4..b91a1489eb69 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -19,7 +19,7 @@ let
in
stdenv.mkDerivation rec {
- name = "opencv-${version}";
+ pname = "opencv";
version = "2.4.13";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
index 17e2c9098a10..6bf5ea6023e0 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -4,13 +4,13 @@
}:
stdenv.mkDerivation rec {
- name = "opendht-${version}";
+ pname = "opendht";
version = "1.8.0";
src = fetchFromGitHub {
owner = "savoirfairelinux";
repo = "opendht";
- rev = "${version}";
+ rev = version;
sha256 = "1mj3zsywxphh9wcazyqsldwwn14r77xv9cjsmc0nmcybsl2bwnpl";
};
diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix
index 71885ba46f10..66496af12f93 100644
--- a/pkgs/development/libraries/opendkim/default.nix
+++ b/pkgs/development/libraries/opendkim/default.nix
@@ -2,11 +2,11 @@
, autoreconfHook, perl, makeWrapper }:
stdenv.mkDerivation rec {
- name = "opendkim-${version}";
+ pname = "opendkim";
version = "2.10.3";
src = fetchurl {
- url = "mirror://sourceforge/opendkim/files/${name}.tar.gz";
+ url = "mirror://sourceforge/opendkim/files/${pname}-${version}.tar.gz";
sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823";
};
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 072848d7bbca..9eef138c532e 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -6,11 +6,11 @@ let
in
stdenv.mkDerivation rec {
- name = "openexr-${version}";
+ pname = "openexr";
version = lib.getVersion ilmbase;
src = fetchurl {
- url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz";
+ url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x";
};
diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix
index 099bd8d1e973..b8a3c4a81e00 100644
--- a/pkgs/development/libraries/openexrid-unstable/default.nix
+++ b/pkgs/development/libraries/openexrid-unstable/default.nix
@@ -1,8 +1,7 @@
{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU_combined, openexr }:
-stdenv.mkDerivation rec
-{
- name = "openexrid-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "openexrid-unstable";
version = "2017-09-17";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix
index cd3210dd08b1..6554d025311b 100644
--- a/pkgs/development/libraries/openfst/default.nix
+++ b/pkgs/development/libraries/openfst/default.nix
@@ -1,12 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "openfst";
version = "1.7.2";
src = fetchurl {
- url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz";
+ url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz";
sha256 = "0fqgk8195kz21is09gwzwnrg7fr9526bi9mh4apyskapz27pbhr1";
};
meta = {
diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix
index 42edb1958ce0..4a7927bfcb2e 100644
--- a/pkgs/development/libraries/openfx/default.nix
+++ b/pkgs/development/libraries/openfx/default.nix
@@ -1,8 +1,7 @@
{ stdenv, fetchFromGitHub, unzip }:
-stdenv.mkDerivation rec
-{
- name = "openfx-${version}";
+stdenv.mkDerivation {
+ pname = "openfx";
version = "1.4";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix
index c8208ce27bae..cd91a1325978 100644
--- a/pkgs/development/libraries/openh264/default.nix
+++ b/pkgs/development/libraries/openh264/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, nasm }:
stdenv.mkDerivation rec {
- name = "openh264-${version}";
+ pname = "openh264";
version = "1.8.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix
index 2a625f32e7ff..beb151f0d2de 100644
--- a/pkgs/development/libraries/openjpeg/1.x.nix
+++ b/pkgs/development/libraries/openjpeg/1.x.nix
@@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.5.2";
branch = "1.5";
revision = "version.1.5.2";
diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
index e26f4160921f..64ed6cb58f0b 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -23,8 +23,9 @@ let
mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}";
in
-stdenv.mkDerivation rec {
- name = "openjpeg-${version}";
+stdenv.mkDerivation {
+ pname = "openjpeg";
+ inherit version;
src = fetchFromGitHub {
owner = "uclouvain";
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 04988debb723..fbc9de11e8f7 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }:
stdenv.mkDerivation rec {
- name = "openldap-2.4.47";
+ name = "openldap-2.4.48";
src = fetchurl {
url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz";
- sha256 = "02sj0p1pq12hqq29b22m3f5zs2rykgvc0q3wlynxjcsjhrvmhk7m";
+ sha256 = "0k87qra4kirb6xgja4q1jyw6piwb9v8b8g6gkxq4plawmgy3ylnr";
};
# TODO: separate "out" and "bin"
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 760fc3e32329..06e4726054e9 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -12,10 +12,11 @@ let
version = "4.0.1";
in stdenv.mkDerivation rec {
- name = "openmpi-${version}";
+ pname = "openmpi";
+ inherit version;
src = with stdenv.lib.versions; fetchurl {
- url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2";
+ url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc";
};
diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix
index ed646b9e221b..6d53d23ae0e7 100644
--- a/pkgs/development/libraries/openpa/default.nix
+++ b/pkgs/development/libraries/openpa/default.nix
@@ -3,10 +3,9 @@
stdenv.mkDerivation rec {
pname = "openpa";
version = "1.0.4";
- name = "${pname}-${version}";
src = fetchurl {
- url = "https://trac.mpich.org/projects/${pname}/raw-attachment/wiki/Downloads/${name}.tar.gz";
+ url = "https://trac.mpich.org/projects/${pname}/raw-attachment/wiki/Downloads/${pname}-${version}.tar.gz";
sha256 = "0flyi596hm6fv7xyw2iykx3s65p748s62bf15624xcnwpfrh8ncy";
};
diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix
index 339f60649997..b217527269dd 100644
--- a/pkgs/development/libraries/openpam/default.nix
+++ b/pkgs/development/libraries/openpam/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation rec {
- name = "openpam-${version}";
+ pname = "openpam";
version = "20170430";
src = fetchurl {
- url = "mirror://sourceforge/openpam/openpam/Resedacea/${name}.tar.gz";
+ url = "mirror://sourceforge/openpam/openpam/Resedacea/${pname}-${version}.tar.gz";
sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2";
};
diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix
index 9488ef484c6f..0edf6dfa7283 100644
--- a/pkgs/development/libraries/opensaml-cpp/default.nix
+++ b/pkgs/development/libraries/opensaml-cpp/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "opensaml-cpp-${version}";
+ pname = "opensaml-cpp";
version = "3.0.1";
src = fetchgit {
diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix
index f07ebad9e810..e2f641147166 100644
--- a/pkgs/development/libraries/openssl/chacha.nix
+++ b/pkgs/development/libraries/openssl/chacha.nix
@@ -3,8 +3,8 @@
}:
with stdenv.lib;
-stdenv.mkDerivation rec {
- name = "openssl-chacha-${version}";
+stdenv.mkDerivation {
+ pname = "openssl-chacha";
version = "2016-08-22";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 67b903970d3e..03082eab0917 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -8,10 +8,11 @@ with stdenv.lib;
let
common = { version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec {
- name = "openssl-${version}";
+ pname = "openssl";
+ inherit version;
src = fetchurl {
- url = "https://www.openssl.org/source/${name}.tar.gz";
+ url = "https://www.openssl.org/source/${pname}-${version}.tar.gz";
inherit sha256;
};
@@ -43,10 +44,10 @@ let
# TODO(@Ericson2314): Improve with mass rebuild
configurePlatforms = [];
configureScript = {
- "x86_64-darwin" = "./Configure darwin64-x86_64-cc";
- "x86_64-solaris" = "./Configure solaris64-x86_64-gcc";
- "armv6l-linux" = "./Configure linux-armv4 -march=armv6";
- "armv7l-linux" = "./Configure linux-armv4 -march=armv7-a";
+ x86_64-darwin = "./Configure darwin64-x86_64-cc";
+ x86_64-solaris = "./Configure solaris64-x86_64-gcc";
+ armv6l-linux = "./Configure linux-armv4 -march=armv6";
+ armv7l-linux = "./Configure linux-armv4 -march=armv7-a";
}.${stdenv.hostPlatform.system} or (
if stdenv.hostPlatform == stdenv.buildPlatform
then "./config"
@@ -72,7 +73,14 @@ let
] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"
++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng";
- makeFlags = [ "MANDIR=$(man)/share/man" ];
+ makeFlags = [
+ "MANDIR=$(man)/share/man"
+ # This avoids conflicts between man pages of openssl subcommands (for
+ # example 'ts' and 'err') man pages and their equivalent top-level
+ # command in other packages (respectively man-pages and moreutils).
+ # This is done in ubuntu and archlinux, and possiibly many other distros.
+ "MANSUFFIX=ssl"
+ ];
enableParallelBuilding = true;
@@ -113,7 +121,6 @@ let
license = licenses.openssl;
platforms = platforms.all;
maintainers = [ maintainers.peti ];
- priority = 10; # resolves collision with ‘man-pages’
};
};
diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index 72e532ae7829..81ef6a3bf5d1 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "opensubdiv-${version}";
+ pname = "opensubdiv";
version = "3.4.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix
index 00f4f45df96a..f29972a64bd9 100644
--- a/pkgs/development/libraries/opentracing-cpp/default.nix
+++ b/pkgs/development/libraries/opentracing-cpp/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "opentracing-cpp-${version}";
+ pname = "opentracing-cpp";
version = "1.5.1";
src = fetchFromGitHub {
owner = "opentracing";
diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix
index af88172c57a1..800acebac34c 100644
--- a/pkgs/development/libraries/openvdb/default.nix
+++ b/pkgs/development/libraries/openvdb/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec
{
- name = "openvdb-${version}";
+ pname = "openvdb";
version = "6.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix
index a986b71bc1dd..134ec74d530a 100644
--- a/pkgs/development/libraries/openwsman/default.nix
+++ b/pkgs/development/libraries/openwsman/default.nix
@@ -2,7 +2,7 @@
, curl, libxml2, pam, sblim-sfcc }:
stdenv.mkDerivation rec {
- name = "openwsman-${version}";
+ pname = "openwsman";
version = "2.6.9";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix
index d1a20552ff76..8013d6865855 100644
--- a/pkgs/development/libraries/openxr-loader/default.nix
+++ b/pkgs/development/libraries/openxr-loader/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "openxr-loader";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "OpenXR-SDK-Source";
rev = "release-${version}";
- sha256 = "1sif2w2vm793j6493364i6pp6s6yqi7fwa6iky5abzmzda51cg5q";
+ sha256 = "11lkihykwkq0sbmijqxmn52lg6mcn6gkcpj1c7fhzm0hm1b9p9dn";
};
nativeBuildInputs = [ cmake python3 ];
diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix
index 5a5e8ffaef7c..3d5988f8114e 100644
--- a/pkgs/development/libraries/openzwave/default.nix
+++ b/pkgs/development/libraries/openzwave/default.nix
@@ -5,8 +5,9 @@
let
version = "2018-11-13";
-in stdenv.mkDerivation rec {
- name = "openzwave-${version}";
+in stdenv.mkDerivation {
+ pname = "openzwave";
+ inherit version;
# Use fork by Home Assistant because this package is mainly used for python.pkgs.homeassistant-pyozw.
# See https://github.com/OpenZWave/open-zwave/compare/master...home-assistant:hass for the difference.
diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index 06b9e360d1a3..a7865fc7f4be 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -1,6 +1,5 @@
{ stdenv
, fetchurl
-, requireFile
, autoPatchelfHook
, fixDarwinDylibNames
, unzip
@@ -22,65 +21,57 @@ let
# determine the version number, there might be different ones per architecture
version = {
- "x86_64-linux" = "19.3.0.0.0";
- "x86_64-darwin" = "18.1.0.0.0";
- }."${stdenv.hostPlatform.system}" or throwSystem;
+ x86_64-linux = "19.3.0.0.0";
+ x86_64-darwin = "19.3.0.0.0";
+ }.${stdenv.hostPlatform.system} or throwSystem;
# hashes per component and architecture
hashes = {
- "x86_64-linux" = {
- "basic" = "1yk4ng3a9ka1mzgfph9br6rwclagbgfvmg6kja11nl5dapxdzaxy";
- "sdk" = "115v1gqr0czy7dcf2idwxhc6ja5b0nind0mf1rn8iawgrw560l99";
- "sqlplus" = "0zj5h84ypv4n4678kfix6jih9yakb277l9hc0819iddc0a5slbi5";
- "odbc" = "1g1z6pdn76dp440fh49pm8ijfgjazx4cvxdi665fsr62h62xkvch";
+ x86_64-linux = {
+ basic = "1yk4ng3a9ka1mzgfph9br6rwclagbgfvmg6kja11nl5dapxdzaxy";
+ sdk = "115v1gqr0czy7dcf2idwxhc6ja5b0nind0mf1rn8iawgrw560l99";
+ sqlplus = "0zj5h84ypv4n4678kfix6jih9yakb277l9hc0819iddc0a5slbi5";
+ odbc = "1g1z6pdn76dp440fh49pm8ijfgjazx4cvxdi665fsr62h62xkvch";
};
- "x86_64-darwin" = {
- "basic" = "fac3cdaaee7526f6c50ff167edb4ba7ab68efb763de24f65f63fb48cc1ba44c0";
- "sdk" = "98e6d797f1ce11e59b042b232f62380cec29ec7d5387b88a9e074b741c13e63a";
- "sqlplus" = "02e66dc52398fced75e7efcb6b4372afcf617f7d88344fb7f0f4bb2bed371f3b";
- "odbc" = "5d0cdd7f9dd2e27affbc9b36ef9fc48e329713ecd36905fdd089366e365ae8a2";
+ x86_64-darwin = {
+ basic = "f4335c1d53e8188a3a8cdfb97494ff87c4d0f481309284cf086dc64080a60abd";
+ sdk = "b46b4b87af593f7cfe447cfb903d1ae5073cec34049143ad8cdc9f3e78b23b27";
+ sqlplus = "f7565c3cbf898b0a7953fbb0017c5edd9d11d1863781588b7caf3a69937a2e9e";
+ odbc = "f91da40684abaa866aa059eb26b1322f2d527670a1937d678404c991eadeb725";
};
- }."${stdenv.hostPlatform.system}" or throwSystem;
+ }.${stdenv.hostPlatform.system} or throwSystem;
# rels per component and architecture, optional
rels = {
- "x86_64-darwin" = {
- "sdk" = "2";
- };
- }."${stdenv.hostPlatform.system}" or {};
+ }.${stdenv.hostPlatform.system} or {};
# convert platform to oracle architecture names
arch = {
- "x86_64-linux" = "linux.x64";
- "x86_64-darwin" = "macos.x64";
- }."${stdenv.hostPlatform.system}" or throwSystem;
+ x86_64-linux = "linux.x64";
+ x86_64-darwin = "macos.x64";
+ }.${stdenv.hostPlatform.system} or throwSystem;
+
+ shortArch = {
+ x86_64-linux = "linux";
+ x86_64-darwin = "macos";
+ }.${stdenv.hostPlatform.system} or throwSystem;
# calculate the filename of a single zip file
srcFilename = component: arch: version: rel:
"instantclient-${component}-${arch}-${version}" +
(optionalString (rel != "") "-${rel}") +
- (optionalString (arch == "linux.x64") "dbru") + # ¯\_(ツ)_/¯
+ (optionalString (arch == "linux.x64" || arch == "macos.x64") "dbru") + # ¯\_(ツ)_/¯
".zip";
- # fetcher for the clickthrough artifacts (requiring manual download)
- fetchClickThrough = srcFilename: hash: (requireFile {
- name = srcFilename;
- url = "https://www.oracle.com/database/technologies/instant-client/downloads.html";
- sha256 = hash;
- });
-
# fetcher for the non clickthrough artifacts
- fetchSimple = srcFilename: hash: fetchurl {
- url = "https://download.oracle.com/otn_software/linux/instantclient/193000/${srcFilename}";
+ fetcher = srcFilename: hash: fetchurl {
+ url = "https://download.oracle.com/otn_software/${shortArch}/instantclient/193000/${srcFilename}";
sha256 = hash;
};
- # pick the appropriate fetcher depending on the platform
- fetcher = if stdenv.hostPlatform.system == "x86_64-linux" then fetchSimple else fetchClickThrough;
-
# assemble srcs
srcs = map (component:
- (fetcher (srcFilename component arch version rels."${component}" or "") hashes."${component}" or ""))
+ (fetcher (srcFilename component arch version rels.${component} or "") hashes.${component} or ""))
components;
pname = "oracle-instantclient";
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index e58e347c7f3e..58f355b27fe1 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "BelledonneCommunications";
- repo = "${baseName}";
- rev = "${version}";
+ repo = baseName;
+ rev = version;
sha256 = "12cwv593bsdnxs0zfcp07vwyk7ghlz2wv7vdbs1ksv293w3vj2rv";
};
diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index ce917ccbe7f4..a243b5c0b516 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
sha256 = "0igic785fh458ck33kxb6i34l7bzdp9zpfjy5dxrcvv5gacklms0";
};
- name = "libosip2-${version}";
+ pname = "libosip2";
meta = {
license = stdenv.lib.licenses.lgpl21Plus;
diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix
index a1e7215fd9a2..14483a12f7ed 100644
--- a/pkgs/development/libraries/osm-gps-map/default.nix
+++ b/pkgs/development/libraries/osm-gps-map/default.nix
@@ -1,7 +1,7 @@
{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }:
stdenv.mkDerivation rec {
- name = "osm-gps-map-${version}";
+ pname = "osm-gps-map";
version = "1.1.0";
src = fetchzip {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- description = "Gtk+ widget for displaying OpenStreetMap tiles";
+ description = "GTK widget for displaying OpenStreetMap tiles";
homepage = https://nzjrs.github.io/osm-gps-map;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ hrdinka ];
diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix
index 47c6a27639d4..67c4e75c1e12 100644
--- a/pkgs/development/libraries/pagmo2/default.nix
+++ b/pkgs/development/libraries/pagmo2/default.nix
@@ -8,7 +8,7 @@
}:
stdenv.mkDerivation rec {
- name = "pagmo2-${version}";
+ pname = "pagmo2";
version = "2.9";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index b67db91ef642..0f84b382f4de 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, cairo, harfbuzz
+{ stdenv, fetchurl, fetchpatch, pkgconfig, cairo, harfbuzz
, libintl, gobject-introspection, darwin, fribidi, gnome3
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
, meson, ninja, glib
@@ -37,10 +37,10 @@ in stdenv.mkDerivation rec {
optional x11Support libXft;
patches = [
- (fetchurl {
+ (fetchpatch {
# Add gobject-2 to .pc file
url = "https://gitlab.gnome.org/GNOME/pango/commit/546f4c242d6f4fe312de3b7c918a848e5172e18d.patch";
- sha256 = "034na38cq98vk8gggn3yfr65jmv3jgig8d25zg89wydrandp14yr";
+ sha256 = "1cqhy4xbwx3ad7z5d1ks7smf038b9as8c6qy84rml44h0fgiq4m2";
})
];
@@ -70,8 +70,8 @@ in stdenv.mkDerivation rec {
Pango is a library for laying out and rendering of text, with an
emphasis on internationalization. Pango can be used anywhere
that text layout is needed, though most of the work on Pango so
- far has been done in the context of the GTK+ widget toolkit.
- Pango forms the core of text and font handling for GTK+-2.x.
+ far has been done in the context of the GTK widget toolkit.
+ Pango forms the core of text and font handling for GTK.
'';
homepage = https://www.pango.org/;
diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix
index 6fb123f50949..d788f1eff346 100644
--- a/pkgs/development/libraries/pangolin/default.nix
+++ b/pkgs/development/libraries/pangolin/default.nix
@@ -3,8 +3,8 @@
, Carbon ? null, Cocoa ? null
}:
-stdenv.mkDerivation rec {
- name = "pangolin-${version}";
+stdenv.mkDerivation {
+ pname = "pangolin";
version = "2017-08-02";
diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix
index 064ebf71cc32..6cb2c070c94f 100644
--- a/pkgs/development/libraries/pangomm/default.nix
+++ b/pkgs/development/libraries/pangomm/default.nix
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
Pango is a library for laying out and rendering of text, with an
emphasis on internationalization. Pango can be used anywhere
that text layout is needed, though most of the work on Pango so
- far has been done in the context of the GTK+ widget toolkit.
- Pango forms the core of text and font handling for GTK+-2.x.
+ far has been done in the context of the GTK widget toolkit.
+ Pango forms the core of text and font handling for GTK.
'';
};
}
diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix
index b45ed2966916..b08936dd34de 100644
--- a/pkgs/development/libraries/partio/default.nix
+++ b/pkgs/development/libraries/partio/default.nix
@@ -1,8 +1,7 @@
{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU_combined, zlib, swig, python, doxygen, xorg }:
-stdenv.mkDerivation rec
-{
- name = "partio-${version}";
+stdenv.mkDerivation {
+ pname = "partio";
version = "2018-03-01";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix
index 2050e5cdfe79..5a02229cb0e2 100644
--- a/pkgs/development/libraries/pcaudiolib/default.nix
+++ b/pkgs/development/libraries/pcaudiolib/default.nix
@@ -3,8 +3,8 @@
, portaudio, alsaLib
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
-stdenv.mkDerivation rec {
- name = "pcaudiolib-${version}";
+stdenv.mkDerivation {
+ pname = "pcaudiolib";
version = "2016-07-19";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix
index 654698c1b32d..58fbb26532e2 100644
--- a/pkgs/development/libraries/pcg-c/default.nix
+++ b/pkgs/development/libraries/pcg-c/default.nix
@@ -4,10 +4,10 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "0.94";
- name = "pcg-c-${version}";
+ pname = "pcg-c";
src = fetchzip {
- url = "http://www.pcg-random.org/downloads/${name}.zip";
+ url = "http://www.pcg-random.org/downloads/${pname}-${version}.zip";
sha256 = "0smm811xbvs03a5nc2668zd0178wnyri2h023pqffy767bpy1vlv";
};
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 6d2896ac3396..2e111240758d 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -13,7 +13,7 @@ let
else if (variant == "cpp") then "pcre-cpp"
else variant;
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index f080de82ddc2..e27c71314d97 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "pcre2-${version}";
+ pname = "pcre2";
version = "10.33";
src = fetchurl {
- url = "https://ftp.pcre.org/pub/pcre/${name}.tar.bz2";
+ url = "https://ftp.pcre.org/pub/pcre/${pname}-${version}.tar.bz2";
sha256 = "1anqi7vpbfzag7imccrc6di1zl5rl63ab7rfpmajpw6d1kzlsl9m";
};
diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix
index 4cc607345e8c..473fb3bfd482 100644
--- a/pkgs/development/libraries/phash/default.nix
+++ b/pkgs/development/libraries/phash/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, cimg, imagemagick }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "pHash";
version = "0.9.4";
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index 67f343d60380..ef7633dadaf3 100644
--- a/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -14,7 +14,7 @@ in
assert withQt5 -> qtbase != null;
assert withQt5 -> qtx11extras != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}";
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix
index 829ecdb86e06..98c6be85672c 100644
--- a/pkgs/development/libraries/phonon/backends/vlc.nix
+++ b/pkgs/development/libraries/phonon/backends/vlc.nix
@@ -15,7 +15,7 @@ assert withQt4 -> qt4 != null;
assert !withQt4 -> qtbase != null;
assert !withQt4 -> qtx11extras != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${if withQt4 then "qt4" else "qt5"}-${v}";
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 4d68d3718c0a..dc32c4ebfb05 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -6,7 +6,7 @@
with lib;
let
- v = "4.10.2";
+ v = "4.10.3";
soname = if withQt5 then "phonon4qt5" else "phonon";
buildsystemdir = "share/cmake/${soname}";
@@ -15,7 +15,7 @@ in
assert withQt5 -> qtbase != null;
assert withQt5 -> qttools != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "phonon-${if withQt5 then "qt5" else "qt4"}-${v}";
meta = {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz";
- sha256 = "02c8fyyvg5qb0lxwxmnxc5grkg6p3halakjf02vmwmvqaycb3v9l";
+ sha256 = "15f2vndpqfcivifzl1s07r0wkavpfrjln1p46cwfk85gd5b192rf";
};
buildInputs =
diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix
index 6edea7f51419..cf9e201b3f6a 100644
--- a/pkgs/development/libraries/physfs/default.nix
+++ b/pkgs/development/libraries/physfs/default.nix
@@ -4,10 +4,11 @@
let
generic = version: sha256:
stdenv.mkDerivation rec {
- name = "physfs-${version}";
+ pname = "physfs";
+ inherit version;
src = fetchurl {
- url = "${meta.homepage}/downloads/${name}.tar.bz2";
+ url = "${meta.homepage}/downloads/${pname}-${version}.tar.bz2";
inherit sha256;
};
diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix
index d542c6cf1d77..5302ad21258a 100644
--- a/pkgs/development/libraries/physics/apfel/default.nix
+++ b/pkgs/development/libraries/physics/apfel/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gfortran, lhapdf, python2 }:
stdenv.mkDerivation rec {
- name = "apfel-${version}";
+ pname = "apfel";
version = "3.0.4";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix
index 983523e1f2fb..2ba87024bc51 100644
--- a/pkgs/development/libraries/physics/apfelgrid/default.nix
+++ b/pkgs/development/libraries/physics/apfelgrid/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }:
stdenv.mkDerivation rec {
- name = "apfelgrid-${version}";
+ pname = "apfelgrid";
version = "1.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix
index 1ad5dcb8b25b..edda5148068a 100644
--- a/pkgs/development/libraries/physics/applgrid/default.nix
+++ b/pkgs/development/libraries/physics/applgrid/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }:
stdenv.mkDerivation rec {
- name = "applgrid-${version}";
+ pname = "applgrid";
version = "1.4.70";
src = fetchurl {
- url = "https://www.hepforge.org/archive/applgrid/${name}.tgz";
+ url = "https://www.hepforge.org/archive/applgrid/${pname}-${version}.tgz";
sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p";
};
diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix
index f01fab74635b..2a1846e40a64 100644
--- a/pkgs/development/libraries/physics/cernlib/default.nix
+++ b/pkgs/development/libraries/physics/cernlib/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2006";
- name = "cernlib-${version}";
+ pname = "cernlib";
src = fetchurl {
url = "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz";
diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix
index 3828cfda2aff..826362cc586b 100644
--- a/pkgs/development/libraries/physics/fastjet/default.nix
+++ b/pkgs/development/libraries/physics/fastjet/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, python2 }:
stdenv.mkDerivation rec {
- name = "fastjet-${version}";
+ pname = "fastjet";
version = "3.3.2";
src = fetchurl {
diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix
index e3291907d31f..5ef446319a8a 100644
--- a/pkgs/development/libraries/physics/fastnlo/default.nix
+++ b/pkgs/development/libraries/physics/fastnlo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }:
stdenv.mkDerivation rec {
- name = "fastnlo_toolkit-${version}";
+ pname = "fastnlo_toolkit";
version = "2.3.1pre-2402";
src = fetchurl {
- url = "https://fastnlo.hepforge.org/code/v23/${name}.tar.gz";
+ url = "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz";
sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl";
};
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 5f51c6a194c7..4ec117777857 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -35,9 +35,9 @@
, libXmu
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "10.4.1";
- name = "geant4-${version}";
+ pname = "geant4";
src = fetchurl{
url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix
index 0b1f3f0490d2..3d6891c48e2b 100644
--- a/pkgs/development/libraries/physics/geant4/g4py/default.nix
+++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix
@@ -14,9 +14,9 @@ let
boost_python = boost.override { enablePython = true; inherit python; };
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (geant4_nomt) version src;
- name = "g4py-${version}";
+ pname = "g4py";
sourceRoot = "geant4.10.04.p01/environments/g4py";
diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix
index d61a68ebe341..665cd417dc09 100644
--- a/pkgs/development/libraries/physics/hepmc2/default.nix
+++ b/pkgs/development/libraries/physics/hepmc2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
- name = "hepmc-${version}";
+ pname = "hepmc";
version = "2.06.10";
src = fetchurl {
diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix
index c4717800f70d..3116c4d36bba 100644
--- a/pkgs/development/libraries/physics/hepmc3/default.nix
+++ b/pkgs/development/libraries/physics/hepmc3/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, coreutils, root }:
stdenv.mkDerivation rec {
- name = "hepmc3-${version}";
+ pname = "hepmc3";
version = "3.1.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
index 7a146bb7309a..d252e62286b0 100644
--- a/pkgs/development/libraries/physics/herwig/default.nix
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }:
stdenv.mkDerivation rec {
- name = "herwig-${version}";
+ pname = "herwig";
version = "7.1.5";
src = fetchurl {
diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix
index 9c379f6a3474..9e68fbd3fc4d 100644
--- a/pkgs/development/libraries/physics/hoppet/default.nix
+++ b/pkgs/development/libraries/physics/hoppet/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gfortran, perl }:
stdenv.mkDerivation rec {
- name = "hoppet-${version}";
+ pname = "hoppet";
version = "1.2.0";
src = fetchurl {
- url = "https://hoppet.hepforge.org/downloads/${name}.tgz";
+ url = "https://hoppet.hepforge.org/downloads/${pname}-${version}.tgz";
sha256 = "0j7437rh4xxbfzmkjr22ry34xm266gijzj6mvrq193fcsfzipzdz";
};
diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index 3ad0b3dc4cc1..dff9fb1c1dd1 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, python2, makeWrapper }:
stdenv.mkDerivation rec {
- name = "lhapdf-${version}";
+ pname = "lhapdf";
version = "6.2.3";
src = fetchurl {
diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix
index b287e52b2431..74b4ba4224e7 100644
--- a/pkgs/development/libraries/physics/mcgrid/default.nix
+++ b/pkgs/development/libraries/physics/mcgrid/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fastnlo, rivet, pkgconfig }:
stdenv.mkDerivation rec {
- name = "mcgrid-${version}";
+ pname = "mcgrid";
version = "2.0.2";
src = fetchurl {
- url = "https://www.hepforge.org/archive/mcgrid/${name}.tar.gz";
+ url = "https://www.hepforge.org/archive/mcgrid/${pname}-${version}.tar.gz";
sha256 = "1mw82x7zqbdchnd6shj3dirsav5i2cndp2hjwb8a8xdh4xh9zvfy";
};
diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix
index a608a7f6b0f7..1518c23718aa 100644
--- a/pkgs/development/libraries/physics/mela/default.nix
+++ b/pkgs/development/libraries/physics/mela/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gfortran }:
stdenv.mkDerivation rec {
- name = "mela-${version}";
+ pname = "mela";
version = "2.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix
index 2f79a2b76ab9..20df49d9ae7f 100644
--- a/pkgs/development/libraries/physics/nlojet/default.nix
+++ b/pkgs/development/libraries/physics/nlojet/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "nlojet++-${version}";
+ pname = "nlojet++";
version = "4.1.3";
src = fetchurl {
diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix
index e6b351c206df..0398175a9a28 100644
--- a/pkgs/development/libraries/physics/pythia/default.nix
+++ b/pkgs/development/libraries/physics/pythia/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, boost, fastjet, hepmc2, lhapdf, rsync, zlib }:
stdenv.mkDerivation rec {
- name = "pythia-${version}";
+ pname = "pythia";
version = "8.243";
src = fetchurl {
diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix
index 620f227250dd..ad5f994620ff 100644
--- a/pkgs/development/libraries/physics/qcdnum/default.nix
+++ b/pkgs/development/libraries/physics/qcdnum/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, gfortran }:
stdenv.mkDerivation rec {
- name = "QCDNUM-${version}";
+ pname = "QCDNUM";
version = "17-01-13";
src = fetchurl {
diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index c068424e416e..914eee5c286b 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc2, imagemagick, less, python2, texlive, yoda, which, makeWrapper }:
stdenv.mkDerivation rec {
- name = "rivet-${version}";
+ pname = "rivet";
version = "2.7.2";
src = fetchurl {
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix
index 272761977bae..fa293eab3500 100644
--- a/pkgs/development/libraries/physics/thepeg/default.nix
+++ b/pkgs/development/libraries/physics/thepeg/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }:
stdenv.mkDerivation rec {
- name = "thepeg-${version}";
+ pname = "thepeg";
version = "2.1.5";
src = fetchurl {
diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index 08afe6d64522..c6c6f742d0bf 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }:
stdenv.mkDerivation rec {
- name = "yoda-${version}";
+ pname = "yoda";
version = "1.7.7";
src = fetchurl {
diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index d3bbb8679746..1f9996ec2134 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpng, glib /*just passthru*/ }:
stdenv.mkDerivation rec {
- name = "pixman-${version}";
+ pname = "pixman";
version = "0.38.4";
src = fetchurl {
- url = "mirror://xorg/individual/lib/${name}.tar.bz2";
+ url = "mirror://xorg/individual/lib/${pname}-${version}.tar.bz2";
sha256 = "0l0m48lnmdlmnaxn2021qi5cj366d9fzfjxkqgcj9bs14pxbgaw4";
};
diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix
index 5cf5d34b9aff..ce511544a42d 100644
--- a/pkgs/development/libraries/pkcs11helper/default.nix
+++ b/pkgs/development/libraries/pkcs11helper/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "pkcs11-helper-${version}";
+ pname = "pkcs11-helper";
version = "1.25.1";
src = fetchFromGitHub {
owner = "OpenSC";
repo = "pkcs11-helper";
- rev = "${name}";
+ rev = "${pname}-${version}";
sha256 = "1nvj6kdbps860kw64m2rz3v2slyn7jkagfdmskrl6966n99iy2ns";
};
diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix
index ceb49fc01538..e945154c0034 100644
--- a/pkgs/development/libraries/pmdk/default.nix
+++ b/pkgs/development/libraries/pmdk/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "pmdk-${version}";
+ pname = "pmdk";
version = "1.6";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix
index 3f6a609121a1..8509468f59a2 100644
--- a/pkgs/development/libraries/png++/default.nix
+++ b/pkgs/development/libraries/png++/default.nix
@@ -4,7 +4,7 @@
assert docSupport -> doxygen != null;
stdenv.mkDerivation rec {
- name = "pngpp-${version}";
+ pname = "pngpp";
version = "0.2.10";
src = fetchurl {
diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
index e766657c19a4..c19e343f19ae 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/pkgs/development/libraries/poco/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }:
stdenv.mkDerivation rec {
- name = "poco-${version}";
+ pname = "poco";
version = "1.9.2";
src = fetchurl {
- url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz";
+ url = "https://pocoproject.org/releases/${pname}-${version}/${pname}-${version}-all.tar.gz";
sha256 = "0jkbxw6z8l7zpr7bh2xcyzk8a5apzyz4ranhl66gxna1ay0gpzvd";
};
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 722c1cae8721..809159b8c2f1 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -4,10 +4,10 @@
stdenv.mkDerivation rec {
version = "0.9.6";
- name = "podofo-${version}";
+ pname = "podofo";
src = fetchurl {
- url = "mirror://sourceforge/podofo/${name}.tar.gz";
+ url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz";
sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9";
};
diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index 89248597f5d9..92b56467aee9 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, alsaLib, pkgconfig, libjack2
, AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "portaudio-190600-20161030";
src = fetchurl {
diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix
index f790c62f5af2..37958038601c 100644
--- a/pkgs/development/libraries/portmidi/default.nix
+++ b/pkgs/development/libraries/portmidi/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }:
stdenv.mkDerivation rec {
- name = "portmidi-${version}";
+ pname = "portmidi";
version = "217";
src = fetchurl {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
];
# XXX: This is to deactivate Java support.
- patches = stdenv.lib.singleton (fetchurl rec {
+ patches = stdenv.lib.singleton (fetchurl {
url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/"
+ "portmidi/files/portmidi-217-cmake-libdir-java-opts.patch";
sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h";
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index 566d88dcdb56..7839547ee928 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -2,8 +2,9 @@
let version = "1.2"; in
-stdenv.mkDerivation rec {
- name = "ppl-${version}";
+stdenv.mkDerivation {
+ pname = "ppl";
+ inherit version;
src = fetchurl {
url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index a98521a2d1ee..01f74bc48eb7 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -6,8 +6,9 @@
}:
let
-mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
- name = "protobuf-${version}";
+mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation {
+ pname = "protobuf";
+ inherit version;
# make sure you test also -A pythonPackages.protobuf
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 1a20d806b968..3c08537db0b6 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -3,8 +3,9 @@
, ...
}:
-stdenv.mkDerivation rec {
- name = "protobuf-${version}";
+stdenv.mkDerivation {
+ pname = "protobuf";
+ inherit version;
inherit src;
diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix
index c3a815c45ac8..304f9d61f397 100644
--- a/pkgs/development/libraries/protobufc/1.3.nix
+++ b/pkgs/development/libraries/protobufc/1.3.nix
@@ -1,6 +1,6 @@
{ callPackage, fetchFromGitHub, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.3.1";
src = fetchFromGitHub {
owner = "protobuf-c";
diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix
index e0c5d4db9305..838fa7de8261 100644
--- a/pkgs/development/libraries/protobufc/generic.nix
+++ b/pkgs/development/libraries/protobufc/generic.nix
@@ -3,8 +3,9 @@
, ...
}:
-stdenv.mkDerivation rec {
- name = "protobuf-c-${version}";
+stdenv.mkDerivation {
+ pname = "protobuf-c";
+ inherit version;
inherit src;
diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix
index 25e0f14d026b..0bbfab62fcd8 100644
--- a/pkgs/development/libraries/protozero/default.nix
+++ b/pkgs/development/libraries/protozero/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "protozero-${version}";
+ pname = "protozero";
version = "1.6.8";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix
index 74c6e8ef1b30..d18251715961 100644
--- a/pkgs/development/libraries/pugixml/default.nix
+++ b/pkgs/development/libraries/pugixml/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }:
stdenv.mkDerivation rec {
- name = "pugixml-${version}";
+ pname = "pugixml";
version = "1.9";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index b5a01698e5e9..66a395801b27 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -1,7 +1,7 @@
{ fetchFromGitHub, stdenv, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "libupnp-${version}";
+ pname = "libupnp";
version = "1.8.4";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/pybind11/default.nix b/pkgs/development/libraries/pybind11/default.nix
index aa1f8d10ba97..7dfbdc4d64a0 100644
--- a/pkgs/development/libraries/pybind11/default.nix
+++ b/pkgs/development/libraries/pybind11/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchFromGitHub, cmake, catch, python, eigen }:
stdenv.mkDerivation rec {
- name = "pybind-${version}";
+ pname = "pybind";
version = "2.2.4";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix
index 4b5b7ace074b..2b630de14b26 100644
--- a/pkgs/development/libraries/python-qt/default.nix
+++ b/pkgs/development/libraries/python-qt/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "3.2";
- name = "python-qt-${version}";
+ pname = "python-qt";
src = fetchurl {
url="mirror://sourceforge/pythonqt/PythonQt${version}.zip";
diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix
index 885b7b378cc3..19b11a60e7b6 100644
--- a/pkgs/development/libraries/qca2/default.nix
+++ b/pkgs/development/libraries/qca2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, openssl_1_0_2, cmake, pkgconfig, qt, darwin }:
stdenv.mkDerivation rec {
- name = "qca-${version}";
+ pname = "qca";
version = "2.1.3";
src = fetchurl {
diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix
index 596dc543e335..92f927ee3985 100644
--- a/pkgs/development/libraries/qhull/default.nix
+++ b/pkgs/development/libraries/qhull/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "qhull-2016.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index a7077c69dd8d..6d84e6091270 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "0.9.0";
- name = "qjson-${version}";
+ pname = "qjson";
src = fetchFromGitHub {
owner = "flavio";
repo = "qjson";
- rev = "${version}";
+ rev = version;
sha256 = "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs";
};
diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix
index 083e0a51b813..03247f9d695b 100644
--- a/pkgs/development/libraries/qmlbox2d/default.nix
+++ b/pkgs/development/libraries/qmlbox2d/default.nix
@@ -1,5 +1,5 @@
{stdenv, qtdeclarative, fetchFromGitHub, qmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "qml-box2d-2018-04-06";
src = fetchFromGitHub {
owner = "qml-box2d";
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index ba62324d586e..b156a1cbf992 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2018-11-24";
- name = "qmltermwidget-unstable-${version}";
+ pname = "qmltermwidget-unstable";
src = fetchFromGitHub {
repo = "qmltermwidget";
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 5bccbf74965a..789a63bef74d 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -3,10 +3,11 @@
let version = "8.4.2";
in
stdenv.mkDerivation rec {
- name = "qpdf-${version}";
+ pname = "qpdf";
+ inherit version;
src = fetchurl {
- url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/qpdf/qpdf/${version}/${pname}-${version}.tar.gz";
sha256 = "1hrys6zmia8fw6f6ih3ckgsc1jr12fizdwaiy7dyd64kxxjhm8v9";
};
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 8c1c76db8f47..b5a10e8f11a7 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
prePatch = ''
substituteInPlace configure --replace /bin/pwd pwd
substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
+ substituteInPlace src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp \
+ --replace 'asm volatile' 'asm'
sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf
'' + lib.optionalString stdenv.isDarwin ''
# remove impure reference to /usr/lib/libstdc++.6.dylib
diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix
index 7f0937db30f0..296db2eab2db 100644
--- a/pkgs/development/libraries/qt-5/5.11/default.nix
+++ b/pkgs/development/libraries/qt-5/5.11/default.nix
@@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
{
newScope,
- stdenv, fetchurl, fetchFromGitHub, makeSetupHook, makeWrapper,
+ stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeSetupHook, makeWrapper,
bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf,
llvmPackages_5,
@@ -55,7 +55,15 @@ let
./qtbase-fixguicmake.patch
];
qtdeclarative = [ ./qtdeclarative.patch ];
- qtscript = [ ./qtscript.patch ];
+ qtscript = [
+ ./qtscript.patch
+ # needed due to changes in gcc 8.3, see https://bugreports.qt.io/browse/QTBUG-74196
+ # fixed in qtscript 5.12.2
+ (fetchpatch {
+ url = "https://github.com/qt/qtscript/commit/97ec1d1882a83c23c91f0f7daea48e05858d8c32.diff";
+ sha256 = "0khrapq13xzvxckzc9l7gqyjwibyd98vyqy6gmyhvsbm2kq8n6wi";
+ })
+ ];
qtserialport = [ ./qtserialport.patch ];
qttools = [ ./qttools.patch ];
qtwebengine = [
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index 1bc63d0e2b9d..7b4addd91617 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -59,7 +59,6 @@ let
qtserialport = [ ./qtserialport.patch ];
qtwebengine = [
./qtwebengine-no-build-skip.patch
- ./qtwebengine-CVE-2019-5786.patch
]
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
qtwebkit = [ ./qtwebkit.patch ]
diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh
index aa3a0fe94898..a4d2fc82ff2d 100644
--- a/pkgs/development/libraries/qt-5/5.12/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ )
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/ )
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch
index aa987acbe92e..87ed0ddc4d4c 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch
@@ -1,8 +1,7 @@
-diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
-index 61bea952b2..9909dae726 100644
---- a/mkspecs/common/mac.conf
-+++ b/mkspecs/common/mac.conf
-@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf 2019-07-10 09:35:08.917628566 -0500
+@@ -24,7 +24,7 @@
QMAKE_FIX_RPATH = install_name_tool -id
@@ -11,11 +10,10 @@ index 61bea952b2..9909dae726 100644
QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip
QMAKE_LFLAGS_REL_RPATH =
-diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 2ed708e085..05e60ff45f 100644
---- a/mkspecs/features/create_cmake.prf
-+++ b/mkspecs/features/create_cmake.prf
-@@ -21,7 +21,7 @@ load(cmake_functions)
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf 2019-07-10 09:35:08.917628566 -0500
+@@ -21,7 +21,7 @@
# at cmake time whether package has been found via a symlink, and correct
# that to an absolute path. This is only done for installations to
# the /usr or / prefix.
@@ -24,7 +22,7 @@ index 2ed708e085..05e60ff45f 100644
contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR
CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake
-@@ -51,45 +51,20 @@ split_incpath {
+@@ -51,45 +51,20 @@
$$cmake_extra_source_includes.output
}
@@ -81,7 +79,7 @@ index 2ed708e085..05e60ff45f 100644
static|staticlib:CMAKE_STATIC_TYPE = true
-@@ -169,7 +144,7 @@ contains(CONFIG, plugin) {
+@@ -169,7 +144,7 @@
cmake_target_file
cmake_qt5_plugin_file.files = $$cmake_target_file.output
@@ -90,7 +88,7 @@ index 2ed708e085..05e60ff45f 100644
INSTALLS += cmake_qt5_plugin_file
return()
-@@ -316,7 +291,7 @@ exists($$cmake_macros_file.input) {
+@@ -318,7 +293,7 @@
cmake_qt5_module_files.files += $$cmake_macros_file.output
}
@@ -99,11 +97,10 @@ index 2ed708e085..05e60ff45f 100644
# We are generating cmake files. Most developers of Qt are not aware of cmake,
# so we require automatic tests to be available. The only module which should
-diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 3ed6dd5889..4c7c8da21a 100644
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-07-10 09:35:08.917628566 -0500
+@@ -3,30 +3,6 @@
message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
endif()
@@ -134,7 +131,7 @@ index 3ed6dd5889..4c7c8da21a 100644
!!IF !equals(TEMPLATE, aux)
# For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)")
-@@ -52,11 +28,7 @@ endmacro()
+@@ -52,11 +28,7 @@
macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION)
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
@@ -146,7 +143,7 @@ index 3ed6dd5889..4c7c8da21a 100644
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
\"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
-@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -69,11 +41,7 @@
)
!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
@@ -158,7 +155,7 @@ index 3ed6dd5889..4c7c8da21a 100644
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
-@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -89,24 +57,13 @@
!!IF !no_module_headers
!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
@@ -187,7 +184,7 @@ index 3ed6dd5889..4c7c8da21a 100644
)
!!ELSE
set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
-@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -122,7 +79,6 @@
set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
!!ENDIF
!!ENDIF
@@ -195,7 +192,7 @@ index 3ed6dd5889..4c7c8da21a 100644
!!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
!!ENDIF
-@@ -272,25 +228,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -272,25 +228,13 @@
!!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
!!IF isEmpty(CMAKE_DEBUG_TYPE)
!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -221,7 +218,7 @@ index 3ed6dd5889..4c7c8da21a 100644
_populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
endif()
-@@ -309,25 +253,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -309,25 +253,13 @@
!!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
!!IF isEmpty(CMAKE_RELEASE_TYPE)
!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -247,7 +244,7 @@ index 3ed6dd5889..4c7c8da21a 100644
_populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
endif()
-@@ -346,11 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -346,11 +278,7 @@
macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
@@ -259,19 +256,17 @@ index 3ed6dd5889..4c7c8da21a 100644
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
set_target_properties(Qt5::${Plugin} PROPERTIES
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
-diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
-index 99f68b78f5..dde69cb7c2 100644
---- a/mkspecs/features/mac/default_post.prf
-+++ b/mkspecs/features/mac/default_post.prf
-@@ -63,199 +63,3 @@ qt {
- }
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf 2019-07-10 09:35:08.917628566 -0500
+@@ -64,202 +64,6 @@
}
}
--
+
-# Add the same default rpaths as Xcode does for new projects.
-# This is especially important for iOS/tvOS/watchOS where no other option is possible.
-!no_default_rpath {
-- QMAKE_RPATHDIR += @executable_path/Frameworks
+- QMAKE_RPATHDIR += @executable_path/../Frameworks
- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks
-}
-
@@ -463,10 +458,13 @@ index 99f68b78f5..dde69cb7c2 100644
- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier}
-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}"
-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting
-diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
-index e3534561a5..3b01424e67 100644
---- a/mkspecs/features/mac/default_pre.prf
-+++ b/mkspecs/features/mac/default_pre.prf
+-
+ !macx-xcode {
+ generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode $(EXPORT__PRO_FILE_)
+ generate_xcode_project.target = xcodeproj
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf 2019-07-10 09:35:08.917628566 -0500
@@ -1,60 +1,2 @@
CONFIG = asset_catalogs rez $$CONFIG
load(default_pre)
@@ -528,11 +526,10 @@ index e3534561a5..3b01424e67 100644
-xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP
-xcode_copy_phase_strip_setting.value = NO
-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
-diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
-index 8360dd8b38..8b13789179 100644
---- a/mkspecs/features/mac/sdk.prf
-+++ b/mkspecs/features/mac/sdk.prf
-@@ -1,58 +1 @@
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf 2019-07-10 09:35:08.917628566 -0500
+@@ -1,54 +1 @@
-isEmpty(QMAKE_MAC_SDK): \
- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")
@@ -568,10 +565,6 @@ index 8360dd8b38..8b13789179 100644
-QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath)
-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)
-
--sysrootified =
--for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val
--QMAKE_INCDIR_OPENGL = $$sysrootified
--
-QMAKESPEC_NAME = $$basename(QMAKESPEC)
-
-# Resolve SDK version of various tools
@@ -591,37 +584,34 @@ index 8360dd8b38..8b13789179 100644
- $$tool = $$sysrooted $$member(value, 1, -1)
- cache($$tool_variable, set stash, $$tool)
-}
-diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
-index 65212b2abf..accd4c07f0 100644
---- a/mkspecs/features/qml_module.prf
-+++ b/mkspecs/features/qml_module.prf
-@@ -52,7 +52,7 @@ qmldir.base = $$_PRO_FILE_PWD_
- # Tools need qmldir and plugins.qmltypes always installed on the file system
- qmldir.files = $$qmldir_file $$fq_aux_qml_files
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf 2019-07-10 09:35:08.917628566 -0500
+@@ -54,7 +54,7 @@
+
+ qmldir.files = $$qmldir_file
install_qml_files: qmldir.files += $$fq_qml_files
--qmldir.path = $$instbase/$$TARGETPATH
+-qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH
+qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH
INSTALLS += qmldir
- !debug_and_release|!build_all|CONFIG(release, debug|release) {
-diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
-index cd6377dcc6..e98bf98151 100644
---- a/mkspecs/features/qml_plugin.prf
-+++ b/mkspecs/features/qml_plugin.prf
-@@ -56,7 +56,7 @@ qml1_target {
- instbase = $$[QT_INSTALL_QML]
- }
+ qmlfiles.base = $$_PRO_FILE_PWD_
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf 2019-07-10 09:35:08.918628595 -0500
+@@ -50,7 +50,7 @@
--target.path = $$instbase/$$TARGETPATH
+ DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
+
+-target.path = $$[QT_INSTALL_QML]/$$TARGETPATH
+target.path = $$NIX_OUTPUT_QML/$$TARGETPATH
INSTALLS += target
# Some final setup
-diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf
-index 8354f30eea..62028fef8e 100644
---- a/mkspecs/features/qt_app.prf
-+++ b/mkspecs/features/qt_app.prf
-@@ -30,7 +30,7 @@ host_build:force_bootstrap {
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf 2019-07-10 09:35:08.918628595 -0500
+@@ -30,7 +30,7 @@
target.path = $$[QT_HOST_BINS]
} else {
!build_pass:qtConfig(debug_and_release): CONFIG += release
@@ -630,11 +620,10 @@ index 8354f30eea..62028fef8e 100644
CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable
}
INSTALLS += target
-diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf
-index 3bb3823a8e..655b7b7db8 100644
---- a/mkspecs/features/qt_build_paths.prf
-+++ b/mkspecs/features/qt_build_paths.prf
-@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf 2019-07-10 09:35:08.918628595 -0500
+@@ -24,6 +24,6 @@
!force_independent {
# If the module is not built independently, everything ends up in qtbase.
# This is the case in non-prefix builds, except for selected modules.
@@ -643,11 +632,10 @@ index 3bb3823a8e..655b7b7db8 100644
+ MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT
+ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT
}
-diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
-index 4ad9946ae0..6d66f29c26 100644
---- a/mkspecs/features/qt_common.prf
-+++ b/mkspecs/features/qt_common.prf
-@@ -34,8 +34,8 @@ contains(TEMPLATE, .*lib) {
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf 2019-07-10 09:35:08.918628595 -0500
+@@ -34,8 +34,8 @@
qqt_libdir = \$\$\$\$[QT_HOST_LIBS]
qt_libdir = $$[QT_HOST_LIBS]
} else {
@@ -658,11 +646,10 @@ index 4ad9946ae0..6d66f29c26 100644
}
contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) {
lib_replace.match = "[^ ']*$$rplbase/lib"
-diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
-index 3139c443c6..1b4f2fddd8 100644
---- a/mkspecs/features/qt_docs.prf
-+++ b/mkspecs/features/qt_docs.prf
-@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf 2019-07-10 09:35:08.918628595 -0500
+@@ -45,7 +45,7 @@
QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR)
!build_online_docs: \
@@ -671,7 +658,7 @@ index 3139c443c6..1b4f2fddd8 100644
PREP_DOC_INDEXES =
DOC_INDEXES =
!isEmpty(QTREPOS) {
-@@ -64,8 +64,8 @@ DOC_INDEXES =
+@@ -64,8 +64,8 @@
DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc)
} else {
prepare_docs: \
@@ -682,7 +669,7 @@ index 3139c443c6..1b4f2fddd8 100644
}
qtattributionsscanner.target = qtattributionsscanner
-@@ -88,12 +88,12 @@ prepare_docs {
+@@ -88,12 +88,12 @@
qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch)
inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR
@@ -697,11 +684,10 @@ index 3139c443c6..1b4f2fddd8 100644
inst_qch_docs.CONFIG += no_check_exist no_default_install no_build
INSTALLS += inst_qch_docs
-diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
-index 43b58817fe..e635b8f67a 100644
---- a/mkspecs/features/qt_example_installs.prf
-+++ b/mkspecs/features/qt_example_installs.prf
-@@ -88,7 +88,7 @@ sourcefiles += \
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf 2019-07-10 09:35:08.918628595 -0500
+@@ -88,7 +88,7 @@
$$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \
$$DBUS_ADAPTORS $$DBUS_INTERFACES
addInstallFiles(sources.files, $$sourcefiles)
@@ -710,11 +696,10 @@ index 43b58817fe..e635b8f67a 100644
INSTALLS += sources
check_examples {
-diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 1903e509c8..ae7b585989 100644
---- a/mkspecs/features/qt_functions.prf
-+++ b/mkspecs/features/qt_functions.prf
-@@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf 2019-07-10 09:35:08.918628595 -0500
+@@ -69,7 +69,7 @@
defineTest(qtPrepareTool) {
cmd = $$eval(QT_TOOL.$${2}.binary)
isEmpty(cmd) {
@@ -723,10 +708,9 @@ index 1903e509c8..ae7b585989 100644
exists($${cmd}.pl) {
$${1}_EXE = $${cmd}.pl
cmd = perl -w $$system_path($${cmd}.pl)
-diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
-index 8f98987b99..21b3bb8b32 100644
---- a/mkspecs/features/qt_installs.prf
-+++ b/mkspecs/features/qt_installs.prf
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf 2019-07-10 09:35:08.918628595 -0500
@@ -12,16 +12,10 @@
#library
!qt_no_install_library {
@@ -746,7 +730,7 @@ index 8f98987b99..21b3bb8b32 100644
!static: target.CONFIG = no_dll
INSTALLS += target
}
-@@ -29,33 +23,33 @@
+@@ -29,35 +23,35 @@
#headers
qt_install_headers {
gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES
@@ -762,6 +746,8 @@ index 8f98987b99..21b3bb8b32 100644
private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES
- private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
+ private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
+ generated_privates: \
+ private_headers.CONFIG += no_check_exist
INSTALLS += private_headers
qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES
@@ -786,11 +772,10 @@ index 8f98987b99..21b3bb8b32 100644
privpritarget.files = $$MODULE_PRIVATE_PRI
INSTALLS += privpritarget
}
-diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
-index 40528a65e2..903f795284 100644
---- a/mkspecs/features/qt_plugin.prf
-+++ b/mkspecs/features/qt_plugin.prf
-@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build {
+diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf
+--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf 2019-07-10 09:35:08.918628595 -0500
+@@ -88,7 +88,7 @@
}
}
@@ -799,84 +784,10 @@ index 40528a65e2..903f795284 100644
INSTALLS += target
TARGET = $$qt5LibraryTarget($$TARGET)
-diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index e0652fdcf9..450b2a2d28 100644
---- a/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
- add_executable(Qt5::qmake IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)
- add_executable(Qt5::moc IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc)
- add_executable(Qt5::rcc IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain)
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
- set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
-+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ELSE
- set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ENDIF
-@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain)
- set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
-+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ELSE
- set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ENDIF
-diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-index c357237d0e..6f0c75de3c 100644
---- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-@@ -1,6 +1,6 @@
-
- !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-index 706304cf34..546420f6ad 100644
---- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-@@ -1,6 +1,6 @@
-
- !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
-index 463e30e1c3..0e1ab669e4 100644
---- a/src/corelib/kernel/qcoreapplication.cpp
-+++ b/src/corelib/kernel/qcoreapplication.cpp
-@@ -2665,6 +2665,15 @@ QStringList QCoreApplication::libraryPaths()
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp 2019-07-10 09:35:08.919628625 -0500
+@@ -2668,6 +2668,15 @@
QStringList *app_libpaths = new QStringList;
coreappdata()->app_libpaths.reset(app_libpaths);
@@ -889,14 +800,117 @@ index 463e30e1c3..0e1ab669e4 100644
+ }
+ }
+
- const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
+ QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH");
if (!libPathEnv.isEmpty()) {
- QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
-diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp
-index bed62a02bd..73158993f7 100644
---- a/src/corelib/tools/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp
-@@ -70,7 +70,11 @@ typedef QHash QTzTimeZoneHash;
+ QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts);
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h 2019-07-10 09:35:08.920628655 -0500
+@@ -212,7 +212,7 @@
+
+ // --------------------------------------------------------------------------
+
+-#if !defined(QT_BOOTSTRAPPED)
++#if 0
+
+ QT_END_NAMESPACE
+ #include
+@@ -290,7 +290,19 @@
+
+ #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter();
+
+-#endif // !defined(QT_BOOTSTRAPPED)
++#else // !defined(QT_BOOTSTRAPPED)
++
++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...)
++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...)
++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...)
++
++#define QT_APPLE_LOG_ACTIVITY2(...)
++#define QT_APPLE_LOG_ACTIVITY1(...)
++#define QT_APPLE_LOG_ACTIVITY(...)
++
++#define QT_APPLE_SCOPED_LOG_ACTIVITY(...)
++
++#endif
+
+ // -------------------------------------------------------------------------
+
+Only in qtbase-everywhere-src-5.12.3-b/src/corelib/kernel: qcore_mac_p.h.orig
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-07-10 09:35:08.918628595 -0500
+@@ -3,7 +3,7 @@
+ add_executable(Qt5::qmake IMPORTED)
+
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+ set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -18,7 +18,7 @@
+ add_executable(Qt5::moc IMPORTED)
+
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+ set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -35,7 +35,7 @@
+ add_executable(Qt5::rcc IMPORTED)
+
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+ set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+@@ -116,7 +116,7 @@
+ !!IF !isEmpty(CMAKE_RELEASE_TYPE)
+ set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
+ !!ELSE
+ set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
+ !!ENDIF
+@@ -130,7 +130,7 @@
+ set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+
+ !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
+ !!ELSE
+ set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
+ !!ENDIF
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-07-10 09:35:08.918628595 -0500
+@@ -1,6 +1,6 @@
+
+ !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
+-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
+ !!ELSE
+ set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
+ !!ENDIF
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-07-10 09:35:08.918628595 -0500
+@@ -1,6 +1,6 @@
+
+ !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
+-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
+ !!ELSE
+ set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
+ !!ENDIF
+diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-07-10 09:35:08.919628625 -0500
+@@ -70,7 +70,11 @@
// Parse zone.tab table, assume lists all installed zones, if not will need to read directories
static QTzTimeZoneHash loadTzTimeZones()
{
@@ -909,7 +923,7 @@ index bed62a02bd..73158993f7 100644
if (!QFile::exists(path))
path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
-@@ -644,12 +648,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
+@@ -644,12 +648,16 @@
if (!tzif.open(QIODevice::ReadOnly))
return;
} else {
@@ -931,10 +945,9 @@ index bed62a02bd..73158993f7 100644
}
}
-diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
-index 1d947159e2..b36865fc48 100644
---- a/src/dbus/Qt5DBusConfigExtras.cmake.in
-+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
+diff -aur qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500
@@ -2,11 +2,7 @@
if (NOT TARGET Qt5::qdbuscpp2xml)
add_executable(Qt5::qdbuscpp2xml IMPORTED)
@@ -948,7 +961,7 @@ index 1d947159e2..b36865fc48 100644
_qt5_DBus_check_file_exists(${imported_location})
set_target_properties(Qt5::qdbuscpp2xml PROPERTIES
-@@ -17,11 +13,7 @@ endif()
+@@ -17,11 +13,7 @@
if (NOT TARGET Qt5::qdbusxml2cpp)
add_executable(Qt5::qdbusxml2cpp IMPORTED)
@@ -961,10 +974,9 @@ index 1d947159e2..b36865fc48 100644
_qt5_DBus_check_file_exists(${imported_location})
set_target_properties(Qt5::qdbusxml2cpp PROPERTIES
-diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 07869efd7d..fb4183bada 100644
---- a/src/gui/Qt5GuiConfigExtras.cmake.in
-+++ b/src/gui/Qt5GuiConfigExtras.cmake.in
+diff -aur qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500
@@ -2,7 +2,7 @@
!!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
@@ -974,7 +986,7 @@ index 07869efd7d..fb4183bada 100644
!!ELSE
set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
!!ENDIF
-@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO
+@@ -17,13 +17,13 @@
set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
@@ -990,11 +1002,10 @@ index 07869efd7d..fb4183bada 100644
!!ELSE
set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
!!ENDIF
-diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-index b5a0a5bbeb..6c20305f4d 100644
---- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations()
+diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-07-10 09:35:08.919628625 -0500
+@@ -265,12 +265,9 @@
m_possibleLocations.reserve(7);
if (qEnvironmentVariableIsSet("QTCOMPOSE"))
m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
@@ -1008,11 +1019,10 @@ index b5a0a5bbeb..6c20305f4d 100644
}
QString TableGenerator::findComposeFile()
-diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
-index 57629ac03a..8a7f219a98 100644
---- a/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -316,10 +316,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
+diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-07-10 09:35:08.919628625 -0500
+@@ -317,10 +317,10 @@
#if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
static bool function_ptrs_not_initialized = true;
if (function_ptrs_not_initialized) {
@@ -1025,10 +1035,10 @@ index 57629ac03a..8a7f219a98 100644
xcursorFound = xcursorLib.load();
}
if (xcursorFound) {
-diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp
-index fb1c425d8e..bb8bab9795 100644
---- a/src/plugins/platformthemes/gtk3/main.cpp
-+++ b/src/plugins/platformthemes/gtk3/main.cpp
+Only in qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb: qxcbcursor.cpp.orig
+diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp 2019-07-10 09:35:08.919628625 -0500
@@ -39,6 +39,7 @@
#include
@@ -1037,7 +1047,7 @@ index fb1c425d8e..bb8bab9795 100644
QT_BEGIN_NAMESPACE
-@@ -54,8 +55,22 @@ public:
+@@ -54,8 +55,22 @@
QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms)
{
Q_UNUSED(params);
@@ -1061,10 +1071,21 @@ index fb1c425d8e..bb8bab9795 100644
return 0;
}
-diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h
-index 6498ea84ef..d821ced7fc 100644
---- a/src/testlib/qtestassert.h
-+++ b/src/testlib/qtestassert.h
+diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp
+--- qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp 2019-07-10 09:35:08.920628655 -0500
+@@ -43,7 +43,7 @@
+
+ QT_BEGIN_NAMESPACE
+
+-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
+
+ using namespace QTestPrivate;
+
+diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h
+--- qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h 2019-07-10 09:35:08.919628625 -0500
@@ -44,10 +44,13 @@
QT_BEGIN_NAMESPACE
@@ -1081,11 +1102,10 @@ index 6498ea84ef..d821ced7fc 100644
QT_END_NAMESPACE
-diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-index 99d87e2e46..a4eab2aa72 100644
---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
+diff -aur qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+--- qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500
++++ qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500
+@@ -3,7 +3,7 @@
add_executable(Qt5::uic IMPORTED)
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
@@ -1094,63 +1114,33 @@ index 99d87e2e46..a4eab2aa72 100644
!!ELSE
set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
!!ENDIF
-diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
-index b14a494296..779c4eda95 100644
---- a/src/corelib/kernel/qcore_mac_p.h
-+++ b/src/corelib/kernel/qcore_mac_p.h
-@@ -211,7 +211,7 @@ private:
-
- // --------------------------------------------------------------------------
-
--#if !defined(QT_BOOTSTRAPPED)
-+#if 0
-
- QT_END_NAMESPACE
- #include
-@@ -289,7 +289,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current);
-
- #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter();
-
--#endif // !defined(QT_BOOTSTRAPPED)
-+#else // !defined(QT_BOOTSTRAPPED)
-+
-+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...)
-+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...)
-+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...)
-+
-+#define QT_APPLE_LOG_ACTIVITY2(...)
-+#define QT_APPLE_LOG_ACTIVITY1(...)
-+#define QT_APPLE_LOG_ACTIVITY(...)
-+
-+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...)
-+
-+#endif
-
- // -------------------------------------------------------------------------
-
-diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp
-index 2c1005ad80..244147ea7d 100644
---- a/src/testlib/qappletestlogger.cpp
-+++ b/src/testlib/qappletestlogger.cpp
-@@ -43,7 +43,7 @@
-
- QT_BEGIN_NAMESPACE
-
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
-
- using namespace QTestPrivate;
-
-diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
-index 1268730cc6..a50e9b0764 100644
---- a/src/testlib/qtestlog.cpp
-+++ b/src/testlib/qtestlog.cpp
-@@ -524,7 +524,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename)
- #endif
- }
-
--#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
-+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
- // Logger that also feeds messages to AUL. It needs to wrap the existing
- // logger, as it needs to be able to short circuit the existing logger
- // in case AUL prints to stderr.
+diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
+index c40f58c987..e69de29bb2 100644
+--- a/mkspecs/features/mac/sdk.mk
++++ b/mkspecs/features/mac/sdk.mk
+@@ -1,25 +0,0 @@
+-
+-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
+- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1
+- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND))
+- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
+- # We don't want to complain about out of date SDK unless the target needs to be remade.
+- # This covers use-cases such as running 'make check' after moving the build to a
+- # computer without Xcode or with a different Xcode version.
+- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0)
+- ifeq ($(TARGET_UP_TO_DATE),0)
+- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),)
+- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.)
+- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),)
+- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.)
+- else ifneq ($(CURRENT_MAC_SDK_VERSION),)
+- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).)
+- else
+- $(info Unknown error resolving current platform SDK version.)
+- endif
+- $(info This requires a fresh build. Please wipe the build directory completely,)
+- $(info including any .qmake.stash and .qmake.cache files generated by qmake.)
+- $(error ^)
+- endif
+- endif
+-endif
diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch
deleted file mode 100644
index ec9a432ea708..000000000000
--- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
-@@ -135,14 +135,16 @@
- if (!raw_data_ || error_code_)
- return nullptr;
-
-- DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
-- if (finished_loading_) {
-- array_buffer_result_ = result;
-- AdjustReportedMemoryUsageToV8(
-- -1 * static_cast(raw_data_->ByteLength()));
-- raw_data_.reset();
-+ if (!finished_loading_) {
-+ return DOMArrayBuffer::Create(
-+ ArrayBuffer::Create(raw_data_->Data(), raw_data_->ByteLength()));
- }
-- return result;
-+ array_buffer_result_ = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
-+ AdjustReportedMemoryUsageToV8(-1 *
-+ static_cast(raw_data_->ByteLength()));
-+
-+ raw_data_.reset();
-+ return array_buffer_result_;
- }
-
- String FileReaderLoader::StringResult() {
diff --git a/pkgs/development/libraries/qt-5/5.12/srcs.nix b/pkgs/development/libraries/qt-5/5.12/srcs.nix
index d83edc97e94f..ce567c3a2bcd 100644
--- a/pkgs/development/libraries/qt-5/5.12/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.12/srcs.nix
@@ -3,323 +3,323 @@
{
qt3d = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qt3d-everywhere-src-5.12.0.tar.xz";
- sha256 = "1nii8qz8791ripmqd158qah40j2dj50zn7lmqksqz8gz2jfdqam1";
- name = "qt3d-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qt3d-everywhere-src-5.12.3.tar.xz";
+ sha256 = "8997f07c816bbc6dd43fc2171801178bc65e704d35039998530cfa49837eaa7d";
+ name = "qt3d-everywhere-src-5.12.3.tar.xz";
};
};
qtactiveqt = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtactiveqt-everywhere-src-5.12.0.tar.xz";
- sha256 = "0gkdx3mc6ysqlf0ci77kf9c961dc9sbi4j3z5q237d1w4js7ca52";
- name = "qtactiveqt-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtactiveqt-everywhere-src-5.12.3.tar.xz";
+ sha256 = "15a5fde0a069f402bea9f422d8d2c46af440d202122c6307c2a6be642d20dc0f";
+ name = "qtactiveqt-everywhere-src-5.12.3.tar.xz";
};
};
qtandroidextras = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtandroidextras-everywhere-src-5.12.0.tar.xz";
- sha256 = "0s083ngvya8bknp0bvgb3hyk6zr8shg8rmkzn98956dqz0xs3agm";
- name = "qtandroidextras-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtandroidextras-everywhere-src-5.12.3.tar.xz";
+ sha256 = "866b3fbcfc2cbebdb83b5adec4e5d0bd29b0e0b0762d66fb3fef0b400e37254f";
+ name = "qtandroidextras-everywhere-src-5.12.3.tar.xz";
};
};
qtbase = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtbase-everywhere-src-5.12.0.tar.xz";
- sha256 = "1jzfx8c0hzch0kmz2m4vkn65s7ikiymnm29lsymil4hfg0fj40sy";
- name = "qtbase-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz";
+ sha256 = "fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701";
+ name = "qtbase-everywhere-src-5.12.3.tar.xz";
};
};
qtcanvas3d = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcanvas3d-everywhere-src-5.12.0.tar.xz";
- sha256 = "0a61z5amp409aq9v7j0fyk003fbz2i247idl7lgfbl4qqh0ry6xj";
- name = "qtcanvas3d-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcanvas3d-everywhere-src-5.12.3.tar.xz";
+ sha256 = "c0821f1232c6bcd00648af9a5d1eade8e0397c6bfff60621e0fcdfc75561baea";
+ name = "qtcanvas3d-everywhere-src-5.12.3.tar.xz";
};
};
qtcharts = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcharts-everywhere-src-5.12.0.tar.xz";
- sha256 = "0l6lrrwqbqaf6agsghaw4ysm2vb6b4n9j5lgrs1i0q8h9i51rmww";
- name = "qtcharts-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcharts-everywhere-src-5.12.3.tar.xz";
+ sha256 = "820c94b2bf5d73e921fe99be1e3a03a6f012d96574a08e504d68db237522b3a9";
+ name = "qtcharts-everywhere-src-5.12.3.tar.xz";
};
};
qtconnectivity = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtconnectivity-everywhere-src-5.12.0.tar.xz";
- sha256 = "1912a4my72wcqmmdyj24wkwq9p9ih4gzzzvgiq75pfwyhnxa3g4f";
- name = "qtconnectivity-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtconnectivity-everywhere-src-5.12.3.tar.xz";
+ sha256 = "01518cee71a8d53b9c2387f8c7facbcc2c4d63ab3b79462edfa06ba3bfeae661";
+ name = "qtconnectivity-everywhere-src-5.12.3.tar.xz";
};
};
qtdatavis3d = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdatavis3d-everywhere-src-5.12.0.tar.xz";
- sha256 = "0czlj088gf2r6w5ahh0p8n36lbwmds86mxqijshmhzax5cspxnjf";
- name = "qtdatavis3d-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdatavis3d-everywhere-src-5.12.3.tar.xz";
+ sha256 = "f6d073c4575542f8ff6de3ac3b6e8dde6ae2d87e98119de7a13bc984aa967313";
+ name = "qtdatavis3d-everywhere-src-5.12.3.tar.xz";
};
};
qtdeclarative = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdeclarative-everywhere-src-5.12.0.tar.xz";
- sha256 = "0yr29hm3bqlwxcmna0bzyxw8k4hw3x8k3k4iiw2sw52p5c85izag";
- name = "qtdeclarative-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdeclarative-everywhere-src-5.12.3.tar.xz";
+ sha256 = "839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7";
+ name = "qtdeclarative-everywhere-src-5.12.3.tar.xz";
};
};
qtdoc = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdoc-everywhere-src-5.12.0.tar.xz";
- sha256 = "1k8caa1nmc9nrhb29vq1qzaz608klnjxy509w6ppxlzz2zbpcr9h";
- name = "qtdoc-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdoc-everywhere-src-5.12.3.tar.xz";
+ sha256 = "ce5e9d0f48d108c48d742ab2127ead735270d7b525103c6cf409683d7fc8334f";
+ name = "qtdoc-everywhere-src-5.12.3.tar.xz";
};
};
qtgamepad = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgamepad-everywhere-src-5.12.0.tar.xz";
- sha256 = "14b0np15gm5lzvip33pg6w9dfs065wwdfz18na28bhbxj6wh06ac";
- name = "qtgamepad-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgamepad-everywhere-src-5.12.3.tar.xz";
+ sha256 = "5d046869e9646912936e3622efa755d85ccc8eddba91f5b12880cfb5e6489642";
+ name = "qtgamepad-everywhere-src-5.12.3.tar.xz";
};
};
qtgraphicaleffects = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgraphicaleffects-everywhere-src-5.12.0.tar.xz";
- sha256 = "0m9l031zhw8il66ld8bj1lwqlc2xx89nl6dvssz1kl2d5nqqy1c1";
- name = "qtgraphicaleffects-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgraphicaleffects-everywhere-src-5.12.3.tar.xz";
+ sha256 = "772c98a009cc82ac290f868906c5aa719e4608ef3c5905d69ef7402b15924a73";
+ name = "qtgraphicaleffects-everywhere-src-5.12.3.tar.xz";
};
};
qtimageformats = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtimageformats-everywhere-src-5.12.0.tar.xz";
- sha256 = "0bkkk5skpplwfbqv7g41rhgynyxs3khvf8gk2rl2gdixdplpv42z";
- name = "qtimageformats-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtimageformats-everywhere-src-5.12.3.tar.xz";
+ sha256 = "db5a9e784f9c327c1e6830b1550311024cc91202d3b8dde82cd0944164298be2";
+ name = "qtimageformats-everywhere-src-5.12.3.tar.xz";
};
};
qtlocation = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtlocation-everywhere-src-5.12.0.tar.xz";
- sha256 = "0ja4cwj59y1xhwwf4f5gzr0fdrrsxbh14g2x812n03x0yd6i78xh";
- name = "qtlocation-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz";
+ sha256 = "52d589be2852ada0c000b06cc411b61e521cd0797470be567fd1625bcc9d75c6";
+ name = "qtlocation-everywhere-src-5.12.3.tar.xz";
};
};
qtmacextras = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmacextras-everywhere-src-5.12.0.tar.xz";
- sha256 = "00xhkj66i3srwmzzin1mcx9m94l5ns08f93c1za3wl23ani7n2nr";
- name = "qtmacextras-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmacextras-everywhere-src-5.12.3.tar.xz";
+ sha256 = "38dedd29d07ea9e4e92a7ef28f9e03c06cf9a1525aee4f8084310c519f5b47ed";
+ name = "qtmacextras-everywhere-src-5.12.3.tar.xz";
};
};
qtmultimedia = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmultimedia-everywhere-src-5.12.0.tar.xz";
- sha256 = "1a96x6c2w9rs6vfsdcnzmmad4w32dxy2dvismldcwmwcq2whqjsw";
- name = "qtmultimedia-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmultimedia-everywhere-src-5.12.3.tar.xz";
+ sha256 = "a30beeb37fb284d93522e29c01fb8d12726f40e9248e80b70b1f8ab60197a301";
+ name = "qtmultimedia-everywhere-src-5.12.3.tar.xz";
};
};
qtnetworkauth = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtnetworkauth-everywhere-src-5.12.0.tar.xz";
- sha256 = "0x877ra8375pf8d8p6hgdkyw8yzjqfca6rgki6vi1q8fyi31j4a1";
- name = "qtnetworkauth-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtnetworkauth-everywhere-src-5.12.3.tar.xz";
+ sha256 = "dd6bf334be29fb82adaeecb184779328b4ad33a069528b9954d9c07f2d889332";
+ name = "qtnetworkauth-everywhere-src-5.12.3.tar.xz";
};
};
qtpurchasing = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtpurchasing-everywhere-src-5.12.0.tar.xz";
- sha256 = "1nk0dp247v1rfbnj84g99zsj6iv86pq32f478r92adz9qcgfs2yr";
- name = "qtpurchasing-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtpurchasing-everywhere-src-5.12.3.tar.xz";
+ sha256 = "a848f1e1022af38571f5ab0c4ec4b904c12fa6ef19154d44abbcaeb35156753e";
+ name = "qtpurchasing-everywhere-src-5.12.3.tar.xz";
};
};
qtquickcontrols = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols-everywhere-src-5.12.0.tar.xz";
- sha256 = "0wyd24aphpixi3k9vbxw73z3dy1xnf8hwc99wimr5mpf1cj67yrb";
- name = "qtquickcontrols-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols-everywhere-src-5.12.3.tar.xz";
+ sha256 = "68ae03b35eaa44a24c3f663b842252053c9f2b00b18841fd39ff7d2150986f46";
+ name = "qtquickcontrols-everywhere-src-5.12.3.tar.xz";
};
};
qtquickcontrols2 = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols2-everywhere-src-5.12.0.tar.xz";
- sha256 = "1ikxj32rd9pipnrz81l5ln700lnw8w6bx573w01x424sx0p7wxw9";
- name = "qtquickcontrols2-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols2-everywhere-src-5.12.3.tar.xz";
+ sha256 = "e855e8369c3cb5a2ebcd2028a2a195ba73945fd9d5bc26134706c2fa14e99b3a";
+ name = "qtquickcontrols2-everywhere-src-5.12.3.tar.xz";
};
};
qtremoteobjects = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtremoteobjects-everywhere-src-5.12.0.tar.xz";
- sha256 = "0pwx2m17yw1qqv8qigfndgj1yd5kq8w5cbiaqlw4zdk1m6jd0h09";
- name = "qtremoteobjects-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtremoteobjects-everywhere-src-5.12.3.tar.xz";
+ sha256 = "3475a409127739930e0bf833cea5f7f605adc66ab25fac39b72ce4bf3039cc42";
+ name = "qtremoteobjects-everywhere-src-5.12.3.tar.xz";
};
};
qtscript = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscript-everywhere-src-5.12.0.tar.xz";
- sha256 = "1a7ziipvy8cfmrpw2b868167sw21zrqhfv2la0w9vs6hwli1mzlp";
- name = "qtscript-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscript-everywhere-src-5.12.3.tar.xz";
+ sha256 = "0f37bf032a2370bd08667aad053f5a57717ea49596c16bf6cfb32b0d6e5c1f9e";
+ name = "qtscript-everywhere-src-5.12.3.tar.xz";
};
};
qtscxml = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscxml-everywhere-src-5.12.0.tar.xz";
- sha256 = "0syx3bx9pxxrsxanfv245ifppjhbj7sbrndh8il86xlrcr9cwvnw";
- name = "qtscxml-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscxml-everywhere-src-5.12.3.tar.xz";
+ sha256 = "70c4b1f8e23560cf54e69aeb3ded4078434e6f78e1b9573fbad1ddace5fc4b19";
+ name = "qtscxml-everywhere-src-5.12.3.tar.xz";
};
};
qtsensors = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsensors-everywhere-src-5.12.0.tar.xz";
- sha256 = "19n5vlx0j5a0h86mpgs86qzsxbyq8fcrls7yqnjdaw0zga234cf5";
- name = "qtsensors-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsensors-everywhere-src-5.12.3.tar.xz";
+ sha256 = "7f63fedf60fdf110a3fc529568c7226d7acd59cc5eaee908f4d5a969e34005fc";
+ name = "qtsensors-everywhere-src-5.12.3.tar.xz";
};
};
qtserialbus = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialbus-everywhere-src-5.12.0.tar.xz";
- sha256 = "16imi82v17n18a5m0i2fcfj6hqdpnzn2z9kdcf6a8h93fv4qd4kb";
- name = "qtserialbus-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialbus-everywhere-src-5.12.3.tar.xz";
+ sha256 = "792cd2d411d2ebd737f5d09580f8db479cd35f2f7e7cedb4412075ef20fcfe4d";
+ name = "qtserialbus-everywhere-src-5.12.3.tar.xz";
};
};
qtserialport = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialport-everywhere-src-5.12.0.tar.xz";
- sha256 = "1fx9fm0418jq05j2hlb52lblq8nr4m0hj8sizi86p708jmb01m2r";
- name = "qtserialport-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialport-everywhere-src-5.12.3.tar.xz";
+ sha256 = "1faf7df4a1f9028bef1ce79330badb4e5cbbba9f717c53cafc5aea41eed1de51";
+ name = "qtserialport-everywhere-src-5.12.3.tar.xz";
};
};
qtspeech = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtspeech-everywhere-src-5.12.0.tar.xz";
- sha256 = "1yx4wahl7iaj6lgpvnw8pdi2q4wc2fkpzfidd3j1bc98wpna4f8r";
- name = "qtspeech-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtspeech-everywhere-src-5.12.3.tar.xz";
+ sha256 = "ed211822765744553fb5abeb97058420668b18a50d985061d949a0e068ee64f5";
+ name = "qtspeech-everywhere-src-5.12.3.tar.xz";
};
};
qtsvg = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsvg-everywhere-src-5.12.0.tar.xz";
- sha256 = "1kpvqd0p7dblgh26p3a99npqr0wmyg5yv0dcmf78ssrvsy58vrpb";
- name = "qtsvg-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsvg-everywhere-src-5.12.3.tar.xz";
+ sha256 = "f666438dbf6816b7534e539b95e3fa4405f11d7e2e2bbcde34f2db5ae0f27dc2";
+ name = "qtsvg-everywhere-src-5.12.3.tar.xz";
};
};
qttools = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttools-everywhere-src-5.12.0.tar.xz";
- sha256 = "1hyschrj568h65m3kl35xqz25hpk61vr98r08375vkavdr5y6k2p";
- name = "qttools-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz";
+ sha256 = "c9e92d2f0d369e44bb1a60e9fa6d970f8d9893d653212305e04be5e6daec2cd8";
+ name = "qttools-everywhere-src-5.12.3.tar.xz";
};
};
qttranslations = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttranslations-everywhere-src-5.12.0.tar.xz";
- sha256 = "023m68vdjj75xnbpc1jflyg85amnjc9i6nwv650k0w4n1dp1hksv";
- name = "qttranslations-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttranslations-everywhere-src-5.12.3.tar.xz";
+ sha256 = "eefcec0a91c302548f9d948a138b8ec77d78570ce818931bd8475b1bff1205ca";
+ name = "qttranslations-everywhere-src-5.12.3.tar.xz";
};
};
qtvirtualkeyboard = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz";
- sha256 = "1nnns0i577zda6qxxd7pxcy06dq0y7lnni8ghn4adh9yl6dvi4yv";
- name = "qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz";
+ sha256 = "7b83af4527310de4ab81146622f3a46677daabf05556d0e33a2e25ca2aa13b22";
+ name = "qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz";
};
};
qtwayland = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwayland-everywhere-src-5.12.0.tar.xz";
- sha256 = "1mvyv4wkcxj4h3q0mqw53zb1d0pahf8mz3r29kckadvk64djsp2m";
- name = "qtwayland-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwayland-everywhere-src-5.12.3.tar.xz";
+ sha256 = "f0b45ad84180730e2d5a1249eb20c6357869b4b78f45eb266c2f2b17f77d86ff";
+ name = "qtwayland-everywhere-src-5.12.3.tar.xz";
};
};
qtwebchannel = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebchannel-everywhere-src-5.12.0.tar.xz";
- sha256 = "1w2b31d7xjzdcgwkb4mz3qrl9ci7c9l4c3v4h8y59isip45g66l5";
- name = "qtwebchannel-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebchannel-everywhere-src-5.12.3.tar.xz";
+ sha256 = "72d1620bcc94e14caa91ddf344c84cd1288aa9479e00b1bb3b5e51f92efe088a";
+ name = "qtwebchannel-everywhere-src-5.12.3.tar.xz";
};
};
qtwebengine = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebengine-everywhere-src-5.12.0.tar.xz";
- sha256 = "0z38ad25n7ckylxnmqrxy95ds4pn7i5k7qxh856zgq1h18wiwn5x";
- name = "qtwebengine-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebengine-everywhere-src-5.12.3.tar.xz";
+ sha256 = "3ff3bac12d75aa0f3fd993bb7077fe411f7b0e6a3993af6f8b039d48e3dc4317";
+ name = "qtwebengine-everywhere-src-5.12.3.tar.xz";
};
};
qtwebglplugin = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebglplugin-everywhere-src-5.12.0.tar.xz";
- sha256 = "0bk5dg33kn2l5lmgd6slsrs9xg15x9h9li91lr1q7qs67b8kl8k5";
- name = "qtwebglplugin-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebglplugin-everywhere-src-5.12.3.tar.xz";
+ sha256 = "23da63013101e97c4e663bb4f6dbb1c7b4386679c634680d3b8d79bcc59d26b3";
+ name = "qtwebglplugin-everywhere-src-5.12.3.tar.xz";
};
};
qtwebsockets = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebsockets-everywhere-src-5.12.0.tar.xz";
- sha256 = "0gzwfjnlgcijym5bn9gi93qlvzizrhf1q9dq06576419sg0s2ka4";
- name = "qtwebsockets-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebsockets-everywhere-src-5.12.3.tar.xz";
+ sha256 = "258883225c5e089015c4036f31019aa8f5bb013ecd8eecd193342e606319a577";
+ name = "qtwebsockets-everywhere-src-5.12.3.tar.xz";
};
};
qtwebview = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebview-everywhere-src-5.12.0.tar.xz";
- sha256 = "11b16b31bxcazqzg1ag9rzh4gj9pif2cf3jz2mj1sdprxp22ra5p";
- name = "qtwebview-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebview-everywhere-src-5.12.3.tar.xz";
+ sha256 = "f904e7fd7e755527e5bc4633c6f7c144065a3ffea473bf01fffb730385a983c5";
+ name = "qtwebview-everywhere-src-5.12.3.tar.xz";
};
};
qtwinextras = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwinextras-everywhere-src-5.12.0.tar.xz";
- sha256 = "1l6s140vrfxb9ar4p1dq9w2gfk3zvgrpqdxbbzs4ngfpwk6mlky6";
- name = "qtwinextras-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwinextras-everywhere-src-5.12.3.tar.xz";
+ sha256 = "2b6319f7dd19fc19b028685c163a69f0a10e610d7554411d4660c1b5e42ada3b";
+ name = "qtwinextras-everywhere-src-5.12.3.tar.xz";
};
};
qtx11extras = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtx11extras-everywhere-src-5.12.0.tar.xz";
- sha256 = "114b4akzpcgx57c6gkl558bl0mbasi34r22fmq3ny84dhvlv9m06";
- name = "qtx11extras-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtx11extras-everywhere-src-5.12.3.tar.xz";
+ sha256 = "85e3ae5177970c2d8656226d7535d0dff5764c100e55a79a59161d80754ba613";
+ name = "qtx11extras-everywhere-src-5.12.3.tar.xz";
};
};
qtxmlpatterns = {
- version = "5.12.0";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtxmlpatterns-everywhere-src-5.12.0.tar.xz";
- sha256 = "0xckcw1j6f5l92c269pb8cx77d21sghp7m7dc05jl1dqmyy7jqpk";
- name = "qtxmlpatterns-everywhere-src-5.12.0.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtxmlpatterns-everywhere-src-5.12.3.tar.xz";
+ sha256 = "e0b98e7c92cd791a9b354d090788347db78f14c47579384fe22d0b650c1d8a61";
+ name = "qtxmlpatterns-everywhere-src-5.12.3.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix
index b27c5d3eb58c..a872f212ff71 100644
--- a/pkgs/development/libraries/qt-5/5.9/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/default.nix
@@ -42,7 +42,15 @@ let
./qtbase-openssl_1_1.patch
];
qtdeclarative = [ ./qtdeclarative.patch ];
- qtscript = [ ./qtscript.patch ];
+ qtscript = [
+ ./qtscript.patch
+ # needed due to changes in gcc 8.3, see https://bugreports.qt.io/browse/QTBUG-74196
+ # fixed in qtscript 5.12.2
+ (fetchpatch {
+ url = "https://github.com/qt/qtscript/commit/97ec1d1882a83c23c91f0f7daea48e05858d8c32.diff";
+ sha256 = "0khrapq13xzvxckzc9l7gqyjwibyd98vyqy6gmyhvsbm2kq8n6wi";
+ })
+ ];
qtserialport = [ ./qtserialport.patch ];
qttools = [ ./qttools.patch ];
qtwebengine = [ ./qtwebengine-no-build-skip.patch ]
diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
index e7d7d1326174..d7a44cace036 100644
--- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
+++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
@@ -80,9 +80,9 @@ wrapQtAppsHook() {
do
[ -d "$targetDir" ] || continue
- find "$targetDir" -executable -print0 | while IFS= read -r -d '' file
+ find "$targetDir" -type f -executable -print0 | while IFS= read -r -d '' file
do
- isELF "$file" || continue
+ patchelf --print-interpreter "$file" >/dev/null 2>&1 || continue
if [ -f "$file" ]
then
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 2c300d1c2f16..e2c71a77062e 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -234,6 +234,8 @@ stdenv.mkDerivation {
"-widgets"
"-opengl desktop"
"-icu"
+ "-L" "${icu.out}/lib"
+ "-I" "${icu.dev}/include"
"-pch"
]
++ lib.optionals (compareVersion "5.11.0" < 0)
@@ -253,14 +255,14 @@ stdenv.mkDerivation {
if (!stdenv.hostPlatform.isx86_64)
then [ "-no-sse2" ]
else lib.optionals (compareVersion "5.9.0" >= 0) {
- "default" = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ];
- "westmere" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ];
- "sandybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ];
- "ivybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ];
- "haswell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
- "broadwell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
- "skylake" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
- "skylake-avx512" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
+ default = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ];
+ westmere = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ];
+ sandybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ];
+ ivybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ];
+ haswell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
+ broadwell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
+ skylake = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
+ skylake-avx512 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"}
)
++ [
@@ -270,10 +272,18 @@ stdenv.mkDerivation {
++ [
"-system-zlib"
+ "-L" "${zlib.out}/lib"
+ "-I" "${zlib.dev}/include"
"-system-libjpeg"
+ "-L" "${libjpeg.out}/lib"
+ "-I" "${libjpeg.dev}/include"
"-system-harfbuzz"
+ "-L" "${harfbuzz.out}/lib"
+ "-I" "${harfbuzz.dev}/include"
"-system-pcre"
"-openssl-linked"
+ "-L" "${openssl.out}/lib"
+ "-I" "${openssl.dev}/include"
"-system-sqlite"
''-${if mysql != null then "plugin" else "no"}-sql-mysql''
''-${if postgresql != null then "plugin" else "no"}-sql-psql''
@@ -302,10 +312,14 @@ stdenv.mkDerivation {
"-system-xcb"
"-xcb"
"-qpa xcb"
+ "-L" "${libX11.out}/lib"
+ "-I" "${libX11.out}/include"
+ "-L" "${libXext.out}/lib"
+ "-I" "${libXext.out}/include"
+ "-L" "${libXrender.out}/lib"
+ "-I" "${libXrender.out}/include"
- "-system-xkbcommon"
"-libinput"
- "-xkbcommon-evdev"
"-no-eglfs"
"-no-gbm"
@@ -326,6 +340,19 @@ stdenv.mkDerivation {
"-no-feature-renameat2"
"-no-feature-getentropy"
]
+ ++ lib.optionals (compareVersion "5.12.1" < 0) [
+ # use -xkbcommon and -xkbcommon-evdev for versions before 5.12.1
+ "-system-xkbcommon"
+ "-xkbcommon-evdev"
+ ]
+ ++ lib.optionals (cups != null) [
+ "-L" "${cups.lib}/lib"
+ "-I" "${cups.dev}/include"
+ ]
+ ++ lib.optionals (mysql != null) [
+ "-L" "${mysql.out}/lib"
+ "-I" "${mysql.out}/include"
+ ]
);
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index d65449023b34..78404ddffa87 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -51,8 +51,12 @@ qtModule {
'';
NIX_CFLAGS_COMPILE =
- # with gcc7 this warning blows the log over Hydra's limit
- [ "-Wno-expansion-to-defined" ]
+ [
+ # with gcc7 this warning blows the log over Hydra's limit
+ "-Wno-expansion-to-defined"
+ # with gcc8, -Wclass-memaccess became part of -Wall and this too exceeds the logging limit
+ "-Wno-class-memaccess"
+ ]
# with clang this warning blows the log over Hydra's limit
++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override"
++ optionals flashplayerFix
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index 84a9d30918b1..5003205ef37d 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -8,14 +8,14 @@ args:
let
inherit (args) name;
- version = args.version or srcs."${name}".version;
- src = args.src or srcs."${name}".src;
+ version = args.version or srcs.${name}.version;
+ src = args.src or srcs.${name}.src;
in
mkDerivation (args // {
name = "${name}-${version}";
inherit src;
- patches = args.patches or patches."${name}" or [];
+ patches = args.patches or patches.${name} or [];
nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ];
propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix
index ae99035d2267..b7857372d1cd 100644
--- a/pkgs/development/libraries/qt-mobility/default.nix
+++ b/pkgs/development/libraries/qt-mobility/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "1.2.0";
- name = "qt-mobility-${version}";
+ pname = "qt-mobility";
src = fetchFromGitHub {
owner = "qtproject";
repo = "qt-mobility";
diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix
index 1578593b8aea..3c4c192bd4b9 100644
--- a/pkgs/development/libraries/qtinstaller/default.nix
+++ b/pkgs/development/libraries/qtinstaller/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmake }:
stdenv.mkDerivation rec {
- name = "qtinstaller-${version}";
+ pname = "qtinstaller";
propagatedBuildInputs = [ qtdeclarative qttools ];
nativeBuildInputs = [ qmake ];
diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix
index dd50e6ec0398..50a1e90588cb 100644
--- a/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/pkgs/development/libraries/qtstyleplugins/default.nix
@@ -1,6 +1,6 @@
{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, gtk2 }:
-mkDerivation rec {
+mkDerivation {
name = "qtstyleplugins-2017-03-11";
src = fetchFromGitHub {
@@ -14,7 +14,7 @@ mkDerivation rec {
buildInputs = [ gtk2 ];
meta = with stdenv.lib; {
- description = "Additional style plugins for Qt5, including BB10, GTK+, Cleanlooks, Motif, Plastique";
+ description = "Additional style plugins for Qt5, including BB10, GTK, Cleanlooks, Motif, Plastique";
homepage = http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/;
license = licenses.lgpl21;
maintainers = [ maintainers.gnidorah ];
diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix
index 84be9876c1cb..2e47a2135657 100644
--- a/pkgs/development/libraries/quesoglc/default.nix
+++ b/pkgs/development/libraries/quesoglc/default.nix
@@ -2,9 +2,8 @@
stdenv.mkDerivation rec {
pname = "quesoglc";
version = "0.7.2";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+ url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0cf9ljdzii5d4i2m23gdmf3kn521ljcldzq69lsdywjid3pg5zjl";
};
buildInputs = [ libGLU_combined glew freetype fontconfig fribidi libX11 ];
diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix
index 35d16ee5e19b..14bfd40a5932 100644
--- a/pkgs/development/libraries/quickder/default.nix
+++ b/pkgs/development/libraries/quickder/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "quickder";
- name = "${pname}-${version}";
version = "1.2-6";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix
index 5ed05ec6b322..79d4d6524241 100644
--- a/pkgs/development/libraries/qxt/default.nix
+++ b/pkgs/development/libraries/qxt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, which, coreutils, fetchzip, qt4 }:
stdenv.mkDerivation rec {
- name = "qxt-${version}";
+ pname = "qxt";
version = "0.6.2";
src = fetchzip {
diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix
index 286c5c868dff..fe48d99b383c 100644
--- a/pkgs/development/libraries/rabbitmq-c/default.nix
+++ b/pkgs/development/libraries/rabbitmq-c/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }:
stdenv.mkDerivation rec {
- name = "rabbitmq-c-${version}";
+ pname = "rabbitmq-c";
version = "0.9.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix
index 96a2347c50fa..afb4e0daeb66 100644
--- a/pkgs/development/libraries/rabbitmq-java-client/default.nix
+++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, ant, jdk, jre, python, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "rabbitmq-java-client-3.3.4";
src = fetchurl {
diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
index 256b756ed45d..e02b22af7565 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "range-v3-${version}";
+ pname = "range-v3";
version = "0.5.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix
index 9d8ce8cef202..92c42d19af62 100644
--- a/pkgs/development/libraries/rapidcheck/default.nix
+++ b/pkgs/development/libraries/rapidcheck/default.nix
@@ -1,7 +1,7 @@
{ stdenv, cmake, fetchFromGitHub }:
stdenv.mkDerivation rec{
- name = "rapidcheck-${version}";
+ pname = "rapidcheck";
version = "unstable-2018-09-27";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix
index a1671aa3e0f9..ea91c1507dc3 100644
--- a/pkgs/development/libraries/rapidjson/default.nix
+++ b/pkgs/development/libraries/rapidjson/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake }:
stdenv.mkDerivation rec {
- name = "rapidjson-${version}";
+ pname = "rapidjson";
version = "1.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix
index 99f880916907..ca072f2ca4b0 100644
--- a/pkgs/development/libraries/rapidxml/default.nix
+++ b/pkgs/development/libraries/rapidxml/default.nix
@@ -3,10 +3,9 @@
stdenv.mkDerivation rec {
pname = "rapidxml";
version = "1.13";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${name}.zip";
+ url = "mirror://sourceforge/${pname}/${pname}-${version}.zip";
sha256 = "0w9mbdgshr6sh6a5jr10lkdycjyvapbj7wxwz8hbp0a96y3biw63";
};
diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index 9f4fe54e8056..165e9716a977 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }:
stdenv.mkDerivation rec {
- name = "rdkafka-${version}";
+ pname = "rdkafka";
version = "1.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
index a6a5fbed4fc5..2b60c3cbf546 100644
--- a/pkgs/development/libraries/re2/default.nix
+++ b/pkgs/development/libraries/re2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "re2-${version}";
+stdenv.mkDerivation {
+ pname = "re2";
version = "20190401";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix
index f9a20a535cb3..73ed823d2be5 100644
--- a/pkgs/development/libraries/readline/6.3.nix
+++ b/pkgs/development/libraries/readline/6.3.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "readline-6.3p08";
src = fetchurl {
diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix
index e96b4f1ebe27..11d5c3780154 100644
--- a/pkgs/development/libraries/readline/7.0.nix
+++ b/pkgs/development/libraries/readline/7.0.nix
@@ -2,7 +2,7 @@
}:
stdenv.mkDerivation rec {
- name = "readline-${version}";
+ pname = "readline";
version = "7.0p${toString (builtins.length upstreamPatches)}";
src = fetchurl {
diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix
index eefef9727663..cdc36617c52d 100644
--- a/pkgs/development/libraries/readline/8.0.nix
+++ b/pkgs/development/libraries/readline/8.0.nix
@@ -2,7 +2,7 @@
}:
stdenv.mkDerivation rec {
- name = "readline-${version}";
+ pname = "readline";
version = "8.0p${toString (builtins.length upstreamPatches)}";
src = fetchurl {
diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix
index 681fc3a012fe..7530cc64bf5f 100644
--- a/pkgs/development/libraries/rep-gtk/default.nix
+++ b/pkgs/development/libraries/rep-gtk/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "rep-gtk-${version}";
+ pname = "rep-gtk";
version = "0.90.8.3";
sourceName = "rep-gtk_${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "GTK+ bindings for librep";
+ description = "GTK bindings for librep";
homepage = http://sawfish.wikia.com;
license = licenses.gpl2;
maintainers = [ maintainers.AndersonTorres ];
diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix
index 195db9a16858..82a2998be1ef 100644
--- a/pkgs/development/libraries/rote/default.nix
+++ b/pkgs/development/libraries/rote/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "rote-${version}";
+ pname = "rote";
version = "0.2.8";
src = fetchurl {
sha256 = "05v1lw99jv4cwxl7spyi7by61j2scpdsvx809x5cga7dm5dhlmky";
- url = "mirror://sourceforge/rote/${name}.tar.gz";
+ url = "mirror://sourceforge/rote/${pname}-${version}.tar.gz";
};
buildInputs = [ ncurses ];
diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix
index daa499061c5b..b69cd56d35d0 100644
--- a/pkgs/development/libraries/safefile/default.nix
+++ b/pkgs/development/libraries/safefile/default.nix
@@ -1,11 +1,10 @@
{ stdenv, fetchurl, path, runtimeShell }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "safefile";
version = "1.0.5";
src = fetchurl {
- url = "http://research.cs.wisc.edu/mist/${pname}/releases/${name}.tar.gz";
+ url = "http://research.cs.wisc.edu/mist/${pname}/releases/${pname}-${version}.tar.gz";
sha256 = "1y0gikds2nr8jk8smhrl617njk23ymmpxyjb2j1xbj0k82xspv78";
};
diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix
index ba0b8f4e996f..9ffa2efc376c 100644
--- a/pkgs/development/libraries/sblim-sfcc/default.nix
+++ b/pkgs/development/libraries/sblim-sfcc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, curl }:
stdenv.mkDerivation rec {
- name = "sblim-sfcc-${version}";
+ pname = "sblim-sfcc";
version = "2.2.9"; # this is technically 2.2.9-preview
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix
index f727728943bd..35d0914e3f76 100644
--- a/pkgs/development/libraries/science/benchmark/papi/default.nix
+++ b/pkgs/development/libraries/science/benchmark/papi/default.nix
@@ -2,16 +2,16 @@
, fetchurl
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "5.6.0";
- name = "papi-${version}";
+ pname = "papi";
src = fetchurl {
url = "https://bitbucket.org/icl/papi/get/papi-5-6-0-t.tar.gz";
sha256 = "13mngf9kl0y2wfxqvkad0smdaag7k8fvw82b4312gx62nwhc1i6r";
};
- buildInputs = [ stdenv ];
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ];
preConfigure = ''
cd src
diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix
index 2ee9144b316d..367fc635c8b9 100644
--- a/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -1,12 +1,11 @@
{ stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "htslib";
version = "1.9";
src = fetchurl {
- url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2";
+ url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2";
sha256 = "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0";
};
diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix
index 22bcc56c82ab..e6c58b96e5c7 100644
--- a/pkgs/development/libraries/science/biology/mirtk/default.nix
+++ b/pkgs/development/libraries/science/biology/mirtk/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.0.0";
- name = "mirtk-${version}";
+ pname = "mirtk";
src = fetchFromGitHub {
owner = "BioMedIA";
diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
index 4668839ebb9c..d43331464067 100644
--- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix
+++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "QuadProgpp-${version}";
+ pname = "QuadProgpp";
version = "4b6bd65f09fbff99c172a86d6e96ca74449b323f";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 05373cd1cbda..36576de05631 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -7,7 +7,8 @@ let
version = "3.7.0";
in
stdenv.mkDerivation {
- name = "arpack-${version}";
+ pname = "arpack";
+ inherit version;
src = fetchFromGitHub {
owner = "opencollab";
diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix
index 286be260052b..a14ed4e6a30b 100644
--- a/pkgs/development/libraries/science/math/blas/default.nix
+++ b/pkgs/development/libraries/science/math/blas/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gfortran }:
stdenv.mkDerivation rec {
- name = "blas-${version}";
+ pname = "blas";
version = "3.8.0";
src = fetchurl {
- url = "http://www.netlib.org/blas/${name}.tgz";
+ url = "http://www.netlib.org/blas/${pname}-${version}.tgz";
sha256 = "1s24iry5197pskml4iygasw196bdhplj0jmbsb9jhabcjqj2mpsm";
};
@@ -44,6 +44,15 @@ stdenv.mkDerivation rec {
install ${dashD} -m755 libblas.so.${version} "$out/lib/libblas.so.${version}"
ln -s libblas.so.${version} "$out/lib/libblas.so.3"
ln -s libblas.so.${version} "$out/lib/libblas.so"
+ # Write pkgconfig alias.
+ # See also openblas/default.nix
+ mkdir $out/lib/pkgconfig
+ cat < $out/lib/pkgconfig/blas.pc
+Name: blas
+Version: ${version}
+Description: blas provided by the BLAS package.
+Libs: -L$out/lib -lblas
+EOF
'';
preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix
index 16850fb1665e..bc276b9923c8 100644
--- a/pkgs/development/libraries/science/math/brial/default.nix
+++ b/pkgs/development/libraries/science/math/brial/default.nix
@@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
version = "1.2.5";
- name = "brial-${version}";
+ pname = "brial";
src = fetchFromGitHub {
owner = "BRiAl";
diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix
index 4746f77a2164..26ec1237601f 100644
--- a/pkgs/development/libraries/science/math/caffe2/default.nix
+++ b/pkgs/development/libraries/science/math/caffe2/default.nix
@@ -38,7 +38,7 @@ let
'';
cub = {
- src = fetchFromGitHub rec {
+ src = fetchFromGitHub {
owner = "NVlabs";
repo = "cub";
rev = "v1.7.4";
@@ -61,7 +61,7 @@ let
in
stdenv.mkDerivation rec {
- name = "caffe2-${version}";
+ pname = "caffe2";
version = "0.8.1";
src = fetchFromGitHub {
owner = "caffe2";
diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix
index 537fcb93a87e..52c775c9a0d0 100644
--- a/pkgs/development/libraries/science/math/cholmod-extra/default.nix
+++ b/pkgs/development/libraries/science/math/cholmod-extra/default.nix
@@ -5,8 +5,6 @@ in let
# SuiteSparse must use the same openblas
suitesparse = suitesparse_.override { inherit openblas; };
in stdenv.mkDerivation rec {
-
- name = "${pname}-${version}";
pname = "cholmod-extra";
version = "1.2.0";
diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix
index 40dbfc53e2cb..8a474e06e556 100644
--- a/pkgs/development/libraries/science/math/clblas/default.nix
+++ b/pkgs/development/libraries/science/math/clblas/default.nix
@@ -11,7 +11,7 @@
}:
stdenv.mkDerivation rec {
- name = "clblas-${version}";
+ pname = "clblas";
version = "2.12";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix
index 2441aff9fa30..5193c2db5c5b 100644
--- a/pkgs/development/libraries/science/math/cliquer/default.nix
+++ b/pkgs/development/libraries/science/math/cliquer/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
version = "1.21";
- name = "cliquer-${version}";
+ pname = "cliquer";
# autotoolized version of the original cliquer
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix
index 3c448abeccf6..f0f5829ce465 100644
--- a/pkgs/development/libraries/science/math/cudnn/generic.nix
+++ b/pkgs/development/libraries/science/math/cudnn/generic.nix
@@ -10,7 +10,7 @@
, addOpenGLRunpath
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}";
inherit version;
diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix
index 645a865eb955..77973a954494 100644
--- a/pkgs/development/libraries/science/math/ecos/default.nix
+++ b/pkgs/development/libraries/science/math/ecos/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "ecos-${version}";
+ pname = "ecos";
version = "2.0.6";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix
index 4ae5ea522555..a93ede63a263 100644
--- a/pkgs/development/libraries/science/math/fenics/default.nix
+++ b/pkgs/development/libraries/science/math/fenics/default.nix
@@ -30,7 +30,8 @@ let
version = "2017.1.0";
dijitso = pythonPackages.buildPythonPackage {
- name = "dijitso-${version}";
+ pname = "dijitso";
+ inherit version;
src = fetchurl {
url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz";
sha256 = "0mw6mynjmg6yl3l2k33yra2x84s4r6mh44ylhk9znjfk74jra8zg";
@@ -54,7 +55,8 @@ let
};
fiat = pythonPackages.buildPythonPackage {
- name = "fiat-${version}";
+ pname = "fiat";
+ inherit version;
src = fetchurl {
url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz";
sha256 = "156ybz70n4n7p88q4pfkvbmg1xr2ll80inzr423mki0nml0q8a6l";
@@ -72,7 +74,8 @@ let
};
ufl = pythonPackages.buildPythonPackage {
- name = "ufl-${version}";
+ pname = "ufl";
+ inherit version;
src = fetchurl {
url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz";
sha256 = "13ysimmwad429fjjs07j1fw1gq196p021j7mv66hwrljyh8gm1xg";
@@ -90,7 +93,8 @@ let
};
ffc = pythonPackages.buildPythonPackage {
- name = "ffc-${version}";
+ pname = "ffc";
+ inherit version;
src = fetchurl {
url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz";
sha256 = "1cw7zsrjms11xrfg7x9wjd90x3w4v5s1wdwa18xqlycqz7cc8wr0";
@@ -109,7 +113,8 @@ let
};
instant = pythonPackages.buildPythonPackage {
- name = "instant-${version}";
+ pname = "instant";
+ inherit version;
src = fetchurl {
url = "https://bitbucket.org/fenics-project/instant/downloads/instant-${version}.tar.gz";
sha256 = "1rsyh6n04w0na2zirfdcdjip8k8ikb8fc2x94fq8ylc3lpcnpx9q";
@@ -125,7 +130,8 @@ let
in
stdenv.mkDerivation {
- name = "dolfin-${version}";
+ pname = "dolfin";
+ inherit version;
src = fetchurl {
url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz";
sha256 = "14hfb5q6rz79zmy742s2fiqkb9j2cgh5bsg99v76apcr84nklyds";
diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix
index 2891429c8578..6fd16535459a 100644
--- a/pkgs/development/libraries/science/math/flintqs/default.nix
+++ b/pkgs/development/libraries/science/math/flintqs/default.nix
@@ -7,7 +7,6 @@
stdenv.mkDerivation rec {
version = "1.0";
pname = "flintqs";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "sagemath";
diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index 30453086d457..1995fb9c85de 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip, openblas, gfortran }:
stdenv.mkDerivation rec {
- name = "ipopt-${version}";
+ pname = "ipopt";
version = "3.12.13";
src = fetchurl {
diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix
index 51fbd9f14cb4..0f23f08145e9 100644
--- a/pkgs/development/libraries/science/math/lcalc/default.nix
+++ b/pkgs/development/libraries/science/math/lcalc/default.nix
@@ -7,7 +7,6 @@
stdenv.mkDerivation rec {
version = "1.23";
pname = "lcalc";
- name = "${pname}-${version}";
src = fetchurl {
# original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available
diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix
index be650f3c3ce8..c8f1138d69ff 100644
--- a/pkgs/development/libraries/science/math/libbraiding/default.nix
+++ b/pkgs/development/libraries/science/math/libbraiding/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
version = "1.0";
- name = "libbraiding-${version}";
+ pname = "libbraiding";
src = fetchFromGitHub {
owner = "miguelmarco";
diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix
index e96ee475d7d2..a2c0dd4fa177 100644
--- a/pkgs/development/libraries/science/math/libhomfly/default.nix
+++ b/pkgs/development/libraries/science/math/libhomfly/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
version = "1.02r5";
- name = "llibhomfly-${version}";
+ pname = "llibhomfly";
src = fetchFromGitHub {
owner = "miguelmarco";
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 46538d0022e7..5a62578481c6 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -11,8 +11,9 @@ let
version = "3.8.0";
in
-stdenv.mkDerivation rec {
- name = "liblapack-${version}";
+stdenv.mkDerivation {
+ pname = "liblapack";
+ inherit version;
src = fetchurl {
url = "http://www.netlib.org/lapack/lapack-${version}.tar.gz";
sha256 = "1xmwi2mqmipvg950gb0rhgprcps8gy8sjm8ic9rgy2qjlv22rcny";
diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix
index 3cf5c3619a9e..b0cfbca5aa33 100644
--- a/pkgs/development/libraries/science/math/lrs/default.nix
+++ b/pkgs/development/libraries/science/math/lrs/default.nix
@@ -1,7 +1,6 @@
{stdenv, fetchurl, gmp}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "lrs";
version = "7.0";
diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix
index b9ee1e2a10d7..b8c4fa671484 100644
--- a/pkgs/development/libraries/science/math/m4ri/default.nix
+++ b/pkgs/development/libraries/science/math/m4ri/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
version = "20140914";
- name = "m4ri-${version}";
+ pname = "m4ri";
src = fetchFromBitbucket {
owner = "malb";
diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix
index 23fc03655cf3..6a664b1dffff 100644
--- a/pkgs/development/libraries/science/math/m4rie/default.nix
+++ b/pkgs/development/libraries/science/math/m4rie/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
version = "20150908";
- name = "m4rie-${version}";
+ pname = "m4rie";
src = fetchFromBitbucket {
owner = "malb";
diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix
index 8444d88809af..ef4e89aecb84 100644
--- a/pkgs/development/libraries/science/math/magma/default.nix
+++ b/pkgs/development/libraries/science/math/magma/default.nix
@@ -1,23 +1,31 @@
-{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, liblapack }:
+{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, liblapack
+, mklSupport ? false, mkl ? null
+}:
+
+assert !mklSupport || mkl != null;
with stdenv.lib;
-let version = "2.0.2";
+let version = "2.5.0";
in stdenv.mkDerivation {
- name = "magma-${version}";
+ pname = "magma";
+ inherit version;
src = fetchurl {
url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz";
- sha256 = "0w3z6k1npfh0d3r8kpw873f1m7lny29sz2bvvfxzk596d4h083lk";
+ sha256 = "0czspk93cv1fy37zyrrc9k306q4yzfxkhy1y4lj937dx8rz5rm2g";
name = "magma-${version}.tar.gz";
};
- buildInputs = [ gfortran cudatoolkit libpthreadstubs liblapack cmake ];
+ buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake ]
+ ++ (if mklSupport then [ mkl ] else [ liblapack ]);
doCheck = false;
- #checkTarget = "tests";
+
+ MKLROOT = optionalString mklSupport mkl;
enableParallelBuilding=true;
+ buildFlags = [ "magma" "magma_sparse" ];
# MAGMA's default CMake setup does not care about installation. So we copy files directly.
installPhase = ''
@@ -41,6 +49,6 @@ in stdenv.mkDerivation {
license = licenses.bsd3;
homepage = http://icl.cs.utk.edu/magma/index.html;
platforms = platforms.unix;
- maintainers = with maintainers; [ ianwookim ];
+ maintainers = with maintainers; [ tbenst ];
};
}
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index d967bbf8c3e1..f8d392691ab2 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -86,13 +86,13 @@ let
mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}");
in
stdenv.mkDerivation rec {
- name = "openblas-${version}";
- version = "0.3.6";
+ pname = "openblas";
+ version = "0.3.7";
src = fetchFromGitHub {
owner = "xianyi";
repo = "OpenBLAS";
rev = "v${version}";
- sha256 = "12vg0g3s4m49fr8z04j15yrgscqnaaflnkckjbffqxnrf90fcav1";
+ sha256 = "0vs1dlzyla02wajpkfzz8x3lfpgmwiaaizq2nmdjbkzkb7jnxhhz";
};
inherit blas64;
diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix
index 01b0faf89f90..6fc96623a33c 100644
--- a/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "openlibm-${version}";
+ pname = "openlibm";
version = "0.6.0";
src = fetchurl {
url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index 2dd63ebfc854..c6e065320a26 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -4,7 +4,7 @@
, pythonProtobuf }:
stdenv.mkDerivation rec {
- name = "or-tools-${version}";
+ pname = "or-tools";
version = "v7.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix
index ca35ce2f4134..3a9ef7704596 100644
--- a/pkgs/development/libraries/science/math/parmetis/default.nix
+++ b/pkgs/development/libraries/science/math/parmetis/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "parmetis-${version}";
+ pname = "parmetis";
version = "4.0.3";
src = fetchurl {
diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix
index ac8129c9032f..c2eda9dac48b 100644
--- a/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/pkgs/development/libraries/science/math/petsc/default.nix
@@ -6,7 +6,7 @@
, python }:
stdenv.mkDerivation rec {
- name = "petsc-${version}";
+ pname = "petsc";
version = "3.8.4";
src = fetchurl {
diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix
index 7394fb9e1b41..e7dfaecf1de0 100644
--- a/pkgs/development/libraries/science/math/planarity/default.nix
+++ b/pkgs/development/libraries/science/math/planarity/default.nix
@@ -7,7 +7,6 @@
stdenv.mkDerivation rec {
pname = "planarity";
version = "3.0.0.5";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "graph-algorithms";
diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix
index 3eee63dbf4f6..faa219044bd3 100644
--- a/pkgs/development/libraries/science/math/primesieve/default.nix
+++ b/pkgs/development/libraries/science/math/primesieve/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
- name = "primesieve-${version}";
+ pname = "primesieve";
version = "7.4";
nativeBuildInputs = [cmake];
diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix
index fda54fe44ab1..66c573245db1 100644
--- a/pkgs/development/libraries/science/math/rankwidth/default.nix
+++ b/pkgs/development/libraries/science/math/rankwidth/default.nix
@@ -5,7 +5,6 @@
stdenv.mkDerivation rec {
pname = "rankwidth";
version = "0.7";
- name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sageupstream/rw/rw-${version}.tar.gz";
diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix
index 624885c501aa..207406388e0e 100644
--- a/pkgs/development/libraries/science/math/rubiks/default.nix
+++ b/pkgs/development/libraries/science/math/rubiks/default.nix
@@ -7,7 +7,6 @@
stdenv.mkDerivation rec {
pname = "rubiks";
version = "20070912";
- name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sageupstream/rubiks/rubiks-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
index b4c6574d13a6..14277c8c6318 100644
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
- name = "scalapack-${version}";
+ pname = "scalapack";
version = "2.0.2";
src = fetchurl {
diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix
index f9d1a84b1f03..51a72585c0cf 100644
--- a/pkgs/development/libraries/science/math/scs/default.nix
+++ b/pkgs/development/libraries/science/math/scs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, blas, liblapack, gfortran, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
- name = "scs-${version}";
+ pname = "scs";
version = "2.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
index 7e71eafef697..48de128edc53 100644
--- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
@@ -5,7 +5,7 @@ let
in
stdenv.mkDerivation rec {
version = "4.2.1";
- name = "suitesparse-${version}";
+ pname = "suitesparse";
src = fetchurl {
url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ;
sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8";
diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix
index 9938a3096a02..570c98144856 100644
--- a/pkgs/development/libraries/science/math/superlu/default.nix
+++ b/pkgs/development/libraries/science/math/superlu/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "5.2.1";
- name = "superlu-${version}";
+ pname = "superlu";
src = fetchurl {
url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_${version}.tar.gz";
diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix
index 2e543abd411b..e67f61599b57 100644
--- a/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/pkgs/development/libraries/science/math/sympow/default.nix
@@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
version = "2.023.5";
- name = "sympow-${version}";
+ pname = "sympow";
src = fetchFromGitLab {
group = "rezozer";
diff --git a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix
index 892dfa2a6097..76f0c5eea7fa 100644
--- a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix
+++ b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix
@@ -1,14 +1,14 @@
{
version = "1.14.0";
-"cpu-linux-x86_64" = {
+cpu-linux-x86_64 = {
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz";
sha256 = "04bi3ijq4sbb8c5vk964zlv0j9mrjnzzxd9q9knq3h273nc1a36k";
};
-"gpu-linux-x86_64" = {
+gpu-linux-x86_64 = {
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz";
sha256 = "1ffnpyj9jjgwxpjfiyjvq4dm3n6nwiksim5jld9zw7fdswh215x6";
};
-"cpu-darwin-x86_64" = {
+cpu-darwin-x86_64 = {
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz";
sha256 = "0zsd5ils1a17j6jzh0c7q1z56fw46gkzybbnms7h2rgg8al0rh92";
};
diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix
index ad4d4c017376..838fb1f3638f 100644
--- a/pkgs/development/libraries/science/math/zn_poly/default.nix
+++ b/pkgs/development/libraries/science/math/zn_poly/default.nix
@@ -10,7 +10,6 @@
stdenv.mkDerivation rec {
version = "0.9.1";
pname = "zn_poly";
- name = "${pname}-${version}";
# sage has picked up the maintenance (bug fixes and building, not development)
# from the original, now unmaintained project which can be found at
@@ -32,7 +31,7 @@ stdenv.mkDerivation rec {
# name of library file ("libzn_poly.so")
libbasename = "libzn_poly";
- libext = "${stdenv.targetPlatform.extensions.sharedLibrary}";
+ libext = stdenv.targetPlatform.extensions.sharedLibrary;
makeFlags = [ "CC=cc" ];
diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/development/libraries/science/robotics/ispike/default.nix
index 5f2263d821d0..640eefbd7336 100644
--- a/pkgs/development/libraries/science/robotics/ispike/default.nix
+++ b/pkgs/development/libraries/science/robotics/ispike/default.nix
@@ -2,11 +2,11 @@
}:
stdenv.mkDerivation rec {
- name = "ispike-${version}";
+ pname = "ispike";
version = "2.1.1";
src = fetchurl {
- url = "mirror://sourceforge/ispike/${name}.tar.gz";
+ url = "mirror://sourceforge/ispike/${pname}-${version}.tar.gz";
sha256 = "0khrxp43bi5kisr8j4lp9fl4r5marzf7b4inys62ac108sfb28lp";
};
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix
index c9c26ca0d66c..ff29ae82c5ce 100644
--- a/pkgs/development/libraries/scmccid/default.nix
+++ b/pkgs/development/libraries/scmccid/default.nix
@@ -2,7 +2,7 @@
assert stdenv ? cc && stdenv.cc.libc != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "scmccid-5.0.11";
src = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix
index ba291dc97ff2..eb8d17c64573 100644
--- a/pkgs/development/libraries/scriptaculous/default.nix
+++ b/pkgs/development/libraries/scriptaculous/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec {
- name = "scriptaculous-${version}";
+ pname = "scriptaculous";
version = "1.9.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/sdformat/3.nix b/pkgs/development/libraries/sdformat/3.nix
index 116f248b3b4e..b78f1d5624ca 100644
--- a/pkgs/development/libraries/sdformat/3.nix
+++ b/pkgs/development/libraries/sdformat/3.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, callPackage, ... } @ args:
-callPackage ./default.nix (args // rec {
+callPackage ./default.nix (args // {
version = "3.7.0";
srchash-sha256 = "07kn8bgvj9mwwinsp2cbmz11z7zw2lgnj61mi1gi1pjg7q9in98q";
})
diff --git a/pkgs/development/libraries/sdformat/default.nix b/pkgs/development/libraries/sdformat/default.nix
index f81eb9b259e8..66ad311387f8 100644
--- a/pkgs/development/libraries/sdformat/default.nix
+++ b/pkgs/development/libraries/sdformat/default.nix
@@ -5,7 +5,7 @@
, ...
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
src = fetchurl {
url = "http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${name}.tar.bz2";
sha256 = srchash-sha256;
diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index 533fefa9f194..63b6ae94a385 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
- name = "serd-${version}";
+ pname = "serd";
version = "0.30.0";
src = fetchurl {
- url = "https://download.drobilla.net/${name}.tar.bz2";
+ url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf";
};
diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index 1b043d33ad6a..4726221a40d9 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -7,8 +7,9 @@ let
version = "2.5.1";
in
-stdenv.mkDerivation rec {
- name = "sfml-${version}";
+stdenv.mkDerivation {
+ pname = "sfml";
+ inherit version;
src = fetchzip {
url = "https://github.com/SFML/SFML/archive/${version}.tar.gz";
diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix
index 1e9a8ba6a58b..261658b0547e 100644
--- a/pkgs/development/libraries/sfsexp/default.nix
+++ b/pkgs/development/libraries/sfsexp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "sfsexp-${version}";
+ pname = "sfsexp";
version = "1.3";
src = fetchurl {
diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix
index dd9b01a0a01e..77b9714066dd 100644
--- a/pkgs/development/libraries/shibboleth-sp/default.nix
+++ b/pkgs/development/libraries/shibboleth-sp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkgconfig, xercesc, xml-security-c, xml-tooling-c }:
stdenv.mkDerivation rec {
- name = "shibboleth-sp-${version}";
+ pname = "shibboleth-sp";
version = "3.0.4.1";
src = fetchgit {
diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index f795dfef9e4c..14af55c2afc1 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.3.6";
- name = "graphite2-${version}";
+ pname = "graphite2";
src = fetchurl {
url = "https://github.com/silnrsi/graphite/releases/download/"
diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/development/libraries/smarty3-i18n/default.nix
index 941e75b8ba92..cd1584ac739b 100644
--- a/pkgs/development/libraries/smarty3-i18n/default.nix
+++ b/pkgs/development/libraries/smarty3-i18n/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
- name = "smarty-i18n-${version}";
+ pname = "smarty-i18n";
version = "1.0";
src = fetchFromGitHub {
owner = "kikimosha";
repo = "smarty3-i18n";
- rev = "${version}";
+ rev = version;
sha256 = "0rjxq4wka73ayna3hb5dxc5pgc8bw8p5fy507yc6cv2pl4h4nji2";
};
diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix
index 66bfd601a62d..4876c39ce83c 100644
--- a/pkgs/development/libraries/smarty3/default.nix
+++ b/pkgs/development/libraries/smarty3/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
- name = "smarty3-${version}";
+ pname = "smarty3";
version = "3.1.33";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix
index 35d5075a949a..e28667883020 100644
--- a/pkgs/development/libraries/smpeg/default.nix
+++ b/pkgs/development/libraries/smpeg/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
patches = [
./format.patch
./gcc6.patch
+ ./libx11.patch
];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/smpeg/libx11.patch b/pkgs/development/libraries/smpeg/libx11.patch
new file mode 100644
index 000000000000..8611073780f3
--- /dev/null
+++ b/pkgs/development/libraries/smpeg/libx11.patch
@@ -0,0 +1,25 @@
+Index: smpeg-0.4.5+cvs20030824/Makefile.am
+===================================================================
+--- smpeg-0.4.5+cvs20030824.orig/Makefile.am
++++ smpeg-0.4.5+cvs20030824/Makefile.am
+@@ -74,7 +74,7 @@
+
+ # Sources for gtv
+ gtv_SOURCES = gtv.c gtv.h
+-gtv_LDADD = @GTK_LIBS@ libsmpeg.la
++gtv_LDADD = @GTK_LIBS@ @X11_LIBS@ libsmpeg.la
+
+ # Sources for glmovie
+ glmovie_SOURCES = glmovie-tile.c glmovie.c glmovie.h
+Index: smpeg-0.4.5+cvs20030824/configure.in
+===================================================================
+--- smpeg-0.4.5+cvs20030824.orig/configure.in
++++ smpeg-0.4.5+cvs20030824/configure.in
+@@ -215,6 +215,7 @@
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ fi
+ AC_SUBST(GTK_LIBS)
++ PKG_CHECK_MODULES([X11], [x11])
+ fi
+ AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xyes)
+
diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index 36077d71126a..80c3630af29e 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "snappy-${version}";
+ pname = "snappy";
version = "1.1.7";
src = fetchFromGitHub {
owner = "google";
repo = "snappy";
- rev = "${version}";
+ rev = version;
sha256 = "1x7r8sjmdqlqjz0xfiwdyrqpgaj5yrvrgb28ivgpvnxgar5qv6m2";
};
diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix
index 2f3ec44a08ce..d9fcea767d5e 100644
--- a/pkgs/development/libraries/soil/default.nix
+++ b/pkgs/development/libraries/soil/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip, mesa, libX11 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "soil";
src = fetchurl {
diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix
index 48ee1af0e30d..4a744c08ae33 100644
--- a/pkgs/development/libraries/sonic/default.nix
+++ b/pkgs/development/libraries/sonic/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "sonic-${version}";
+stdenv.mkDerivation {
+ pname = "sonic";
version = "2016-03-01";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix
index 98226ce20f4a..79084ceda1c3 100644
--- a/pkgs/development/libraries/soqt/default.nix
+++ b/pkgs/development/libraries/soqt/default.nix
@@ -1,6 +1,6 @@
{ fetchhg, stdenv, coin3d, qt5, cmake, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "soqt";
version = "1.6.0a";
diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index 10258e791ba6..c1c22cb910d7 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, python, serd, pcre, wafHook }:
stdenv.mkDerivation rec {
- name = "sord-${version}";
+ pname = "sord";
version = "0.16.2";
src = fetchurl {
- url = "https://download.drobilla.net/${name}.tar.bz2";
+ url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89";
};
diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix
index 50ba9c944ab5..11ba48c59716 100644
--- a/pkgs/development/libraries/soxt/default.nix
+++ b/pkgs/development/libraries/soxt/default.nix
@@ -1,6 +1,6 @@
{ fetchhg, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU_combined }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "soxt";
version = "unstable-2019-06-14";
diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index be2fc503e390..c2dc20cc3927 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, audiofile, libtiff}:
stdenv.mkDerivation rec {
version = "0.0.6";
- name = "spandsp-${version}";
+ pname = "spandsp";
src=fetchurl {
url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix
index cab0e69ad1a7..a18edc0a6dff 100644
--- a/pkgs/development/libraries/spdk/default.nix
+++ b/pkgs/development/libraries/spdk/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libuuid, numactl, openssl }:
stdenv.mkDerivation rec {
- name = "spdk-${version}";
+ pname = "spdk";
version = "19.04";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index b27fd0843bc0..43360d781cdb 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -27,11 +27,11 @@ let
else
throw "You need to enable at least one output module.";
in stdenv.mkDerivation rec {
- name = "speech-dispatcher-${version}";
+ pname = "speech-dispatcher";
version = "0.8.8";
src = fetchurl {
- url = "http://www.freebsoft.org/pub/projects/speechd/${name}.tar.gz";
+ url = "http://www.freebsoft.org/pub/projects/speechd/${pname}-${version}.tar.gz";
sha256 = "1wvck00w9ixildaq6hlhnf6wa576y02ac96lp6932h3k1n08jaiw";
};
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 8f92e0b64f6a..7ba120d661bf 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -117,9 +117,9 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- description = "A GTK+3 SPICE widget";
+ description = "GTK 3 SPICE widget";
longDescription = ''
- spice-gtk is a GTK+3 SPICE widget. It features glib-based
+ spice-gtk is a GTK 3 SPICE widget. It features glib-based
objects for SPICE protocol parsing and a gtk widget for embedding
the SPICE display into other applications such as virt-manager.
Python bindings are available too.
diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix
index 40d272fd07d6..9b2c0032d4e9 100644
--- a/pkgs/development/libraries/spirv-headers/default.nix
+++ b/pkgs/development/libraries/spirv-headers/default.nix
@@ -1,13 +1,14 @@
{ stdenv, fetchFromGitHub, cmake }:
+
stdenv.mkDerivation rec {
- name = "spirv-headers-${version}";
- version = "2019.1"; # spirv-tools version whose DEPS file calls for this commit
+ pname = "spirv-headers";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Headers";
- rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; # from spirv-tools' DEPS
- sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj";
+ rev = version;
+ sha256 = "1zfmvg3x0q9w652s8g5m5rcckzm6jiiw8rif2qck4vlsryl55akp";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix
index 6cf8d97cb67c..9365ee006d14 100644
--- a/pkgs/development/libraries/sqlcipher/default.nix
+++ b/pkgs/development/libraries/sqlcipher/default.nix
@@ -3,7 +3,7 @@
assert readline != null -> ncurses != null;
stdenv.mkDerivation rec {
- name = "sqlcipher-${version}";
+ pname = "sqlcipher";
version = "4.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index f0390486b10e..3c5761b767ec 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -5,7 +5,7 @@ let
in
stdenv.mkDerivation rec {
- name = "sqlite-analyzer-${version}";
+ pname = "sqlite-analyzer";
version = "3.28.0";
src = assert version == sqlite.version; fetchurl {
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index ea1c38ea476b..9ba5da0c910c 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -9,7 +9,7 @@ let
in
stdenv.mkDerivation rec {
- name = "sqlite-${version}";
+ pname = "sqlite";
version = "3.28.0";
# NB! Make sure to update analyzer.nix src (in the same directory).
diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix
index e5d322330e8e..739dfc3bc5b4 100644
--- a/pkgs/development/libraries/sqlite/sqlar.nix
+++ b/pkgs/development/libraries/sqlite/sqlar.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fuse, zlib }:
-stdenv.mkDerivation rec {
- name = "sqlar-${version}";
+stdenv.mkDerivation {
+ pname = "sqlar";
version = "2018-01-07";
src = fetchurl {
diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix
index bb66174c8841..5edb2d92b551 100644
--- a/pkgs/development/libraries/srt/default.nix
+++ b/pkgs/development/libraries/srt/default.nix
@@ -4,13 +4,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "srt";
- version = "1.3.2";
+ version = "1.3.3";
src = fetchFromGitHub {
owner = "Haivision";
repo = "srt";
rev = "v${version}";
- sha256 = "1h1kim9vvqnwx95yd9768ds30h731yg27jz63r90kjxm7b5kmja4";
+ sha256 = "1dwz7qrkdrbmsbh66rbdx36b60r8whkz0wvf47jfckzsj37d2w22";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix
index c9073fc0b7e7..3940faf1d6d1 100644
--- a/pkgs/development/libraries/srtp/default.nix
+++ b/pkgs/development/libraries/srtp/default.nix
@@ -4,7 +4,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "libsrtp-${version}";
+ pname = "libsrtp";
version = "2.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix
index fc771a493b6d..82cbce8055e8 100644
--- a/pkgs/development/libraries/startup-notification/default.nix
+++ b/pkgs/development/libraries/startup-notification/default.nix
@@ -4,7 +4,8 @@ let
version = "0.12";
in
stdenv.mkDerivation {
- name = "libstartup-notification-${version}";
+ pname = "libstartup-notification";
+ inherit version;
src = fetchurl {
url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz";
sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a";
diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix
index 4f36ac2ba1c7..c2353c7b7061 100644
--- a/pkgs/development/libraries/stb/default.nix
+++ b/pkgs/development/libraries/stb/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "stb-${version}";
+stdenv.mkDerivation {
+ pname = "stb";
version = "20180211";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index 36768acd991a..8121b7a501f7 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "strigi-${version}";
+ pname = "strigi";
version = "0.7.8";
src = fetchurl {
- url = "https://www.vandenoever.info/software/strigi/${name}.tar.bz2";
+ url = "https://www.vandenoever.info/software/strigi/${pname}-${version}.tar.bz2";
sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23";
};
diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix
index 2244803f4d32..5589a5560eb0 100644
--- a/pkgs/development/libraries/stxxl/default.nix
+++ b/pkgs/development/libraries/stxxl/default.nix
@@ -7,7 +7,7 @@ let
in
stdenv.mkDerivation rec {
- name = "stxxl-${version}";
+ pname = "stxxl";
version = "1.4.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix
index 35bacff0525a..9a5f4db2debb 100644
--- a/pkgs/development/libraries/subunit/default.nix
+++ b/pkgs/development/libraries/subunit/default.nix
@@ -3,11 +3,11 @@
# NOTE: for subunit python library see pkgs/top-level/python-packages.nix
stdenv.mkDerivation rec {
- name = "subunit-${version}";
+ pname = "subunit";
version = "1.1.0";
src = fetchurl {
- url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz";
+ url = "https://launchpad.net/subunit/trunk/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "0lcah7p66c05p7xpw6ns1is0i02lh0nq8gq51mv4wyvbr6zaasa8";
};
diff --git a/pkgs/development/libraries/sundials/3.x.nix b/pkgs/development/libraries/sundials/3.x.nix
new file mode 100644
index 000000000000..879f13e8bf53
--- /dev/null
+++ b/pkgs/development/libraries/sundials/3.x.nix
@@ -0,0 +1,52 @@
+{ stdenv
+, cmake
+, fetchurl
+, python
+, liblapack
+, gfortran
+, lapackSupport ? true }:
+
+let liblapackShared = liblapack.override {
+ shared = true;
+};
+
+in stdenv.mkDerivation rec {
+ pname = "sundials";
+ version = "3.2.1";
+
+ buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran ];
+ nativeBuildInputs = [ cmake ];
+
+ src = fetchurl {
+ url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
+ sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7";
+ };
+
+ patches = [
+ (fetchurl {
+ # https://github.com/LLNL/sundials/pull/19
+ url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch";
+ sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l";
+ })
+ ];
+
+ cmakeFlags = [
+ "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples"
+ ] ++ stdenv.lib.optionals (lapackSupport) [
+ "-DSUNDIALS_INDEX_TYPE=int32_t"
+ "-DLAPACK_ENABLE=ON"
+ "-DLAPACK_LIBRARIES=${liblapackShared}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary};${liblapackShared}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}"
+ ];
+
+ # flaky tests, and patch in https://github.com/LLNL/sundials/pull/21 doesn't apply cleanly for sundials_3
+ doCheck = false;
+ checkPhase = "make test";
+
+ meta = with stdenv.lib; {
+ description = "Suite of nonlinear differential/algebraic equation solvers";
+ homepage = https://computation.llnl.gov/projects/sundials;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ flokli idontgetoutmuch ];
+ license = licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index abe444c63c32..4bc066df32e2 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -1,28 +1,58 @@
-{ cmake, fetchurl, python, stdenv }:
+{ stdenv
+, cmake
+, fetchurl
+, python
+, liblapack
+, gfortran
+, lapackSupport ? true }:
-stdenv.mkDerivation rec {
+let liblapackShared = liblapack.override {
+ shared = true;
+};
+in stdenv.mkDerivation rec {
pname = "sundials";
version = "4.1.0";
+ buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran ];
+ nativeBuildInputs = [ cmake ];
+
src = fetchurl {
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
sha256 = "19ca4nmlf6i9ijqcibyvpprxzsdfnackgjs6dw51fq13gg1f2398";
};
- preConfigure = ''
- export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$out -DEXAMPLES_INSTALL_PATH=$out/share/examples $cmakeFlags"
- '';
+ patches = [
+ (fetchurl {
+ # https://github.com/LLNL/sundials/pull/19
+ url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch";
+ sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l";
+ })
+ (fetchurl {
+ # https://github.com/LLNL/sundials/pull/20
+ url = "https://github.com/LLNL/sundials/pull/20/commits/2d951bbe1ff7842fcd0dafa28c61b0aa94015f66.patch";
+ sha256 = "0lcr6m4lk14yqrxah4rdscpczny5l7m1zpfsjh8bgspadfsgk512";
+ })
+ # https://github.com/LLNL/sundials/pull/21
+ ./tests-parallel.patch
+ ];
- nativeBuildInputs = [ cmake ];
- buildInputs = [ python ];
+ cmakeFlags = [
+ "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples"
+ ] ++ stdenv.lib.optionals (lapackSupport) [
+ "-DSUNDIALS_INDEX_TYPE=int32_t"
+ "-DLAPACK_ENABLE=ON"
+ "-DLAPACK_LIBRARIES=${liblapackShared}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary};${liblapackShared}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}"
+ ];
+
+ doCheck = true;
+ checkPhase = "make test";
meta = with stdenv.lib; {
description = "Suite of nonlinear differential/algebraic equation solvers";
homepage = https://computation.llnl.gov/projects/sundials;
platforms = platforms.all;
- maintainers = [ maintainers.idontgetoutmuch ];
+ maintainers = with maintainers; [ flokli idontgetoutmuch ];
license = licenses.bsd3;
};
-
}
diff --git a/pkgs/development/libraries/sundials/tests-parallel.patch b/pkgs/development/libraries/sundials/tests-parallel.patch
new file mode 100644
index 000000000000..a785a1dade9b
--- /dev/null
+++ b/pkgs/development/libraries/sundials/tests-parallel.patch
@@ -0,0 +1,45 @@
+diff --git a/config/SundialsAddTest.cmake b/config/SundialsAddTest.cmake
+index e965fed..a7fb1d2 100644
+--- a/config/SundialsAddTest.cmake
++++ b/config/SundialsAddTest.cmake
+@@ -70,7 +70,7 @@ MACRO(SUNDIALS_ADD_TEST NAME EXECUTABLE)
+ "--verbose"
+ "--testname=${NAME}"
+ "--executablename=$"
+- "--outputdir=${CMAKE_BINARY_DIR}/Testing/output"
++ "--outputdir=${TEST_OUTPUT_DIR}"
+ )
+
+ # do not diff the output and answer files
+diff --git a/config/SundialsTesting.cmake b/config/SundialsTesting.cmake
+index 815576a..d91801a 100644
+--- a/config/SundialsTesting.cmake
++++ b/config/SundialsTesting.cmake
+@@ -29,6 +29,13 @@ IF(SUNDIALS_DEVTESTS)
+ ENDIF()
+ ENDIF()
+
++ # Directory for test output
++ SET(TEST_OUTPUT_DIR ${PROJECT_BINARY_DIR}/Testing/output)
++
++ IF(NOT EXISTS ${TEST_OUTPUT_DIR})
++ FILE(MAKE_DIRECTORY ${TEST_OUTPUT_DIR})
++ ENDIF()
++
+ # look for the testRunner script in the test directory
+ FIND_PROGRAM(TESTRUNNER testRunner PATHS test)
+ HIDE_VARIABLE(TESTRUNNER)
+diff --git a/test/testRunner b/test/testRunner
+index f450ec2..f1c8deb 100755
+--- a/test/testRunner
++++ b/test/testRunner
+@@ -106,7 +106,8 @@ def main():
+
+ # create output directory if necessary
+ if not os.path.exists(outDir):
+- os.makedirs(outDir)
++ error("Output directory does not exist, it must be created.", outDir)
++ sys.exit(1)
+ elif not os.path.isdir(outDir):
+ error("Output directory exists but is not a directory, it must be deleted.", outDir)
+ sys.exit(1)
diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix
index 2e6e2d3fbbfd..628ab7e28ef1 100644
--- a/pkgs/development/libraries/svrcore/default.nix
+++ b/pkgs/development/libraries/svrcore/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, nss, nspr }:
stdenv.mkDerivation rec {
- name = "svrcore-${version}";
+ pname = "svrcore";
version = "4.0.4";
src = fetchurl {
- url = "mirror://mozilla/directory/svrcore/releases/${version}/src/${name}.tar.bz2";
+ url = "mirror://mozilla/directory/svrcore/releases/${version}/src/${pname}-${version}.tar.bz2";
sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7";
};
diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix
index e30da732a46c..c8c60c1f8ea6 100644
--- a/pkgs/development/libraries/swiften/default.nix
+++ b/pkgs/development/libraries/swiften/default.nix
@@ -1,6 +1,6 @@
{ stdenv, python, fetchurl, openssl, boost, scons }:
stdenv.mkDerivation rec {
- name = "swiften-${version}";
+ pname = "swiften";
version = "4.0.2";
nativeBuildInputs = [ scons];
diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index a8a110cf9b14..3d146a5a227b 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
- name = "sword-${version}";
+ pname = "sword";
version = "1.7.4";
src = fetchurl {
- url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz";
+ url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${pname}-${version}.tar.gz";
sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr";
};
diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix
index 424dc116c7e9..47b93ab373a6 100644
--- a/pkgs/development/libraries/symengine/default.nix
+++ b/pkgs/development/libraries/symengine/default.nix
@@ -8,7 +8,7 @@
}:
stdenv.mkDerivation rec {
- name = "symengine-${version}";
+ pname = "symengine";
version = "0.4.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix
index 6577ebeae28e..6fd1d1ca941d 100644
--- a/pkgs/development/libraries/szip/default.nix
+++ b/pkgs/development/libraries/szip/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "szip-${version}";
+ pname = "szip";
version = "2.1.1";
src = fetchurl {
url = "https://support.hdfgroup.org/ftp/lib-external/szip/${version}/src/szip-${version}.tar.gz";
diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix
index 27ac0fdd5ff9..5e0f37bbb526 100644
--- a/pkgs/development/libraries/tachyon/default.nix
+++ b/pkgs/development/libraries/tachyon/default.nix
@@ -12,10 +12,10 @@ assert withPngSupport -> libpng != null;
assert stdenv.isDarwin -> Carbon != null;
stdenv.mkDerivation rec {
- name = "tachyon-${version}";
+ pname = "tachyon";
version = "0.99b2";
src = fetchurl {
- url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${name}.tar.gz";
+ url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz";
sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
if stdenv.hostPlatform.system == "x86_64-freebsd" then "bsd" else
if stdenv.hostPlatform.system == "x686-freebsd" then "bsd" else
throw "Don't know what arch to select for tachyon build";
- makeFlags = "${arch}";
+ makeFlags = arch;
patches = [
# Remove absolute paths in Make-config (and unset variables so they can be set in preBuild)
./no-absolute-paths.patch
diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix
index 86006806baa0..28ce5c60481c 100644
--- a/pkgs/development/libraries/taglib-sharp/default.nix
+++ b/pkgs/development/libraries/taglib-sharp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono }:
stdenv.mkDerivation rec {
- name = "taglib-sharp-${version}";
+ pname = "taglib-sharp";
version = "2.1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix
index 8992c7e75c05..401c2562167f 100644
--- a/pkgs/development/libraries/taglib/1.9.nix
+++ b/pkgs/development/libraries/taglib/1.9.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, zlib, cmake}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "taglib-1.9.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix
index a2cb103a1821..6dcfa3068c11 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/pkgs/development/libraries/taglib/default.nix
@@ -1,10 +1,13 @@
-{stdenv, fetchurl, zlib, cmake, fetchpatch}:
+{ stdenv, fetchurl, cmake, fetchpatch
+, zlib
+}:
stdenv.mkDerivation rec {
- name = "taglib-1.11.1";
+ pname = "taglib";
+ version = "1.11.1";
src = fetchurl {
- url = "http://taglib.org/releases/${name}.tar.gz";
+ url = "http://taglib.org/releases/${pname}-${version}.tar.gz";
sha256 = "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn";
};
@@ -22,6 +25,13 @@ stdenv.mkDerivation rec {
url = "https://github.com/taglib/taglib/commit/272648ccfcccae30e002ccf34a22e075dd477278.patch";
sha256 = "0p397qq4anvcm0p8xs68mxa8hg6dl07chg260lc6k2929m34xv72";
})
+
+ (fetchpatch {
+ # many consumers of taglib have started vendoring taglib due to this bug
+ name = "fix_ogg_corruption.patch";
+ url = "https://github.com/taglib/taglib/commit/9336c82da3a04552168f208cd7a5fa4646701ea4.patch";
+ sha256 = "01wlwk4gmfxdg5hjj9jmrain7kia89z0zsdaf5gn3nibmy5bq70r";
+ })
];
nativeBuildInputs = [ cmake ];
@@ -31,8 +41,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
meta = with stdenv.lib; {
- homepage = http://taglib.org/;
- repositories.git = git://github.com/taglib/taglib.git;
+ homepage = "http://taglib.org/";
+ repositories.git = "git://github.com/taglib/taglib.git";
description = "A library for reading and editing audio file metadata.";
longDescription = ''
TagLib is a library for reading and editing the meta-data of several
diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index 89b163a0917c..6fe4e45521ed 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
with stdenv.lib; stdenv.mkDerivation rec {
- name = "tbb-${version}";
+ pname = "tbb";
version = "2019_U8";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix
index 24b1d477b8a0..40e137204e26 100644
--- a/pkgs/development/libraries/tcllib/default.nix
+++ b/pkgs/development/libraries/tcllib/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, tcl }:
stdenv.mkDerivation rec {
- name = "tcllib-${version}";
+ pname = "tcllib";
version = "1.19";
src = fetchurl {
diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix
index 4e1f0bcab035..f1fd6760c61d 100644
--- a/pkgs/development/libraries/tcltls/default.nix
+++ b/pkgs/development/libraries/tcltls/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, tcl, openssl }:
stdenv.mkDerivation rec {
- name = "tcltls-${version}";
+ pname = "tcltls";
version = "1.6.7";
src = fetchurl {
diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix
index eefc976a62b0..8ebf0156be8f 100644
--- a/pkgs/development/libraries/termbox/default.nix
+++ b/pkgs/development/libraries/termbox/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }:
stdenv.mkDerivation rec {
- name = "termbox-${version}";
+ pname = "termbox";
version = "1.1.2";
src = fetchFromGitHub {
owner = "nsf";
diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix
index 8d72d9a7d8ec..646cc60406a5 100644
--- a/pkgs/development/libraries/theft/default.nix
+++ b/pkgs/development/libraries/theft/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.4.5";
- name = "theft-${version}";
+ pname = "theft";
src = fetchFromGitHub {
owner = "silentbicycle";
diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix
index 92cc76273ba1..0fce957df229 100644
--- a/pkgs/development/libraries/thrift/default.nix
+++ b/pkgs/development/libraries/thrift/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "thrift-${version}";
+ pname = "thrift";
version = "0.12.0";
src = fetchurl {
- url = "https://archive.apache.org/dist/thrift/${version}/${name}.tar.gz";
+ url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz";
sha256 = "0a04v7dgm1qzgii7v0sisnljhxc9xpq2vxkka60scrdp6aahjdn3";
};
diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix
index 7f1b3ebcbf5b..4fc1da1fe0a3 100644
--- a/pkgs/development/libraries/tinyxml-2/default.nix
+++ b/pkgs/development/libraries/tinyxml-2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "tinyxml-2-${version}";
+ pname = "tinyxml-2";
version = "6.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix
index d61076e569bc..cc7c996f7c3a 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/pkgs/development/libraries/tinyxml/2.6.2.nix
@@ -4,7 +4,8 @@ let
version = "2.6.2";
SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary;
in stdenv.mkDerivation {
- name = "tinyxml-${version}";
+ pname = "tinyxml";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip";
diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix
index 232c95e6257e..507f2fb275b7 100644
--- a/pkgs/development/libraries/tix/default.nix
+++ b/pkgs/development/libraries/tix/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, tcl, tk, fetchpatch } :
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "8.4.3";
- name = "tix-${version}";
+ pname = "tix";
src = fetchurl {
url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz";
sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn";
diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix
index 141f6da14ce4..3058af46ab57 100644
--- a/pkgs/development/libraries/tk/8.5.nix
+++ b/pkgs/development/libraries/tk/8.5.nix
@@ -1,6 +1,6 @@
{ callPackage, fetchurl, tcl, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
src = fetchurl {
url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix
index 5013db64bbae..c30f9a819478 100644
--- a/pkgs/development/libraries/tk/8.6.nix
+++ b/pkgs/development/libraries/tk/8.6.nix
@@ -1,6 +1,6 @@
{ callPackage, fetchurl, tcl, stdenv, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
src = fetchurl {
url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x
diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix
index 229e4cfaa6c0..13e8f783915d 100644
--- a/pkgs/development/libraries/tnt/default.nix
+++ b/pkgs/development/libraries/tnt/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, unzip}:
-stdenv.mkDerivation rec {
- name = "tnt-${version}";
+stdenv.mkDerivation {
+ pname = "tnt";
version = "3.0.12";
src = fetchurl {
diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix
index 9edfcc88f164..13b4e6b97a9a 100644
--- a/pkgs/development/libraries/tntdb/default.nix
+++ b/pkgs/development/libraries/tntdb/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }:
stdenv.mkDerivation rec {
- name = "tntdb-${version}";
+ pname = "tntdb";
version = "1.3";
src = fetchurl {
- url = "http://www.tntnet.org/download/${name}.tar.gz";
+ url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz";
sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";
};
diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix
index aaff759525b6..86b0080a8242 100644
--- a/pkgs/development/libraries/tntnet/default.nix
+++ b/pkgs/development/libraries/tntnet/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cxxtools, zlib, openssl, zip }:
stdenv.mkDerivation rec {
- name = "tntnet-${version}";
+ pname = "tntnet";
version = "2.2.1";
src = fetchurl {
- url = "http://www.tntnet.org/download/${name}.tar.gz";
+ url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz";
sha256 = "08bmak9mpbamwwl3h9p8x5qzwqlm9g3jh70y0ml5hk7hiv870cf8";
};
diff --git a/pkgs/development/libraries/torch-hdf5/default.nix b/pkgs/development/libraries/torch-hdf5/default.nix
index e5803d644f3b..6dd519441114 100644
--- a/pkgs/development/libraries/torch-hdf5/default.nix
+++ b/pkgs/development/libraries/torch-hdf5/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, torch, cmake, hdf5}:
stdenv.mkDerivation rec {
- name = "torch-hdf5-${version}";
+ pname = "torch-hdf5";
version = "0.0pre2016-07-01";
buildInputs = [cmake torch hdf5];
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix
index d4c61890afb1..ff8c26062d3c 100644
--- a/pkgs/development/libraries/torch/default.nix
+++ b/pkgs/development/libraries/torch/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec{
version = "0.0pre20160820";
- name = "torch-${version}";
+ pname = "torch";
buildInputs = [
luajit openblas imagemagick cmake curl fftw gnuplot unzip qt4
libjpeg zeromq3 ncurses openssl libpng readline pkgconfig
diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix
index 397184f798a8..db4f620a740f 100644
--- a/pkgs/development/libraries/tracker/default.nix
+++ b/pkgs/development/libraries/tracker/default.nix
@@ -30,8 +30,8 @@ in stdenv.mkDerivation rec {
LC_ALL = "en_US.UTF-8";
mesonFlags = [
- "-Ddbus_services=${placeholder ''out''}/share/dbus-1/services"
- "-Dsystemd_user_services=${placeholder ''out''}/lib/systemd/user"
+ "-Ddbus_services=${placeholder "out"}/share/dbus-1/services"
+ "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user"
# TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
"-Dfunctional_tests=false"
"-Ddocs=true"
diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix
index 5609f1d67d17..291336076892 100644
--- a/pkgs/development/libraries/tremor/default.nix
+++ b/pkgs/development/libraries/tremor/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "tremor-unstable-2018-03-16";
src = fetchgit {
diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix
index 552bd4c1c51d..af2fc6c879a7 100644
--- a/pkgs/development/libraries/trompeloeil/default.nix
+++ b/pkgs/development/libraries/trompeloeil/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "trompeloeil-${version}";
+ pname = "trompeloeil";
version = "34";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix
index bcc91d058f04..d5af39d3f2a1 100644
--- a/pkgs/development/libraries/tsocks/default.nix
+++ b/pkgs/development/libraries/tsocks/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "tsocks-${version}";
+ pname = "tsocks";
version = "1.8beta5";
src = fetchurl {
- url = "mirror://sourceforge/tsocks/${name}.tar.gz";
+ url = "mirror://sourceforge/tsocks/${pname}-${version}.tar.gz";
sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4";
};
diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix
index a752da8cb57d..e1284c39aa3b 100644
--- a/pkgs/development/libraries/twolame/default.nix
+++ b/pkgs/development/libraries/twolame/default.nix
@@ -2,9 +2,9 @@
, autoreconfHook, pkgconfig
, libsndfile }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
- name = "twolame-${version}";
+ pname = "twolame";
version = "2017-09-27";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix
index 9c899eb21ba7..18f270e70db5 100644
--- a/pkgs/development/libraries/udns/default.nix
+++ b/pkgs/development/libraries/udns/default.nix
@@ -4,7 +4,7 @@
# https://tracker.debian.org/media/packages/u/udns/rules-0.4-1
stdenv.mkDerivation rec {
- name = "udns-${version}";
+ pname = "udns";
version = "0.4";
configurePhase = "./configure --enable-ipv6";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildPhase = "make staticlib sharedlib rblcheck_s dnsget_s";
src = fetchurl {
- url = "http://www.corpit.ru/mjt/udns/${name}.tar.gz";
+ url = "http://www.corpit.ru/mjt/udns/${pname}-${version}.tar.gz";
sha256 = "0447fv1hmb44nnchdn6p5pd9b44x8p5jn0ahw6crwbqsg7f0hl8i";
};
diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix
index 664bc29a72de..faee73fd393a 100644
--- a/pkgs/development/libraries/udunits/default.nix
+++ b/pkgs/development/libraries/udunits/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "udunits-${version}";
+ pname = "udunits";
version = "2.2.27.6";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix
index 6eef95309aab..1b5fbe6c2cae 100644
--- a/pkgs/development/libraries/uhttpmock/default.nix
+++ b/pkgs/development/libraries/uhttpmock/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version="0.5.0";
- name = "uhttpmock-${version}";
+ pname = "uhttpmock";
src = fetchFromGitLab {
repo = "uhttpmock";
diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index 6a2285563064..e257088c41fb 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -3,13 +3,13 @@
, usbutils, which, python3 }:
stdenv.mkDerivation rec {
- name = "umockdev-${version}";
+ pname = "umockdev";
version = "0.13.1";
outputs = [ "bin" "out" "dev" "doc" ];
src = fetchurl {
- url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${name}.tar.xz";
+ url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "197a169imiirgm73d9fn9234cx56agyw9d2f47h7f1d8s2d51lla";
};
diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix
index 717edda18a2b..73ca55cffd08 100644
--- a/pkgs/development/libraries/unibilium/default.nix
+++ b/pkgs/development/libraries/unibilium/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl, ncurses }:
stdenv.mkDerivation rec {
- name = "unibilium-${version}";
+ pname = "unibilium";
version = "2.0.0";
diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix
index a902b6f84514..7fa8fe81c110 100644
--- a/pkgs/development/libraries/unicap/default.nix
+++ b/pkgs/development/libraries/unicap/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l-utils }:
stdenv.mkDerivation rec {
- name = "libunicap-${version}";
+ pname = "libunicap";
version="0.9.12";
src = fetchurl {
- url = "https://www.unicap-imaging.org/downloads/${name}.tar.gz";
+ url = "https://www.unicap-imaging.org/downloads/${pname}-${version}.tar.gz";
sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9";
};
diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix
index aa4a7890b23e..96f318ff0ef5 100644
--- a/pkgs/development/libraries/unicorn-emu/default.nix
+++ b/pkgs/development/libraries/unicorn-emu/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, python }:
stdenv.mkDerivation rec {
- name = "unicorn-emulator-${version}";
+ pname = "unicorn-emulator";
version = "1.0.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix
index 90a28df6a15a..0e5971945f3d 100644
--- a/pkgs/development/libraries/unittest-cpp/default.nix
+++ b/pkgs/development/libraries/unittest-cpp/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "unittest-cpp-${version}";
+ pname = "unittest-cpp";
version = "2.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix
index 1275df69f596..3a51e2c986a7 100644
--- a/pkgs/development/libraries/unixODBC/default.nix
+++ b/pkgs/development/libraries/unixODBC/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "unixODBC-${version}";
+ pname = "unixODBC";
version = "2.3.7";
src = fetchurl {
- url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz";
+ url = "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz";
sha256 = "0xry3sg497wly8f7715a7gwkn2k36bcap0mvzjw74jj53yx6kwa5";
};
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 99535ec395ea..b9aa1696d487 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -4,11 +4,11 @@
{
psql = stdenv.mkDerivation rec {
- name = "psqlodbc-${version}";
+ pname = "psqlodbc";
version = "10.01.0000";
src = fetchurl {
- url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz";
+ url = "http://ftp.postgresql.org/pub/odbc/versions/src/${pname}-${version}.tar.gz";
sha256 = "1cyams7157f3gry86x64xrplqi2vyqrq3rqka59gv4lb4rpl7jl7";
};
@@ -28,11 +28,11 @@
};
mariadb = stdenv.mkDerivation rec {
- name = "mariadb-connector-odbc-${version}";
+ pname = "mariadb-connector-odbc";
version = "2.0.10";
src = fetchurl {
- url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${name}-ga-src.tar.gz";
+ url = "https://downloads.mariadb.org/interstitial/connector-odbc-${version}/src/${pname}-${version}-ga-src.tar.gz";
sha256 = "0b6ximy0dg0xhqbrm1l7pn8hjapgpmddi67kh54h6i9cq9hqfdvz";
};
@@ -57,12 +57,12 @@
};
mysql = stdenv.mkDerivation rec {
- name = "mysql-connector-odbc-${version}";
+ pname = "mysql-connector-odbc";
majorVersion = "5.3";
version = "${majorVersion}.6";
src = fetchurl {
- url = "https://dev.mysql.com/get/Downloads/Connector-ODBC/${majorVersion}/${name}-src.tar.gz";
+ url = "https://dev.mysql.com/get/Downloads/Connector-ODBC/${majorVersion}/${pname}-${version}-src.tar.gz";
sha256 = "1smi4z49i4zm7cmykjkwlxxzqvn7myngsw5bc35z6gqxmi8c55xr";
};
@@ -86,7 +86,7 @@
};
sqlite = stdenv.mkDerivation rec {
- name = "sqlite-connector-odbc-${version}";
+ pname = "sqlite-connector-odbc";
version = "0.9993";
src = fetchurl {
@@ -121,7 +121,7 @@
};
msodbcsql17 = stdenv.mkDerivation rec {
- name = "msodbcsql17-${version}";
+ pname = "msodbcsql17";
version = "${versionMajor}.${versionMinor}.${versionAdditional}-1";
versionMajor = "17";
diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix
index 46eac0fb88bb..61246748ac73 100644
--- a/pkgs/development/libraries/uri/default.nix
+++ b/pkgs/development/libraries/uri/default.nix
@@ -1,15 +1,18 @@
{ stdenv, fetchFromGitHub, cmake, doxygen }:
-stdenv.mkDerivation {
- name = "uri-2017-07-16";
+stdenv.mkDerivation rec {
+ name = "uri-${version}";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "cpp-netlib";
repo = "uri";
- rev = "ac30f19cc7a4745667a8ebd3eac68d5e70b9a4a6";
- sha256 = "0ys295ij071rilwkk3xq1p3sdzgb0gyybvd3f0cahh67kh8hyk6n";
+ rev = "v${version}";
+ sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd";
};
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=parentheses" ];
+
nativeBuildInputs = [ cmake doxygen ];
cmakeFlags = [
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
index 89efdc006a54..9c48488bff8e 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }:
stdenv.mkDerivation rec {
- name = "uriparser-${version}";
+ pname = "uriparser";
version = "0.9.1";
# Release tarball differs from source tarball
src = fetchurl {
- url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2";
+ url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2";
sha256 = "1gisi7h8hd6mswbiaaa3s25bnb77xf37pzrmjy63rcdpwcyqy93m";
};
diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix
index 3d09545c9317..2eee80a76969 100644
--- a/pkgs/development/libraries/usbredir/default.nix
+++ b/pkgs/development/libraries/usbredir/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libusb }:
stdenv.mkDerivation rec {
- name = "usbredir-${version}";
+ pname = "usbredir";
version = "0.8.0";
src = fetchurl {
- url = "https://spice-space.org/download/usbredir/${name}.tar.bz2";
+ url = "https://spice-space.org/download/usbredir/${pname}-${version}.tar.bz2";
sha256 = "002yik1x7kn0427xahvnhjby2np14a6xqw7c3dx530n9h5d9rg47";
};
diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix
index c15259c585ad..18eae87e11c6 100644
--- a/pkgs/development/libraries/ustr/default.nix
+++ b/pkgs/development/libraries/ustr/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ustr-${version}";
+ pname = "ustr";
version = "1.0.4";
src = fetchurl {
- url = "http://www.and.org/ustr/${version}/${name}.tar.bz2";
+ url = "http://www.and.org/ustr/${version}/${pname}-${version}.tar.bz2";
sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx";
};
diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix
index b80984303d76..e6cd08276396 100644
--- a/pkgs/development/libraries/uthash/default.nix
+++ b/pkgs/development/libraries/uthash/default.nix
@@ -3,8 +3,9 @@
let
version = "2.1.0";
in
-stdenv.mkDerivation rec {
- name = "uthash-${version}";
+stdenv.mkDerivation {
+ pname = "uthash";
+ inherit version;
src = fetchurl {
url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix
index 827274251ed9..3d36245631be 100644
--- a/pkgs/development/libraries/v8/3.14.nix
+++ b/pkgs/development/libraries/v8/3.14.nix
@@ -11,14 +11,14 @@ let
arch = if stdenv.is64bit then "x64" else "ia32";
in
-stdenv.mkDerivation rec {
- name = "v8-${version}";
+stdenv.mkDerivation {
+ pname = "v8";
inherit version;
src = fetchFromGitHub {
owner = "v8";
repo = "v8";
- rev = "${version}";
+ rev = version;
inherit sha256;
};
patchPhase = ''
diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix
index a7dddd141246..e134c9ea60f5 100644
--- a/pkgs/development/libraries/v8/3.16.14.nix
+++ b/pkgs/development/libraries/v8/3.16.14.nix
@@ -10,12 +10,12 @@ let
in
stdenv.mkDerivation rec {
- name = "v8-${version}";
+ pname = "v8";
version = "3.16.14.11";
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
- + "${name}.tar.bz2";
+ + "${pname}-${version}.tar.bz2";
sha256 = "1gpf2xvhxfs5ll3m2jlslsx9jfjbmrbz55iq362plflrvf8mbxhj";
};
diff --git a/pkgs/development/libraries/v8/5_x.nix b/pkgs/development/libraries/v8/5_x.nix
index 2b9fa5cc04c0..050abe9e81bf 100644
--- a/pkgs/development/libraries/v8/5_x.nix
+++ b/pkgs/development/libraries/v8/5_x.nix
@@ -17,7 +17,7 @@ let
sharedFlag = if static then "static_library" else "shared_library";
deps = {
- "build" = fetchgit {
+ build = fetchgit {
url = "${git_url}/chromium/src/build.git";
rev = "2c67d4d74b6b3673228fab191918500a582ef3b0";
sha256 = "0jc7hci5yh792pw0ahjfxrk5xzllnlrv9llmwlgcgn2x8x6bn34q";
@@ -32,7 +32,7 @@ let
rev = "b5ecbb29a26532f72ef482569b223d5a51fd50bf";
sha256 = "0ld47wdnk8grcba221z67l3pnphv9zwifk4y44f5b946w3iwmpns";
};
- "buildtools" = fetchgit {
+ buildtools = fetchgit {
url = "${git_url}/chromium/buildtools.git";
rev = "60f7f9a8b421ebf9a46041dfa2ff11c0fe59c582";
sha256 = "0i10bw7yhslklqwcx5krs3k05sicb73cpwd0mkaz96yxsvmkvjq0";
@@ -102,7 +102,7 @@ let
in
stdenv.mkDerivation rec {
- name = "v8-${version}";
+ pname = "v8";
version = "5.4.232";
inherit doCheck;
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index f7c4f34e8e6e..fa2a0f4f5946 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -14,7 +14,7 @@ let
rev = "936ba8a963284a6b3737cf2f0474a7131073abee";
sha256 = "14nr22fqdpxma1kzjflj6a865vr3hfnnm2gs4vcixyq4kmfzfcy2";
};
- "build" = fetchgit {
+ build = fetchgit {
url = "${git_url}/chromium/src/build.git";
rev = "325e95d6dae64f35b160b3dc7d73218cee5ec079";
sha256 = "0dddyxa76p2xpjhmxif05v63i5ar6h5v684fdl667sg84f5bhhxf";
@@ -44,7 +44,7 @@ let
in
stdenv.mkDerivation rec {
- name = "v8-${version}";
+ pname = "v8";
version = "7.4.255";
doCheck = true;
@@ -73,6 +73,11 @@ stdenv.mkDerivation rec {
chmod u+w -R .
'';
+ postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
+ substituteInPlace build/toolchain/linux/BUILD.gn \
+ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
+ '';
+
gnFlags = [
"use_custom_libcxx=false"
"is_clang=${if stdenv.cc.isClang then "true" else "false"}"
@@ -104,6 +109,17 @@ stdenv.mkDerivation rec {
install -D d8 $out/bin/d8
install -D obj/libv8_monolith.a $out/lib/libv8.a
cp -r ../../include $out
+
+ mkdir -p $out/lib/pkgconfig
+ cat > $out/lib/pkgconfig/v8.pc << EOF
+ Name: v8
+ Description: V8 JavaScript Engine
+ Version: ${version}
+ Libs: -L$out/lib -lv8 -pthread
+ Cflags: -I$out/include
+ Libs: -L$out/lib -lpulse
+ Cflags: -I$out/include
+ EOF
'';
meta = with lib; {
diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix
index e0ca0e14b668..782d324c8be0 100644
--- a/pkgs/development/libraries/v8/plv8_6_x.nix
+++ b/pkgs/development/libraries/v8/plv8_6_x.nix
@@ -26,12 +26,12 @@ let
rev = "0e9a47d74970bee1bbfc063c47215406f8918699";
sha256 = "07rbzrlscp8adh4z86yl5jxdnvgkc3xs950xldpk318wf9i3bh6c";
};
- "build" = fetchgit {
+ build = fetchgit {
url = "${git_url}/chromium/src/build.git";
rev = "9338ce52d0b9bcef34c38285fbd5023b62739fac";
sha256 = "1s2sa8dy3waidsirjylc82ggb18l1108bczjc8z0v4ywyj4k0cvh";
};
- "buildtools" = fetchgit {
+ buildtools = fetchgit {
url = "${git_url}/chromium/buildtools.git";
rev = "505de88083136eefd056e5ee4ca0f01fe9b33de8";
sha256 = "0vj216nhb803bggsl0hnyagj8njrm96pn8sim6xcnqb7nhz1vabw";
@@ -111,7 +111,7 @@ let
in
stdenv.mkDerivation rec {
- name = "v8-${version}";
+ pname = "v8";
version = "6.4.388.40";
inherit doCheck;
diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
index 56ded2c56447..678d7dd265c4 100644
--- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
+++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, cmrt, libdrm, libva, libX11, libGL, wayland }:
stdenv.mkDerivation rec {
- name = "intel-hybrid-driver-${version}";
+ pname = "intel-hybrid-driver";
version = "1.0.2";
src = fetchurl {
diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index 640f50eb45bf..722079ff3478 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "intel-vaapi-driver-${version}";
+ pname = "intel-vaapi-driver";
# TODO: go back to stable releases with the next stable release after 2.3.0.
# see: https://github.com/NixOS/nixpkgs/issues/55975 (and the libva comment v)
rev = "329975c63123610fc750241654a3bd18add75beb"; # generally try to match libva version, but not required
diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
index abdf9fbeed3c..8a2e3af4791c 100644
--- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix
+++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "vapoursynth-mvtools-${version}";
+ pname = "vapoursynth-mvtools";
version = "21";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index 53d70f4d369d..0d96829b6baf 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
++ optional imwriSupport imagemagick7;
configureFlags = [
- "--disable-static"
(optionalString (!ocrSupport) "--disable-ocr")
(optionalString (!imwriSupport) "--disable-imwri")
];
diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix
index 1af70056d2eb..18b2659cc5df 100644
--- a/pkgs/development/libraries/vc/0.7.nix
+++ b/pkgs/development/libraries/vc/0.7.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "Vc-${version}";
+ pname = "Vc";
version = "0.7.5";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index 66c8e4fbc531..2194c7be38b9 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "Vc-${version}";
+ pname = "Vc";
version = "1.4.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix
index b7249c8ee82c..eb37d14b532b 100644
--- a/pkgs/development/libraries/vcg/default.nix
+++ b/pkgs/development/libraries/vcg/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, eigen }:
stdenv.mkDerivation rec {
- name = "vcg-${version}";
+ pname = "vcg";
version = "1.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/vid-stab/default.nix b/pkgs/development/libraries/vid-stab/default.nix
index e516c94866a2..eb88b36a1422 100644
--- a/pkgs/development/libraries/vid-stab/default.nix
+++ b/pkgs/development/libraries/vid-stab/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
- name = "vid-stab-${version}";
+ pname = "vid-stab";
version = "0.98b";
src = fetchurl {
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index fb69d4bf63e7..625ec2cee389 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -5,7 +5,7 @@ let
inherit (python2Packages) python numpy;
# Might want to use `python2.withPackages(ps: [ps.numpy]);` here...
in stdenv.mkDerivation rec {
- name = "vigra-${version}";
+ pname = "vigra";
version = "1.11.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix
index 72803e09f075..71bd608e93a1 100644
--- a/pkgs/development/libraries/virglrenderer/default.nix
+++ b/pkgs/development/libraries/virglrenderer/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
- name = "virglrenderer-${version}";
+ pname = "virglrenderer";
version = "0.7.0";
src = fetchurl {
- url = "https://www.freedesktop.org/software/virgl/${name}.tar.bz2";
+ url = "https://www.freedesktop.org/software/virgl/${pname}-${version}.tar.bz2";
sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m";
};
diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix
index e0398487abc3..a68880c2f952 100644
--- a/pkgs/development/libraries/vmime/default.nix
+++ b/pkgs/development/libraries/vmime/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "vmime-${version}";
+ pname = "vmime";
version = "0.9.2";
src = fetchFromGitHub {
owner = "kisli";
diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix
index 18b9278539fc..b9eb29422c54 100644
--- a/pkgs/development/libraries/vmmlib/default.nix
+++ b/pkgs/development/libraries/vmmlib/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "1.6.2";
- name = "vmmlib-${version}";
+ pname = "vmmlib";
src = fetchFromGitHub {
owner = "VMML";
diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix
index f6669f2f8fea..2b0a807bfa75 100644
--- a/pkgs/development/libraries/volume-key/default.nix
+++ b/pkgs/development/libraries/volume-key/default.nix
@@ -6,8 +6,9 @@
let
version = "0.3.11";
-in stdenv.mkDerivation rec {
- name = "volume_key-${version}";
+in stdenv.mkDerivation {
+ pname = "volume_key";
+ inherit version;
src = fetchgit {
url = https://pagure.io/volume_key.git;
diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/development/libraries/vrb/default.nix
index 4f72cc138acf..efd60fe66fb5 100644
--- a/pkgs/development/libraries/vrb/default.nix
+++ b/pkgs/development/libraries/vrb/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "vrb-${version}";
+ pname = "vrb";
version = "0.5.1";
src = fetchurl {
- url = "http://vrb.sourceforge.net/download/${name}.tar.bz2";
+ url = "http://vrb.sourceforge.net/download/${pname}-${version}.tar.bz2";
sha256 = "d579ed1998ef2d78e2ef8481a748d26e1fa12cdda806d2e31d8ec66ffb0e289f";
};
diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix
index e706c730ddd3..fd0e90941b89 100644
--- a/pkgs/development/libraries/vsqlite/default.nix
+++ b/pkgs/development/libraries/vsqlite/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, boost, sqlite }:
stdenv.mkDerivation rec {
- name = "vsqlite-${version}";
+ pname = "vsqlite";
version = "0.3.13";
src = fetchurl {
diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix
index f4e8c128ccbf..e091f6a3917b 100644
--- a/pkgs/development/libraries/vte/2.90.nix
+++ b/pkgs/development/libraries/vte/2.90.nix
@@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://www.gnome.org/;
- description = "A library implementing a terminal emulator widget for GTK+";
+ description = "A library implementing a terminal emulator widget for GTK";
longDescription = ''
VTE is a library (libvte) implementing a terminal emulator widget for
- GTK+, and a minimal sample application (vte) using that. Vte is
+ GTK, and a minimal sample application (vte) using that. Vte is
mainly used in gnome-terminal, but can also be used to embed a
console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
character set conversion, as well as emulating any terminal known to
diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix
index 273072e93239..35bc881d3d1c 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/pkgs/development/libraries/vte/default.nix
@@ -34,10 +34,10 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://www.gnome.org/;
- description = "A library implementing a terminal emulator widget for GTK+";
+ description = "A library implementing a terminal emulator widget for GTK";
longDescription = ''
VTE is a library (libvte) implementing a terminal emulator widget for
- GTK+, and a minimal sample application (vte) using that. Vte is
+ GTK, and a minimal sample application (vte) using that. Vte is
mainly used in gnome-terminal, but can also be used to embed a
console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
character set conversion, as well as emulating any terminal known to
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index e2a82b7adcda..c0b8fd7d1679 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -8,8 +8,8 @@ with stdenv.lib;
let
os = stdenv.lib.optionalString;
- majorVersion = "7.0";
- minorVersion = "0";
+ majorVersion = "7.1";
+ minorVersion = "1";
version = "${majorVersion}.${minorVersion}";
in
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
name = "vtk-${os (qtLib != null) "qvtk-"}${version}";
src = fetchurl {
url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
- sha256 = "1hrjxkcvs3ap0bdhk90vymz5pgvxmg7q6sz8ab3wsyddbshr1abq";
+ sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
};
buildInputs = [ cmake ]
diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index f7c1bf9a65b9..4ea8d69a498b 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "vulkan-headers-${version}";
- version = "1.1.106";
+ pname = "vulkan-headers";
+ version = "1.1.114.0";
- buildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake ];
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Headers";
rev = "sdk-${version}";
- sha256 = "0idw7q715ikj575qmspvgq2gzc6c1sj581b8z3xnv6wz9qbzrmsd";
+ sha256 = "0fdvh26nxibylh32lj8b62d9nf9j25xa0il9zg362wmr2zgm8gka";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index a44e91e1bf5c..3cdf8f08651f 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -2,40 +2,32 @@
, xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }:
let
- version = "1.1.106";
+ version = "1.1.114.0";
in
assert version == vulkan-headers.version;
-stdenv.mkDerivation rec {
- name = "vulkan-loader-${version}";
+stdenv.mkDerivation {
+ pname = "vulkan-loader";
inherit version;
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Loader";
rev = "sdk-${version}";
- sha256 = "0zhrwj1gi90x2w8gaaaw5h4b969a8gfy244kn0drrplhhb1nqz3b";
+ sha256 = "08nibkbjf3g32qyp5bpdvj7i0zdv5ds1n5y52z8pvyzkpiz7s6ww";
};
- nativeBuildInputs = [ pkgconfig addOpenGLRunpath ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ];
enableParallelBuilding = true;
- patches = [ ./system-search-path.patch ];
-
cmakeFlags = [
- "-DSYSTEM_SEARCH_PATH=${addOpenGLRunpath.driverLink}/share"
+ "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"
"-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"
];
outputs = [ "out" "dev" ];
- # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found.
- # See the explanation in addOpenGLRunpath.
- postFixup = ''
- addOpenGLRunpath $out/lib/libvulkan.so
- '';
-
meta = with stdenv.lib; {
description = "LunarG Vulkan loader";
homepage = https://www.lunarg.com;
diff --git a/pkgs/development/libraries/vulkan-loader/system-search-path.patch b/pkgs/development/libraries/vulkan-loader/system-search-path.patch
deleted file mode 100644
index 26f83e6d534f..000000000000
--- a/pkgs/development/libraries/vulkan-loader/system-search-path.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9ac5ce835..cbdb0ff56 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -88,6 +88,12 @@ if(UNIX)
- STRING
- "Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant."
- )
-+ set(
-+ SYSTEM_SEARCH_PATH ""
-+ CACHE
-+ STRING
-+ "Search path to always use, after all other search paths."
-+ )
- endif()
-
- if(UNIX AND NOT APPLE) # i.e.: Linux
-@@ -184,6 +190,7 @@ if(UNIX)
- add_definitions(-DFALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}")
- add_definitions(-DFALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}")
- add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}")
-+ add_definitions(-DSYSTEM_SEARCH_PATH="${SYSTEM_SEARCH_PATH}")
-
- # Make sure /etc is searched by the loader
- if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc"))
-diff --git a/loader/loader.c b/loader/loader.c
-index 0d3b5a947..abe357004 100644
---- a/loader/loader.c
-+++ b/loader/loader.c
-@@ -3688,6 +3688,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e
- search_path_size += DetermineDataFilePathSize(xdgdatahome, rel_size);
- search_path_size += DetermineDataFilePathSize(home_root, rel_size);
- }
-+ search_path_size += DetermineDataFilePathSize(SYSTEM_SEARCH_PATH, rel_size);
- #endif
- }
- }
-@@ -3737,6 +3738,7 @@ static VkResult ReadDataFilesInSearchPaths(const struct loader_instance *inst, e
- CopyDataFilePath(xdgdatahome, relative_location, rel_size, &cur_path_ptr);
- CopyDataFilePath(home_root, relative_location, rel_size, &cur_path_ptr);
- }
-+ CopyDataFilePath(SYSTEM_SEARCH_PATH, relative_location, rel_size, &cur_path_ptr);
- }
-
- // Remove the last path separator
diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix
index 8af33c10319c..cd0b8bdb29dd 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/pkgs/development/libraries/wavpack/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libiconv, fetchpatch }:
stdenv.mkDerivation rec {
- name = "wavpack-${version}";
+ pname = "wavpack";
version = "5.1.0";
enableParallelBuilding = true;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
src = fetchurl {
- url = "http://www.wavpack.com/${name}.tar.bz2";
+ url = "http://www.wavpack.com/${pname}-${version}.tar.bz2";
sha256 = "0i19c6krc0p9krwrqy9s5xahaafigqzxcn31piidmlaqadyn4f8r";
};
@@ -69,6 +69,16 @@ stdenv.mkDerivation rec {
name = "CVE-2019-1010319.patch";
sha256 = "011sqdgpykilaj2c4ns298z7aad03yprpva0dqr39nx88ji6jnrb";
})
+ (fetchpatch {
+ url = "https://github.com/dbry/WavPack/commit/36a24c7881427d2e1e4dc1cef58f19eee0d13aec.patch";
+ name = "CVE-2018-7253.patch";
+ sha256 = "130kvmlpaj6x1pm6qzdzrmf4xzhp0pj29qrardb76zcfinx5pk2n";
+ })
+ (fetchpatch {
+ url = "https://github.com/dbry/WavPack/commit/8e3fe45a7bac31d9a3b558ae0079e2d92a04799e.patch";
+ name = "CVE-2018-7254.patch";
+ sha256 = "06fdzw2cbdj8ajf171z1g53cl6bf1cdh2czswqldrqqvv3jkzk77";
+ })
];
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix
index 3fda417d8e1f..7572051b1de0 100644
--- a/pkgs/development/libraries/wayland/1.9.nix
+++ b/pkgs/development/libraries/wayland/1.9.nix
@@ -7,11 +7,11 @@
assert expat != null;
stdenv.mkDerivation rec {
- name = "wayland-${version}";
+ pname = "wayland";
version = "1.9.0";
src = fetchurl {
- url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
+ url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww";
};
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index b14dc03385cf..0b367f4a930f 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
- name = "wayland-protocols-${version}";
- version = "1.17";
+ pname = "wayland-protocols";
+ version = "1.18";
src = fetchurl {
- url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
- sha256 = "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz";
+ url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
+ sha256 = "1cvl93h83ymbfhb567jv5gzyq08181w7c46rsw4xqqqpcvkvfwrx";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index 5f9015fa9609..b0c8c1edd66b 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "6.4";
- name = "wcslib-${version}";
+ pname = "wcslib";
buildInputs = [ flex ];
src = fetchurl {
- url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2";
+ url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2";
sha256 ="003h23m6d5wcs29v2vbnl63f3z35k5x70lpsqlz5c9bp1bvizh8k";
};
diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 04758ace7fa4..060109072b49 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -14,11 +14,11 @@ assert stdenv.isDarwin -> !enableCredentialStorage;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "webkitgtk-${version}";
+ pname = "webkitgtk";
version = "2.4.11";
meta = with stdenv.lib; {
- description = "Web content rendering engine, GTK+ port";
+ description = "Web content rendering engine, GTK port";
homepage = http://webkitgtk.org/;
license = licenses.bsd2;
platforms = with platforms; linux ++ darwin;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
};
src = fetchurl {
- url = "https://webkitgtk.org/releases/${name}.tar.xz";
+ url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
sha256 = "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq";
};
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 927301589b4c..c0fae2f71765 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -14,11 +14,11 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "webkitgtk-${version}";
- version = "2.24.3";
+ pname = "webkitgtk";
+ version = "2.24.4";
meta = {
- description = "Web content rendering engine, GTK+ port";
+ description = "Web content rendering engine, GTK port";
homepage = https://webkitgtk.org/;
license = licenses.bsd2;
platforms = platforms.linux;
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
};
src = fetchurl {
- url = "https://webkitgtk.org/releases/${name}.tar.xz";
- sha256 = "0lbcrw5axwrbrajxq7fqywfyh0djqi23ynzb5wi5ghw2grnp83cl";
+ url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
+ sha256 = "1n3x5g1z6rg9n1ssna7wi0z6zlprjm4wzk544v14wqi6q0lv2s46";
};
patches = optionals stdenv.isDarwin [
diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix
index d84f30aad55b..84fbda503eac 100644
--- a/pkgs/development/libraries/websocket++/default.nix
+++ b/pkgs/development/libraries/websocket++/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "websocket++-${version}";
+ pname = "websocket++";
version = "0.8.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index bccf4f69e9d2..2ebad693de50 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -25,7 +25,7 @@ let
optLeveldb = shouldUsePkg leveldb;
in
stdenv.mkDerivation rec {
- name = "wiredtiger-${version}";
+ pname = "wiredtiger";
version = "3.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 549e492e944c..780d7df47cb0 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "wolfssl-${version}";
+ pname = "wolfssl";
version = "4.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index ba77189b2a55..319b0effc578 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -1,13 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu
, pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl
-, pcre
+, pcre, harfbuzz
}:
let
generic =
{ version, sha256 }:
- stdenv.mkDerivation rec {
- name = "wt-${version}";
+ stdenv.mkDerivation {
+ pname = "wt";
+ inherit version;
src = fetchFromGitHub {
owner = "emweb";
@@ -30,6 +31,7 @@ let
"-DWT_CPP_11_MODE=-std=c++11"
"-DGM_PREFIX=${graphicsmagick}"
"-DMYSQL_PREFIX=${mysql.connector-c}"
+ "-DHARFBUZZ_INCLUDE_DIR=${harfbuzz.dev}/include"
"--no-warn-unused-cli"
];
@@ -43,12 +45,12 @@ let
};
in {
wt3 = generic {
- version = "3.4.0";
- sha256 = "0y0b2h9jf5cg1gdh48dj32pj5nsvipab1cgygncxf98c46ikhysg";
+ version = "3.4.1";
+ sha256 = "1bsx7hmy6g2x9p3vl5xw9lv1xk891pnvs93a87s15g257gznkjmj";
};
wt4 = generic {
- version = "4.1.0";
- sha256 = "1a9nl5gs8m8pssf2l3z6kbl2rc9fw5ad7lfslw5yr3gzi0zqn05x";
+ version = "4.1.1";
+ sha256 = "1f1imx5kbpqlysrqx5h75hf2f8pkq972rz42x0pl6cxbnsyzngid";
};
}
diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix
index ce8e3f0f677c..bdc8f8c3435c 100644
--- a/pkgs/development/libraries/wxSVG/default.nix
+++ b/pkgs/development/libraries/wxSVG/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
- name = "wxSVG-${version}";
+ pname = "wxSVG";
srcName = "wxsvg-${version}";
version = "1.5.20";
diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix
index 49f12842533b..a528166f68a0 100644
--- a/pkgs/development/libraries/wxsqlite3/default.nix
+++ b/pkgs/development/libraries/wxsqlite3/default.nix
@@ -2,7 +2,7 @@
, darwin }:
stdenv.mkDerivation rec {
- name = "wxsqlite3-${version}";
+ pname = "wxsqlite3";
version = "3.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix
index 998f6a9e5f69..9ca15d4977b9 100644
--- a/pkgs/development/libraries/wxsqliteplus/default.nix
+++ b/pkgs/development/libraries/wxsqliteplus/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }:
stdenv.mkDerivation rec {
- name = "wxsqliteplus-${version}";
+ pname = "wxsqliteplus";
version = "0.3.6";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix
index b952e8b12673..38ee4376ac2d 100644
--- a/pkgs/development/libraries/wxwidgets/2.8/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix
@@ -12,7 +12,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "2.8.12.1";
- name = "wxGTK-${version}";
+ pname = "wxGTK";
src = fetchurl {
url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix
index 369d011f9b3c..02367e18a95b 100644
--- a/pkgs/development/libraries/wxwidgets/2.9/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix
@@ -15,7 +15,8 @@ let
version = "2.9.4";
in
stdenv.mkDerivation {
- name = "wxwidgets-${version}";
+ pname = "wxwidgets";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index b33b0b15331a..a12447562b81 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -18,7 +18,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "3.0.4";
- name = "wxwidgets-${version}";
+ pname = "wxwidgets";
src = fetchFromGitHub {
owner = "wxWidgets";
diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index cbe8bd8ac5ee..5236996199d6 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
version = "3.0.4";
- name = "wxmac-${version}";
+ pname = "wxmac";
src = fetchzip {
url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz";
diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix
index cee967ef2aa0..8fe75153de6d 100644
--- a/pkgs/development/libraries/wxwidgets/3.1/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix
@@ -17,7 +17,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "3.1.2";
- name = "wxwidgets-${version}";
+ pname = "wxwidgets";
src = fetchFromGitHub {
owner = "wxWidgets";
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index f2189cb014ec..634847941d00 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -16,7 +16,7 @@ let
in
stdenv.mkDerivation rec {
- name = "x265-${version}";
+ pname = "x265";
version = "3.1.1";
src = fetchurl {
diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix
index aeb741dbae7b..92a932a01a4a 100644
--- a/pkgs/development/libraries/xalanc/default.nix
+++ b/pkgs/development/libraries/xalanc/default.nix
@@ -5,7 +5,7 @@ let
if stdenv.isDarwin then "macosx" else
throw "Unsupported platform";
in stdenv.mkDerivation rec {
- name = "xalan-c-${version}";
+ pname = "xalan-c";
version = "1.11";
src = fetchurl {
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 271c7adf3d98..bb14f3437ba5 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -2,8 +2,9 @@
, libuuid, zlib }:
let
- generic = version: sha256: stdenv.mkDerivation rec {
- name = "xapian-${version}";
+ generic = version: sha256: stdenv.mkDerivation {
+ pname = "xapian";
+ inherit version;
passthru = { inherit version; };
src = fetchurl {
@@ -36,7 +37,5 @@ let
};
};
in {
- # xapian-ruby needs 1.2.22 as of 2017-05-06
- xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
xapian_1_4 = generic "1.4.12" "0z5c1y9vp519h2x2igjq39v6j615nppry0wasd0xn4hphgd3d2jg";
}
diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix
index 1203f19d6c82..6c8eda6358b2 100644
--- a/pkgs/development/libraries/xapian/tools/omega/default.nix
+++ b/pkgs/development/libraries/xapian/tools/omega/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib, libmagic }:
stdenv.mkDerivation rec {
- name = "xapian-omega-${version}";
+ pname = "xapian-omega";
inherit (xapian) version;
src = fetchurl {
diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix
index 31c31164e010..a5536f70a902 100644
--- a/pkgs/development/libraries/xavs/default.nix
+++ b/pkgs/development/libraries/xavs/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchsvn }:
stdenv.mkDerivation rec {
- name = "xavs-${version}";
+ pname = "xavs";
version = "55";
src = fetchsvn {
url = "https://svn.code.sf.net/p/xavs/code/trunk";
- rev = "${version}";
+ rev = version;
sha256 = "0drw16wm95dqszpl7j33y4gckz0w0107lnz6wkzb66f0dlbv48cf";
};
diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
index e343c301127f..4764c1bdb93c 100644
--- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig
, xorg, gnum4, libxcb, gperf }:
-stdenv.mkDerivation rec {
- name = "xcb-util-cursor-0.1.1-3-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "xcb-util-cursor-0.1.1-3-unstable";
version = "2017-04-05";
src = fetchgit {
diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix
index 8ad4e6d6a8a6..704884c23f3e 100644
--- a/pkgs/development/libraries/xercesc/default.nix
+++ b/pkgs/development/libraries/xercesc/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "xerces-c-${version}";
+ pname = "xerces-c";
version = "3.2.2";
src = fetchurl {
- url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz";
+ url = "mirror://apache/xerces/c/3/sources/${pname}-${version}.tar.gz";
sha256 = "04q4c460wqzyzmprjm22igcm1d52xr20ajxnhr33nv95mbw92qfx";
};
diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index 74d263a94179..f4687bd46f85 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -7,7 +7,7 @@
assert ncclSupport -> cudaSupport;
stdenv.mkDerivation rec {
- name = "xgboost-${version}";
+ pname = "xgboost";
version = "0.90";
# needs submodules
diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix
index 718554b20a48..3d1b4ea74db8 100644
--- a/pkgs/development/libraries/xlslib/default.nix
+++ b/pkgs/development/libraries/xlslib/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, unzip }:
stdenv.mkDerivation rec {
- name = "xlslib-${version}";
+ pname = "xlslib";
version = "2.5.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix
index 35ae93e79392..74846c8306dd 100644
--- a/pkgs/development/libraries/xml-security-c/default.nix
+++ b/pkgs/development/libraries/xml-security-c/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, xalanc, xercesc, openssl, pkgconfig }:
stdenv.mkDerivation rec {
- name = "xml-security-c-${version}";
+ pname = "xml-security-c";
version = "2.0.2";
src = fetchurl {
- url = "https://www.apache.org/dist/santuario/c-library/${name}.tar.gz";
+ url = "https://www.apache.org/dist/santuario/c-library/${pname}-${version}.tar.gz";
sha256 = "1prh5sxzipkqglpsh53iblbr7rxi54wbijxdjiahzjmrijqa40y3";
};
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
"--with-openssl"
"--with-xerces"
"--with-xalan"
- "--disable-static"
];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix
index fbe515f6217f..d5e1eb08fa49 100644
--- a/pkgs/development/libraries/xml-tooling-c/default.nix
+++ b/pkgs/development/libraries/xml-tooling-c/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "xml-tooling-c-${version}";
+ pname = "xml-tooling-c";
version = "3.0.4";
src = fetchgit {
diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
index b19bf000b0d4..25c5bf458887 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -4,8 +4,9 @@
let
version = "1.2.28";
in
-stdenv.mkDerivation rec {
- name = "xmlsec-${version}";
+stdenv.mkDerivation {
+ pname = "xmlsec";
+ inherit version;
src = fetchurl {
url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix
index 051a194af98e..bd87d306b965 100644
--- a/pkgs/development/libraries/xsd/default.nix
+++ b/pkgs/development/libraries/xsd/default.nix
@@ -3,8 +3,8 @@
let
fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"'';
in
-stdenv.mkDerivation rec {
- name = "xsd-${version}";
+stdenv.mkDerivation {
+ pname = "xsd";
version = "4.0.0";
src = fetchurl {
diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix
index 17d7320cb648..5ec96157a79c 100644
--- a/pkgs/development/libraries/xvidcore/default.nix
+++ b/pkgs/development/libraries/xvidcore/default.nix
@@ -2,11 +2,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "xvidcore-${version}";
+ pname = "xvidcore";
version = "1.3.5";
src = fetchurl {
- url = "http://downloads.xvid.org/downloads/${name}.tar.bz2";
+ url = "http://downloads.xvid.org/downloads/${pname}-${version}.tar.bz2";
sha256 = "1d0hy1w9sn6491a3vhyf3vmhq4xkn6yd4ralx1191s6qz5wz483w";
};
diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix
index 70701f2d070e..51165f47a219 100644
--- a/pkgs/development/libraries/xxHash/default.nix
+++ b/pkgs/development/libraries/xxHash/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "xxHash-${version}";
+ pname = "xxHash";
version = "0.7.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix
index c9c84f4e1d89..155e46c8f8c6 100644
--- a/pkgs/development/libraries/xylib/default.nix
+++ b/pkgs/development/libraries/xylib/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }:
stdenv.mkDerivation rec {
- name = "xylib-${version}";
+ pname = "xylib";
version = "1.5";
src = fetchurl {
- url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${name}.tar.bz2";
+ url = "https://github.com/wojdyr/xylib/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "1r2kx80zhdvz39k6h2fsncm2742xxvxl3z8a3fnr13jl9sl7mnnd";
};
diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix
index 6305b6c03a46..d3df30e03e18 100644
--- a/pkgs/development/libraries/yojimbo/default.nix
+++ b/pkgs/development/libraries/yojimbo/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "yojimbo";
version = "1.1";
diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index c5dc775d0755..9e3b06453bfa 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
- configureFlags = [ "--with-session-bus-services-dir=${placeholder ''out''}/share/dbus-1/services" ];
+ configureFlags = [ "--with-session-bus-services-dir=${placeholder "out"}/share/dbus-1/services" ];
nativeBuildInputs = [
autoconf automake libtool pkgconfig gettext gobject-introspection vala python2Packages.python
diff --git a/pkgs/development/libraries/zeroc-ice/3.6.nix b/pkgs/development/libraries/zeroc-ice/3.6.nix
new file mode 100644
index 000000000000..dd983a34f883
--- /dev/null
+++ b/pkgs/development/libraries/zeroc-ice/3.6.nix
@@ -0,0 +1,67 @@
+{ stdenv, lib, fetchFromGitHub, fetchpatch, mcpp, bzip2, expat, openssl, db5
+, darwin, libiconv, Security
+, cpp11 ? false
+}:
+
+stdenv.mkDerivation rec {
+ pname = "zeroc-ice";
+ version = "3.6.3";
+
+ src = fetchFromGitHub {
+ owner = "zeroc-ice";
+ repo = "ice";
+ rev = "v${version}";
+ sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2";
+ };
+
+ buildInputs = [ mcpp bzip2 expat openssl db5 ]
+ ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
+
+ postUnpack = ''
+ sourceRoot=$sourceRoot/cpp
+ '';
+
+ prePatch = lib.optional stdenv.isDarwin ''
+ substituteInPlace config/Make.rules.Darwin \
+ --replace xcrun ""
+ '';
+
+ patches = [
+ # Fixes compilation issues with GCC 8 using one of the patches
+ # provided in https://github.com/zeroc-ice/ice/issues/82
+ ( fetchpatch {
+ url = "https://github.com/zeroc-ice/ice/commit/a6a4981616b669432ff7b588179d6e93694d9e3f.patch";
+ sha256 = "17j5r7gsa3izrm7zln4mrp7l16h532gvmpas0kzglybicbiz7d56";
+ stripLen = 1;
+ })
+ ];
+
+ preBuild = ''
+ makeFlagsArray+=(
+ "prefix=$out"
+ "OPTIMIZE=yes"
+ "USR_DIR_INSTALL=yes"
+ "CONFIGS=${if cpp11 then "cpp11-shared" else "shared"}"
+ "SKIP=slice2py" # provided by a separate package
+ )
+ '';
+
+ # cannot find -lIceXML (linking bin/transformdb)
+ enableParallelBuilding = false;
+
+ outputs = [ "out" "bin" "dev" ];
+
+ postInstall = ''
+ mkdir -p $bin $dev/share
+ mv $out/bin $bin
+ mv $out/share/Ice-* $dev/share/ice
+ rm -rf $out/share/slice
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://www.zeroc.com/ice.html;
+ description = "The internet communications engine";
+ license = licenses.gpl2;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix
index 82b53402fc78..e4d0c0fde174 100644
--- a/pkgs/development/libraries/zeroc-ice/default.nix
+++ b/pkgs/development/libraries/zeroc-ice/default.nix
@@ -1,41 +1,72 @@
-{ stdenv, fetchFromGitHub, mcpp, bzip2, expat, openssl, db5
+{ stdenv, lib, fetchFromGitHub, mcpp, bzip2, expat, openssl, lmdb
, darwin, libiconv, Security
+, cpp11 ? false
}:
-stdenv.mkDerivation rec {
- name = "zeroc-ice-${version}";
- version = "3.6.3";
+let
+ zeroc_mcpp = mcpp.overrideAttrs (self: rec {
+ pname = "zeroc-mcpp";
+ version = "2.7.2.14";
+
+ src = fetchFromGitHub {
+ owner = "zeroc-ice";
+ repo = "mcpp";
+ rev = "v${version}";
+ sha256 = "1psryc2ql1cp91xd3f8jz84mdaqvwzkdq2pr96nwn03ds4cd88wh";
+ };
+
+ installFlags = [ "PREFIX=$(out)" ];
+ });
+
+in stdenv.mkDerivation rec {
+ pname = "zeroc-ice";
+ version = "3.7.2";
src = fetchFromGitHub {
owner = "zeroc-ice";
repo = "ice";
rev = "v${version}";
- sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2";
+ sha256 = "0m9lh79dfpcwcp2jhmj0wqdcsw3rl633x2hzfw9n2i34jjv64fvg";
};
- patches = [ ./makefile.patch ];
+ buildInputs = [ zeroc_mcpp bzip2 expat openssl lmdb ]
+ ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
- buildInputs = [ mcpp bzip2 expat openssl db5 ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=class-memaccess" ];
- postUnpack = ''
- sourceRoot=$sourceRoot/cpp
- '';
-
- prePatch = ''
- substituteInPlace config/Make.rules.Darwin \
+ prePatch = lib.optional stdenv.isDarwin ''
+ substituteInPlace Make.rules.Darwin \
--replace xcrun ""
'';
- makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ];
+ preBuild = ''
+ makeFlagsArray+=(
+ "prefix=$out"
+ "OPTIMIZE=yes"
+ "USR_DIR_INSTALL=yes"
+ "LANGUAGES=cpp"
+ "CONFIGS=${if cpp11 then "cpp11-shared" else "shared"}"
+ "SKIP=slice2py" # provided by a separate package
+ )
+ '';
- # cannot find -lIceXML (linking bin/transformdb)
- #enableParallelBuilding = true;
+ buildFlags = [ "srcs" ]; # no tests; they require network
+
+ enableParallelBuilding = true;
+
+ outputs = [ "out" "bin" "dev" ];
+
+ postInstall = ''
+ mkdir -p $bin $dev/share
+ mv $out/bin $bin
+ mv $out/share/ice $dev/share
+ '';
meta = with stdenv.lib; {
homepage = http://www.zeroc.com/ice.html;
description = "The internet communications engine";
license = licenses.gpl2;
platforms = platforms.unix;
+ maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/pkgs/development/libraries/zeroc-ice/makefile.patch b/pkgs/development/libraries/zeroc-ice/makefile.patch
deleted file mode 100644
index 6955bcd0a6d7..000000000000
--- a/pkgs/development/libraries/zeroc-ice/makefile.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -77,4 +77,6 @@ FreezeScript: Freeze
- Glacier2 IceGridLib Glacier2CryptPermissionsVerifier: Glacier2Lib
-
-+Glacier2: IceSSL
-+
- IcePatch2: IcePatch2Lib
-
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index 8a89d2ae1c74..db5d90e2f021 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, asciidoc, enableDrafts ? false }:
stdenv.mkDerivation rec {
- name = "zeromq-${version}";
+ pname = "zeromq";
version = "4.3.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix
index 9b7a90266284..1b74b8c5388b 100644
--- a/pkgs/development/libraries/zimlib/default.nix
+++ b/pkgs/development/libraries/zimlib/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, lzma }:
stdenv.mkDerivation rec {
- name = "zimlib-${version}";
+ pname = "zimlib";
version = "1.4";
src = fetchurl {
- url = "http://www.openzim.org/download/${name}.tar.gz";
+ url = "http://www.openzim.org/download/${pname}-${version}.tar.gz";
sha256 = "14ra3iq42x53k1nqxb5lsg4gadlkpkgv6cbjjl6305ajmbrghcdq";
};
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 592abea4ea04..b0f8ae503ea4 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -96,6 +96,9 @@ stdenv.mkDerivation (rec {
"LIBRARY_PATH=$(out)/lib"
];
+ enableParallelBuilding = true;
+ doCheck = true;
+
makeFlags = [
"PREFIX=${stdenv.cc.targetPrefix}"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix
index 330b91e995d9..5c6015757420 100644
--- a/pkgs/development/libraries/zlog/default.nix
+++ b/pkgs/development/libraries/zlog/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.2.14";
- name = "zlog-${version}";
+ pname = "zlog";
src = fetchzip {
- name = "${name}-src";
+ name = "${pname}-${version}-src";
url = "https://github.com/HardySimpson/zlog/archive/${version}.tar.gz";
sha256 = "1qcrfmh2vbarkx7ij3gwk174qmgmhm2j336bfaakln1ixd9lkxa5";
};
diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/development/libraries/zmqpp/default.nix
index f7e849f6a334..98211e6e3eb5 100644
--- a/pkgs/development/libraries/zmqpp/default.nix
+++ b/pkgs/development/libraries/zmqpp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, zeromq }:
stdenv.mkDerivation rec {
- name = "zmqpp-${version}";
+ pname = "zmqpp";
version = "4.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix
index 58e1940a3ef4..4f69c1c80790 100644
--- a/pkgs/development/libraries/zookeeper_mt/default.nix
+++ b/pkgs/development/libraries/zookeeper_mt/default.nix
@@ -1,20 +1,21 @@
{ stdenv, zookeeper, bash }:
stdenv.mkDerivation rec {
- name = "zookeeper_mt-${stdenv.lib.getVersion zookeeper}";
-
- src = zookeeper.src;
-
- setSourceRoot = "export sourceRoot=${zookeeper.name}/src/c";
+ name = "zookeeper_mt-${stdenv.lib.getVersion zookeeper}";
- buildInputs = [ zookeeper bash ];
+ src = zookeeper.src;
- meta = with stdenv.lib; {
- homepage = http://zookeeper.apache.org;
- description = "Apache Zookeeper";
- license = licenses.asl20;
- maintainers = [ maintainers.boothead ];
- platforms = platforms.unix;
- };
+ setSourceRoot = "export sourceRoot=${zookeeper.name}/src/c";
+
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" ];
+
+ buildInputs = [ zookeeper bash ];
+
+ meta = with stdenv.lib; {
+ homepage = http://zookeeper.apache.org;
+ description = "Apache Zookeeper";
+ license = licenses.asl20;
+ maintainers = [ maintainers.boothead ];
+ platforms = platforms.unix;
+ };
}
-
diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix
index 65509d766b96..78983f095439 100644
--- a/pkgs/development/libraries/zxcvbn-c/default.nix
+++ b/pkgs/development/libraries/zxcvbn-c/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "zxcvbn-c-${version}";
+ pname = "zxcvbn-c";
version = "2.4";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index 010c73336b92..8b199d3e89a2 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -1,7 +1,7 @@
{ docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib, fetchpatch }:
stdenv.mkDerivation rec {
- name = "zziplib-${version}";
+ pname = "zziplib";
version = "0.13.69";
src = fetchurl {
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 083398029504..d9478c60db88 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -36,8 +36,8 @@ let lispPackages = rec {
};
};
- quicklisp-to-nix-system-info = stdenv.mkDerivation rec {
- name = "quicklisp-to-nix-system-info-${version}";
+ quicklisp-to-nix-system-info = stdenv.mkDerivation {
+ pname = "quicklisp-to-nix-system-info";
version = "1.0.0";
src = ./quicklisp-to-nix;
nativeBuildInputs = [sbcl];
@@ -57,8 +57,8 @@ let lispPackages = rec {
dontStrip = true;
};
- quicklisp-to-nix = stdenv.mkDerivation rec {
- name = "quicklisp-to-nix-${version}";
+ quicklisp-to-nix = stdenv.mkDerivation {
+ pname = "quicklisp-to-nix";
version = "1.0.0";
src = ./quicklisp-to-nix;
buildDependencies = [sbcl quicklisp-to-nix-system-info];
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
index a5fddd417fa1..729f5937117e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''_3bmd'';
version = ''20171019-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
index a657159a41f1..cbfcb6f43619 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''abnf'';
version = ''cl-20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 48dd57aac54b..586502945ba6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''alexandria'';
version = ''20181210-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
index 61a07c61ca07..5921b5f49b12 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''anaphora'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index 40d5aed49917..1d64784a0a64 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''array-utils'';
version = ''20181018-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
index 68c8a7e087b5..482752f2c7f2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
-rec {
+{
baseName = ''asdf-finalizers'';
version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
index 65df45d95a50..1d1ef41f2d16 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''asdf-system-connections'';
version = ''20170124-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
index 4f438eb734a8..5251cbc920fa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''babel-streams'';
version = ''babel-20171227-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
index 4cba3e86e068..d8a12f6edbe3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''babel'';
version = ''20171227-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
index a660882f36b1..d7cebabb0adf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''blackbird'';
version = ''20160531-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index c5305587a029..530a3b76d301 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''bordeaux-threads'';
version = ''v0.8.6'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
index 5d7f3f2dd10b..71a7a1894a25 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''buildnode-xhtml'';
version = ''buildnode-20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
index 0a2e56a9c9b8..26d907c2524c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''buildnode'';
version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index 6cf810707343..d159ce49581e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''caveman'';
version = ''20181210-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index a7d22ac129b9..c4e3b9b57340 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cffi-grovel'';
version = ''cffi_0.20.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
index 3d2463806073..db85c50a5c1e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cffi-toolchain'';
version = ''cffi_0.20.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index b83b14611978..08115ea3a3ab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cffi'';
version = ''cffi_0.20.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index c30c68e53c8d..c9700a9d0091 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''chipz'';
version = ''20190202-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index 4a533220caf5..3209735adb59 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''chunga'';
version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
index 2e387d29833f..ea812b38c954 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''circular-streams'';
version = ''20161204-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index 531d429df244..9ffc4c0d39ef 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-aa'';
version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
index 5f93167a1141..5dab19a55319 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-annot'';
version = ''20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
index a413743eb8d5..8459e32fd045 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-anonfun'';
version = ''20111203-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
index 9b053c920e32..1e61d4e48e75 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-ansi-text'';
version = ''20150804-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index d84233c43424..e366dc551d60 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-async-repl'';
version = ''cl-async-20190307-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index c13b8b70647d..d18c95153ff5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-async-ssl'';
version = ''cl-async-20190307-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index 363227534a8b..876a24055c21 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-async'';
version = ''20190307-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
index a4a9a9261fd6..8aa43a81f190 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-base64'';
version = ''20150923-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
index 36641b73b750..aed744e04338 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-cli'';
version = ''20151218-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
index 0d0337a65cec..9b69bf886c0e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-colors'';
version = ''20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
index ebff2928c3ea..9b558402ce6a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-containers'';
version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
index a3aacd0aa8bd..62f895b20279 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-cookie'';
version = ''20150804-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
index 56ccab7b5cd5..82b63ca088dd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-csv'';
version = ''20180831-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index bdc5fe920cf6..7a1b7d9f8639 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-dbi'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index 1510495a4cbc..d6fb845aa386 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-emb'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
index d032b4768dd6..f92d9c464cf4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-fad'';
version = ''20180430-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index 6a40d0fa8c92..399abebe6e70 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-fuse-meta-fs'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index de71e2e299ad..b0e6159e6262 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-fuse'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
index 61a35f2b58c6..365360ba896b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-html-parse'';
version = ''20161031-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
index dde2cc31dd05..7f20a171734a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-html5-parser'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
index b0be8c775a37..feefecf75bbb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-interpol'';
version = ''20180711-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
index 713aff0ea405..66fb98ee0dec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-jpeg'';
version = ''20170630-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
index d8bc535f3559..9faf2b1b3888 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-json'';
version = ''20141217-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index dfabda0428f0..0c276740f90a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-l10n-cldr'';
version = ''20120909-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
index f37e653bc564..1a13df679283 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-l10n'';
version = ''20161204-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index 36d15673427c..cbbc8ccb0b21 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-libuv'';
version = ''20190107-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
index d506acf876ee..9c623c2278ec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
-rec {
+{
baseName = ''cl-log'';
version = ''cl-log.1.0.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
index f52952af3e1a..0f3d0c126ff7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-markdown'';
version = ''20101006-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index b1916c27bfdd..7b5b7fb3e1ab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-markup'';
version = ''20131003-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
index 1590f2536e34..c8460177a244 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-mysql'';
version = ''20171019-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
index cfca59e3b503..c096c4d2728b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-paths-ttf'';
version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
index e8034b11c237..0f0a22c97e0e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-paths'';
version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
index babdf04e3ec2..d54c37c2de1c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-pdf'';
version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 2fad295c7ee5..952a4394ae79 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-postgres'';
version = ''postmodern-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
index 4c97f03870fa..c10a1500563b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-ppcre-template'';
version = ''cl-unification-20190107-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
index 27887f12497e..20433b51f877 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-ppcre-unicode'';
version = ''cl-ppcre-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index 8bb8fb2478d8..cfea494fc4bd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-ppcre'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index 496a0bd4e567..1e13378b38c4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-project'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
index 046f910a8660..81f1455714d9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-protobufs'';
version = ''20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
index 916af5b29727..c16486754db3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-reexport'';
version = ''20150709-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index 0d58e11b4d26..16cc2309e645 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-smtp'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
index 2aff988dfd24..b639681fd306 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-store'';
version = ''20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
index add200b09a1d..4639a66da78f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-syntax-annot'';
version = ''cl-syntax-20150407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
index c19a47df6c23..cea65514d4b1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-syntax-anonfun'';
version = ''cl-syntax-20150407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
index cded8dc2d06d..fa08d3b114ce 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-syntax-markup'';
version = ''cl-syntax-20150407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
index 353c8210885e..2715cfdf8dac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-syntax'';
version = ''20150407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
index 968f2972abfc..b04a6cd83444 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-test-more'';
version = ''prove-20171130-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
index 358666877a6d..38237f6f3b7b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-typesetting'';
version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index 7849acb57c0a..77e2ba0036ce 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-unicode'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index dbdd53a93469..bb8a05b0d6d1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-unification'';
version = ''20190107-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 750da99d5d6a..4999da6d0b69 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-utilities'';
version = ''1.2.4'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
index f44bd0f22e0c..dbdd6d6b617c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-vectors'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
index 3be45384d418..19af99826fce 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl-who'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
index f344dbfa2fe8..5294613b9789 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cl_plus_ssl'';
version = ''cl+ssl-20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
index 6cfd7842409c..4b0a4cd176d8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clack-handler-hunchentoot'';
version = ''clack-20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index 1ac6ccc329c2..5f4a96dbcc4a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clack-socket'';
version = ''clack-20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
index 1792d79f1d89..d8c8acf83aa6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clack-test'';
version = ''clack-20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index 749fce006e4e..0234f7644988 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clack-v1-compat'';
version = ''clack-20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 1813844e85fd..ab615e5dc83f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clack'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index ca03207fabd8..abbefea70b48 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''closer-mop'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index c1b36b6b653c..3448f70f5adb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''closure-common'';
version = ''20181018-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
index f55ccecadc61..2746ccff6c9c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''closure-html'';
version = ''20180711-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix
index 9f4abb8e4756..8f6760b96247 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clsql-postgresql-socket'';
version = ''clsql-20160208-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix
index add3a15d27c7..e90cda0f6d93 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clsql-postgresql'';
version = ''clsql-20160208-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
index 653adb3d12b3..254a22fbafa5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clsql-sqlite3'';
version = ''clsql-20160208-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix
index 8243a3375853..c664c23dd1c5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clsql-uffi'';
version = ''clsql-20160208-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
index 74b8442c0c90..e37eecabbca9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clsql'';
version = ''20160208-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index 2f07706a9129..458cb51e6adf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clss'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
index 303d43a964ee..ba45b3530573 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clx-truetype'';
version = ''20160825-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index 6b99f99b7ab8..0fe6e115f3f2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''clx'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
index 7375b8dd7094..0a4a40b06841 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''collectors'';
version = ''20161204-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index 1d81acba2dc6..25eaf1fa6fa9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''command-line-arguments'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index f4941aa80cd6..0dd93c46fb2f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''css-lite'';
version = ''20120407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
index 98c565648dcb..a0a6d2d7c2ec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''css-selectors-simple-tree'';
version = ''css-selectors-20160628-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
index fcdb69f3c351..1aff3a5826cb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''css-selectors-stp'';
version = ''css-selectors-20160628-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
index aa523d6f838b..268eea723ddf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''css-selectors'';
version = ''20160628-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
index ebae32962f10..9bef7fb990c5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cxml-stp'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
index 68a019fa027d..667cf93d44f9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''cxml'';
version = ''20181018-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
index 7c69878900cd..1f0b4f9f71bc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
-rec {
+{
baseName = ''db3'';
version = ''cl-20150302-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 173a31e9f31d..9d0f2549f50b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''dbd-mysql'';
version = ''cl-dbi-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index 6668cd4f762b..9f3046eb51ff 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''dbd-postgres'';
version = ''cl-dbi-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index 9b6fde0ea94b..7bc556eaff20 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''dbd-sqlite3'';
version = ''cl-dbi-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
index 26c5306c06a3..2e4006dbf3f4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''dbi'';
version = ''cl-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index 4d5bc0a22175..5a84a62ee835 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''dexador'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
index 3dbacdf0f81a..2896ec154ecd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''do-urlencode'';
version = ''20181018-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 7c25ed9a0377..a4196b2d394f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''documentation-utils'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index aa97f8f7cbe3..a3d063ec9bd9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''drakma'';
version = ''v2.0.5'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
index a4a58fd0d0b6..8c3182045720 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''dynamic-classes'';
version = ''20130128-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
index 91b8db69a36b..aa2b01e6bcd5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
-rec {
+{
baseName = ''eos'';
version = ''20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
index d68fd839bd16..e94ed40f9e1c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''esrap-peg'';
version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index a024ad3907a3..3ab6e03ab659 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''esrap'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index 0e7f5b79160b..b247ea27298d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''external-program'';
version = ''20190307-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 82c8603d4a45..8d43fa3362cc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''fast-http'';
version = ''20180831-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
index 89bed83acd54..ea006556876e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''fast-io'';
version = ''20171023-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
index 39f2af5430fc..8b5fe1f7de6c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''fiasco'';
version = ''20190307-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
index be9648a0da4a..8ebd9f603816 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''fiveam'';
version = ''v1.4.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index d9b25bebddc3..4d5524d9d18d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''flexi-streams'';
version = ''20190107-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index 90ce8b83dde6..a5fe52ec0277 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''form-fiddle'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
index d901df215a68..893cec1c72ad 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''fset'';
version = ''20171019-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
index 76e2a55620cb..e961aecf8540 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
-rec {
+{
baseName = ''garbage-pools'';
version = ''20130720-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index 3754829ac37b..775e30e711a9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''http-body'';
version = ''20181210-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
index 1f2700608e37..6fc92c088822 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''hu_dot_dwim_dot_asdf'';
version = ''20190521-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
index 51f4a2d06980..98a77dad63cd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''hu_dot_dwim_dot_stefil'';
version = ''20170403-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
index 611ef77256fa..11d0831c96fc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''hunchentoot'';
version = ''v1.2.38'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
index 1b948bcf325e..9dfeb3f12062 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''idna'';
version = ''20120107-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
index 4211dfbc9194..675521dcde94 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''ieee-floats'';
version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index c4ae44cd6761..bd0e896e1434 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''iolib'';
version = ''v0.8.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
index 195b52c08c45..d5e072e5f6a8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''iolib_dot_asdf'';
version = ''iolib-v0.8.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
index aa650edde020..445da3b1b179 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''iolib_dot_base'';
version = ''iolib-v0.8.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
index c0ec72d48695..415e7a598202 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''iolib_dot_common-lisp'';
version = ''iolib-v0.8.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
index 4ba0cfa1ce2e..58fd95012e82 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''iolib_dot_conf'';
version = ''iolib-v0.8.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
index 7a1a12243fe2..009e0e278660 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''iolib_dot_grovel'';
version = ''iolib-v0.8.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 2c56b5964f97..727be89bf446 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''ironclad'';
version = ''v0.46'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index f276ec72736d..9a91033bb8be 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''iterate'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
index 9a4681894818..9d219f4c193c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''ixf'';
version = ''cl-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index 702eb2d05b55..790638f5954c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''jonathan'';
version = ''20190202-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
index e44004a9cf7e..88ededf0e73b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''kmrcl'';
version = ''20150923-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index 96a831147bba..cdac924b4396 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lack-component'';
version = ''lack-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index 610633e9af25..68604485c77a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lack-middleware-backtrace'';
version = ''lack-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index 3607cbedf44f..cda7716151ab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lack-util'';
version = ''lack-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index 08095979989b..7740e73c0e5b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lack'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
index 1f6a0709b0f4..91e28f402b23 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''let-plus'';
version = ''20171130-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
index 9dd6baad1bdc..8d52d518e113 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lev'';
version = ''20150505-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
index 10977c16f838..6ff0fdb4c829 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lfarm-client'';
version = ''lfarm-20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
index 4a5fe87982ae..4be971bef065 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lfarm-common'';
version = ''lfarm-20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
index 354d6c315076..44c8cc01c95f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lfarm-server'';
version = ''lfarm-20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
index 348c71fe9663..3d917ff2817f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lfarm-ssl'';
version = ''lfarm-20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
index 1edb65596a6c..84f0ca863ec1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lift'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
index 7f88beb974b0..802b9eb2b7a9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lisp-namespace'';
version = ''20171130-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
index 8d21f88cbf82..c623d368a043 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lisp-unit2'';
version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
index 7189a09e20cf..4eb30ef013b0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''list-of'';
version = ''asdf-finalizers-20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index 5ffa27fcca53..4695c3dfe0e7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''local-time'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
index 1a6f217a2f96..a4011b78d4f4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lparallel'';
version = ''20160825-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index f64e9ee6a330..5dbd186e62e7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''lquery'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index 8187c99f94a4..c6445010f544 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''map-set'';
version = ''20190307-hg'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index 4f6842606b45..531cc1adc1af 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''marshal'';
version = ''cl-20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index 953dd0a58a4a..b34fdd83ca38 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''md5'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index d72e0839d1e8..cf2c3a1c777b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''metabang-bind'';
version = ''20171130-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
index 6bbdf5f911e0..c45a3eff384e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
-rec {
+{
baseName = ''metatilities-base'';
version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
index 6334804c4f70..ef0da68cfe4d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''misc-extensions'';
version = ''20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
index 1f2dd20ee4be..adb1ad27c45d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''moptilities'';
version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
index 470d2fed738c..974a63c1a730 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''mssql'';
version = ''cl-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
index a8cfc070bf99..f1fe0e3c2791 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''mt19937'';
version = ''1.1.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
index 068d0eba69dd..16b1f22ceebb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''myway'';
version = ''20181018-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index 82d06b1c93b2..c5f1379f421f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''named-readtables'';
version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
index 4e7c84566a0a..dcc49aa79937 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''net_dot_didierverna_dot_asdf-flv'';
version = ''asdf-flv-version-2.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index ea6adac9e9f8..0a3dba6b8243 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''nibbles'';
version = ''20180831-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
index 07b86f58fe7c..b5b6ace2ae94 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''optima'';
version = ''20150709-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
index bf6216dcaddc..2bf306507858 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''parenscript'';
version = ''Parenscript-2.7.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
index e636df0805e7..72bef6f60bf2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''parse-number'';
version = ''v1.7'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
index fe9ccae2886a..0c34654b1ae3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''pcall-queue'';
version = ''pcall-0.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index 025d160f4602..60385ab59393 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''pcall'';
version = ''0.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
index a913cdbe521c..f0b5fb23d661 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''pgloader'';
version = ''v3.4.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
index 38fb942c331f..e4fd9f0c4df8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''plump-dom'';
version = ''plump-20170725-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
index cd0db041c5b2..16cd9d5f062d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
-rec {
+{
baseName = ''plump-lexer'';
version = ''plump-20170725-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
index a9d07b48a9d4..cb06b039abd9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''plump-parser'';
version = ''plump-20170725-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 8757c704c8f4..53af356f05ac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''plump'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
index ba7bef260c08..ed09e3805c08 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''postmodern'';
version = ''20180430-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
index 8ffcbc784ff7..3afcbf98d505 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''proc-parse'';
version = ''20160318-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index a1542dc13cf6..9bbc47275f80 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''prove'';
version = ''20171130-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
index ffa2e595c26a..b4957d68e883 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''ptester'';
version = ''20160929-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
index 4f6946783939..84b252f93a51 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''puri'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
index 0eb4c0f5b9e6..741929484d84 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''py-configparser'';
version = ''20170830-svn'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
index de24a5984960..03d96005935e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''qmynd'';
version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index 3666dda9bf87..dbeb5f1d08e0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''query-fs'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index f6022cb2a1f2..fed624578912 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''quri'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index 25d535176a6a..e6c1477298d4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''rfc2388'';
version = ''20180831-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
index d5be4be7daf4..14b327a97364 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''rt'';
version = ''20101006-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
index c283abd479ed..92fa57794522 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''s-sql'';
version = ''postmodern-20180430-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index 9056cfbdcca8..26c616ec3922 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''salza2'';
version = ''2.0.9'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index 33847198bdd9..f3c1dade8219 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''simple-date'';
version = ''postmodern-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
index 63adab55741b..a6fc781c3698 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''smart-buffer'';
version = ''20160628-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index a22076facd39..be9f59986428 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''split-sequence'';
version = ''v2.0.0'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
index 57dec7c93cac..cd018a4b9975 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''sqlite'';
version = ''cl-20130615-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
index 1cd4e4c44027..0386a674916b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''static-vectors'';
version = ''v1.8.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
index df63a5c9836a..7c769e614c14 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''stefil'';
version = ''20181210-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
index 17a56c09b7e8..2b38115aabdd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''string-case'';
version = ''20180711-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index e89eb1971d60..fa0a2ab7944d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''stumpwm'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
index 50b815425dc6..ec14ffffcba1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''swank'';
version = ''slime-v2.24'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
index f0df3b84f153..89003686df38 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''swap-bytes'';
version = ''v1.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
index 4bae3cc1ceed..9ec472fa08a1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''symbol-munger'';
version = ''20150407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index 683f87357f56..d10b68b2d2ed 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-backtrace'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 82d0e4513ab1..8db7c603ec88 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-features'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index c629bb3548d4..4d26aa435193 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-garbage'';
version = ''20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index 2aee236ac0ca..7826a9379924 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-gray-streams'';
version = ''20181018-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index 33eedbaa8184..002c75e10212 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-indent'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index f02d9e0dc2c7..960778dc17c1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-mimes'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 8cc04c2c64ac..6bfaac06f2dd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-types'';
version = ''20120407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index c925382d81d4..0ac57089e50d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''trivial-utf-8'';
version = ''20111001-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 1986f7c88f7a..f5e8677f508f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''uffi'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index 18f1b74edbd3..ae9c1c6d5ac7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''uiop'';
version = ''3.3.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
index 6c4564967320..6a877e5a9646 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''unit-test'';
version = ''20120520-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index c3928cf0e4cc..fccce79eb84d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''usocket'';
version = ''0.8.2'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
index 0886b1082a88..bfd845146223 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''uuid'';
version = ''20130813-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index 6a4751f799ea..2fb1cdacfac2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''vom'';
version = ''20160825-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index 59a41a7cf9ae..7825678c77c5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''woo'';
version = ''20190710-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index f717441068b6..93bcb2072a7b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''wookie'';
version = ''20181018-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
index 9854567fd5bf..db03e57a663b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''xembed'';
version = ''clx-20190307-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
index 4bfc0678f0f1..71cd9cfbde6b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''xkeyboard'';
version = ''clx-20120811-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index 0fd076509c22..ea08214cb6f5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''xmls'';
version = ''3.0.2'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
index 3e14a5ba9f06..e2a5494c5b4b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''xpath'';
version = ''plexippus-20190521-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index b9ab71744c3a..92f661f85310 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''xsubseq'';
version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
index c7031f4aa3fc..cf8f3a8ac0fd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''yacc'';
version = ''cl-20101006-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
index e14a540a1783..ca74dd0e5007 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''yason'';
version = ''v0.7.6'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index 74e5d7e97e95..3aa695caed6f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -1,5 +1,5 @@
args @ { fetchurl, ... }:
-rec {
+{
baseName = ''zpb-ttf'';
version = ''1.0.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 2e4ceda31c81..052bfb119498 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -39,7 +39,7 @@ in
};
};
hunchentoot = addNativeLibs [pkgs.openssl];
- iolib = x: rec {
+ iolib = x: {
propagatedBuildInputs = (x.propagatedBuildInputs or [])
++ (with pkgs; [libfixposix gcc])
;
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 4b8369456b75..5adc23979393 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1106,6 +1106,26 @@ luasystem = buildLuarocksPackage {
};
};
};
+luautf8 = buildLuarocksPackage {
+ pname = "luautf8";
+ version = "0.1.1-1";
+
+ src = fetchurl {
+ url = https://luarocks.org/luautf8-0.1.1-1.src.rock;
+ sha256 = "1832ilrlddh4h7ayx4l9j7z1p8c2hk5yr96cpxjjrmirkld23aji";
+ };
+ disabled = (luaOlder "5.1");
+ propagatedBuildInputs = [ lua ];
+
+ meta = with stdenv.lib; {
+ homepage = "http://github.com/starwing/luautf8";
+ description = "A UTF-8 support module for Lua";
+ maintainers = with maintainers; [ pstn ];
+ license = {
+ fullName = "MIT";
+ };
+ };
+};
luazip = buildLuarocksPackage {
pname = "luazip";
version = "1.2.7-1";
@@ -1125,6 +1145,26 @@ luazip = buildLuarocksPackage {
};
};
};
+lua-yajl = buildLuarocksPackage {
+ pname = "lua-yajl";
+ version = "2.0-1";
+
+ src = fetchurl {
+ url = https://luarocks.org/lua-yajl-2.0-1.src.rock;
+ sha256 = "0bsm519vs53rchcdf8g96ygzdx2bz6pa4vffqlvc7ap49bg5np4f";
+ };
+ disabled = (luaOlder "5.1");
+ propagatedBuildInputs = [ lua ];
+
+ meta = with stdenv.lib; {
+ homepage = "http://github.com/brimworks/lua-yajl";
+ description = "Integrate the yajl JSON library with Lua.";
+ maintainers = with maintainers; [ pstn ];
+ license = {
+ fullName = "MIT/X11";
+ };
+ };
+};
luuid = buildLuarocksPackage {
pname = "luuid";
version = "20120509-2";
diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix
index 3dae32b5e15d..71e1f7c05e6e 100644
--- a/pkgs/development/lua-modules/generic/default.nix
+++ b/pkgs/development/lua-modules/generic/default.nix
@@ -1,6 +1,6 @@
{ lua, writeText, toLuaModule }:
-{ buildInputs ? [], disabled ? false, ... } @ attrs:
+{ disabled ? false, ... } @ attrs:
if disabled then
throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}"
@@ -18,37 +18,8 @@ else
//
{
name = "lua${lua.luaversion}-" + attrs.name;
- buildInputs = buildInputs ++ [ lua ];
-
- setupHook = writeText "setup-hook.sh" ''
- # check for lua/clua modules and don't add duplicates
-
- addLuaLibPath() {
- local package_path="$1/share/lua/${lua.luaversion}"
- if [[ ! -d $package_path ]]; then return; fi
- if [[ $LUA_PATH = *"$package_path"* ]]; then return; fi
-
- if [[ -z $LUA_PATH ]]; then
- export LUA_PATH="$package_path/?.lua;$package_path/?/init.lua"
- else
- export LUA_PATH="$LUA_PATH;$package_path/?.lua;$package_path/?/init.lua"
- fi
- }
-
- addLuaLibCPath() {
- local package_cpath="$1/lib/lua/${lua.luaversion}"
- if [[ ! -d $package_cpath ]]; then return; fi
- if [[ $LUA_CPATH = *"$package_cpath"* ]]; then return; fi
-
- if [[ -z $LUA_CPATH ]]; then
- export LUA_CPATH="$package_cpath/?.so"
- else
- export LUA_CPATH="$LUA_CPATH;$package_cpath/?.so"
- fi
- }
-
- addEnvHooks "$hostOffset" addLuaLibPath
- addEnvHooks "$hostOffset" addLuaLibCPath
- '';
+ propagatedBuildInputs = [
+ lua # propagate it for its setup-hook
+ ];
}
) )
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index a4c1c7fa324e..233503c2eca8 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -235,6 +235,12 @@ with super;
];
});
+ lua-yajl = super.lua-yajl.override({
+ buildInputs = [
+ pkgs.yajl
+ ];
+ });
+
luuid = super.luuid.override(old: {
externalDeps = [
{ name = "LIBUUID"; dep = pkgs.libuuid; }
diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix
index 5ef83ed77b3b..e93f904b8959 100644
--- a/pkgs/development/misc/amdadl-sdk/default.nix
+++ b/pkgs/development/misc/amdadl-sdk/default.nix
@@ -1,8 +1,8 @@
{ requireFile, stdenv, unzip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "6.0";
- name = "amdadl-sdk-${version}";
+ pname = "amdadl-sdk";
src = requireFile {
name = "ADL_SDK_6.0.zip";
diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix
index 79651db23ea4..4169b9e4d35d 100644
--- a/pkgs/development/misc/amdapp-sdk/default.nix
+++ b/pkgs/development/misc/amdapp-sdk/default.nix
@@ -35,8 +35,9 @@ let
};
};
-in stdenv.mkDerivation rec {
- name = "amdapp-sdk-${version}";
+in stdenv.mkDerivation {
+ pname = "amdapp-sdk";
+ inherit version;
src = fetchurl {
url = stdenv.lib.getAttrFromPath [version "url"] src_info;
diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix
index 4527a8700f6e..48ea088a73c9 100644
--- a/pkgs/development/misc/avr/libc/default.nix
+++ b/pkgs/development/misc/avr/libc/default.nix
@@ -4,7 +4,8 @@ let
version = "2.0.0";
in
stdenv.mkDerivation {
- name = "avr-libc-${version}";
+ pname = "avr-libc";
+ inherit version;
src = fetchurl {
url = https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2;
diff --git a/pkgs/development/misc/google-clasp/default.nix b/pkgs/development/misc/google-clasp/default.nix
index 105104ebd721..db6ade1c85a6 100644
--- a/pkgs/development/misc/google-clasp/default.nix
+++ b/pkgs/development/misc/google-clasp/default.nix
@@ -5,7 +5,7 @@ in
(import ./google-clasp.nix {
inherit pkgs;
inherit (stdenv.hostPlatform) system;
-})."@google/clasp-${version}".override rec {
+})."@google/clasp-${version}".override {
preRebuild = ''
patch -p1 <<<"${builtins.readFile ./dotf.patch}"
'';
diff --git a/pkgs/development/misc/google-clasp/google-clasp.nix b/pkgs/development/misc/google-clasp/google-clasp.nix
index c32132d7ac64..c2a2412d3d76 100644
--- a/pkgs/development/misc/google-clasp/google-clasp.nix
+++ b/pkgs/development/misc/google-clasp/google-clasp.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ../../node-packages/node-env.nix {
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index ad1d0e396a91..557d6f176097 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -4,7 +4,7 @@ with rustPlatform;
buildRustPackage rec {
version = "0.4.1";
- name = "loc-${version}";
+ pname = "loc";
src = fetchFromGitHub {
owner = "cgag";
diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix
index 0456c8eae769..b84f358cbee0 100644
--- a/pkgs/development/misc/msp430/mspdebug.nix
+++ b/pkgs/development/misc/msp430/mspdebug.nix
@@ -3,7 +3,8 @@
let
version = "0.25";
in stdenv.mkDerivation {
- name = "mspdebug-${version}";
+ pname = "mspdebug";
+ inherit version;
src = fetchFromGitHub {
owner = "dlbeer";
repo = "mspdebug";
diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix
index 4230672e12f3..df0ef999dd6a 100644
--- a/pkgs/development/misc/newlib/default.nix
+++ b/pkgs/development/misc/newlib/default.nix
@@ -2,7 +2,8 @@
let version = "3.1.0";
in stdenv.mkDerivation {
- name = "newlib-${version}";
+ pname = "newlib";
+ inherit version;
src = fetchurl {
url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz";
sha256 = "0ahh3n079zjp7d9wynggwrnrs27440aac04340chf1p9476a2kzv";
diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/pkgs/development/misc/qmk_firmware/default.nix
index 0ec8664dac9e..8abe4b2550e0 100644
--- a/pkgs/development/misc/qmk_firmware/default.nix
+++ b/pkgs/development/misc/qmk_firmware/default.nix
@@ -6,7 +6,8 @@
let version = "0.6.144";
in stdenv.mkDerivation {
- name = "qmk_firmware-${version}";
+ pname = "qmk_firmware";
+ inherit version;
src = fetchFromGitHub {
owner = "qmk";
repo = "qmk_firmware";
diff --git a/pkgs/development/misc/rappel/default.nix b/pkgs/development/misc/rappel/default.nix
new file mode 100644
index 000000000000..761d2ea98ba0
--- /dev/null
+++ b/pkgs/development/misc/rappel/default.nix
@@ -0,0 +1,38 @@
+{ fetchFromGitHub
+, libedit
+, makeWrapper
+, nasm
+, stdenv
+}:
+
+stdenv.mkDerivation rec {
+ pname = "rappel";
+ version = "unstable-2019-09-09";
+
+ src = fetchFromGitHub {
+ owner = "yrp604";
+ repo = "rappel";
+ rev = "31a06762d34880ff2ed7176ca71bd8a6b91b10d5";
+ sha256 = "0wj3hypqfrjra8mwmn32hs5qs6ic81cq3gn1v0b2fba6vkqcsqfy";
+ };
+
+ buildInputs = [ libedit ];
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm755 -t $out/bin bin/rappel
+ wrapProgram $out/bin/rappel --prefix PATH : "${nasm}/bin"
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/yrp604/rappel";
+ description = "A pretty janky assembly REPL";
+ license = licenses.bsdOriginal;
+ maintainers = [ maintainers.pamplemousse ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix
index e66bb6fe2118..bc806410b1ea 100644
--- a/pkgs/development/misc/stm32/betaflight/default.nix
+++ b/pkgs/development/misc/stm32/betaflight/default.nix
@@ -15,7 +15,8 @@ let
in stdenv.mkDerivation rec {
- name = "betaflight-${version}";
+ pname = "betaflight";
+ inherit version;
src = fetchFromGitHub {
owner = "betaflight";
diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix
index 683883ddbce9..5014cdce8f37 100644
--- a/pkgs/development/misc/stm32/inav/default.nix
+++ b/pkgs/development/misc/stm32/inav/default.nix
@@ -8,7 +8,8 @@ let
in stdenv.mkDerivation rec {
- name = "inav-${version}";
+ pname = "inav";
+ inherit version;
src = fetchFromGitHub {
owner = "iNavFlight";
diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix
index a2ddda34347a..eed4b43d6a36 100644
--- a/pkgs/development/mobile/abootimg/default.nix
+++ b/pkgs/development/mobile/abootimg/default.nix
@@ -4,7 +4,8 @@ let
version = "0.6";
in
stdenv.mkDerivation {
- name = "abootimg-${version}";
+ pname = "abootimg";
+ inherit version;
src = fetchFromGitHub {
owner = "ggrandou";
diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix
index b6d35051733a..ebba63353dab 100644
--- a/pkgs/development/mobile/adb-sync/default.nix
+++ b/pkgs/development/mobile/adb-sync/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, python3, platform-tools, makeWrapper }:
-stdenv.mkDerivation rec {
- name = "adb-sync-${version}";
+stdenv.mkDerivation {
+ pname = "adb-sync";
version = "2016-08-31";
src = fetchgit {
diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix
index fffe2fbbcbed..2033fa78ae58 100644
--- a/pkgs/development/mobile/adbfs-rootless/default.nix
+++ b/pkgs/development/mobile/adbfs-rootless/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }:
stdenv.mkDerivation rec {
- name = "adbfs-rootless-${version}";
+ pname = "adbfs-rootless";
version = "2016-10-02";
src = fetchFromGitHub {
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 6e6a349cccc5..fb548bf3f9f2 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -78,13 +78,13 @@ rec {
platform-tools = import ./platform-tools.nix {
inherit deployAndroidPackage os autoPatchelfHook pkgs lib;
- package = packages.platform-tools."${platformToolsVersion}";
+ package = packages.platform-tools.${platformToolsVersion};
};
build-tools = map (version:
import ./build-tools.nix {
inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686 lib;
- package = packages.build-tools."${version}";
+ package = packages.build-tools.${version};
}
) buildToolsVersions;
@@ -95,20 +95,20 @@ rec {
emulator = import ./emulator.nix {
inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686 lib;
- package = packages.emulator."${emulatorVersion}"."${os}";
+ package = packages.emulator.${emulatorVersion}.${os};
};
platforms = map (version:
deployAndroidPackage {
inherit os;
- package = packages.platforms."${version}";
+ package = packages.platforms.${version};
}
) platformVersions;
sources = map (version:
deployAndroidPackage {
inherit os;
- package = packages.sources."${version}";
+ package = packages.sources.${version};
}
) platformVersions;
@@ -132,33 +132,33 @@ rec {
lldb = map (version:
import ./lldb.nix {
inherit deployAndroidPackage os autoPatchelfHook pkgs lib;
- package = packages.lldb."${version}";
+ package = packages.lldb.${version};
}
) lldbVersions;
cmake = map (version:
import ./cmake.nix {
inherit deployAndroidPackage os autoPatchelfHook pkgs lib;
- package = packages.cmake."${version}";
+ package = packages.cmake.${version};
}
) cmakeVersions;
ndk-bundle = import ./ndk-bundle {
inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs lib platform-tools;
- package = packages.ndk-bundle."${ndkVersion}";
+ package = packages.ndk-bundle.${ndkVersion};
};
google-apis = map (version:
deployAndroidPackage {
inherit os;
- package = addons.addons."${version}".google_apis;
+ package = addons.addons.${version}.google_apis;
}
) (builtins.filter (platformVersion: platformVersion < "26") platformVersions); # API level 26 and higher include Google APIs by default
google-tv-addons = map (version:
deployAndroidPackage {
inherit os;
- package = addons.addons."${version}".google_tv_addon;
+ package = addons.addons.${version}.google_tv_addon;
}
) platformVersions;
@@ -225,10 +225,10 @@ rec {
# Link extras
${lib.concatMapStrings (identifier:
let
- path = addons.extras."${identifier}".path;
+ path = addons.extras.${identifier}.path;
addon = deployAndroidPackage {
inherit os;
- package = addons.extras."${identifier}";
+ package = addons.extras.${identifier};
};
in
''
diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix
index 9957168f7af3..92f53e5a7c20 100644
--- a/pkgs/development/mobile/androidenv/tools.nix
+++ b/pkgs/development/mobile/androidenv/tools.nix
@@ -19,8 +19,8 @@ if toolsVersion == "26.0.1" then import ./tools/26.nix {
};
} else if toolsVersion == "26.1.1" then import ./tools/26.nix {
inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall;
- package = packages.tools."${toolsVersion}";
+ package = packages.tools.${toolsVersion};
} else import ./tools/25.nix {
inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall;
- package = packages.tools."${toolsVersion}";
+ package = packages.tools.${toolsVersion};
}
diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/mobile/cocoapods/default.nix
index 0b9bb7c5b5fc..c235b9e9a126 100644
--- a/pkgs/development/mobile/cocoapods/default.nix
+++ b/pkgs/development/mobile/cocoapods/default.nix
@@ -1,7 +1,7 @@
{ lib, bundlerApp, ruby
, beta ? false }:
-bundlerApp rec {
+bundlerApp {
inherit ruby;
pname = "cocoapods";
gemfile = if beta then ./Gemfile-beta else ./Gemfile;
diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix
index ba498ce0953b..0ea74377a5fc 100644
--- a/pkgs/development/mobile/genymotion/default.nix
+++ b/pkgs/development/mobile/genymotion/default.nix
@@ -7,7 +7,7 @@ let
packages = [
stdenv.cc.cc zlib glib xorg.libX11 libxkbcommon libXmu libXi libXext libGL
];
- libPath = "${stdenv.lib.makeLibraryPath packages}";
+ libPath = stdenv.lib.makeLibraryPath packages;
in
stdenv.mkDerivation rec {
pname = "genymotion";
diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix
index 9cee1c9e5dee..706fa2c65998 100644
--- a/pkgs/development/mobile/imgpatchtools/default.nix
+++ b/pkgs/development/mobile/imgpatchtools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, bzip2, openssl, zlib }:
stdenv.mkDerivation rec {
- name = "imgpatchtools-${version}";
+ pname = "imgpatchtools";
version = "0.3";
src = fetchzip {
diff --git a/pkgs/development/mobile/webos/cmake-modules.nix b/pkgs/development/mobile/webos/cmake-modules.nix
index f149cb622e13..cd58ea4e20cf 100644
--- a/pkgs/development/mobile/webos/cmake-modules.nix
+++ b/pkgs/development/mobile/webos/cmake-modules.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "cmake-modules-webos-${version}";
+ pname = "cmake-modules-webos";
version = "19";
src = fetchFromGitHub {
diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix
index 52b50635e336..e7afdb32137b 100644
--- a/pkgs/development/mobile/webos/novacom.nix
+++ b/pkgs/development/mobile/webos/novacom.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, webos, cmake, pkgconfig }:
stdenv.mkDerivation rec {
- name = "novacom-${version}";
+ pname = "novacom";
version = "18";
src = fetchFromGitHub {
diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix
index f82009b0c39c..4d62dd305d3a 100644
--- a/pkgs/development/mobile/webos/novacomd.nix
+++ b/pkgs/development/mobile/webos/novacomd.nix
@@ -4,7 +4,7 @@ webos, cmake, pkgconfig,
libusb }:
stdenv.mkDerivation rec {
- name = "novacomd-${version}";
+ pname = "novacomd";
version = "127";
src = fetchFromGitHub {
diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix
index 9f723a6da470..9e2521717efc 100644
--- a/pkgs/development/node-packages/composition-v10.nix
+++ b/pkgs/development/node-packages/composition-v10.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix
index 4f05009f3efd..4ed0336ec5c4 100644
--- a/pkgs/development/node-packages/composition-v12.nix
+++ b/pkgs/development/node-packages/composition-v12.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-6_x}:
let
nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix
index 30e3687676ab..0766e6e8a8c5 100644
--- a/pkgs/development/ocaml-modules/bap/default.nix
+++ b/pkgs/development/ocaml-modules/bap/default.nix
@@ -1,11 +1,15 @@
{ stdenv, fetchFromGitHub, fetchurl
, ocaml, findlib, ocamlbuild, ocaml_oasis,
- bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, frontc, ounit, ppx_jane, parsexp,
- utop,
+ bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp,
+ utop, libxml2,
ppx_tools_versioned,
which, makeWrapper, writeText
}:
+if stdenv.lib.versionAtLeast core_kernel.version "0.12"
+then throw "BAP needs core_kernel-0.11 (hence OCaml ≤ 4.06)"
+else
+
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-bap-${version}";
version = "1.6.0";
@@ -31,8 +35,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ which makeWrapper ];
buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis
- llvm_38 ppx_tools_versioned
- utop ];
+ llvm ppx_tools_versioned
+ utop libxml2 ];
propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp
piqi-ocaml uuidm frontc ounit ];
@@ -51,7 +55,7 @@ stdenv.mkDerivation rec {
disableIda = "--disable-ida --disable-fsi-benchmark";
- configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm_38}/bin/llvm-config" ];
+ configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ];
BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)";
diff --git a/pkgs/development/ocaml-modules/base64/2.0.nix b/pkgs/development/ocaml-modules/base64/2.0.nix
index 8128dc1cb6f5..4606ebd51721 100644
--- a/pkgs/development/ocaml-modules/base64/2.0.nix
+++ b/pkgs/development/ocaml-modules/base64/2.0.nix
@@ -3,7 +3,8 @@
let version = "2.0.0"; in
stdenv.mkDerivation {
- name = "ocaml-base64-${version}";
+ pname = "ocaml-base64";
+ inherit version;
src = fetchzip {
url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/biniou/1.0.nix b/pkgs/development/ocaml-modules/biniou/1.0.nix
index d2d3159cde14..2584c5ad8b3f 100644
--- a/pkgs/development/ocaml-modules/biniou/1.0.nix
+++ b/pkgs/development/ocaml-modules/biniou/1.0.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
- homepage = "${webpage}";
+ homepage = webpage;
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
index 38673fb9ddc4..6a98267d89a5 100644
--- a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
+++ b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix
@@ -1,6 +1,6 @@
{ buildDunePackage, bisect_ppx, ocamlbuild }:
-buildDunePackage rec {
+buildDunePackage {
minimumOCamlVersion = "4.02";
inherit (bisect_ppx) version src meta;
pname = "bisect_ppx-ocamlbuild";
diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix
index b3dddec511c4..d6a1cac17195 100644
--- a/pkgs/development/ocaml-modules/bistro/default.nix
+++ b/pkgs/development/ocaml-modules/bistro/default.nix
@@ -1,22 +1,22 @@
{ lib, fetchFromGitHub, buildDunePackage
-, core, lwt ? ocaml_lwt, ocaml_lwt, ocamlgraph, rresult, tyxml
+, base64, bos, core, lwt_react, ocamlgraph, rresult, tyxml
}:
buildDunePackage rec {
pname = "bistro";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "pveber";
repo = pname;
rev = "v${version}";
- sha256 = "0bxnggm4nkyl2iqwj4f5afw8lj5miq2rqsc9qfrlmg4g4rr3zh1c";
+ sha256 = "114gq48cpj2mvycypa9lfyqqb26wa2gkdfwkcqhnx7m6sdwv9a38";
};
- buildInputs = [ lwt ocamlgraph rresult tyxml ];
+ buildInputs = [ base64 bos lwt_react ocamlgraph rresult tyxml ];
propagatedBuildInputs = [ core ];
- minimumOCamlVersion = "4.04";
+ minimumOCamlVersion = "4.07";
meta = {
inherit (src.meta) homepage;
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix
index a7e591e049e6..21897e3bf10f 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix
@@ -5,7 +5,7 @@ then throw "camomile-0.8.2 is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
- name = "camomile-${version}";
+ pname = "camomile";
version = "0.8.2";
src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix
index 48517036dc6d..eb9cdb78562e 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}:
-stdenv.mkDerivation rec {
- name = "camomile-${version}";
+stdenv.mkDerivation {
+ pname = "camomile";
version = "0.8.5";
src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
index 64a8f2416ad4..588ba6711cb4 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
@@ -7,7 +7,7 @@ if !stdenv.lib.versionAtLeast cohttp-lwt.version "0.99"
then cohttp-lwt
else
-buildDunePackage rec {
+buildDunePackage {
pname = "cohttp-lwt-unix";
inherit (cohttp-lwt) version src meta;
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix
index 93ba084703e5..748b970477ee 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix
@@ -4,7 +4,7 @@ if !stdenv.lib.versionAtLeast cohttp.version "0.99"
then cohttp
else
-buildDunePackage rec {
+buildDunePackage {
pname = "cohttp-lwt";
inherit (cohttp) version src meta;
diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
index b6d2e24ec551..51fb369e66fe 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
@@ -6,7 +6,7 @@ if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0"
then conduit-lwt
else
-buildDunePackage rec {
+buildDunePackage {
pname = "conduit-lwt-unix";
inherit (conduit-lwt) version src meta;
diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix
index 560600e2fee8..2eb225d88b6e 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt.nix
@@ -4,7 +4,7 @@ if !stdenv.lib.versionAtLeast conduit.version "1.0"
then conduit
else
-buildDunePackage rec {
+buildDunePackage {
pname = "conduit-lwt";
inherit (conduit) version src meta;
diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix
index 214721fa0906..98fd7fc46cf6 100644
--- a/pkgs/development/ocaml-modules/containers/default.nix
+++ b/pkgs/development/ocaml-modules/containers/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "c-cube";
repo = "ocaml-containers";
- rev = "${version}";
+ rev = version;
sha256 = "1wbarxphdrxvy7qsdp4p837h1zrv0z83pgs5lbz2h3kdnyvz2f1i";
};
diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix
index 4832f5c39af3..2a4d7004faa0 100644
--- a/pkgs/development/ocaml-modules/cow/default.nix
+++ b/pkgs/development/ocaml-modules/cow/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "2.2.0";
- name = "ocaml-cow-${version}";
+ pname = "ocaml-cow";
src = fetchFromGitHub {
owner = "mirage";
diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix
index 7720650ddfc9..8d395798979c 100644
--- a/pkgs/development/ocaml-modules/cryptgps/default.nix
+++ b/pkgs/development/ocaml-modules/cryptgps/default.nix
@@ -4,8 +4,8 @@ if stdenv.lib.versionAtLeast ocaml.version "4.06"
then throw "cryptgps is not available for OCaml ${ocaml.version}"
else
-stdenv.mkDerivation rec {
- name = "ocaml-cryptgps-${version}";
+stdenv.mkDerivation {
+ pname = "ocaml-cryptgps";
version = "0.2.1";
src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index 412146244278..8180373a3dd9 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -17,8 +17,8 @@ let param =
};
in
-stdenv.mkDerivation rec {
- name = "cryptokit-${version}";
+stdenv.mkDerivation {
+ pname = "cryptokit";
inherit (param) version;
src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix
index 0ddf3cb5995c..567defea7d2f 100644
--- a/pkgs/development/ocaml-modules/ctypes/default.nix
+++ b/pkgs/development/ocaml-modules/ctypes/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildOcaml, fetchzip, libffi, pkgconfig, ncurses, integers }:
-buildOcaml rec {
+buildOcaml {
name = "ctypes";
version = "0.13.1";
diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix
index d08259af247c..dc6b17512837 100644
--- a/pkgs/development/ocaml-modules/curses/default.nix
+++ b/pkgs/development/ocaml-modules/curses/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ocaml, findlib, ncurses }:
stdenv.mkDerivation rec {
- name = "ocaml-curses-${version}";
+ pname = "ocaml-curses";
version = "1.0.4";
src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix
index 318353168336..9239d2543ee3 100644
--- a/pkgs/development/ocaml-modules/dolog/default.nix
+++ b/pkgs/development/ocaml-modules/dolog/default.nix
@@ -3,7 +3,8 @@
let version = "3.0"; in
stdenv.mkDerivation {
- name = "ocaml-dolog-${version}";
+ pname = "ocaml-dolog";
+ inherit version;
src = fetchzip {
url = "https://github.com/UnixJunkie/dolog/archive/v${version}.tar.gz";
sha256 = "0gx2s4509vkkkaikl2yp7k5x7bqv45s1y1vsy408d8rakd7yl1zb";
diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix
index 44bfeb2d4740..b41743f542d8 100644
--- a/pkgs/development/ocaml-modules/elina/default.nix
+++ b/pkgs/development/ocaml-modules/elina/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--use-apron"
"--use-opam"
- "--apron-prefix" "${apron}"
+ "--apron-prefix" apron
]
++ stdenv.lib.optional stdenv.isDarwin "--absolute-dylibs"
;
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 010df7d8df92..25e75ceeba36 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec
{
pname = "eliom";
version = "6.7.0";
- name = "${pname}-${version}";
src = fetchzip {
url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix
index 348f0cf2170b..626e6321acf8 100644
--- a/pkgs/development/ocaml-modules/gen/default.nix
+++ b/pkgs/development/ocaml-modules/gen/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "c-cube";
repo = "gen";
- rev = "${version}";
+ rev = version;
sha256 = "14b8vg914nb0yp1hgxzm29bg692m0gqncjj43b599s98s1cwl92h";
};
diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix
index bff993a4d193..d4c28be2f798 100644
--- a/pkgs/development/ocaml-modules/gg/default.nix
+++ b/pkgs/development/ocaml-modules/gg/default.nix
@@ -10,7 +10,7 @@ in
assert versionAtLeast (getVersion ocaml) "4.01.0";
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ocaml-${pname}-${version}";
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
matrices, quaternions, axis aligned boxes, colors, color spaces, and
raster data.
'';
- homepage = "${webpage}";
+ homepage = webpage;
platforms = ocaml.meta.platforms or [];
license = licenses.bsd3;
maintainers = [ maintainers.jirkamarsik ];
diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix
index 0869ae659cc3..89a1803b5202 100644
--- a/pkgs/development/ocaml-modules/git-http/default.nix
+++ b/pkgs/development/ocaml-modules/git-http/default.nix
@@ -1,6 +1,6 @@
{ buildDunePackage, git, cohttp-lwt, alcotest, mtime, nocrypto }:
-buildDunePackage rec {
+buildDunePackage {
pname = "git-http";
inherit (git) version src;
diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix
index 9c8a7c48255f..50e6f1d3bce9 100644
--- a/pkgs/development/ocaml-modules/git-unix/default.nix
+++ b/pkgs/development/ocaml-modules/git-unix/default.nix
@@ -1,6 +1,6 @@
{ buildDunePackage, git-http, cohttp-lwt-unix, tls, cmdliner, mtime }:
-buildDunePackage rec {
+buildDunePackage {
pname = "git-unix";
inherit (git-http) version src;
diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix
index e8d9267aa858..93e2b3b84295 100644
--- a/pkgs/development/ocaml-modules/higlo/default.nix
+++ b/pkgs/development/ocaml-modules/higlo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, xtmpl, ulex }:
stdenv.mkDerivation rec {
- name = "higlo-${version}";
+ pname = "higlo";
version = "0.6";
src = fetchFromGitHub {
owner = "zoggy";
diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix
index 8a11d22c2c11..40db8246f4aa 100644
--- a/pkgs/development/ocaml-modules/iso8601/default.nix
+++ b/pkgs/development/ocaml-modules/iso8601/default.nix
@@ -3,7 +3,8 @@
let version = "0.2.4"; in
stdenv.mkDerivation {
- name = "ocaml-iso8601-${version}";
+ pname = "ocaml-iso8601";
+ inherit version;
src = fetchzip {
url = "https://github.com/sagotch/ISO8601.ml/archive/${version}.tar.gz";
sha256 = "0ypdd1p04xdjxxx3b61wp7abswfrq3vcvwwaxvywxwqljw0dhydi";
diff --git a/pkgs/development/ocaml-modules/janestreet/0.12.nix b/pkgs/development/ocaml-modules/janestreet/0.12.nix
new file mode 100644
index 000000000000..4089b24ca228
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/0.12.nix
@@ -0,0 +1,466 @@
+{ janePackage
+, ctypes
+, num
+, octavius
+, ppxlib
+, re
+, openssl
+}:
+
+rec {
+
+ ocaml-compiler-libs = janePackage {
+ pname = "ocaml-compiler-libs";
+ hash = "0g9y1ljjsj1nw0lz460ivb6qmz9vhcmfl8krlmqfrni6pc7b0r6f";
+ meta.description = "OCaml compiler libraries repackaged";
+ };
+
+ sexplib0 = janePackage {
+ pname = "sexplib0";
+ hash = "13xdd0pvypxqn0ldwdgikmlinrp3yfh8ixknv1xrpxbx3np4qp0g";
+ meta.description = "Library containing the definition of S-expressions and some base converters";
+ };
+
+ base = janePackage {
+ pname = "base";
+ version = "0.12.2";
+ hash = "0gl89zpgsf3n30nb6v5cns27g2bfg4rf3s2427gqvwbkr5gcf7ri";
+ meta.description = "Full standard library replacement for OCaml";
+ propagatedBuildInputs = [ sexplib0 ];
+ };
+
+ stdio = janePackage {
+ pname = "stdio";
+ hash = "1pn8jjcb79n6crpw7dkp68s4lz2mw103lwmfslil66f05jsxhjhg";
+ meta.description = "Standard IO library for OCaml";
+ propagatedBuildInputs = [ base ];
+ };
+
+ ppx_sexp_conv = janePackage {
+ pname = "ppx_sexp_conv";
+ hash = "0idzp1kzds0gnilschzs9ydi54if8y5xpn6ajn710vkipq26qcld";
+ meta.description = "[@@deriving] plugin to generate S-expression conversion functions";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ ppx_here = janePackage {
+ pname = "ppx_here";
+ hash = "07qbchwif1i9ii8z7v1bib57d3mjv0b27i8iixw78i83wnsycmdx";
+ meta.description = "Expands [%here] into its location";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ ppx_compare = janePackage {
+ pname = "ppx_compare";
+ hash = "0n1ax4k2smhps9hc2v58lc06a0fgimwvbi1aj4x78vwh5j492bys";
+ meta.description = "Generation of comparison functions from types";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ ppx_assert = janePackage {
+ pname = "ppx_assert";
+ hash = "0as6mzr6ki2a9d4k6132p9dskn0qssla1s7j5rkzp75bfikd0ip8";
+ meta.description = "Assert-like extension nodes that raise useful errors on failure";
+ propagatedBuildInputs = [ ppx_compare ppx_here ppx_sexp_conv ];
+ };
+
+ ppx_inline_test = janePackage {
+ pname = "ppx_inline_test";
+ hash = "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50";
+ meta.description = "Syntax extension for writing in-line tests in ocaml code";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ ppx_custom_printf = janePackage {
+ pname = "ppx_custom_printf";
+ version = "0.12.1";
+ hash = "0q7591agvd3qy9ihhbyk4db48r0ng7yxspfj8afxxiawl7k5bas6";
+ meta.description = "Printf-style format-strings for user-defined string conversion";
+ propagatedBuildInputs = [ ppx_sexp_conv ];
+ };
+
+ fieldslib = janePackage {
+ pname = "fieldslib";
+ hash = "0dlgr7cimqmjlcymk3bdcyzqzvdy12q5lqa844nqix0k2ymhyphf";
+ meta.description = "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values";
+ propagatedBuildInputs = [ base ];
+ };
+
+ ppx_fields_conv = janePackage {
+ pname = "ppx_fields_conv";
+ hash = "0flrdyxdfcqcmdrbipxdjq0s3djdgs7z5pvjdycsvs6czbixz70v";
+ meta.description = "Generation of accessor and iteration functions for ocaml records";
+ propagatedBuildInputs = [ fieldslib ppxlib ];
+ };
+
+ variantslib = janePackage {
+ pname = "variantslib";
+ hash = "1cclb5magk63gyqmkci8abhs05g2pyhyr60a2c1bvmig0faqcnsf";
+ meta.description = "Part of Jane Street's Core library";
+ propagatedBuildInputs = [ base ];
+ };
+
+ ppx_variants_conv = janePackage {
+ pname = "ppx_variants_conv";
+ hash = "05j9bgra8xq6fcp12ch3z9vjrk139p2wrcjjcs4h52n5hhc8vzbz";
+ meta.description = "Generation of accessor and iteration functions for ocaml variant types";
+ propagatedBuildInputs = [ variantslib ppxlib ];
+ };
+
+ ppx_expect = janePackage {
+ pname = "ppx_expect";
+ hash = "1wawsbjfkri4sw52n8xqrzihxc3xfpdicv3ahz83a1rsn4lb8j5q";
+ meta.description = "Cram like framework for OCaml";
+ propagatedBuildInputs = [ ppx_assert ppx_custom_printf ppx_fields_conv ppx_inline_test ppx_variants_conv re ];
+ };
+
+ ppx_enumerate = janePackage {
+ pname = "ppx_enumerate";
+ hash = "08zfpq6bdm5lh7xj9k72iz9f2ihv3aznl3nypw3x78vz1chj8dqa";
+ meta.description = "Generate a list containing all values of a finite type";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ ppx_hash = janePackage {
+ pname = "ppx_hash";
+ hash = "1dfsfvhiyp1mnf24mr93svpdn432kla0y7x631lssacxxp2sadbg";
+ meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
+ propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ];
+ };
+
+ ppx_js_style = janePackage {
+ pname = "ppx_js_style";
+ hash = "1lz931m3qdv3yzqy6dnb8fq1d99r61w0n7cwf3b9fl9rhk0pggwh";
+ meta.description = "Code style checker for Jane Street Packages";
+ propagatedBuildInputs = [ octavius ppxlib ];
+ };
+
+ ppx_base = janePackage {
+ pname = "ppx_base";
+ hash = "0vd96rp2l084iamkwmvizzhl9625cagjb6gzzbir06czii5mlq2p";
+ meta.description = "Base set of ppx rewriters";
+ propagatedBuildInputs = [ ppx_enumerate ppx_hash ppx_js_style ];
+ };
+
+ ppx_bench = janePackage {
+ pname = "ppx_bench";
+ hash = "1ib81irawxzq091bmpi50z0kmpx6z2drg14k2xcgmwbb1d4063xn";
+ meta.description = "Syntax extension for writing in-line benchmarks in ocaml code";
+ propagatedBuildInputs = [ ppx_inline_test ];
+ };
+
+ ppx_sexp_message = janePackage {
+ pname = "ppx_sexp_message";
+ hash = "0yskd6v48jc6wa0nhg685kylh1n9qb6b7d1wglr9wnhl9sw990mc";
+ meta.description = "A ppx rewriter for easy construction of s-expressions";
+ propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
+ };
+
+ splittable_random = janePackage {
+ pname = "splittable_random";
+ hash = "1wpyz7807cgj8b50gdx4rw6f1zsznp4ni5lzjbnqdwa66na6ynr4";
+ meta.description = "PRNG that can be split into independent streams";
+ propagatedBuildInputs = [ base ppx_assert ppx_bench ppx_sexp_message ];
+ };
+
+ ppx_let = janePackage {
+ pname = "ppx_let";
+ hash = "146dmyzkbmafa3giz69gpxccvdihg19cvk4xsg8krbbmlkvdda22";
+ meta.description = "Monadic let-bindings";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ base_quickcheck = janePackage {
+ pname = "base_quickcheck";
+ hash = "1la6qgq1zwmfyq1hqy6i337w435ym5yqgx2ygk86qip6nws0s6r3";
+ meta.description = "Randomized testing framework, designed for compatibility with Base";
+ propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let splittable_random ];
+ };
+
+ ppx_stable = janePackage {
+ pname = "ppx_stable";
+ hash = "15zvf66wlkvz0yd4bkvndkpq74dj20jv1qkljp9n52hh7d0f9ykh";
+ meta.description = "Stable types conversions generator";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ bin_prot = janePackage {
+ pname = "bin_prot";
+ hash = "0hh6s7g9s004z35hsr8z6nw5phlcvcd6g2q3bj4f0s1s0anlsswm";
+ meta.description = "A binary protocol generator";
+ propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ];
+ };
+
+ ppx_bin_prot = janePackage {
+ pname = "ppx_bin_prot";
+ version = "0.12.1";
+ hash = "1j0kjgmv58dmg3x5dj5zrfbm920rwq21lvkkaqq493y76cd0x8xg";
+ meta.description = "Generation of bin_prot readers and writers from types";
+ propagatedBuildInputs = [ bin_prot ppx_here ];
+ };
+
+ ppx_fail = janePackage {
+ pname = "ppx_fail";
+ hash = "0krsv6z9gi0ifxmw5ss6gwn108qhywyhbs41an10x9d5zpgf4l1n";
+ meta.description = "Add location to calls to failwiths";
+ propagatedBuildInputs = [ ppx_here ];
+ };
+
+ jst-config = janePackage {
+ pname = "jst-config";
+ hash = "0yxcz13vda1mdh9ah7qqxwfxpcqang5sgdssd8721rszbwqqaw93";
+ meta.description = "Compile-time configuration for Jane Street libraries";
+ buildInputs = [ ppx_assert ];
+ };
+
+ ppx_optcomp = janePackage {
+ pname = "ppx_optcomp";
+ hash = "0bdbx01kz0174g1szdhv3mcfqxqqf2frxq7hk13xaf6fsz04kwmj";
+ meta.description = "Optional compilation for OCaml";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ jane-street-headers = janePackage {
+ pname = "jane-street-headers";
+ hash = "0qa4llf812rjqa8nb63snmy8d8ny91p3anwhb50afb7vjaby8m34";
+ meta.description = "Jane Street C header files";
+ };
+
+ time_now = janePackage {
+ pname = "time_now";
+ hash = "169mgsb3rja4j1j9nj5xa7bbkd21p9kfpskqz0wjf9x2fpxqsniq";
+ meta.description = "Reports the current time";
+ buildInputs = [ jst-config ppx_optcomp ];
+ propagatedBuildInputs = [ jane-street-headers base ppx_base ];
+ };
+
+ ppx_module_timer = janePackage {
+ pname = "ppx_module_timer";
+ hash = "0yziakm7f4c894na76k1z4bp7azy82xc33mh36fj761w1j9zy3wm";
+ meta.description = "Ppx rewriter that records top-level module startup times";
+ propagatedBuildInputs = [ time_now ];
+ };
+
+ ppx_optional = janePackage {
+ pname = "ppx_optional";
+ hash = "07i0iipbd5xw2bc604qkwlcxmhncfpm3xmrr6svyj2ij86pyssh8";
+ meta.description = "Pattern matching on flat options";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ ppx_pipebang = janePackage {
+ pname = "ppx_pipebang";
+ hash = "1p4pdpl8h2bblbhpn5nk17ri4rxpz0aih0gffg3cl1186irkj0xj";
+ meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`";
+ propagatedBuildInputs = [ ppxlib ];
+ };
+
+ ppx_sexp_value = janePackage {
+ pname = "ppx_sexp_value";
+ hash = "1mg81834a6dx1x7x9zb9wc58438cabjjw08yhkx6i386hxfy891p";
+ meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values";
+ propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
+ };
+
+ typerep = janePackage {
+ pname = "typerep";
+ hash = "1psl6gsk06a62szh60y5sc1s92xpmrl1wpw3rhha09v884b7arbc";
+ meta.description = "Typerep is a library for runtime types";
+ propagatedBuildInputs = [ base ];
+ };
+
+ ppx_typerep_conv = janePackage {
+ pname = "ppx_typerep_conv";
+ hash = "09vik6qma1id44k8nz87y48l9wbjhqhap1ar1hpfdfkjai1hrzzq";
+ meta.description = "Generation of runtime types from type declarations";
+ propagatedBuildInputs = [ ppxlib typerep ];
+ };
+
+ ppx_jane = janePackage {
+ pname = "ppx_jane";
+ hash = "1a2602isqzsh640q20qbmarx0sc316mlsqc3i25ysv2kdyhh0kyw";
+ meta.description = "Standard Jane Street ppx rewriters";
+ propagatedBuildInputs = [ base_quickcheck ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_sexp_value ppx_stable ppx_typerep_conv ];
+ };
+
+ base_bigstring = janePackage {
+ pname = "base_bigstring";
+ hash = "0rbgyg511847fbnxad40prz2dyp4da6sffzyzl88j18cxqxbh1by";
+ meta.description = "String type based on [Bigarray], for use in I/O and C-bindings";
+ propagatedBuildInputs = [ ppx_jane ];
+ };
+
+ parsexp = janePackage {
+ pname = "parsexp";
+ hash = "1974i9s2c2n03iffxrm6ncwbd2gg6j6avz5jsxfd35scc2zxcd4l";
+ meta.description = "S-expression parsing library";
+ propagatedBuildInputs = [ base sexplib0 ];
+ };
+
+ sexplib = janePackage {
+ pname = "sexplib";
+ hash = "0780klc5nnv0ij6aklzra517cfnfkjdlp8ylwjrqwr8dl9rvxza2";
+ meta.description = "Library for serializing OCaml values to and from S-expressions";
+ propagatedBuildInputs = [ num parsexp ];
+ };
+
+ core_kernel = janePackage {
+ pname = "core_kernel";
+ version = "0.12.2";
+ hash = "0c85bjvadrb4pmjcg0gjk3bkkgka62r90pjm690mjvcbbv5zjxzj";
+ meta.description = "System-independent part of Core";
+ buildInputs = [ jst-config ];
+ propagatedBuildInputs = [ base_bigstring sexplib ];
+ };
+
+ spawn = janePackage {
+ pname = "spawn";
+ version = "0.13.0";
+ hash = "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf";
+ meta.description = "Spawning sub-processes";
+ buildInputs = [ ppx_expect ];
+ };
+
+ core = janePackage {
+ pname = "core";
+ version = "0.12.3";
+ hash = "1vmjqiafkg45hqfvahx6jnlaww1q4a4215k8znbgprf0qn3zymnj";
+ meta.description = "System-independent part of Core";
+ buildInputs = [ jst-config ];
+ propagatedBuildInputs = [ core_kernel spawn ];
+ };
+
+ async_kernel = janePackage {
+ pname = "async_kernel";
+ hash = "1d9illx7vvpblj1i2r9y0f2yff2fbhy3rp4hhvamq1n9n3lvxmh2";
+ meta.description = "Monadic concurrency library";
+ propagatedBuildInputs = [ core_kernel ];
+ };
+
+ protocol_version_header = janePackage {
+ pname = "protocol_version_header";
+ hash = "14vqhx3r84rlfhcjq52gxdqksckiaswlck9s47g7y2z1lsc17v7r";
+ meta.description = "Protocol versioning";
+ propagatedBuildInputs = [ core_kernel ];
+ };
+
+ async_rpc_kernel = janePackage {
+ pname = "async_rpc_kernel";
+ hash = "1znhqbzx4fp58i7dbcgyv5rx7difbhb5d8cbqzv96yqvbn67lsjk";
+ meta.description = "Platform-independent core of Async RPC library";
+ propagatedBuildInputs = [ async_kernel protocol_version_header ];
+ };
+
+ async_unix = janePackage {
+ pname = "async_unix";
+ hash = "09h10rdyykbm88n6r9nb5a22mlb6vcxa04q6hvrcr0kys6qhhqmb";
+ meta.description = "Monadic concurrency library";
+ propagatedBuildInputs = [ async_kernel core ];
+ };
+
+ async_extra = janePackage {
+ pname = "async_extra";
+ hash = "10j4mwlyqvf67yrp5dwd857llqjinpnnykmlzw2gpmks9azxk6mh";
+ meta.description = "Monadic concurrency library";
+ propagatedBuildInputs = [ async_rpc_kernel async_unix ];
+ };
+
+ textutils = janePackage {
+ pname = "textutils";
+ hash = "0302awqihf3abib9mvzvn4g8m364hm6jxry1r3kc01hzybhy9acq";
+ meta.description = "Text output utilities";
+ propagatedBuildInputs = [ core ];
+ };
+
+ async = janePackage {
+ pname = "async";
+ hash = "0pk7z3h2gi21nfchvmjz2wx516bynf9vgwf84zf5qhvlvqqsmyrx";
+ meta.description = "Monadic concurrency library";
+ propagatedBuildInputs = [ async_extra textutils ];
+ };
+
+ async_ssl = janePackage {
+ pname = "async_ssl";
+ hash = "02ard8x5q5c42d9jdqmyzfx624yjq8cxxmvq3zb82hf6p8cc57ml";
+ meta.description = "An Async-pipe-based interface with OpenSSL";
+ propagatedBuildInputs = [ async ctypes openssl ];
+ };
+
+ async_find = janePackage {
+ pname = "async_find";
+ hash = "0qsz9f15s5rlk6za10s810v6nlkdxg2g9p1827lcpa7nhjcpi673";
+ meta.description = "Directory traversal with Async";
+ propagatedBuildInputs = [ async ];
+ };
+
+ re2 = janePackage {
+ pname = "re2";
+ hash = "1sw32lb0y501y971ij7287796lvfhs0nfgla895r74ymfks2rcjb";
+ meta.description = "OCaml bindings for RE2, Google's regular expression library";
+ propagatedBuildInputs = [ core_kernel ];
+ };
+
+ shell = janePackage {
+ pname = "shell";
+ hash = "158857rdr6qgglc5iksg0l54jgf51b5lmsw7nlazpxwdwc9fcn5n";
+ meta.description = "Yet another implementation of fork&exec and related functionality";
+ buildInputs = [ jst-config ];
+ propagatedBuildInputs = [ re2 textutils ];
+ };
+
+ async_shell = janePackage {
+ pname = "async_shell";
+ hash = "0cxln9hkc3cy522la9yi9p23qjwl69kqmadsq4lnjh5bxdad06sv";
+ meta.description = "Shell helpers for Async";
+ propagatedBuildInputs = [ async shell ];
+ };
+
+ core_bench = janePackage {
+ pname = "core_bench";
+ hash = "00hyzbbj19dkcw0vhfnc8w0ca3zkjriwwvl00ssa0a2g9mygijdm";
+ meta.description = "Benchmarking library";
+ propagatedBuildInputs = [ textutils ];
+ };
+
+ core_extended = janePackage {
+ pname = "core_extended";
+ hash = "1gwx66235irpf5krb1r25a3c7w52qhmass8hp7rdv89il9jn49w4";
+ meta.description = "Extra components that are not as closely vetted or as stable as Core";
+ propagatedBuildInputs = [ core ];
+ };
+
+ ### Packages at version 0.11, with dependencies at version 0.12
+
+ configurator = janePackage {
+ pname = "configurator";
+ version = "0.11.0";
+ hash = "0h686630cscav7pil8c3w0gbh6rj4b41dvbnwmicmlkc746q5bfk";
+ propagatedBuildInputs = [ stdio ];
+ meta.description = "Helper library for gathering system configuration";
+ };
+
+ ppx_core = janePackage {
+ pname = "ppx_core";
+ version = "0.11.0";
+ hash = "11hgm9mxig4cm3c827f6dns9mjv3pf8g6skf10x0gw9xnp1dmzmx";
+ propagatedBuildInputs = [ ppxlib ];
+ meta.description = "Deprecated (see ppxlib)";
+ };
+
+ ppx_driver = janePackage {
+ pname = "ppx_driver";
+ version = "0.11.0";
+ hash = "00kfx6js2kxk57k4v7hiqvwk7h35whgjihnxf75m82rnaf4yzvfi";
+ propagatedBuildInputs = [ ppxlib ];
+ meta.description = "Deprecated (see ppxlib)";
+ };
+
+ ppx_type_conv = janePackage {
+ pname = "ppx_type_conv";
+ version = "0.11.0";
+ hash = "04dbrglqqhkas25cpjz8xhjcbpk141c35qggzw66bn69izczfmaf";
+ propagatedBuildInputs = [ ppxlib ];
+ meta.description = "Deprecated (see ppxlib)";
+ };
+
+}
diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix
index 19eef7cf1825..ff923bbd467e 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-extra.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async-extra.nix
@@ -2,7 +2,7 @@
bin_prot, core, ppx_custom_printf, fieldslib, herelib,
pipebang, sexplib, async_rpc_kernel}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "async_extra";
hash = "1xdwab19fycr4cdm3dh9vmx42f8lvf9s4f9pjgdydxfrm7yzyrfh";
propagatedBuildInputs = [ async_kernel async_unix core bin_prot ppx_custom_printf
diff --git a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix
index 938f5ccf4474..49f38136c4f5 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix
@@ -2,7 +2,7 @@
bin_prot, fieldslib,
sexplib, herelib}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "async_kernel";
hash = "1n6ifbrq6q6hq8bxh6b9vhg11mv9r6jgp1b7vfw7mh5s2nrd4b60";
propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ];
diff --git a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
index 1f5ff6b9646f..83a7e13a5d01 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
@@ -2,7 +2,7 @@
fieldslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test,
ppx_jane, sexplib, typerep, variantslib}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "async_rpc_kernel";
hash = "0pvys7giqix1nfidw1f4i3r94cf03ba1mvhadpm2zpdir3av91sw";
propagatedBuildInputs = [ async_kernel bin_prot core_kernel fieldslib
diff --git a/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/pkgs/development/ocaml-modules/janestreet/async-unix.nix
index 7db7cae27096..0d0f26134f2f 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-unix.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async-unix.nix
@@ -2,7 +2,7 @@
bin_prot, comparelib, core, fieldslib, herelib,
pipebang, sexplib}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "async_unix";
hash = "03ng7f0s22wwzspakiqj442vs1a7yf834109jcj9r3g1awwfhcy7";
propagatedBuildInputs = [ async_kernel core bin_prot comparelib
diff --git a/pkgs/development/ocaml-modules/janestreet/async.nix b/pkgs/development/ocaml-modules/janestreet/async.nix
index 4cd67e1af86b..fe01e47426da 100644
--- a/pkgs/development/ocaml-modules/janestreet/async.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane, async_kernel,
async_unix, async_extra}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "async";
version = "113.33.03";
hash = "0wyspkp8k833fh03r3h016nbfn6kjfhvb2bg42cly6agcak59fmr";
diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
index 631562159762..e8f42ef71d1e 100644
--- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
@@ -2,7 +2,7 @@
, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis
}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "async_ssl";
version = "113.33.07";
hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs";
diff --git a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix
index 11e6189e6c1e..c47fcd2fea6b 100644
--- a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix
+++ b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix
@@ -1,6 +1,6 @@
{stdenv, buildOcamlJane, type_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "bin_prot";
version = "113.33.03";
minimumSupportedOcamlVersion = "4.02";
diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix
index 5410167e0a26..c7c69beedb7b 100644
--- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix
@@ -4,7 +4,7 @@
ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
re2, textutils}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "core_extended";
hash = "1j4ipcn741j8w3h4gpv5sygjzg6b5g6gc2jcrr4n0jyn5dq8b0p5";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/core.nix b/pkgs/development/ocaml-modules/janestreet/core.nix
index c2f97badda93..f6a7ba5b0db0 100644
--- a/pkgs/development/ocaml-modules/janestreet/core.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core.nix
@@ -3,7 +3,7 @@
bin_prot, fieldslib, sexplib, typerep, variantslib,
ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "core";
hash = "0nz6d5glgymbpchvcpw77yis9jgi2bll32knzy9vx99wn83zdrmd";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/pkgs/development/ocaml-modules/janestreet/core_bench.nix
index 83e6100f0597..b279318dd935 100644
--- a/pkgs/development/ocaml-modules/janestreet/core_bench.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core_bench.nix
@@ -5,7 +5,7 @@
, textutils
}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "core_bench";
hash = "1d1ainpakgsf5rg8dvar12ksgilqcc4465jr8gf7fz5mmn0mlifj";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
index e5bbb7800520..53e92a95c236 100644
--- a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
@@ -2,7 +2,7 @@
bin_prot, fieldslib, sexplib, typerep, variantslib,
ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "core_kernel";
hash = "13gamj056nlib04l7yh80lqpdx0pnswzlb52fkqa01awwp5nf3z6";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix
index 8823a0c8054d..8ce1ca6c505a 100644
--- a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix
+++ b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix
@@ -1,6 +1,6 @@
{ stdenv, type_conv, buildOcamlJane }:
-buildOcamlJane rec {
+buildOcamlJane {
name = "fieldslib";
version = "113.33.03";
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
new file mode 100644
index 000000000000..5b7d9c3210d4
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
@@ -0,0 +1,19 @@
+{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.12.0" }:
+
+{ pname, version ? defaultVersion, hash, ...}@args:
+
+buildDunePackage (args // {
+ inherit version;
+
+ minimumOCamlVersion = "4.07";
+
+ src = fetchFromGitHub {
+ owner = "janestreet";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = hash;
+ };
+
+ meta.license = lib.licenses.mit;
+ meta.homepage = "https://github.com/janestreet/${pname}";
+})
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
index b61874d3a7ea..3ed7106e7b65 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_compare, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools, ppx_type_conv, sexplib}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_assert";
hash = "0n7fa1j79ykbkhp8xz0ksg5096asri5d0msshsaqhw5fz18chvz4";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
index 56a124c5b691..9e5df431e04c 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_inline_test, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_bench";
minimumSupportedOcamlVersion = "4.02";
hash = "1l5jlwy1d1fqz70wa2fkf7izngp6nx3g4s9bmnd6ca4dx1x5bksk";
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
index 9dffbed69600..d7f333d4cf4c 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_tools, ppx_type_conv, bin_prot}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_bin_prot";
hash = "0kwmrrrybdkmphqczsr3lg3imsxcjb8iy41syvn44s3kcjfyyzbz";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv bin_prot ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
index d70fe6ddd550..0bfdd7bd540c 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_tools, ppx_type_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_compare";
hash = "05cnwxfxm8201lpfmcqkcqfy6plh5c2151jbj4qsnxhlvvjli459";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-core.nix b/pkgs/development/ocaml-modules/janestreet/ppx-core.nix
index 4f5bb87b7675..c5789ee9cfb4 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-core.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-core.nix
@@ -1,6 +1,6 @@
{stdenv, buildOcamlJane, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_core";
hash = "0df7vyai488lfkyh8szw2hvn22jsyrkfvq1b91j1s0g0y27nnfax";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
index 3fe78e3e7e2e..c652afa5fbfc 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_sexp_conv, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_custom_printf";
hash = "06y85m6ky376byja4w7gdwd339di5ag0xrf0czkylzjsnylhdr85";
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix b/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix
index 7844756c7bfb..b4fb9ec7602f 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_optcomp}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_driver";
hash = "19cpfdn1n36vl5l9d6h7c61ffn0wmiipprn5by0354i5aywj8gpn";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
index 8dbf34ed2329..2fdfede0f23d 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_tools, ppx_type_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_enumerate";
hash = "0m11921q2pjzkwckf21fynd2qfy83n9jjsgks23yagdai8a7ym16";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
index 7e688a1dc1c8..f78f93ee1202 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
@@ -3,7 +3,7 @@
ppx_fields_conv, ppx_here, ppx_inline_test, ppx_sexp_conv, ppx_tools,
ppx_variants_conv, re, sexplib, variantslib, fieldslib}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_expect";
hash = "0cwagb4cj3x1vsr19kyfa9pxlvaz9a5v863cahi5glinsh4mzgdx";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix
index 187d5db19995..4f55a6c4eacb 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_here, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_fail";
hash = "1ms5axpc0zg469zj4799nz3wwxi6rmmyvqj52dy03crmpj71s18l";
propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_tools ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
index a05cf149b268..551738573b36 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_tools, ppx_type_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_fields_conv";
hash = "11w9wfjgkv7yxv3rwlwi6m193zan6rhmi45q7n3ddi2s8ls3gra7";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix
index 3aa157a68c5b..ea3ac5e8e5ae 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_here";
hash = "1mzdgn8k171zkwmbizf1a48l525ny0w3363c7gknpnifcinxniiw";
propagatedBuildInputs = [ ppx_core ppx_driver ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
index cd16d7c32864..d0e4c84158c7 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_inline_test";
hash = "0ygapa54i0wwcj3jcqwiimrc6z0b7aafgjhbk37h6vvclnm5n7f6";
propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
index 86394f228e9d..1086059b19f3 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
@@ -5,7 +5,7 @@
ppx_inline_test, ppx_let, ppx_pipebang, ppx_sexp_conv, ppx_sexp_message,
ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_jane";
hash = "1la0rp8fhzfglwb15gqh1pl1ld8ls4cnidaw9mjc5q1hb0yj1qd9";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix
index 3498affeb090..8c8b87d7112e 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_let";
hash = "0whnfq4rgkq4apfqnvc100wlk25pmqdyvy6s21dsn3fcm9hff467";
propagatedBuildInputs = [ ppx_core ppx_driver ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
index 5dcfc97bfa37..61fa66b77cc5 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_optcomp";
hash = "09m2x2a5ics4bz1j29n5slhh1rlyhcwdfmf44v1jfxcby3f0riwd";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
index f3f4bcdead59..209638f97b74 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_pipebang";
hash = "0k25bhj9ziiw89xvs4svz7cgazbbmprba9wbic2llffg55fp7acc";
propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
index bf4a7b214dec..00361ee81ebe 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_tools, ppx_type_conv, sexplib}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_sexp_conv";
hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
index e83aaa2c2723..2a8bf44bfab2 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_sexp_message";
hash = "0inbff25qii868p141jb1y8n3vjfyz66jpnsl9nma6nkkyjkp05j";
propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
index a1a1080d73d7..64fbe4bd9bb9 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_sexp_value";
hash = "04602ppqfwx33ghjywam00hlqqzsz4d99r60k9q0v1mynk9pjhj0";
propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix
index fc6d9ca03459..bf36dfab5cb0 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_deriving, ppx_driver, ppx_tools}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_type_conv";
hash = "0gv0mqwn97dwrfm6rj442565y8dz7kiq8s8vadnhywrl7j4znqyq";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
index e6d23e0dbdd0..472ec19b5588 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_tools, ppx_type_conv, typerep}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_typerep_conv";
hash = "0dldlx73r07j6w0i7h4hxly0v678naa79na5rafsk2974gs5ih9g";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv typerep ];
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
index 9bc1cbb59e46..1d01b0bc321d 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
@@ -1,7 +1,7 @@
{stdenv, buildOcamlJane,
ppx_core, ppx_tools, ppx_type_conv, sexplib, variantslib}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "ppx_variants_conv";
hash = "0kgal8b9yh7wrd75hllb9fyl6zbksfnr9k7pykpzdm3js98dirhn";
propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib variantslib ];
diff --git a/pkgs/development/ocaml-modules/janestreet/re2.nix b/pkgs/development/ocaml-modules/janestreet/re2.nix
index 6604a8d012c6..9153d336b22a 100644
--- a/pkgs/development/ocaml-modules/janestreet/re2.nix
+++ b/pkgs/development/ocaml-modules/janestreet/re2.nix
@@ -3,7 +3,7 @@
ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
rsync}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "re2";
hash = "0fw5jscb1i17aw8v4l965zw20kyimhfnmf4w83wqaaxkqy3l6fqw";
buildInputs = [ rsync ];
diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/pkgs/development/ocaml-modules/janestreet/sexplib.nix
index 4a785d199c8c..f4a86f80b04d 100644
--- a/pkgs/development/ocaml-modules/janestreet/sexplib.nix
+++ b/pkgs/development/ocaml-modules/janestreet/sexplib.nix
@@ -1,6 +1,6 @@
{stdenv, buildOcamlJane, type_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
minimumSupportedOcamlVersion = "4.02";
name = "sexplib";
version = "113.33.03";
diff --git a/pkgs/development/ocaml-modules/janestreet/textutils.nix b/pkgs/development/ocaml-modules/janestreet/textutils.nix
index 459743f055ab..6b3dba5aac8e 100644
--- a/pkgs/development/ocaml-modules/janestreet/textutils.nix
+++ b/pkgs/development/ocaml-modules/janestreet/textutils.nix
@@ -2,7 +2,7 @@
bin_prot, core, fieldslib, sexplib, typerep, variantslib,
ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "textutils";
hash = "0mkjm9b3k7db7zzrq4403v8qbkgqgkjlz120vcbqh6z7d7ql65vb";
propagatedBuildInputs =
diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/pkgs/development/ocaml-modules/janestreet/typerep.nix
index 81e6c4be9cbc..2e8fcde1d0da 100644
--- a/pkgs/development/ocaml-modules/janestreet/typerep.nix
+++ b/pkgs/development/ocaml-modules/janestreet/typerep.nix
@@ -1,6 +1,6 @@
{stdenv, buildOcamlJane, type_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "typerep";
version = "113.33.03";
diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix
index d9acadbb6158..7b3af8a080e9 100644
--- a/pkgs/development/ocaml-modules/janestreet/variantslib.nix
+++ b/pkgs/development/ocaml-modules/janestreet/variantslib.nix
@@ -1,6 +1,6 @@
{stdenv, buildOcamlJane, type_conv}:
-buildOcamlJane rec {
+buildOcamlJane {
name = "variantslib";
version = "113.33.03";
diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
index 55a4a02f7ffc..581319a0edfe 100644
--- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (rec {
stdenv.lib.maintainers.roconnor
];
homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html;
- description = "LablGTK is is an Objective Caml interface to gtk+";
+ description = "LablGTK is is an Objective Caml interface to GTK";
license = stdenv.lib.licenses.lgpl21Plus;
};
})
diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index 6b01929db768..1b1869f991ea 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -3,9 +3,9 @@
let param =
let check = stdenv.lib.versionAtLeast ocaml.version; in
if check "4.06" then {
- version = "2.18.6";
- url = https://forge.ocamlcore.org/frs/download.php/1726/lablgtk-2.18.6.tar.gz;
- sha256 = "1y38fdvswy6hmppm65qvgdk4pb3ghhnvz7n4ialf46340r1s5p2d";
+ version = "2.18.8";
+ url = "https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/lablgtk-2.18.8.tar.gz";
+ sha256 = "1qsd9nv96fxddc8zayqiqxw9hcyf29axckqg100fm2brs2prpxci";
} else if check "3.12" then {
version = "2.18.5";
url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz;
@@ -13,8 +13,8 @@ let param =
} else throw "lablgtk is not available for OCaml ${ocaml.version}";
in
-stdenv.mkDerivation rec {
- name = "lablgtk-${version}";
+stdenv.mkDerivation {
+ pname = "lablgtk";
inherit (param) version;
src = fetchurl {
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
z77z roconnor vbgl
];
homepage = http://lablgtk.forge.ocamlcore.org/;
- description = "An OCaml interface to gtk+";
+ description = "An OCaml interface to GTK";
license = licenses.lgpl21Plus;
};
}
diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix
index 8ba27248db6a..d49208ede602 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ cairo2 ];
meta = {
- description = "OCaml interface to gtk+-3";
+ description = "OCaml interface to GTK 3";
homepage = "http://lablgtk.forge.ocamlcore.org/";
license = lib.licenses.lgpl21;
maintainers = [ lib.maintainers.vbgl ];
diff --git a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix
index 7e898be74901..be57c7e7146f 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix
+++ b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix
@@ -1,6 +1,6 @@
{ buildDunePackage, gtkspell3, lablgtk3 }:
-buildDunePackage rec {
+buildDunePackage {
pname = "lablgtk3-gtkspell3";
buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs;
propagatedBuildInputs = [ lablgtk3 ];
diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
index a266e57dd859..0e8ba3ef3ffe 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
+++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix
@@ -1,6 +1,6 @@
{ buildDunePackage, gtksourceview, lablgtk3 }:
-buildDunePackage rec {
+buildDunePackage {
pname = "lablgtk3-sourceview3";
buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ];
propagatedBuildInputs = [ lablgtk3 ];
diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix
index b4a4e012560e..d92cf543f803 100644
--- a/pkgs/development/ocaml-modules/labltk/default.nix
+++ b/pkgs/development/ocaml-modules/labltk/default.nix
@@ -25,7 +25,7 @@ let param = {
key = "1764";
sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj";
};
-}."${builtins.substring 0 4 ocaml.version}";
+}.${builtins.substring 0 4 ocaml.version};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix
index b316540e3d05..4556fb1eb416 100644
--- a/pkgs/development/ocaml-modules/lacaml/default.nix
+++ b/pkgs/development/ocaml-modules/lacaml/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "mmottl";
repo = "lacaml";
- rev = "${version}";
+ rev = version;
sha256 = "1aflg07cc9ak9mg1cr0qr368c9s141glwlarl5nhalf6hhq7ibcb";
};
diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix
index 3bced92cc3e3..3cebefb33edf 100644
--- a/pkgs/development/ocaml-modules/llvm/default.nix
+++ b/pkgs/development/ocaml-modules/llvm/default.nix
@@ -3,25 +3,28 @@
let version = stdenv.lib.getVersion llvm; in
stdenv.mkDerivation {
- name = "ocaml-llvm-${version}";
+ pname = "ocaml-llvm";
+ inherit version;
inherit (llvm) src;
buildInputs = [ python cmake llvm ocaml findlib ctypes ];
patches = [ (fetchpatch {
- url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/llvm/llvm.3.9/files/cmake.patch;
- sha256 = "1fcc6ylfiw1npdhx7mrsj7h0dx7cym7i9664kpr76zqazb52ikm9";
+ url = https://raw.githubusercontent.com/ocaml/opam-repository/2bdc193f5a9305ea93bf0f0dfc1fbc327c8b9306/packages/llvm/llvm.7.0.0/files/fix-shared.patch;
+ sha256 = "1p98j3b1vrryfn1xa7i50m6mmm4dyw5ldafq6kyh9sfmdihz4zsx";
})];
- cmakeFlags = [ "-DLLVM_OCAML_OUT_OF_TREE=TRUE" ];
+ cmakeFlags = [
+ "-DLLVM_OCAML_OUT_OF_TREE=TRUE"
+ "-DLLVM_OCAML_INSTALL_PATH=${placeholder "out"}/ocaml"
+ ];
buildFlags = "ocaml_all";
installFlags = "-C bindings/ocaml";
postInstall = ''
- mv $out/lib/ocaml $out/ocaml
mkdir -p $OCAMLFIND_DESTDIR/
mv $out/ocaml $OCAMLFIND_DESTDIR/llvm
mv $OCAMLFIND_DESTDIR/llvm/META{.llvm,}
diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix
index 22c4216a88ff..15d2bde0ec6f 100644
--- a/pkgs/development/ocaml-modules/logs/default.nix
+++ b/pkgs/development/ocaml-modules/logs/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Logging infrastructure for OCaml";
- homepage = "${webpage}";
+ homepage = webpage;
inherit (ocaml.meta) platforms;
maintainers = [ maintainers.sternenseemann ];
license = licenses.isc;
diff --git a/pkgs/development/ocaml-modules/lwt/4.x.nix b/pkgs/development/ocaml-modules/lwt/4.x.nix
index 105104bc308d..4850a853ea04 100644
--- a/pkgs/development/ocaml-modules/lwt/4.x.nix
+++ b/pkgs/development/ocaml-modules/lwt/4.x.nix
@@ -1,29 +1,33 @@
-{ stdenv, fetchzip, pkgconfig, ncurses, libev, buildDunePackage, ocaml
+{ lib, fetchzip, pkgconfig, ncurses, libev, buildDunePackage, ocaml
, cppo, ocaml-migrate-parsetree, ppx_tools_versioned, result
+, mmap, seq
}:
-let inherit (stdenv.lib) optional versionAtLeast; in
+let inherit (lib) optional versionAtLeast; in
buildDunePackage rec {
pname = "lwt";
- version = "4.1.0";
+ version = "4.2.1";
src = fetchzip {
url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz";
- sha256 = "16wnc61kfj54z4q8sn9f5iik37pswz328hcz3z6rkza3kh3s6wmm";
+ sha256 = "1hz24fyhpm7d6603v399pgxvdl236srwagqja41ljvjx83y10ysr";
};
+ postPatch = ''
+ substituteInPlace lwt.opam \
+ --replace 'version: "dev"' 'version: "${version}"'
+ '';
+
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cppo ocaml-migrate-parsetree ppx_tools_versioned ]
++ optional (!versionAtLeast ocaml.version "4.07") ncurses;
- propagatedBuildInputs = [ libev result ];
-
- configurePhase = "ocaml src/util/configure.ml -use-libev true";
+ propagatedBuildInputs = [ libev mmap seq result ];
meta = {
homepage = "https://ocsigen.org/lwt/";
description = "A cooperative threads library for OCaml";
- maintainers = [ stdenv.lib.maintainers.vbgl ];
- license = stdenv.lib.licenses.lgpl21;
+ maintainers = [ lib.maintainers.vbgl ];
+ license = lib.licenses.mit;
};
}
diff --git a/pkgs/development/ocaml-modules/lwt/legacy.nix b/pkgs/development/ocaml-modules/lwt/legacy.nix
index cd40a5051be9..e6ef82a90088 100644
--- a/pkgs/development/ocaml-modules/lwt/legacy.nix
+++ b/pkgs/development/ocaml-modules/lwt/legacy.nix
@@ -14,11 +14,11 @@ let sha256 = {
"3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88";
"2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w";
"2.6.0" = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w";
-}."${version}"; in
+}.${version}; in
let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in
-buildOcaml rec {
+buildOcaml {
name = "lwt";
inherit version;
diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix
index 9a8a6259a778..65acbd6cc428 100644
--- a/pkgs/development/ocaml-modules/magic-mime/default.nix
+++ b/pkgs/development/ocaml-modules/magic-mime/default.nix
@@ -3,7 +3,8 @@
let version = "1.0.0"; in
stdenv.mkDerivation {
- name = "ocaml-magic-mime-${version}";
+ pname = "ocaml-magic-mime";
+ inherit version;
src = fetchzip {
url = "https://github.com/mirage/ocaml-magic-mime/archive/v${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix
index e69b9dabeabc..d767c20f6385 100644
--- a/pkgs/development/ocaml-modules/menhir/generic.nix
+++ b/pkgs/development/ocaml-modules/menhir/generic.nix
@@ -1,7 +1,8 @@
{ version, src, stdenv, ocaml, findlib, ocamlbuild, ... }:
stdenv.mkDerivation {
- name = "menhir-${version}";
+ pname = "menhir";
+ inherit version;
inherit src;
diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix
index 9108fd248c01..06a87c072b4a 100644
--- a/pkgs/development/ocaml-modules/nocrypto/default.nix
+++ b/pkgs/development/ocaml-modules/nocrypto/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg
, cpuid, ocb-stubblr, sexplib
-, cstruct, zarith, ppx_sexp_conv
+, cstruct, zarith, ppx_sexp_conv, ppx_deriving
, cstruct-lwt ? null
}:
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr ];
- propagatedBuildInputs = [ cstruct ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt;
+ propagatedBuildInputs = [ cstruct ppx_deriving ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt;
buildPhase = "${topkg.buildPhase} --with-lwt ${boolToString withLwt}";
inherit (topkg) installPhase;
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index b789b133aaf3..11405c0ebe5e 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }:
stdenv.mkDerivation rec {
- name = "ocaml-libvirt-${version}";
+ pname = "ocaml-libvirt";
rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897";
version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4
diff --git a/pkgs/development/ocaml-modules/ocaml-result/default.nix b/pkgs/development/ocaml-modules/ocaml-result/default.nix
index 362ad697934f..f6dee5ce3ce8 100644
--- a/pkgs/development/ocaml-modules/ocaml-result/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-result/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "janestreet";
repo = "result";
- rev = "${version}";
+ rev = version;
sha256 = "1jwzpcmxwgkfsbjz9zl59v12hf1vv4r9kiifancn9p8gm206g3g0";
};
diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix
index 10d8484e3efa..e210ffa11523 100644
--- a/pkgs/development/ocaml-modules/ocaml-text/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }:
stdenv.mkDerivation rec {
- name = "ocaml-text-${version}";
+ pname = "ocaml-text";
version = "0.8";
src = fetchzip {
diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
index 20b63e3a8eef..27442075064c 100644
--- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ocaml, camlidl, fuse, findlib }:
stdenv.mkDerivation rec {
- name = "ocamlfuse-${version}";
+ pname = "ocamlfuse";
version = "2.7.1_cvs5";
src = fetchFromGitHub {
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index e005024d2225..887dce586897 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, ocaml, findlib, lablgtk}:
stdenv.mkDerivation rec {
- name = "ocamlgraph-${version}";
+ pname = "ocamlgraph";
version = "1.8.8";
src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix
index d6d0c3292bb5..8063f284728b 100644
--- a/pkgs/development/ocaml-modules/ocamlmake/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix
@@ -6,7 +6,8 @@ let
sha256 = "99ff58080ed154cc4bd70f915fe4760dffb026a1c0447caa0b3bdb982b24b0a8";
in stdenv.mkDerivation {
- name = "ocaml-make-${version}";
+ pname = "ocaml-make";
+ inherit version;
src = fetchurl {
url = "https://bitbucket.org/mmottl/ocaml-makefile/downloads/ocaml-makefile-${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix
index 9c4c2e21eddd..468e387f8f11 100644
--- a/pkgs/development/ocaml-modules/ocamlnat/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix
@@ -4,11 +4,11 @@
assert lib.versionOlder ocaml.version "4";
stdenv.mkDerivation rec {
- name = "ocamlnat-${version}";
+ pname = "ocamlnat";
version = "0.1.1";
src = fetchurl {
- url = "http://benediktmeurer.de/files/source/${name}.tar.bz2";
+ url = "http://benediktmeurer.de/files/source/${pname}-${version}.tar.bz2";
sha256 = "0dyvy0j6f47laxhnadvm71z1py9hz9zd49hamf6bij99cggb2ij1";
};
diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix
index 6117d30665f0..0452b1b7dfe4 100644
--- a/pkgs/development/ocaml-modules/ocf/default.nix
+++ b/pkgs/development/ocaml-modules/ocf/default.nix
@@ -4,7 +4,7 @@ if stdenv.lib.versionOlder ocaml.version "4.03"
then throw "ocf not supported for ocaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
- name = "ocf-${version}";
+ pname = "ocf";
version = "0.5.0";
src = fetchFromGitHub {
owner = "zoggy";
diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix
new file mode 100644
index 000000000000..af3341e7e598
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix
@@ -0,0 +1,14 @@
+{ buildDunePackage, ocplib-json-typed, js_of_ocaml }:
+
+buildDunePackage {
+ pname = "ocplib-json-typed-browser";
+ inherit (ocplib-json-typed) version src;
+
+ propagatedBuildInputs = [ ocplib-json-typed js_of_ocaml ];
+
+ meta = {
+ description = "A Json_repr interface over JavaScript's objects";
+ inherit (ocplib-json-typed.meta) homepage license maintainers;
+ };
+}
+
diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix
new file mode 100644
index 000000000000..350c31a3819d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocplib-json-typed/bson.nix
@@ -0,0 +1,13 @@
+{ buildDunePackage, ocplib-json-typed, ocplib-endian }:
+
+buildDunePackage {
+ pname = "ocplib-json-typed-bson";
+ inherit (ocplib-json-typed) version src;
+
+ propagatedBuildInputs = [ ocplib-json-typed ocplib-endian ];
+
+ meta = {
+ description = "A Json_repr compatible implementation of the JSON compatible subset of BSON";
+ inherit (ocplib-json-typed.meta) homepage license maintainers;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
index cadb65bcbed9..6a1b906d7f2b 100644
--- a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
+++ b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
@@ -1,25 +1,21 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocplib-endian, js_of_ocaml, uri }:
+{ lib, buildDunePackage, fetchFromGitHub, uri }:
-stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-ocplib-json-typed-${version}";
- version = "0.5";
+buildDunePackage rec {
+ pname = "ocplib-json-typed";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocplib-json-typed";
rev = "v${version}";
- sha256 = "02c600wm2wdpzb66pivxzwjhqa2dm7dqyfvw3mbvkv1g2jj7kn2q";
+ sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q";
};
- buildInputs = [ ocaml findlib ocplib-endian js_of_ocaml ];
propagatedBuildInputs = [ uri ];
- createFindlibDestdir = true;
-
meta = {
description = "A collection of type-aware JSON utilities for OCaml";
- license = stdenv.lib.licenses.lgpl21;
- maintainers = [ stdenv.lib.maintainers.vbgl ];
+ license = lib.licenses.lgpl21;
+ maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
- inherit (ocaml.meta) platforms;
};
}
diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
index 569f5081355c..0263d3284ffa 100644
--- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
@@ -17,7 +17,8 @@ in
let inherit (param) version; in
stdenv.mkDerivation {
- name = "ocsigen-deriving-${version}";
+ pname = "ocsigen-deriving";
+ inherit version;
src = fetchzip {
url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz";
inherit (param) sha256;
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 147b4200cf69..9499bff84a10 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -14,7 +14,7 @@ in
stdenv.mkDerivation rec {
version = "2.11.0";
- name = "ocsigenserver-${version}";
+ pname = "ocsigenserver";
src = fetchFromGitHub {
owner = "ocsigen";
diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix
index f61a690da190..4d308dc78b5f 100644
--- a/pkgs/development/ocaml-modules/opam-file-format/default.nix
+++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "ocaml";
repo = "opam-file-format";
- rev = "${version}";
+ rev = version;
sha256 = "0fqb99asnair0043hhc8r158d6krv5nzvymd0xwycr5y72yrp0hv";
};
diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/pkgs/development/ocaml-modules/opium/default.nix
index 06784b445e3b..cbd3a14541f5 100644
--- a/pkgs/development/ocaml-modules/opium/default.nix
+++ b/pkgs/development/ocaml-modules/opium/default.nix
@@ -13,7 +13,7 @@
, alcotest
}:
-buildDunePackage rec {
+buildDunePackage {
pname = "opium";
inherit (opium_kernel) version src meta minimumOCamlVersion;
diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix
index e80b322ffba1..8d5bf290c6e0 100644
--- a/pkgs/development/ocaml-modules/otfm/default.nix
+++ b/pkgs/development/ocaml-modules/otfm/default.nix
@@ -8,7 +8,7 @@ in
assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ocaml-${pname}-${version}";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
provides low-level access to font tables and functions to decode some
of them.
'';
- homepage = "${webpage}";
+ homepage = webpage;
platforms = ocaml.meta.platforms or [];
license = licenses.bsd3;
maintainers = [ maintainers.jirkamarsik ];
diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix
index caa2d01a4418..ba192b3c24b2 100644
--- a/pkgs/development/ocaml-modules/otr/default.nix
+++ b/pkgs/development/ocaml-modules/otr/default.nix
@@ -9,7 +9,7 @@ buildDunePackage rec {
src = fetchFromGitHub {
owner = "hannesm";
repo = "ocaml-otr";
- rev = "${version}";
+ rev = version;
sha256 = "0iz6p85a0jxng9aq9blqsky173zaqfr6wlc5j48ad55lgwzlbih5";
};
diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
index bbe38ac89942..83d47fbb3af8 100644
--- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.7.5";
- name = "piqi-ocaml-${version}";
+ pname = "piqi-ocaml";
src = fetchurl {
url = "https://github.com/alavrik/piqi-ocaml/archive/v${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
index 6be1595f7c59..fb06820f1961 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.6.14";
- name = "piqi-${version}";
+ pname = "piqi";
src = fetchurl {
url = "https://github.com/alavrik/piqi/archive/v${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix
index a8fb4af2a6bb..60b730e06403 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -23,7 +23,7 @@ let param = {
"4.08" = {
version = "5.3+4.08.0";
sha256 = "0vdmhs3hpmh5iclx4lzgdpf362m4l35zprxs73r84z1yhr4jcr4m"; };
-}."${ocaml.meta.branch}";
+}.${ocaml.meta.branch};
in
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-ppx_tools-${param.version}";
diff --git a/pkgs/development/ocaml-modules/rpclib/default.nix b/pkgs/development/ocaml-modules/rpclib/default.nix
new file mode 100644
index 000000000000..2b4ab1818590
--- /dev/null
+++ b/pkgs/development/ocaml-modules/rpclib/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, buildDunePackage, alcotest, cmdliner, rresult, result, xmlm, yojson }:
+
+buildDunePackage rec {
+ pname = "rpclib";
+ version = "5.9.0";
+
+ minimumOCamlVersion = "4.04";
+
+ src = fetchFromGitHub {
+ owner = "mirage";
+ repo = "ocaml-rpc";
+ rev = "v${version}";
+ sha256 = "1swnnmmnkn53mxqpckdnd1j8bz0wksqznjbv0zamspxyqybmancq";
+ };
+
+ buildInputs = [ alcotest cmdliner yojson ];
+ propagatedBuildInputs = [ rresult result xmlm ];
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/mirage/ocaml-rpc";
+ description = "Light library to deal with RPCs in OCaml";
+ license = licenses.isc;
+ maintainers = [ maintainers.vyorkin ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index 94120f2f8b9d..01bc71928469 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -7,7 +7,7 @@ let
version = "1.5.6";
webpage = "http://sawja.inria.fr/";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ocaml${ocaml.version}-${pname}-${version}";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs";
- homepage = "${webpage}";
+ homepage = webpage;
license = licenses.gpl3Plus;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/pkgs/development/ocaml-modules/secp256k1/default.nix
index 69b276db90ec..64f05b26dd81 100644
--- a/pkgs/development/ocaml-modules/secp256k1/default.nix
+++ b/pkgs/development/ocaml-modules/secp256k1/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildDunePackage, base, stdio, configurator, secp256k1 }:
-buildDunePackage rec {
+buildDunePackage {
pname = "secp256k1";
version = "0.4.0";
diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix
index 38e1b3c7467d..0b3f13bc54f2 100644
--- a/pkgs/development/ocaml-modules/sqlite3/default.nix
+++ b/pkgs/development/ocaml-modules/sqlite3/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, sqlite, ocaml, findlib, ocamlbuild, pkgconfig }:
stdenv.mkDerivation rec {
- name = "ocaml-sqlite3-${version}";
+ pname = "ocaml-sqlite3";
version = "2.0.9";
src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix
index 2a29179f4cd4..b1a178128adb 100644
--- a/pkgs/development/ocaml-modules/tls/default.nix
+++ b/pkgs/development/ocaml-modules/tls/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "mirleft";
repo = "ocaml-tls";
- rev = "${version}";
+ rev = version;
sha256 = "02wv4lia583imn3sfci4nqv6ac5nzig5j3yfdnlqa0q8bp9rfc6g";
};
diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix
index 17f66227e9c5..1bac71d301ff 100644
--- a/pkgs/development/ocaml-modules/tsdl/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
inherit (topkg) buildPhase installPhase;
meta = with stdenv.lib; {
- homepage = "${webpage}";
+ homepage = webpage;
description = "Thin bindings to the cross-platform SDL library";
license = licenses.bsd3;
platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix
index 773bec612d6a..097676e8abba 100644
--- a/pkgs/development/ocaml-modules/uucd/default.nix
+++ b/pkgs/development/ocaml-modules/uucd/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An OCaml module to decode the data of the Unicode character database from its XML representation";
- homepage = "${webpage}";
+ homepage = webpage;
platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers.vbgl ];
license = licenses.bsd3;
diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix
index b5074841eb1b..d657a6f02053 100644
--- a/pkgs/development/ocaml-modules/uucp/default.nix
+++ b/pkgs/development/ocaml-modules/uucp/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database";
- homepage = "${webpage}";
+ homepage = webpage;
platforms = ocaml.meta.platforms or [];
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix
index ab6a7d8f5235..079e810bfdc6 100644
--- a/pkgs/development/ocaml-modules/uuidm/default.nix
+++ b/pkgs/development/ocaml-modules/uuidm/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.9.7";
- name = "uuidm-${version}";
+ pname = "uuidm";
src = fetchurl {
url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz";
sha256 = "1ivxb3hxn9bk62rmixx6px4fvn52s4yr1bpla7rgkcn8981v45r8";
diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix
index 263094ca2eb0..c8eb8ea532c4 100644
--- a/pkgs/development/ocaml-modules/uunf/default.nix
+++ b/pkgs/development/ocaml-modules/uunf/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An OCaml module for normalizing Unicode text";
- homepage = "${webpage}";
+ homepage = webpage;
platforms = ocaml.meta.platforms or [];
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix
index 404a463fd034..8fb9d207576d 100644
--- a/pkgs/development/ocaml-modules/uuseg/default.nix
+++ b/pkgs/development/ocaml-modules/uuseg/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An OCaml library for segmenting Unicode text";
- homepage = "${webpage}";
+ homepage = webpage;
platforms = ocaml.meta.platforms or [];
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix
index b6b943b2a036..863a4cbb8409 100644
--- a/pkgs/development/ocaml-modules/uutf/default.nix
+++ b/pkgs/development/ocaml-modules/uutf/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Non-blocking streaming Unicode codec for OCaml";
- homepage = "${webpage}";
+ homepage = webpage;
platforms = ocaml.meta.platforms or [];
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix
index 9980b3f10830..0a127e49fdc2 100644
--- a/pkgs/development/ocaml-modules/vg/default.nix
+++ b/pkgs/development/ocaml-modules/vg/default.nix
@@ -19,7 +19,7 @@ if !versionAtLeast ocaml.version "4.03"
then throw "vg is not available for OCaml ${ocaml.version}"
else
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ocaml${ocaml.version}-${pname}-${version}";
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
Renderers for PDF, SVG and the HTML canvas are distributed with the
module. An API allows to implement new renderers.
'';
- homepage = "${webpage}";
+ homepage = webpage;
inherit (ocaml.meta) platforms;
license = licenses.isc;
maintainers = [ maintainers.jirkamarsik ];
diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix
index 4324b62f9c6e..bb05b89d7bef 100644
--- a/pkgs/development/ocaml-modules/xmlm/default.nix
+++ b/pkgs/development/ocaml-modules/xmlm/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An OCaml streaming codec to decode and encode the XML data format";
- homepage = "${webpage}";
+ homepage = webpage;
platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers.vbgl ];
license = licenses.bsd3;
diff --git a/pkgs/development/ocaml-modules/zmq/lwt.nix b/pkgs/development/ocaml-modules/zmq/lwt.nix
index 378bcf3acec0..f8fc06791b1b 100644
--- a/pkgs/development/ocaml-modules/zmq/lwt.nix
+++ b/pkgs/development/ocaml-modules/zmq/lwt.nix
@@ -1,6 +1,6 @@
{ buildDunePackage, zmq, ocaml_lwt }:
-buildDunePackage rec {
+buildDunePackage {
pname = "zmq-lwt";
inherit (zmq) version src meta;
diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix
index 54df32f3eb20..6eed57c4e7c6 100644
--- a/pkgs/development/perl-modules/DBD-mysql/default.nix
+++ b/pkgs/development/perl-modules/DBD-mysql/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }:
-buildPerlPackage rec {
+buildPerlPackage {
pname = "DBD-mysql";
version = "4.050";
diff --git a/pkgs/development/perl-modules/mhonarc.patch b/pkgs/development/perl-modules/mhonarc.patch
new file mode 100644
index 000000000000..12b8cc2931b6
--- /dev/null
+++ b/pkgs/development/perl-modules/mhonarc.patch
@@ -0,0 +1,26 @@
+diff --git a/lib/mhamain.pl b/lib/mhamain.pl
+index 80980a2..c1259ce 100644
+--- a/lib/mhamain.pl
++++ b/lib/mhamain.pl
+@@ -1562,7 +1562,7 @@ sub signal_catch {
+ ##
+ sub defineIndex2MsgId {
+ no warnings qw(deprecated);
+- if (!defined(%Index2MsgId)) {
++ unless (%Index2MsgId) {
+ foreach (keys %MsgId) {
+ $Index2MsgId{$MsgId{$_}} = $_;
+ }
+diff --git a/lib/mhopt.pl b/lib/mhopt.pl
+index 02fb05e..939109b 100644
+--- a/lib/mhopt.pl
++++ b/lib/mhopt.pl
+@@ -865,7 +865,7 @@ sub update_data_1_to_2 {
+ sub update_data_2_1_to_later {
+ no warnings qw(deprecated);
+ # we can preserve filter arguments
+- if (defined(%main::MIMEFiltersArgs)) {
++ if (%main::MIMEFiltersArgs) {
+ warn qq/ preserving MIMEARGS...\n/;
+ %readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs;
+ $IsDefault{'MIMEARGS'} = 0;
diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix
index 8282c38a1e7f..5bccd0946c36 100644
--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2017.02.28";
- name = "pharo-launcher-${version}";
+ pname = "pharo-launcher";
src = fetchurl {
url = "http://files.pharo.org/platform/launcher/PharoLauncher-user-stable-${version}.zip";
sha256 = "1hfwjyx0c47s6ivc1zr2sf5mk1xw2zspsv0ns8mj3kcaglzqwiq0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
desktopItem = makeDesktopItem {
name = "Pharo";
- exec = "${executable-name}";
+ exec = executable-name;
icon = "pharo";
comment = "Launcher for Pharo distributions";
desktopName = "Pharo";
diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix
index 3bd72434eb3c..ec4168508a7b 100644
--- a/pkgs/development/pharo/vm/share.nix
+++ b/pkgs/development/pharo/vm/share.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.0";
- name = "pharo-share-${version}";
+ pname = "pharo-share";
dontUnpack = true;
diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix
index 0e65a9b990ed..91cf01847090 100644
--- a/pkgs/development/pharo/vm/vms.nix
+++ b/pkgs/development/pharo/vm/vms.nix
@@ -27,7 +27,7 @@ in
let suffix = if stdenv.is64bit then "64" else "32"; in
-rec {
+{
# Build the latest VM
spur = pharo-vm-build rec {
name = "pharo-spur${suffix}";
diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix
index 77fae1d0981c..a6a93f9ec95b 100644
--- a/pkgs/development/pure-modules/gtk/default.nix
+++ b/pkgs/development/pure-modules/gtk/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
setupHook = ../generic-setup-hook.sh;
meta = {
- description = "A collection of bindings to use the GTK+ GUI toolkit version 2.x with Pure";
+ description = "A collection of bindings to use the GTK GUI toolkit version 2.x with Pure";
homepage = http://puredocs.bitbucket.org/pure-gtk.html;
license = stdenv.lib.licenses.lgpl3Plus;
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix
index 48878995bb4e..0862fa63072d 100644
--- a/pkgs/development/python-modules/PyLD/default.nix
+++ b/pkgs/development/python-modules/PyLD/default.nix
@@ -18,7 +18,7 @@ let
in
-buildPythonPackage rec {
+buildPythonPackage {
pname = "PyLD";
version = "0.7.2";
diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix
index 75fceb7deedc..cb0986e1d7f0 100644
--- a/pkgs/development/python-modules/Pygments/default.nix
+++ b/pkgs/development/python-modules/Pygments/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Pygments";
- version = "2.3.1";
+ version = "2.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a";
+ sha256 = "15v2sqm5g12bqa0c7wikfh9ck2nl97ayizy1hpqhmws5gqalq748";
};
propagatedBuildInputs = [ docutils ];
diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix
index 678141f394f9..b524cb0c6b3c 100644
--- a/pkgs/development/python-modules/XlsxWriter/default.nix
+++ b/pkgs/development/python-modules/XlsxWriter/default.nix
@@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "XlsxWriter";
- version = "1.1.8";
+ version = "1.2.0";
# PyPI release tarball doesn't contain tests so let's use GitHub. See:
# https://github.com/jmcnamara/XlsxWriter/issues/327
@@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "jmcnamara";
repo = pname;
rev = "RELEASE_${version}";
- sha256 = "19qhdcycaiamd3bp8v2z9rpirxsr4c29fgs219k2766fpmfrgx40";
+ sha256 = "0w9ggzi887w4z6i5mz24kcy7qbkd4d7gycqi0dhqgaj9lzxh7jjh";
};
meta = {
diff --git a/pkgs/development/python-modules/adb-homeassistant/default.nix b/pkgs/development/python-modules/adb-homeassistant/default.nix
index 83dab71e2216..4e37d18a9f3a 100644
--- a/pkgs/development/python-modules/adb-homeassistant/default.nix
+++ b/pkgs/development/python-modules/adb-homeassistant/default.nix
@@ -7,7 +7,7 @@
, pytest
, mock
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "adb-homeassistant";
version = "1.3.1";
diff --git a/pkgs/development/python-modules/aiohttp-swagger/default.nix b/pkgs/development/python-modules/aiohttp-swagger/default.nix
new file mode 100644
index 000000000000..e01e3ce30bc1
--- /dev/null
+++ b/pkgs/development/python-modules/aiohttp-swagger/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, aiohttp
+, flake8
+, jinja2
+, pytestCheckHook
+, pytest-aiohttp
+, pyyaml
+}:
+
+buildPythonPackage rec {
+ pname = "aiohttp-swagger";
+ version = "1.0.5";
+
+ src = fetchFromGitHub {
+ owner = "cr0hn";
+ repo = pname;
+ rev = "5a59e86f8c5672d2cc97dd35dc730c2f809d95ce"; # corresponds to 1.0.5 on PyPi, no tag on GitHub
+ sha256 = "1vpfk5b3f7s9qzr2q48g776f39xzqppjwm57scfzqqmbldkk5nv7";
+ };
+
+ propagatedBuildInputs = [ aiohttp jinja2 pyyaml ];
+
+ checkInputs = [ flake8 pytestCheckHook pytest-aiohttp ];
+
+ meta = with lib; {
+ description = "Swagger API Documentation builder for aiohttp";
+ homepage = https://github.com/cr0hn/aiohttp-swagger;
+ license = licenses.mit;
+ maintainers = with maintainers; [ elohmeier ];
+ };
+}
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 5769109f7741..049ceb124ea0 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -40,14 +40,10 @@ buildPythonPackage rec {
propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ]
++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ];
- # Don't error on cryptography deprecation warning
- postPatch = ''
- substituteInPlace pytest.ini --replace "filterwarnings = error" ""
+ checkPhase = ''
+ pytest -k "not test__get_valid_log_format_exc and not test_access_logger_atoms"
'';
- # coroutine 'noop2' was never awaited
- doCheck = false;
-
meta = with lib; {
description = "Asynchronous HTTP Client/Server for Python and asyncio";
license = licenses.asl20;
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index 88fd18431d68..ddc3779749b8 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
-, pytest, pytestcov, mock, coverage
+, pytest, pytestcov, mock, coverage, setuptools
, Mako, sqlalchemy, python-editor, dateutil
}:
@@ -13,7 +13,7 @@ buildPythonPackage rec {
};
buildInputs = [ pytest pytestcov mock coverage ];
- propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil ];
+ propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil setuptools ];
meta = with stdenv.lib; {
homepage = https://bitbucket.org/zzzeek/alembic;
diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix
index 1d61f1a6cc79..bda0e677f4a7 100644
--- a/pkgs/development/python-modules/alot/default.nix
+++ b/pkgs/development/python-modules/alot/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "pazz";
repo = "alot";
- rev = "${version}";
+ rev = version;
sha256 = "1isn0p0i2a7dlbrdk5ib01xa1wgi6bi9ka4xl4vj8iw1q4i5fqv9";
};
diff --git a/pkgs/development/python-modules/ansible-kernel/default.nix b/pkgs/development/python-modules/ansible-kernel/default.nix
index 34e360d2c1a4..42438b31c210 100644
--- a/pkgs/development/python-modules/ansible-kernel/default.nix
+++ b/pkgs/development/python-modules/ansible-kernel/default.nix
@@ -16,7 +16,7 @@
let
kernelSpecFile = writeText "kernel.json" (builtins.toJSON {
- argv = [ "${python.interpreter}" "-m" "ansible_kernel" "-f" "{connection_file}" ];
+ argv = [ python.interpreter "-m" "ansible_kernel" "-f" "{connection_file}" ];
codemirror_mode = "yaml";
display_name = "Ansible";
language = "ansible";
diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
index a2a026e74d5b..22bddb252c8e 100644
--- a/pkgs/development/python-modules/apipkg/default.nix
+++ b/pkgs/development/python-modules/apipkg/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
-, pytest, setuptools_scm }:
+, pytest, setuptools_scm, isPy3k }:
buildPythonPackage rec {
pname = "apipkg";
@@ -19,8 +19,18 @@ buildPythonPackage rec {
--replace "py.test.ensuretemp('test_apipkg')" "py.path.local('test_apipkg')"
'';
- checkPhase = ''
- py.test
+ # Failing tests on Python 3
+ # https://github.com/pytest-dev/apipkg/issues/17
+ checkPhase = let
+ disabledTests = stdenv.lib.optionals isPy3k [
+ "test_error_loading_one_element"
+ "test_aliasmodule_proxy_methods"
+ "test_eagerload_on_bython"
+ ];
+ testExpression = stdenv.lib.optionalString (disabledTests != [])
+ "-k 'not ${stdenv.lib.concatStringsSep " and not " disabledTests}'";
+ in ''
+ py.test ${testExpression}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix
deleted file mode 100644
index cd8e83dbf630..000000000000
--- a/pkgs/development/python-modules/area53/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi
-, boto }:
-
-buildPythonPackage rec {
- pname = "Area53";
- version = "0.94";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0v9b7f8b6v21y410anx5sr52k2ac8jrzdf19q6m6p0zsdsf9vr42";
- };
-
- # error: invalid command 'test'
- doCheck = false;
-
- propagatedBuildInputs = [ boto ];
-
- meta = with lib; {
- description = "Python Interface to Route53";
- homepage = https://github.com/mariusv/Area53;
- license = licenses.unfree; # unspecified
- };
-}
diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix
index e34f937b5090..eed9591d7bdf 100644
--- a/pkgs/development/python-modules/atomicwrites/default.nix
+++ b/pkgs/development/python-modules/atomicwrites/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ stdenv, buildPythonPackage, fetchPypi, pytest }:
buildPythonPackage rec {
pname = "atomicwrites";
@@ -9,6 +9,10 @@ buildPythonPackage rec {
sha256 = "75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6";
};
+ # Tests depend on pytest but atomicwrites is a dependency of pytest
+ doCheck = false;
+ checkInputs = [ pytest ];
+
meta = with stdenv.lib; {
description = "Atomic file writes on POSIX";
homepage = https://pypi.python.org/pypi/atomicwrites;
diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix
index de041c0f4c80..12a3529f8645 100644
--- a/pkgs/development/python-modules/augeas/default.nix
+++ b/pkgs/development/python-modules/augeas/default.nix
@@ -2,7 +2,6 @@
buildPythonPackage rec {
pname = "augeas";
version = "1.0.3";
- name = pname + "-" + version;
src = fetchFromGitHub {
owner = "hercules-team";
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 0ccf3da7bec9..7d1e365b243c 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -1,17 +1,17 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k,
six, txaio, twisted, zope_interface, cffi, trollius, futures,
- mock, pytest
+ mock, pytest, cryptography, pynacl
}:
buildPythonPackage rec {
pname = "autobahn";
- version = "19.1.1";
+ version = "19.8.1";
src = fetchPypi {
inherit pname version;
- sha256 = "aebbadb700c13792a2967c79002855d1153b9ec8f2949d169e908388699596ff";
+ sha256 = "294e7381dd54e73834354832604ae85567caf391c39363fed0ea2bfa86aa4304";
};
- propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++
+ propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++
(lib.optionals (!isPy3k) [ trollius futures ]);
checkInputs = [ mock pytest ];
@@ -21,6 +21,10 @@ buildPythonPackage rec {
runHook postCheck
'';
+ # Tests do no seem to be compatible yet with pytest 5.1
+ # https://github.com/crossbario/autobahn-python/issues/1235
+ doCheck = false;
+
meta = with lib; {
description = "WebSocket and WAMP in Python for Twisted and asyncio.";
homepage = "https://crossbar.io/autobahn";
diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix
index c79f9a5a73e3..73ce99eb7525 100644
--- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix
@@ -8,7 +8,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "azure-mgmt-billing";
version = "0.2.0"; #pypi's 0.2.0 doesn't build ootb
diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
index 86e323be1686..ed0cb18aff33 100644
--- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
@@ -8,7 +8,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "azure-mgmt-commerce";
version = "1.0.1";
diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
index 6a0c04c58cc9..51e1c08e63dc 100644
--- a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
+++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
@@ -5,7 +5,7 @@
, requests
}:
-buildPythonPackage rec {
+buildPythonPackage {
version = "0.20.7";
pname = "azure-servicemanagement-legacy";
diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
index 3cd37617a393..143657479710 100644
--- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
+++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
@@ -5,7 +5,7 @@
, pythonOlder
}:
-if !(pythonOlder "3.3") then null else buildPythonPackage rec {
+if !(pythonOlder "3.3") then null else buildPythonPackage {
pname = "backports.shutil_get_terminal_size";
version = "unstable-2016-02-21";
diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix
index d14bf02cabf3..e0492a7d1c44 100644
--- a/pkgs/development/python-modules/bap/default.nix
+++ b/pkgs/development/python-modules/bap/default.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform";
repo = "bap-python";
- rev = "${version}";
+ rev = version;
sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp";
};
diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix
index a210b5b44aae..56a60de59793 100644
--- a/pkgs/development/python-modules/baselines/default.nix
+++ b/pkgs/development/python-modules/baselines/default.nix
@@ -15,7 +15,7 @@
, mpi4py
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "baselines";
version = "0.1.6"; # remember to manually adjust the rev
diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix
index 3b196810b005..09e0b8b3f3e5 100644
--- a/pkgs/development/python-modules/beaker/default.nix
+++ b/pkgs/development/python-modules/beaker/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "bbangert";
repo = "beaker";
- rev = "${version}";
+ rev = version;
sha256 = "0xrvg503xmi28w0hllr4s7fkap0p09fgw2wax3p1s2r6b3xjvbz7";
};
diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix
index 61080e5e4c46..9405e3489d4f 100644
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/pkgs/development/python-modules/beancount/default.nix
@@ -1,20 +1,20 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k
, beautifulsoup4, bottle, chardet, dateutil
-, google_api_python_client, lxml, ply, python_magic
-, pytest, requests }:
+, google_api_python_client, lxml, oauth2client
+, ply, python_magic, pytest, requests }:
buildPythonPackage rec {
- version = "2.2.1";
+ version = "2.2.3";
pname = "beancount";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0xrgmqv0wsc0makm5i6jwng99yp3rvm30v2xqmcah60fgjymkjzb";
+ sha256 = "0pcfl2rx2ng06i4f9izdpnlnb1k0rdzsckbzzn4cn4ixfzyssm0m";
};
- # No tests in archive
+ # Tests require files not included in the PyPI archive.
doCheck = false;
propagatedBuildInputs = [
@@ -24,6 +24,7 @@ buildPythonPackage rec {
dateutil
google_api_python_client
lxml
+ oauth2client
ply
python_magic
requests
diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix
new file mode 100644
index 000000000000..ec66124e3c78
--- /dev/null
+++ b/pkgs/development/python-modules/bids-validator/default.nix
@@ -0,0 +1,23 @@
+{ buildPythonPackage
+, lib
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ version = "1.2.4";
+ pname = "bids-validator";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1mvp1mi1k6yqgyj7rxij8mlwclqlyfzq08s67v0qaycw44l68ifg";
+ };
+
+ propagatedBuildInputs = [ ];
+
+ meta = with lib; {
+ description = "Validator for the Brain Imaging Data Structure";
+ homepage = "https://github.com/bids-standard/bids-validator";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix
index 9bd7e586820d..88ef71cabdf1 100644
--- a/pkgs/development/python-modules/binwalk/default.nix
+++ b/pkgs/development/python-modules/binwalk/default.nix
@@ -15,8 +15,8 @@
let visualizationSupport = (pyqtgraph != null);
in
-buildPythonPackage rec {
- name = "binwalk-${version}";
+buildPythonPackage {
+ pname = "binwalk";
version = "2.1.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index c2b0db61cbb3..7de124267f0e 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -23,6 +23,12 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace ",<3dev" ""
'';
+ # Disable a test
+ # https://github.com/mozilla/bleach/issues/467
+ checkPhase = ''
+ pytest -k "not test_only_text_is_cleaned"
+ '';
+
meta = {
description = "An easy, HTML5, whitelisting HTML sanitizer";
longDescription = ''
diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix
index 784de33e7ade..164848aeac93 100644
--- a/pkgs/development/python-modules/blessed/default.nix
+++ b/pkgs/development/python-modules/blessed/default.nix
@@ -1,5 +1,20 @@
-{ stdenv, buildPythonPackage, fetchPypi, six, wcwidth, pytest, mock
-, glibcLocales }:
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, six
+, wcwidth, pytest, mock, glibcLocales
+}:
+
+let
+
+ fixTestSuiteFailure_1 = fetchpatch {
+ url = https://github.com/jquast/blessed/pull/108/commits/76a54d39b0f58bfc71af04ee143459eefb0e1e7b.patch;
+ sha256 = "1higmv4c03ly7ywac1d7s71f3hrl531vj16nsfl9xh6zh9c47qcg";
+ };
+
+ fixTestSuiteFailure_2 = fetchpatch {
+ url = https://github.com/jquast/blessed/pull/108/commits/aa94e01aed745715e667601fb674844b257cfcc9.patch;
+ sha256 = "1frygr6sc1vakdfx1hf6jj0dbwibiqz8hw9maf1b605cbslc9nay";
+ };
+
+in
buildPythonPackage rec {
pname = "blessed";
@@ -10,6 +25,8 @@ buildPythonPackage rec {
sha256 = "777b0b6b5ce51f3832e498c22bc6a093b6b5f99148c7cbf866d26e2dec51ef21";
};
+ patches = [ fixTestSuiteFailure_1 fixTestSuiteFailure_2 ];
+
checkInputs = [ pytest mock glibcLocales ];
checkPhase = ''
diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix
index fde330d706f7..7b67997fa08a 100644
--- a/pkgs/development/python-modules/blockdiag/default.nix
+++ b/pkgs/development/python-modules/blockdiag/default.nix
@@ -5,7 +5,6 @@
buildPythonPackage rec {
pname = "blockdiag";
version = "1.5.3";
- name = pname + "-" + version;
src = fetchurl {
url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2";
diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index 158a3d318822..d53371221202 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -1,74 +1,55 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
, fetchPypi
-, isPyPy
-, mock
-, pytest
-, flask
-, jinja2
-, markupsafe
-, werkzeug
-, itsdangerous
-, dateutil
-, requests
-, six
-, pygments
-, pystache
-, markdown
-, pyyaml
-, pyzmq
-, tornado
-, colorama
-, isPy3k
, futures
-, websocket_client
+, isPy3k
+, isPyPy
+, jinja2
+, lib
+, mock
, numpy
-, pandas
-, greenlet
-, python
-, bkcharts
+, nodejs
, pillow
+, pytest
+, python
+, python-dateutil
+, pyyaml
, selenium
+, six
+, substituteAll
+, tornado
}:
buildPythonPackage rec {
pname = "bokeh";
- version = "1.0.4";
+ version = "1.3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "ceeb6a75afc1b2de00c2b8b6da121dec3fb77031326897b80d4375a70e96aebf";
+ sha256 = "0m27j29jpi977y95k272xc24qkl5bkniy046cil116hrbgnppng2";
};
- disabled = isPyPy;
+ patches = [
+ (substituteAll {
+ src = ./hardcode-nodejs-npmjs-paths.patch;
+ node_bin = "${nodejs}/bin/node";
+ npm_bin = "${nodejs}/bin/npm";
+ })
+ ];
- # Some test that uses tornado fails
-# doCheck = false;
+ disabled = isPyPy;
checkInputs = [ mock pytest pillow selenium ];
propagatedBuildInputs = [
pillow
- flask
jinja2
- markupsafe
- werkzeug
- itsdangerous
- dateutil
- requests
+ python-dateutil
six
- pygments
- pystache
- markdown
pyyaml
- pyzmq
tornado
- colorama
- bkcharts
+ numpy
]
- ++ lib.optionals ( !isPy3k ) [ futures ]
- ++ lib.optionals ( !isPy3k && !isPyPy ) [ websocket_client ]
- ++ lib.optionals ( !isPyPy ) [ numpy pandas greenlet ];
+ ++ lib.optionals ( !isPy3k ) [ futures ];
checkPhase = ''
${python.interpreter} -m unittest discover -s bokeh/tests
diff --git a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch
new file mode 100644
index 000000000000..f8f33c0021f2
--- /dev/null
+++ b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch
@@ -0,0 +1,15 @@
+diff --git a/bokeh/util/compiler.py b/bokeh/util/compiler.py
+index a752aad7d..8af05ff63 100644
+--- a/bokeh/util/compiler.py
++++ b/bokeh/util/compiler.py
+@@ -442,8 +442,8 @@ def _detect_nodejs():
+ raise RuntimeError('node.js v%s or higher is needed to allow compilation of custom models ' % version +
+ '("conda install nodejs" or follow https://nodejs.org/en/download/)')
+
+-_nodejs = None
+-_npmjs = None
++_nodejs = "@node_bin@"
++_npmjs = "@npm_bin@"
+
+ def _nodejs_path():
+ global _nodejs
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 1455a783593f..d2f64a5e5a8b 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -1,30 +1,43 @@
-{ stdenv, python, fetchPypi, makeWrapper, unzip }:
+{ stdenv, python, fetchPypi, makeWrapper, unzip, makeSetupHook
+, pipInstallHook
+, setuptoolsBuildHook
+
+}:
let
wheel_source = fetchPypi {
pname = "wheel";
- version = "0.33.4";
+ version = "0.33.6";
format = "wheel";
- sha256 = "5e79117472686ac0c4aef5bad5172ea73a1c2d1646b808c35926bd26bdfb0c08";
+ sha256 = "f4da1763d3becf2e2cd92a14a7c920f0f00eca30fdde9ea992c836685b9faf28";
};
setuptools_source = fetchPypi {
pname = "setuptools";
- version = "41.0.1";
+ version = "41.2.0";
format = "wheel";
- sha256 = "c7769ce668c7a333d84e17fe8b524b1c45e7ee9f7908ad0a73e1eda7e6a5aebf";
+ sha256 = "4380abcf2a4ffd1a5ba22d687c6d690dce83b2b51c70e9c6d09f7e8c7e8040dc";
};
in stdenv.mkDerivation rec {
pname = "pip";
- version = "19.1.1";
+ version = "19.2.3";
name = "${python.libPrefix}-bootstrapped-${pname}-${version}";
src = fetchPypi {
inherit pname version;
format = "wheel";
- sha256 = "993134f0475471b91452ca029d4390dc8f298ac63a712814f101cd1b6db46676";
+ sha256 = "340a0ba40fdeb16413914c0fcd8e0b4ebb0bf39a900ec80e11c05d836c05103f";
};
+ dontUseSetuptoolsBuild = true;
+
+ # Should be propagatedNativeBuildInputs
+ propagatedBuildInputs = [
+ # Override to remove dependencies to prevent infinite recursion.
+ (pipInstallHook.override{pip=null;})
+ (setuptoolsBuildHook.override{setuptools=null; wheel=null;})
+ ];
+
unpackPhase = ''
mkdir -p $out/${python.sitePackages}
unzip -d $out/${python.sitePackages} $src
@@ -32,7 +45,7 @@ in stdenv.mkDerivation rec {
unzip -d $out/${python.sitePackages} ${wheel_source}
'';
- patchPhase = ''
+ postPatch = ''
mkdir -p $out/bin
'';
@@ -52,4 +65,5 @@ in stdenv.mkDerivation rec {
wrapProgram $f --prefix PYTHONPATH ":" $out/${python.sitePackages}/
done
'';
+
}
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 203ef9a4355d..34178befebe4 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.9.160"; # N.B: if you change this, change botocore too
+ version = "1.9.205"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
- sha256 = "1qxhdmv58k2ipk47fbnpdg6jmbp7dca86s6c6gdm3d79aw17391f";
+ sha256 = "1zxz1d6w3f4ip04bm26xplpxjhblc2vfmqcs5n63a9y1h43mk171";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index e3bbdf22ddf1..5c8b00fc6c15 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.12.160"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.12.205"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "18jhc6v2xcd20hlq69ykapmxgd9k7szjbp1ndmgxi4g8w37fvcqp";
+ sha256 = "19ls7hdmcaqrrq8przqy05s8chsy8315ic2zg185k6m64pvr0qhd";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix
index c4db013ea34d..21492dc152cb 100644
--- a/pkgs/development/python-modules/bottleneck/default.nix
+++ b/pkgs/development/python-modules/bottleneck/default.nix
@@ -9,7 +9,6 @@
buildPythonPackage rec {
pname = "Bottleneck";
version = "1.2.1";
- name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix
index 35b40a3adf1c..bec205676bae 100644
--- a/pkgs/development/python-modules/brotli/default.nix
+++ b/pkgs/development/python-modules/brotli/default.nix
@@ -12,6 +12,8 @@ buildPythonPackage rec {
sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw";
};
+ dontConfigure = true;
+
checkInputs = [ pytest ];
checkPhase = ''
diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix
index dfd4d8f0cbf1..f998ebca06d9 100644
--- a/pkgs/development/python-modules/bt-proximity/default.nix
+++ b/pkgs/development/python-modules/bt-proximity/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
, pybluez }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "bt-proximity";
version = "0.0.20180217";
diff --git a/pkgs/development/python-modules/btchip/default.nix b/pkgs/development/python-modules/btchip/default.nix
index 6e2e703dd569..069358a4d6d3 100644
--- a/pkgs/development/python-modules/btchip/default.nix
+++ b/pkgs/development/python-modules/btchip/default.nix
@@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "btchip-python";
version = "0.1.28";
- name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/bugz/default.nix b/pkgs/development/python-modules/bugz/default.nix
index 4af8b247fcf3..57ec37285744 100644
--- a/pkgs/development/python-modules/bugz/default.nix
+++ b/pkgs/development/python-modules/bugz/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "bugz-0.9.3";
version = "0.13";
diff --git a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix
index 7f4857a95319..a12a12547e96 100644
--- a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix
+++ b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix
@@ -4,7 +4,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
version = "asynkdev";
pname = "caldavclientlibrary-asynk";
diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index 8e6c90441211..b87e526dc452 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -1,7 +1,9 @@
{ lib
, buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
, pythonOlder
+, isPy27
+, aenum
, wrapt
, typing
, pyserial
@@ -14,21 +16,21 @@
buildPythonPackage rec {
pname = "python-can";
- version = "3.1.0";
+ version = "3.3.1";
- # PyPI tarball is missing some tests and is missing __init__.py in test
- # directory causing the tests to fail. See:
- # https://github.com/hardbyte/python-can/issues/518
- src = fetchFromGitHub {
- repo = pname;
- owner = "hardbyte";
- rev = "v${version}";
- sha256 = "01lfsh7drm4qvv909x9i0vnhskdh27mcb5xa86sv9m3zfpq8cjis";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1giv9s6w90lalxsijgnxzynygkckcfyaxnxsldbwv0784vwy1jcd";
};
- propagatedBuildInputs = [ wrapt pyserial ] ++ lib.optional (pythonOlder "3.5") typing;
+ propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing;
checkInputs = [ nose mock pytest pytest-timeout hypothesis future ];
+ # Tests won't work with hypothesis 4.7.3 under Python 2. So skip the tests in
+ # that case. This clause can be removed once hypothesis has been upgraded in
+ # nixpkgs.
+ doCheck = !(isPy27 && (hypothesis.version == "4.7.3"));
+
# Add the scripts to PATH
checkPhase = ''
PATH=$out/bin:$PATH pytest -c /dev/null
diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix
index 1afe23416331..a76e05332f19 100644
--- a/pkgs/development/python-modules/canopen/default.nix
+++ b/pkgs/development/python-modules/canopen/default.nix
@@ -5,7 +5,7 @@
, can
, canmatrix }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "canopen";
version = "0.5.1";
diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix
index 2c97cbd4a334..7496e7e1fcce 100644
--- a/pkgs/development/python-modules/cgroup-utils/default.nix
+++ b/pkgs/development/python-modules/cgroup-utils/default.nix
@@ -3,7 +3,6 @@
buildPythonPackage rec {
version = "0.6";
pname = "cgroup-utils";
- name = pname + "-" + version;
buildInputs = [ pep8 nose ];
# Pep8 tests fail...
diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index 75152d39aeb4..6941e1117bdc 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -2,6 +2,7 @@
, setuptools_scm
, cheroot, portend, more-itertools, zc_lockfile, routes
, objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services
+, fetchpatch
}:
buildPythonPackage rec {
@@ -16,6 +17,22 @@ buildPythonPackage rec {
sha256 = "1w3hpsg7q8shdmscmbqk00w90lcw3brary7wl1a56k5h7nx33pj8";
};
+ # Remove patches once 96b34df and 14c12d2
+ # become part of a release - they're currently only present in master.
+ # ref: https://github.com/cherrypy/cherrypy/pull/1791
+ patches = [
+ (fetchpatch {
+ name = "pytest5-1.patch";
+ url = "https://github.com/cherrypy/cherrypy/commit/96b34dfea7853b0189bc0a3878b6ddff0d4e505c.patch";
+ sha256 = "0zy53mahffgkpd844118b42lsk5lkjmig70d60x1i46w6gnr61mi";
+ })
+ (fetchpatch {
+ name = "pytest5-2.patch";
+ url = "https://github.com/cherrypy/cherrypy/commit/14c12d2420a4b3765bb241250bd186e93b2f25eb.patch";
+ sha256 = "0ihcz7b5myn923rq5665b98pz52hnf6fcys2y2inf23r3i07scyz";
+ })
+ ];
+
propagatedBuildInputs = [
# required
cheroot portend more-itertools zc_lockfile
diff --git a/pkgs/development/python-modules/chevron/default.nix b/pkgs/development/python-modules/chevron/default.nix
index c6338fce56bc..7fa3a2b471de 100644
--- a/pkgs/development/python-modules/chevron/default.nix
+++ b/pkgs/development/python-modules/chevron/default.nix
@@ -4,7 +4,7 @@
, python
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "chevron";
version = "0.13.1";
diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix
index 3aece4020e6c..c3e6a120ae78 100644
--- a/pkgs/development/python-modules/cliapp/default.nix
+++ b/pkgs/development/python-modules/cliapp/default.nix
@@ -5,7 +5,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "cliapp";
version = "1.20150305";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix
new file mode 100644
index 000000000000..93cd5c7a1d7d
--- /dev/null
+++ b/pkgs/development/python-modules/clickclick/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytestcov }:
+
+buildPythonPackage rec {
+ pname = "clickclick";
+ version = "1.2.2";
+
+ src = fetchFromGitHub {
+ owner = "hjacobs";
+ repo = "python-clickclick";
+ rev = version;
+ sha256 = "1rij9ws9nhsmagiy1vclzliiqfkxi006rf65qvrw1k3sm2s8p5g0";
+ };
+
+ checkInputs = [ pytestCheckHook pytestcov ];
+ propagatedBuildInputs = [ flake8 click pyyaml six ];
+
+ disabledTests = lib.optionals isPy36 [
+ "test_cli"
+ "test_choice_default"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Click command line utilities";
+ homepage = https://github.com/hjacobs/python-clickclick/;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ elohmeier ];
+ };
+}
diff --git a/pkgs/development/python-modules/closure-linter/default.nix b/pkgs/development/python-modules/closure-linter/default.nix
index f6c94ace1fad..b814455da3ff 100644
--- a/pkgs/development/python-modules/closure-linter/default.nix
+++ b/pkgs/development/python-modules/closure-linter/default.nix
@@ -8,7 +8,7 @@
/* There is a project called "closure-linter" on PyPI that is the
same as this, but it does not appear to be owned by Google.
So we're pulling from Google's GitHub repo instead. */
-buildPythonPackage rec {
+buildPythonPackage {
pname = "closure-linter";
version = "2.3.19";
diff --git a/pkgs/development/python-modules/cntk/default.nix b/pkgs/development/python-modules/cntk/default.nix
index 43a7b7646dae..ce388bb1d5d2 100644
--- a/pkgs/development/python-modules/cntk/default.nix
+++ b/pkgs/development/python-modules/cntk/default.nix
@@ -14,7 +14,7 @@
let
cntk = pkgs.cntk;
in
-buildPythonPackage rec {
+buildPythonPackage {
inherit (cntk) name version src;
nativeBuildInputs = [ swig openmpi ];
diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix
index f92f8004ac00..b877c4cabd5f 100644
--- a/pkgs/development/python-modules/colorcet/default.nix
+++ b/pkgs/development/python-modules/colorcet/default.nix
@@ -34,9 +34,9 @@ buildPythonPackage rec {
export HOME=$(mktemp -d)
mkdir -p $HOME/.config/matplotlib
echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc
+ ln -s $HOME/.config/matplotlib $HOME/.matplotlib
- # disable matplotlib tests on darwin, because it requires a framework build of Python
- pytest ${stdenv.lib.optionalString stdenv.isDarwin "--ignore=colorcet/tests/test_matplotlib.py"} colorcet
+ pytest colorcet
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix
new file mode 100644
index 000000000000..bc1356a72742
--- /dev/null
+++ b/pkgs/development/python-modules/connexion/default.nix
@@ -0,0 +1,94 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, isPy3k
+, glibcLocales
+, lib
+, pythonOlder
+
+, aiohttp
+, aiohttp-swagger
+, aiohttp-jinja2
+, clickclick
+, decorator
+, flake8
+, flask
+, gevent
+, inflection
+, jsonschema
+, mock
+, openapi-spec-validator
+, pathlib
+, pytest
+, pytest-aiohttp
+, pytestcov
+, pyyaml
+, requests
+, six
+, swagger-ui-bundle
+, testfixtures
+, typing
+, ujson
+}:
+
+buildPythonPackage rec {
+ pname = "connexion";
+ version = "2.3.0";
+
+ # we're fetching from GitHub because tests weren't distributed on PyPi
+ src = fetchFromGitHub {
+ owner = "zalando";
+ repo = pname;
+ rev = version;
+ sha256 = "1xdm3misxwgrl87ms0vvn0h4rjwzlmmi7kcra2ahs40iaraf33ln";
+ };
+
+ checkInputs = [
+ decorator
+ mock
+ pytest
+ pytestcov
+ testfixtures
+ flask
+ swagger-ui-bundle
+ ]
+ ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson pytest-aiohttp ]
+ ++ lib.optional (pythonOlder "3.7") glibcLocales
+ ;
+ propagatedBuildInputs = [
+ clickclick
+ jsonschema
+ pyyaml
+ requests
+ six
+ inflection
+ openapi-spec-validator
+ swagger-ui-bundle
+ flask
+ ]
+ ++ lib.optional (pythonOlder "3.4") pathlib
+ ++ lib.optional (pythonOlder "3.6") typing
+ ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson ]
+ ;
+
+ preConfigure = lib.optional (pythonOlder "3.7") ''
+ export LANG=en_US.UTF-8
+ '';
+
+ postPatch = ''
+ substituteInPlace setup.py --replace "'aiohttp>=2.3.10,<3.5.2'" "'aiohttp>=2.3.10'"
+ '';
+
+ checkPhase = if isPy3k then ''
+ pytest -k "not test_app_get_root_path and \
+ not test_verify_oauth_scopes_remote and \
+ not test_verify_oauth_scopes_local and \
+ not test_run_with_aiohttp_not_installed"''
+ else "pytest --ignore=tests/aiohttp";
+
+ meta = with lib; {
+ description = "Swagger/OpenAPI First framework on top of Flask";
+ homepage = https://github.com/zalando/connexion/;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ elohmeier ];
+ };
+}
diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix
index 4722b049edf7..46fcc378be9d 100644
--- a/pkgs/development/python-modules/contextlib2/default.nix
+++ b/pkgs/development/python-modules/contextlib2/default.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
pname = "contextlib2";
version = "0.5.5";
- src = fetchPypi rec {
+ src = fetchPypi {
inherit pname version;
sha256 = "509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48";
};
diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix
index 67120bf0f3d0..234bb46f97bc 100644
--- a/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/pkgs/development/python-modules/cx_freeze/default.nix
@@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "cx_Freeze";
version = "5.1.1";
- name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix
index 6862d6447e5f..b3d4a40bf66f 100644
--- a/pkgs/development/python-modules/cymem/default.nix
+++ b/pkgs/development/python-modules/cymem/default.nix
@@ -7,7 +7,6 @@
buildPythonPackage rec {
pname = "cymem";
version = "2.0.2";
- name = pname + "-" + version;
src = fetchFromGitHub {
owner = "explosion";
diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix
index bb2e65125b7d..27665c689c41 100644
--- a/pkgs/development/python-modules/datashape/default.nix
+++ b/pkgs/development/python-modules/datashape/default.nix
@@ -38,6 +38,9 @@ in buildPythonPackage rec {
--ignore datashape/tests/test_user.py
'';
+ # https://github.com/blaze/datashape/issues/238
+ PYTEST_ADDOPTS = "-k 'not test_record and not test_tuple'";
+
meta = {
homepage = https://github.com/ContinuumIO/datashape;
description = "A data description language";
diff --git a/pkgs/development/python-modules/delegator-py/default.nix b/pkgs/development/python-modules/delegator-py/default.nix
new file mode 100644
index 000000000000..3521e8ce1298
--- /dev/null
+++ b/pkgs/development/python-modules/delegator-py/default.nix
@@ -0,0 +1,30 @@
+{ buildPythonPackage
+, lib
+, fetchFromGitHub
+, pexpect
+, pytest
+}:
+
+buildPythonPackage rec {
+ version = "0.1.1";
+ pname = "delegator.py";
+
+ src = fetchFromGitHub {
+ owner = "amitt001";
+ repo = "delegator.py";
+ rev = "v${version}";
+ sha256 = "17n9h3xzjsfxmwclh33vc4yg3c9yzh9hfhaj12kv5ah3fy8rklwb";
+ };
+
+ propagatedBuildInputs = [ pexpect ];
+
+ # no tests in github or pypi
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Subprocesses for Humans 2.0";
+ homepage = "https://github.com/amitt001/delegator.py";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/pkgs/development/python-modules/deskcon/default.nix b/pkgs/development/python-modules/deskcon/default.nix
index 05fa3aa835a3..2e205ce69557 100644
--- a/pkgs/development/python-modules/deskcon/default.nix
+++ b/pkgs/development/python-modules/deskcon/default.nix
@@ -6,7 +6,7 @@
, python
}:
-buildPythonPackage rec {
+buildPythonPackage {
name = "deskcon-0.3";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix
index 822815736da7..1e9a6ac764d3 100644
--- a/pkgs/development/python-modules/django-extensions/default.nix
+++ b/pkgs/development/python-modules/django-extensions/default.nix
@@ -1,23 +1,31 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
-, six, typing
+, six, typing, pygments
, django, shortuuid, python-dateutil, pytest
, pytest-django, pytestcov, mock, vobject
-, werkzeug, glibcLocales
+, werkzeug, glibcLocales, factory_boy
}:
buildPythonPackage rec {
pname = "django-extensions";
- version = "2.1.4";
+ version = "2.1.9";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "1bp0ybarkrj66qx2gn9954vsjqq2ya1w4bppfhr763mkis8qnb4f";
+ sha256 = "08vggm6wrn5cbf8brfprif0rjrkqz06wddsw0ir1skkk8q2sp1b2";
};
postPatch = ''
substituteInPlace setup.py --replace "'tox'," ""
+
+ # not yet pytest 5 compatible?
+ rm tests/management/commands/test_set_fake_emails.py
+ rm tests/management/commands/test_set_fake_passwords.py
+ rm tests/management/commands/test_validate_templates.py
+
+ # pip should not be used during tests...
+ rm tests/management/commands/test_pipchecker.py
'';
propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") typing;
@@ -25,7 +33,7 @@ buildPythonPackage rec {
checkInputs = [
django shortuuid python-dateutil pytest
pytest-django pytestcov mock vobject
- werkzeug glibcLocales
+ werkzeug glibcLocales factory_boy pygments
];
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix
index 905ce92e5177..381624e5719e 100644
--- a/pkgs/development/python-modules/django-haystack/default.nix
+++ b/pkgs/development/python-modules/django-haystack/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
-, setuptools_scm, django, dateutil, whoosh, pysolr
+, setuptools, setuptools_scm, django, dateutil, whoosh, pysolr
, coverage, mock, nose, geopy, requests }:
buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
};
checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ];
- propagatedBuildInputs = [ django ];
+ propagatedBuildInputs = [ django setuptools ];
nativeBuildInputs = [ setuptools_scm ];
postPatch = ''
diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
index 8b60155b50a0..cb82fdc204ca 100644
--- a/pkgs/development/python-modules/django/1_11.nix
+++ b/pkgs/development/python-modules/django/1_11.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "Django";
- version = "1.11.23";
+ version = "1.11.24";
src = fetchurl {
url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
- sha256 = "1qb9npkpvyafd1f4yjqyzhj78wp1ifg3awj41bd04v83idznv9jj";
+ sha256 = "1qw97zcsnbnn9dqad1kps48vfaifdkvqb8c3vld6nnvp7x2jfp11";
};
patches = stdenv.lib.optionals withGdal [
@@ -21,11 +21,6 @@ buildPythonPackage rec {
})
];
- # patch only $out/bin to avoid problems with starter templates (see #3134)
- postFixup = ''
- wrapPythonProgramsIn $out/bin "$out $pythonPath"
- '';
-
propagatedBuildInputs = [ pytz ];
# too complicated to setup
diff --git a/pkgs/development/python-modules/django/1_8.nix b/pkgs/development/python-modules/django/1_8.nix
index a459e3c0e10b..d575599cbe1d 100644
--- a/pkgs/development/python-modules/django/1_8.nix
+++ b/pkgs/development/python-modules/django/1_8.nix
@@ -4,22 +4,17 @@
}:
buildPythonPackage rec {
- name = "Django-${version}";
+ pname = "Django";
version = "1.8.19";
src = fetchurl {
- url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
+ url = "http://www.djangoproject.com/m/releases/1.8/${pname}-${version}.tar.gz";
sha256 = "0iy0ni9j1rnx9b06ycgbg2dkrf3qid3y2jipk9x28cykz5f4mm1k";
};
# too complicated to setup
doCheck = false;
- # patch only $out/bin to avoid problems with starter templates (see #3134)
- postFixup = ''
- wrapPythonProgramsIn $out/bin "$out $pythonPath"
- '';
-
meta = with stdenv.lib; {
description = "A high-level Python Web framework";
homepage = https://www.djangoproject.com/;
diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix
index e5d08381055c..78d595082a46 100644
--- a/pkgs/development/python-modules/django/2_1.nix
+++ b/pkgs/development/python-modules/django/2_1.nix
@@ -24,11 +24,6 @@ buildPythonPackage rec {
})
];
- # patch only $out/bin to avoid problems with starter templates (see #3134)
- postFixup = ''
- wrapPythonProgramsIn $out/bin "$out $pythonPath"
- '';
-
propagatedBuildInputs = [ pytz ];
# too complicated to setup
diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix
index efc13e455e57..95fd8a769289 100644
--- a/pkgs/development/python-modules/django/2_2.nix
+++ b/pkgs/development/python-modules/django/2_2.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
- version = "2.2.4";
+ version = "2.2.5";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1s5ad5zlmwdn4h5lwn4s4m8mqy0gz4w9nfzyknn815sr252db98n";
+ sha256 = "0mpxmckd1mah0yrp6n8vjk6mq7hxf6d5xcbk6rcmi6z572h0mdyy";
};
patches = stdenv.lib.optional withGdal
diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix
index 8a51227da0e4..4ce61680f03b 100644
--- a/pkgs/development/python-modules/dm-sonnet/default.nix
+++ b/pkgs/development/python-modules/dm-sonnet/default.nix
@@ -18,7 +18,7 @@ let
version = "1.33";
# first build all binaries and generate setup.py using bazel
- bazel-build = buildBazelPackage rec {
+ bazel-build = buildBazelPackage {
name = "dm-sonnet-bazel-${version}";
src = fetchFromGitHub {
@@ -60,7 +60,7 @@ let
};
# now use pip to install the package prepared by bazel
-in buildPythonPackage rec {
+in buildPythonPackage {
pname = "dm-sonnet";
inherit version;
diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix
index deeb8ce06420..a12a63c46f14 100644
--- a/pkgs/development/python-modules/dogtail/default.nix
+++ b/pkgs/development/python-modules/dogtail/default.nix
@@ -15,7 +15,7 @@
# , fetchPypi
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "dogtail";
version = "0.9.10";
diff --git a/pkgs/development/python-modules/dopy/default.nix b/pkgs/development/python-modules/dopy/default.nix
index beaca0757507..538a861c9f4c 100644
--- a/pkgs/development/python-modules/dopy/default.nix
+++ b/pkgs/development/python-modules/dopy/default.nix
@@ -4,7 +4,7 @@
, six
}:
-buildPythonPackage rec {
+buildPythonPackage {
version = "2016-01-04";
pname = "dopy";
diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix
index 5c0e57cddc02..6e03a33f29b6 100644
--- a/pkgs/development/python-modules/dyn/default.nix
+++ b/pkgs/development/python-modules/dyn/default.nix
@@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "dyn";
version = "1.8.1";
- name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix
index 3f276374d9ea..28eff473199c 100644
--- a/pkgs/development/python-modules/editorconfig/default.nix
+++ b/pkgs/development/python-modules/editorconfig/default.nix
@@ -5,17 +5,20 @@
}:
buildPythonPackage rec {
- pname = "EditorConfig";
- version = "0.12.1";
+ pname = "editorconfig";
+ version = "0.12.2";
# fetchgit used to ensure test submodule is available
src = fetchgit {
url = "https://github.com/editorconfig/editorconfig-core-py";
- rev = "refs/tags/v${version}";
- sha256 = "0svk7id7ncygj2rnxhm7602xizljyidk4xgrl6i0xgq3829cz4bl";
+ rev = "596da5e06ebee05bdbdc6224203c79c4d3c6486a"; # Not tagged
+ sha256 = "05cbp971b0zix7kfxkk7ndxb4ax1l21frwc00d4g78mk4sdz6dig";
};
nativeBuildInputs = [ cmake ];
+
+ dontUseCmakeConfigure = true;
+
checkPhase = ''
cmake .
# utf_8_char fails with python3
diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix
index b09bef9fec4e..1ad5ea1ab3b3 100644
--- a/pkgs/development/python-modules/edward/default.nix
+++ b/pkgs/development/python-modules/edward/default.nix
@@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "edward";
version = "1.3.5";
- name = "${pname}-${version}";
disabled = !(isPy27 || pythonAtLeast "3.4");
diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix
index 0622bd41d237..c837e46066fe 100644
--- a/pkgs/development/python-modules/eggdeps/default.nix
+++ b/pkgs/development/python-modules/eggdeps/default.nix
@@ -6,11 +6,12 @@
}:
buildPythonPackage rec {
- pname = "eggdeps";
+ pname = "tl-eggdeps";
version = "0.4";
src = fetchPypi {
- inherit pname version;
+ inherit version;
+ pname = "tl.eggdeps";
sha256 = "a99de5e4652865224daab09b2e2574a4f7c1d0d9a267048f9836aa914a2caf3a";
};
diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix
index d517af949d47..e95d1aaba022 100644
--- a/pkgs/development/python-modules/elasticsearch-curator/default.nix
+++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix
@@ -45,6 +45,10 @@ buildPythonPackage rec {
funcsigs
];
+ postPatch = ''
+ sed -i s/pyyaml==3.12/pyyaml==${pyyaml.version}/ setup.cfg setup.py
+ '';
+
meta = with stdenv.lib; {
homepage = https://github.com/elastic/curator;
description = "Curate, or manage, your Elasticsearch indices and snapshots";
diff --git a/pkgs/development/python-modules/elpy/default.nix b/pkgs/development/python-modules/elpy/default.nix
deleted file mode 100644
index f30dc218379c..000000000000
--- a/pkgs/development/python-modules/elpy/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, rope
-, flake8
-, autopep8
-, jedi
-, importmagic
-, black
-, mock
-, nose
-, yapf
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "elpy";
- version = "1.29.1";
-
- src = fetchFromGitHub {
- owner = "jorgenschaefer";
- repo = pname;
- rev = version;
- sha256 = "19sd5p03rkp5yibq1ilwisq8jlma02ks2kdc3swy6r27n4hy90xf";
- };
-
- propagatedBuildInputs = [ flake8 autopep8 jedi importmagic rope yapf ]
- ++ stdenv.lib.optionals isPy3k [ black ];
-
- checkInputs = [ mock nose ];
-
- checkPhase = ''
- HOME=$(mktemp -d) nosetests -e "test_should_complete_top_level_modules_for_import"
- '';
-
- meta = with stdenv.lib; {
- description = "Backend for the elpy Emacs mode";
- homepage = "https://github.com/jorgenschaefer/elpy";
- license = licenses.gpl3;
- maintainers = [ maintainers.costrouc ];
- };
-
-}
diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix
index fee2156e67db..0fcf7731ee02 100644
--- a/pkgs/development/python-modules/eth-typing/default.nix
+++ b/pkgs/development/python-modules/eth-typing/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "eth-typing";
- version = "2.0.0";
+ version = "2.1.0";
# Tests are missing from the PyPI source tarball so let's use GitHub
# https://github.com/ethereum/eth-typing/issues/8
@@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "ethereum";
repo = pname;
rev = "v${version}";
- sha256 = "017rshrz9kzax851hdbd3924jmr06h2sx3xdq7m4dwhgz3pgqfcy";
+ sha256 = "0chrrfw3kdaihgr2ryhljf56bflipzmfxai688xrc2yk7yiqnll5";
};
# setuptools-markdown uses pypandoc which is broken at the moment
diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix
index 5fb83126d1c7..116fa0273e52 100644
--- a/pkgs/development/python-modules/eth-utils/default.nix
+++ b/pkgs/development/python-modules/eth-utils/default.nix
@@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "eth-utils";
- version = "1.4.1";
+ version = "1.7.0";
# Tests are missing from the PyPI source tarball so let's use GitHub
# https://github.com/ethereum/eth-utils/issues/130
@@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "ethereum";
repo = pname;
rev = "v${version}";
- sha256 = "1bwn7b5f0nzvwiw9zs63wy3qhaxvz2fhjp4wj9djp2337d7195h4";
+ sha256 = "0hhhdz764xgwj5zg3pjzpx10vh54q7kbvlnj9d67qkgwl3fkfgw2";
};
checkInputs = [ pytest hypothesis ];
diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix
index 4e1b78f80be9..c7766802e4e4 100644
--- a/pkgs/development/python-modules/execnet/default.nix
+++ b/pkgs/development/python-modules/execnet/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "execnet";
- version = "1.6.0";
+ version = "1.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1lvj8z6fikpb5r4rq9n53x3lmsm3vlbr58ikz28x85kly633fakm";
+ sha256 = "3839f3c1e9270926e7b3d9b0a52a57be89c302a3826a2b19c8d6e6c3d2b506d2";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/filemagic/default.nix b/pkgs/development/python-modules/filemagic/default.nix
index 731b83294a8f..cbb5ca56fed5 100644
--- a/pkgs/development/python-modules/filemagic/default.nix
+++ b/pkgs/development/python-modules/filemagic/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, file
, isPy3k, mock, unittest2 }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "filemagic";
version = "1.6";
diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix
index c44083e4c29a..7af8d29fce73 100644
--- a/pkgs/development/python-modules/fire/default.nix
+++ b/pkgs/development/python-modules/fire/default.nix
@@ -1,18 +1,18 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock
-, python-Levenshtein, pytest }:
+, python-Levenshtein, pytest, termcolor, isPy27, enum34 }:
buildPythonPackage rec {
pname = "fire";
- version = "0.1.3";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "google";
repo = "python-fire";
rev = "v${version}";
- sha256 = "0kdcmzr3sgzjsw5fmvdylgrn8akqjbs433jbgqzp498njl9cc6qx";
+ sha256 = "1r6cmihafd7mb6j3mvgk251my6ckb0sqqj1l2ny2azklv175b38a";
};
- propagatedBuildInputs = [ six ];
+ propagatedBuildInputs = [ six termcolor ] ++ stdenv.lib.optional isPy27 enum34;
checkInputs = [ hypothesis mock python-Levenshtein pytest ];
@@ -20,14 +20,6 @@ buildPythonPackage rec {
py.test
'';
- patches = [
- # Add Python 3.7 support. Remove with the next release
- (fetchpatch {
- url = "https://github.com/google/python-fire/commit/668007ae41391f5964870b4597e41493a936a11e.patch";
- sha256 = "0rf7yzv9qx66zfmdggfz478z37fi4rwx4hlh3dk1065sx5rfksi0";
- })
- ];
-
meta = with stdenv.lib; {
description = "A library for automatically generating command line interfaces";
longDescription = ''
diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix
index 3b91fb717bc4..de7342d67ca0 100644
--- a/pkgs/development/python-modules/first/default.nix
+++ b/pkgs/development/python-modules/first/default.nix
@@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "first";
version = "2.0.2";
- name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix
index edc873458a11..653e39b17401 100644
--- a/pkgs/development/python-modules/flask-silk/default.nix
+++ b/pkgs/development/python-modules/flask-silk/default.nix
@@ -4,7 +4,7 @@
, flask
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "Flask-Silk";
version = "2018-06-28";
diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix
index df39b2ea7253..bc7962d41081 100644
--- a/pkgs/development/python-modules/flask/default.nix
+++ b/pkgs/development/python-modules/flask/default.nix
@@ -2,12 +2,12 @@
, itsdangerous, click, werkzeug, jinja2, pytest }:
buildPythonPackage rec {
- version = "1.0.3";
+ version = "1.0.4";
pname = "Flask";
src = fetchPypi {
inherit pname version;
- sha256 = "ad7c6d841e64296b962296c2c2dabc6543752985727af86a975072dea984b6f3";
+ sha256 = "ed1330220a321138de53ec7c534c3d90cf2f7af938c7880fc3da13aa46bf870f";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix
new file mode 100644
index 000000000000..fa5edc1077c6
--- /dev/null
+++ b/pkgs/development/python-modules/fx2/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, python
+, fetchFromGitHub
+, sdcc
+, libusb1
+, crcmod
+}:
+
+buildPythonPackage {
+ pname = "fx2";
+ version = "unstable-2019-08-27";
+
+ src = fetchFromGitHub {
+ owner = "whitequark";
+ repo = "libfx2";
+ rev = "dd1e42c7b46ff410dbb18beab46111bb5491400c";
+ sha256 = "0xvlmx6ym0ylrvnlqzf18d475wa0mfci7wkdbv30gl3hgdhsppjz";
+ };
+
+ nativeBuildInputs = [ sdcc ];
+
+ propagatedBuildInputs = [ libusb1 crcmod ];
+
+ preBuild = ''
+ cd software
+ ${python.pythonForBuild.interpreter} setup.py build_ext
+ '';
+
+ preInstall = ''
+ mkdir -p $out/share/libfx2
+ cp -R ../firmware/library/{.stamp,lib,include,fx2{rules,conf}.mk} \
+ $out/share/libfx2
+ '';
+
+ # installCheckPhase tries to run build_ext again and there are no tests
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Chip support package for Cypress EZ-USB FX2 series microcontrollers";
+ homepage = https://github.com/whitequark/libfx2;
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ emily ];
+ };
+}
diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix
index e0b6b3e49fa4..f9ad118673ac 100644
--- a/pkgs/development/python-modules/gateone/default.nix
+++ b/pkgs/development/python-modules/gateone/default.nix
@@ -7,7 +7,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
name = "gateone-1.2-0d57c3";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix
index d352d6def24f..c8ff60b318b7 100644
--- a/pkgs/development/python-modules/geeknote/default.nix
+++ b/pkgs/development/python-modules/geeknote/default.nix
@@ -10,7 +10,7 @@
, evernote
}:
-buildPythonPackage rec {
+buildPythonPackage {
version = "2015-05-11";
pname = "geeknote";
disabled = ! isPy27;
diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix
index a9ac85e6248b..de313dc1c7d6 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@@ -5,7 +5,6 @@
buildPythonPackage rec {
pname = "geopandas";
version = "0.5.1";
- name = pname + "-" + version;
src = fetchFromGitHub {
owner = "geopandas";
diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix
index 95c64e7187b0..0f4bb4ce9c47 100644
--- a/pkgs/development/python-modules/glances/default.nix
+++ b/pkgs/development/python-modules/glances/default.nix
@@ -8,7 +8,7 @@
}:
buildPythonPackage rec {
- name = "glances-${version}";
+ pname = "glances";
version = "3.1.2";
disabled = isPyPy;
diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix
new file mode 100644
index 000000000000..264a13aed5e7
--- /dev/null
+++ b/pkgs/development/python-modules/glasgow/default.nix
@@ -0,0 +1,66 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, sdcc
+, nmigen
+, fx2
+, libusb1
+, aiohttp
+, pyvcd
+, bitarray
+, crcmod
+, yosys
+, icestorm
+, nextpnr
+}:
+
+buildPythonPackage rec {
+ pname = "glasgow";
+ version = "unstable-2019-08-31";
+ realVersion = lib.substring 0 7 src.rev;
+
+ src = fetchFromGitHub {
+ owner = "GlasgowEmbedded";
+ repo = "Glasgow";
+ rev = "21641a13c6a0daaf8618aff3c5bfffcb26ef6cca";
+ sha256 = "1dpm1jmm4fg8xf17s6h9g5sc09gq8b6xq955sv2x11nrbqf98l4v";
+ };
+
+ nativeBuildInputs = [ sdcc ];
+
+ propagatedBuildInputs = [
+ nmigen
+ fx2
+ libusb1
+ aiohttp
+ pyvcd
+ bitarray
+ crcmod
+ ];
+
+ postPatch = ''
+ substituteInPlace software/setup.py \
+ --replace 'versioneer.get_version()' '"${realVersion}"'
+ '';
+
+ preBuild = ''
+ make -C firmware LIBFX2=${fx2}/share/libfx2
+ cp firmware/glasgow.ihex software/glasgow
+ cd software
+ '';
+
+ # a couple failing tests and also installCheck tries to build_ext again
+ doInstallCheck = false;
+ doCheck = false;
+
+ checkPhase = ''
+ python -m unittest discover
+ '';
+
+ meta = with lib; {
+ description = "Software for Glasgow, a digital interface multitool";
+ homepage = https://github.com/GlasgowEmbedded/Glasgow;
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ emily ];
+ };
+}
diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix
index b0b6bfaa5ef9..315d4756e0db 100644
--- a/pkgs/development/python-modules/google_auth/default.nix
+++ b/pkgs/development/python-modules/google_auth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ stdenv, buildPythonPackage, fetchpatch, fetchPypi
, pytest, mock, oauth2client, flask, requests, urllib3, pytest-localserver, six, pyasn1-modules, cachetools, rsa }:
buildPythonPackage rec {
@@ -9,6 +9,13 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "0f7c6a64927d34c1a474da92cfc59e552a5d3b940d3266606c6a28b72888b9e4";
};
+ patches = [
+ (fetchpatch {
+ name = "use-new-pytest-api-to-keep-building-with-pytest5.patch";
+ url = "https://github.com/googleapis/google-auth-library-python/commit/b482417a04dbbc207fcd6baa7a67e16b1a9ffc77.patch";
+ sha256 = "07jpa7pa6sffbcwlsg5fgcv2vvngil5qpmv6fhjqp7fnvx0674s0";
+ })
+ ];
checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ];
propagatedBuildInputs = [ six pyasn1-modules cachetools rsa ];
diff --git a/pkgs/development/python-modules/google_cloud_testutils/default.nix b/pkgs/development/python-modules/google_cloud_testutils/default.nix
index 9c8d6ca93e05..311815ef3313 100644
--- a/pkgs/development/python-modules/google_cloud_testutils/default.nix
+++ b/pkgs/development/python-modules/google_cloud_testutils/default.nix
@@ -5,7 +5,7 @@
, google_auth
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "google-cloud-testutils";
version = "unstable-36ffa923c7037e8b4fdcaa76272cb6267e908a9d";
diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix
index 8bbcaed377a8..2a65df18fa54 100644
--- a/pkgs/development/python-modules/gpy/default.nix
+++ b/pkgs/development/python-modules/gpy/default.nix
@@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "GPy";
version = "1.9.8";
- name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix
index b0e418913b7d..c6fddd1554c2 100644
--- a/pkgs/development/python-modules/greatfet/default.nix
+++ b/pkgs/development/python-modules/greatfet/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, future, pyusb, ipython, pygreat }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "GreatFET";
version = "2019.5.1.dev0";
diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix
index c729874846da..17dc8dea4f83 100644
--- a/pkgs/development/python-modules/gtimelog/default.nix
+++ b/pkgs/development/python-modules/gtimelog/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
'';
meta = with stdenv.lib; {
- description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible";
+ description = "A small GTK app for keeping track of your time. It's main goal is to be as unintrusive as possible";
homepage = https://mg.pov.lt/gtimelog/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ocharles ];
diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix
index 85c5c011dfd9..58d5c414cf0a 100644
--- a/pkgs/development/python-modules/gunicorn/default.nix
+++ b/pkgs/development/python-modules/gunicorn/default.nix
@@ -17,6 +17,10 @@ buildPythonPackage rec {
--replace "coverage>=4.0,<4.4" "coverage"
'';
+ # Test failures but patch does not apply cleanly
+ # https://github.com/benoitc/gunicorn/commit/f38f717539b1b7296720805b8ae3969c3509b9c1
+ doCheck = false;
+
meta = with stdenv.lib; {
homepage = https://pypi.python.org/pypi/gunicorn;
description = "WSGI HTTP Server for UNIX";
diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix
index 46b0dde636af..3cd89a7d0e1e 100644
--- a/pkgs/development/python-modules/gyp/default.nix
+++ b/pkgs/development/python-modules/gyp/default.nix
@@ -4,7 +4,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "gyp";
version = "2015-06-11";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix
index 42ebf1b81da7..f77c267d792c 100644
--- a/pkgs/development/python-modules/h11/default.nix
+++ b/pkgs/development/python-modules/h11/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pytest, fetchpatch }:
buildPythonPackage rec {
pname = "h11";
@@ -9,6 +9,14 @@ buildPythonPackage rec {
sha256 = "1qfad70h59hya21vrzz8dqyyaiqhac0anl2dx3s3k80gpskvrm1k";
};
+ patches = [
+ # pytest5 compatability
+ (fetchpatch {
+ url = https://github.com/python-hyper/h11/commit/241e220493a511a5f5a5d472cb88d72661a92ab1.patch;
+ sha256 = "1s3ipf9s41m1lksws3xv3j133q7jnjdqvmgk4sfnm8q7li2dww39";
+ })
+ ];
+
checkInputs = [ pytest ];
checkPhase = ''
diff --git a/pkgs/development/python-modules/hcs_utils/default.nix b/pkgs/development/python-modules/hcs_utils/default.nix
index cfaaa5636113..51d42e5c8b73 100644
--- a/pkgs/development/python-modules/hcs_utils/default.nix
+++ b/pkgs/development/python-modules/hcs_utils/default.nix
@@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "hcs_utils";
version = "2.0";
- name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix
index 9938d4053879..32c79b171366 100644
--- a/pkgs/development/python-modules/hmmlearn/default.nix
+++ b/pkgs/development/python-modules/hmmlearn/default.nix
@@ -3,10 +3,9 @@
buildPythonPackage rec {
pname = "hmmlearn";
version = "0.2.2";
- name = pname + "-" + version;
src = fetchurl {
- url = "mirror://pypi/h/hmmlearn/${name}.tar.gz";
+ url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz";
sha256 = "081c53xs5wn5vikwslallwdv0am09w9cbbggl5dbkqpnic9zx4h4";
};
diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix
index d5492b3b6414..810d9ee6148e 100644
--- a/pkgs/development/python-modules/hocr-tools/default.nix
+++ b/pkgs/development/python-modules/hocr-tools/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "tmbdev";
- repo = "${pname}";
+ repo = pname;
rev = "v${version}";
sha256 = "14f9hkp7pr677085w8iidwd0la9cjzy3pyj3rdg9b03nz9pc0w6p";
};
diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix
index c4afe809cfb6..59528723d80d 100644
--- a/pkgs/development/python-modules/hoomd-blue/default.nix
+++ b/pkgs/development/python-modules/hoomd-blue/default.nix
@@ -16,7 +16,7 @@ let components = {
in
stdenv.mkDerivation rec {
version = "2.3.4";
- name = "hoomd-blue-${version}";
+ pname = "hoomd-blue";
src = fetchgit {
url = "https://bitbucket.org/glotzer/hoomd-blue";
diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix
index cf78a6185365..3a76bd9f148b 100644
--- a/pkgs/development/python-modules/httpretty/default.nix
+++ b/pkgs/development/python-modules/httpretty/default.nix
@@ -36,6 +36,7 @@ buildPythonPackage rec {
NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
"tests.functional.test_httplib2.test_callback_response"
"tests.functional.test_requests.test_streaming_responses"
+ "tests.functional.test_httplib2.test_callback_response"
];
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/imagecodecs-lite/default.nix b/pkgs/development/python-modules/imagecodecs-lite/default.nix
new file mode 100644
index 000000000000..6374b882718b
--- /dev/null
+++ b/pkgs/development/python-modules/imagecodecs-lite/default.nix
@@ -0,0 +1,25 @@
+{ lib, fetchPypi, buildPythonPackage
+, pytest
+, numpy
+, cython
+}:
+
+buildPythonPackage rec {
+ pname = "imagecodecs-lite";
+ version = "2019.4.20";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1cp88g7g91gdhjhaz6gvb4jzvi5ad817id9f2bnc5r95ag93bqb0";
+ };
+
+ checkInputs = [ pytest ];
+ propagatedBuildInputs = [ numpy cython ];
+
+ meta = with lib; {
+ description = "Block-oriented, in-memory buffer transformation, compression, and decompression functions";
+ homepage = "https://www.lfd.uci.edu/~gohlke/";
+ maintainers = [ maintainers.tbenst ];
+ license = licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix
index c7f6e5c82194..f89b7ab1ce62 100644
--- a/pkgs/development/python-modules/intake/default.nix
+++ b/pkgs/development/python-modules/intake/default.nix
@@ -4,28 +4,31 @@
, appdirs
, dask
, holoviews
+, hvplot
, jinja2
, msgpack-numpy
, msgpack-python
, numpy
, pandas
+, panel
, python-snappy
, requests
, ruamel_yaml
, six
, tornado
, pytest
-, isPy27
+, pythonOlder
}:
buildPythonPackage rec {
pname = "intake";
- version = "0.4.4";
- disabled = isPy27;
+ version = "0.5.3";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "3fc1b7c2949c9b4200ecbbfdff17da126981a1d8d95ccb7b7bcca3e3dd849d5e";
+ sha256 = "1mbjr4xl4i523bg8k08s5986v2289fznd8cr3j3czn5adi8519j7";
};
checkInputs = [ pytest ];
@@ -33,11 +36,13 @@ buildPythonPackage rec {
appdirs
dask
holoviews
+ hvplot
jinja2
msgpack-numpy
msgpack-python
numpy
pandas
+ panel
python-snappy
requests
ruamel_yaml
@@ -45,10 +50,15 @@ buildPythonPackage rec {
tornado
];
+ postPatch = ''
+ # Is in setup_requires but not used in setup.py...
+ substituteInPlace setup.py --replace "'pytest-runner'" ""
+ '';
+
+ # test_discover requires driver_with_entrypoints-0.1.dist-info, which is not included in tarball
+ # test_filtered_compressed_cache requires calvert_uk_filter.tar.gz, which is not included in tarball
checkPhase = ''
- # test_filtered_compressed_cache requires calvert_uk_filter.tar.gz, which is not included in tarball
- # test_which assumes python for executable name
- PATH=$out/bin:$PATH HOME=$(mktemp -d) pytest -k "not test_filtered_compressed_cache and not test_which"
+ PATH=$out/bin:$PATH HOME=$(mktemp -d) pytest -k "not test_discover and not test_filtered_compressed_cache"
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/ipfsapi/default.nix b/pkgs/development/python-modules/ipfsapi/default.nix
index 377ed8549cff..1778e5a81af6 100644
--- a/pkgs/development/python-modules/ipfsapi/default.nix
+++ b/pkgs/development/python-modules/ipfsapi/default.nix
@@ -6,7 +6,7 @@
, requests
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "ipfsapi";
version = "0.4.2.post1";
disabled = isPy27;
diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix
index c65c5f21e567..54d9aff280f6 100644
--- a/pkgs/development/python-modules/iso3166/default.nix
+++ b/pkgs/development/python-modules/iso3166/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "iso3166";
version = "0.8";
diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix
index 15191858daa8..10d0004f74a5 100644
--- a/pkgs/development/python-modules/jsbeautifier/default.nix
+++ b/pkgs/development/python-modules/jsbeautifier/default.nix
@@ -1,10 +1,10 @@
-{ lib, fetchPypi, buildPythonApplication, EditorConfig, pytest, six }:
+{ lib, fetchPypi, buildPythonApplication, editorconfig, pytest, six }:
buildPythonApplication rec {
pname = "jsbeautifier";
version = "1.10.0";
- propagatedBuildInputs = [ six EditorConfig ];
+ propagatedBuildInputs = [ six editorconfig ];
checkInputs = [ pytest ];
src = fetchPypi {
diff --git a/pkgs/development/python-modules/jsonwatch/default.nix b/pkgs/development/python-modules/jsonwatch/default.nix
index 177b0d4cfee9..1b859e21e904 100644
--- a/pkgs/development/python-modules/jsonwatch/default.nix
+++ b/pkgs/development/python-modules/jsonwatch/default.nix
@@ -5,7 +5,7 @@
, isPyPy
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "jsonwatch";
version = "0.2.0";
disabled = isPyPy; # doesn't find setuptools
diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix
index 81301f337e62..e22ab22d5a76 100644
--- a/pkgs/development/python-modules/ldappool/default.nix
+++ b/pkgs/development/python-modules/ldappool/default.nix
@@ -2,7 +2,7 @@
, pbr, ldap, prettytable, fixtures, testresources, testtools }:
buildPythonPackage rec {
- name = "ldappool-${version}";
+ pname = "ldappool";
version = "2.4.1";
src = fetchPypi {
diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix
index 3853d796fcd6..734a51c7be61 100644
--- a/pkgs/development/python-modules/libcloud/default.nix
+++ b/pkgs/development/python-modules/libcloud/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "apache-libcloud";
- version = "2.5.0";
+ version = "2.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1dj8jh5ccjv7qbydf49cw17py7z3jjkaxk4jj2gx6mq2f4w304wg";
+ sha256 = "1spjkw5nxhbawblj5db8izff05kjw425iyydipajb7qh73vm25r0";
};
checkInputs = [ mock pytest pytestrunner requests-mock ];
diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix
index 6babc6ae0145..40a4f6f7429f 100644
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/default.nix
@@ -18,7 +18,6 @@ assert cudaSupport -> nvidia_x11 != null
buildPythonPackage rec {
pname = "libgpuarray";
version = "0.7.5";
- name = pname + "-" + version;
src = fetchFromGitHub {
owner = "Theano";
diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix
index 745f83fe5081..e89b606879bb 100644
--- a/pkgs/development/python-modules/libsoundtouch/default.nix
+++ b/pkgs/development/python-modules/libsoundtouch/default.nix
@@ -7,8 +7,7 @@
, enum34
}:
-buildPythonPackage rec {
- name = "${pname}-${version}";
+buildPythonPackage {
pname = "libsoundtouch";
version = "0.4.0";
diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
index 7f9aa3fa2e48..6a4973584044 100644
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -5,10 +5,9 @@
buildPythonPackage rec {
pname = "llfuse";
version = "1.3.6";
- name = pname + "-" + version;
src = fetchurl {
- url = "mirror://pypi/l/llfuse/${name}.tar.bz2";
+ url = "mirror://pypi/l/llfuse/${pname}-${version}.tar.bz2";
sha256 = "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii";
};
diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix
index 4f090d73e60f..13adad603d10 100644
--- a/pkgs/development/python-modules/lmdb/default.nix
+++ b/pkgs/development/python-modules/lmdb/default.nix
@@ -16,7 +16,6 @@ buildPythonPackage rec {
checkInputs = [ pytest cffi ];
checkPhase = ''
- export PYTHONPATH=.:$PYTHONPATH
py.test
'';
@@ -24,7 +23,7 @@ buildPythonPackage rec {
description = "Universal Python binding for the LMDB 'Lightning' Database";
homepage = "https://github.com/dw/py-lmdb";
license = licenses.openldap;
- maintainers = with maintainers; [ copumpkin ];
+ maintainers = with maintainers; [ copumpkin ivan ];
};
}
diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix
index 18875f840644..2203fa4c6ad0 100644
--- a/pkgs/development/python-modules/locustio/default.nix
+++ b/pkgs/development/python-modules/locustio/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "locustio";
repo = "locust";
- rev = "${version}";
+ rev = version;
sha256 = "1645d63ig4ymw716b6h53bhmjqqc13p9r95k1xfx66ck6vdqnisd";
};
diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix
index c06f5d6cd088..67134fdfd95a 100644
--- a/pkgs/development/python-modules/loguru/default.nix
+++ b/pkgs/development/python-modules/loguru/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "loguru";
- version = "0.3.1";
+ version = "0.3.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "14pmxyx4kwyafdifqzal121mpdd89lxbjgn0zzi9z6fmzk6pr5h2";
+ sha256 = "0apd3wcjbyhwzgw0fgzzn4dcgy10pqa8f1vf58d4hmszxvyqn4z3";
};
checkInputs = [ pytest colorama ];
diff --git a/pkgs/development/python-modules/lpod/default.nix b/pkgs/development/python-modules/lpod/default.nix
index dd40ac851865..9b262007706f 100644
--- a/pkgs/development/python-modules/lpod/default.nix
+++ b/pkgs/development/python-modules/lpod/default.nix
@@ -7,7 +7,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
version = "1.1.7";
pname = "python-lpod";
# lpod library currently does not support Python 3.x
diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix
index 1c707b320310..f0b3aa60f179 100644
--- a/pkgs/development/python-modules/ludios_wpull/default.nix
+++ b/pkgs/development/python-modules/ludios_wpull/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
disabled = !isPy3k;
src = fetchFromGitHub {
- rev = "${version}";
+ rev = version;
owner = "ludios";
repo = "wpull";
sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf";
diff --git a/pkgs/development/python-modules/lxc/default.nix b/pkgs/development/python-modules/lxc/default.nix
index a078d33a8895..26be7020c666 100644
--- a/pkgs/development/python-modules/lxc/default.nix
+++ b/pkgs/development/python-modules/lxc/default.nix
@@ -5,7 +5,7 @@
, pkgs
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "python-lxc-unstable";
version = "2016-08-25";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/magic/default.nix b/pkgs/development/python-modules/magic/default.nix
index 41c932ed1117..ee2c38fed535 100644
--- a/pkgs/development/python-modules/magic/default.nix
+++ b/pkgs/development/python-modules/magic/default.nix
@@ -3,8 +3,8 @@
, pkgs
}:
-buildPythonPackage rec {
- name = "${pkgs.file.name}";
+buildPythonPackage {
+ name = pkgs.file.name;
src = pkgs.file.src;
diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix
new file mode 100644
index 000000000000..fd89260ab94b
--- /dev/null
+++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, fetchPypi, mailman, mock }:
+
+buildPythonPackage rec {
+ pname = "mailman-hyperkitty";
+ version = "1.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1lfqa9admhvdv71f528jmz2wl0i5cv77v6l64px2pm4zqr9ckkjx";
+ };
+
+ propagatedBuildInputs = [ mailman ];
+ checkInputs = [ mock ];
+
+ checkPhase = ''
+ python -m nose2 -v
+ '';
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Mailman archiver plugin for HyperKitty";
+ homepage = https://gitlab.com/mailman/mailman-hyperkitty;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ globin peti ];
+ };
+}
diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index 04381d73834f..876b57dd01fa 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
+{ lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch
, aws-xray-sdk
, backports_tempfile
, boto
@@ -26,13 +26,21 @@
buildPythonPackage rec {
pname = "moto";
- version = "1.3.10";
+ version = "1.3.13";
src = fetchPypi {
inherit pname version;
- sha256 = "0vlq015irqqwdknk1an7qqkg1zjk18c7jd89r7zbxxfwy3bgzwwj";
+ sha256 = "0rhbjvqi1khp80gfnl3x632kwlpq3k7m8f13nidznixdpa78vm4m";
};
+ # Backported fix from 1.3.14.dev for compatibility with botocore >= 1.9.198.
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/spulec/moto/commit/e4a4e6183560489e98b95e815b439c7a1cf3566c.diff";
+ sha256 = "1fixr7riimnldiikv33z4jwjgcsccps0c6iif40x8wmpvgcfs0cb";
+ })
+ ];
+
postPatch = ''
substituteInPlace setup.py \
--replace "jsondiff==1.1.2" "jsondiff~=1.1"
diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix
index 3669b8dddbf8..95ee5c5001ad 100644
--- a/pkgs/development/python-modules/mpd2/default.nix
+++ b/pkgs/development/python-modules/mpd2/default.nix
@@ -1,22 +1,24 @@
{ stdenv
, buildPythonPackage
, fetchPypi
+, python
, mock
}:
buildPythonPackage rec {
- pname = "mpd2";
- version = "0.5.5";
+ pname = "python-mpd2";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1gfrxf71xll1w6zb69znqg5c9j0g7036fsalkvqprh2id640cl3a";
+ extension = "tar.bz2";
+ sha256 = "772fa6861273bb9f363a97987c2c45ca3965eb770570f1f02566efec9c89fc5f";
};
buildInputs = [ mock ];
- patchPhase = ''
- sed -i -e '/tests_require/d' \
- -e 's/cmdclass.*/test_suite="mpd_test",/' setup.py
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest mpd.tests
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix
index 388e0148d0a0..dd255d4d0049 100644
--- a/pkgs/development/python-modules/mrbob/default.nix
+++ b/pkgs/development/python-modules/mrbob/default.nix
@@ -3,11 +3,12 @@
}:
buildPythonPackage rec {
- pname = "mrbob";
+ pname = "mr-bob";
version = "0.1.2";
src = fetchPypi {
- inherit pname version;
+ inherit version;
+ pname = "mr.bob";
sha256 = "6737eaf98aaeae85e07ebef844ee5156df2f06a8b28d7c3dcb056f811c588121";
};
diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix
index 3fbb36a37188..0d5d8d75a368 100644
--- a/pkgs/development/python-modules/mutag/default.nix
+++ b/pkgs/development/python-modules/mutag/default.nix
@@ -5,7 +5,7 @@
, pyparsing
}:
-buildPythonPackage rec {
+buildPythonPackage {
name = "mutag-0.0.2-2ffa0258ca";
disabled = ! isPy3k;
diff --git a/pkgs/development/python-modules/muttils/default.nix b/pkgs/development/python-modules/muttils/default.nix
index 904284e5b332..868700b62237 100644
--- a/pkgs/development/python-modules/muttils/default.nix
+++ b/pkgs/development/python-modules/muttils/default.nix
@@ -4,7 +4,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "muttils";
version = "1.3";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix
index f2e38a0e9b3b..65eb2d44ffcc 100644
--- a/pkgs/development/python-modules/mxnet/default.nix
+++ b/pkgs/development/python-modules/mxnet/default.nix
@@ -8,7 +8,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
inherit (pkgs.mxnet) name version src meta;
buildInputs = [ pkgs.mxnet ];
diff --git a/pkgs/development/python-modules/mysql_python/default.nix b/pkgs/development/python-modules/mysql_python/default.nix
deleted file mode 100644
index 0ab11521cc88..000000000000
--- a/pkgs/development/python-modules/mysql_python/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, isPy3k
-, fetchPypi
-, nose
-, pkgs
-}:
-
-buildPythonPackage rec {
- pname = "MySQL-python";
- version = "1.2.5";
- disabled = isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- extension = "zip";
- sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441";
- };
-
- checkInputs = [ nose ];
- nativeBuildInputs = [ pkgs.mysql.connector-c ];
- buildInputs = [ pkgs.mysql.connector-c ];
-
- # plenty of failing tests
- doCheck = false;
-
- meta = with stdenv.lib; {
- description = "MySQL database binding for Python";
- homepage = https://sourceforge.net/projects/mysql-python;
- license = licenses.gpl3;
- };
-
-}
diff --git a/pkgs/development/python-modules/nanomsg-python/default.nix b/pkgs/development/python-modules/nanomsg-python/default.nix
index b6e323ff9c69..31662cd3941a 100644
--- a/pkgs/development/python-modules/nanomsg-python/default.nix
+++ b/pkgs/development/python-modules/nanomsg-python/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "nanomsg-python";
version = "1.0.20190114";
diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index 0b0220d32460..0f84486674e9 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -4,7 +4,7 @@ let
pname = "nbxmpp";
version = "0.6.10";
name = "${pname}-${version}";
-in buildPythonPackage rec {
+in buildPythonPackage {
inherit pname version;
# Tests aren't included in PyPI tarball.
src = fetchzip {
diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index ee5110995b01..d3a1cfe3907c 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -37,10 +37,10 @@ buildPythonPackage rec {
# Variables used to configure the build process
USE_NCCONFIG="0";
- HDF5_DIR="${hdf5}";
- NETCDF4_DIR="${netcdf}";
- CURL_DIR="${curl.dev}";
- JPEG_DIR="${libjpeg.dev}";
+ HDF5_DIR=hdf5;
+ NETCDF4_DIR=netcdf;
+ CURL_DIR=curl.dev;
+ JPEG_DIR=libjpeg.dev;
meta = with stdenv.lib; {
description = "Interface to netCDF library (versions 3 and 4)";
diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix
index 76494c70b2ea..365f741c57fa 100644
--- a/pkgs/development/python-modules/nibabel/default.nix
+++ b/pkgs/development/python-modules/nibabel/default.nix
@@ -2,20 +2,20 @@
, buildPythonPackage
, fetchPypi
, isPy3k
+, bz2file
+, mock
+, nose
, numpy
, six
-, bz2file
-, nose
-, mock
}:
buildPythonPackage rec {
pname = "nibabel";
- version = "2.4.1";
+ version = "2.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f165ff1cb4464902d6594eb2694e2cfb6f8b9fe233b856c976c3cff623ee0e17";
+ sha256 = "07v1gsq1v43v0z06cnp82ij9sqx3972c9bc6vsdj7pa9ddpa2yjw";
};
propagatedBuildInputs = [
@@ -25,16 +25,8 @@ buildPythonPackage rec {
checkInputs = [ nose mock ];
- checkPhase = let
- excludeTests = lib.optionals isPy3k [
- # https://github.com/nipy/nibabel/issues/691
- "nibabel.gifti.tests.test_giftiio.test_read_deprecated"
- "nibabel.gifti.tests.test_parse_gifti_fast.test_parse_dataarrays"
- "nibabel.tests.test_minc1.test_old_namespace"
- ];
- # TODO: Add --with-doctest once all doctests pass
- in ''
- nosetests ${lib.concatMapStrings (test: "-e '${test}' ") excludeTests}
+ checkPhase = ''
+ nosetests
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
index e45a0033c82a..2da580abd926 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "nilearn";
version = "0.5.2";
- name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 42fb2de9dca6..5f33a5fe63ca 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -16,6 +16,7 @@
, packaging
, prov
, psutil
+, pybids
, pydot
, pytest
, pytest_xdist
@@ -44,11 +45,11 @@ in
buildPythonPackage rec {
pname = "nipype";
- version = "1.1.9";
+ version = "1.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f80096ec6cfd7cffc05764bba1749e424877140ef1373193f076bdd843f19016";
+ sha256 = "09azgfmb0992c3xqmi7n93pz95i4v37vc9kqmjh8c9jjxjzszdd5";
};
postPatch = ''
@@ -79,6 +80,7 @@ buildPythonPackage rec {
];
checkInputs = [
+ pybids
codecov
glibcLocales
mock
@@ -89,13 +91,11 @@ buildPythonPackage rec {
which
];
+ # ignore tests which incorrect fail to detect xvfb
checkPhase = ''
- LC_ALL="en_US.UTF-8" pytest -v --doctest-modules nipype
+ LC_ALL="en_US.UTF-8" pytest -v nipype -k 'not display'
'';
- # See: https://github.com/nipy/nipype/issues/2839
- doCheck = false;
-
meta = with stdenv.lib; {
homepage = https://nipy.org/nipype/;
description = "Neuroimaging in Python: Pipelines and Interfaces";
diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix
new file mode 100644
index 000000000000..4151d08b60f4
--- /dev/null
+++ b/pkgs/development/python-modules/nmigen-boards/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, nmigen
+}:
+
+buildPythonPackage rec {
+ pname = "nmigen-boards";
+ version = "unstable-2019-08-30";
+ realVersion = lib.substring 0 7 src.rev;
+
+ src = fetchFromGitHub {
+ owner = "m-labs";
+ repo = "nmigen-boards";
+ rev = "3b80b3a3749ae8f123ff258a25e81bd21412aed4";
+ sha256 = "01qynxip8bq23jfjc5wjd97vxfvhld2zb8sxphwf0zixrmmyaspi";
+ };
+
+ propagatedBuildInputs = [ nmigen ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace 'versioneer.get_version()' '"${realVersion}"'
+ '';
+
+ meta = with lib; {
+ description = "Board and connector definitions for nMigen";
+ homepage = https://github.com/m-labs/nmigen-boards;
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ emily ];
+ };
+}
diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix
new file mode 100644
index 000000000000..345ba982b0bc
--- /dev/null
+++ b/pkgs/development/python-modules/nmigen/default.nix
@@ -0,0 +1,65 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, pyvcd
+, bitarray
+, jinja2
+
+# nmigen.{test,build} call out to these
+, yosys
+, symbiyosys
+, nextpnr ? null
+, icestorm ? null
+, trellis ? null
+
+# for tests
+, yices
+}:
+
+buildPythonPackage rec {
+ pname = "nmigen";
+ version = "unstable-2019-08-31";
+ realVersion = lib.substring 0 7 src.rev;
+
+ src = fetchFromGitHub {
+ owner = "m-labs";
+ repo = "nmigen";
+ rev = "2e206220462c67aa6ae97f7515a2191440fd61b3";
+ sha256 = "0y3w6vd493jqm9b8ppgwzs02v1al8w1n5gylljlsw70ci7fyk4qa";
+ };
+
+ disabled = pythonOlder "3.6";
+
+ propagatedBuildInputs = [ pyvcd bitarray jinja2 ];
+
+ checkInputs = [ yosys yices ];
+
+ postPatch = let
+ tool = pkg: name:
+ if pkg == null then {} else { ${name} = "${pkg}/bin/${name}"; };
+
+ # Only FOSS toolchain supported out of the box, sorry!
+ toolchainOverrides =
+ tool yosys "yosys" //
+ tool symbiyosys "sby" //
+ tool nextpnr "nextpnr-ice40" //
+ tool nextpnr "nextpnr-ecp5" //
+ tool icestorm "icepack" //
+ tool trellis "ecppack";
+ in ''
+ substituteInPlace setup.py \
+ --replace 'versioneer.get_version()' '"${realVersion}"'
+
+ substituteInPlace nmigen/_toolchain.py \
+ --replace 'overrides = {}' \
+ 'overrides = ${builtins.toJSON toolchainOverrides}'
+ '';
+
+ meta = with lib; {
+ description = "A refreshed Python toolbox for building complex digital hardware";
+ homepage = https://github.com/m-labs/nmigen;
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ emily ];
+ };
+}
diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix
index 5dd953808910..f3a1d6514eb5 100644
--- a/pkgs/development/python-modules/notify/default.nix
+++ b/pkgs/development/python-modules/notify/default.nix
@@ -6,8 +6,8 @@
, pkgs
}:
-stdenv.mkDerivation rec {
- name = "python-notify-${version}";
+stdenv.mkDerivation {
+ pname = "python-notify";
version = "0.1.1";
src = fetchurl {
diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix
index ec641420f652..567977a84f54 100644
--- a/pkgs/development/python-modules/notmuch/default.nix
+++ b/pkgs/development/python-modules/notmuch/default.nix
@@ -4,7 +4,7 @@
, python
}:
-buildPythonPackage rec {
+buildPythonPackage {
name = "python-${pkgs.notmuch.name}";
src = pkgs.notmuch.src;
diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix
new file mode 100644
index 000000000000..bce4c0426e40
--- /dev/null
+++ b/pkgs/development/python-modules/num2words/default.nix
@@ -0,0 +1,35 @@
+{ buildPythonPackage
+, lib
+, fetchPypi
+, docopt
+, delegator-py
+, pytest
+}:
+
+buildPythonPackage rec {
+ version = "0.5.10";
+ pname = "num2words";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0myc27k087rhgpwn1a1dffzl32rwz6ngdbf3rm2i0zlgcxh4zk9p";
+ };
+
+ propagatedBuildInputs = [ docopt ];
+
+ checkInputs = [ delegator-py pytest ];
+
+ checkPhase = ''
+ pytest -k 'not cli_with_lang'
+ '';
+
+ meta = with lib; {
+ description = "Modules to convert numbers to words. 42 --> forty-two";
+ homepage = "https://github.com/savoirfairelinux/num2words";
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ jonringer ];
+
+ longDescription =
+ "num2words is a library that converts numbers like 42 to words like forty-two. It supports multiple languages (see the list below for full list of languages) and can even generate ordinal numbers like forty-second";
+ };
+}
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index 10a1df8876cb..41064c6b36c7 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -5,7 +5,7 @@ let
cfg = writeTextFile {
name = "site.cfg";
text = (lib.generators.toINI {} {
- "${blasImplementation}" = {
+ ${blasImplementation} = {
include_dirs = "${blas}/include";
library_dirs = "${blas}/lib";
} // lib.optionalAttrs (blasImplementation == "mkl") {
@@ -16,12 +16,12 @@ let
};
in buildPythonPackage rec {
pname = "numpy";
- version = "1.17.0";
+ version = "1.17.2";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "951fefe2fb73f84c620bec4e001e80a80ddaa1b84dce244ded7f1e0cbe0ed34a";
+ sha256 = "73615d3edc84dd7c4aeb212fa3748fb83217e00d201875a47327f55363cef2df";
};
nativeBuildInputs = [ gfortran pytest ];
diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix
index 7fb1de53dbd9..7e34f3897bc5 100644
--- a/pkgs/development/python-modules/nwdiag/default.nix
+++ b/pkgs/development/python-modules/nwdiag/default.nix
@@ -5,10 +5,9 @@
buildPythonPackage rec {
pname = "nwdiag";
version = "1.0.4";
- name = pname + "-" + version;
src = fetchurl {
- url = "mirror://pypi/n/nwdiag/${name}.tar.gz";
+ url = "mirror://pypi/n/nwdiag/${pname}-${version}.tar.gz";
sha256 = "002565875559789a2dfc5f578c07abdf44269c3f7cdf78d4809bdc4bdc2213fa";
};
diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix
index c28f22aa5ec9..8e294f290cbd 100644
--- a/pkgs/development/python-modules/nxt-python/default.nix
+++ b/pkgs/development/python-modules/nxt-python/default.nix
@@ -8,7 +8,7 @@
, git
}:
-buildPythonPackage rec {
+buildPythonPackage {
version = "unstable-20160819";
pname = "nxt-python";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix
index 116ba717add6..a9598825dd00 100644
--- a/pkgs/development/python-modules/openant/default.nix
+++ b/pkgs/development/python-modules/openant/default.nix
@@ -4,7 +4,7 @@
, pyusb
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "openant-unstable";
version = "2017-02-11";
diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix
new file mode 100644
index 000000000000..eac2751ce3e5
--- /dev/null
+++ b/pkgs/development/python-modules/openrazer/common.nix
@@ -0,0 +1,17 @@
+{ stdenv
+, fetchFromGitHub
+}: rec {
+ version = "2.6.0";
+ src = fetchFromGitHub {
+ owner = "openrazer";
+ repo = "openrazer";
+ rev = "v${version}";
+ sha256 = "1s5irs3avrlp891mxan3z8p55ias9rq26rqp2qrlcc6i4vl29di0";
+ };
+ meta = with stdenv.lib; {
+ homepage = https://openrazer.github.io/;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ roelvandijk ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix
new file mode 100644
index 000000000000..6e3ab1e78338
--- /dev/null
+++ b/pkgs/development/python-modules/openrazer/daemon.nix
@@ -0,0 +1,45 @@
+{ buildPythonApplication
+, daemonize
+, dbus-python
+, fetchFromGitHub
+, fetchpatch
+, gobject-introspection
+, gtk3
+, makeWrapper
+, pygobject3
+, pyudev
+, setproctitle
+, stdenv
+, wrapGAppsHook
+}:
+
+let
+ common = import ./common.nix { inherit stdenv fetchFromGitHub; };
+in
+buildPythonApplication (common // rec {
+ pname = "openrazer_daemon";
+
+ sourceRoot = "source/daemon";
+
+ outputs = [ "out" "man" ];
+
+ nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
+
+ propagatedBuildInputs = [
+ daemonize
+ dbus-python
+ gobject-introspection
+ gtk3
+ pygobject3
+ pyudev
+ setproctitle
+ ];
+
+ postBuild = ''
+ DESTDIR="$out" PREFIX="" make install manpages
+ '';
+
+ meta = common.meta // {
+ description = "An entirely open source user-space daemon that allows you to manage your Razer peripherals on GNU/Linux";
+ };
+})
diff --git a/pkgs/development/python-modules/openrazer/pylib.nix b/pkgs/development/python-modules/openrazer/pylib.nix
new file mode 100644
index 000000000000..2f9ff467b2d9
--- /dev/null
+++ b/pkgs/development/python-modules/openrazer/pylib.nix
@@ -0,0 +1,26 @@
+{ buildPythonPackage
+, dbus-python
+, fetchFromGitHub
+, numpy
+, stdenv
+, openrazer-daemon
+}:
+
+let
+ common = import ./common.nix { inherit stdenv fetchFromGitHub; };
+in
+buildPythonPackage (common // rec {
+ pname = "openrazer";
+
+ sourceRoot = "source/pylib";
+
+ propagatedBuildInputs = [
+ dbus-python
+ numpy
+ openrazer-daemon
+ ];
+
+ meta = common.meta // {
+ description = "An entirely open source Python library that allows you to manage your Razer peripherals on GNU/Linux";
+ };
+})
diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix
index 73230b2e8fb3..694b87581cd6 100644
--- a/pkgs/development/python-modules/ovito/default.nix
+++ b/pkgs/development/python-modules/ovito/default.nix
@@ -4,11 +4,11 @@
, pythonPackages
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
# compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40
# This is not the "released" 3.0.0 just a commit
version = "3.0.0";
- name = "ovito-${version}";
+ pname = "ovito";
src = fetchgit {
url = "https://gitlab.com/stuko/ovito";
diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix
index fccd46c605db..4c88f0e1e4b7 100644
--- a/pkgs/development/python-modules/panel/default.nix
+++ b/pkgs/development/python-modules/panel/default.nix
@@ -11,18 +11,13 @@
buildPythonPackage rec {
pname = "panel";
- version = "0.4.0";
+ version = "0.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "21fc6729909dba4ba8c9a84b7fadd293322cc2594d15ac73b0f66a5ceffd1f98";
+ sha256 = "04w8jjlf7yz3k84xnacahczc9mmddqyp756rj3n8hclks9c1ww40";
};
- postPatch = ''
- substituteInPlace setup.py \
- --replace "testpath<0.4" "testpath"
- '';
-
propagatedBuildInputs = [
bokeh
param
diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix
index 69a2e61e2690..cb27fdb64e5f 100644
--- a/pkgs/development/python-modules/param/default.nix
+++ b/pkgs/development/python-modules/param/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "param";
- version = "1.8.2";
+ version = "1.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "49927979d4f6c994bcd8f6f7f2b34e3a0a7f0d62404dca6bcae5acde0192bb01";
+ sha256 = "1dbnviszdq3d2k3dfwpimb0adf27yzwm4iyv42rk8xvd8c6p9gdi";
};
checkInputs = [ flake8 nose ];
diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix
index 0183379ac004..029ce4a1712d 100644
--- a/pkgs/development/python-modules/paramz/default.nix
+++ b/pkgs/development/python-modules/paramz/default.nix
@@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "paramz";
version = "0.9.5";
- name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix
index 24539c7bbcef..6f82c446a1ff 100644
--- a/pkgs/development/python-modules/passlib/default.nix
+++ b/pkgs/development/python-modules/passlib/default.nix
@@ -8,7 +8,6 @@
buildPythonPackage rec {
pname = "passlib";
version = "1.7.1";
- name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/path.py/2.nix b/pkgs/development/python-modules/path.py/2.nix
new file mode 100644
index 000000000000..318642a393a3
--- /dev/null
+++ b/pkgs/development/python-modules/path.py/2.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, pytest
+, pytest-flake8
+, glibcLocales
+, packaging
+, isPy27
+, backports_os
+, importlib-metadata
+}:
+
+buildPythonPackage rec {
+ pname = "path.py";
+ version = "11.5.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "de7cd643affbc23e56533a6e8d551ecdee4983501a08c24e4e71565202d8cdaa";
+ };
+
+ checkInputs = [ pytest pytest-flake8 glibcLocales packaging ];
+ buildInputs = [ setuptools_scm ];
+ propagatedBuildInputs = [
+ importlib-metadata
+ ] ++ lib.optional isPy27 backports_os
+ ;
+
+ LC_ALL = "en_US.UTF-8";
+
+ meta = {
+ description = "A module wrapper for os.path";
+ homepage = https://github.com/jaraco/path.py;
+ license = lib.licenses.mit;
+ };
+
+ checkPhase = ''
+ # ignore performance test which may fail when the system is under load
+ py.test -v -k 'not TestPerformance'
+ '';
+}
diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix
index 318642a393a3..d3c3206fabaf 100644
--- a/pkgs/development/python-modules/path.py/default.nix
+++ b/pkgs/development/python-modules/path.py/default.nix
@@ -9,15 +9,16 @@
, isPy27
, backports_os
, importlib-metadata
+, fetchpatch
}:
buildPythonPackage rec {
pname = "path.py";
- version = "11.5.2";
+ version = "12.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "de7cd643affbc23e56533a6e8d551ecdee4983501a08c24e4e71565202d8cdaa";
+ sha256 = "9f2169633403aa0423f6ec000e8701dd1819526c62465f5043952f92527fea0f";
};
checkInputs = [ pytest pytest-flake8 glibcLocales packaging ];
@@ -39,4 +40,12 @@ buildPythonPackage rec {
# ignore performance test which may fail when the system is under load
py.test -v -k 'not TestPerformance'
'';
+
+ patches = [
+ (fetchpatch {
+ url = https://github.com/jaraco/path.py/commit/02eb16f0eb2cdc0015972ce963357aaa1cd0b84b.patch;
+ sha256 = "0bqa8vjwil7jn35a6984adcm24pvv3pjkhszv10qv6yr442d1mk9";
+ })
+ ];
+
}
diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix
index 39a2789a360f..8fb6259c5749 100644
--- a/pkgs/development/python-modules/pathspec/default.nix
+++ b/pkgs/development/python-modules/pathspec/default.nix
@@ -6,7 +6,6 @@
buildPythonPackage rec {
pname = "pathspec";
version = "0.5.9";
- name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix
index 4c0086869f74..57023e786f05 100644
--- a/pkgs/development/python-modules/pdfminer_six/default.nix
+++ b/pkgs/development/python-modules/pdfminer_six/default.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "pdfminer";
repo = "pdfminer.six";
- rev = "${version}";
+ rev = version;
sha256 = "1v8pcx43fgidv1g54s92k85anvcss08blkhm4yi1hn1ybl0mmw6c";
};
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index b9c4a62f0de0..6d2e8169eb76 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "phonenumbers";
- version = "8.10.16";
+ version = "8.10.17";
src = fetchPypi {
inherit pname version;
- sha256 = "1cfkyz991nbqsak3mdwybaxvzqbdcqivxnl84n8p4dyi5lk45v4b";
+ sha256 = "023rcv3qishd5n33gj22dzgq51kzpk41ckcmim96s1xvdbd2sxg9";
};
meta = {
diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index c2662915b12d..025b17d19ae9 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -22,12 +22,12 @@
buildPythonPackage rec {
pname = "pikepdf";
- version = "1.1.0";
+ version = "1.6.2";
disabled = ! isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "14b36r6h3088z2sxp2pqvm171js53hz53mwm1g52iadignjnp0my";
+ sha256 = "1x1b55znr0j4fib69l2h0xq0qmbf2nbxwbwd4f7y8r4sqi20239z";
};
buildInputs = [
@@ -55,8 +55,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [ defusedxml lxml ];
postPatch = ''
- substituteInPlace requirements/test.txt \
- --replace "pytest >= 3.6.0, < 4.1.0" "pytest >= 4.2.1, < 5"
+ sed -i \
+ -e 's/^pytest .*/pytest/g' \
+ -e 's/^attrs .*/attrs/g' \
+ -e 's/^hypothesis .*/hypothesis/g' \
+ requirements/test.txt
'';
preBuild = ''
@@ -70,4 +73,3 @@ buildPythonPackage rec {
maintainers = [ maintainers.kiwi ];
};
}
-
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index 76f3b0b7176b..9892d02b3922 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -1,25 +1,32 @@
{ lib
+, python
, buildPythonPackage
+, bootstrapped-pip
, fetchPypi
, mock
, scripttest
, virtualenv
, pretend
, pytest
+, setuptools
+, wheel
}:
buildPythonPackage rec {
pname = "pip";
- version = "19.1.1";
+ version = "19.2.3";
+ format = "other";
src = fetchPypi {
inherit pname version;
- sha256 = "44d3d7d3d30a1eb65c7e5ff1173cdf8f7467850605ac7cc3707b6064bddd0958";
+ sha256 = "e7a31f147974362e6c82d84b91c7f2bdf57e4d3163d3d454e6c3e71944d67135";
};
+ nativeBuildInputs = [ bootstrapped-pip ];
+
# pip detects that we already have bootstrapped_pip "installed", so we need
# to force it a little.
- installFlags = [ "--ignore-installed" ];
+ pipInstallFlags = [ "--ignore-installed" ];
checkInputs = [ mock scripttest virtualenv pretend pytest ];
# Pip wants pytest, but tests are not distributed
diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix
index 9ff1094aec13..6c8fc211ae69 100644
--- a/pkgs/development/python-modules/pivy/default.nix
+++ b/pkgs/development/python-modules/pivy/default.nix
@@ -28,6 +28,9 @@ buildPythonPackage rec {
"-I${pkgs.qt5.qtbase.dev}/include/QtWidgets"
];
+ dontUseQmakeConfigure = true;
+ dontUseCmakeConfigure = true;
+
doCheck = false;
postPatch = ''
@@ -39,6 +42,7 @@ buildPythonPackage rec {
homepage = http://pivy.coin3d.org/;
description = "A Python binding for Coin";
license = licenses.bsd0;
+ maintainers = with maintainers; [ gebner ];
};
}
diff --git a/pkgs/development/python-modules/plyplus/default.nix b/pkgs/development/python-modules/plyplus/default.nix
index 2b18d114f3f6..41327c6fc486 100644
--- a/pkgs/development/python-modules/plyplus/default.nix
+++ b/pkgs/development/python-modules/plyplus/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ ply ];
- disabled = isPy3k;
+ doCheck = !isPy3k;
meta = {
homepage = https://github.com/erezsh/plyplus;
diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix
index b35c9de19dcc..f8db636520fb 100644
--- a/pkgs/development/python-modules/powerline/default.nix
+++ b/pkgs/development/python-modules/powerline/default.nix
@@ -11,11 +11,10 @@
buildPythonPackage rec {
version = "2.7";
pname = "powerline";
- name = pname + "-" + version;
src = fetchurl {
url = "https://github.com/powerline/powerline/archive/${version}.tar.gz";
- name = "${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
sha256 = "1h1j2rfphvfdq6mmfyn5bql45hzrwxkhpc2jcwf0vrl3slzkl5s5";
};
diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix
index 69dce2723ebb..d5ff4b04c595 100644
--- a/pkgs/development/python-modules/protobuf/default.nix
+++ b/pkgs/development/python-modules/protobuf/default.nix
@@ -4,7 +4,7 @@
with stdenv.lib;
-buildPythonPackage rec {
+buildPythonPackage {
inherit (protobuf) name src version;
inherit disabled doCheck;
@@ -59,6 +59,7 @@ buildPythonPackage rec {
meta = {
description = "Protocol Buffers are Google's data interchange format";
homepage = https://developers.google.com/protocol-buffers/;
+ license = licenses.bsd3;
};
passthru.protobuf = protobuf;
diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix
index 02429f589cfc..f1118325610c 100644
--- a/pkgs/development/python-modules/ptable/default.nix
+++ b/pkgs/development/python-modules/ptable/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, nose }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "ptable";
version = "unstable-2019-06-14";
diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix
index ece893874939..fbaa1cfad710 100644
--- a/pkgs/development/python-modules/purepng/default.nix
+++ b/pkgs/development/python-modules/purepng/default.nix
@@ -7,7 +7,7 @@
, numpy ? null
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "purepng";
version = "0.2.0";
diff --git a/pkgs/development/python-modules/purl/default.nix b/pkgs/development/python-modules/purl/default.nix
new file mode 100644
index 000000000000..43fd5b71ca6c
--- /dev/null
+++ b/pkgs/development/python-modules/purl/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, nose
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "purl";
+ version = "1.5";
+
+ src = fetchFromGitHub {
+ owner = "codeinthehole";
+ repo = "purl";
+ rev = version;
+ sha256 = "0vi7xdm2xc1rbqrz5jwpr7x7dnkcrbjf1mb4w1q2c2f8jca0kk0g";
+ };
+
+ propagatedBuildInputs = [ six ];
+
+ checkInputs = [ nose ];
+
+ meta = with lib; {
+ description = "Immutable URL class for easy URL-building and manipulation";
+ homepage = "https://github.com/codeinthehole/purl";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix
index 91af07b49be3..cdd6011aba2e 100644
--- a/pkgs/development/python-modules/pvlib/default.nix
+++ b/pkgs/development/python-modules/pvlib/default.nix
@@ -1,27 +1,26 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, pandas, pytz, six
-, pytest, mock, pytest-mock }:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, numpy, pandas, pytz, six
+, pytest, mock, pytest-mock, requests }:
buildPythonPackage rec {
pname = "pvlib";
- version = "0.6.1";
+ version = "0.6.3";
- # Use GitHub because PyPI release tarball doesn't contain the tests. See:
- # https://github.com/pvlib/pvlib-python/issues/473
- src = fetchFromGitHub{
- owner = "pvlib";
- repo = "pvlib-python";
- rev = "v${version}";
- sha256 = "17h7vz9s829qxnl4byr8458gzgiismrbrn5gl0klhfhwvc5kkdfh";
+ # Support for Python <3.5 dropped in 0.6.3 on June 1, 2019.
+ disabled = pythonOlder "3.5";
+
+ src = fetchPypi{
+ inherit pname version;
+ sha256 = "03nvgpmnscd7rh9jwm2h579zvriq5lva6rsdhb6jckpra5wjkn69";
};
checkInputs = [ pytest mock pytest-mock ];
- propagatedBuildInputs = [ numpy pandas pytz six ];
+ propagatedBuildInputs = [ numpy pandas pytz six requests ];
# Skip a few tests that try to access some URLs
checkPhase = ''
runHook preCheck
pushd pvlib/test
- pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata"
+ pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata and not test_get_psm3"
popd
runHook postCheck
'';
diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix
index 20d3eb31b0f7..9c5ada22b146 100644
--- a/pkgs/development/python-modules/py/default.nix
+++ b/pkgs/development/python-modules/py/default.nix
@@ -1,17 +1,22 @@
{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm }:
+
buildPythonPackage rec {
pname = "py";
- version = "1.7.0";
+ version = "1.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "bf92637198836372b520efcba9e020c330123be8ce527e535d185ed4b6f45694";
+ sha256 = "0lsy1gajva083pzc7csj1cvbmminb7b4l6a0prdzyb3fd829nqyw";
};
# Circular dependency on pytest
doCheck = false;
- buildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ setuptools_scm ];
+
+ pythonImportsCheck = [
+ "py"
+ ];
meta = with stdenv.lib; {
description = "Library with cross-python path, ini-parsing, io, code, log facilities";
diff --git a/pkgs/development/python-modules/pyaudio/default.nix b/pkgs/development/python-modules/pyaudio/default.nix
index 2f788966718c..62fec908a4d3 100644
--- a/pkgs/development/python-modules/pyaudio/default.nix
+++ b/pkgs/development/python-modules/pyaudio/default.nix
@@ -6,20 +6,20 @@
}:
buildPythonPackage rec {
- pname = "python-pyaudio";
- version = "0.2.9";
+ pname = "PyAudio";
+ version = "0.2.11";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "bfd694272b3d1efc51726d0c27650b3c3ba1345f7f8fdada7e86c9751ce0f2a1";
+ sha256 = "93bfde30e0b64e63a46f2fd77e85c41fd51182a4a3413d9edfaf9ffaa26efb74";
};
buildInputs = [ pkgs.portaudio ];
meta = with stdenv.lib; {
description = "Python bindings for PortAudio";
- homepage = "http://people.csail.mit.edu/hubert/pyaudio/";
+ homepage = https://people.csail.mit.edu/hubert/pyaudio/;
license = licenses.mit;
};
diff --git a/pkgs/development/python-modules/pybfd/default.nix b/pkgs/development/python-modules/pybfd/default.nix
index 8f074943dd32..f9737b935833 100644
--- a/pkgs/development/python-modules/pybfd/default.nix
+++ b/pkgs/development/python-modules/pybfd/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, buildPythonPackage, isPyPy, isPy3k, libbfd, libopcodes }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pybfd";
version = "-0.1.1.2017-12-31";
diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix
new file mode 100644
index 000000000000..8779ad36ca2a
--- /dev/null
+++ b/pkgs/development/python-modules/pybids/default.nix
@@ -0,0 +1,49 @@
+{ buildPythonPackage
+, lib
+, fetchPypi
+, isPy27
+, num2words
+, numpy
+, scipy
+, pandas
+, nibabel
+, patsy
+, bids-validator
+, sqlalchemy
+, pytest
+, pathlib
+}:
+
+buildPythonPackage rec {
+ version = "0.9.2";
+ pname = "pybids";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "16c0v800yklp043prbrx1357vx1mq5gddxz5zqlcnf4akhzcqrxs";
+ };
+
+ propagatedBuildInputs = [
+ num2words
+ numpy
+ scipy
+ pandas
+ nibabel
+ patsy
+ bids-validator
+ sqlalchemy
+ ];
+
+ checkInputs = [ pytest ] ++ lib.optionals isPy27 [ pathlib ];
+
+ checkPhase = ''
+ pytest
+ '';
+
+ meta = with lib; {
+ description = "Python tools for querying and manipulating BIDS datasets";
+ homepage = https://github.com/bids-standard/pybids;
+ license = licenses.mit;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix
index f49c50185db7..37e55617023c 100644
--- a/pkgs/development/python-modules/pybind11/default.nix
+++ b/pkgs/development/python-modules/pybind11/default.nix
@@ -1,12 +1,24 @@
-{ lib, buildPythonPackage, fetchPypi, fetchpatch }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, python
+, pytest
+, cmake
+, numpy ? null
+, eigen ? null
+, scipy ? null
+}:
buildPythonPackage rec {
pname = "pybind11";
- version = "2.2.4";
+ version = "2.3.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "1kz1z2cg3q901q9spkdhksmcfiskaghzmbb9ivr5mva856yvnak4";
+ src = fetchFromGitHub {
+ owner = "pybind";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "11b6dniri8m05spfd2a19irz82shf4sdca73566bniggrf3zclnf";
};
patches = [
@@ -14,10 +26,23 @@ buildPythonPackage rec {
url = https://github.com/pybind/pybind11/commit/44a40dd61e5178985cfb1150cf05e6bfcec73042.patch;
sha256 = "047nzyfsihswdva96hwchnp4gj2mlbiqvmkdnhxrfi9sji8x31ka";
})
+ (fetchpatch {
+ name = "pytest-4-excinfo-fix.patch";
+ url = https://github.com/pybind/pybind11/commit/9fd4712121fdbb6202a35be4c788525e6c8ab826.patch;
+ sha256 = "07jjv8jlbszvr2grpm5xqxjac7jb0y68lgb1jcbb93k9vyp1hr33";
+ })
];
- # Current PyPi version does not include test suite
- doCheck = false;
+ dontUseCmakeConfigure = true;
+
+ checkInputs = [ pytest cmake ]
+ ++ (lib.optional (numpy != null) numpy)
+ ++ (lib.optional (eigen != null) eigen)
+ ++ (lib.optional (scipy != null) scipy);
+ checkPhase = ''
+ cmake ${if eigen != null then "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" else ""}
+ make -j $NIX_BUILD_CORES pytest
+ '';
meta = {
homepage = https://github.com/pybind/pybind11;
diff --git a/pkgs/development/python-modules/pyblock/default.nix b/pkgs/development/python-modules/pyblock/default.nix
index eb6de23e0eaa..4dcc34340256 100644
--- a/pkgs/development/python-modules/pyblock/default.nix
+++ b/pkgs/development/python-modules/pyblock/default.nix
@@ -5,13 +5,13 @@
}:
stdenv.mkDerivation rec {
- name = "pyblock-${version}";
+ pname = "pyblock";
version = "0.53";
md5_path = "f6d33a8362dee358517d0a9e2ebdd044";
- src = pkgs.fetchurl rec {
+ src = pkgs.fetchurl {
url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/"
- + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2";
+ + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2";
sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815";
};
diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix
index 6ceca20fdd17..47c70758e4ca 100644
--- a/pkgs/development/python-modules/pybluez/default.nix
+++ b/pkgs/development/python-modules/pybluez/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "karulis";
- repo = "${pname}";
+ repo = pname;
rev = "a0b226a61b166e170d48539778525b31e47a4731";
sha256 = "104dm5ngfhqisv1aszdlr3szcav2g3bhsgzmg4qfs09b3i5zj047";
};
diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix
index 163477a27251..b3e31a9bc788 100644
--- a/pkgs/development/python-modules/pycangjie/default.nix
+++ b/pkgs/development/python-modules/pycangjie/default.nix
@@ -4,7 +4,7 @@
let
rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3";
-in buildPythonPackage rec {
+in buildPythonPackage {
pname = "pycangjie";
version = "1.3_rev_${rev}";
format = "other";
diff --git a/pkgs/development/python-modules/pycuda/compyte.nix b/pkgs/development/python-modules/pycuda/compyte.nix
index 192d60cec46a..cfa685c1ac9c 100644
--- a/pkgs/development/python-modules/pycuda/compyte.nix
+++ b/pkgs/development/python-modules/pycuda/compyte.nix
@@ -2,10 +2,9 @@
, fetchFromGitHub
}:
-mkDerivation rec {
+mkDerivation {
pname = "compyte";
version = "git-20150817";
- name = pname + "-" + version;
src = fetchFromGitHub {
owner = "inducer";
diff --git a/pkgs/development/python-modules/pycurl2/default.nix b/pkgs/development/python-modules/pycurl2/default.nix
index 9b04f2b6fcb4..01428d41b7d2 100644
--- a/pkgs/development/python-modules/pycurl2/default.nix
+++ b/pkgs/development/python-modules/pycurl2/default.nix
@@ -8,7 +8,7 @@
, pkgs
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pycurl2";
version = "7.20.0";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/pyev/default.nix b/pkgs/development/python-modules/pyev/default.nix
index e393265ae37f..b5ca0c7ef6cf 100644
--- a/pkgs/development/python-modules/pyev/default.nix
+++ b/pkgs/development/python-modules/pyev/default.nix
@@ -3,10 +3,9 @@
buildPythonPackage rec {
pname = "pyev";
version = "0.9.0";
- name = pname + "-" + version;
src = fetchurl {
- url = "mirror://pypi/p/pyev/${name}.tar.gz";
+ url = "mirror://pypi/p/pyev/${pname}-${version}.tar.gz";
sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx";
};
diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix
index 31a188ed1720..2e4c639465b4 100644
--- a/pkgs/development/python-modules/pyext/default.nix
+++ b/pkgs/development/python-modules/pyext/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pyext";
version = "0.8";
diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix
index 1abf04079880..b9e15d376b5b 100644
--- a/pkgs/development/python-modules/pyfantom/default.nix
+++ b/pkgs/development/python-modules/pyfantom/default.nix
@@ -3,7 +3,7 @@
, fetchgit
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pyfantom";
version = "unstable-2013-12-18";
diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix
index 2b20ba956009..bf92f7360ddb 100644
--- a/pkgs/development/python-modules/pyftgl/default.nix
+++ b/pkgs/development/python-modules/pyftgl/default.nix
@@ -12,11 +12,10 @@ in
buildPythonPackage rec {
pname = "pyftgl";
version = "0.4b";
- name = pname + "-" + version;
src = fetchFromGitHub {
owner = "umlaeute";
- repo = name;
+ repo = "${pname}-${version}";
rev = version;
sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r";
};
diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix
index 507310b4c51e..c7dfdef4be48 100644
--- a/pkgs/development/python-modules/pygmo/default.nix
+++ b/pkgs/development/python-modules/pygmo/default.nix
@@ -27,7 +27,7 @@ let
'';
});
-in buildPythonPackage rec {
+in buildPythonPackage {
pname = "pygmo";
version = pagmo2WithPython.version;
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index 4826db3a8c02..d685e3541f94 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -4,10 +4,9 @@ buildPythonPackage rec {
pname = "pygobject";
version = "2.28.6";
format = "other";
- name = pname + "-" + version;
src = fetchurl {
- url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz";
+ url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz";
sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
};
@@ -31,7 +30,7 @@ buildPythonPackage rec {
# used to select a specific version, in our setup it should have no
# effect, but we leave it in case somebody expects and calls it.
postInstall = ''
- mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${name}.pth}
+ mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth}
# Prevent wrapping of codegen files as these are meant to be
# executed by the python program
diff --git a/pkgs/development/python-modules/pygreat/default.nix b/pkgs/development/python-modules/pygreat/default.nix
index 97401f2eb166..103e215f047b 100644
--- a/pkgs/development/python-modules/pygreat/default.nix
+++ b/pkgs/development/python-modules/pygreat/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pygreat";
version = "2019.5.1.dev0";
diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index c6f939d319ab..09ccb5c3d95f 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
'';
meta = with stdenv.lib; {
- description = "GTK+-2 bindings";
+ description = "GTK 2 Python bindings";
homepage = "https://gitlab.gnome.org/Archive/pygtk";
platforms = platforms.all;
license = with licenses; [ lgpl21Plus ];
diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix
index a03be0ac04df..947b5733a7e5 100644
--- a/pkgs/development/python-modules/pygtksourceview/default.nix
+++ b/pkgs/development/python-modules/pygtksourceview/default.nix
@@ -4,7 +4,6 @@ buildPythonPackage rec {
pname = "pygtksourceview";
format = "other";
version = "2.10.1";
- name = pname + "-" + version;
src = fetchurl {
url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2";
diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/pkgs/development/python-modules/pyinputevent/default.nix
index 153b5701b267..90d13ae07877 100644
--- a/pkgs/development/python-modules/pyinputevent/default.nix
+++ b/pkgs/development/python-modules/pyinputevent/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pyinputevent";
version = "2016-10-18";
diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix
index c02c0361cf28..10bfb0d72b6f 100644
--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/pkgs/development/python-modules/pyjwt/default.nix
@@ -15,6 +15,10 @@ buildPythonPackage rec {
checkInputs = [ pytestrunner pytestcov pytest ];
+ postPatch = ''
+ substituteInPlace setup.py --replace "pytest>=4.0.1,<5.0.0" "pytest"
+ '';
+
meta = with lib; {
description = "JSON Web Token implementation in Python";
homepage = https://github.com/jpadilla/pyjwt;
diff --git a/pkgs/development/python-modules/pykde4/default.nix b/pkgs/development/python-modules/pykde4/default.nix
index 850e64000738..913453962eb5 100644
--- a/pkgs/development/python-modules/pykde4/default.nix
+++ b/pkgs/development/python-modules/pykde4/default.nix
@@ -11,15 +11,15 @@ let
sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl";
};
});
- pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: rec {
+ pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: {
propagatedBuildInputs = [ sip4_19_3 ];
});
in stdenv.mkDerivation rec {
version = "4.14.3";
- name = "pykde4-${version}";
+ pname = "pykde4";
src = fetchurl {
- url = "mirror://kde/stable/${version}/src/${name}-${version}.tar.xz";
+ url = "mirror://kde/stable/${version}/src/${pname}-${version}-${version}.tar.xz";
sha256 = "1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";
};
diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix
index 073a2e624a5f..9803e7800c37 100644
--- a/pkgs/development/python-modules/pykde4/kdelibs.nix
+++ b/pkgs/development/python-modules/pykde4/kdelibs.nix
@@ -7,9 +7,9 @@
stdenv.mkDerivation rec {
version = "4.14.38";
- name = "kdelibs-${version}";
+ pname = "kdelibs";
src = fetchurl {
- url = "mirror://kde/stable/applications/17.08.3/src/${name}.tar.xz";
+ url = "mirror://kde/stable/applications/17.08.3/src/${pname}-${version}.tar.xz";
sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
};
diff --git a/pkgs/development/python-modules/pykickstart/default.nix b/pkgs/development/python-modules/pykickstart/default.nix
index bc06a10f9732..27827270fa17 100644
--- a/pkgs/development/python-modules/pykickstart/default.nix
+++ b/pkgs/development/python-modules/pykickstart/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
version = "1.99.39";
md5_path = "d249f60aa89b1b4facd63f776925116d";
- src = fetchurl rec {
+ src = fetchurl {
url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/"
+ "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz";
sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a";
diff --git a/pkgs/development/python-modules/pylev/default.nix b/pkgs/development/python-modules/pylev/default.nix
index 895171ff7138..f198d214172d 100644
--- a/pkgs/development/python-modules/pylev/default.nix
+++ b/pkgs/development/python-modules/pylev/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pylev";
version = "1.3.0";
diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix
index 97fbe28e50d7..f366f6e57f60 100644
--- a/pkgs/development/python-modules/pylibacl/default.nix
+++ b/pkgs/development/python-modules/pylibacl/default.nix
@@ -7,7 +7,6 @@
buildPythonPackage rec {
pname = "pylibacl";
version = "0.5.3";
- name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix
index c088ea6a3967..96f50568f787 100644
--- a/pkgs/development/python-modules/pylint/1.9.nix
+++ b/pkgs/development/python-modules/pylint/1.9.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "pylint";
- version = "1.9.4";
+ version = "1.9.5";
src = fetchPypi {
inherit pname version;
@@ -24,6 +24,8 @@ buildPythonPackage rec {
pytest pylint/test -k "not ${lib.concatStringsSep " and not " (
[ # Broken test
"test_good_comprehension_checks"
+ # requires setuptools
+ "test_pkginfo"
# See PyCQA/pylint#2535
"test_libmodule" ] ++
# Disable broken darwin tests
diff --git a/pkgs/development/python-modules/pymaging/default.nix b/pkgs/development/python-modules/pymaging/default.nix
index 234aee8436dc..81100a8e214b 100644
--- a/pkgs/development/python-modules/pymaging/default.nix
+++ b/pkgs/development/python-modules/pymaging/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pymaging";
version = "unstable-2016-11-16";
diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix
index fb92739776da..61239f1cbe36 100644
--- a/pkgs/development/python-modules/pymaging_png/default.nix
+++ b/pkgs/development/python-modules/pymaging_png/default.nix
@@ -4,7 +4,7 @@
, pymaging
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pymaging-png";
version = "unstable-2016-11-16";
diff --git a/pkgs/development/python-modules/pymysqlsa/default.nix b/pkgs/development/python-modules/pymysqlsa/default.nix
index 0167fe00ea7c..11813d3d1bcd 100644
--- a/pkgs/development/python-modules/pymysqlsa/default.nix
+++ b/pkgs/development/python-modules/pymysqlsa/default.nix
@@ -6,11 +6,12 @@
}:
buildPythonPackage rec {
- pname = "pymysqlsa";
+ pname = "pymysql-sa";
version = "1.0";
src = fetchPypi {
- inherit pname version;
+ inherit version;
+ pname = "pymysql_sa";
sha256 = "a2676bce514a29b2d6ab418812259b0c2f7564150ac53455420a20bd7935314a";
};
diff --git a/pkgs/development/python-modules/pynac/default.nix b/pkgs/development/python-modules/pynac/default.nix
index 0839cb1aa4a1..755dda341c9d 100644
--- a/pkgs/development/python-modules/pynac/default.nix
+++ b/pkgs/development/python-modules/pynac/default.nix
@@ -3,7 +3,7 @@
, fetchurl
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pynac";
version = "0.2";
diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix
index fb2e9abe0651..1561c3c4d6de 100644
--- a/pkgs/development/python-modules/pynacl/default.nix
+++ b/pkgs/development/python-modules/pynacl/default.nix
@@ -35,6 +35,9 @@ buildPythonPackage rec {
py.test
'';
+ # https://github.com/pyca/pynacl/issues/550
+ PYTEST_ADDOPTS = "-k 'not test_wrong_types'";
+
meta = with stdenv.lib; {
maintainers = with maintainers; [ va1entin ];
description = "Python binding to the Networking and Cryptography (NaCl) library";
diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix
index 47a73c9c80af..ca606767f4d5 100644
--- a/pkgs/development/python-modules/pyocr/default.nix
+++ b/pkgs/development/python-modules/pyocr/default.nix
@@ -5,7 +5,6 @@
buildPythonPackage rec {
pname = "pyocr";
version = "0.5.3";
- name = pname + "-" + version;
disabled = !isPy3k;
# Don't fetch from PYPI because it doesn't contain tests.
diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix
index 1a477ab23284..3defe979d378 100644
--- a/pkgs/development/python-modules/pyparted/default.nix
+++ b/pkgs/development/python-modules/pyparted/default.nix
@@ -6,7 +6,7 @@
}:
buildPythonPackage rec {
- name = "pyparted-${version}";
+ pname = "pyparted";
version = "3.10.7";
disabled = isPyPy;
diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix
index 76503122a1b1..0313632e6fd1 100644
--- a/pkgs/development/python-modules/pypillowfight/default.nix
+++ b/pkgs/development/python-modules/pypillowfight/default.nix
@@ -2,7 +2,7 @@
, isPy3k, isPyPy
}:
buildPythonPackage rec {
- name = "pypillowfight-${version}";
+ pname = "pypillowfight";
version = "0.2.4";
src = fetchFromGitLab {
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 5791299bdc12..f3578459b9d0 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -6,6 +6,7 @@
, qtdeclarative
, qtwebchannel
, withConnectivity ? false, qtconnectivity
+, withMultimedia ? false, qtmultimedia
, withWebKit ? false, qtwebkit
, withWebSockets ? false, qtwebsockets
}:
@@ -50,6 +51,7 @@ in buildPythonPackage rec {
qtwebchannel
]
++ lib.optional withConnectivity qtconnectivity
+ ++ lib.optional withMultimedia qtmultimedia
++ lib.optional withWebKit qtwebkit
++ lib.optional withWebSockets qtwebsockets
;
@@ -121,6 +123,7 @@ in buildPythonPackage rec {
]
++ lib.optional withWebSockets "PyQt5.QtWebSockets"
++ lib.optional withWebKit "PyQt5.QtWebKit"
+ ++ lib.optional withMultimedia "PyQt5.QtMultimedia"
++ lib.optional withConnectivity "PyQt5.QtConnectivity"
;
imports = lib.concatMapStrings (module: "import ${module};") modules;
diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix
index 65ff765a5849..8851b0464146 100644
--- a/pkgs/development/python-modules/pyro4/default.nix
+++ b/pkgs/development/python-modules/pyro4/default.nix
@@ -13,8 +13,6 @@
}:
buildPythonPackage rec {
-
- name = "${pname}-${version}";
pname = "Pyro4";
version = "4.75";
diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix
index a2b614ba3b8c..cabb96d22565 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/pkgs/development/python-modules/pyrsistent/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pyrsistent";
- version = "0.14.11";
+ version = "0.15.2";
src = fetchPypi {
inherit pname version;
- sha256 = "3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2";
+ sha256 = "0fjwnxg7q1b02j7hk1wqm5xdn7wck9j2g3ggkkizab6l77kjws8n";
};
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix
index 280981ab2c24..d02c85fb4ffd 100644
--- a/pkgs/development/python-modules/pysc2/default.nix
+++ b/pkgs/development/python-modules/pysc2/default.nix
@@ -16,7 +16,7 @@
, sc2-headless
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "PySC2";
version = "1.2";
diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index bab8e502b9c8..06e2690c111b 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -1,5 +1,13 @@
{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, swig, pcsclite, PCSC }:
+let
+ # Package does not support configuring the pcsc library.
+ withApplePCSC = stdenv.isDarwin;
+
+ inherit (stdenv.lib) getLib getDev optionalString optionals;
+ inherit (stdenv.hostPlatform.extensions) sharedLibrary;
+in
+
buildPythonPackage rec {
version = "1.9.8";
pname = "pyscard";
@@ -9,24 +17,28 @@ buildPythonPackage rec {
sha256 = "15fh00z1an6r5j7hrz3jlq0rb3jygwf3x4jcwsa008bv8vpcg7gm";
};
- postPatch = ''
- sed -e 's!"libpcsclite\.so\.1"!"${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so.1"!' \
- -i smartcard/scard/winscarddll.c
+ postPatch = if withApplePCSC then ''
+ substituteInPlace smartcard/scard/winscarddll.c \
+ --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \
+ "${PCSC}/Library/Frameworks/PCSC.framework/PCSC"
+ '' else ''
+ substituteInPlace smartcard/scard/winscarddll.c \
+ --replace "libpcsclite.so.1" \
+ "${getLib pcsclite}/lib/libpcsclite${sharedLibrary}"
'';
- NIX_CFLAGS_COMPILE = "-isystem ${stdenv.lib.getDev pcsclite}/include/PCSC/";
+ NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC)
+ "-I ${getDev pcsclite}/include/PCSC";
- patches = [
- # Fixes darwin tests
- # See: https://github.com/LudovicRousseau/pyscard/issues/77
- (fetchpatch {
- url = "https://github.com/LudovicRousseau/pyscard/commit/62e675028086c75656444cc21d563d9f08ebf8e7.patch";
- sha256 = "1lr55npcpc8j750vf7vaisqyk18d5f00l7nii2lvawg4sssjaaf7";
- })
- ];
+ # The error message differs depending on the macOS host version.
+ # Since Nix reports a constant host version, but proxies to the
+ # underlying library, it's not possible to determine the correct
+ # expected error message. This patch allows both errors to be
+ # accepted.
+ # See: https://github.com/LudovicRousseau/pyscard/issues/77
+ patches = optionals withApplePCSC [ ./ignore-macos-bug.patch ];
- propagatedBuildInputs = [ pcsclite ];
- buildInputs = stdenv.lib.optional stdenv.isDarwin PCSC;
+ propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ];
nativeBuildInputs = [ swig ];
meta = {
diff --git a/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch b/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch
new file mode 100644
index 000000000000..62b20477c9f8
--- /dev/null
+++ b/pkgs/development/python-modules/pyscard/ignore-macos-bug.patch
@@ -0,0 +1,22 @@
+diff --git a/test/test_SCardGetErrorMessage.py b/test/test_SCardGetErrorMessage.py
+old mode 100644
+new mode 100755
+index c6fe755..c1217f5
+--- a/test/test_SCardGetErrorMessage.py
++++ b/test/test_SCardGetErrorMessage.py
+@@ -29,12 +29,10 @@ class TestError(unittest.TestCase):
+ self.assertEqual(res, expected)
+
+ res = SCardGetErrorMessage(1)
++ expected = "Unknown error: 0x00000001"
+ # macOS bug not yet fixed
+- if get_platform().startswith('macosx-') and get_platform() < 'macosx-10.13':
+- expected = "Unkown error: 0x00000001"
+- else:
+- expected = "Unknown error: 0x00000001"
+- self.assertEqual(res, expected)
++ macos_bug_expected = "Unkown error: 0x00000001"
++ self.assertIn(res, [expected, macos_bug_expected])
+
+
+ if __name__ == '__main__':
diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix
index 625eae7b74b9..2dfa1f22962e 100644
--- a/pkgs/development/python-modules/pyscss/default.nix
+++ b/pkgs/development/python-modules/pyscss/default.nix
@@ -9,7 +9,7 @@
, pythonOlder
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pyScss";
version = "1.3.5";
diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix
index 5069bbe96484..3f55a015991b 100644
--- a/pkgs/development/python-modules/pysensors/default.nix
+++ b/pkgs/development/python-modules/pysensors/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }:
-buildPythonPackage rec {
+buildPythonPackage {
version = "2017-07-13";
pname = "pysensors";
diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix
index 0950726172d5..feeeda812f98 100644
--- a/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/pkgs/development/python-modules/pyside/generatorrunner.nix
@@ -5,7 +5,7 @@ let
pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]);
pname = "pyside-generatorrunner";
version = "0.6.16";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
diff --git a/pkgs/development/python-modules/pyside2-tools/default.nix b/pkgs/development/python-modules/pyside2-tools/default.nix
index 5314a5cc7135..a96ea5d32ff8 100644
--- a/pkgs/development/python-modules/pyside2-tools/default.nix
+++ b/pkgs/development/python-modules/pyside2-tools/default.nix
@@ -1,7 +1,7 @@
{ buildPythonPackage, wrapPython, python, fetchurl, stdenv, cmake, qt5,
shiboken2, pyside2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "pyside2-tools";
inherit (pyside2) version src;
diff --git a/pkgs/development/python-modules/pysparse/default.nix b/pkgs/development/python-modules/pysparse/default.nix
index 45ff5a9b5b49..5c3a6bb26f86 100644
--- a/pkgs/development/python-modules/pysparse/default.nix
+++ b/pkgs/development/python-modules/pysparse/default.nix
@@ -8,7 +8,7 @@
, python
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pysparse";
version = "1.3-dev";
disabled = !isPy27;
diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix
index ee57c4995481..8ae01e493970 100644
--- a/pkgs/development/python-modules/pystache/default.nix
+++ b/pkgs/development/python-modules/pystache/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }:
buildPythonPackage rec {
- pname = "pystache-${version}";
+ pname = "pystache";
version = "0.5.4";
src = fetchPypi {
diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix
index 72be3227e6cb..e8146a6fc7ff 100644
--- a/pkgs/development/python-modules/pytesseract/default.nix
+++ b/pkgs/development/python-modules/pytesseract/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
patches = [
(substituteAll {
src = ./tesseract-binary.patch;
- drv = "${tesseract}";
+ drv = tesseract;
})
];
diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
index a4e0cb809aec..8f24d1dc1f68 100644
--- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
+++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "saltstack";
- repo = "${pname}";
+ repo = pname;
rev = "v${version}";
sha256 = "0z9f25d2wpf3lnqzmmnrlvl5b1f7kqwjjf4nzs9x2bpf91s5zny1";
};
diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix
index 37ba58977e15..edf0450366c5 100644
--- a/pkgs/development/python-modules/pytest-mpl/default.nix
+++ b/pkgs/development/python-modules/pytest-mpl/default.nix
@@ -26,13 +26,11 @@ buildPythonPackage rec {
pytest
];
- # disable tests on darwin, because it requires a framework build of Python
- doCheck = !stdenv.isDarwin;
-
checkPhase = ''
export HOME=$(mktemp -d)
mkdir -p $HOME/.config/matplotlib
echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc
+ ln -s $HOME/.config/matplotlib $HOME/.matplotlib
pytest
'';
diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix
new file mode 100644
index 000000000000..088f8702436f
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-random-order/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, pytest
+}:
+
+buildPythonPackage rec {
+ version = "1.0.4";
+ pname = "pytest-random-order";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "6b2159342a4c8c10855bc4fc6d65ee890fc614cb2b4ff688979b008a82a0ff52";
+ };
+
+ disabled = pythonOlder "3.5";
+
+ propagatedBuildInputs = [ pytest ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/jbasko/pytest-random-order";
+ description = "Randomise the order of tests with some control over the randomness";
+ license = licenses.mit;
+ maintainers = [ maintainers.prusnak ];
+ };
+}
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index b61bc8d5fa50..a2796fba5d8f 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked, filelock, six }:
+{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest
+, setuptools_scm, pytest-forked, filelock, six, isPy3k }:
buildPythonPackage rec {
pname = "pytest-xdist";
@@ -13,6 +14,10 @@ buildPythonPackage rec {
checkInputs = [ pytest filelock ];
propagatedBuildInputs = [ execnet pytest-forked six ];
+ # Encountered a memory leak
+ # https://github.com/pytest-dev/pytest-xdist/issues/462
+ doCheck = !isPy3k;
+
checkPhase = ''
# Excluded tests access file system
py.test testing -k "not test_distribution_rsyncdirs_example \
diff --git a/pkgs/development/python-modules/pytest/3.10.nix b/pkgs/development/python-modules/pytest/2.nix
similarity index 76%
rename from pkgs/development/python-modules/pytest/3.10.nix
rename to pkgs/development/python-modules/pytest/2.nix
index 2b4dd41bc2ec..7a43a2e2517b 100644
--- a/pkgs/development/python-modules/pytest/3.10.nix
+++ b/pkgs/development/python-modules/pytest/2.nix
@@ -1,9 +1,9 @@
{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
-, atomicwrites, mock, writeText, pathlib2
+, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy
}:
buildPythonPackage rec {
- version = "3.10.1";
+ version = "4.6.5";
pname = "pytest";
preCheck = ''
@@ -13,18 +13,19 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "e246cf173c01169b9617fc07264b7b1316e78d7a650055235d6d897bc80d9660";
+ sha256 = "8fc39199bdda3d9d025d3b1f4eb99a192c20828030ea7c9a0d2840721de7d347";
};
checkInputs = [ hypothesis mock ];
buildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites]
+ propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ]
++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
+ doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
checkPhase = ''
runHook preCheck
- $out/bin/py.test -x testing/ -k "not test_raises_exception_looks_iterable" --ignore testing/test_assertion.py --ignore testing/test_config.py
+ $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths"
runHook postCheck
'';
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 96001a2d952e..506b560e01ae 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,9 +1,9 @@
{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
-, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy
+, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy, python
}:
buildPythonPackage rec {
- version = "4.6.3";
+ version = "5.1.0";
pname = "pytest";
preCheck = ''
@@ -13,19 +13,21 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "4a784f1d4f2ef198fe9b7aef793e9fa1a3b2f84e822d9b3a64a181293a572d45";
+ sha256 = "3805d095f1ea279b9870c3eeae5dddf8a81b10952c8835cd628cf1875b0ef031";
};
checkInputs = [ hypothesis mock ];
- buildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ]
++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
+
+ # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929
checkPhase = ''
runHook preCheck
- $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths"
+ $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py
runHook postCheck
'';
@@ -34,15 +36,17 @@ buildPythonPackage rec {
pytestcachePhase() {
find $out -name .pytest_cache -type d -exec rm -rf {} +
}
-
preDistPhases+=" pytestcachePhase"
'';
+ pythonImportsCheck = [
+ "pytest"
+ ];
+
meta = with stdenv.lib; {
homepage = https://docs.pytest.org;
description = "Framework for writing tests";
maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
license = licenses.mit;
- platforms = platforms.unix;
};
}
diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix
index 47e269c2ff50..beb57ac491af 100644
--- a/pkgs/development/python-modules/python-efl/default.nix
+++ b/pkgs/development/python-modules/python-efl/default.nix
@@ -3,11 +3,11 @@
# Should be bumped along with EFL!
buildPythonPackage rec {
- name = "python-efl-${version}";
+ pname = "python-efl";
version = "1.22.0";
src = fetchurl {
- url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
+ url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz";
sha256 = "1qhy63c3fs2bxkx2np5z14hyxbr12ii030crsjnhpbyw3mic0s63";
};
diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index 4eb2daaf26dc..a9377c4a1c21 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -25,6 +25,9 @@ buildPythonPackage rec {
py.test
'';
+ # https://github.com/mpdavis/python-jose/issues/149
+ PYTEST_ADDOPTS = "-k 'not test_invalid_claims_json and not test_invalid_claims'";
+
propagatedBuildInputs = [ future six ecdsa rsa ];
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix
index c7709c4886d9..e967ba9934d2 100644
--- a/pkgs/development/python-modules/python-lz4/default.nix
+++ b/pkgs/development/python-modules/python-lz4/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "python-lz4";
- version = "2.1.6";
+ version = "2.1.10";
# get full repository inorder to run tests
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1gx228946c2w645sh190m7ixfd0zfkdl3i8ybga77jz2sn1chzdi";
+ sha256 = "02cadqfdmw4vc94px18dh4hcybpsa2lr6jz6j5phwc0jjaavh3wr";
};
buildInputs = [ setuptools_scm pkgconfig pytestrunner ];
diff --git a/pkgs/development/python-modules/python-pipedrive/default.nix b/pkgs/development/python-modules/python-pipedrive/default.nix
new file mode 100644
index 000000000000..e21f01d5cd6b
--- /dev/null
+++ b/pkgs/development/python-modules/python-pipedrive/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, python
+, httplib2
+}:
+
+buildPythonPackage rec {
+ pname = "python-pipedrive";
+ version = "0.4.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0f8qiyl82bpwxwjw2746vdvkps2010mvn1x9b6j6ppmifff2d4pl";
+ };
+
+ propagatedBuildInputs = [ httplib2 ];
+
+ doCheck = false; # Tests are not provided.
+
+ meta = with stdenv.lib; {
+ description = "Python library for interacting with the pipedrive.com API";
+ homepage = "https://github.com/jscott1989/python-pipedrive";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ mrmebelman ];
+ };
+}
diff --git a/pkgs/development/python-modules/python-unshare/default.nix b/pkgs/development/python-modules/python-unshare/default.nix
index e6425c300478..a7f0bd93b0af 100644
--- a/pkgs/development/python-modules/python-unshare/default.nix
+++ b/pkgs/development/python-modules/python-unshare/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "python-unshare";
# pypi version doesn't support Python 3 and the package didn't update for a long time:
# https://github.com/TheTincho/python-unshare/pull/8
diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix
index 93fa36fa2fcf..8a160da29648 100644
--- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix
+++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix
@@ -7,7 +7,7 @@
, stdenv
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "python-xmp-toolkit";
version = "2.0.2";
diff --git a/pkgs/development/python-modules/python3pika/default.nix b/pkgs/development/python-modules/python3pika/default.nix
deleted file mode 100644
index 4f75acff02ec..000000000000
--- a/pkgs/development/python-modules/python3pika/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, nose
-, mock
-, pyyaml
-, unittest2
-}:
-
-buildPythonPackage rec {
- pname = "python3-pika";
- version = "0.9.14";
- disabled = !isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1c3hifwvn04kvlja88iawf0awyz726jynwnpcb6gn7376b4nfch7";
- };
-
- # Unit tests adds dependencies on pyev, tornado and twisted (and twisted is disabled for Python 3)
- doCheck = false;
-
- buildInputs = [ nose mock pyyaml ];
- propagatedBuildInputs = [ unittest2 ];
-
- meta = with stdenv.lib; {
- homepage = https://pika.readthedocs.org/;
- description = "Pika Python AMQP Client Library";
- license = licenses.gpl2;
- };
-
-}
diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix
index 1ff1f6512645..24f56ae53b24 100644
--- a/pkgs/development/python-modules/python_fedora/default.nix
+++ b/pkgs/development/python-modules/python_fedora/default.nix
@@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "python-fedora";
version = "0.10.0";
- name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix
new file mode 100644
index 000000000000..a7fbf3012951
--- /dev/null
+++ b/pkgs/development/python-modules/pyvmomi/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchFromGitHub, requests }:
+
+buildPythonPackage rec {
+ pname = "pyvmomi";
+ version = "6.7.1.2018.12";
+
+ src = fetchFromGitHub {
+ owner = "vmware";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1pgl95rbghidbyr8hndjzfzgb1yjchfcknlqgg3qbqvljnz9hfja";
+ };
+
+ # requires old version of vcrpy
+ doCheck = false;
+
+ propagatedBuildInputs = [ requests ];
+
+ meta = with lib; {
+ description = "Python SDK for the VMware vSphere API that allows you to manage ESX, ESXi, and vCenter";
+ homepage = "https://github.com/vmware/pyvmomi";
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/development/python-modules/pywebkitgtk/default.nix b/pkgs/development/python-modules/pywebkitgtk/default.nix
index 5448f5c6951d..c76f1f470773 100644
--- a/pkgs/development/python-modules/pywebkitgtk/default.nix
+++ b/pkgs/development/python-modules/pywebkitgtk/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
homepage = "https://code.google.com/p/pywebkitgtk/";
- description = "Python bindings for the WebKit GTK+ port";
+ description = "Python bindings for the WebKit GTK port";
license = licenses.lgpl2Plus;
};
diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix
index f667e09892c1..7a137f5204ce 100644
--- a/pkgs/development/python-modules/pyxattr/default.nix
+++ b/pkgs/development/python-modules/pyxattr/default.nix
@@ -7,7 +7,6 @@
buildPythonPackage rec {
pname = "pyxattr";
version = "0.6.1";
- name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix
index 8a49e8418fd0..00f15f801d16 100644
--- a/pkgs/development/python-modules/qasm2image/default.nix
+++ b/pkgs/development/python-modules/qasm2image/default.nix
@@ -11,7 +11,7 @@
, pythonOlder
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "qasm2image";
version = "0.8.0";
diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix
index 987c1ca90490..e8076db60534 100644
--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix
@@ -5,7 +5,7 @@
, qtbase
}:
with pythonPackages;
-buildPythonPackage rec {
+buildPythonPackage {
pname = "qscintilla";
version = qscintilla.version;
src = qscintilla.src;
diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/pkgs/development/python-modules/qscintilla/default.nix
index 91c2009744f7..e44f6205d39f 100644
--- a/pkgs/development/python-modules/qscintilla/default.nix
+++ b/pkgs/development/python-modules/qscintilla/default.nix
@@ -9,9 +9,9 @@
}:
disabledIf (isPy3k || isPyPy)
- (buildPythonPackage rec {
+ (buildPythonPackage {
# TODO: Qt5 support
- name = "qscintilla-${version}";
+ pname = "qscintilla";
version = pkgs.qscintilla.version;
format = "other";
diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix
index 4d80a4075646..08d4a8f36a34 100644
--- a/pkgs/development/python-modules/radicale_infcloud/default.nix
+++ b/pkgs/development/python-modules/radicale_infcloud/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildPythonPackage }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "radicale_infcloud";
version = "2017-07-27";
diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix
index 83edfa4f1d27..a2da451905a1 100644
--- a/pkgs/development/python-modules/rarfile/default.nix
+++ b/pkgs/development/python-modules/rarfile/default.nix
@@ -6,7 +6,7 @@
assert useUnrar -> unrar != null;
assert !useUnrar -> libarchive != null;
-buildPythonPackage rec {
+buildPythonPackage {
pname = "rarfile";
version = "3.0";
diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix
index e394b9646430..2bd421729178 100644
--- a/pkgs/development/python-modules/rbtools/default.nix
+++ b/pkgs/development/python-modules/rbtools/default.nix
@@ -6,7 +6,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "rbtools";
version = "0.7.2";
disabled = isPy3k;
diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix
index aaa095c53980..c49f891ec1de 100644
--- a/pkgs/development/python-modules/recursive-pth-loader/default.nix
+++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix
@@ -1,9 +1,8 @@
{ stdenv, python }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "python-recursive-pth-loader";
version = "1.0";
- name = pname + "-" + version;
dontUnpack = true;
diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix
index ac041d664ae4..46f562ee5d6d 100644
--- a/pkgs/development/python-modules/rencode/default.nix
+++ b/pkgs/development/python-modules/rencode/default.nix
@@ -5,7 +5,7 @@
, cython
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "rencode";
version = "git20150810";
disabled = isPy33;
diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix
index 3ea1bf58d8af..9728639e0ef7 100644
--- a/pkgs/development/python-modules/requests-mock/default.nix
+++ b/pkgs/development/python-modules/requests-mock/default.nix
@@ -1,21 +1,33 @@
-{ buildPythonPackage, fetchPypi, python
-, mock, testrepository, testtools
-, requests, six }:
+{ lib, buildPythonPackage, fetchPypi, python
+, mock
+, purl
+, requests
+, six
+, testrepository
+, testtools
+}:
buildPythonPackage rec {
pname = "requests-mock";
- version = "1.5.2";
+ version = "1.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "7a5fa99db5e3a2a961b6f20ed40ee6baeff73503cf0a553cc4d679409e6170fb";
+ sha256 = "0ij6ir5cy0gpy5xw4sykxz320ndi26np6flx9yg9mimkv0nl1lw8";
};
patchPhase = ''
sed -i 's@python@${python.interpreter}@' .testr.conf
'';
- checkInputs = [ mock testrepository testtools ];
-
propagatedBuildInputs = [ requests six ];
+
+ checkInputs = [ mock purl testrepository testtools ];
+
+ meta = with lib; {
+ description = "Mock out responses from the requests package";
+ homepage = "https://requests-mock.readthedocs.io";
+ license = licenses.asl20;
+ maintainers = [ ];
+ };
}
diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix
new file mode 100644
index 000000000000..0bd7b0ca686c
--- /dev/null
+++ b/pkgs/development/python-modules/rfc6555/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildPythonPackage, fetchPypi, pythonPackages }:
+
+buildPythonPackage rec {
+ pname = "rfc6555";
+ version = "0.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "05sjrd6jc0sdvx0z7d3llk82rx366jlmc7ijam0nalsv66hbn70r";
+ };
+
+ propagatedBuildInputs = with pythonPackages; [ selectors2 ];
+
+ checkInputs = with pythonPackages; [ mock pytest ];
+ # disabling tests that require a functional DNS IPv{4,6} stack to pass.
+ patches = [ ./disable_network_tests.patch ];
+ # default doCheck = true; is not enough, apparently
+ postCheck = ''
+ py.test tests/
+ '';
+
+ meta = {
+ description = "Python implementation of the Happy Eyeballs Algorithm";
+ homepage = "https://pypi.org/project/rfc6555";
+ license = stdenv.lib.licenses.asl20;
+ maintainers = with stdenv.lib.maintainers; [ endocrimes ];
+ };
+}
diff --git a/pkgs/development/python-modules/rfc6555/disable_network_tests.patch b/pkgs/development/python-modules/rfc6555/disable_network_tests.patch
new file mode 100644
index 000000000000..dc59111ac43f
--- /dev/null
+++ b/pkgs/development/python-modules/rfc6555/disable_network_tests.patch
@@ -0,0 +1,31 @@
+diff --git a/tests/test_create_connection.py b/tests/test_create_connection.py
+index fe38026..cdb26b4 100644
+--- a/tests/test_create_connection.py
++++ b/tests/test_create_connection.py
+@@ -6,10 +6,12 @@ from .test_utils import requires_network
+
+
+ class _BasicCreateConnectionTests(object):
++
+ @requires_network
+ def test_create_connection_google(self):
+ sock = rfc6555.create_connection(('www.google.com', 80))
+
++ @requires_network
+ @pytest.mark.parametrize('timeout', [None, 5.0])
+ def test_create_connection_has_proper_timeout(self, timeout):
+ sock = rfc6555.create_connection(('www.google.com', 80), timeout=timeout)
+diff --git a/tests/test_ipv6.py b/tests/test_ipv6.py
+index 3ee8564..f0db28e 100644
+--- a/tests/test_ipv6.py
++++ b/tests/test_ipv6.py
+@@ -2,7 +2,9 @@ import socket
+ import mock
+ import rfc6555
+
++from .test_utils import requires_network
+
++@requires_network
+ def test_ipv6_available():
+ assert rfc6555._detect_ipv6()
+
diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix
index 1a40f61cc50e..577c21d6e0b4 100644
--- a/pkgs/development/python-modules/rhpl/default.nix
+++ b/pkgs/development/python-modules/rhpl/default.nix
@@ -1,6 +1,6 @@
{buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "rhpl";
version = "0.218";
format = "other";
diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix
index 8bac32ba9112..4db1db04acce 100644
--- a/pkgs/development/python-modules/robotframework-ride/default.nix
+++ b/pkgs/development/python-modules/robotframework-ride/default.nix
@@ -4,10 +4,9 @@ buildPythonPackage rec {
version = "1.2.3";
pname = "robotframework-ride";
disabled = isPy3k;
- name = pname + "-" + version;
src = fetchurl {
- url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz";
+ url = "https://robotframework-ride.googlecode.com/files/${pname}-${version}.tar.gz";
sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j";
};
diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
index d0e5b13ddbe8..b5ca464938b6 100644
--- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
+++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
@@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
- version = "3.3.0";
+ version = "3.4.0";
pname = "robotframework-sshlibrary";
src = fetchPypi {
inherit pname version;
- sha256 = "fc5b5db63cf63a937bd4ada1a8b7508ec8a75d9454fa75e6410cbe72fd718de9";
+ sha256 = "21fa0183776e6061366f517765db479aaa634b707f3dd9d90ef6972adae6a755";
};
# unit tests are impure
diff --git a/pkgs/development/python-modules/rpkg/default.nix b/pkgs/development/python-modules/rpkg/default.nix
index 3164be5aa86d..bbe20fd1e825 100644
--- a/pkgs/development/python-modules/rpkg/default.nix
+++ b/pkgs/development/python-modules/rpkg/default.nix
@@ -4,12 +4,11 @@
buildPythonPackage rec {
pname = "rpkg";
version = "1.50";
- name = "${pname}-${version}";
disabled = isPy3k;
src = fetchurl {
- url = "https://releases.pagure.org/rpkg/${name}.tar.gz";
+ url = "https://releases.pagure.org/rpkg/${pname}-${version}.tar.gz";
sha256 = "0j83bnm9snr3m1mabw2cvd2r7d6kcnkzyz7b9p65fhcc3c7s3rvv";
};
diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix
index 1b3b271fb61f..37222964b047 100644
--- a/pkgs/development/python-modules/ruffus/default.nix
+++ b/pkgs/development/python-modules/ruffus/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "cgat-developers";
- repo = "${pname}";
+ repo = pname;
rev = "v${version}";
sha256 = "1gyabqafq4s2sy0prh3k1m8859shzjmfxr7fimx10liflvki96a9";
};
diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix
index b5952e6ee156..8de675d4ea16 100644
--- a/pkgs/development/python-modules/samplerate/default.nix
+++ b/pkgs/development/python-modules/samplerate/default.nix
@@ -4,7 +4,7 @@
, pkgs
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "scikits.samplerate";
version = "0.3.3";
diff --git a/pkgs/development/python-modules/scandir/default.nix b/pkgs/development/python-modules/scandir/default.nix
index 2736eb2ee9a3..bc71fde5cedb 100644
--- a/pkgs/development/python-modules/scandir/default.nix
+++ b/pkgs/development/python-modules/scandir/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, python, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "scandir";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 ="1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd";
};
- checkPhase = "python test/run_tests.py";
+ checkPhase = "${python.interpreter} test/run_tests.py";
meta = with lib; {
description = "A better directory iterator and faster os.walk()";
diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix
new file mode 100644
index 000000000000..89ffe334e7ff
--- /dev/null
+++ b/pkgs/development/python-modules/scikits-odes/default.nix
@@ -0,0 +1,55 @@
+{ stdenv
+, lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchurl
+, cython
+, enum34
+, gfortran
+, isPy3k
+, numpy
+, pytest
+, python
+, scipy
+, sundials_3
+}:
+
+buildPythonPackage rec {
+ pname = "scikits.odes";
+ version = "2.4.0-9-g93075ae";
+
+ # we fetch github instead of Pypi, as we want #104 and #105, which don't apply cleanly on 2.4.0
+ src = fetchFromGitHub {
+ owner = "bmcage";
+ repo = "odes";
+ rev = "93075ae25c409f572f13ca7207fada5706f73c73";
+ sha256 = "161rab7hy6r1a9xw1zby9xhnnmxi0zwdpzxfpjkw9651xn2k5xyw";
+ };
+
+ nativeBuildInputs = [
+ gfortran
+ cython
+ ];
+
+ propagatedBuildInputs = [
+ numpy
+ sundials_3
+ scipy
+ ] ++ lib.optionals (!isPy3k) [ enum34 ];
+
+ doCheck = true;
+ checkInputs = [ pytest ];
+
+ checkPhase = ''
+ cd $out/${python.sitePackages}/scikits/odes/tests
+ pytest
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A scikit offering extra ode/dae solvers, as an extension to what is available in scipy";
+ homepage = https://github.com/bmcage/odes;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ flokli idontgetoutmuch ];
+ platforms = [ "aarch64-linux" "x86_64-linux" "x86_64-darwin" ];
+ };
+}
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index a69ab0d27a3c..934889170174 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "scipy";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "c3bb4bd2aca82fb498247deeac12265921fe231502a6bc6edea3ee7fe6c40a7a";
+ sha256 = "2643cfb46d97b7797d1dbdb6f3c23fe3402904e3c90e6facfe6a9b98d808c1b5";
};
checkInputs = [ nose pytest ];
diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix
index 079e88378c07..7bb66be3096e 100644
--- a/pkgs/development/python-modules/selectors34/default.nix
+++ b/pkgs/development/python-modules/selectors34/default.nix
@@ -6,8 +6,6 @@
}:
buildPythonPackage rec {
-
- name = "${pname}-${version}";
pname = "selectors34";
version = "1.2";
diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix
index e3c92a0e40fc..4fcc19e57fc1 100644
--- a/pkgs/development/python-modules/semantic-version/default.nix
+++ b/pkgs/development/python-modules/semantic-version/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "semantic_version";
- version = "2.6.0";
+ version = "2.8.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1h2l9xyg1zzsda6kjcmfcgycbvrafwci283vcr1v5sbk01l2hhra";
+ sha256 = "1lnnpxmf3z1rcfr5n562vbraq236s13wlj8fmw2kwr2mrq7lqb8r";
};
# ModuleNotFoundError: No module named 'tests'
diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
index 4072268609d2..3201de0ba46c 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "semver";
version = "2.8.1";
diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix
index 158d9a054df9..1f6307f2cbbf 100644
--- a/pkgs/development/python-modules/seqdiag/default.nix
+++ b/pkgs/development/python-modules/seqdiag/default.nix
@@ -5,10 +5,9 @@
buildPythonPackage rec {
pname = "seqdiag";
version = "0.9.6";
- name = pname + "-" + version;
src = fetchurl {
- url = "mirror://pypi/s/seqdiag/${name}.tar.gz";
+ url = "mirror://pypi/s/seqdiag/${pname}-${version}.tar.gz";
sha256 = "78104e7644c1a4d3a5cacb68de6a7f720793f08dd78561ef0e9e80bed63702bf";
};
diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix
index 5ea59eb6a2a3..887d0c544245 100644
--- a/pkgs/development/python-modules/serpent/default.nix
+++ b/pkgs/development/python-modules/serpent/default.nix
@@ -9,8 +9,6 @@
}:
buildPythonPackage rec {
-
- name = "${pname}-${version}";
pname = "serpent";
version = "1.27";
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index a849dad54aa9..569ff017ea9b 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -1,24 +1,29 @@
{ stdenv
+, buildPythonPackage
, fetchPypi
, python
, wrapPython
, unzip
+, callPackage
+, bootstrapped-pip
}:
-# Should use buildPythonPackage here somehow
-stdenv.mkDerivation rec {
+buildPythonPackage rec {
pname = "setuptools";
- version = "41.0.1";
- name = "${python.libPrefix}-${pname}-${version}";
+ version = "41.2.0";
+ format = "other";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "a222d126f5471598053c9a77f4b5d4f26eaa1f150ad6e01dcf1a42e185d05613";
+ sha256 = "66b86bbae7cc7ac2e867f52dc08a6bd064d938bac59dfec71b9b565dd36d6012";
};
- nativeBuildInputs = [ unzip wrapPython python.pythonForBuild ];
- doCheck = false; # requires pytest
+ # There is nothing to build
+ dontBuild = true;
+
+ nativeBuildInputs = [ bootstrapped-pip ];
+
installPhase = ''
dst=$out/${python.sitePackages}
mkdir -p $dst
@@ -27,13 +32,11 @@ stdenv.mkDerivation rec {
wrapPythonPrograms
'';
- pythonPath = [];
-
- dontPatchShebangs = true;
-
- # Python packages built through cross-compilation are always for the host platform.
- disallowedReferences = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ python.pythonForBuild ];
+ # Adds setuptools to nativeBuildInputs causing infinite recursion.
+ catchConflicts = false;
+ # Requires pytest, causing infinite recursion.
+ doCheck = false;
meta = with stdenv.lib; {
description = "Utilities to facilitate the installation of Python packages";
diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix
index a222fc9e49f8..eda016795289 100644
--- a/pkgs/development/python-modules/setuptools_scm/default.nix
+++ b/pkgs/development/python-modules/setuptools_scm/default.nix
@@ -1,19 +1,14 @@
{ stdenv, buildPythonPackage, fetchPypi, pip }:
+
buildPythonPackage rec {
pname = "setuptools_scm";
- version = "3.2.0";
+ version = "3.3.3";
src = fetchPypi {
inherit pname version;
- sha256 = "52ab47715fa0fc7d8e6cd15168d1a69ba995feb1505131c3e814eb7087b57358";
+ sha256 = "19cyndx23xmpbhz4qrwmfwsmnnaczd0dw7qg977ksq2dbvxy29dx";
};
- buildInputs = [ pip ];
-
- # Seems to fail due to chroot and would cause circular dependency
- # with pytest
- doCheck = false;
-
meta = with stdenv.lib; {
homepage = https://bitbucket.org/pypa/setuptools_scm/;
description = "Handles managing your python package versions in scm metadata";
diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix
index 82dfa3c4ea2a..9b2062dbf6c6 100644
--- a/pkgs/development/python-modules/shiboken2/default.nix
+++ b/pkgs/development/python-modules/shiboken2/default.nix
@@ -1,7 +1,7 @@
{ buildPythonPackage, python, fetchurl, stdenv, pyside2,
cmake, qt5, llvmPackages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "shiboken2";
inherit (pyside2) version src;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
cd sources/shiboken2
'';
- CLANG_INSTALL_DIR = "${llvmPackages.libclang.out}";
+ CLANG_INSTALL_DIR = llvmPackages.libclang.out;
nativeBuildInputs = [ cmake ];
buildInputs = [ llvmPackages.libclang python qt5.qtbase qt5.qtxmlpatterns ];
diff --git a/pkgs/development/python-modules/simple-websocket-server/default.nix b/pkgs/development/python-modules/simple-websocket-server/default.nix
index ee9444fd38ec..312f58bf9fa9 100644
--- a/pkgs/development/python-modules/simple-websocket-server/default.nix
+++ b/pkgs/development/python-modules/simple-websocket-server/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "simple-websocket-server";
version = "20180414";
src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/simplebayes/default.nix b/pkgs/development/python-modules/simplebayes/default.nix
index 705b75593725..57f7df73c21d 100644
--- a/pkgs/development/python-modules/simplebayes/default.nix
+++ b/pkgs/development/python-modules/simplebayes/default.nix
@@ -6,7 +6,7 @@
, isPy3k
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "simplebayes";
version = "1.5.8";
diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix
index c54997a21fe8..47df62dd1c6a 100644
--- a/pkgs/development/python-modules/sklearn-deap/default.nix
+++ b/pkgs/development/python-modules/sklearn-deap/default.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "rsteca";
repo = pname;
- rev = "${version}";
+ rev = version;
sha256 = "1yqnmy8h08i2y6bb2s0a5nx9cwvyg45293whqh420c195gpzg1x3";
};
diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix
index 71163a2f11f6..6a16b38c6e15 100644
--- a/pkgs/development/python-modules/slackclient/default.nix
+++ b/pkgs/development/python-modules/slackclient/default.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "slackapi";
repo = pname;
- rev = "${version}";
+ rev = version;
sha256 = "073fwf6fm2sqdp5ms3vm1v3ljh0pldi69k048404rp6iy3cfwkp0";
};
diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix
index 490113d6952a..8a6971ceb8f8 100644
--- a/pkgs/development/python-modules/slob/default.nix
+++ b/pkgs/development/python-modules/slob/default.nix
@@ -6,7 +6,7 @@
, python
}:
-buildPythonPackage rec {
+buildPythonPackage {
name = "slob";
verison = "unstable-2016-11-03";
disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/smugline/default.nix b/pkgs/development/python-modules/smugline/default.nix
index ac625cf1fa04..514a3005725e 100644
--- a/pkgs/development/python-modules/smugline/default.nix
+++ b/pkgs/development/python-modules/smugline/default.nix
@@ -8,7 +8,6 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "smugline";
version = "20160106";
diff --git a/pkgs/development/python-modules/smugpy/default.nix b/pkgs/development/python-modules/smugpy/default.nix
index 5eb8d77a244d..c2028228c31c 100644
--- a/pkgs/development/python-modules/smugpy/default.nix
+++ b/pkgs/development/python-modules/smugpy/default.nix
@@ -1,7 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub }:
buildPythonPackage rec {
- name = pname + "-" + version;
pname = "smugpy";
version = "20131218";
diff --git a/pkgs/development/python-modules/snappergui/default.nix b/pkgs/development/python-modules/snappergui/default.nix
index db1a75ab7f27..6b31145d519a 100644
--- a/pkgs/development/python-modules/snappergui/default.nix
+++ b/pkgs/development/python-modules/snappergui/default.nix
@@ -5,7 +5,7 @@
, dbus-python
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "Snapper-GUI";
version = "0.1";
diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix
index a97d2e82c348..18a7c2bb209f 100644
--- a/pkgs/development/python-modules/snscrape/default.nix
+++ b/pkgs/development/python-modules/snscrape/default.nix
@@ -3,6 +3,7 @@
, isPy3k
, fetchPypi
, setuptools_scm
+, setuptools
, requests
, lxml
, beautifulsoup4
@@ -26,7 +27,7 @@ buildPythonPackage rec {
'';
nativeBuildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ requests lxml beautifulsoup4 ];
+ propagatedBuildInputs = [ setuptools requests lxml beautifulsoup4 ];
meta = with lib; {
homepage = https://github.com/JustAnotherArchivist/snscrape;
diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix
index d9a67454fe6a..b091c3b7d56c 100644
--- a/pkgs/development/python-modules/spacy/models.nix
+++ b/pkgs/development/python-modules/spacy/models.nix
@@ -13,7 +13,7 @@ let
meta = with stdenv.lib; {
description = "Models for the spaCy NLP library";
homepage = "https://github.com/explosion/spacy-models";
- license = licenses."${license}";
+ license = licenses.${license};
maintainers = with maintainers; [ rvl ];
};
};
diff --git a/pkgs/development/python-modules/speedtest-cli/default.nix b/pkgs/development/python-modules/speedtest-cli/default.nix
index 36816f6133d6..3c7a1c8d8397 100644
--- a/pkgs/development/python-modules/speedtest-cli/default.nix
+++ b/pkgs/development/python-modules/speedtest-cli/default.nix
@@ -7,11 +7,11 @@
# required for home-assistant
buildPythonPackage rec {
pname = "speedtest-cli";
- version = "2.1.1";
+ version = "2.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1s3ylvkclzdsyqmpjnsd6ixrbmj7vd4bfsdplkjaz1c2czyy3j9p";
+ sha256 = "0m1fpsb318mrpliw026a7nhx8iky306rmfi565734k7r49i3h7fg";
};
# tests require working internet connection
diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix
index 3309f1e9978f..f1455f945a9f 100644
--- a/pkgs/development/python-modules/sphfile/default.nix
+++ b/pkgs/development/python-modules/sphfile/default.nix
@@ -3,10 +3,9 @@
buildPythonPackage rec {
pname = "sphfile";
version = "1.0.1";
- name = pname + "-" + version;
src = fetchurl {
- url = "mirror://pypi/s/sphfile/${name}.tar.gz";
+ url = "mirror://pypi/s/sphfile/${pname}-${version}.tar.gz";
sha256 = "422b0704107b02ef3ca10e55ccdc80b0bb5ad8e2613b6442f8e2ea372c7cf5d8";
};
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 4bea277a95b3..1e69692eac1e 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -22,6 +22,7 @@
, requests
, sphinxcontrib-websupport
, typing
+, setuptools
}:
buildPythonPackage rec {
@@ -46,6 +47,7 @@ buildPythonPackage rec {
pygments
alabaster
Babel
+ setuptools
snowballstemmer
six
sqlalchemy
diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix
index 9a414e31360b..70471aedbd76 100644
--- a/pkgs/development/python-modules/spotipy/default.nix
+++ b/pkgs/development/python-modules/spotipy/default.nix
@@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "spotipy";
version = "2.4.4";
- name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix
index 96de95655e05..eefb53dd7a60 100644
--- a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = pkgs.fetchFromGitHub {
repo = "sqlalchemy-imageattach";
owner = "dahlia";
- rev = "${version}";
+ rev = version;
sha256 = "0ba97pn5dh00qvxyjbr0mr3pilxqw5kb3a6jd4wwbsfcv6nngqig";
};
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index c7ff2e56f02b..beb19b64f5ff 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -1,41 +1,29 @@
-{ lib
-, fetchPypi
-, fetchpatch
-, buildPythonPackage
-, pytest
+{ lib, fetchPypi, buildPythonPackage, isPy3k
, mock
-, isPy3k
, pysqlite
+, pytest
}:
buildPythonPackage rec {
pname = "SQLAlchemy";
- version = "1.2.14";
+ version = "1.3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "9de7c7dabcf06319becdb7e15099c44e5e34ba7062f9ba10bc00e562f5db3d04";
+ sha256 = "1zxhabcgzspwrh9l7b68p57kqx4h664a1dp9xr8mi84r472pyzi1";
};
- patches = [
- # fix for failing doc tests
- # https://bitbucket.org/zzzeek/sqlalchemy/issues/4370/sqlite-325x-docs-tutorialrst-doctests-fail
- (fetchpatch {
- name = "doc-test-fixes.patch";
- url = https://bitbucket.org/zzzeek/sqlalchemy/commits/63279a69e2b9277df5e97ace161fa3a1bb4f29cd/raw;
- sha256 = "1x25aj5hqmgjdak4hllya0rf0srr937k1hwaxb24i9ban607hjri";
- })
- ];
-
checkInputs = [
pytest
mock
-# Disable pytest_xdist tests for now, because our version seems to be too new.
-# pytest_xdist
] ++ lib.optional (!isPy3k) pysqlite;
+ postInstall = ''
+ sed -e 's:--max-worker-restart=5::g' -i setup.cfg
+ '';
+
checkPhase = ''
- py.test -k "not test_round_trip_direct_type_affinity"
+ pytest test
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix
index 967e365dde0c..71b643e5cb58 100644
--- a/pkgs/development/python-modules/stumpy/default.nix
+++ b/pkgs/development/python-modules/stumpy/default.nix
@@ -14,7 +14,7 @@
, codecov
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "stumpy";
version = "1.0";
diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix
index 024fd136c403..eeef94e6c765 100644
--- a/pkgs/development/python-modules/subunit/default.nix
+++ b/pkgs/development/python-modules/subunit/default.nix
@@ -4,7 +4,7 @@
, testscenarios
}:
-buildPythonPackage rec {
+buildPythonPackage {
name = pkgs.subunit.name;
src = pkgs.subunit.src;
diff --git a/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/pkgs/development/python-modules/swagger-ui-bundle/default.nix
new file mode 100644
index 000000000000..9922e0819349
--- /dev/null
+++ b/pkgs/development/python-modules/swagger-ui-bundle/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchPypi, jinja2, flake8 }:
+
+buildPythonPackage rec {
+ pname = "swagger-ui-bundle";
+ version = "0.0.5";
+
+ src = fetchPypi {
+ pname = "swagger_ui_bundle";
+ inherit version;
+ sha256 = "0v69v94mzzb63ciwpz3n8jwxqcyll3fsyx087s9k9q543zdqzbh1";
+ };
+
+ # patch away unused test requirements since package contains no tests
+ postPatch = ''
+ substituteInPlace setup.py --replace "setup_requires=['pytest-runner', 'flake8']" "setup_requires=[]"
+ '';
+
+ propagatedBuildInputs = [ jinja2 ];
+
+ # package contains no tests
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "bundled swagger-ui pip package";
+ homepage = https://github.com/dtkav/swagger_ui_bundle;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ elohmeier ];
+ };
+}
diff --git a/pkgs/development/python-modules/sybase/default.nix b/pkgs/development/python-modules/sybase/default.nix
index 51c80e0fa910..7821c7b3d743 100644
--- a/pkgs/development/python-modules/sybase/default.nix
+++ b/pkgs/development/python-modules/sybase/default.nix
@@ -8,11 +8,10 @@
buildPythonPackage rec {
pname = "python-sybase";
version = "0.40pre2";
- name = pname + "-" + version;
disabled = isPy3k;
src = fetchurl {
- url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${name}/${name}.tar.gz";
+ url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "0pm88hyn18dy7ljam4mdx9qqgmgraf2zy2wl02g5vsjl4ncvq90j";
};
diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix
index ec5b3b325dd2..cbe2a2131918 100644
--- a/pkgs/development/python-modules/systemd/default.nix
+++ b/pkgs/development/python-modules/systemd/default.nix
@@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "systemd";
version = "234";
- name = pname + "-" + version;
src = fetchFromGitHub {
owner = "systemd";
diff --git a/pkgs/development/python-modules/tempita/default.nix b/pkgs/development/python-modules/tempita/default.nix
index 318c47d21608..a903aae104ef 100644
--- a/pkgs/development/python-modules/tempita/default.nix
+++ b/pkgs/development/python-modules/tempita/default.nix
@@ -1,8 +1,8 @@
{ lib, buildPythonPackage, fetchFromGitHub, nose }:
-buildPythonPackage rec {
+buildPythonPackage {
version = "0.5.3-2016-09-28";
- name = "tempita-${version}";
+ pname = "tempita";
src = fetchFromGitHub {
owner = "gjhiggins";
diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix
index 0f03adfccf5c..b585ab4f81b5 100644
--- a/pkgs/development/python-modules/tensorflow-probability/default.nix
+++ b/pkgs/development/python-modules/tensorflow-probability/default.nix
@@ -63,7 +63,7 @@ let
'';
};
};
-in buildPythonPackage rec {
+in buildPythonPackage {
inherit version pname;
format = "wheel";
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index a562ba8f2fad..e46d02989531 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -45,13 +45,13 @@ let
variant = if cudaSupport then "-gpu" else "";
pname = "tensorflow${variant}";
-in buildPythonPackage rec {
+in buildPythonPackage {
inherit pname;
inherit (packages) version;
format = "wheel";
src = let
- pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) "${python.pythonVersion}";
+ pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion;
pyver = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot;
platform = if stdenv.isDarwin then "mac" else "linux";
unit = if cudaSupport then "gpu" else "cpu";
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 899e89368436..7f6952e8fe54 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -58,10 +58,25 @@ let
variant = if cudaSupport then "-gpu" else "";
pname = "tensorflow${variant}";
- # TODO: remove after there's support for setupPyDistFlags
- setuppy = ../../../development/interpreters/python/run_setup.py;
+ pythonEnv = python.withPackages (_:
+ [ # python deps needed during wheel build time
+ numpy
+ keras-preprocessing
+ protobuf
+ wrapt
+ gast
+ astor
+ absl-py
+ termcolor
+ keras-applications
+ setuptools
+ wheel
+ ] ++ lib.optionals (!isPy3k)
+ [ future
+ mock
+ ]);
- bazel-build = buildBazelPackage rec {
+ bazel-build = buildBazelPackage {
name = "${pname}-${version}";
src = fetchFromGitHub {
@@ -96,27 +111,15 @@ let
# https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow
nativeBuildInputs = [
- swig which cython
+ swig which pythonEnv
];
buildInputs = [
- python
jemalloc
openmpi
glibcLocales
git
- # python deps needed during wheel build time
- numpy
- keras-preprocessing
- protobuf
- wrapt
- gast
- astor
- absl-py
- termcolor
- keras-applications
-
# libs taken from system through the TF_SYS_LIBS mechanism
# grpc
sqlite
@@ -133,20 +136,12 @@ let
giflib
re2
pkgs.lmdb
-
- # for building the wheel
- setuptools
- wheel
- ] ++ lib.optionals (!isPy3k) [
- future
- mock
] ++ lib.optionals cudaSupport [
cudatoolkit
cudnn
nvidia_x11
];
-
# arbitrarily set to the current latest bazel version, overly careful
TF_IGNORE_MAX_BAZEL_VERSION = true;
@@ -194,8 +189,8 @@ let
INCLUDEDIR = "${includes_joined}/include";
- PYTHON_BIN_PATH = python.interpreter;
-
+ PYTHON_BIN_PATH = pythonEnv.interpreter;
+
TF_NEED_GCP = true;
TF_NEED_HDFS = true;
TF_ENABLE_XLA = tfFeature xlaSupport;
@@ -237,6 +232,9 @@ let
export PYTHON_LIB_PATH="$NIX_BUILD_TOP/site-packages"
export CC_OPT_FLAGS="${lib.concatStringsSep " " opt_flags}"
mkdir -p "$PYTHON_LIB_PATH"
+
+ # To avoid mixing Python 2 and Python 3
+ unset PYTHONPATH
'';
configurePhase = ''
@@ -300,7 +298,7 @@ let
};
};
-in buildPythonPackage rec {
+in buildPythonPackage {
inherit version pname;
src = bazel-build.python;
@@ -313,13 +311,7 @@ in buildPythonPackage rec {
rm $out/bin/tensorboard
'';
- # TODO: remove after there's support for setupPyDistFlags
- buildPhase = ''
- runHook preBuild
- cp ${setuppy} nix_run_setup
- ${python.interpreter} nix_run_setup --project_name ${pname} bdist_wheel
- runHook postBuild
- '';
+ setupPyGlobalFlags = [ "--project_name ${pname}" ];
# tensorflow/tools/pip_package/setup.py
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix
index bebe8c3d1f8e..dbcc5935e5e2 100644
--- a/pkgs/development/python-modules/terminado/default.nix
+++ b/pkgs/development/python-modules/terminado/default.nix
@@ -16,6 +16,9 @@ buildPythonPackage rec {
propagatedBuildInputs = [ ptyprocess tornado ];
+ # test_max_terminals fails
+ doCheck = false;
+
meta = with lib; {
description = "Terminals served by Tornado websockets";
homepage = https://github.com/jupyter/terminado;
diff --git a/pkgs/development/python-modules/tess/default.nix b/pkgs/development/python-modules/tess/default.nix
index 987fbf010197..c168492be721 100644
--- a/pkgs/development/python-modules/tess/default.nix
+++ b/pkgs/development/python-modules/tess/default.nix
@@ -6,7 +6,7 @@
, scipy
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "tess";
version = "unstable-2019-05-07";
diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix
index 086218b84396..454cff5e4a87 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -1,69 +1,59 @@
-{ stdenv
-, buildPythonPackage
-, isPy27
-, fetchPypi
+{ lib, buildPythonPackage, fetchPypi, isPy27
, cachetools
-, cld2-cffi
, cytoolz
-, ftfy
-, ijson
+, jellyfish
, matplotlib
, networkx
, numpy
, pyemd
, pyphen
-, python-Levenshtein
+, pytest
, requests
, scikitlearn
, scipy
, spacy
-, tqdm
-, unidecode
+, srsly
}:
buildPythonPackage rec {
pname = "textacy";
- version = "0.6.3";
+ version = "0.9.1";
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "50402545ac92b1a931c2365e341cb35c4ebe5575525f1dcc5265901ff3895a5f";
+ sha256 = "1jhj02g6kh5vc0z4az7n547siav3gj5571bqpzdryskj6bsma2z1";
};
propagatedBuildInputs = [
cachetools
- cld2-cffi
cytoolz
- ftfy
- ijson
+ jellyfish
matplotlib
networkx
numpy
pyemd
pyphen
- python-Levenshtein
requests
scikitlearn
scipy
spacy
- tqdm
- unidecode
+ srsly
];
- postPatch = ''
- substituteInPlace setup.py \
- --replace "'ftfy>=4.2.0,<5.0.0'," "'ftfy>=5.0.0',"
+ checkInputs = [ pytest ];
+ # almost all tests have to deal with downloading a dataset, only test pure tests
+ checkPhase = ''
+ pytest tests/test_text_utils.py \
+ tests/test_utils.py \
+ tests/preprocessing \
+ tests/datasets/test_base_dataset.py
'';
- doCheck = false; # tests want to download data files
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Higher-level text processing, built on spaCy";
homepage = "http://textacy.readthedocs.io/";
license = licenses.asl20;
maintainers = with maintainers; [ rvl ];
- # ftfy and jellyfish no longer support python2
- # latest scikitlearn not supported for this: https://github.com/chartbeat-labs/textacy/issues/260
- broken = true;
};
}
diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix
index f4c498bed959..1c59b0cae6b1 100644
--- a/pkgs/development/python-modules/thespian/default.nix
+++ b/pkgs/development/python-modules/thespian/default.nix
@@ -1,13 +1,13 @@
{ fetchPypi, buildPythonPackage, lib }:
buildPythonPackage rec {
- version = "3.9.10";
+ version = "3.9.11";
pname = "thespian";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "bffb04b93afcbab0268332445f02757c326f95056eb7e1e2f0515c1dfb92ac7d";
+ sha256 = "84887f0437ec144f7266ae22678bc5dc5d2a9e60a89f1f7c1707cbea5e03022a";
};
# Do not run the test suite: it takes a long time and uses
diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix
index bd242c62ab8d..ba910f75e199 100644
--- a/pkgs/development/python-modules/tkinter/default.nix
+++ b/pkgs/development/python-modules/tkinter/default.nix
@@ -5,7 +5,7 @@
, isPyPy
}:
-buildPythonPackage rec {
+buildPythonPackage {
name = "tkinter-${python.version}";
src = py;
format = "other";
diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix
index 3a21ce57fe7a..b3d83deeac9e 100644
--- a/pkgs/development/python-modules/tld/default.nix
+++ b/pkgs/development/python-modules/tld/default.nix
@@ -10,20 +10,25 @@ python.pkgs.buildPythonPackage rec {
};
propagatedBuildInputs = with python.pkgs; [ six ];
- checkInputs = with python.pkgs; [ factory_boy faker pytest pytestcov tox ];
+ checkInputs = with python.pkgs; [ factory_boy faker pytestcov tox pytestCheckHook];
# https://github.com/barseghyanartur/tld/issues/54
- disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([
+ disabledTests = [
"test_1_update_tld_names"
"test_1_update_tld_names_command"
"test_2_update_tld_names_module"
- ]);
+ ];
- checkPhase = ''
- export PATH="$PATH:$out/bin"
- py.test -k '${disabledTests}'
+ preCheck = ''
+ export PATH="$PATH:$out/bin"
'';
+ dontUseSetuptoolsCheck = true;
+
+ pythonImportsCheck = [
+ "tld"
+ ];
+
meta = with stdenv.lib; {
homepage = https://github.com/barseghyanartur/tld;
description = "Extracts the top level domain (TLD) from the URL given";
diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix
index 848c114543d2..2a74a00539f9 100644
--- a/pkgs/development/python-modules/tlsh/default.nix
+++ b/pkgs/development/python-modules/tlsh/default.nix
@@ -4,7 +4,7 @@
, cmake
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "tlsh";
version = "3.4.5";
@@ -20,10 +20,7 @@ buildPythonPackage rec {
# no test data
doCheck = false;
- preConfigure = ''
- mkdir build
- cd build
- cmake ..
+ postConfigure = ''
cd ../py_ext
'';
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index 0915bc300c54..0413fd33f6f0 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -10,7 +10,6 @@
buildPythonPackage rec {
version = "0.2.1";
pname = "torchvision";
- name = "${pname}-${version}";
format = "wheel";
diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 47aa23ca1143..9b7dc424ddc1 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -26,9 +26,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp shamir-mnemonic ];
- # build requires UTF-8 locale
- LANG = "en_US.UTF-8";
-
checkInputs = [
pytest
];
@@ -36,7 +33,7 @@ buildPythonPackage rec {
# disable test_tx_api.py as it requires being online
checkPhase = ''
runHook preCheck
- ${python.interpreter} -m pytest --pyarg trezorlib.tests.unit_tests --ignore trezorlib/tests/unit_tests/test_tx_api.py
+ ${python.interpreter} -m pytest --pyargs trezorlib.tests.unit_tests --ignore trezorlib/tests/unit_tests/test_tx_api.py
runHook postCheck
'';
diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix
index e0c5329d23fc..17ecd369136e 100644
--- a/pkgs/development/python-modules/trezor_agent/default.nix
+++ b/pkgs/development/python-modules/trezor_agent/default.nix
@@ -8,6 +8,8 @@
, mnemonic
, keepkey
, semver
+, wheel
+, pinentry
}:
buildPythonPackage rec{
@@ -19,13 +21,13 @@ buildPythonPackage rec{
sha256 = "e82bf000c1178b1a7612f2a90487eb34c6234d2edb15dc8e310ad875d8298690";
};
- propagatedBuildInputs = [ trezor libagent ecdsa ed25519 mnemonic keepkey semver ];
+ propagatedBuildInputs = [ trezor libagent ecdsa ed25519 mnemonic keepkey semver wheel pinentry ];
meta = with stdenv.lib; {
description = "Using Trezor as hardware SSH agent";
- homepage = https://github.com/romanz/trezor-agent;
+ homepage = "https://github.com/romanz/trezor-agent";
license = licenses.gpl3;
- maintainers = with maintainers; [ np ];
+ maintainers = with maintainers; [ np mmahut ];
};
}
diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix
index bc2f8807eaa7..b0df40089928 100644
--- a/pkgs/development/python-modules/tvnamer/default.nix
+++ b/pkgs/development/python-modules/tvnamer/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
sha256 = "75e38454757c77060ad3782bd071682d6d316de86f9aec1c2042d236f93aec7b";
};
- buildInputs = [ pytest ];
+ checkInputs = [ pytest ];
propagatedBuildInputs = [ tvdb_api ];
# a ton of tests fail with: IOError: tvnamer/main.py could not be found in . or ..
diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix
index 3aeb84113c2d..ef3b1c78c399 100644
--- a/pkgs/development/python-modules/typesentry/default.nix
+++ b/pkgs/development/python-modules/typesentry/default.nix
@@ -6,7 +6,7 @@
, pytestcov
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "typesentry";
version = "0.2.7";
diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix
index 5c5ecd8949a2..51e634d2439b 100644
--- a/pkgs/development/python-modules/typing/default.nix
+++ b/pkgs/development/python-modules/typing/default.nix
@@ -5,11 +5,11 @@ let
in buildPythonPackage rec {
pname = "typing";
- version = "3.6.6";
+ version = "3.7.4";
src = fetchPypi {
inherit pname version;
- sha256 = "4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d";
+ sha256 = "1kj4kvkh89psajxlyb72rm5fr7w70yb32zkj2h174arsz325wxjk";
};
# Error for Python3.6: ImportError: cannot import name 'ann_module'
diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix
index 416c857bdc68..95c0d628697c 100644
--- a/pkgs/development/python-modules/umemcache/default.nix
+++ b/pkgs/development/python-modules/umemcache/default.nix
@@ -4,10 +4,9 @@ buildPythonPackage rec {
pname = "umemcache";
version = "1.6.3";
disabled = isPy3k;
- name = pname + "-" + version;
src = fetchurl {
- url = "mirror://pypi/u/umemcache/${name}.zip";
+ url = "mirror://pypi/u/umemcache/${pname}-${version}.zip";
sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918";
};
diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix
index 35afe10f8d24..725c73960f5d 100644
--- a/pkgs/development/python-modules/unicorn/default.nix
+++ b/pkgs/development/python-modules/unicorn/default.nix
@@ -1,7 +1,6 @@
{ stdenv, buildPackages, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
- name = "${pname}-${version}";
pname = "unicorn";
version = "1.0.1";
@@ -11,7 +10,7 @@ buildPythonPackage rec {
};
# needs python2 at build time
- PYTHON="${buildPackages.python2.interpreter}";
+ PYTHON=buildPackages.python2.interpreter;
setupPyBuildFlags = [ "--plat-name" "linux" ];
diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix
index 6835f8c48e0a..cf3d36c3e5db 100644
--- a/pkgs/development/python-modules/uritools/default.nix
+++ b/pkgs/development/python-modules/uritools/default.nix
@@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "uritools";
version = "2.2.0";
- name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix
index ffd99734f932..31e6e6a066a7 100644
--- a/pkgs/development/python-modules/urlgrabber/default.nix
+++ b/pkgs/development/python-modules/urlgrabber/default.nix
@@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "urlgrabber";
version = "4.0.0";
- name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix
index 915194459b24..b69bb62a875a 100644
--- a/pkgs/development/python-modules/urwidtrees/default.nix
+++ b/pkgs/development/python-modules/urwidtrees/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "pazz";
repo = "urwidtrees";
- rev = "${version}";
+ rev = version;
sha256 = "1n1kpidvkdnsqyb82vlvk78gmly96kh8351lqxn2pzgwwns6fml2";
};
diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix
index bcbaa0b728c3..8b397d3c42c6 100644
--- a/pkgs/development/python-modules/usbtmc/default.nix
+++ b/pkgs/development/python-modules/usbtmc/default.nix
@@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "usbtmc";
version = "0.8";
- name = pname + "-" + version;
src = fetchurl {
url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz";
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 9c3dae74a79e..2093f4d7053c 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -1,23 +1,33 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchPypi
, pyopenssl
, libuv
, psutil
, isPy27
+, CoreServices
+, ApplicationServices
}:
buildPythonPackage rec {
pname = "uvloop";
- version = "0.12.2";
+ version = "0.13.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "c48692bf4587ce281d641087658eca275a5ad3b63c78297bbded96570ae9ce8f";
+ sha256 = "0blcnrd5vky2k1m1p1skx4516dr1jx76yyb0c6fi82si6mqd0b4l";
};
- buildInputs = [ libuv ];
+ buildInputs = [
+ libuv
+ ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
+
+ postPatch = ''
+ # Removing code linting tests, which we don't care about
+ rm tests/test_sourcecode.py
+ '';
checkInputs = [ pyopenssl psutil ];
diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix
index e66e21f01a66..236e4121cf86 100644
--- a/pkgs/development/python-modules/vultr/default.nix
+++ b/pkgs/development/python-modules/vultr/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "spry-group";
repo = "python-vultr";
- rev = "${version}";
+ rev = version;
sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h";
};
diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix
index c230cd9cfa6e..6b3ca778ead1 100644
--- a/pkgs/development/python-modules/waitress-django/default.nix
+++ b/pkgs/development/python-modules/waitress-django/default.nix
@@ -1,6 +1,6 @@
{ buildPythonPackage, django_1_8, waitress }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "waitress-django";
version = "0.0.0";
diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix
index ef6089baa507..7cf69fdb614d 100644
--- a/pkgs/development/python-modules/warrant/default.nix
+++ b/pkgs/development/python-modules/warrant/default.nix
@@ -2,7 +2,7 @@
, mock
, boto3, envs, python-jose, requests }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "warrant";
version = "0.6.1";
diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix
index cbf82ca7ca3d..b3d397b97b41 100644
--- a/pkgs/development/python-modules/werkzeug/default.nix
+++ b/pkgs/development/python-modules/werkzeug/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "Werkzeug";
- version = "0.15.4";
+ version = "0.15.5";
src = fetchPypi {
inherit pname version;
- sha256 = "a0b915f0815982fb2a09161cb8f31708052d0951c3ba433ccc5e1aa276507ca6";
+ sha256 = "a13b74dd3c45f758d4ebdb224be8f1ab8ef58b3c0ffc1783a8c7d9f4f50227e6";
};
propagatedBuildInputs = [ itsdangerous ];
diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix
index d7814984060e..0ba5b19597ee 100644
--- a/pkgs/development/python-modules/wheel/default.nix
+++ b/pkgs/development/python-modules/wheel/default.nix
@@ -1,30 +1,34 @@
{ lib
+, setuptools
+, pip
, buildPythonPackage
, fetchPypi
, pytest
, pytestcov
, coverage
, jsonschema
+, bootstrapped-pip
}:
buildPythonPackage rec {
pname = "wheel";
- version = "0.33.4";
+ version = "0.33.6";
+ format = "other";
src = fetchPypi {
inherit pname version;
- sha256 = "62fcfa03d45b5b722539ccbc07b190e4bfff4bb9e3a4d470dd9f6a0981002565";
+ sha256 = "10c9da68765315ed98850f8e048347c3eb06dd81822dc2ab1d4fde9dc9702646";
};
checkInputs = [ pytest pytestcov coverage ];
+ nativeBuildInputs = [ bootstrapped-pip setuptools ];
- propagatedBuildInputs = [ jsonschema ];
-
+ catchConflicts = false;
# No tests in archive
doCheck = false;
# We add this flag to ignore the copy installed by bootstrapped-pip
- installFlags = [ "--ignore-installed" ];
+ pipInstallFlags = [ "--ignore-installed" ];
meta = {
description = "A built-package format for Python";
diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix
index d672cb8bae90..97530989a382 100644
--- a/pkgs/development/python-modules/wordfreq/default.nix
+++ b/pkgs/development/python-modules/wordfreq/default.nix
@@ -11,7 +11,7 @@
, fetchFromGitHub
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "wordfreq";
version = "2.2.0";
diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix
index 584200ff2b09..98461dfb4044 100644
--- a/pkgs/development/python-modules/wxPython/3.0.nix
+++ b/pkgs/development/python-modules/wxPython/3.0.nix
@@ -21,7 +21,6 @@ assert wxGTK.unicode;
buildPythonPackage rec {
pname = "wxPython";
version = "3.0.2.0";
- name = pname + "-" + version;
disabled = isPy3k || isPyPy;
doCheck = false;
@@ -31,6 +30,9 @@ buildPythonPackage rec {
sha256 = "0qfzx3sqx4mwxv99sfybhsij4b5pc03ricl73h4vhkzazgjjjhfm";
};
+ dontUseSetuptoolsBuild = true;
+ dontUsePipInstall = true;
+
hardeningDisable = [ "format" ];
nativeBuildInputs = [ pkgconfig ]
diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix
index c75362436e4a..81a8d05f5bf0 100644
--- a/pkgs/development/python-modules/xgboost/default.nix
+++ b/pkgs/development/python-modules/xgboost/default.nix
@@ -12,7 +12,7 @@
, datatable
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "xgboost";
inherit (xgboost) version src meta;
diff --git a/pkgs/development/python-modules/zerobin/default.nix b/pkgs/development/python-modules/zerobin/default.nix
index d1cab88b45b8..ce993d3d41a6 100644
--- a/pkgs/development/python-modules/zerobin/default.nix
+++ b/pkgs/development/python-modules/zerobin/default.nix
@@ -7,7 +7,7 @@
, clize
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "zerobin";
version = "20160108";
diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix
new file mode 100644
index 000000000000..978f8749d3b3
--- /dev/null
+++ b/pkgs/development/python-modules/zeroc-ice/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi, openssl, bzip2 }:
+
+buildPythonPackage rec {
+ pname = "zeroc-ice";
+ version = "3.7.2";
+
+ src = fetchPypi {
+ inherit version pname;
+ sha256 = "1bs7h3k9nd1gls2azgp8gz9407cslxbi2x1gspab8p87a61pjim8";
+ };
+
+ buildInputs = [ openssl bzip2 ];
+
+ meta = with stdenv.lib; {
+ homepage = https://zeroc.com/;
+ license = licenses.gpl2;
+ description = "Comprehensive RPC framework with support for Python, C++, .NET, Java, JavaScript and more.";
+ maintainers = with maintainers; [ abbradar ];
+ };
+}
diff --git a/pkgs/development/python-modules/zxcvbn/default.nix b/pkgs/development/python-modules/zxcvbn/default.nix
index 8c9a0af142cb..67f48f34731d 100644
--- a/pkgs/development/python-modules/zxcvbn/default.nix
+++ b/pkgs/development/python-modules/zxcvbn/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, pytest }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "zxcvbn";
version = "4.4.28";
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index e813e550f6e2..1616eacffc65 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -308,7 +308,7 @@ let
RcppGSL = [ pkgs.gsl_1 ];
RcppZiggurat = [ pkgs.gsl_1 ];
reprex = [ pkgs.which ];
- rgdal = [ pkgs.proj pkgs.gdal ];
+ rgdal = [ pkgs.proj.dev pkgs.gdal ];
rgeos = [ pkgs.geos ];
rggobi = [ pkgs.ggobi pkgs.gtk2.dev pkgs.libxml2.dev ];
rgl = [ pkgs.libGLU_combined pkgs.xlibsWrapper ];
@@ -420,7 +420,7 @@ let
odbc = [ pkgs.pkgconfig ];
openssl = [ pkgs.pkgconfig ];
pdftools = [ pkgs.pkgconfig ];
- sf = [ pkgs.pkgconfig ];
+ sf = [ pkgs.pkgconfig pkgs.sqlite.dev pkgs.proj.dev ];
showtext = [ pkgs.pkgconfig ];
spate = [ pkgs.pkgconfig ];
stringi = [ pkgs.pkgconfig ];
@@ -806,11 +806,11 @@ let
RAppArmor = old.RAppArmor.overrideDerivation (attrs: {
patches = [ ./patches/RAppArmor.patch ];
- LIBAPPARMOR_HOME = "${pkgs.libapparmor}";
+ LIBAPPARMOR_HOME = pkgs.libapparmor;
});
RMySQL = old.RMySQL.overrideDerivation (attrs: {
- MYSQL_DIR="${pkgs.mysql.connector-c}";
+ MYSQL_DIR=pkgs.mysql.connector-c;
preConfigure = ''
patchShebangs configure
'';
diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix
index d6a8f3ddbc66..353adbcea6ff 100644
--- a/pkgs/development/ruby-modules/bundix/default.nix
+++ b/pkgs/development/ruby-modules/bundix/default.nix
@@ -6,13 +6,13 @@ buildRubyGem rec {
name = "${gemName}-${version}";
gemName = "bundix";
- version = "2.4.2";
+ version = "2.5.0";
src = fetchFromGitHub {
- owner = "manveru";
+ owner = "nix-community";
repo = "bundix";
rev = version;
- sha256 = "03jhj1dy0ljrymjnpi6mcxn36a29qxr835l1lc11879jjzvnr2ax";
+ sha256 = "05y8sy6v9km1dwvpjzkjxpfzv95g6yzac1b5blac2f1r2kw167p8";
};
buildInputs = [ ruby bundler ];
diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index c31dfb63b3cd..0812ff590a50 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -52,7 +52,7 @@ let
name
else
let
- gem = gems."${pname}";
+ gem = gems.${pname};
version = gem.version;
in
"${pname}-${version}";
@@ -70,7 +70,7 @@ let
maybeCopyAll = pkgname: if pkgname == null then "" else
let
- mainGem = gems."${pkgname}" or (throw "bundlerEnv: gem ${pkgname} not found");
+ mainGem = gems.${pkgname} or (throw "bundlerEnv: gem ${pkgname} not found");
in
copyIfBundledByPath mainGem;
diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix
index 6324f27e9faf..a093cc4dc95c 100644
--- a/pkgs/development/ruby-modules/bundled-common/functions.nix
+++ b/pkgs/development/ruby-modules/bundled-common/functions.nix
@@ -42,21 +42,21 @@ in rec {
converge expandDependencies directlyMatchingGems;
platformMatches = {rubyEngine, version, ...}: attrs: (
- !(attrs ? "platforms") ||
+ !(attrs ? platforms) ||
builtins.length attrs.platforms == 0 ||
builtins.any (platform:
platform.engine == rubyEngine &&
- (!(platform ? "version") || platform.version == version.majMin)
+ (!(platform ? version) || platform.version == version.majMin)
) attrs.platforms
);
groupMatches = groups: attrs:
- groups == null || !(attrs ? "groups") ||
+ groups == null || !(attrs ? groups) ||
(intersectLists (groups ++ [ "default" ]) attrs.groups) != [];
applyGemConfigs = attrs:
- (if gemConfig ? "${attrs.gemName}"
- then attrs // gemConfig."${attrs.gemName}" attrs
+ (if gemConfig ? ${attrs.gemName}
+ then attrs // gemConfig.${attrs.gemName} attrs
else attrs);
genStubsScript = { lib, ruby, confFiles, bundler, groups, binPaths, ... }: ''
@@ -88,6 +88,6 @@ in rec {
inherit (attrs.source) type;
source = removeAttrs attrs.source ["type"];
gemName = name;
- gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []);
+ gemPath = map (gemName: gems.${gemName}) (attrs.dependencies or []);
});
}
diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix
index f0727b3c1704..2fa706643234 100644
--- a/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/pkgs/development/ruby-modules/bundler-app/default.nix
@@ -36,7 +36,7 @@
let
basicEnv = (callPackage ../bundled-common {}) args;
- cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" "gemset" ] // {
+ cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" "gemset" "gemdir" ] // {
inherit preferLocalBuild allowSubstitutes; # pass the defaults
buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper;
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index b3f91b678c44..9e9ccb128cf9 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -49,7 +49,7 @@ in
postBuild = genStubsScript {
inherit lib ruby bundler groups;
confFiles = basicEnv.confFiles;
- binPaths = [ basicEnv.gems."${pname}" ];
+ binPaths = [ basicEnv.gems.${pname} ];
} + lib.optionalString (postBuild != null) postBuild;
meta = { platforms = ruby.meta.platforms; } // meta;
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 4e9bd0538a9d..e9f57d2b85fb 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -19,13 +19,13 @@
{ lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
, libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
-, pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
+, pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi
, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
-, bison, flex, pango, python3, patchelf
-, libselinux ? null, libsepol ? null
+, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk
+, bundler, libsass, libselinux ? null, libsepol ? null
}@args:
let
@@ -42,8 +42,9 @@ in
{
atk = attrs: {
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk2 pcre rake ];
+ dependencies = attrs.dependencies ++ [ "gobject-introspection" ];
+ nativeBuildInputs = [ rake bundler pkgconfig ];
+ propagatedBuildInputs = [ gobject-introspection wrapGAppsHook atk ];
};
bundler = attrs:
@@ -85,6 +86,38 @@ in
buildInputs = [ protobuf ];
};
+ cocoapods-acknowledgements = attrs: {
+ dependencies = attrs.dependencies ++ [ "cocoapods" ];
+ };
+
+ cocoapods-deploy = attrs: {
+ dependencies = [ "cocoapods" ];
+ };
+
+ cocoapods-disable-podfile-validations = attrs: {
+ dependencies = [ "cocoapods" ];
+ };
+
+ cocoapods-generate = attrs: {
+ dependencies = attrs.dependencies ++ [ "cocoapods" ];
+ };
+
+ cocoapods-git_url_rewriter = attrs: {
+ dependencies = [ "cocoapods" ];
+ };
+
+ cocoapods-keys = attrs: {
+ dependencies = attrs.dependencies ++ [ "cocoapods" ];
+ };
+
+ cocoapods-open = attrs: {
+ dependencies = [ "cocoapods" ];
+ };
+
+ cocoapods-try-release-fix = attrs: {
+ dependencies = [ "cocoapods" ];
+ };
+
curb = attrs: {
buildInputs = [ curl ];
};
@@ -113,12 +146,13 @@ in
'';
};
- fog-dnsimple = attrs: {
- postInstall = ''
- cd $(cat $out/nix-support/gem-meta/install-path)
- rm {$out/bin,bin,../../bin}/{setup,console}
- '';
- };
+ fog-dnsimple = attrs:
+ lib.optionalAttrs (lib.versionOlder attrs.version "1.0.1") {
+ postInstall = ''
+ cd $(cat $out/nix-support/gem-meta/install-path)
+ rm {$out/bin,bin,../../bin}/{setup,console}
+ '';
+ };
redis-rack = attrs: {
dontBuild = false;
@@ -158,12 +192,13 @@ in
};
gdk_pixbuf2 = attrs: {
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ rake gdk-pixbuf ];
+ nativeBuildInputs = [ pkgconfig bundler rake ];
+ propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf ];
};
gpgme = attrs: {
buildInputs = [ gpgme ];
+ buildFlags = [ "--use-system-libraries" ];
};
gio2 = attrs: {
@@ -179,8 +214,14 @@ in
};
gtk2 = attrs: {
- nativeBuildInputs = [ pkgconfig ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ];
- buildInputs = [
+ nativeBuildInputs = [
+ binutils pkgconfig
+ ] ++ lib.optionals stdenv.isLinux [
+ utillinux libselinux libsepol
+ ];
+ propagatedBuildInputs = [
+ atk
+ gdk-pixbuf
fribidi
gobject-introspection
gtk2
@@ -194,15 +235,28 @@ in
};
gobject-introspection = attrs: {
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gobject-introspection gtk2 pcre ];
+ nativeBuildInputs = [ pkgconfig pcre ];
+ propagatedBuildInputs = [ gobject-introspection wrapGAppsHook glib ];
};
grpc = attrs: {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ];
hardeningDisable = [ "format" ];
- NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=implicit-fallthrough" ];
+ NIX_CFLAGS_COMPILE = [
+ "-Wno-error=stringop-overflow"
+ "-Wno-error=implicit-fallthrough"
+ "-Wno-error=sizeof-pointer-memaccess"
+ "-Wno-error=cast-function-type"
+ "-Wno-error=class-memaccess"
+ "-Wno-error=ignored-qualifiers"
+ "-Wno-error=tautological-compare"
+ ];
+ dontBuild = false;
+ postPatch = ''
+ substituteInPlace Makefile \
+ --replace '-Wno-invalid-source-encoding' ""
+ '';
};
hitimes = attrs: {
@@ -239,6 +293,10 @@ in
buildFlags = [ "--with-system-v8=true" ];
};
+ execjs = attrs: {
+ propagatedBuildInputs = [ v8 ];
+ };
+
libxml-ruby = attrs: {
buildFlags = [
"--with-xml2-lib=${libxml2.out}/lib"
@@ -333,16 +391,15 @@ in
};
pango = attrs: {
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
+ nativeBuildInputs = [
+ pkgconfig
fribidi
- gobject-introspection
- gtk2
harfbuzz
pcre
xorg.libpthreadstubs
xorg.libXdmcp
];
+ propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gtk2 ];
};
patron = attrs: {
@@ -380,7 +437,12 @@ in
"
'';
} else {
- buildInputs = [ libsodium ];
+ dontBuild = false;
+ postPatch = ''
+ substituteInPlace lib/rbnacl/sodium.rb \
+ --replace 'ffi_lib ["sodium"' \
+ 'ffi_lib ["${libsodium}/lib/libsodium${stdenv.hostPlatform.extensions.sharedLibrary}"'
+ '';
};
re2 = attrs: {
@@ -439,6 +501,12 @@ in
sassc = attrs: {
nativeBuildInputs = [ rake ];
+ dontBuild = false;
+ SASS_LIBSASS_PATH = libsass;
+ postPatch = ''
+ substituteInPlace lib/sassc/native.rb \
+ --replace 'gem_root = spec.gem_dir' 'gem_root = File.join(__dir__, "../../")'
+ '';
};
scrypt = attrs:
@@ -468,19 +536,6 @@ in
];
};
- sup = attrs: {
- dontBuild = false;
- # prevent sup from trying to dynamically install `xapian-ruby`.
- nativeBuildInputs = [ rake ];
- postPatch = ''
- cp ${./mkrf_conf_xapian.rb} ext/mkrf_conf_xapian.rb
-
- substituteInPlace lib/sup/crypto.rb \
- --replace 'which gpg2' \
- '${which}/bin/which gpg'
- '';
- };
-
rb-readline = attrs: {
dontBuild = false;
postPatch = ''
@@ -506,6 +561,7 @@ in
tiny_tds = attrs: {
nativeBuildInputs = [ pkgconfig openssl ];
+ buildInputs = [ freetds ];
};
therubyracer = attrs: {
@@ -541,13 +597,13 @@ in
xapian-ruby = attrs: {
# use the system xapian
dontBuild = false;
- nativeBuildInputs = [ rake pkgconfig ];
- buildInputs = [ xapian_1_2_22 zlib ];
+ nativeBuildInputs = [ rake pkgconfig bundler ];
+ buildInputs = [ xapian zlib ];
postPatch = ''
cp ${./xapian-Rakefile} Rakefile
'';
preInstall = ''
- export XAPIAN_CONFIG=${xapian_1_2_22}/bin/xapian-config
+ export XAPIAN_CONFIG=${xapian}/bin/xapian-config
'';
};
@@ -557,5 +613,11 @@ in
zookeeper = attrs: {
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
+ dontBuild = false;
+ postPatch = ''
+ sed -i ext/extconf.rb -e "4a \
+ FileUtils.cp '${./zookeeper-ftbfs-with-gcc-8.patch}', 'patches/zkc-3.4.5-gcc-8.patch'
+ "
+ '';
};
}
diff --git a/pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb b/pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb
deleted file mode 100644
index e19f06e23ac2..000000000000
--- a/pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'rubygems'
-require 'rubygems/command.rb'
-require 'rubygems/dependency_installer.rb'
-require 'rbconfig'
-
-begin
- Gem::Command.build_args = ARGV
-rescue NoMethodError
-end
-
-# create dummy rakefile to indicate success
-f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")
-f.write("task :default\n")
-f.close
diff --git a/pkgs/development/ruby-modules/gem-config/zookeeper-ftbfs-with-gcc-8.patch b/pkgs/development/ruby-modules/gem-config/zookeeper-ftbfs-with-gcc-8.patch
new file mode 100644
index 000000000000..badb76ccfd20
--- /dev/null
+++ b/pkgs/development/ruby-modules/gem-config/zookeeper-ftbfs-with-gcc-8.patch
@@ -0,0 +1,11 @@
+--- zkc-3.4.5/c/src/zookeeper.c 2019-09-13 12:05:20.647034862 +0200
++++ zkc-3.4.5/c/src/zookeeper.c 2019-09-13 12:05:49.125360269 +0200
+@@ -3418,7 +3418,7 @@
+
+ static const char* format_endpoint_info(const struct sockaddr_storage* ep)
+ {
+- static char buf[128];
++ static char buf[128 + 6]; // include space for the port :xxxxxx
+ char addrstr[128];
+ void *inaddr;
+ #ifdef WIN32
diff --git a/pkgs/development/ruby-modules/gem/gem-post-build.rb b/pkgs/development/ruby-modules/gem/gem-post-build.rb
index f0322b67f61f..b754f9459861 100644
--- a/pkgs/development/ruby-modules/gem/gem-post-build.rb
+++ b/pkgs/development/ruby-modules/gem/gem-post-build.rb
@@ -7,7 +7,7 @@ ruby = File.join(ENV["ruby"], "bin", RbConfig::CONFIG['ruby_install_name'])
out = ENV["out"]
bin_path = File.join(ENV["out"], "bin")
gem_home = ENV["GEM_HOME"]
-gem_path = ENV["GEM_PATH"].split(File::PATH_SEPARATOR)
+gem_path = ENV["GEM_PATH"].split(File::PATH_SEPARATOR).uniq
install_path = Dir.glob("#{gem_home}/gems/*").first
gemspec_path = ARGV[0]
diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix
index f5854a6533d1..ff9b1bac321c 100644
--- a/pkgs/development/ruby-modules/solargraph/default.nix
+++ b/pkgs/development/ruby-modules/solargraph/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerApp, bundlerUpdateScript }:
-bundlerApp rec {
+bundlerApp {
pname = "solargraph";
exes = ["solargraph" "solargraph-runtime"];
gemdir = ./.;
diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile
new file mode 100644
index 000000000000..0cd04f07b94b
--- /dev/null
+++ b/pkgs/development/ruby-modules/with-packages/Gemfile
@@ -0,0 +1,159 @@
+source 'https://rubygems.org' do
+ gem 'addressable'
+ gem 'atk'
+ gem 'awesome_print'
+ gem 'bacon'
+ # gem 'bundler' already got a package for that
+ gem 'byebug'
+ gem 'cairo'
+ gem 'cairo-gobject'
+ gem 'camping'
+ # gem 'capybara-webkit' takes too long to build right now since webkit depends on ruby
+ gem 'charlock_holmes'
+ gem 'cld3'
+ gem 'cocoapods'
+ gem 'cocoapods-acknowledgements'
+ gem 'cocoapods-art'
+ gem 'cocoapods-bin'
+ gem 'cocoapods-browser'
+ gem 'cocoapods-bugsnag'
+ gem 'cocoapods-check'
+ gem 'cocoapods-clean'
+ gem 'cocoapods-clean_build_phases_scripts'
+ gem 'cocoapods-core'
+ gem 'cocoapods-coverage'
+ gem 'cocoapods-deintegrate'
+ gem 'cocoapods-dependencies'
+ gem 'cocoapods-deploy'
+ gem 'cocoapods-downloader'
+ gem 'cocoapods-expert-difficulty'
+ gem 'cocoapods-fix-react-native'
+ gem 'cocoapods-generate'
+ gem 'cocoapods-git_url_rewriter'
+ gem 'cocoapods-keys'
+ gem 'cocoapods-no-dev-schemes'
+ gem 'cocoapods-open'
+ gem 'cocoapods-packager'
+ gem 'cocoapods-playgrounds'
+ gem 'cocoapods-plugins'
+ gem 'cocoapods-prune-localizations'
+ gem 'cocoapods-rome'
+ gem 'cocoapods-search'
+ gem 'cocoapods-sorted-search'
+ gem 'cocoapods-static-swift-framework'
+ gem 'cocoapods-stats'
+ gem 'cocoapods-tdfire-binary'
+ gem 'cocoapods-testing'
+ gem 'cocoapods-trunk'
+ gem 'cocoapods-try'
+ gem 'cocoapods-try-release-fix'
+ gem 'cocoapods-update-if-you-dare'
+ gem 'cocoapods-whitelist'
+ gem 'cocoapods-wholemodule'
+ gem 'coderay'
+ gem 'concurrent-ruby'
+ gem 'curb'
+ gem 'curses'
+ gem 'daemons'
+ gem 'dep-selector-libgecode'
+ gem 'digest-sha3'
+ gem 'domain_name'
+ gem 'do_sqlite3'
+ gem 'ethon'
+ gem 'eventmachine'
+ gem 'excon'
+ gem 'faraday'
+ gem 'ffi'
+ gem 'ffi-rzmq-core'
+ gem 'fog-dnsimple'
+ gem 'gdk_pixbuf2'
+ gem 'gio2'
+ gem 'gitlab-markup'
+ gem 'glib2'
+ # gem 'gobject-introspection' fails on require
+ gem 'gpgme'
+ # gem 'grpc' fails to build
+ gem 'gtk2'
+ gem 'hashie'
+ gem 'highline'
+ gem 'hike'
+ gem 'hitimes'
+ gem 'hpricot'
+ gem 'httpclient'
+ gem 'http-cookie'
+ gem 'iconv'
+ gem 'idn-ruby'
+ gem 'jbuilder'
+ gem 'jekyll'
+ gem 'jmespath'
+ gem 'jwt'
+ gem 'libv8'
+ gem 'libxml-ruby'
+ gem 'magic'
+ gem 'markaby'
+ gem 'method_source'
+ gem 'mini_magick'
+ gem 'msgpack'
+ gem 'mysql2'
+ # gem 'mysql' deprecated
+ gem 'ncursesw'
+ gem 'netrc'
+ gem 'net-scp'
+ gem 'net-ssh'
+ gem 'nokogiri'
+ gem 'opus-ruby'
+ gem 'ovirt-engine-sdk'
+ gem 'pango'
+ gem 'patron'
+ gem 'pcaprub'
+ gem 'pg'
+ gem 'pry'
+ gem 'pry-byebug'
+ gem 'pry-doc'
+ gem 'public_suffix'
+ gem 'puma'
+ gem 'rails'
+ gem 'rainbow'
+ # gem 'rbczmq' deprecated
+ gem 'rbnacl'
+ gem 'rb-readline'
+ gem 're2'
+ gem 'redis'
+ gem 'redis-rack'
+ gem 'rest-client'
+ gem 'rmagick'
+ gem 'rpam2'
+ gem 'rspec'
+ gem 'rubocop'
+ gem 'rubocop-performance'
+ gem 'ruby-libvirt'
+ gem 'ruby-lxc'
+ gem 'ruby-progressbar'
+ gem 'ruby-terminfo'
+ gem 'ruby-vips'
+ gem 'rubyzip'
+ gem 'rugged'
+ gem 'sassc'
+ gem 'scrypt'
+ gem 'semian'
+ gem 'sequel'
+ gem 'sequel_pg'
+ gem 'simplecov'
+ gem 'sinatra'
+ gem 'slop'
+ gem 'snappy'
+ gem 'sqlite3'
+ gem 'taglib-ruby'
+ gem 'therubyracer'
+ gem 'thrift'
+ gem 'tilt'
+ gem 'tiny_tds'
+ gem 'treetop'
+ gem 'typhoeus'
+ gem 'tzinfo'
+ gem 'unf_ext'
+ gem 'uuid4r'
+ gem 'whois'
+ # gem 'xapian-ruby' doesn't contain ruby code
+ gem 'zookeeper'
+end
diff --git a/pkgs/development/ruby-modules/with-packages/default.nix b/pkgs/development/ruby-modules/with-packages/default.nix
new file mode 100644
index 000000000000..ac0a33f45614
--- /dev/null
+++ b/pkgs/development/ruby-modules/with-packages/default.nix
@@ -0,0 +1,75 @@
+{ stdenv, lib, buildEnv, buildRubyGem, ruby, gemConfig, makeWrapper }:
+
+/*
+Example usage:
+nix-shell -E "(import {}).ruby.withPackages (pkgs: with pkgs; [ pry nokogiri ])"
+
+You can also use this for writing ruby scripts that run anywhere that has nix
+using a nix-shell shebang:
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i ruby -p "ruby.withPackages (pkgs: with pkgs; [ pry nokogiri ])"
+
+
+Run the following in the nixpkgs root directory to update the ruby-packages.nix:
+./maintainers/scripts/update-ruby-packages
+*/
+
+let
+ functions = import ../bundled-common/functions.nix { inherit lib gemConfig; };
+
+ buildGems = gemset:
+ let
+ realGemset = if builtins.isAttrs gemset then gemset else import gemset;
+ builtGems =
+ lib.mapAttrs (name: initialAttrs:
+ let
+ attrs = functions.applyGemConfigs ({ inherit ruby; gemName = name; } // initialAttrs);
+ in
+ buildRubyGem (functions.composeGemAttrs ruby builtGems name attrs)
+ ) realGemset;
+ in builtGems;
+
+ gems = buildGems (import ../../../top-level/ruby-packages.nix);
+
+ withPackages = selector:
+ let
+ selected = selector gems;
+
+ gemEnv = buildEnv {
+ name = "ruby-gems";
+ paths = selected;
+ pathsToLink = [ "/lib" "/bin" "/nix-support" ];
+ };
+
+ wrappedRuby = stdenv.mkDerivation {
+ name = "wrapped-${ruby.name}";
+ nativeBuildInputs = [ makeWrapper ];
+ buildCommand = ''
+ mkdir -p $out/bin
+ for i in ${ruby}/bin/*; do
+ makeWrapper "$i" $out/bin/$(basename "$i") --set GEM_PATH ${gemEnv}/${ruby.gemPath}
+ done
+ '';
+ };
+
+ in stdenv.mkDerivation {
+ name = "${ruby.name}-with-packages";
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ selected ruby ];
+
+ unpackPhase = ":";
+
+ installPhase = ''
+ for i in ${ruby}/bin/* ${gemEnv}/bin/*; do
+ rm -f $out/bin/$(basename "$i")
+ makeWrapper "$i" $out/bin/$(basename "$i") --set GEM_PATH ${gemEnv}/${ruby.gemPath}
+ done
+ '';
+
+ passthru = {
+ inherit wrappedRuby;
+ gems = selected;
+ };
+ };
+
+in { inherit withPackages gems buildGems; }
diff --git a/pkgs/development/ruby-modules/with-packages/require_exceptions.nix b/pkgs/development/ruby-modules/with-packages/require_exceptions.nix
new file mode 100644
index 000000000000..e6ae3b5013fe
--- /dev/null
+++ b/pkgs/development/ruby-modules/with-packages/require_exceptions.nix
@@ -0,0 +1,84 @@
+let
+ cocoapod-plugin = name: ''
+ require "cocoapods"
+ require "#{Gem::Specification.find_by_name(%(${name})).gem_dir}/lib/cocoapods_plugin"
+ '';
+in {
+ actioncable = [ "action_cable" ];
+ actionmailer = [ "action_mailer" ];
+ actionpack = [ "action_pack" ];
+ actionview = [ "action_view" ];
+ activejob = [ "active_job" ];
+ activemodel = [ "active_model" ];
+ activerecord = [ "active_record" ];
+ activestorage = [ "active_storage" ];
+ activesupport = [ "active_support" ];
+ atk = [ "atk" ];
+ CFPropertyList = [ "cfpropertylist" ];
+ cocoapods-acknowledgements = [ "cocoapods" "cocoapods_acknowledgements" ];
+ cocoapods-art = [ "cocoapods_art" ];
+ cocoapods-browser = [ "cocoapods" "cocoapods_plugin" ];
+ cocoapods-bugsnag = cocoapod-plugin "cocoapods-bugsnag";
+ cocoapods-clean = [ "cocoapods_clean" ];
+ cocoapods-coverage = [ "cocoapods_coverage" ];
+ cocoapods-deintegrate = [ ]; # used by cocoapods
+ cocoapods-dependencies = [ "cocoapods_dependencies" ];
+ cocoapods-deploy = cocoapod-plugin "cocoapods-deploy";
+ cocoapods-generate = cocoapod-plugin "cocoapods-generate";
+ cocoapods-git_url_rewriter = cocoapod-plugin "cocoapods-git_url_rewriter";
+ cocoapods-keys = []; # osx only cocoapod-plugin "cocoapods-keys";
+ cocoapods-open = [ "cocoapods" "cocoapods_plugin" ];
+ cocoapods-packager = [ "cocoapods_packager" ];
+ cocoapods-packager-pro = [ ]; # requires osx
+ cocoapods-plugins = [ "cocoapods_plugins" ];
+ cocoapods-sorted-search = [ ]; # requires osx
+ cocoapods-check = cocoapod-plugin "cocoapods-check";
+ cocoapods-disable-podfile-validations = cocoapod-plugin "cocoapods-disable-podfile-validations";
+ cocoapods-stats = [ "cocoapods_stats" ];
+ cocoapods-testing = [ "cocoapods_testing" ];
+ cocoapods-trunk = [ "cocoapods_trunk" ];
+ cocoapods-try = [ "cocoapods_try" ];
+ cocoapods-try-release-fix = cocoapod-plugin "cocoapods-try-release-fix";
+ digest-sha3 = [ "digest/sha3" ];
+ ffi-compiler = [ "ffi-compiler/loader" ];
+ fog-core = [ "fog/core" ];
+ fog-dnsimple = [ "fog/dnsimple" ];
+ fog-json = [ "fog/json" ];
+ forwardable-extended = [ "forwardable/extended" ];
+ gdk_pixbuf2 = [ "gdk_pixbuf2" ];
+ gitlab-markup = [ "github/markup" ];
+ gobject-introspection = [ "gobject-introspection" ];
+ gtk2 = [ ]; # requires display
+ idn-ruby = [ "idn" ];
+ jekyll-sass-converter = []; # tested through jekyll
+ libxml-ruby = [ "libxml" ];
+ multipart-post = [ "multipart_post" ];
+ unicode-display_width = [ "unicode/display_width" ];
+ nap = [ "rest" ];
+ net-scp = [ "net/scp" ];
+ net-ssh = [ "net/ssh" ];
+ nio4r = [ "nio" ];
+ osx_keychain = [ ]; # requires osx
+ ovirt-engine-sdk = [ "ovirtsdk4" ];
+ pango = [ "pango" ];
+ rack-test = [ "rack/test" ];
+ railties = [ "rails" ];
+ rspec-core = [ "rspec/core" ];
+ rspec-expectations = [ "rspec/expectations" ];
+ rspec-mocks = [ "rspec/mocks" ];
+ rspec-support = [ "rspec/support" ];
+ RubyInline = [ "inline" ];
+ ruby-libvirt = [ "libvirt" ];
+ ruby-lxc = [ "lxc" ];
+ ruby-macho = [ "macho" ];
+ ruby-terminfo = [ "terminfo" ];
+ rubyzip = [ "zip" ];
+ sequel_pg = [ "pg" "sequel" "sequel/adapters/postgresql" "sequel_pg" ];
+ simplecov-html = [ ]; # tested through simplecov
+ sinatra = [ "sinatra/base" ];
+ sprockets-rails = [ "sprockets/rails" ];
+ taglib-ruby = [ "taglib" ];
+ websocket-driver = [ "websocket/driver" ];
+ websocket-extensions = [ "websocket/extensions" ];
+ ZenTest = [ "zentest" ];
+}
diff --git a/pkgs/development/ruby-modules/with-packages/test.nix b/pkgs/development/ruby-modules/with-packages/test.nix
new file mode 100644
index 000000000000..73f8f02b27b3
--- /dev/null
+++ b/pkgs/development/ruby-modules/with-packages/test.nix
@@ -0,0 +1,48 @@
+# a generic test suite for all gems for all ruby versions.
+# use via nix-build.
+let
+ pkgs = import ../../../.. {};
+ lib = pkgs.lib;
+ stdenv = pkgs.stdenv;
+
+ rubyVersions = with pkgs; [
+ ruby_2_4
+ ruby_2_5
+ ruby_2_6
+ ];
+
+ gemTests =
+ (lib.mapAttrs
+ (name: gem: [ name ])
+ pkgs.ruby.gems) //
+ (import ./require_exceptions.nix);
+
+ tests = ruby:
+ lib.mapAttrs (name: gem:
+ let
+ test =
+ if builtins.isList gemTests.${name}
+ then pkgs.writeText "${name}.rb" ''
+ puts "${name} GEM_HOME: #{ENV['GEM_HOME']}"
+ ${lib.concatStringsSep "\n" (map (n: "require '${n}'") gemTests.${name})}
+ ''
+ else pkgs.writeText "${name}.rb" gemTests.${name};
+
+ deps = ruby.withPackages (g: [ g.${name} ]);
+ in stdenv.mkDerivation {
+ name = "test-gem-${ruby.name}-${name}";
+ buildInputs = [ deps ];
+ buildCommand = ''
+ INLINEDIR=$PWD ruby ${test}
+ touch $out
+ '';
+ }
+ ) ruby.gems;
+in
+ stdenv.mkDerivation {
+ name = "test-all-ruby-gems";
+ buildInputs = builtins.foldl' (sum: ruby: sum ++ ( builtins.attrValues (tests ruby) )) [] rubyVersions;
+ buildCommand = ''
+ touch $out
+ '';
+ }
diff --git a/pkgs/development/ruby-modules/with-packages/test.rb b/pkgs/development/ruby-modules/with-packages/test.rb
new file mode 100755
index 000000000000..760402d070c9
--- /dev/null
+++ b/pkgs/development/ruby-modules/with-packages/test.rb
@@ -0,0 +1,76 @@
+#!/usr/bin/env ruby
+
+# this is a quick and dirty test suite for easier analyzing of breakages in a
+# manual testing.
+# For automated testing use the test.nix
+
+require 'fileutils'
+
+class FakeGemfile
+ attr_reader :gems
+
+ def initialize
+ @gems = []
+ end
+
+ def source(_source, &block)
+ instance_exec(&block)
+ end
+
+ def gem(name)
+ @gems << name
+ end
+end
+
+gemfile = File.expand_path(File.join(__dir__, 'Gemfile'))
+packages = FakeGemfile.new.instance_eval(File.read(gemfile), gemfile)
+
+test_cases = packages.map { |pkg| [pkg, "require '#{pkg}'"] }.to_h
+
+test_cases.merge!(
+ 'digest-sha3' => "require 'digest/sha3'",
+ 'gitlab-markup' => "require 'github/markup'",
+ 'idn-ruby' => "require 'idn'",
+ 'net-scp' => "require 'net/scp'",
+ 'taglib-ruby' => "require 'taglib'",
+ 'net-ssh' => "require 'net/ssh'",
+ 'ruby-libvirt' => "require 'libvirt'",
+ 'ruby-lxc' => "require 'lxc'",
+ 'rubyzip' => "require 'zip'",
+ 'sinatra' => "require 'sinatra/base'",
+ 'libxml-ruby' => "require 'libxml'",
+ 'ruby-terminfo' => "require 'terminfo'",
+ 'ovirt-engine-sdk' => "require 'ovirtsdk4'",
+ 'fog-dnsimple' => "require 'fog/dnsimple'"
+)
+
+test_cases['sequel_pg'] = <<~TEST
+ require 'pg'
+ require 'sequel'
+ require 'sequel/adapters/postgresql'
+ require 'sequel_pg'
+TEST
+
+tmpdir = File.expand_path(File.join(__dir__, 'tests'))
+FileUtils.rm_rf(tmpdir)
+FileUtils.mkdir_p(tmpdir)
+
+failing = test_cases.reject do |name, test_case|
+ test_case = <<~SHELL
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i ruby -E "(import ../../../.. {}).ruby.withPackages (r: [ r.#{name} ] )"
+ #{test_case}
+ SHELL
+
+ file = File.join(tmpdir, "#{name}_test.rb")
+ File.write(file, test_case)
+ FileUtils.chmod('u=wrx', file)
+
+ system(file) && FileUtils.rm(file)
+end
+
+exit if failing.empty?
+
+puts "Following gems failed: #{failing.keys.join(' ')}"
+puts "tests for failing gems remain in #{tmpdir}"
+exit 1
diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix
index 7ff5633072e1..056bbd859164 100644
--- a/pkgs/development/tools/alloy/default.nix
+++ b/pkgs/development/tools/alloy/default.nix
@@ -7,7 +7,7 @@ let generic = { major, version, src }:
nameMajor = "alloy${major}";
desktopItem = makeDesktopItem rec {
- name = "${nameMajor}";
+ name = nameMajor;
exec = name;
icon = name;
desktopName = "Alloy ${major}";
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 4bd95a8d745a..ff630242c933 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -4,13 +4,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "ammonite-${version}";
- version = "1.6.9";
+ pname = "ammonite";
+ version = "1.7.1";
scalaVersion = "2.12";
src = fetchurl {
url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
- sha256 = "1fi5j0kcndq00x72d8bkx6qiy9nh2i6c6m29gzfqql52qgbq1fd0";
+ sha256 = "0isg9flnzc2ldbx6q0lg0xyg9lnvqkd8qhgfln8p1hbzdq0n6jd0";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix
index a8b8a965256f..16b4be47d8b7 100644
--- a/pkgs/development/tools/analysis/autoflake/default.nix
+++ b/pkgs/development/tools/analysis/autoflake/default.nix
@@ -4,7 +4,6 @@ with python3Packages;
buildPythonApplication rec {
pname = "autoflake";
version = "1.3";
- name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 95f5a418a617..ac2c6795a428 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "8.23";
- name = "checkstyle-${version}";
+ pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix
index 2e01e4d8f28e..6b0c1b401f63 100644
--- a/pkgs/development/tools/analysis/clang-analyzer/default.nix
+++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper }:
stdenv.mkDerivation rec {
- name = "clang-analyzer-${version}";
+ pname = "clang-analyzer";
version = "3.4";
src = fetchurl {
diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix
index 2b4a87ffcb8d..951c46e2166f 100644
--- a/pkgs/development/tools/analysis/coan/default.nix
+++ b/pkgs/development/tools/analysis/coan/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "6.0.1";
- name = "coan-${version}";
+ pname = "coan";
src = fetchurl {
- url = "mirror://sourceforge/project/coan2/v${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/coan2/v${version}/${pname}-${version}.tar.gz";
sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44";
};
diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/development/tools/analysis/cov-build/default.nix
index bd0a4ee5e40a..bd8c5c37c864 100644
--- a/pkgs/development/tools/analysis/cov-build/default.nix
+++ b/pkgs/development/tools/analysis/cov-build/default.nix
@@ -7,7 +7,7 @@ let
'';
in
stdenv.mkDerivation rec {
- name = "cov-build-${version}";
+ pname = "cov-build";
version = "7.0.2";
src =
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 09901afdd20b..8b6eb71f90ff 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -3,10 +3,9 @@
stdenv.mkDerivation rec {
pname = "cppcheck";
version = "1.88";
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+ url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "1jiqv9pzzy2gxkdhxv3gqjarwgbvc7kxyc66dm3i6xwp94bl89dv";
};
diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix
index 00c020e3f404..ed338a6e0d9b 100644
--- a/pkgs/development/tools/analysis/eresi/default.nix
+++ b/pkgs/development/tools/analysis/eresi/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, which, openssl, readline }:
stdenv.mkDerivation rec {
- name = "eresi-${version}";
+ pname = "eresi";
version = "0.83-a3-phoenix";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix
index 77bfa548068c..c250f442a0eb 100644
--- a/pkgs/development/tools/analysis/evmdis/default.nix
+++ b/pkgs/development/tools/analysis/evmdis/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
- name = "evmdis-unstable-${version}";
+buildGoPackage {
+ pname = "evmdis-unstable";
version = "2018-03-23";
goPackagePath = "github.com/Arachnid/evmdis";
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index fb351f4adfd8..f4c7047e8de2 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
- version = "0.106.0";
+ version = "0.107.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
- sha256 = "0da32j8s3avxa84g2gn9sr4nakibllz1kq5i3bgqbndrgcgsdvgw";
+ sha256 = "1in7a006lgw4v2p0gn5sx41cn3p259vncpq0l3rz52lyfpn7ai3b";
};
installPhase = ''
diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index 5f6b894f9849..8f1709933707 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -22,7 +22,7 @@ let
in
stdenv.mkDerivation rec {
- name = "frama-c-${version}";
+ pname = "frama-c";
version = "19.0";
slang = "Potassium";
diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index 019a449ebcd9..c05d47e396cf 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, cmake, llvmPackages, python2 }:
stdenv.mkDerivation rec {
- name = "include-what-you-use-${version}";
+ pname = "include-what-you-use";
# Also bump llvmPackages in all-packages.nix to the supported version!
version = "0.12";
src = fetchurl {
sha256 = "09b0h704fh7r4f5h92p5997cj3zk1v04bqp4jk1j1f6cmfq2z2d5";
- url = "${meta.homepage}/downloads/${name}.src.tar.gz";
+ url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz";
};
buildInputs = with llvmPackages; [ clang-unwrapped llvm python2 ];
diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix
index 939ae10c089d..455ff7722fa9 100644
--- a/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/pkgs/development/tools/analysis/jdepend/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ant, jdk, runtimeShell }:
stdenv.mkDerivation rec {
- name = "jdepend-${version}";
+ pname = "jdepend";
version = "2.9.1";
src = fetchFromGitHub {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin $out/share
- install dist/${name}.jar $out/share
+ install dist/${pname}-${version}.jar $out/share
cat > "$out/bin/jdepend" <
# DO NOT EDIT! Automatically generated by ./update.py
radare2 = generic {
- version_commit = "22465";
- gittap = "3.7.0";
- gittip = "cb2648cbbde3cd63cb1b2a9b1d4269c97bd653b8";
- rev = "3.7.0";
- version = "3.7.0";
- sha256 = "1kinf51sb1zyy8nlq9yig02z42izih7kz8ff0gqm8all0hrzclxc";
+ version_commit = "22646";
+ gittap = "3.8.0";
+ gittip = "b4860e4eecad2053202965926f16296864b2f1e5";
+ rev = "3.8.0";
+ version = "3.8.0";
+ sha256 = "0rx6az2vpqy12lvzpxx9pappqj84d88daj8bis3zsffqgmhsafcd";
cs_ver = "4.0.1";
cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
};
diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix
index 4fc85c301665..e8e3168e937c 100644
--- a/pkgs/development/tools/analysis/randoop/default.nix
+++ b/pkgs/development/tools/analysis/randoop/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "3.1.5";
- name = "randoop-${version}";
+ pname = "randoop";
src = fetchurl {
- url = "https://github.com/randoop/randoop/releases/download/v${version}/${name}.zip";
+ url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip";
sha256 = "13zspyi9fgnqc90qfqqnj0hb7869l0aixv0vwgj8m4m1hggpadlx";
};
diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix
index fec127178f9e..475d1950bb2a 100644
--- a/pkgs/development/tools/analysis/retdec/default.nix
+++ b/pkgs/development/tools/analysis/retdec/default.nix
@@ -124,7 +124,7 @@ let
'';
in stdenv.mkDerivation rec {
- name = "retdec-${version}";
+ pname = "retdec";
# If you update this you will also need to adjust the versions of the updated dependencies. You can do this by first just updating retdec
# itself and trying to build it. The build should fail and tell you which dependencies you have to upgrade to which versions.
diff --git a/pkgs/development/tools/analysis/retdec/yaracpp.nix b/pkgs/development/tools/analysis/retdec/yaracpp.nix
index cc857b86145f..c8bc4ed747b3 100644
--- a/pkgs/development/tools/analysis/retdec/yaracpp.nix
+++ b/pkgs/development/tools/analysis/retdec/yaracpp.nix
@@ -13,7 +13,7 @@ let
in stdenv.mkDerivation rec {
# only fetches the yaracpp source patched to work with a local yara clone,
# does not build anything
- name = "yaracpp-src-${version}";
+ pname = "yaracpp-src";
version = "2018-10-09";
rev = "b92bde0e59e3b75bc445227e04b71105771dee8b"; # as specified in retdec/deps/yaracpp/CMakeLists.txt
diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index cd2fb21209c4..844fd38d9be6 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "5.2.0";
- name = "rr-${version}";
+ pname = "rr";
src = fetchFromGitHub {
owner = "mozilla";
diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix
index e965acc746cc..f8f2f55c5aa7 100644
--- a/pkgs/development/tools/analysis/snowman/default.nix
+++ b/pkgs/development/tools/analysis/snowman/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, boost, qtbase }:
stdenv.mkDerivation rec {
- name = "snowman-${version}";
+ pname = "snowman";
version = "0.1.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index fbb7eca0ef51..26598bb36cd0 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -6,7 +6,7 @@ let
ibinPath = stdenv.lib.makeBinPath [ gcc tk swarm graphviz tk ];
in stdenv.mkDerivation rec {
- name = "spin-${version}";
+ pname = "spin";
version = "6.4.9";
url-version = stdenv.lib.replaceChars ["."] [""] version;
diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix
index 86e4d6ef5f69..922a73a4be09 100644
--- a/pkgs/development/tools/analysis/swarm/default.nix
+++ b/pkgs/development/tools/analysis/swarm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "swarm-2019-03-11";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 5099505cc5b0..7dca029d557e 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tflint";
- version = "0.10.3";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "wata727";
repo = pname;
rev = "v${version}";
- sha256 = "1p4w1ddgb4nqibbrvix0p0gdlj6ann5lkyvlcsbkn25z8ha3qa39";
+ sha256 = "0aff7ckl245cyjs2rbgczkqlp2x6g4g458p4li0k1agk3m9bbq35";
};
- modSha256 = "1snanz4cpqkfgxp8k52w3x4i49k6d5jffcffrcx8xya8yvx2wxy3";
+ modSha256 = "1facqppgpmmz2j7j77fa3mnjv2nzjxz4ya6xvyvyy92ma0ybclgh";
subPackages = [ "." ];
diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
index d9d70f64d73e..56f9f98856cc 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, jre, build-tools }:
stdenv.mkDerivation rec {
- name = "apktool-${version}";
+ pname = "apktool";
version = "2.4.0";
src = fetchurl {
diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix
index d2cb7e807b58..04cb6f808df2 100644
--- a/pkgs/development/tools/asmfmt/default.nix
+++ b/pkgs/development/tools/asmfmt/default.nix
@@ -5,7 +5,7 @@
}:
buildGoPackage rec {
- name = "asmfmt-${version}";
+ pname = "asmfmt";
version = "1.1";
goPackagePath = "github.com/klauspost/asmfmt";
diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix
index e0b9aec9ee15..335a2238b91e 100644
--- a/pkgs/development/tools/asn2quickder/default.nix
+++ b/pkgs/development/tools/asn2quickder/default.nix
@@ -12,11 +12,13 @@ buildPythonApplication rec {
repo = "quick-der";
};
- patchPhase = ''
+ postPatch = ''
patchShebangs ./python/scripts/*
'';
- buildInputs = [ makeWrapper cmake ];
+ dontUseCmakeConfigure = true;
+
+ nativeBuildInputs = [ makeWrapper cmake ];
checkInputs = [ pytestrunner pytest ];
propagatedBuildInputs = [ pyparsing asn1ate six ];
diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
index 2089142a1deb..403d0ab745a9 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "azure-storage-azcopy-${version}";
+ pname = "azure-storage-azcopy";
version = "10.0.1-pre";
revision = "10.0.1";
goPackagePath = "github.com/Azure/azure-storage-azcopy";
diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
index f66c84142648..9a12a7afc625 100644
--- a/pkgs/development/tools/bloaty/default.nix
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.0";
- name = "bloaty-${version}";
+ pname = "bloaty";
src = fetchFromGitHub {
owner = "google";
diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix
index 7b5391725423..2623787993c6 100644
--- a/pkgs/development/tools/boomerang/default.nix
+++ b/pkgs/development/tools/boomerang/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, qtbase }:
stdenv.mkDerivation rec {
- name = "boomerang-${version}";
+ pname = "boomerang";
version = "0.4.0-alpha-2018-07-03";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix
index 89c1b560eaca..f392475f6187 100644
--- a/pkgs/development/tools/boost-build/default.nix
+++ b/pkgs/development/tools/boost-build/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "boost-build-${version}";
+ pname = "boost-build";
version = "2016.03";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix
index 8816a005ca0f..0a86aaeb6ca0 100644
--- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix
@@ -3,7 +3,8 @@
let version = "1.9.6"; in
stdenv.mkDerivation {
- name = "ant-${version}";
+ pname = "ant";
+ inherit version;
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index b6c2702485b1..8d1e09eeb338 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -3,7 +3,8 @@
let version = "1.10.2"; in
stdenv.mkDerivation {
- name = "ant-${version}";
+ pname = "ant";
+ inherit version;
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
index cde6ea2f7a87..ef339e658c10 100644
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -4,12 +4,13 @@ assert jdk != null;
let version = "3.6.1"; in
stdenv.mkDerivation rec {
- name = "apache-maven-${version}";
+ pname = "apache-maven";
+ inherit version;
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz";
+ url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz";
sha256 = "1rv97g9qr6sifl88rxbsqnz5i79m6ifs36srri08j3y3k5dc6a15";
};
diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/development/tools/build-managers/arpa2cm/default.nix
index 0aec7491e4ad..ef3062c6ca50 100644
--- a/pkgs/development/tools/build-managers/arpa2cm/default.nix
+++ b/pkgs/development/tools/build-managers/arpa2cm/default.nix
@@ -3,12 +3,11 @@
stdenv.mkDerivation rec {
pname = "arpa2cm";
version = "0.5";
- name = "${pname}-${version}";
src = fetchFromGitHub {
sha256 = "093h7njj8d8iiwnw5byfxkkzlbny60fwv1w57j8f1lsd4yn6rih4";
rev = "version-${version}";
- repo = "${pname}";
+ repo = pname;
owner = "arpa2";
};
diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix
index 624821613465..969cd9879746 100644
--- a/pkgs/development/tools/build-managers/bam/default.nix
+++ b/pkgs/development/tools/build-managers/bam/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, lua5_3, python }:
stdenv.mkDerivation rec {
- name = "bam-${version}";
+ pname = "bam";
version = "0.5.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix
index 1018abd6ee9c..334d09622530 100644
--- a/pkgs/development/tools/build-managers/bazel/0.4.nix
+++ b/pkgs/development/tools/build-managers/bazel/0.4.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
broken = true; # 2018-08-07
};
- name = "bazel-${version}";
+ pname = "bazel";
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
diff --git a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
index 898640a84fe6..cd0c5f6c081b 100644
--- a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
@@ -1,4 +1,4 @@
-{ writeText, bazel, runLocal, bazelTest }:
+{ writeText, bazel, runLocal, bazelTest, distDir }:
# Tests that certain executables are available in bazel-executed bash shells.
@@ -35,7 +35,7 @@ let
inherit workspaceDir;
bazelScript = ''
- ${bazel}/bin/bazel build :tool_usage
+ ${bazel}/bin/bazel build :tool_usage --distdir=${distDir}
cp bazel-genfiles/output.txt $out
echo "Testing content" && [ "$(cat $out | wc -l)" == "2" ] && echo "OK"
'';
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index f7b0184f8367..b606e5470361 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
- name = "bazel-buildtools-${version}";
+ pname = "bazel-buildtools";
version = "0.28.0";
rev = "d7ccc5507c6c16e04f5e362e558d70b8b179b052";
diff --git a/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/cpp-test.nix
index 2b59bd3c4338..f4e03abdbc94 100644
--- a/pkgs/development/tools/build-managers/bazel/cpp-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/cpp-test.nix
@@ -8,6 +8,7 @@
, runtimeShell
, writeScript
, writeText
+, distDir
}:
let
@@ -42,6 +43,7 @@ let
bazelScript = ''
${bazel}/bin/bazel \
build --verbose_failures \
+ --distdir=${distDir} \
//...
'';
};
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 7e6b584f9668..01619e0cb117 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -22,11 +22,11 @@
}:
let
- version = "0.28.1";
+ version = "0.29.0";
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
- sha256 = "0503fax70w7h6v00mkrrrgf1m5n0vkjqs76lyg95alhzc4yldsic";
+ sha256 = "01cb6f2e808bd016cf0e217e12373c9efb808123e58b37885be8364458d3a40a";
};
# Update with `eval $(nix-build -A bazel.updater)`,
@@ -46,11 +46,15 @@ let
srcs.io_bazel_rules_sass
srcs.platforms
(if stdenv.hostPlatform.isDarwin
- then srcs.${"java_tools_javac11_darwin-v2.0.zip"}
- else srcs.${"java_tools_javac11_linux-v2.0.zip"})
- srcs.${"coverage_output_generator-v1.0.zip"}
+ then srcs."java_tools_javac11_darwin-v4.0.zip"
+ else srcs."java_tools_javac11_linux-v4.0.zip")
+ srcs."coverage_output_generator-v1.0.zip"
srcs.build_bazel_rules_nodejs
- srcs.${"android_tools_pkg-0.7.tar.gz"}
+ srcs."android_tools_pkg-0.8.tar.gz"
+ srcs."0.27.1.tar.gz"
+ srcs.rules_pkg
+ srcs.rules_cc
+ srcs.rules_java
]);
distDir = runCommand "bazel-deps" {} ''
@@ -102,7 +106,7 @@ let
remote_java_tools = stdenv.mkDerivation {
name = "remote_java_tools_${system}";
- src = srcDepsSet."java_tools_javac11_${system}-v2.0.zip";
+ src = srcDepsSet."java_tools_javac11_${system}-v4.0.zip";
nativeBuildInputs = [ autoPatchelfHook unzip ];
buildInputs = [ gcc-unwrapped ];
@@ -121,7 +125,8 @@ let
in
stdenv.mkDerivation rec {
- name = "bazel-${version}";
+ pname = "bazel";
+ inherit version;
meta = with lib; {
homepage = "https://github.com/bazelbuild/bazel/";
@@ -217,18 +222,18 @@ stdenv.mkDerivation rec {
};
in {
- bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; };
- cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; };
- java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; };
- protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; };
- pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; };
+ bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; };
+ cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
+ java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
+ protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; };
+ pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; };
- bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
+ bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
- cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; };
- javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples; bazel = bazelWithNixHacks; };
- protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
- pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
+ cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; };
+ javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; };
+ protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
+ pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
# downstream packages using buildBazelPackage
# fixed-output hashes of the fetch phase need to be spot-checked manually
@@ -462,6 +467,7 @@ stdenv.mkDerivation rec {
# the reference to .name
mkdir $out/etc
echo "build --override_repository=${remote_java_tools.name}=${remote_java_tools}" > $out/etc/bazelrc
+ echo "build --distdir=${distDir}" >> $out/etc/bazelrc
# shell completion files
mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/pkgs/development/tools/build-managers/bazel/java-test.nix
index 5f780a795e31..30b957eb5e30 100644
--- a/pkgs/development/tools/build-managers/bazel/java-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/java-test.nix
@@ -9,6 +9,7 @@
, runtimeShell
, writeScript
, writeText
+, distDir
}:
let
@@ -44,6 +45,7 @@ let
bazelScript = ''
${bazel}/bin/bazel \
run \
+ --distdir=${distDir} \
--host_javabase='@local_jdk//:jdk' \
--java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
--javabase='@local_jdk//:jdk' \
diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
index 90065be67bc7..0784de4cfd39 100644
--- a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
@@ -10,6 +10,7 @@
, runtimeShell
, writeScript
, writeText
+, distDir
}:
let
@@ -141,6 +142,7 @@ let
bazelScript = ''
${bazel}/bin/bazel \
build \
+ --distdir=${distDir} \
--host_javabase='@local_jdk//:jdk' \
--java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
--javabase='@local_jdk//:jdk' \
diff --git a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
index ff921b395da7..c02547c08e06 100644
--- a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
@@ -1,4 +1,4 @@
-{ writeText, bazel, bazelTest, runLocal }:
+{ writeText, bazel, bazelTest, runLocal, distDir }:
let
WORKSPACE = writeText "WORKSPACE" ''
@@ -45,6 +45,7 @@ let
bazelScript = ''
${bazel}/bin/bazel \
run \
+ --distdir=${distDir} \
//python:bin
'';
};
diff --git a/pkgs/development/tools/build-managers/bazel/src-deps.json b/pkgs/development/tools/build-managers/bazel/src-deps.json
index fc3fe13f5809..f93794249ec7 100644
--- a/pkgs/development/tools/build-managers/bazel/src-deps.json
+++ b/pkgs/development/tools/build-managers/bazel/src-deps.json
@@ -7,12 +7,28 @@
"https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip"
]
},
- "1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz": {
- "name": "1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz",
- "sha256": "3ca1b3d453a977aeda60dd335feb812771addfd0d0c61751b34b9681aa4d6534",
+ "0.27.1.tar.gz": {
+ "name": "0.27.1.tar.gz",
+ "sha256": "28cb3666da80fbc62d4c46814f5468dd5d0b59f9064c0b933eee3140d706d330",
"urls": [
- "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz",
- "https://github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz"
+ "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz",
+ "https://github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz"
+ ]
+ },
+ "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip": {
+ "name": "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip",
+ "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip",
+ "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip"
+ ]
+ },
+ "41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz": {
+ "name": "41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz",
+ "sha256": "fdc34621839104b57363a258eab9d821b02ff7837923cfe7fb6fd67182780829",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz",
+ "https://github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz"
]
},
"441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": {
@@ -23,6 +39,14 @@
"https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip"
]
},
+ "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": {
+ "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
+ "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
+ "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
+ ]
+ },
"8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": {
"name": "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz",
"sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898",
@@ -31,29 +55,28 @@
"https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz"
]
},
- "android_tools_pkg-0.7.tar.gz": {
- "name": "android_tools_pkg-0.7.tar.gz",
- "sha256": "a8e48f2fdee2c34b31f45bd47ce050a75ac774f19e0a1f6694fa49fc11d88718",
+ "android_tools_pkg-0.8.tar.gz": {
+ "name": "android_tools_pkg-0.8.tar.gz",
+ "sha256": "a9eac6e1b27d5549edaaa724b20eb1cdae6253b84f44d5744c30372bd523cfcd",
"urls": [
- "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.7.tar.gz"
+ "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.8.tar.gz"
+ ]
+ },
+ "b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz": {
+ "name": "b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz",
+ "sha256": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz",
+ "https://github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz"
]
},
"bazel_j2objc": {
"name": "bazel_j2objc",
- "sha256": "a36bac432d0dbd8c98249e484b2b69dd5720afa4abb58711a3c3def1c0bfa21d",
- "strip_prefix": "j2objc-2.0.3",
+ "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b",
+ "strip_prefix": "j2objc-2.5",
"urls": [
- "https://miirror.bazel.build/github.com/google/j2objc/releases/download/2.0.3/j2objc-2.0.3.zip",
- "https://github.com/google/j2objc/releases/download/2.0.3/j2objc-2.0.3.zip"
- ]
- },
- "bazel_rbe_toolchains": {
- "name": "bazel_rbe_toolchains",
- "sha256": "e2b8644caa15235a488e831264e5dcb014e2cdf3b697319bc1e9d6b0fff0b4b9",
- "strip_prefix": "bazel_rbe_toolchains-01529a65d21abdf71635ff0c2472043a567ecded",
- "urls": [
- "https://mirror.bazel.build/github.com/buchgr/bazel_rbe_toolchains/archive/01529a65d21abdf71635ff0c2472043a567ecded.tar.gz",
- "https://github.com/buchgr/bazel_rbe_toolchains/archive/01529a65d21abdf71635ff0c2472043a567ecded.tar.gz"
+ "https://miirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip",
+ "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip"
]
},
"bazel_skylib": {
@@ -67,11 +90,11 @@
},
"bazel_toolchains": {
"name": "bazel_toolchains",
- "sha256": "67335b3563d9b67dc2550b8f27cc689b64fadac491e69ce78763d9ba894cc5cc",
- "strip_prefix": "bazel-toolchains-cddc376d428ada2927ad359211c3e356bd9c9fbb",
+ "sha256": "28cb3666da80fbc62d4c46814f5468dd5d0b59f9064c0b933eee3140d706d330",
+ "strip_prefix": "bazel-toolchains-0.27.1",
"urls": [
- "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/cddc376d428ada2927ad359211c3e356bd9c9fbb.tar.gz",
- "https://github.com/bazelbuild/bazel-toolchains/archive/cddc376d428ada2927ad359211c3e356bd9c9fbb.tar.gz"
+ "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz",
+ "https://github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz"
]
},
"build_bazel_rules_nodejs": {
@@ -135,46 +158,46 @@
},
"io_bazel_skydoc": {
"name": "io_bazel_skydoc",
- "sha256": "3ca1b3d453a977aeda60dd335feb812771addfd0d0c61751b34b9681aa4d6534",
- "strip_prefix": "skydoc-1ca560df1cf6e280f987af2f8d08a5edc7ac6b54",
+ "sha256": "fdc34621839104b57363a258eab9d821b02ff7837923cfe7fb6fd67182780829",
+ "strip_prefix": "skydoc-41c28e43dffbae39c52dd4b91932d1209e5a8893",
"urls": [
- "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz",
- "https://github.com/bazelbuild/skydoc/archive/1ca560df1cf6e280f987af2f8d08a5edc7ac6b54.tar.gz"
+ "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz",
+ "https://github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz"
]
},
- "java_tools_javac11_darwin-v2.0.zip": {
- "name": "java_tools_javac11_darwin-v2.0.zip",
- "sha256": "0ceb0c9ff91256fe33508306bc9cd9e188dcca38df78e70839d426bdaef67a38",
+ "java_tools_javac11_darwin-v4.0.zip": {
+ "name": "java_tools_javac11_darwin-v4.0.zip",
+ "sha256": "fbf5bf22e9aab9c622e4c8c59314a1eef5ea09eafc5672b4f3250dc0b971bbcc",
"urls": [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v2.0/java_tools_javac11_darwin-v2.0.zip"
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_darwin-v4.0.zip"
]
},
- "java_tools_javac11_linux-v2.0.zip": {
- "name": "java_tools_javac11_linux-v2.0.zip",
- "sha256": "074d624fb34441df369afdfd454e75dba821d5d54932fcfee5ba598d17dc1b99",
+ "java_tools_javac11_linux-v4.0.zip": {
+ "name": "java_tools_javac11_linux-v4.0.zip",
+ "sha256": "96e223094a12c842a66db0bb7bb6866e88e26e678f045842911f9bd6b47161f5",
"urls": [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v2.0/java_tools_javac11_linux-v2.0.zip"
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_linux-v4.0.zip"
]
},
- "java_tools_javac11_windows-v2.0.zip": {
- "name": "java_tools_javac11_windows-v2.0.zip",
- "sha256": "2c3fc0ce7d30d60e26f4b8a36e2eadcf9e6a9d5a51b667d3d13b78db53b24251",
+ "java_tools_javac11_windows-v4.0.zip": {
+ "name": "java_tools_javac11_windows-v4.0.zip",
+ "sha256": "a1de51447b2ba2eab923d589ba6c72c289c16e6091e6a3bb3e67a05ef4ad200c",
"urls": [
- "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v2.0/java_tools_javac11_windows-v2.0.zip"
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_windows-v4.0.zip"
]
},
"java_tools_langtools_javac10": {
"name": "java_tools_langtools_javac10",
- "sha256": "e379c71e051eb83e3fc9a08c9b404712707d8920ffcf1e8fd59c844965f0b0dd",
+ "sha256": "0e9c9ac5ef17869de3cb8c3497c4c0d31836ef7b63efe1690506f53783adb212",
"urls": [
- "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10.zip"
+ "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10_v2.zip"
]
},
"java_tools_langtools_javac11": {
"name": "java_tools_langtools_javac11",
- "sha256": "128a63f39d3f828a761f6afcfe3c6115279336a72ea77f60d7b3acf1841c9acb",
+ "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7",
"urls": [
- "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11.zip"
+ "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip"
]
},
"java_tools_langtools_javac12": {
@@ -186,9 +209,9 @@
},
"java_tools_langtools_javac9": {
"name": "java_tools_langtools_javac9",
- "sha256": "3b6bbc47256acf2f61883901e2d4e3f9b292f5fe154a6912b928805de24cb864",
+ "sha256": "d94befcfb325a9a62aebc2052e631fde2322b4df5c82a19ed260b38ba12a0ad1",
"urls": [
- "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9.zip"
+ "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9_v2.zip"
]
},
"jdk10-server-release-1804.tar.xz": {
@@ -346,6 +369,49 @@
"https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip"
]
},
+ "rules_cc": {
+ "name": "rules_cc",
+ "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89",
+ "strip_prefix": "rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip",
+ "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip"
+ ]
+ },
+ "rules_java": {
+ "name": "rules_java",
+ "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598",
+ "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
+ "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
+ ]
+ },
+ "rules_pkg": {
+ "name": "rules_pkg",
+ "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz",
+ "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz"
+ ]
+ },
+ "rules_pkg-0.2.0.tar.gz": {
+ "name": "rules_pkg-0.2.0.tar.gz",
+ "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz",
+ "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz"
+ ]
+ },
+ "rules_proto": {
+ "name": "rules_proto",
+ "sha256": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d",
+ "strip_prefix": "rules_proto-b0cc14be5da05168b01db282fe93bdf17aa2b9f4",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz",
+ "https://github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz"
+ ]
+ },
"zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz": {
"name": "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz",
"sha256": "57fad3602e74c79587901d6966d3b54ef32cb811829a2552163185d5064fe9b5",
diff --git a/pkgs/development/tools/build-managers/bazel/update-srcDeps.py b/pkgs/development/tools/build-managers/bazel/update-srcDeps.py
index 7fd1e5e2b048..504a227b9582 100755
--- a/pkgs/development/tools/build-managers/bazel/update-srcDeps.py
+++ b/pkgs/development/tools/build-managers/bazel/update-srcDeps.py
@@ -40,6 +40,11 @@ def rules_sass_dependencies(**kw): pass
def node_repositories(**kw): pass
def sass_repositories(**kw): pass
def register_execution_platforms(*args): pass
+def rbe_autoconfig(*args, **kw): pass
+def rules_pkg_dependencies(*args, **kw): pass
+def winsdk_configure(*args, **kw): pass
+def register_local_rc_exe_toolchains(*args, **kw): pass
+def register_toolchains(*args, **kw): pass
# execute the WORKSPACE like it was python code in this module,
# using all the function stubs from above.
diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index ea8ee1f84962..ec1577c51079 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, python }:
stdenv.mkDerivation rec {
- name = "bear-${version}";
- version = "2.4.1";
+ pname = "bear";
+ version = "2.4.2";
src = fetchFromGitHub {
owner = "rizsotto";
- repo = "Bear";
+ repo = pname;
rev = version;
- sha256 = "0fqhhavyz9ddjc3wgb2ng47bfgk1q4w5bwah74nsa02k8r22pbch";
+ sha256 = "1w1kyjzvvy5lj16kn3yyf7iil2cqlfkszi8kvagql7f5h5l6w9b1";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index ba842289dba4..23ffe2868241 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -49,7 +49,7 @@ let
installPhase = ''cp $src $out'';
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${baseName}-${version}";
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix
index f71b877c8c52..d895261c4b5b 100644
--- a/pkgs/development/tools/build-managers/bmake/default.nix
+++ b/pkgs/development/tools/build-managers/bmake/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "bmake-${version}";
+ pname = "bmake";
version = "20181221";
src = fetchurl {
- url = "http://www.crufty.net/ftp/pub/sjg/${name}.tar.gz";
+ url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz";
sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw";
};
diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix
index 380ba4803bd5..3f086c912c18 100644
--- a/pkgs/development/tools/build-managers/boot/default.nix
+++ b/pkgs/development/tools/build-managers/boot/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.7.2";
- name = "boot-${version}";
+ pname = "boot";
src = fetchurl {
url = "https://github.com/boot-clj/boot-bin/releases/download/${version}/boot.sh";
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 4761d8dc5b11..5bad0100a032 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
+ lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI"
+ lib.optionalString useQt4 "-qt4UI";
- version = "3.14.5";
+ version = "3.15.1";
src = fetchurl {
url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
- sha256 = "505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06";
+ sha256 = "1xyprly3sf4wi0n1x79k4n22yxm6pb7fv70gqr9lvc7qv14cbphq";
};
patches = [
diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix
index 9f4cb366e239..f14aa4eea6e2 100644
--- a/pkgs/development/tools/build-managers/colormake/default.nix
+++ b/pkgs/development/tools/build-managers/colormake/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchgit, perl}:
-stdenv.mkDerivation rec {
- name = "colormake-${version}";
+stdenv.mkDerivation {
+ pname = "colormake";
version = "2.1.0";
buildInputs = [perl];
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 7b882926e1f5..ef2b155482f1 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
stdenv.mkDerivation rec {
- name = "dub-${version}";
+ pname = "dub";
version = "1.14.0";
enableParallelBuilding = true;
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index 34d19b616942..7b29e7d02dc6 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -16,8 +16,8 @@ let
'';
in
-stdenv.mkDerivation rec {
- name = "gn-${version}";
+stdenv.mkDerivation {
+ pname = "gn";
version = "20190403";
src = fetchgit {
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
index 47f800c67be5..b543565758c1 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix
@@ -6,7 +6,8 @@ let
version = "4.2.1";
in
stdenv.mkDerivation {
- name = "gnumake-${version}";
+ pname = "gnumake";
+ inherit version;
src = fetchurl {
url = "mirror://gnu/make/make-${version}.tar.bz2";
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 902c74a08b4a..5e01438844c6 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }:
rec {
- gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation rec {
+ gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation {
inherit name src nativeVersion;
dontBuild = true;
diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
index baa658b522a3..30c4d4ec4de0 100644
--- a/pkgs/development/tools/build-managers/gup/default.nix
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
rev = "version-0.7.0";
sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv";
};
- name = "gup-${version}";
+ pname = "gup";
buildInputs = lib.remove null [ python which pychecker ];
SKIP_PYCHECKER = pychecker == null;
buildPhase = "make python";
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index c5ab3fafc5e6..1d1bee9c04f6 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }:
stdenv.mkDerivation rec {
- name = "icmake-${version}";
+ pname = "icmake";
version = "9.02.08";
src = fetchFromGitLab {
diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix
index 8a72847be772..03cc0518ab51 100644
--- a/pkgs/development/tools/build-managers/kati/default.nix
+++ b/pkgs/development/tools/build-managers/kati/default.nix
@@ -1,7 +1,7 @@
{ fetchgit, stdenv }:
stdenv.mkDerivation rec {
- name = "kati-unstable-${version}";
+ pname = "kati-unstable";
version = "2017-05-23";
rev = "2dde61e46ab789f18956ff3b7c257dd8eb97993f";
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index d73683287a1e..9538171474d6 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -4,7 +4,6 @@
stdenv.mkDerivation rec {
pname = "leiningen";
version = "2.9.1";
- name = "${pname}-${version}";
src = fetchurl {
url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
@@ -13,11 +12,11 @@ stdenv.mkDerivation rec {
jarsrc = fetchurl {
# NOTE: This is actually a .jar, Github has issues
- url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip";
+ url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.zip";
sha256 = "1y2mva5s2w2szzn1b9rhz0dvkffls4ravii677ybcf2w9wd86z7a";
};
- JARNAME = "${name}-standalone.jar";
+ JARNAME = "${pname}-${version}-standalone.jar";
dontUnpack = true;
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index b5ee5d758170..fad5bc9e630d 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -3,20 +3,20 @@
let
# See https://mesonbuild.com/Reference-tables.html#cpu-families
cpuFamilies = {
- "aarch64" = "aarch64";
- "armv6l" = "arm";
- "armv7l" = "arm";
- "i686" = "x86";
- "x86_64" = "x86_64";
+ aarch64 = "aarch64";
+ armv6l = "arm";
+ armv7l = "arm";
+ i686 = "x86";
+ x86_64 = "x86_64";
};
in
python3Packages.buildPythonApplication rec {
pname = "meson";
- version = "0.50.1";
+ version = "0.51.2";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "05k3wsxjcnnq7a8n5kzxh2cdh5jdkh13xagigz5axs48j36zfai4";
+ sha256 = "0cqhkjbab1mbvxmbjvyfrbjfkm7bh436svqpjapca36c2k9h1vwr";
};
postFixup = ''
@@ -60,6 +60,7 @@ python3Packages.buildPythonApplication rec {
# pass it `-Wl,-O1` flag but optimizations are not recognized by
# Mac linker.
# https://github.com/mesonbuild/meson/issues/4784
+ # Should be fixed in 0.52
./fix-objc-linking.patch
];
diff --git a/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch b/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch
index 60a205828f5d..996e0c3420e2 100644
--- a/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch
+++ b/pkgs/development/tools/build-managers/meson/fix-objc-linking.patch
@@ -1,20 +1,22 @@
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index dc8f099b..d8581fcf 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
-@@ -795,7 +795,7 @@
+@@ -944,7 +944,7 @@
compiler_type = self.get_gnu_compiler_type(defines)
version = self.get_gnu_version_from_defines(defines)
- return GnuObjCCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines)
-- if out.startswith('Apple LLVM'):
-+ if out.startswith('Apple LLVM') or mesonlib.for_darwin(want_cross, self):
- return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap)
- if out.startswith('clang'):
- return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap)
-@@ -822,7 +822,7 @@
+ return GnuObjCCompiler(ccache + compiler, version, compiler_type, for_machine, is_cross, exe_wrap, defines)
+- if out.startswith('Apple LLVM') or out.startswith('Apple clang'):
++ if out.startswith('Apple LLVM') or out.startswith('Apple clang') or self.machines.build.is_darwin():
+ return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, for_machine, is_cross, exe_wrap)
+ if 'windows' in out:
+ return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_MINGW, for_machine, is_cross, exe_wrap)
+@@ -974,7 +974,7 @@
compiler_type = self.get_gnu_compiler_type(defines)
version = self.get_gnu_version_from_defines(defines)
- return GnuObjCPPCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines)
-- if out.startswith('Apple LLVM'):
-+ if out.startswith('Apple LLVM') or mesonlib.for_darwin(want_cross, self):
- return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap)
- if out.startswith('clang'):
- return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap)
+ return GnuObjCPPCompiler(ccache + compiler, version, compiler_type, for_machine, is_cross, exe_wrap, defines)
+- if out.startswith('Apple LLVM') or out.startswith('Apple clang'):
++ if out.startswith('Apple LLVM') or out.startswith('Apple clang') or self.machines.build.is_darwin():
+ return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, for_machine, is_cross, exe_wrap)
+ if 'windows' in out:
+ return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_MINGW, for_machine, is_cross, exe_wrap)
diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index f929d3105856..a07fc2643f6c 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
- name = "mill-${version}";
- version = "0.5.0";
+ pname = "mill";
+ version = "0.5.1";
src = fetchurl {
url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}";
- sha256 = "ecf83db96a32024f14b031ce458b1b3eed01e713265e16c42eb4a894a1a0d654";
+ sha256 = "1y5044m0qlwa1wlg7xkhg76agmfn7bgcf040wf56fvxhf0w78zjw";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index 796747bf6e9c..1c90bcc3a9f8 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "ninja-${version}";
+ pname = "ninja";
version = "1.9.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix
index 266dff8cf6ce..3d2759f025cc 100644
--- a/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/pkgs/development/tools/build-managers/qbs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qtscript }:
stdenv.mkDerivation rec {
- name = "qbs-${version}";
+ pname = "qbs";
version = "1.13.1";
diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix
index 98cd7e136d22..0b858f6f20d2 100644
--- a/pkgs/development/tools/build-managers/rebar/default.nix
+++ b/pkgs/development/tools/build-managers/rebar/default.nix
@@ -5,7 +5,8 @@ let
version = "2.5.1";
in
stdenv.mkDerivation {
- name = "rebar-${version}";
+ pname = "rebar";
+ inherit version;
src = fetchurl {
url = "https://github.com/rebar/rebar/archive/${version}.tar.gz";
diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
index 767cd70abcda..7d08bbf6df2c 100644
--- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
+++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, python2, which}:
-stdenv.mkDerivation rec {
- name = "redo-apenwarr-${version}";
+stdenv.mkDerivation {
+ pname = "redo-apenwarr";
version = "unstable-2019-06-21";
diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix
index 3036ef235845..19ce0b44bf72 100644
--- a/pkgs/development/tools/build-managers/redo-sh/default.nix
+++ b/pkgs/development/tools/build-managers/redo-sh/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2.0.3";
- name = "redo-sh-${version}";
+ pname = "redo-sh";
src = fetchurl {
url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz";
diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix
index 3eca6f02e45d..4d43812ebe65 100644
--- a/pkgs/development/tools/build-managers/remake/default.nix
+++ b/pkgs/development/tools/build-managers/remake/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, readline }:
stdenv.mkDerivation rec {
- name = "remake-${version}";
+ pname = "remake";
remakeVersion = "4.1";
dbgVersion = "1.1";
version = "${remakeVersion}+dbg-${dbgVersion}";
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index ba00a7078fc6..d32eba51ce17 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, jre }:
stdenv.mkDerivation rec {
- name = "sbt-${version}";
+ pname = "sbt";
version = "1.2.8";
src = fetchurl {
urls = [
- "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"
+ "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${pname}-${version}.tgz"
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
"https://cocl.us/sbt-${version}.tgz"
];
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 08644def517d..1655c154d4e5 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -8,7 +8,7 @@ in {
sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4";
};
scons_latest = mkScons {
- version = "3.1.0";
- sha256 = "0bqkrpk5j6wvlljpdsimazav44y43qkl9mzc4f8ig8nl73blixgk";
+ version = "3.1.1";
+ sha256 = "19a3j6x7xkmr2srk2yzxx3wv003h9cxx08vr81ps76blvmzl3sjc";
};
}
diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix
index 00345179131a..7f0cc8100ac0 100644
--- a/pkgs/development/tools/build-managers/shards/default.nix
+++ b/pkgs/development/tools/build-managers/shards/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, crystal, pcre, libyaml, which }:
stdenv.mkDerivation rec {
- name = "shards-${version}";
+ pname = "shards";
version = "0.9.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix
index 19256e39c33c..9b44b30d7775 100644
--- a/pkgs/development/tools/build-managers/tup/default.nix
+++ b/pkgs/development/tools/build-managers/tup/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fuse, pkgconfig, pcre }:
stdenv.mkDerivation rec {
- name = "tup-${version}";
+ pname = "tup";
version = "0.7.8";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix
index c3346ad7e993..f8bbda61627a 100644
--- a/pkgs/development/tools/build-managers/waf/default.nix
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -7,14 +7,14 @@ let
optionalString (!isNull withTools) " --tools=\"${concatStringsSep "," withTools}\"";
in
stdenv.mkDerivation rec {
- name = "waf-${version}";
- version = "2.0.15";
+ pname = "waf";
+ version = "2.0.18";
src = fetchFromGitLab {
owner = "ita1024";
repo = "waf";
- rev = name;
- sha256 = "0i86dbn6l01n4h4rzyl4mvizqabbqn5w7fywh83z7fxpha13c3bz";
+ rev = "${pname}-${version}";
+ sha256 = "1ifcanm2x2i8qwgfkwgdxwaqcdwsx5jg8bd1d6sqjps3pz7s5qxx";
};
patches = [
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 3ef3c75ca4ef..9e7856c9e3a9 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -2,36 +2,27 @@
, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp
}:
-let
- version = "1.10.1";
+buildGoPackage rec {
+ pname = "buildah";
+ version = "1.11.1";
src = fetchFromGitHub {
- rev = "v${version}";
owner = "containers";
repo = "buildah";
- sha256 = "0dki2v8j2jzbw49sdzcyjqbalbh70m0lgzrldgj6cc92mj896pxk";
+ rev = "v${version}";
+ sha256 = "0mbmb7994dcv8i41zgiqmb6qp5hawgygzam7mi4pmdygkx4ckkxw";
};
- goPackagePath = "github.com/containers/buildah";
-
-in buildGoPackage rec {
- name = "buildah-${version}";
- inherit src;
-
outputs = [ "bin" "man" "out" ];
- inherit goPackagePath;
+ goPackagePath = "github.com/containers/buildah";
excludedPackages = [ "tests" ];
- # Optimizations break compilation of libseccomp c bindings
- hardeningDisable = [ "fortify" ];
-
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ];
buildPhase = ''
pushd go/src/${goPackagePath}
- patchShebangs .
make GIT_COMMIT="unknown"
install -Dm755 buildah $bin/bin/buildah
'';
@@ -40,10 +31,10 @@ in buildGoPackage rec {
make -C docs install PREFIX="$man"
'';
- meta = {
+ meta = with stdenv.lib; {
description = "A tool which facilitates building OCI images";
- homepage = https://github.com/containers/buildah;
- maintainers = with stdenv.lib.maintainers; [ Profpatsch vdemeester ];
- license = stdenv.lib.licenses.asl20;
+ homepage = "https://github.com/containers/buildah";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ Profpatsch vdemeester ];
};
}
diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix
index 0b6742fbf43e..8ec2552aeffb 100644
--- a/pkgs/development/tools/cask/default.nix
+++ b/pkgs/development/tools/cask/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, python, emacsPackages }:
stdenv.mkDerivation rec {
- name = "cask-${version}";
+ pname = "cask";
version = "0.8.4";
src = fetchurl {
diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix
index e07b3cd9db74..8a1d81acaaa7 100644
--- a/pkgs/development/tools/casperjs/default.nix
+++ b/pkgs/development/tools/casperjs/default.nix
@@ -2,9 +2,10 @@
let version = "1.1.1";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
- name = "casperjs-${version}";
+ pname = "casperjs";
+ inherit version;
src = fetchFromGitHub {
owner = "casperjs";
diff --git a/pkgs/development/tools/check/default.nix b/pkgs/development/tools/check/default.nix
index dfa164e6755c..9ae1026c8583 100644
--- a/pkgs/development/tools/check/default.nix
+++ b/pkgs/development/tools/check/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "check-unstable-${version}";
+ pname = "check-unstable";
version = "2018-09-12";
rev = "88db195993f8e991ad402754accd0635490769f9";
diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix
index 921448855a64..d5c742014189 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerEnv, bundlerUpdateScript, ruby_2_4, perl, autoconf }:
-bundlerEnv rec {
+bundlerEnv {
pname = "chef-dk";
ruby = ruby_2_4;
diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix
index 0c8e6ff591bf..12289cbb68aa 100644
--- a/pkgs/development/tools/clog-cli/default.nix
+++ b/pkgs/development/tools/clog-cli/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "clog-cli-${version}";
+ pname = "clog-cli";
version = "0.9.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix
index 93809551f1d7..be39f6e36677 100644
--- a/pkgs/development/tools/cloudfoundry-cli/default.nix
+++ b/pkgs/development/tools/cloudfoundry-cli/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "cloudfoundry-cli-${version}";
+ pname = "cloudfoundry-cli";
version = "6.46.1";
goPackagePath = "code.cloudfoundry.org/cli";
diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix
index db7df2af7009..24aca0dada7b 100644
--- a/pkgs/development/tools/compile-daemon/default.nix
+++ b/pkgs/development/tools/compile-daemon/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "compile-daemon-unstable-${version}";
+ pname = "compile-daemon-unstable";
version = "2017-03-08";
rev = "d447e567232bcb84cedd3b2be012c7127f31f469";
diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index 192938473e05..4c8792cc6aa0 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -2,21 +2,27 @@
buildGoModule rec {
pname = "conftest";
- version = "0.7.0";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "instrumenta";
repo = "conftest";
rev = "v${version}";
- sha256 = "0qq2kp9h91rirlhml5vyzmi7rd4v3pkqjk2bn7mvdn578jnwww24";
+ sha256 = "0blrbbnvnnxyw0idhglqdz16i7g6g86a6kw2iw707bg0yfdl1ncq";
};
+ patches = [
+ # Version 0.12.0 does not build with go 1.13. See https://github.com/instrumenta/conftest/pull/85.
+ # TODO: Remove once https://github.com/instrumenta/conftest/pull/85 is merged and lands in a release.
+ ./go-1.13-deps.patch
+ ];
+
buildFlagsArray = ''
-ldflags=
-X main.version=${version}
'';
- modSha256 = "0c9phka7n2cfi8lf0a3prks2pjna5dgf5lj6az82iklnq4p7177y";
+ modSha256 = "11999ywy73ng45gl1qypky8342jvishcp11bdxbigvqhwl2zbpav";
meta = with lib; {
description = "Write tests against structured configuration data";
diff --git a/pkgs/development/tools/conftest/go-1.13-deps.patch b/pkgs/development/tools/conftest/go-1.13-deps.patch
new file mode 100644
index 000000000000..d03d4ed742a3
--- /dev/null
+++ b/pkgs/development/tools/conftest/go-1.13-deps.patch
@@ -0,0 +1,99 @@
+diff --git a/go.mod b/go.mod
+index a552a6b..a39703d 100644
+--- a/go.mod
++++ b/go.mod
+@@ -1,6 +1,6 @@
+ module github.com/instrumenta/conftest
+
+-go 1.12
++go 1.13
+
+ require (
+ cloud.google.com/go v0.39.0 // indirect
+@@ -43,12 +43,16 @@ require (
+ golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f // indirect
+ golang.org/x/oauth2 v0.0.0-20190523182746-aaccbc9213b0 // indirect
+ golang.org/x/sys v0.0.0-20190526052359-791d8a0f4d09 // indirect
++ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 // indirect
+ google.golang.org/appengine v1.6.0 // indirect
+ google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601 // indirect
+ )
+
+ replace (
++ git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
+ github.com/containerd/containerd => github.com/containerd/containerd v1.2.6
+ github.com/docker/docker => github.com/docker/docker v0.0.0-20190131205458-8a43b7bb99cd
+ github.com/golang/lint => golang.org/x/lint v0.0.0-20190409202823-959b441ac422
++ github.com/opencontainers/runc v1.0.1-0.20190307181833-2b18fe1d885e => github.com/opencontainers/runc v1.0.0-rc6.0.20190307181833-2b18fe1d885e
++ golang.org/x/crypto v0.0.0-20190129210102-0709b304e793 => golang.org/x/crypto v0.0.0-20180904163835-0709b304e793
+ )
+diff --git a/go.sum b/go.sum
+index 2441c4e..212ac69 100644
+--- a/go.sum
++++ b/go.sum
+@@ -10,7 +10,6 @@ dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl
+ dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
+ dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
+ dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
+-git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
+ github.com/Azure/azure-sdk-for-go v21.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+ github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
+ github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
+@@ -43,6 +42,7 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU
+ github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk=
+ github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod h1:LzD22aAzDP8/dyiCKFp31He4m2GPjl0AFyzDtZzUu9M=
+ github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
++github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+ github.com/apparentlymart/go-cidr v1.0.0 h1:lGDvXx8Lv9QHjrAVP7jyzleG4F9+FkRhJcEsDFxeb8w=
+ github.com/apparentlymart/go-cidr v1.0.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc=
+ github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
+@@ -132,13 +132,8 @@ github.com/docker/cli v0.0.0-20190511004558-53fc257292ad/go.mod h1:JLrzqnKDaYBop
+ github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+ github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
+ github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+-github.com/docker/docker v0.0.0-20180531152204-71cd53e4a197/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+ github.com/docker/docker v0.0.0-20190131205458-8a43b7bb99cd h1:h98Vus5/NAC3I4k243/B/KgCdpjCUK4lfxNEw2p/HAc=
+ github.com/docker/docker v0.0.0-20190131205458-8a43b7bb99cd/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+-github.com/docker/docker v1.14.0-0.20190131205458-8a43b7bb99cd h1:adRHD5aU4yFK0L4yZwjY3SyWapVmPdq1h19eJdgYUfs=
+-github.com/docker/docker v1.14.0-0.20190131205458-8a43b7bb99cd/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+-github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c h1:rZ+3jNsgjvYgdZ0Nrd4Udrv8rneDbWBohAPuXsTsvGU=
+-github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+ github.com/docker/docker-credential-helpers v0.6.0/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
+ github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
+ github.com/docker/docker-credential-helpers v0.6.2 h1:CrW9H1VMf3a4GrtyAi7IUJjkJVpwBBpX0+mvkvYJaus=
+@@ -214,6 +209,7 @@ github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPg
+ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+ github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+ github.com/google/shlex v0.0.0-20150127133951-6f45313302b9/go.mod h1:RpwtwJQFrIEPstU94h88MWPXP2ektJZ8cZ0YntAmXiE=
++github.com/googleapis/gax-go v2.0.0+incompatible h1:j0GKcs05QVmm7yesiZq2+9cxHkNK9YM6zKx4D2qucQU=
+ github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
+ github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
+ github.com/googleapis/gax-go/v2 v2.0.4 h1:hU4mGcQI4DaAYW+IbTun+2qEZVFxK0ySjQLTbS0VQKc=
+@@ -407,8 +403,8 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM
+ github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y=
+ github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+ github.com/opencontainers/runc v1.0.0-rc6/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+-github.com/opencontainers/runc v1.0.1-0.20190307181833-2b18fe1d885e h1:+uPGJuuDl61O9GKN/rLHkUCf597mpxmJI06RqMQX81A=
+-github.com/opencontainers/runc v1.0.1-0.20190307181833-2b18fe1d885e/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
++github.com/opencontainers/runc v1.0.0-rc6.0.20190307181833-2b18fe1d885e h1:9wcty7nGPPNkY8/VsiZkjmMB8x7SydrklJE+vCr4uDg=
++github.com/opencontainers/runc v1.0.0-rc6.0.20190307181833-2b18fe1d885e/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+ github.com/opencontainers/runtime-spec v0.0.0-20180909173843-eba862dc2470/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+ github.com/opentracing-contrib/go-stdlib v0.0.0-20171029140428-b1a47cfbdd75/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w=
+ github.com/opentracing/opentracing-go v0.0.0-20171003133519-1361b9cd60be/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+@@ -587,7 +583,6 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
+ golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+ golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+-golang.org/x/crypto v0.0.0-20190129210102-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+ golang.org/x/crypto v0.0.0-20190129210102-ccddf3741a0c/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+ golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+ golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+@@ -679,6 +674,8 @@ golang.org/x/tools v0.0.0-20190425150028-36563e24a262 h1:qsl9y/CJx34tuA7QCPNp86J
+ golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+ golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 h1:PPwnA7z1Pjf7XYaBP9GL1VAMZmcIWyFz7QCMSIIa3Bg=
+ golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
++golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
++golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+ google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
+ google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
+ google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix
index b2b903b095c6..9aaf886ef067 100644
--- a/pkgs/development/tools/container-linux-config-transpiler/default.nix
+++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix
@@ -3,7 +3,7 @@
with lib;
buildGoPackage rec {
- name = "ct-${version}";
+ pname = "ct";
version = "0.7.0";
goPackagePath = "github.com/coreos/container-linux-config-transpiler";
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
index ba0be89abf3d..d9f7237d2897 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
@@ -5,7 +5,8 @@ let
goPackagePath = "github.com/buildkite/agent";
in
buildGoPackage {
- name = "buildkite-agent-${version}";
+ pname = "buildkite-agent";
+ inherit version;
inherit goPackagePath src postPatch;
diff --git a/pkgs/development/tools/continuous-integration/cide/Gemfile b/pkgs/development/tools/continuous-integration/cide/Gemfile
deleted file mode 100644
index 7e72ac0529d6..000000000000
--- a/pkgs/development/tools/continuous-integration/cide/Gemfile
+++ /dev/null
@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem 'cide'
-
-# Optional dependency, only used by `cide upload`
-gem 'aws-sdk', '~> 2'
diff --git a/pkgs/development/tools/continuous-integration/cide/Gemfile.lock b/pkgs/development/tools/continuous-integration/cide/Gemfile.lock
deleted file mode 100644
index 736b2bfca1a2..000000000000
--- a/pkgs/development/tools/continuous-integration/cide/Gemfile.lock
+++ /dev/null
@@ -1,40 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- aws-sdk (2.2.17)
- aws-sdk-resources (= 2.2.17)
- aws-sdk-core (2.2.17)
- jmespath (~> 1.0)
- aws-sdk-resources (2.2.17)
- aws-sdk-core (= 2.2.17)
- axiom-types (0.1.1)
- descendants_tracker (~> 0.0.4)
- ice_nine (~> 0.11.0)
- thread_safe (~> 0.3, >= 0.3.1)
- cide (0.9.0)
- thor (~> 0.19)
- virtus (~> 1.0)
- coercible (1.0.0)
- descendants_tracker (~> 0.0.1)
- descendants_tracker (0.0.4)
- thread_safe (~> 0.3, >= 0.3.1)
- equalizer (0.0.11)
- ice_nine (0.11.2)
- jmespath (1.1.3)
- thor (0.19.1)
- thread_safe (0.3.5)
- virtus (1.0.5)
- axiom-types (~> 0.1)
- coercible (~> 1.0)
- descendants_tracker (~> 0.0, >= 0.0.3)
- equalizer (~> 0.0, >= 0.0.9)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- aws-sdk (~> 2)
- cide
-
-BUNDLED WITH
- 1.10.6
diff --git a/pkgs/development/tools/continuous-integration/cide/default.nix b/pkgs/development/tools/continuous-integration/cide/default.nix
deleted file mode 100644
index fe83a9aa1704..000000000000
--- a/pkgs/development/tools/continuous-integration/cide/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, docker, git, gnutar, gzip }:
-
-stdenv.mkDerivation rec {
- name = "cide-${version}";
- version = "0.9.0";
-
- env = bundlerEnv {
- name = "${name}-gems";
-
- gemdir = ./.;
- };
-
- phases = ["installPhase"];
-
- buildInputs = [ makeWrapper ];
-
- installPhase = ''
- mkdir -p $out/bin
- makeWrapper ${env}/bin/cide $out/bin/cide \
- --set PATH ${stdenv.lib.makeBinPath [ docker git gnutar gzip ]}
- '';
-
- passthru.updateScript = bundlerUpdateScript "cide";
-
- meta = with lib; {
- description = "Isolated test runner with Docker";
- homepage = http://zimbatm.github.io/cide/;
- license = licenses.mit;
- maintainers = with maintainers; [ zimbatm nicknovitski ];
- platforms = docker.meta.platforms;
- };
-}
diff --git a/pkgs/development/tools/continuous-integration/cide/gemset.nix b/pkgs/development/tools/continuous-integration/cide/gemset.nix
deleted file mode 100644
index df8f7c9f2088..000000000000
--- a/pkgs/development/tools/continuous-integration/cide/gemset.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{
- virtus = {
- dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
- source = {
- sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk";
- type = "gem";
- };
- version = "1.0.5";
- };
- thread_safe = {
- source = {
- sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr";
- type = "gem";
- };
- version = "0.3.5";
- };
- thor = {
- source = {
- sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
- type = "gem";
- };
- version = "0.19.1";
- };
- jmespath = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0vpvd61kc60f98jn28kw7x7vi82qrwgglam42nvzh98i43yxwsfb";
- type = "gem";
- };
- version = "1.1.3";
- };
- ice_nine = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
- type = "gem";
- };
- version = "0.11.2";
- };
- equalizer = {
- source = {
- sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
- type = "gem";
- };
- version = "0.0.11";
- };
- descendants_tracker = {
- dependencies = ["thread_safe"];
- source = {
- sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79";
- type = "gem";
- };
- version = "0.0.4";
- };
- coercible = {
- dependencies = ["descendants_tracker"];
- source = {
- sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah";
- type = "gem";
- };
- version = "1.0.0";
- };
- cide = {
- version = "0.9.0";
- source = {
- type = "gem";
- remotes = ["https://rubygems.org"];
- sha256 = "1wykwv0jnrh49jm9zsy1cb5wddv65iw4ixh072hr242wb83dcyl0";
- };
- };
- axiom-types = {
- dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
- source = {
- sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1";
- type = "gem";
- };
- version = "0.1.1";
- };
- aws-sdk-resources = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0vdnpjmil99n9d1fpk1w6ssgvmzx4wfmrqcij8nyd0iqdaacx3fj";
- type = "gem";
- };
- version = "2.2.17";
- };
- aws-sdk-core = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1vq7ny5n3rdfzkdqdm76r48slmp2a5v7565llrl4bw5hb5k4p75z";
- type = "gem";
- };
- version = "2.2.17";
- };
- aws-sdk = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1cwycrdk21blzjzf8fj1wlmdix94rj9aixj6phx6lwbqykn2dzx9";
- type = "gem";
- };
- version = "2.2.17";
- };
-}
\ No newline at end of file
diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
index 4a4708df32dd..b20d5cfbeee1 100644
--- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "drone-cli-${version}";
+ pname = "drone-cli";
version = "0.8.6";
revision = "v${version}";
goPackagePath = "github.com/drone/drone-cli";
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index 81dbc54cece0..53ad6f4c2f61 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildGoPackage, go-bindata, go-bindata-assetfs }:
buildGoPackage rec {
- name = "drone.io-${version}";
+ pname = "drone.io";
version = "0.8.6-20180727-${stdenv.lib.strings.substring 0 7 revision}";
revision = "c48150767c2700d35dcc29b110a81c8b5969175e";
goPackagePath = "github.com/drone/drone";
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 62c682a1608f..d8b18fcd121e 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -15,7 +15,7 @@ let
in
buildGoPackage rec {
inherit version;
- name = "gitlab-runner-${version}";
+ pname = "gitlab-runner";
goPackagePath = "gitlab.com/gitlab-org/gitlab-runner";
commonPackagePath = "${goPackagePath}/common";
buildFlagsArray = ''
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index a381d65b357c..26647370821a 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "jenkins-${version}";
+ pname = "jenkins";
version = "2.176.3";
src = fetchurl {
diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index 5554455b8894..09e6513d2b16 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -7,7 +7,7 @@ let
};
in
stdenv.mkDerivation rec {
- name = "coursier-${version}";
+ pname = "coursier";
version = "2.0.0-RC3-3";
src = fetchurl {
diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix
index 553d622a83c6..47f625736750 100644
--- a/pkgs/development/tools/database/cdb/default.nix
+++ b/pkgs/development/tools/database/cdb/default.nix
@@ -16,7 +16,8 @@ let
};
in stdenv.mkDerivation {
- name = "cdb-${version}";
+ pname = "cdb";
+ inherit version;
src = fetchurl {
url = "https://cr.yp.to/cdb/cdb-${version}.tar.gz";
diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix
index 7eb34aa29ba4..11b84648632d 100644
--- a/pkgs/development/tools/database/dbmate/default.nix
+++ b/pkgs/development/tools/database/dbmate/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "dbmate-${version}";
+ pname = "dbmate";
version = "1.4.1";
goPackagePath = "github.com/amacneil/dbmate";
diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix
index e136b180d78c..8feca8c62ca8 100644
--- a/pkgs/development/tools/database/ephemeralpg/default.nix
+++ b/pkgs/development/tools/database/ephemeralpg/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, postgresql, getopt, makeWrapper }:
stdenv.mkDerivation rec {
- name = "ephemeralpg-${version}";
+ pname = "ephemeralpg";
version = "2.5";
src = fetchurl {
- url = "http://ephemeralpg.org/code/${name}.tar.gz";
+ url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz";
sha256 = "004fcll7248h73adkqawn9bhkqj9wsxyi3w99x64f7s37r2518wk";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 4589e6ff4e5b..637519bcf3fb 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -21,12 +21,11 @@ let
in
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "liquibase";
version = "3.6.2";
src = fetchurl {
- url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz";
+ url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${pname}-${version}-bin.tar.gz";
sha256 = "199ybjk0xxsg04v5x5l4arljmzj96hxva6ym6bp7av7dny0nqvfx";
};
@@ -48,10 +47,10 @@ stdenv.mkDerivation rec {
cp ${logback-core} ${logback-classic} ${slf4j} $out/lib
# Clean up documentation.
- mkdir -p $out/share/doc/${name}
+ mkdir -p $out/share/doc/${pname}-${version}
mv $out/LICENSE.txt \
$out/README.txt \
- $out/share/doc/${name}
+ $out/share/doc/${pname}-${version}
# Remove silly files.
rm $out/liquibase.bat $out/liquibase.spec
diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix
index 0390e7b86bbc..a83b5a219440 100644
--- a/pkgs/development/tools/database/pyrseas/default.nix
+++ b/pkgs/development/tools/database/pyrseas/default.nix
@@ -1,7 +1,7 @@
{ stdenv, pythonPackages, fetchFromGitHub }:
let
- pgdbconn = pythonPackages.buildPythonPackage rec {
+ pgdbconn = pythonPackages.buildPythonPackage {
pname = "pgdbconn";
version = "0.8.0";
src = fetchFromGitHub {
@@ -19,7 +19,7 @@ let
};
in
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
pname = "pyrseas";
version = "0.8.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix
index 128921a67d7a..d4e57adc140c 100644
--- a/pkgs/development/tools/database/schemaspy/default.nix
+++ b/pkgs/development/tools/database/schemaspy/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "6.0.0-rc2";
- name = "schemaspy-${version}";
+ pname = "schemaspy";
src = fetchurl {
- url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${name}.jar";
+ url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${pname}-${version}.jar";
sha256 = "0ph1l62hy163m2hgybhkccqbcj6brna1vdbr7536zc37lzjxq9rn";
};
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
];
installPhase = ''
- install -D ${src} "$out/share/java/${name}.jar"
+ install -D ${src} "$out/share/java/${pname}-${version}.jar"
makeWrapper ${jre}/bin/java $out/bin/schemaspy \
- --add-flags "-jar $out/share/java/${name}.jar" \
+ --add-flags "-jar $out/share/java/${pname}-${version}.jar" \
--prefix PATH : "$wrappedPath"
'';
diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix
index f65347889382..2ba38905af9c 100644
--- a/pkgs/development/tools/database/shmig/default.nix
+++ b/pkgs/development/tools/database/shmig/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "shmig-${version}";
+ pname = "shmig";
version = "1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/development/tools/database/sqlcheck/default.nix
index 867aa0b98eca..33b2abce277b 100644
--- a/pkgs/development/tools/database/sqlcheck/default.nix
+++ b/pkgs/development/tools/database/sqlcheck/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "sqlcheck-${version}";
+ pname = "sqlcheck";
version = "1.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/database/sqldeveloper/18.2.nix b/pkgs/development/tools/database/sqldeveloper/18.2.nix
index adb22f45c8e1..070c7c81c403 100644
--- a/pkgs/development/tools/database/sqldeveloper/18.2.nix
+++ b/pkgs/development/tools/database/sqldeveloper/18.2.nix
@@ -13,10 +13,10 @@ let
categories = "Application;Development;";
};
in
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
inherit version;
- name = "sqldeveloper-${version}";
+ pname = "sqldeveloper";
src = requireFile rec {
name = "sqldeveloper-${version}-no-jre.zip";
diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index 45e8ba4f7c02..9e75088aa5cb 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -13,10 +13,10 @@ let
categories = "Application;Development;";
};
in
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
inherit version;
- name = "sqldeveloper-${version}";
+ pname = "sqldeveloper";
src = requireFile rec {
name = "sqldeveloper-${version}-no-jre.zip";
diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix
index 5eb7651f199b..ca04d209fabb 100644
--- a/pkgs/development/tools/database/squirrel-sql/default.nix
+++ b/pkgs/development/tools/database/squirrel-sql/default.nix
@@ -7,7 +7,8 @@
let
version = "3.9.1";
in stdenv.mkDerivation rec {
- name = "squirrel-sql-${version}";
+ pname = "squirrel-sql";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip";
diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix
index f9ca826cd620..685b9d2f13d5 100644
--- a/pkgs/development/tools/dcadec/default.nix
+++ b/pkgs/development/tools/dcadec/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = pname + "-" + version;
pname = "dcadec";
version = "0.2.0";
diff --git a/pkgs/development/tools/deadcode/default.nix b/pkgs/development/tools/deadcode/default.nix
index fbed4e905cfc..7d106e5a2516 100644
--- a/pkgs/development/tools/deadcode/default.nix
+++ b/pkgs/development/tools/deadcode/default.nix
@@ -6,7 +6,7 @@
# TODO(yl): should we package https://github.com/remyoudompheng/go-misc instead of
# the standalone extract of deadcode from it?
buildGoPackage rec {
- name = "deadcode-unstable-${version}";
+ pname = "deadcode-unstable";
version = "2016-07-24";
rev = "210d2dc333e90c7e3eedf4f2242507a8e83ed4ab";
diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
index 172e81e1369e..db232561add0 100644
--- a/pkgs/development/tools/deis/default.nix
+++ b/pkgs/development/tools/deis/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "deis-${version}";
+ pname = "deis";
version = "1.13.4";
rev = "v${version}";
diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix
index 4285a6745591..a344bcf91d83 100644
--- a/pkgs/development/tools/deisctl/default.nix
+++ b/pkgs/development/tools/deisctl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "deis-${version}";
+ pname = "deis";
version = "1.13.3";
rev = "v${version}";
diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix
index a0bd4e12063e..fc38f3edb47a 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "delve-${version}";
+ pname = "delve";
version = "1.2.0";
goPackagePath = "github.com/go-delve/delve";
diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix
index a486d786c374..d807e79f9edf 100644
--- a/pkgs/development/tools/dep/default.nix
+++ b/pkgs/development/tools/dep/default.nix
@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "dep-${version}";
- version = "0.5.1";
+ pname = "dep";
+ version = "0.5.4";
rev = "v${version}";
goPackagePath = "github.com/golang/dep";
@@ -12,7 +12,7 @@ buildGoPackage rec {
inherit rev;
owner = "golang";
repo = "dep";
- sha256 = "1a5vq5v3ikg6iysbywxr5hcjnbv76nzhk50rd3iq3v2fnyq38dv2";
+ sha256 = "02akzbjar1v01rdal746vk6mklff29yk2mqfyjk1zrs0mlg38ygd";
};
buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}");
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index b23745a7b493..3108ffdcbba9 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -7,7 +7,6 @@
} :
pythonPackages.buildPythonApplication rec {
- name = "${pname}-${version}";
pname = "devpi-client";
version = "4.1.0";
diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix
index d883af1b0686..d42152882674 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@@ -1,20 +1,21 @@
- { stdenv, python3Packages, nginx }:
+{ stdenv, python3Packages, nginx }:
python3Packages.buildPythonApplication rec {
- name = "${pname}-${version}";
pname = "devpi-server";
- version = "4.9.0";
+ version = "5.1.0";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "0cx0nv1qqv8lg6p1v8dv5val0dxnc3229c15imibl9wrhrffjbg9";
+ sha256 = "254fceee846532a5fec4e6bf52a59eb8f236efc657678a542b5200da4bb3abbc";
};
propagatedBuildInputs = with python3Packages; [
+ py
appdirs
devpi-common
execnet
itsdangerous
+ repoze_lru
passlib
pluggy
pyramid
@@ -24,13 +25,12 @@ python3Packages.buildPythonApplication rec {
checkInputs = with python3Packages; [
beautifulsoup4
- mock
nginx
pytest
- pytest-flakes
+ pytest-flake8
pytestpep8
webtest
- ];
+ ] ++ stdenv.lib.optionals isPy27 [ mock ];
# test_genconfig.py needs devpi-server on PATH
checkPhase = ''
diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix
index dcaa43156699..b3134b0d0ad0 100644
--- a/pkgs/development/tools/devtodo/default.nix
+++ b/pkgs/development/tools/devtodo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, readline, ncurses }:
stdenv.mkDerivation rec {
- name = "devtodo-${version}";
+ pname = "devtodo";
version = "0.1.20";
src = fetchurl {
- url = "https://swapoff.org/files/devtodo/${name}.tar.gz";
+ url = "https://swapoff.org/files/devtodo/${pname}-${version}.tar.gz";
sha256 = "029y173njydzlznxmdizrrz4wcky47vqhl87fsb7xjcz9726m71p";
};
diff --git a/pkgs/development/tools/diesel-cli/allow-warnings.patch b/pkgs/development/tools/diesel-cli/allow-warnings.patch
new file mode 100644
index 000000000000..342ac1baa102
--- /dev/null
+++ b/pkgs/development/tools/diesel-cli/allow-warnings.patch
@@ -0,0 +1,88 @@
+diff --git a/diesel/src/lib.rs b/diesel/src/lib.rs
+index 4e743eb4..97c53ed8 100644
+--- a/diesel/src/lib.rs
++++ b/diesel/src/lib.rs
+@@ -131,7 +131,6 @@
+ #![cfg_attr(feature = "unstable", feature(specialization, try_from))]
+ // Built-in Lints
+ #![deny(
+- warnings,
+ missing_debug_implementations,
+ missing_copy_implementations,
+ missing_docs
+diff --git a/diesel_cli/src/main.rs b/diesel_cli/src/main.rs
+index 741ca003..cf93bb8f 100644
+--- a/diesel_cli/src/main.rs
++++ b/diesel_cli/src/main.rs
+@@ -1,5 +1,5 @@
+ // Built-in Lints
+-#![deny(warnings, missing_copy_implementations)]
++#![deny(missing_copy_implementations)]
+ // Clippy lints
+ #![allow(clippy::option_map_unwrap_or_else, clippy::option_map_unwrap_or)]
+ #![warn(
+diff --git a/diesel_cli/tests/tests.rs b/diesel_cli/tests/tests.rs
+index 2edee846..c96917c4 100644
+--- a/diesel_cli/tests/tests.rs
++++ b/diesel_cli/tests/tests.rs
+@@ -1,5 +1,3 @@
+-#![deny(warnings)]
+-
+ extern crate chrono;
+ extern crate diesel;
+ #[macro_use]
+diff --git a/diesel_derives/src/lib.rs b/diesel_derives/src/lib.rs
+index 2c43b2a3..44dcf3f9 100644
+--- a/diesel_derives/src/lib.rs
++++ b/diesel_derives/src/lib.rs
+@@ -1,6 +1,6 @@
+ #![recursion_limit = "1024"]
+ // Built-in Lints
+-#![deny(warnings, missing_copy_implementations)]
++#![deny(missing_copy_implementations)]
+ // Clippy lints
+ #![allow(
+ clippy::needless_pass_by_value,
+diff --git a/diesel_derives/tests/tests.rs b/diesel_derives/tests/tests.rs
+index 636fea66..f86f3dcc 100644
+--- a/diesel_derives/tests/tests.rs
++++ b/diesel_derives/tests/tests.rs
+@@ -1,5 +1,3 @@
+-#![deny(warnings)]
+-
+ #[macro_use]
+ extern crate cfg_if;
+ #[macro_use]
+diff --git a/diesel_migrations/migrations_internals/src/lib.rs b/diesel_migrations/migrations_internals/src/lib.rs
+index 933e21a8..7c4d0222 100644
+--- a/diesel_migrations/migrations_internals/src/lib.rs
++++ b/diesel_migrations/migrations_internals/src/lib.rs
+@@ -1,5 +1,5 @@
+ // Built-in Lints
+-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)]
++#![deny(missing_debug_implementations, missing_copy_implementations)]
+ // Clippy lints
+ #![allow(
+ clippy::option_map_unwrap_or_else,
+diff --git a/diesel_migrations/migrations_macros/src/lib.rs b/diesel_migrations/migrations_macros/src/lib.rs
+index 0a83234e..2f509c04 100644
+--- a/diesel_migrations/migrations_macros/src/lib.rs
++++ b/diesel_migrations/migrations_macros/src/lib.rs
+@@ -1,5 +1,5 @@
+ // Built-in Lints
+-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)]
++#![deny(missing_debug_implementations, missing_copy_implementations)]
+ // Clippy lints
+ #![allow(
+ clippy::option_map_unwrap_or_else,
+diff --git a/diesel_migrations/src/lib.rs b/diesel_migrations/src/lib.rs
+index c85414e5..f025f237 100644
+--- a/diesel_migrations/src/lib.rs
++++ b/diesel_migrations/src/lib.rs
+@@ -1,5 +1,5 @@
+ // Built-in Lints
+-#![deny(warnings, missing_copy_implementations)]
++#![deny(missing_copy_implementations)]
+ // Clippy lints
+ #![allow(
+ clippy::needless_pass_by_value,
diff --git a/pkgs/development/tools/diesel-cli/cargo-lock.patch b/pkgs/development/tools/diesel-cli/cargo-lock.patch
new file mode 100644
index 000000000000..26d583f9a11d
--- /dev/null
+++ b/pkgs/development/tools/diesel-cli/cargo-lock.patch
@@ -0,0 +1,1589 @@
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 0000000..f20a5bf
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,1583 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "advanced-blog-cli"
++version = "0.1.0"
++dependencies = [
++ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bcrypt 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "structopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "structopt-derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "aho-corasick"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "aho-corasick"
++version = "0.6.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "all_about_inserts"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "all_about_inserts_mysql"
++version = "0.1.0"
++dependencies = [
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "all_about_inserts_sqlite"
++version = "0.1.0"
++dependencies = [
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "all_about_updates"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ansi_term"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "assert_matches"
++version = "1.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "atty"
++version = "0.2.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "autocfg"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "backtrace"
++version = "0.3.35"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "backtrace-sys"
++version = "0.1.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "barrel"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "base64"
++version = "0.9.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "bcrypt"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "bigdecimal"
++version = "0.0.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "bitflags"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "bumpalo"
++version = "2.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "byteorder"
++version = "1.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "c2-chacha"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cc"
++version = "1.0.41"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "cfg-if"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "chrono"
++version = "0.4.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "js-sys 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "clap"
++version = "2.33.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cloudabi"
++version = "0.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "derive-error-chain"
++version = "0.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel"
++version = "1.4.0"
++dependencies = [
++ "bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "r2d2 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel"
++version = "1.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_cli"
++version = "1.4.0"
++dependencies = [
++ "barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_1_mysql"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_1_pg"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_1_sqlite"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_2_mysql"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_2_pg"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_2_sqlite"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_3_mysql"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_3_pg"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_demo_step_3_sqlite"
++version = "0.1.0"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_derives"
++version = "1.4.0"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_derives"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++replace = "diesel_derives 1.4.0"
++
++[[package]]
++name = "diesel_infer_schema"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "infer_schema_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_migrations"
++version = "1.4.0"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "migrations_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "diesel_migrations"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++replace = "diesel_migrations 1.4.0"
++
++[[package]]
++name = "diesel_tests"
++version = "0.1.0"
++dependencies = [
++ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.0",
++ "diesel_infer_schema 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++ "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "difference"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "dotenv"
++version = "0.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "derive-error-chain 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "env_logger"
++version = "0.3.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "error-chain"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "fuchsia-cprng"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "gcc"
++version = "0.3.55"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "getrandom"
++version = "0.1.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "idna"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "infer_schema_internals"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "infer_schema_macros"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "infer_schema_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ipnetwork"
++version = "0.13.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "itoa"
++version = "0.4.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "js-sys"
++version = "0.3.27"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "kernel32-sys"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "libc"
++version = "0.2.62"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "libsqlite3-sys"
++version = "0.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "lock_api"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "lock_api"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "log"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "log"
++version = "0.4.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "matches"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "memchr"
++version = "0.1.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "memchr"
++version = "2.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "migrations_internals"
++version = "1.4.0"
++dependencies = [
++ "barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "migrations_internals"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++replace = "migrations_internals 1.4.0"
++
++[[package]]
++name = "migrations_macros"
++version = "1.4.0"
++dependencies = [
++ "migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "migrations_macros"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++replace = "migrations_macros 1.4.0"
++
++[[package]]
++name = "mysqlclient-sys"
++version = "0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-bigint"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-integer"
++version = "0.1.41"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot_core"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "parking_lot_core"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "percent-encoding"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "pkg-config"
++version = "0.3.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "pq-sys"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "proc-macro2"
++version = "0.4.30"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quickcheck"
++version = "0.4.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quote"
++version = "0.3.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "quote"
++version = "0.6.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quote"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "r2d2"
++version = "0.8.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "scheduled-thread-pool 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.3.23"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.6.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rand_core"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_isaac"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_jitter"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_os"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_pcg"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_xorshift"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rdrand"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.1.56"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "regex"
++version = "0.1.80"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "regex"
++version = "0.2.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "regex-syntax"
++version = "0.5.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "remove_dir_all"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rust-crypto"
++version = "0.2.36"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rustc-demangle"
++version = "0.1.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rustc-serialize"
++version = "0.3.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rustc_version"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ryu"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "safemem"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "scheduled-thread-pool"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "scopeguard"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "semver"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "semver-parser"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "serde"
++version = "1.0.99"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.99"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "serde_json"
++version = "1.0.40"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "smallvec"
++version = "0.6.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "strsim"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "structopt"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "structopt-derive"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "syn"
++version = "0.11.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "syn"
++version = "0.15.44"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "syn"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "synom"
++version = "0.11.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tempdir"
++version = "0.3.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tempfile"
++version = "2.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tempfile"
++version = "3.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "textwrap"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "thread-id"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "thread_local"
++version = "0.2.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "thread_local"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "time"
++version = "0.1.42"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "toml"
++version = "0.4.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ucd-util"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-bidi"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-normalization"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-width"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "url"
++version = "1.7.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "utf8-ranges"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "utf8-ranges"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "uuid"
++version = "0.6.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "uuid"
++version = "0.7.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "vcpkg"
++version = "0.2.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "vec_map"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "wasi"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "wasm-bindgen"
++version = "0.2.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wasm-bindgen-backend"
++version = "0.2.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wasm-bindgen-macro"
++version = "0.2.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-macro-support 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wasm-bindgen-macro-support"
++version = "0.2.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-backend 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wasm-bindgen-shared"
++version = "0.2.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "winapi-build"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[metadata]
++"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
++"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5"
++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
++"checksum assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5"
++"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
++"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875"
++"checksum backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "1371048253fa3bac6704bfd6bbfc922ee9bdcee8881330d40f308b81cc5adc55"
++"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b"
++"checksum barrel 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f2016bcea86b2a1a807753dc2b6ba682fa24e14e50c7474f4b1a0330949c86fb"
++"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
++"checksum bcrypt 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4a6f09cde06fb2cd52a77123c36bfd1e8e60cf13a8bac6ba8f451dabff4644c8"
++"checksum bigdecimal 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "679e21a6734fdfc63378aea80c2bf31e6ac8ced21ed33e1ee37f8f7bf33c2056"
++"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
++"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708"
++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
++"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
++"checksum cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff"
++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
++"checksum chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "27429a03ca54100bf6bdc726c09adc46a74187ac93f9ce96dc7aaa9594ebf707"
++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
++"checksum derive-error-chain 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c9ca9ade651388daad7c993f005d0d20c4f6fe78c1cdc93e95f161c6f5ede4a"
++"checksum diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d24935ba50c4a8dc375a0fd1f8a2ba6bdbdc4125713126a74b965d6a01a06d7"
++"checksum diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "62a27666098617d52c487a41f70de23d44a1dc1f3aa5877ceba2790fb1f1cab4"
++"checksum diesel_infer_schema 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7bea70d0798a3d8489e1d5493bb2111a1ab2da434191b9e9605f167c01a20680"
++"checksum diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c"
++"checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8"
++"checksum dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d6f0e2bb24d163428d8031d3ebd2d2bd903ad933205a97d0f18c7c1aade380f3"
++"checksum env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f"
++"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
++"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
++"checksum getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "fc344b02d3868feb131e8b5fe2b9b0a1cc42942679af493061fc13b853243872"
++"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
++"checksum infer_schema_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "90e390df38a4e5cb4337a76db5b736f239e08f3ab7e8e42a34548617f0113f64"
++"checksum infer_schema_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07b667b471ef99645989ceea451be288b6e669eeb8951d3f0fbd310677588ac6"
++"checksum ipnetwork 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d1d8b990621b5b0806fac3dbf71d1833a4c0a9e25702d10bd8b2c629c7ae01c"
++"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
++"checksum js-sys 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "1efc4f2a556c58e79c5500912e221dd826bec64ff4aabd8ce71ccef6da02d7d4"
++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
++"checksum libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd6457c70bbff456d9fe49deaba35ec47c3e598bf8d7950ff0575ceb7a8a6ad1"
++"checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff"
++"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc"
++"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
++"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
++"checksum migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8089920229070f914b9ce9b07ef60e175b2b9bc2d35c3edd8bf4433604e863b9"
++"checksum migrations_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1664412abf7db2b8a6d58be42a38b099780cc542b5b350383b805d88932833fe"
++"checksum mysqlclient-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7e9637d93448044078aaafea7419aed69d301b4a12bcc4aa0ae856eb169bef85"
++"checksum num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "57450397855d951f1a41305e54851b1a7b8f5d2e349543a02a2effe25459f718"
++"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
++"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
++"checksum parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7767817701cce701d5585b9c4db3cdd02086398322c1d7e8bf5094a96a2ce7"
++"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
++"checksum parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb88cb1cb3790baa6776844f968fea3be44956cf184fa1be5a03341f5491278c"
++"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
++"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
++"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af"
++"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
++"checksum pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac25eee5a0582f45a67e837e350d784e7003bd29a5f460796772061ca49ffda"
++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
++"checksum proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "175a40b9cf564ce9bf050654633dbf339978706b8ead1a907bb970b63185dd95"
++"checksum quickcheck 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "02c2411d418cea2364325b18a205664f9ef8252e06b2e911db97c0b0d98b1406"
++"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
++"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
++"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
++"checksum r2d2 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bc42ce75d9f4447fb2a04bbe1ed5d18dd949104572850ec19b164e274919f81b"
++"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c"
++"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
++"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c"
++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
++"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
++"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
++"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
++"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
++"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
++"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
++"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
++"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
++"checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"
++"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
++"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
++"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
++"checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"
++"checksum scheduled-thread-pool 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bd07742e081ff6c077f5f6b283f12f32b9e7cc765b316160d66289b74546fbb3"
++"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
++"checksum serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "fec2851eb56d010dc9a21b89ca53ee75e6528bab60c11e89d38390904982da9f"
++"checksum serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "cb4dc18c61206b08dc98216c98faa0232f4337e1e1b8574551d5bad29ea1b425"
++"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704"
++"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
++"checksum structopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "783cb22d520b177a3772e520d04a3c7970d51c3b647ba80739f99be01131b54f"
++"checksum structopt-derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4da119c9a7a1eccb7c6de0c1eb3f7ed1c11138624d092b3687222aeed8f1375c"
++"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
++"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
++"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
++"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
++"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
++"checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0"
++"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
++"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
++"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
++"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
++"checksum ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874"
++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
++"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
++"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
++"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
++"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
++"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
++"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
++"checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
++"checksum uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363"
++"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
++"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95"
++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
++"checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7"
++"checksum wasm-bindgen 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "dcddca308b16cd93c2b67b126c688e5467e4ef2e28200dc7dfe4ae284f2faefc"
++"checksum wasm-bindgen-backend 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "f805d9328b5fc7e5c6399960fd1889271b9b58ae17bdb2417472156cc9fafdd0"
++"checksum wasm-bindgen-macro 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "3ff88201a482abfc63921621f6cb18eb1efd74f136b05e5841e7f8ca434539e9"
++"checksum wasm-bindgen-macro-support 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "6a433d89ecdb9f77d46fcf00c8cf9f3467b7de9954d8710c175f61e2e245bb0e"
++"checksum wasm-bindgen-shared 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "d41fc1bc3570cdf8d108c15e014045fd45a95bb5eb36605f96a90461fc34027d"
++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix
new file mode 100644
index 000000000000..f6a67b051146
--- /dev/null
+++ b/pkgs/development/tools/diesel-cli/default.nix
@@ -0,0 +1,77 @@
+{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkgconfig, Security
+, sqliteSupport ? true, sqlite
+, postgresqlSupport ? true, postgresql
+, mysqlSupport ? true, mysql, zlib, libiconv
+}:
+
+assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysqlSupport == true)
+ "support for at least one database must be enabled";
+
+let
+ inherit (stdenv.lib) optional optionals optionalString;
+ features = ''
+ ${optionalString sqliteSupport "sqlite"} \
+ ${optionalString postgresqlSupport "postgres"} \
+ ${optionalString mysqlSupport "mysql"} \
+ '';
+in
+
+rustPlatform.buildRustPackage rec {
+ pname = "diesel-cli";
+ version = "1.4.0";
+
+ src = fetchFromGitHub {
+ owner = "diesel-rs";
+ repo = "diesel";
+ rev = "v${version}";
+ sha256 = "0wp4hvpl9cf8hw1jyz3z476k5blrh6srfpv36dw10bj126rz9pvb";
+ };
+
+ patches = [
+ # Allow warnings to fix many instances of `error: trait objects without an explicit `dyn` are deprecated`
+ #
+ # Remove this after https://github.com/diesel-rs/diesel/commit/9004d1c3fa12aaee84986bd3d893002491373f8c
+ # is in a release.
+ ./allow-warnings.patch
+ ];
+
+ cargoBuildFlags = [ "--no-default-features --features \"${features}\"" ];
+ cargoPatches = [ ./cargo-lock.patch ];
+ cargoSha256 = "0xlcskddhy7xsiwj54gmn1xlgkfxb4dwrys7rbamfz1h8aa6ixjx";
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ openssl ]
+ ++ optional stdenv.isDarwin Security
+ ++ optional (stdenv.isDarwin && mysqlSupport) libiconv
+ ++ optional sqliteSupport sqlite
+ ++ optional postgresqlSupport postgresql
+ ++ optionals mysqlSupport [ mysql zlib ];
+
+ # We must `cd diesel_cli`, we cannot use `--package diesel_cli` to build
+ # because --features fails to apply to the package:
+ # https://github.com/rust-lang/cargo/issues/5015
+ # https://github.com/rust-lang/cargo/issues/4753
+ preBuild = "cd diesel_cli";
+ postBuild = "cd ..";
+
+ checkPhase = optionalString sqliteSupport ''
+ (cd diesel_cli && cargo check --features sqlite)
+ '';
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ $out/bin/diesel --version
+ '';
+
+ # Fix the build with mariadb, which otherwise shows "error adding symbols:
+ # DSO missing from command line" errors for libz and libssl.
+ NIX_LDFLAGS = lib.optional mysqlSupport "-lz -lssl -lcrypto";
+
+ meta = with lib; {
+ description = "Database tool for working with Rust projects that use Diesel";
+ homepage = https://github.com/diesel-rs/diesel/tree/master/diesel_cli;
+ license = with licenses; [ mit asl20 ];
+ platforms = platforms.all;
+ maintainers = with maintainers; [ ivan ];
+ };
+}
diff --git a/pkgs/development/tools/diesel-cli/update-cargo-lock.sh b/pkgs/development/tools/diesel-cli/update-cargo-lock.sh
new file mode 100755
index 000000000000..bd2e033e6871
--- /dev/null
+++ b/pkgs/development/tools/diesel-cli/update-cargo-lock.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# This updates cargo-lock.patch for the diesel version listed in default.nix.
+
+set -eu -o verbose
+
+here=$PWD
+version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2)
+checkout=$(mktemp -d)
+git clone -b "v$version" --depth=1 https://github.com/diesel-rs/diesel "$checkout"
+cd "$checkout"
+
+rm -f rust-toolchain
+cargo generate-lockfile
+git add -f Cargo.lock
+git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch
+
+cd "$here"
+rm -rf "$checkout"
diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix
index b599ccf1364a..5ce57ee80556 100644
--- a/pkgs/development/tools/dive/default.nix
+++ b/pkgs/development/tools/dive/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dive";
- version = "0.7.2";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "wagoodman";
repo = pname;
rev = "v${version}";
- sha256 = "0az9b800zwk5sd90s8ssg8amf0a4dl7nrglkirp51d8hh3rs6nzl";
+ sha256 = "1pyrdff5qqc0l3h4nssa9a7qnfqwy2p6ywc8nbwyc7wvzgdiczb8";
};
- modSha256 = "1rc9nqri66kgjpxqcgwllyd0qmk46gs3wmsfdj1w43p6ybnaf3qw";
+ modSha256 = "1fk9z7a6wghrs15pc28g5ri7rkbb1ifjb91rscwqsmh10r2wik4w";
meta = with lib; {
description = "A tool for exploring each layer in a docker image";
diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index d7604f4de9d7..670e2e1e3492 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "doctl-${version}";
+ pname = "doctl";
version = "${major}.${minor}.${patch}";
major = "1";
minor = "18";
@@ -9,7 +9,7 @@ buildGoPackage rec {
goPackagePath = "github.com/digitalocean/doctl";
excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)'';
- buildFlagsArray = let t = "${goPackagePath}"; in ''
+ buildFlagsArray = let t = goPackagePath; in ''
-ldflags=
-X ${t}.Major=${major}
-X ${t}.Minor=${minor}
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index 44b5384106ea..7792d14775c9 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
- description = "Tools to extract documentation embedded in GTK+ and GNOME source code";
+ description = "Tools to extract documentation embedded in GTK and GNOME source code";
homepage = "https://www.gtk.org/gtk-doc";
license = licenses.gpl2;
maintainers = with maintainers; [ pSub ];
diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix
index af25f3f75952..a88963c6e2cd 100644
--- a/pkgs/development/tools/documentation/mdsh/default.nix
+++ b/pkgs/development/tools/documentation/mdsh/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "mdsh-${version}";
+ pname = "mdsh";
version = "0.1.4";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix
index 17aa94ebf366..1b559df8ef6c 100644
--- a/pkgs/development/tools/drip/default.nix
+++ b/pkgs/development/tools/drip/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, jdk, which, makeWrapper }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "drip";
version = "0.2.4";
diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix
index c223a8dc54a1..5f359757eac4 100644
--- a/pkgs/development/tools/dtools/default.nix
+++ b/pkgs/development/tools/dtools/default.nix
@@ -1,7 +1,7 @@
{stdenv, lib, fetchFromGitHub, dmd, curl}:
stdenv.mkDerivation rec {
- name = "dtools-${version}";
+ pname = "dtools";
version = "2.085.1";
srcs = [
diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix
index 9dff0cc3ebed..4f3d89c07881 100644
--- a/pkgs/development/tools/easyjson/default.nix
+++ b/pkgs/development/tools/easyjson/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "easyjson";
version = "unstable-2019-06-26";
goPackagePath = "github.com/mailru/easyjson";
diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/development/tools/ejson/default.nix
index 19ee4c6391bf..bc46f0776a6d 100644
--- a/pkgs/development/tools/ejson/default.nix
+++ b/pkgs/development/tools/ejson/default.nix
@@ -7,7 +7,7 @@ let
inherit ruby;
};
in buildGoPackage rec {
- name = "ejson-${version}";
+ pname = "ejson";
version = "1.2.1";
rev = "v${version}";
diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix
index e67b417226f4..736640eba8ea 100644
--- a/pkgs/development/tools/erlang/cuter/default.nix
+++ b/pkgs/development/tools/erlang/cuter/default.nix
@@ -2,7 +2,7 @@
, z3, python }:
stdenv.mkDerivation rec {
- name = "cuter-${version}";
+ pname = "cuter";
version = "0.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/development/tools/errcheck/default.nix
index 1ce49a4cbb9d..f65dfe6565bc 100644
--- a/pkgs/development/tools/errcheck/default.nix
+++ b/pkgs/development/tools/errcheck/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "errcheck-${version}";
+ pname = "errcheck";
version = "1.1.0";
goPackagePath = "github.com/kisielk/errcheck";
diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix
index 18367d14f6e5..331c86ad88c5 100644
--- a/pkgs/development/tools/fac/default.nix
+++ b/pkgs/development/tools/fac/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }:
buildGoPackage rec {
- name = "fac-${version}";
+ pname = "fac";
version = "2.0.0";
goPackagePath = "github.com/mkchoi212/fac";
diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index 7eb057654283..d190ee32fca4 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -45,12 +45,13 @@ let
installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder";
version = "1.0.8";
in stdenv.mkDerivation rec {
- name = "flatpak-builder-${version}";
+ pname = "flatpak-builder";
+ inherit version;
outputs = [ "out" "doc" "man" "installedTests" ];
src = fetchurl {
- url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
+ url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "0ns1vv2phhd3vsi2749cajwapapx7xa841kkvssixwgfa575d912";
};
diff --git a/pkgs/development/tools/flock/default.nix b/pkgs/development/tools/flock/default.nix
index ac145fae7efe..a6ba410ec710 100644
--- a/pkgs/development/tools/flock/default.nix
+++ b/pkgs/development/tools/flock/default.nix
@@ -2,7 +2,6 @@
stdenv.mkDerivation rec {
pname = "flock";
- name = "${pname}-${version}";
version = "0.2.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 4ad04ae0e43b..b57c9841978f 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -3,7 +3,8 @@
version = "5.2.4";
in
stdenv.mkDerivation {
- name = "flyway-${version}";
+ pname = "flyway";
+ inherit version;
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
sha256 = "16ia6nlvj4cgmdkn66bjg73h5vah82hpzk9mf0n5kmqnwcaa8hmc";
diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix
index 11880213bada..3100daae389b 100644
--- a/pkgs/development/tools/fmbt/default.nix
+++ b/pkgs/development/tools/fmbt/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
version = "0.39";
- name = "fMBT-${version}";
+ pname = "fMBT";
src = fetchFromGitHub {
owner = "intel";
diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix
index 292c0dc3a4e8..4fb05da30678 100644
--- a/pkgs/development/tools/fusee-launcher/default.nix
+++ b/pkgs/development/tools/fusee-launcher/default.nix
@@ -6,8 +6,8 @@
, makeWrapper
} :
-stdenv.mkDerivation rec {
- name = "fusee-launcher-${version}";
+stdenv.mkDerivation {
+ pname = "fusee-launcher";
version = "unstable-2018-07-14";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix
index fac1a3958d37..15129bbebffc 100644
--- a/pkgs/development/tools/galen/default.nix
+++ b/pkgs/development/tools/galen/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "galen";
version = "2.4.4";
- name = "${pname}-${version}";
inherit jre8;
diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/development/tools/gamecube-tools/default.nix
index 0857a3d4a7c6..872c8fae527d 100644
--- a/pkgs/development/tools/gamecube-tools/default.nix
+++ b/pkgs/development/tools/gamecube-tools/default.nix
@@ -2,7 +2,7 @@
libtool, freeimage, mesa }:
stdenv.mkDerivation rec {
version = "v1.0.2";
- name = "gamecube-tools-${version}";
+ pname = "gamecube-tools";
nativeBuildInputs = [ which autoconf automake libtool ];
buildInputs = [ freeimage mesa ];
diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix
index c750b5537913..b284b7e7a040 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "gauge-${version}";
+ pname = "gauge";
version = "1.0.4";
goPackagePath = "github.com/getgauge/gauge";
diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix
index 35328fdf66cf..9cfa2f02c6e6 100644
--- a/pkgs/development/tools/gdm/default.nix
+++ b/pkgs/development/tools/gdm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "gdm-${version}";
+ pname = "gdm";
version = "1.4";
goPackagePath = "github.com/sparrc/gdm";
diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix
index 17560f55ec4a..68d1a74b2777 100644
--- a/pkgs/development/tools/geckodriver/default.nix
+++ b/pkgs/development/tools/geckodriver/default.nix
@@ -9,7 +9,7 @@ with rustPlatform;
buildRustPackage rec {
version = "0.22.0";
- name = "geckodriver-${version}";
+ pname = "geckodriver";
src = fetchFromGitHub {
owner = "mozilla";
diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix
index 2d61b27e2c2c..b0a59e632f16 100644
--- a/pkgs/development/tools/git-ftp/default.nix
+++ b/pkgs/development/tools/git-ftp/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pandoc, man }:
stdenv.mkDerivation rec {
- name = "git-ftp-${version}";
+ pname = "git-ftp";
version = "1.5.2";
src = fetchFromGitHub {
owner = "git-ftp";
diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix
index 3408b960889d..6bb8719d5d64 100644
--- a/pkgs/development/tools/git-quick-stats/default.nix
+++ b/pkgs/development/tools/git-quick-stats/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "git-quick-stats-${version}";
+ pname = "git-quick-stats";
version = "2.0.8";
src = fetchFromGitHub {
repo = "git-quick-stats";
owner = "arzzen";
- rev = "${version}";
+ rev = version;
sha256 = "1px1sk7b6mjnbclsr1jn33m9k4wd8wqyw4d6w1rgj0ii29lhzmqi";
};
PREFIX = builtins.placeholder "out";
diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix
index 70fa18ceddb5..5faceca57166 100644
--- a/pkgs/development/tools/git-series/default.nix
+++ b/pkgs/development/tools/git-series/default.nix
@@ -4,7 +4,7 @@ with rustPlatform;
buildRustPackage rec {
version = "0.9.1";
- name = "git-series-${version}";
+ pname = "git-series";
src = fetchFromGitHub {
owner = "git-series";
diff --git a/pkgs/development/tools/github-changelog-generator/default.nix b/pkgs/development/tools/github-changelog-generator/default.nix
index 39aab9cfa278..9a14cc7f6e21 100644
--- a/pkgs/development/tools/github-changelog-generator/default.nix
+++ b/pkgs/development/tools/github-changelog-generator/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerApp, bundlerUpdateScript }:
-bundlerApp rec {
+bundlerApp {
pname = "github_changelog_generator";
gemdir = ./.;
exes = [ "github_changelog_generator" ];
diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix
index 6a336b7015a0..1bad76b246ac 100644
--- a/pkgs/development/tools/github/cligh/default.nix
+++ b/pkgs/development/tools/github/cligh/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildPythonApplication, pyxdg, PyGithub }:
buildPythonApplication rec {
- name = "cligh-${version}";
+ pname = "cligh";
version = "0.3";
doCheck = false; # no tests
diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix
index bd83a63e5d66..930043489813 100644
--- a/pkgs/development/tools/glide/default.nix
+++ b/pkgs/development/tools/glide/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "glide-${version}";
+ pname = "glide";
version = "0.12.3";
goPackagePath = "github.com/Masterminds/glide";
diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
index b581e71129ca..dfc5ed843e75 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "gllvm-${version}";
+ pname = "gllvm";
version = "1.2.3";
goPackagePath = "github.com/SRI-CSL/gllvm";
diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix
index 361740def118..74a88caeb7c0 100644
--- a/pkgs/development/tools/global-platform-pro/default.nix
+++ b/pkgs/development/tools/global-platform-pro/default.nix
@@ -5,17 +5,16 @@ stdenv.mkDerivation rec {
pname = "global-platform-pro";
version = "18.09.14";
GPPRO_VERSION = "18.09.14-0-gb439b52"; # git describe --tags --always --long --dirty
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "martinpaljak";
repo = "GlobalPlatformPro";
- rev = "${version}";
+ rev = version;
sha256 = "1vws6cbgm3mrwc2xz9j1y262vw21x3hjc9m7rqc4hn3m7gjpwsvg";
};
deps = stdenv.mkDerivation {
- name = "${name}-deps";
+ name = "${pname}-${version}-deps";
inherit src;
nativeBuildInputs = [ jdk maven ];
installPhase = ''
diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix
index 35f7a2bfdea1..d0e9cc9e2d35 100644
--- a/pkgs/development/tools/glock/default.nix
+++ b/pkgs/development/tools/glock/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "glock-${version}";
+ pname = "glock";
version = "20160816-${stdenv.lib.strings.substring 0 7 rev}";
rev = "b8c84ff5ade15a6238ca61c20d3afc70d2e41276";
diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix
index d85060add5eb..fd22295540d0 100644
--- a/pkgs/development/tools/glslviewer/default.nix
+++ b/pkgs/development/tools/glslviewer/default.nix
@@ -4,8 +4,8 @@
, Cocoa
}:
-stdenv.mkDerivation rec {
- name = "glslviewer-${version}";
+stdenv.mkDerivation {
+ pname = "glslviewer";
version = "2019-04-22";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix
index 70b426dc5942..8f9b9ddf0b55 100644
--- a/pkgs/development/tools/gnome-desktop-testing/default.nix
+++ b/pkgs/development/tools/gnome-desktop-testing/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2018.1";
- name = "gnome-desktop-testing-${version}";
+ pname = "gnome-desktop-testing";
src = fetchgit {
url = https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;
diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix
index 249fc21cdfe4..ffdb2a092a05 100644
--- a/pkgs/development/tools/go-bindata-assetfs/default.nix
+++ b/pkgs/development/tools/go-bindata-assetfs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "go-bindata-assetfs-${version}";
+ pname = "go-bindata-assetfs";
version = "20160814-${rev}";
rev = "e1a2a7e";
goPackagePath = "github.com/elazarl/go-bindata-assetfs";
diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix
index 9a783deecee6..4d07939bd7c0 100644
--- a/pkgs/development/tools/go-bindata/default.nix
+++ b/pkgs/development/tools/go-bindata/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "go-bindata-${version}";
+ pname = "go-bindata";
version = "20151023-${stdenv.lib.strings.substring 0 7 rev}";
rev = "a0ff2567cfb70903282db057e799fd826784d41d";
diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix
index 5e1a69a16929..3c6cf7e3d83b 100644
--- a/pkgs/development/tools/go-junit-report/default.nix
+++ b/pkgs/development/tools/go-junit-report/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "go-junit-report-unstable-${version}";
+ pname = "go-junit-report-unstable";
version = "2018-06-14";
rev = "385fac0ced9acaae6dc5b39144194008ded00697";
diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix
index 62e276f2f423..52b2962a23d8 100644
--- a/pkgs/development/tools/go-motion/default.nix
+++ b/pkgs/development/tools/go-motion/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "motion-unstable-${version}";
+ pname = "motion-unstable";
version = "2018-04-09";
rev = "218875ebe23806e7af82f3b5b14bb3355534f679";
diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix
index 4df506f908fc..5f6088363f1f 100644
--- a/pkgs/development/tools/go-outline/default.nix
+++ b/pkgs/development/tools/go-outline/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "go-outline-${version}";
+ pname = "go-outline";
version = "unstable-2018-11-22";
rev = "7182a932836a71948db4a81991a494751eccfe77";
diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix
index f818569dd004..febf71657eb4 100644
--- a/pkgs/development/tools/go-protobuf/default.nix
+++ b/pkgs/development/tools/go-protobuf/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
- name = "go-protobuf-${version}";
+ pname = "go-protobuf";
version = "1.3.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix
index 52cd37f98850..7fcec1937c7a 100644
--- a/pkgs/development/tools/go-repo-root/default.nix
+++ b/pkgs/development/tools/go-repo-root/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "go-repo-root-${version}";
+ pname = "go-repo-root";
version = "20140911-${stdenv.lib.strings.substring 0 7 rev}";
rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix
index dfeb6d52e727..e774ed716647 100644
--- a/pkgs/development/tools/go-symbols/default.nix
+++ b/pkgs/development/tools/go-symbols/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "go-symbols-${version}";
+ pname = "go-symbols";
version = "0.1.1";
goPackagePath = "github.com/acroca/go-symbols";
diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index 36634423fdbc..26458a3ca2ef 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -2,7 +2,7 @@
fetchFromGitHub }:
buildGoPackage rec {
- name = "go2nix-${version}";
+ pname = "go2nix";
version = "1.3.0";
rev = "v${version}";
diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix
index 53d4bfaa483e..24a21c8279cf 100644
--- a/pkgs/development/tools/goa/default.nix
+++ b/pkgs/development/tools/goa/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "goa-${version}";
+ pname = "goa";
version = "1.4.1";
goPackagePath = "github.com/goadesign/goa";
diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix
index f93bd9d28c81..1524984756fc 100644
--- a/pkgs/development/tools/gocode-gomod/default.nix
+++ b/pkgs/development/tools/gocode-gomod/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "gocode-gomod-unstable-${version}";
+ pname = "gocode-gomod-unstable";
version = "2019-03-27";
rev = "81059208699789f992bb4a4a3fedd734e335468d";
diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index 3351c0e986b3..b67f8929e48d 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "gocode-unstable-${version}";
+ pname = "gocode-unstable";
version = "2018-11-05";
rev = "0af7a86943a6e0237c90f8aeb74a882e1862c898";
diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/development/tools/goconst/default.nix
index 9ef94ffdc7fa..0ee889d02654 100644
--- a/pkgs/development/tools/goconst/default.nix
+++ b/pkgs/development/tools/goconst/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "goconst-${version}";
+ pname = "goconst";
version = "1.1.0";
goPackagePath = "github.com/jgautheron/goconst";
diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix
index fcdb56460e19..1df94147ba4a 100644
--- a/pkgs/development/tools/goconvey/default.nix
+++ b/pkgs/development/tools/goconvey/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "goconvey-${version}";
+ pname = "goconvey";
version = "1.6.3";
goPackagePath = "github.com/smartystreets/goconvey";
@@ -12,7 +12,7 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "smartystreets";
repo = "goconvey";
- rev = "${version}";
+ rev = version;
sha256 = "1ph18rkl3ns3fgin5i4j54w5a69grrmf3apcsmnpdn1wlrbs3dxh";
};
diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/development/tools/gocyclo/default.nix
index 91ebaff803eb..f446b7289085 100644
--- a/pkgs/development/tools/gocyclo/default.nix
+++ b/pkgs/development/tools/gocyclo/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "gocyclo-unstable-${version}";
+ pname = "gocyclo-unstable";
version = "2015-02-08";
rev = "aa8f8b160214d8dfccfe3e17e578dd0fcc6fede7";
diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix
index 993305bd98fa..ce6c77b2cc3f 100644
--- a/pkgs/development/tools/godef/default.nix
+++ b/pkgs/development/tools/godef/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "godef-${version}";
+ pname = "godef";
version = "1.1.1";
rev = "v${version}";
diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 7fd6fe623748..20c031ead4ab 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -9,7 +9,7 @@ let
pulseaudio = false;
};
in stdenv.mkDerivation rec {
- name = "godot-${version}";
+ pname = "godot";
version = "3.1.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix
index 7724ee49465c..61d0e7a73dba 100644
--- a/pkgs/development/tools/gogetdoc/default.nix
+++ b/pkgs/development/tools/gogetdoc/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "gogetdoc-unstable-${version}";
+ pname = "gogetdoc-unstable";
version = "2018-10-25";
rev = "9098cf5fc236a5e25060730544af2ba6d65cd968";
diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index ae7f24a62a51..7a3d7882715f 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -1,7 +1,7 @@
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
- name = "golangci-lint-${version}";
+ pname = "golangci-lint";
version = "1.17.1";
goPackagePath = "github.com/golangci/golangci-lint";
diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
index 9d404546d008..bd66f35e4710 100644
--- a/pkgs/development/tools/golint/default.nix
+++ b/pkgs/development/tools/golint/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "lint-${version}";
+ pname = "lint";
version = "20181026-${stdenv.lib.strings.substring 0 7 rev}";
rev = "c67002cb31c3a748b7688c27f20d8358b4193582";
diff --git a/pkgs/development/tools/gometalinter/default.nix b/pkgs/development/tools/gometalinter/default.nix
index f63d33138fc2..c2f2a8a597a1 100644
--- a/pkgs/development/tools/gometalinter/default.nix
+++ b/pkgs/development/tools/gometalinter/default.nix
@@ -39,7 +39,7 @@ let
];
in buildGoPackage rec {
- name = "gometalinter-${version}";
+ pname = "gometalinter";
version = "3.0.0";
goPackagePath = "github.com/alecthomas/gometalinter";
diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix
index 112e1769f212..4d97415bc565 100644
--- a/pkgs/development/tools/gomodifytags/default.nix
+++ b/pkgs/development/tools/gomodifytags/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "gomodifytags-unstable-${version}";
+ pname = "gomodifytags-unstable";
version = "2018-09-14";
rev = "141225bf62b6e5c9c0c9554a2e993e8c30aebb1d";
diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
index ba4f4bb3f519..df3310893a4d 100644
--- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix
+++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
@@ -3,7 +3,7 @@
with python27Packages;
stdenv.mkDerivation rec {
- name = "google-app-engine-go-sdk-${version}";
+ pname = "google-app-engine-go-sdk";
version = "1.9.61";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix
index 89a1da772701..778ed562637e 100644
--- a/pkgs/development/tools/gopkgs/default.nix
+++ b/pkgs/development/tools/gopkgs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "gopkgs-${version}";
+ pname = "gopkgs";
version = "2.0.1";
goPackagePath = "github.com/uudashr/gopkgs";
diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix
index 7ee87b8f8483..1b6b3aed4e88 100644
--- a/pkgs/development/tools/gosec/default.nix
+++ b/pkgs/development/tools/gosec/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "gosec-${version}";
+ pname = "gosec";
version = "1.2.0";
goPackagePath = "github.com/securego/gosec";
@@ -13,7 +13,7 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "securego";
repo = "gosec";
- rev = "${version}";
+ rev = version;
sha256 = "1420yl4cjp4v4xv0l0wbahgl6bjhz77lx5va9hqa6abddmqvx1hg";
};
diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix
index b8230561fb42..881ae7e24d4a 100644
--- a/pkgs/development/tools/gotags/default.nix
+++ b/pkgs/development/tools/gotags/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "gotags-${version}";
+ pname = "gotags";
version = "20150803-${stdenv.lib.strings.substring 0 7 rev}";
rev = "be986a34e20634775ac73e11a5b55916085c48e7";
diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix
index 8eb65281b3fe..e74b6c27b2b2 100644
--- a/pkgs/development/tools/gotests/default.nix
+++ b/pkgs/development/tools/gotests/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "gotests-${version}";
+ pname = "gotests";
version = "1.5.3";
rev = "v${version}";
diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index d83f0ec40149..4c662f9b5c0e 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -1,14 +1,14 @@
{ stdenv, go, buildGoModule, fetchgit }:
buildGoModule rec {
- name = "gotools-unstable-${version}";
- version = "2019-07-06";
- rev = "72ffa07ba3db8d09f5215feec0f89464f3028f8e";
+ pname = "gotools-unstable";
+ version = "2019-09-05";
+ rev = "6b3d1c9ba8bf7ce410f6b490852ec54953383362";
src = fetchgit {
inherit rev;
url = "https://go.googlesource.com/tools";
- sha256 = "0c0s5aiwj807vxfzwrah32spwq8cnxvy0j117i5cbsqw2df80pgv";
+ sha256 = "0a2xjx9hqkash7fd2qv9hd93wcqdbfrmsdzjd91dwvnk48j61daf";
};
# Build of golang.org/x/tools/gopls fails with:
@@ -21,7 +21,7 @@ buildGoModule rec {
rm -rf gopls
'';
- modSha256 = "16nkrpki9fnxsrxxxs9ljz49plcz393z0sqq2knkk30pmncpwd3q";
+ modSha256 = "16cfzmfr9jv8wz0whl433xdm614dk63fzjxv6l1xvkagjmki49iy";
postConfigure = ''
# Make the builtin tools available here
diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix
index 2030c8ba444a..804a9bf043ed 100644
--- a/pkgs/development/tools/govendor/default.nix
+++ b/pkgs/development/tools/govendor/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "govendor-${version}";
+ pname = "govendor";
version = "1.0.9";
goPackagePath = "github.com/kardianos/govendor";
diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix
index 152b619966c9..ebce368ea9f8 100644
--- a/pkgs/development/tools/govers/default.nix
+++ b/pkgs/development/tools/govers/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "govers-${version}";
+ pname = "govers";
version = "20160623-${stdenv.lib.strings.substring 0 7 rev}";
rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43";
diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix
index b28bf24892c2..6caa32c16f2b 100644
--- a/pkgs/development/tools/gox/default.nix
+++ b/pkgs/development/tools/gox/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
- name = "gox-${version}";
+buildGoPackage {
+ pname = "gox";
version = "20181025";
goPackagePath = "github.com/mitchellh/gox";
diff --git a/pkgs/development/tools/gpp/default.nix b/pkgs/development/tools/gpp/default.nix
index 461110b63d71..ee15df1a9f6f 100644
--- a/pkgs/development/tools/gpp/default.nix
+++ b/pkgs/development/tools/gpp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
-stdenv.mkDerivation rec {
- name = "gpp-${version}";
+stdenv.mkDerivation {
+ pname = "gpp";
version = "2.25";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix
index c86c2e275ed1..ab32674f1881 100644
--- a/pkgs/development/tools/grabserial/default.nix
+++ b/pkgs/development/tools/grabserial/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchgit, pythonPackages }:
+{ lib, fetchFromGitHub, pythonPackages }:
pythonPackages.buildPythonApplication rec {
+ pname = "grabserial";
+ version = "1.9.8";
- name = "grabserial-1.9.3";
- namePrefix = "";
-
- src = fetchgit {
- url = https://github.com/tbird20d/grabserial.git;
- rev = "7cbf104b61ffdf68e6782a8e885050565399a014";
- sha256 = "043r2p5jw0ymx8ka1d39q1ap39i7sliq5f4w3yr1n53lzshjmc5g";
+ src = fetchFromGitHub {
+ owner = "tbird20d";
+ repo = "grabserial";
+ rev = "v${version}";
+ sha256 = "1xmy3js4hzsxlkxc172hkjzxsc34mmg3vfz61h24c7svmfzyhbd5";
};
propagatedBuildInputs = [ pythonPackages.pyserial ];
- meta = {
+ meta = with lib; {
description = "Python based serial dump and timing program";
- homepage = https://github.com/tbird20d/grabserial;
- license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ vmandela ];
- platforms = stdenv.lib.platforms.linux;
+ homepage = "https://github.com/tbird20d/grabserial";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ vmandela ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix
index ebe76197ef4e..e0d2d3d1498f 100644
--- a/pkgs/development/tools/gron/default.nix
+++ b/pkgs/development/tools/gron/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "gron-${version}";
+ pname = "gron";
version = "0.6.0";
owner = "tomnomnom";
diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix
index 833b41ae985b..02d5ad87dc47 100644
--- a/pkgs/development/tools/gtk-mac-bundler/default.nix
+++ b/pkgs/development/tools/gtk-mac-bundler/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "gtk-mac-bundler-${version}";
+ pname = "gtk-mac-bundler";
version = "0.7.4";
src = fetchFromGitHub {
@@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- description = "a helper script that creates application bundles form GTK+ executables for macOS";
+ description = "a helper script that creates application bundles form GTK executables for macOS";
maintainers = [ maintainers.matthewbauer ];
platforms = platforms.darwin;
- homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Bundling;
+ homepage = https://wiki.gnome.org/Projects/GTK/OSX/Bundling;
license = licenses.gpl2;
};
}
diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix
index 78f2e967123b..15233979e158 100644
--- a/pkgs/development/tools/guile/g-wrap/default.nix
+++ b/pkgs/development/tools/guile/g-wrap/default.nix
@@ -1,12 +1,11 @@
{ fetchurl, stdenv, guile, guile-lib, libffi, pkgconfig, glib }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "g-wrap";
version = "1.9.15";
src = fetchurl {
- url = "mirror://savannah/${pname}/${name}.tar.gz";
+ url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg";
};
diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix
index fd9347a4007f..b8efb30f5f17 100644
--- a/pkgs/development/tools/guile/guile-lint/default.nix
+++ b/pkgs/development/tools/guile/guile-lint/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, guile }:
stdenv.mkDerivation rec {
- name = "guile-lint-${version}";
+ pname = "guile-lint";
version = "14";
src = fetchurl {
- url = "https://download.tuxfamily.org/user42/${name}.tar.bz2";
+ url = "https://download.tuxfamily.org/user42/${pname}-${version}.tar.bz2";
sha256 = "1gnhnmki05pkmzpbfc07vmb2iwza6vhy75y03bw2x2rk4fkggz2v";
};
buildInputs = [ guile ];
- unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${name}"'';
+ unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${pname}-${version}"'';
prePatch = ''
substituteInPlace guile-lint.in --replace \
diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix
index 3b52c262c0c6..7d99a5e9a573 100644
--- a/pkgs/development/tools/haskell/hyper-haskell/default.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix
@@ -5,7 +5,7 @@ let
binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages);
in stdenv.mkDerivation rec {
- name = "hyper-haskell-${version}";
+ pname = "hyper-haskell";
version = "0.1.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix
index 905580482d45..c97e35583b63 100644
--- a/pkgs/development/tools/hexio/default.nix
+++ b/pkgs/development/tools/hexio/default.nix
@@ -2,7 +2,6 @@
stdenv.mkDerivation rec {
pname = "hexio";
- name = "${pname}-${version}";
version = "1.0-RC1";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index 2bac15403038..b3ce4f8f6a71 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
-, pkgconfig, libftdi
+, pkgconfig, libftdi1
, python3, pypy3
# PyPy yields large improvements in build time and runtime performance,
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "icestorm";
- version = "2019.08.15";
+ version = "2019.08.31";
pythonPkg = if usePyPy then pypy3 else python3;
pythonInterp = pythonPkg.interpreter;
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "cliffordwolf";
repo = "icestorm";
- rev = "95949315364f8d9b0c693386aefadf44b28e2cf6";
- sha256 = "05q1vxlf9l5z9mam8jbv58jqj7nsd8v7ssy753sharpgzzgdc8a2";
+ rev = "04f1eb78ed8fd50516aee50102675041a8fd40cd";
+ sha256 = "10jdiw4mw0afcjq7xl3xs8z733mlrx927x620vs2yz91p757jxbd";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ pythonPkg libftdi ];
+ buildInputs = [ pythonPkg libftdi1 ];
makeFlags = [ "PREFIX=$(out)" ];
enableParallelBuilding = true;
diff --git a/pkgs/development/tools/iferr/default.nix b/pkgs/development/tools/iferr/default.nix
index e2aebe9b2dc2..5874d1eeed38 100644
--- a/pkgs/development/tools/iferr/default.nix
+++ b/pkgs/development/tools/iferr/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "iferr-unstable-${version}";
+ pname = "iferr-unstable";
version = "2018-06-15";
rev = "bb332a3b1d9129b6486c7ddcb7030c11b05cfc88";
diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix
index 62f33a2d2517..549a4d1b8266 100644
--- a/pkgs/development/tools/imatix_gsl/default.nix
+++ b/pkgs/development/tools/imatix_gsl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pcre } :
-stdenv.mkDerivation rec {
- name = "imatix_gsl-${version}";
+stdenv.mkDerivation {
+ pname = "imatix_gsl";
version = "4.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/development/tools/impl/default.nix
index 69bbf8afe5ac..8d368ba528a9 100644
--- a/pkgs/development/tools/impl/default.nix
+++ b/pkgs/development/tools/impl/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "impl-unstable-${version}";
+ pname = "impl-unstable";
version = "2018-02-27";
rev = "3d0f908298c49598b6aa84f101c69670e15d1d03";
diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix
index 10e5c61025ab..06831e3a43c2 100644
--- a/pkgs/development/tools/ineffassign/default.nix
+++ b/pkgs/development/tools/ineffassign/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "ineffassign-unstable-${version}";
+ pname = "ineffassign-unstable";
version = "2018-09-09";
rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514";
diff --git a/pkgs/development/tools/interfacer/default.nix b/pkgs/development/tools/interfacer/default.nix
index 274ced0b37cd..2f505ef1c678 100644
--- a/pkgs/development/tools/interfacer/default.nix
+++ b/pkgs/development/tools/interfacer/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "interfacer-unstable-${version}";
+ pname = "interfacer-unstable";
version = "2018-08-31";
rev = "c20040233aedb03da82d460eca6130fcd91c629a";
diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix
index b6a78071bc87..f2c926a6f391 100644
--- a/pkgs/development/tools/irony-server/default.nix
+++ b/pkgs/development/tools/irony-server/default.nix
@@ -1,7 +1,7 @@
{ stdenv, cmake, llvmPackages, irony }:
-stdenv.mkDerivation rec {
- name = "irony-server-${version}";
+stdenv.mkDerivation {
+ pname = "irony-server";
inherit (irony) version;
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index 1f0d8f286094..382ef28c0147 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, makeWrapper, fetchurl, jre }:
stdenv.mkDerivation rec {
- name = "cfr-${version}";
+ pname = "cfr";
version = "0.146";
src = fetchurl {
diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix
index 403bfeabfd05..9791cd56ea1a 100644
--- a/pkgs/development/tools/java/fastjar/default.nix
+++ b/pkgs/development/tools/java/fastjar/default.nix
@@ -2,7 +2,8 @@
let version = "0.98"; in
stdenv.mkDerivation {
- name = "fastjar-${version}";
+ pname = "fastjar";
+ inherit version;
src = fetchurl {
url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz";
diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix
index 4577de0cde4c..dae394534959 100644
--- a/pkgs/development/tools/java/jhiccup/default.nix
+++ b/pkgs/development/tools/java/jhiccup/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
- name = "jhiccup-${version}";
+ pname = "jhiccup";
version = "2.0.10";
src = fetchzip {
diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix
index 9682ceb93c75..04d5a0b2e768 100644
--- a/pkgs/development/tools/java/visualvm/default.nix
+++ b/pkgs/development/tools/java/visualvm/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.4.3";
- name = "visualvm-${version}";
+ pname = "visualvm";
src = fetchzip {
url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip";
diff --git a/pkgs/development/tools/jazzy/default.nix b/pkgs/development/tools/jazzy/default.nix
index ad71dfb22a8f..a6cb7a92b639 100644
--- a/pkgs/development/tools/jazzy/default.nix
+++ b/pkgs/development/tools/jazzy/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerApp, bundlerUpdateScript }:
-bundlerApp rec {
+bundlerApp {
pname = "jazzy";
gemdir = ./.;
exes = [ "jazzy" ];
diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index dbda476171ab..79054c7f667b 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "2.6.4";
- name = "jbake-${version}";
+ pname = "jbake";
src = fetchzip {
- url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip";
+ url = "https://dl.bintray.com/jbake/binary/${pname}-${version}-bin.zip";
sha256 = "0zgp0wwxxmi13v5q5jvr610igx2vxg0bwck9j1imnn9ciakg1aaw";
};
diff --git a/pkgs/development/tools/jd/default.nix b/pkgs/development/tools/jd/default.nix
index 3fe55de2ec8c..b03fd7a0028a 100644
--- a/pkgs/development/tools/jd/default.nix
+++ b/pkgs/development/tools/jd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "jd-${version}";
+ pname = "jd";
version = "0.3.1";
rev = "2729b5af166cfd72bd953ef8959b456c4db940fc";
diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix
index 4833755b3ee3..0fc8b85d8f42 100644
--- a/pkgs/development/tools/jid/default.nix
+++ b/pkgs/development/tools/jid/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "jid-${version}";
+ pname = "jid";
version = "0.7.2";
goPackagePath = "github.com/simeji/jid";
@@ -9,7 +9,7 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "simeji";
repo = "jid";
- rev = "${version}";
+ rev = version;
sha256 = "0p4srp85ilcafrn9d36rzpzg5k5jd7is93p68hamgxqyiiw6a8fi";
};
diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix
index c53d6608efd3..b12be2a9567f 100644
--- a/pkgs/development/tools/jmespath/default.nix
+++ b/pkgs/development/tools/jmespath/default.nix
@@ -1,9 +1,9 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "jmespath-${version}";
+ pname = "jmespath";
version = "0.2.2";
- rev = "${version}";
+ rev = version;
goPackagePath = "github.com/jmespath/go-jmespath";
diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix
index e8e8acd6a9a4..3ebdc881dcb3 100644
--- a/pkgs/development/tools/jp/default.nix
+++ b/pkgs/development/tools/jp/default.nix
@@ -1,9 +1,9 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "jp-${version}";
+ pname = "jp";
version = "0.1.2";
- rev = "${version}";
+ rev = version;
goPackagePath = "github.com/jmespath/jp";
diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
index e7c5955ef417..8605ef398a1c 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/pkgs/development/tools/jq/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, oniguruma }:
stdenv.mkDerivation rec {
- name = "jq-${version}";
+ pname = "jq";
version="1.6";
src = fetchurl {
diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix
index dc8e618910c4..0b6098e5ee93 100644
--- a/pkgs/development/tools/jsduck/default.nix
+++ b/pkgs/development/tools/jsduck/default.nix
@@ -2,11 +2,10 @@
stdenv.mkDerivation rec {
pname = "jsduck";
- name = "${pname}-${version}";
version = (import ./gemset.nix).jsduck.version;
env = bundlerEnv {
- name = "${pname}";
+ name = pname;
gemfile = ./Gemfile;
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix
index 694428f55a6b..4fe4e4c7eab3 100644
--- a/pkgs/development/tools/json2hcl/default.nix
+++ b/pkgs/development/tools/json2hcl/default.nix
@@ -2,7 +2,6 @@
buildGoPackage rec {
pname = "json2hcl";
- name = "${pname}-${version}";
version = "0.0.6";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix
index 4a837bcef652..076cea38a9e5 100644
--- a/pkgs/development/tools/kafkacat/default.nix
+++ b/pkgs/development/tools/kafkacat/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, pkgconfig, zlib, rdkafka, yajl }:
stdenv.mkDerivation rec {
- name = "kafkacat-${version}";
+ pname = "kafkacat";
version = "1.4.0";
src = fetchFromGitHub {
owner = "edenhill";
repo = "kafkacat";
- rev = "${version}";
+ rev = version;
sha256 = "0zs2nmf3ghm9iar7phc0ncqsb9nhipav94v6qmpxkfwxd2ljkpds";
};
diff --git a/pkgs/development/tools/kexpand/default.nix b/pkgs/development/tools/kexpand/default.nix
index a82c21b72e9e..e6c562721c28 100644
--- a/pkgs/development/tools/kexpand/default.nix
+++ b/pkgs/development/tools/kexpand/default.nix
@@ -1,6 +1,6 @@
{ buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
name = "kexpand-unstable-2017-05-12";
goPackagePath = "github.com/kopeio/kexpand";
diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix
index 3a2040e712a9..4ac57d0e8502 100644
--- a/pkgs/development/tools/kind/default.nix
+++ b/pkgs/development/tools/kind/default.nix
@@ -3,22 +3,19 @@
with stdenv.lib;
buildGoPackage rec {
- name = "kind-${version}";
- version = "0.3.0";
+ pname = "kind";
+ version = "0.5.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "kubernetes-sigs";
repo = "kind";
- sha256 = "1azl5knw1n7g42xp92r9k7y4rzwp9xx0spcldszrpry2v4lmc5sb";
+ sha256 = "12bjvma98dlxybqs43dggnd6cihxm18xz68a5jw8dzf0cg738gs8";
};
- # move dev tool package that confuses the go compiler
- patchPhase = "rm -r hack";
-
goDeps = ./deps.nix;
goPackagePath = "sigs.k8s.io/kind";
- excludedPackages = "images/base/entrypoint";
+ subPackages = [ "." ];
meta = {
description = "Kubernetes IN Docker - local clusters for testing Kubernetes";
diff --git a/pkgs/development/tools/kind/deps.nix b/pkgs/development/tools/kind/deps.nix
index 1681fe9e2eb4..c5557c2aa49d 100644
--- a/pkgs/development/tools/kind/deps.nix
+++ b/pkgs/development/tools/kind/deps.nix
@@ -14,8 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/PuerkitoBio/purell";
- rev = "v1.1.0";
- sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91";
+ rev = "v1.1.1";
+ sha256 = "0c525frsxmalrn55hzzsxy17ng8avkd40ga0wxfw9haxsdjgqdqy";
};
}
{
@@ -41,8 +41,8 @@
fetch = {
type = "git";
url = "https://github.com/emicklei/go-restful";
- rev = "ff4f55a20633";
- sha256 = "1v5lj5142abz3gvbygp6xghpdx4ps2lwswl8559ivaidahwnc21c";
+ rev = "v2.9.6";
+ sha256 = "0dgjld5240xhz45rj929ffm452n931qfw3fx8x99vhlnii9qrwz2";
};
}
{
@@ -50,8 +50,17 @@
fetch = {
type = "git";
url = "https://github.com/evanphx/json-patch";
- rev = "v4.2.0";
- sha256 = "0cfvyhl3hjfc4z8hbkfc40yafv6r7y513zgp3jwf88isbd13r7a6";
+ rev = "v4.5.0";
+ sha256 = "144mk2v9q37l1qjf8498nff4hhz96mlkl7ls7ihixbmrji4lmch4";
+ };
+ }
+ {
+ goPackagePath = "github.com/fsnotify/fsnotify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fsnotify/fsnotify";
+ rev = "v1.4.7";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
@@ -59,8 +68,8 @@
fetch = {
type = "git";
url = "https://github.com/ghodss/yaml";
- rev = "v1.0.0";
- sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
+ rev = "73d445a93680";
+ sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7";
};
}
{
@@ -68,8 +77,8 @@
fetch = {
type = "git";
url = "https://github.com/go-openapi/jsonpointer";
- rev = "v0.17.0";
- sha256 = "0sv2k1fwj6rsigc9489c19ap0jib1d0widm040h0sjdw2nadh3i2";
+ rev = "v0.19.2";
+ sha256 = "1s3cqf4svrbygvvpvi7hf122szsgihas52vqh0bba3avf4w03g9n";
};
}
{
@@ -77,8 +86,8 @@
fetch = {
type = "git";
url = "https://github.com/go-openapi/jsonreference";
- rev = "v0.17.0";
- sha256 = "1d0rk17wn755xsfi9pxifdpgs2p23bc0rkf95kjwxczyy6jbqdaj";
+ rev = "v0.19.2";
+ sha256 = "0v933yvcwyzzlpdxwb9204ki7lls2rwfd96ww2i901ndvz37kdf8";
};
}
{
@@ -86,8 +95,8 @@
fetch = {
type = "git";
url = "https://github.com/go-openapi/spec";
- rev = "v0.19.0";
- sha256 = "1527dbn74c0gw9gib5lmdr5vjgp5h57r1j92c3wh37irz90vnb6a";
+ rev = "v0.19.2";
+ sha256 = "1r2my46qc85fp1j4lbddmd6c1n0am9bq1wyqsnw7x8raiznqxp5l";
};
}
{
@@ -95,8 +104,8 @@
fetch = {
type = "git";
url = "https://github.com/go-openapi/swag";
- rev = "v0.17.0";
- sha256 = "1hhgbx59f7lcsqiza2is8q9walhf8mxfkwj7xql1scrn6ms2jmlv";
+ rev = "v0.19.2";
+ sha256 = "1mlxlajx2p9wjm72rmqjrx5g49q2sn04y45s3nrykkf6jqlq1v4z";
};
}
{
@@ -113,8 +122,8 @@
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
- rev = "4bd1920723d7";
- sha256 = "0z21hxin616xvkv075vdz416zm36qs0mbi76526l9yz8khbg7jmr";
+ rev = "v1.3.1";
+ sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
};
}
{
@@ -140,8 +149,17 @@
fetch = {
type = "git";
url = "https://github.com/googleapis/gnostic";
- rev = "68f4ded48ba9";
- sha256 = "0l6qkbpmy2qd0q8h7dghhv27qjngll739kzm389qdbjxj3inq2dl";
+ rev = "v0.3.0";
+ sha256 = "0bnxpkxw9kmwm27rxhgv3i0jn362wp9whmqrv0lb77874s5iz2lc";
+ };
+ }
+ {
+ goPackagePath = "github.com/hpcloud/tail";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hpcloud/tail";
+ rev = "v1.0.0";
+ sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
};
}
{
@@ -189,13 +207,40 @@
sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
};
}
+ {
+ goPackagePath = "github.com/kr/pretty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pretty";
+ rev = "v0.1.0";
+ sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pty";
+ rev = "v1.1.5";
+ sha256 = "1bpq77b90z72cv9h66dvxsg2j197ylpgcps23xsjfbs752bykfw1";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/text";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/text";
+ rev = "v0.1.0";
+ sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+ };
+ }
{
goPackagePath = "github.com/mailru/easyjson";
fetch = {
type = "git";
url = "https://github.com/mailru/easyjson";
- rev = "60711f1a8329";
- sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1";
+ rev = "da37f6c1e481";
+ sha256 = "0yhamddd1jyqslp0hm5g07ki82sp52f0idfiqylx6fm24fin74gh";
};
}
{
@@ -230,8 +275,8 @@
fetch = {
type = "git";
url = "https://github.com/onsi/ginkgo";
- rev = "11459a886d9c";
- sha256 = "1nswc1fnrrs792qbix05h91bilj8rr3wxmxgwi97p2gjk0r292zh";
+ rev = "v1.8.0";
+ sha256 = "1326s5fxgasdpz1qqwrw4n5p3k0vz44msnyz14knrhlw5l97lx33";
};
}
{
@@ -239,8 +284,8 @@
fetch = {
type = "git";
url = "https://github.com/onsi/gomega";
- rev = "dcabb60a477c";
- sha256 = "1775lv5jbsgv3ghq5v2827slqlhqdadrzc1nkpq4y0hdv2qzrgkm";
+ rev = "v1.5.0";
+ sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9";
};
}
{
@@ -248,8 +293,8 @@
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
- rev = "v0.8.0";
- sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+ rev = "v0.8.1";
+ sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
};
}
{
@@ -293,8 +338,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/objx";
- rev = "v0.1.1";
- sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+ rev = "v0.2.0";
+ sha256 = "0pcdvakxgddaiwcdj73ra4da05a3q4cgwbpm2w75ycq4kzv8ij8k";
};
}
{
@@ -302,8 +347,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
- rev = "v1.2.2";
- sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+ rev = "v1.3.0";
+ sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
};
}
{
@@ -311,8 +356,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
- rev = "c2843e01d9a2";
- sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
+ rev = "5c40567a22f8";
+ sha256 = "17g8fb9vy2sqq8vgz8jdvf6c6d2290gm2qs0i4yzsd86mgn4dlrg";
};
}
{
@@ -320,8 +365,17 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "3ec191127204";
- sha256 = "0zzhbkw3065dp1jscp7q8dxw3mkwj95ixnrr8j7c47skis0m11i3";
+ rev = "3b0461eec859";
+ sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "112230192c58";
+ sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
};
}
{
@@ -329,8 +383,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "d0b11bdaac8a";
- sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
+ rev = "d432491b9138";
+ sha256 = "0ijq720jr76yxdd6mh1rdpxh7q93w6149paclb4g39vhr84hfiv8";
};
}
{
@@ -338,8 +392,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
- rev = "v0.3.0";
- sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+ rev = "v0.3.2";
+ sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
};
}
{
@@ -347,8 +401,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
- rev = "1f849cf54d09";
- sha256 = "19a3srk9dcqad3sqd8mfg36pbaxcfkbzhp3jinhqxnzd90bds6am";
+ rev = "5aca471b1d59";
+ sha256 = "1i4h3q83w4y9s065w0wnnnwlssy69jbrj08k47ppsa8dnv85kyrf";
};
}
{
@@ -356,8 +410,17 @@
fetch = {
type = "git";
url = "https://gopkg.in/check.v1";
- rev = "20d25e280405";
- sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
+ rev = "788fd7840127";
+ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/fsnotify.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/fsnotify.v1";
+ rev = "v1.4.7";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
@@ -369,13 +432,22 @@
sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng";
};
}
+ {
+ goPackagePath = "gopkg.in/tomb.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/tomb.v1";
+ rev = "dd632973f1e7";
+ sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
+ };
+ }
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
- rev = "v2.2.1";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ rev = "v2.2.2";
+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
};
}
{
@@ -419,8 +491,8 @@
fetch = {
type = "git";
url = "https://github.com/kubernetes/klog";
- rev = "v0.3.0";
- sha256 = "05lp8ddqnbypgszv3ra7x105qpr8rr1g4rk2148wcmgfjrfhw437";
+ rev = "v0.3.3";
+ sha256 = "1gk1jhhyzsqcb4wnb02hkp8fwmk3ac924yzk87hfc6sgz43jplpn";
};
}
{
@@ -428,17 +500,17 @@
fetch = {
type = "git";
url = "https://github.com/kubernetes/kube-openapi";
- rev = "a01b7d5d6c22";
- sha256 = "182s6gqhzal5602dfyk9h8adsdqgh5fmgh0bifksp1x856v4aizx";
+ rev = "db7b694dc208";
+ sha256 = "11pmxz6if6gphspyyjqrphwclg02mgnp30mn1i0lr8r21d64m148";
};
}
{
- goPackagePath = "sigs.k8s.io/kustomize";
+ goPackagePath = "sigs.k8s.io/kustomize/v3";
fetch = {
type = "git";
url = "https://github.com/kubernetes-sigs/kustomize";
- rev = "v2.0.3";
- sha256 = "1dfkpx9rllj1bzm5f52bx404kdds3zx1h38yqri9ha3p3pcb1bbb";
+ rev = "4b67a6de1296";
+ sha256 = "1qi5swzs3qix9mimrc660hxh9qgcrbcw49z4w27hdv27xl5fa0rd";
};
}
{
@@ -446,8 +518,8 @@
fetch = {
type = "git";
url = "https://github.com/kubernetes-sigs/structured-merge-diff";
- rev = "ea680f03cc65";
- sha256 = "1drc908qcvwifvbz12vxahplycnaj177pz5ay6ygbn3q8824qv7b";
+ rev = "15d366b2352e";
+ sha256 = "1anrx09ksgrwjwmbrcrk3hx8wyzjaakzmmn36nd23if36nv1xg11";
};
}
{
@@ -459,49 +531,4 @@
sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb";
};
}
- {
- goPackagePath = "github.com/vishvananda/netlink";
- fetch = {
- type = "git";
- url = "https://github.com/vishvananda/netlink";
- rev = "v1.0.0";
- sha256 = "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0";
- };
- }
- {
- goPackagePath = "github.com/vishvananda/netns";
- fetch = {
- type = "git";
- url = "https://github.com/vishvananda/netns";
- rev = "13995c7128cc";
- sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn";
- };
- }
- {
- goPackagePath = "golang.org/x/oauth2";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/oauth2";
- rev = "9f3314589c9a";
- sha256 = "13rr34jmgisgy8mc7yqz3474w4qbs01gz4b7zrgkvikdv4a6py3h";
- };
- }
- {
- goPackagePath = "golang.org/x/time";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/time";
- rev = "9d24e82272b4";
- sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb";
- };
- }
- {
- goPackagePath = "k8s.io/utils";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/utils";
- rev = "8fab8cb257d5";
- sha256 = "0ckkl9zj8c0p5csfgsnvgb3vm91l2zgxgxhbjcf3ds3wryljalyj";
- };
- }
]
diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix
index 202c57f9106d..c98d397953ec 100644
--- a/pkgs/development/tools/ktlint/default.nix
+++ b/pkgs/development/tools/ktlint/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- name = "ktlint-${version}";
+ pname = "ktlint";
version = "0.34.2";
src = fetchurl {
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ jre ];
unpackCmd = ''
- mkdir -p ${name}
- cp $curSrc ${name}/ktlint
+ mkdir -p ${pname}-${version}
+ cp $curSrc ${pname}-${version}/ktlint
'';
installPhase = ''
diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix
index af5c0e9c2f9f..6083c03ebc9f 100644
--- a/pkgs/development/tools/kube-aws/default.nix
+++ b/pkgs/development/tools/kube-aws/default.nix
@@ -3,7 +3,7 @@
with lib;
buildGoPackage rec {
- name = "kube-aws-${version}";
+ pname = "kube-aws";
version = "0.9.4";
goPackagePath = "github.com/coreos/kube-aws";
diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/development/tools/kube-prompt/default.nix
index 20a26824e5e7..8e6ca8e221e2 100644
--- a/pkgs/development/tools/kube-prompt/default.nix
+++ b/pkgs/development/tools/kube-prompt/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "kube-prompt-${version}";
+ pname = "kube-prompt";
version = "1.0.5";
rev = "v${version}";
diff --git a/pkgs/development/tools/kubicorn/default.nix b/pkgs/development/tools/kubicorn/default.nix
index a63de5507479..104b11c1ce1d 100644
--- a/pkgs/development/tools/kubicorn/default.nix
+++ b/pkgs/development/tools/kubicorn/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildGoPackage rec {
- name = "kubicorn-${version}";
+ pname = "kubicorn";
version = "2018-10-13-${stdenv.lib.strings.substring 0 7 rev}";
rev = "4c7f3623e9188fba43778271afe161a4facfb657";
diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix
index 1691f09e6e41..1dea14401138 100644
--- a/pkgs/development/tools/lattice-diamond/default.nix
+++ b/pkgs/development/tools/lattice-diamond/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib,
freetype, fontconfig, xorg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "diamond-3.10";
nativeBuildInputs = [ rpmextract patchelf makeWrapper file ];
diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix
index be964cf4d308..a2a35c7fd1d7 100644
--- a/pkgs/development/tools/leaps/default.nix
+++ b/pkgs/development/tools/leaps/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "leaps-${version}";
+ pname = "leaps";
version = "0.9.0";
goPackagePath = "github.com/Jeffail/leaps";
diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/development/tools/librarian-puppet-go/default.nix
index 58f50dd2f7e3..7f40824c4724 100644
--- a/pkgs/development/tools/librarian-puppet-go/default.nix
+++ b/pkgs/development/tools/librarian-puppet-go/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "librarian-puppet-go-${version}";
+ pname = "librarian-puppet-go";
version = "0.3.9";
goPackagePath = "github.com/tmtk75/librarian-puppet-go";
diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix
index 00397978054b..41c4b25c8b1b 100644
--- a/pkgs/development/tools/literate-programming/nuweb/default.nix
+++ b/pkgs/development/tools/literate-programming/nuweb/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec{
- name = "nuweb-${version}";
+ pname = "nuweb";
version = "1.58";
src = fetchurl {
- url = "mirror://sourceforge/project/nuweb/${name}.tar.gz";
+ url = "mirror://sourceforge/project/nuweb/${pname}-${version}.tar.gz";
sha256 = "0q51i3miy15fv4njjp82yws01qfjxvqx5ly3g3vh8z3h7iq9p47y";
};
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec{
make nuweb.pdf nuwebdoc.pdf all
'';
installPhase = ''
- install -d $out/bin $out/share/man/man1 $out/share/doc/${name} $out/share/emacs/site-lisp
+ install -d $out/bin $out/share/man/man1 $out/share/doc/${pname}-${version} $out/share/emacs/site-lisp
cp nuweb $out/bin
cp nuweb.el $out/share/emacs/site-lisp
gzip -c nuweb.1 > $out/share/man/man1/nuweb.1.gz
- cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${name}
+ cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${pname}-${version}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix
index 404f3758ced4..24e5a6b6e191 100644
--- a/pkgs/development/tools/makerpm/default.nix
+++ b/pkgs/development/tools/makerpm/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.0";
- name = "makerpm-${version}";
+ pname = "makerpm";
installPhase = ''
mkdir -p $out/bin
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "ivan-tkatchev";
repo = "makerpm";
- rev = "${version}";
+ rev = version;
sha256 = "089dkbh5705ppyi920rd0ksjc0143xmvnhm8qrx93rsgwc1ggi1y";
};
diff --git a/pkgs/development/tools/maligned/default.nix b/pkgs/development/tools/maligned/default.nix
index 7e5cbaddd8b3..3029ee385188 100644
--- a/pkgs/development/tools/maligned/default.nix
+++ b/pkgs/development/tools/maligned/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "maligned-unstable-${version}";
+ pname = "maligned-unstable";
version = "2018-07-07";
rev = "6e39bd26a8c8b58c5a22129593044655a9e25959";
diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix
index a5dd0a882728..f921e900e56b 100644
--- a/pkgs/development/tools/manul/default.nix
+++ b/pkgs/development/tools/manul/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
name = "manul-unstable-2016-09-30";
goPackagePath = "github.com/kovetskiy/manul";
diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix
index 14f42ed9d40a..53e2920c68d6 100644
--- a/pkgs/development/tools/minizinc/default.nix
+++ b/pkgs/development/tools/minizinc/default.nix
@@ -3,7 +3,8 @@ let
version = "2.2.3";
in
stdenv.mkDerivation {
- name = "minizinc-${version}";
+ pname = "minizinc";
+ inherit version;
buildInputs = [ cmake flex bison ];
diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix
index 799623d34cc9..284ad4a5a670 100644
--- a/pkgs/development/tools/minizinc/ide.nix
+++ b/pkgs/development/tools/minizinc/ide.nix
@@ -3,7 +3,8 @@ let
version = "2.3.1";
in
stdenv.mkDerivation {
- name = "minizinc-ide-${version}";
+ pname = "minizinc-ide";
+ inherit version;
nativeBuildInputs = [ qmake makeWrapper ];
buildInputs = [ qtbase qtwebengine qtwebkit ];
diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/development/tools/misc/abi-compliance-checker/default.nix
index db0e41d27ab3..37d49b1f35bf 100644
--- a/pkgs/development/tools/misc/abi-compliance-checker/default.nix
+++ b/pkgs/development/tools/misc/abi-compliance-checker/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }:
stdenv.mkDerivation rec {
- name = "abi-compliance-checker-${version}";
+ pname = "abi-compliance-checker";
version = "2.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/development/tools/misc/abi-dumper/default.nix
index 047cd466baac..ca59bf28b1ec 100644
--- a/pkgs/development/tools/misc/abi-dumper/default.nix
+++ b/pkgs/development/tools/misc/abi-dumper/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }:
stdenv.mkDerivation rec {
- name = "abi-dumper-${version}";
+ pname = "abi-dumper";
version = "1.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index 7810ba6349ce..b3d380b0a0ad 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -14,8 +14,8 @@ let
sha256 = "0x0xxiar202ypbgxh19swzjil546bbp8li4k5yrpvab55y8ymkd4";
};
in
-stdenv.mkDerivation rec {
- name = "arcanist-${version}";
+stdenv.mkDerivation {
+ pname = "arcanist";
version = "20180916";
src = [ arcanist libphutil ];
diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix
index d7cea5c3d4ed..9901e46d5787 100644
--- a/pkgs/development/tools/misc/autoconf-archive/default.nix
+++ b/pkgs/development/tools/misc/autoconf-archive/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, xz }:
stdenv.mkDerivation rec {
- name = "autoconf-archive-${version}";
+ pname = "autoconf-archive";
version = "2019.01.06";
src = fetchurl {
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index ff5ce659d2e1..dc7197897192 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildPackages, fetchurl, which, pkgconfig, perl, guile, libxml2 }:
stdenv.mkDerivation rec {
- name = "autogen-${version}";
+ pname = "autogen";
version = "5.18.12";
src = fetchurl {
diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix
index 38d2194dab82..8892142ad779 100644
--- a/pkgs/development/tools/misc/awf/default.nix
+++ b/pkgs/development/tools/misc/awf/default.nix
@@ -2,7 +2,7 @@
, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "awf-${version}";
+ pname = "awf";
version = "1.4.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix
index 16182d26db3f..72848d049303 100644
--- a/pkgs/development/tools/misc/bashdb/default.nix
+++ b/pkgs/development/tools/misc/bashdb/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, python3Packages }:
stdenv.mkDerivation rec {
- name = "bashdb-${version}";
+ pname = "bashdb";
version = "4.4-1.0.0";
src = fetchurl {
- url = "mirror://sourceforge/bashdb/${name}.tar.bz2";
+ url = "mirror://sourceforge/bashdb/${pname}-${version}.tar.bz2";
sha256 = "0p7i7bpzs6q1i7swnkr89kxqgzr146xw8d2acmqwqbslzm9dqlml";
};
diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix
index ac7eb557f2ed..c246ddb9d905 100644
--- a/pkgs/development/tools/misc/bin_replace_string/default.nix
+++ b/pkgs/development/tools/misc/bin_replace_string/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libelf, txt2man }:
-stdenv.mkDerivation rec {
- name = "bin_replace_string-${version}";
+stdenv.mkDerivation {
+ pname = "bin_replace_string";
version = "0.2";
src = fetchurl {
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index c33741740adc..210659289d1e 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -22,7 +22,7 @@ let
"${stdenv.targetPlatform.config}-";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = targetPrefix + basename;
# HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix
index 0d78cfbbab8c..6548e9643971 100644
--- a/pkgs/development/tools/misc/bossa/default.nix
+++ b/pkgs/development/tools/misc/bossa/default.nix
@@ -13,7 +13,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "bossa-1.8";
src = fetchgit {
diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix
index 359ab125be99..dd84e3830c41 100644
--- a/pkgs/development/tools/misc/bsdbuild/default.nix
+++ b/pkgs/development/tools/misc/bsdbuild/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }:
stdenv.mkDerivation rec {
- name = "bsdbuild-${version}";
+ pname = "bsdbuild";
version = "3.1";
src = fetchurl {
- url = "http://stable.hypertriton.com/bsdbuild/${name}.tar.gz";
+ url = "http://stable.hypertriton.com/bsdbuild/${pname}-${version}.tar.gz";
sha256 = "1zrdjh7a6z4khhfw9zrp490afq306cpl5v8wqz2z55ys7k1n5ifl";
};
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index ae7ecad7ea1c..4eeb61a7edd9 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, zlib, makeWrapper }:
let ccache = stdenv.mkDerivation rec {
- name = "ccache-${version}";
+ pname = "ccache";
version = "3.4.1";
src = fetchurl {
sha256 = "1pppi4jbkkj641cdynmc35jaj40jjicw7gj75ran5qs5886jcblc";
- url = "mirror://samba/ccache/${name}.tar.xz";
+ url = "mirror://samba/ccache/${pname}-${version}.tar.xz";
};
nativeBuildInputs = [ perl ];
@@ -30,7 +30,7 @@ let ccache = stdenv.mkDerivation rec {
passthru = {
# A derivation that provides gcc and g++ commands, but that
# will end up calling ccache for the given cacheDir
- links = {unwrappedCC, extraConfig}: stdenv.mkDerivation rec {
+ links = {unwrappedCC, extraConfig}: stdenv.mkDerivation {
name = "ccache-links";
passthru = {
isClang = unwrappedCC.isClang or false;
diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix
index 775879440ab4..e42c3e58db8e 100644
--- a/pkgs/development/tools/misc/ccls/default.nix
+++ b/pkgs/development/tools/misc/ccls/default.nix
@@ -2,7 +2,7 @@
, cmake, llvmPackages, rapidjson, runtimeShell }:
stdenv.mkDerivation rec {
- name = "ccls-${version}";
+ pname = "ccls";
version = "0.20190823";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix
index 6de69a34b290..f823519fb34a 100644
--- a/pkgs/development/tools/misc/cgdb/default.nix
+++ b/pkgs/development/tools/misc/cgdb/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses, readline, flex, texinfo }:
stdenv.mkDerivation rec {
- name = "cgdb-${version}";
+ pname = "cgdb";
version = "0.7.1";
src = fetchurl {
- url = "https://cgdb.me/files/${name}.tar.gz";
+ url = "https://cgdb.me/files/${pname}-${version}.tar.gz";
sha256 = "1671gpz5gx5j0zga8xy2x7h33vqh3nij93lbb6dbb366ivjknwmv";
};
diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix
index 5f98df54c0a0..887a0f16ec1a 100644
--- a/pkgs/development/tools/misc/checkbashisms/default.nix
+++ b/pkgs/development/tools/misc/checkbashisms/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
version = "2.0.0.2";
- name = "checkbashisms-${version}";
+ pname = "checkbashisms";
src = fetchurl {
url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms";
diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix
index 4170570e08aa..956a8df69cea 100644
--- a/pkgs/development/tools/misc/chrpath/default.nix
+++ b/pkgs/development/tools/misc/chrpath/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "chrpath-0.16";
src = fetchurl {
diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix
index ed96befca5e7..1aac0bd651c7 100644
--- a/pkgs/development/tools/misc/chruby/default.nix
+++ b/pkgs/development/tools/misc/chruby/default.nix
@@ -8,7 +8,7 @@ let
'';
in stdenv.mkDerivation rec {
- name = "chruby-${version}";
+ pname = "chruby";
version = "0.3.9";
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index daf39318432a..e1b89d07cdfd 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -5,7 +5,7 @@ let
pname = "circleci-cli";
version = "0.1.2569";
in
-buildGoPackage rec {
+buildGoPackage {
name = "${pname}-${version}";
inherit version;
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 4040eda141fd..861a6eff1640 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }:
stdenv.mkDerivation rec {
- name = "coccinelle-${version}";
+ pname = "coccinelle";
version = "1.0.6";
src = fetchurl {
- url = "http://coccinelle.lip6.fr/distrib/${name}.tgz";
+ url = "http://coccinelle.lip6.fr/distrib/${pname}-${version}.tgz";
sha256 = "02g9hmwkvfl838zz690yra5jzrqjg6y6ffxkrfcsx790bhkfsll4";
};
diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix
index d95c67fea6d9..a2a39b810553 100644
--- a/pkgs/development/tools/misc/complexity/default.nix
+++ b/pkgs/development/tools/misc/complexity/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, autogen }:
stdenv.mkDerivation rec {
- name = "complexity-${version}";
+ pname = "complexity";
version = "1.10";
src = fetchurl {
- url = "mirror://gnu/complexity/${name}.tar.gz";
+ url = "mirror://gnu/complexity/${pname}-${version}.tar.gz";
sha256 = "1vfns9xm7w0wrz12a3w15slrqnrfh6qxk15nv7qkj3irll3ff522";
};
diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix
index 8a0cb095d445..973caee64e85 100644
--- a/pkgs/development/tools/misc/cproto/default.nix
+++ b/pkgs/development/tools/misc/cproto/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, flex, bison }:
stdenv.mkDerivation rec {
- name = "cproto-${version}";
+ pname = "cproto";
version = "4.7o";
src = fetchurl {
diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix
index 54ad7ca7071c..c43509a4f43b 100644
--- a/pkgs/development/tools/misc/cquery/default.nix
+++ b/pkgs/development/tools/misc/cquery/default.nix
@@ -14,8 +14,8 @@ let
stdenv = llvmPackages.stdenv;
in
-stdenv.mkDerivation rec {
- name = "cquery-${version}";
+stdenv.mkDerivation {
+ pname = "cquery";
version = "2018-10-14";
inherit src;
diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix
index eff1af8cdb47..34cbadb38afb 100644
--- a/pkgs/development/tools/misc/csmith/default.nix
+++ b/pkgs/development/tools/misc/csmith/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }:
stdenv.mkDerivation rec {
- name = "csmith-${version}";
+ pname = "csmith";
version = "2.3.0";
src = fetchurl {
- url = "https://embed.cs.utah.edu/csmith/${name}.tar.gz";
+ url = "https://embed.cs.utah.edu/csmith/${pname}-${version}.tar.gz";
sha256 = "1mb5zgixsyf86slggs756k8a5ddmj980md3ic9sa1y75xl5cqizj";
};
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
postInstall = ''
substituteInPlace $out/bin/compiler_test.pl \
- --replace '$CSMITH_HOME/runtime' $out/include/${name} \
- --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${name}" \
+ --replace '$CSMITH_HOME/runtime' $out/include/${pname}-${version} \
+ --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${pname}-${version}" \
--replace '$CSMITH_HOME/src/csmith' $out/bin/csmith
substituteInPlace $out/bin/launchn.pl \
diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix
index d8deb75d2d41..3a54a17a93af 100644
--- a/pkgs/development/tools/misc/cwebbin/default.nix
+++ b/pkgs/development/tools/misc/cwebbin/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl, tie }:
stdenv.mkDerivation rec {
- name = "cwebbin-${version}";
+ pname = "cwebbin";
version = "22p";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix
index a1c9e85a83ab..5bccea9ced88 100644
--- a/pkgs/development/tools/misc/dbench/default.nix
+++ b/pkgs/development/tools/misc/dbench/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, autoconf, popt, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dbench-2013-01-01";
src = fetchgit {
diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix
index ba95889b5a80..1dd53f62cec6 100644
--- a/pkgs/development/tools/misc/dfu-programmer/default.nix
+++ b/pkgs/development/tools/misc/dfu-programmer/default.nix
@@ -3,12 +3,13 @@ let
version = "0.7.2";
in
stdenv.mkDerivation rec {
- name="dfu-programmer-${version}";
+ pname = "dfu-programmer";
+ inherit version;
buildInputs = [ libusb ];
src = fetchurl {
- url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz";
+ url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz";
sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x";
};
diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix
index 2657e570106e..bf1effbe71a2 100644
--- a/pkgs/development/tools/misc/dfu-util/default.nix
+++ b/pkgs/development/tools/misc/dfu-util/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, libusb1 }:
stdenv.mkDerivation rec {
- name="dfu-util-${version}";
+ pname = "dfu-util";
version = "0.9";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libusb1 ];
src = fetchurl {
- url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz";
+ url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz";
sha256 = "0czq73m92ngf30asdzrfkzraag95hlrr74imbanqq25kdim8qhin";
};
diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix
index efb850d5adef..378cc4683b41 100644
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -8,13 +8,13 @@ assert withLibrary -> libtool != null;
assert unicodeSupport -> ncurses.unicode && ncurses != null;
stdenv.mkDerivation rec {
- name = "dialog-${version}";
+ pname = "dialog";
version = "1.3-20190211";
src = fetchurl {
urls = [
- "ftp://ftp.invisible-island.net/dialog/${name}.tgz"
- "https://invisible-mirror.net/archives/dialog/${name}.tgz"
+ "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz"
+ "https://invisible-mirror.net/archives/dialog/${pname}-${version}.tgz"
];
sha256 = "1lx0bvradzx1zl7znlrsnyljcs596r7wamkhyq37ikbxsy4y5h29";
};
diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix
index 51a5f52d3759..23c01338f601 100644
--- a/pkgs/development/tools/misc/elfinfo/default.nix
+++ b/pkgs/development/tools/misc/elfinfo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "elfinfo-${version}";
+ pname = "elfinfo";
version = "0.7.5";
goPackagePath = "github.com/xyproto/elfinfo";
diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix
index 905fa0d40935..c7eaafd9c7a8 100644
--- a/pkgs/development/tools/misc/elfkickers/default.nix
+++ b/pkgs/development/tools/misc/elfkickers/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "elfkickers-${version}";
+ pname = "elfkickers";
version = "3.1";
src = fetchurl {
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 424032e21af4..06f1e2895c02 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -2,20 +2,16 @@
# TODO: Look at the hardcoded paths to kernel, modules etc.
stdenv.mkDerivation rec {
- name = "elfutils-${version}";
+ pname = "elfutils";
version = "0.176";
src = fetchurl {
- url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2";
+ url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2";
sha256 = "08qhrl4g6qqr4ga46jhh78y56a47p3msa5b2x1qhzbxhf71lfmzb";
};
patches = [ ./debug-info-from-env.patch ];
- postPatch = ''
- patchShebangs tests
- '';
-
hardeningDisable = [ "format" ];
# We need bzip2 in NativeInputs because otherwise we can't unpack the src,
diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix
index f58d06599650..b449c0a2d010 100644
--- a/pkgs/development/tools/misc/epm/default.nix
+++ b/pkgs/development/tools/misc/epm/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, rpm}:
stdenv.mkDerivation rec {
- name = "epm-${version}";
+ pname = "epm";
version = "4.4";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix
index e84aa0ef555a..152792dcee25 100644
--- a/pkgs/development/tools/misc/fsatrace/default.nix
+++ b/pkgs/development/tools/misc/fsatrace/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "fsatrace-${version}";
+ pname = "fsatrace";
version = "0.0.1-160";
src = fetchFromGitHub {
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
};
preConfigure = ''
- mkdir -p $out/libexec/${name}
- export makeFlags=INSTALLDIR=$out/libexec/${name}
+ mkdir -p $out/libexec/${pname}-${version}
+ export makeFlags=INSTALLDIR=$out/libexec/${pname}-${version}
'';
postInstall = ''
mkdir -p $out/bin
- ln -s $out/libexec/${name}/fsatrace $out/bin/
+ ln -s $out/libexec/${pname}-${version}/fsatrace $out/bin/
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 73de8eb8cb61..a5c32bd3dc1b 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -10,7 +10,7 @@
}:
stdenv.mkDerivation rec {
- name = "fswatch-${version}";
+ pname = "fswatch";
version = "1.14.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix
index 70a157bc0840..1484e54289e6 100644
--- a/pkgs/development/tools/misc/gede/default.nix
+++ b/pkgs/development/tools/misc/gede/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, python, qmake, ctags, gdb }:
stdenv.mkDerivation rec {
- name = "gede-${version}";
+ pname = "gede";
version = "2.14.1";
src = fetchurl {
- url = "http://gede.acidron.com/uploads/source/${name}.tar.xz";
+ url = "http://gede.acidron.com/uploads/source/${pname}-${version}.tar.xz";
sha256 = "1z7577zwz7h03d58as93hyx99isi3p4i3rhxr8l01zgi65mz0mr9";
};
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index b2c71388fc52..2d756a655a43 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "global-${version}";
+ pname = "global";
version = "6.6.3";
src = fetchurl {
- url = "mirror://gnu/global/${name}.tar.gz";
+ url = "mirror://gnu/global/${pname}-${version}.tar.gz";
sha256 = "0735pj47dnspf20n0j1px24p59nwjinlmlb2n32ln1hvdkprivnb";
};
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index afe9b59e012d..ab2ab0de9cf9 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "gnum4-1.4.18";
src = fetchurl {
diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix
index 25043f89463d..108d6190cb7d 100644
--- a/pkgs/development/tools/misc/gpshell/default.nix
+++ b/pkgs/development/tools/misc/gpshell/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "gpshell-${version}";
+ pname = "gpshell";
version = "1.4.4";
src = fetchurl {
diff --git a/pkgs/development/tools/misc/gputils/default.nix b/pkgs/development/tools/misc/gputils/default.nix
index aaaee20b81a8..37a7a8c931c3 100644
--- a/pkgs/development/tools/misc/gputils/default.nix
+++ b/pkgs/development/tools/misc/gputils/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "gputils-${version}";
+ pname = "gputils";
version = "1.5.0-1";
src = fetchurl {
- url = "mirror://sourceforge/gputils/${name}.tar.bz2";
+ url = "mirror://sourceforge/gputils/${pname}-${version}.tar.bz2";
sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g";
};
diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix
index 5280b69cdcec..5b47ce0bc247 100644
--- a/pkgs/development/tools/misc/gtkperf/default.nix
+++ b/pkgs/development/tools/misc/gtkperf/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
patches = [ ./bench.patch ];
meta = with stdenv.lib; {
- description = "Application designed to test GTK+ performance";
+ description = "Application designed to test GTK performance";
homepage = http://gtkperf.sourceforge.net/;
license = with licenses; [ gpl2 ];
maintainers = with maintainers; [ dtzWill ];
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 264f2aec44d4..c4cba5ffc69c 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perlPackages, gettext }:
stdenv.mkDerivation rec {
- name = "help2man-1.47.10";
+ name = "help2man-1.47.11";
src = fetchurl {
url = "mirror://gnu/help2man/${name}.tar.xz";
- sha256 = "1yywli520246aba12vpgj7bhr1r13swad3xm49a0cygqcgywnwgk";
+ sha256 = "123vsimgx8zq1h077sbyh3bd0hbmlc3wih2231wwh133z1bv51ar";
};
nativeBuildInputs = [ gettext perlPackages.LocaleGettext ];
diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix
index 0f9219f10a01..d3afbbc1bc76 100644
--- a/pkgs/development/tools/misc/hound/default.nix
+++ b/pkgs/development/tools/misc/hound/default.nix
@@ -7,7 +7,7 @@
}:
buildGoPackage rec {
- name = "hound-unstable-${version}";
+ pname = "hound-unstable";
version = "2018-11-02";
rev = "74ec7448a234d8d09e800b92e52c92e378c07742";
diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/development/tools/misc/igprof/default.nix
index 294d1fa10dde..996dda4ca941 100644
--- a/pkgs/development/tools/misc/igprof/default.nix
+++ b/pkgs/development/tools/misc/igprof/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "5.9.16";
- name = "igprof-${version}";
+ pname = "igprof";
src = fetchFromGitHub {
owner = "igprof";
diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix
index 8bc35ba01a61..b04de1832abb 100644
--- a/pkgs/development/tools/misc/inotify-tools/default.nix
+++ b/pkgs/development/tools/misc/inotify-tools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, autoreconfHook, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "inotify-tools-${version}";
+ pname = "inotify-tools";
version = "3.20.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 281b09393b5d..12197c2de40c 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -3,7 +3,7 @@
, procps, utilmacros, gtk-doc, openssl, peg }:
stdenv.mkDerivation rec {
- name = "intel-gpu-tools-${version}";
+ pname = "intel-gpu-tools";
version = "1.23";
src = fetchurl {
diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix
index a9f451d31e7d..c837728f72dd 100644
--- a/pkgs/development/tools/misc/intltool/default.nix
+++ b/pkgs/development/tools/misc/intltool/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, gettext, perlPackages }:
stdenv.mkDerivation rec {
- name = "intltool-${version}";
+ pname = "intltool";
version = "0.51.0";
src = fetchurl {
- url = "https://launchpad.net/intltool/trunk/${version}/+download/${name}.tar.gz";
+ url = "https://launchpad.net/intltool/trunk/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7";
};
diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix
index b431e804d8dc..8da3cd57703c 100644
--- a/pkgs/development/tools/misc/kdbg/default.nix
+++ b/pkgs/development/tools/misc/kdbg/default.nix
@@ -3,10 +3,10 @@
}:
stdenv.mkDerivation rec {
- name = "kdbg-${version}";
+ pname = "kdbg";
version = "3.0.0";
src = fetchurl {
- url = "mirror://sourceforge/kdbg/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/kdbg/${version}/${pname}-${version}.tar.gz";
sha256 = "0lxfal6jijdcrf0hc81gmapfmz0kq4569d5qzfm4p72rq9s4r5in";
};
diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix
deleted file mode 100644
index f4c3237ee7a5..000000000000
--- a/pkgs/development/tools/misc/kibana/5.x.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, makeWrapper, fetchurl, elk5Version, nodejs, coreutils, which }:
-
-with stdenv.lib;
-let
- inherit (builtins) elemAt;
- archOverrides = {
- "i686" = "x86";
- };
- info = splitString "-" stdenv.hostPlatform.system;
- arch = (elemAt info 0);
- elasticArch = archOverrides."${arch}" or arch;
- plat = elemAt info 1;
- shas = {
- "x86_64-linux" = "0hzr47hyw54b9j4c33n6f6n3pala6kjhyvinfszgikbghyhb7fsa";
- "i686-linux" = "0bka4h31cw10ii4pfygc81pwc3wr32pzw3v4k4bi8rnqbk280fmn";
- "x86_64-darwin" = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll";
- };
-in stdenv.mkDerivation rec {
- name = "kibana-${version}";
- version = elk5Version;
-
- src = fetchurl {
- url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${elasticArch}.tar.gz";
- sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
- };
-
- buildInputs = [ makeWrapper ];
-
- installPhase = ''
- mkdir -p $out/libexec/kibana $out/bin
- mv * $out/libexec/kibana/
- rm -r $out/libexec/kibana/node
- makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
- --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"
- sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
- '';
-
- meta = {
- description = "Visualize logs and time-stamped data";
- homepage = http://www.elasticsearch.org/overview/kibana;
- license = licenses.asl20;
- maintainers = with maintainers; [ offline ];
- platforms = with platforms; unix;
- };
-}
diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix
index 46a72a32722e..9605a035be67 100644
--- a/pkgs/development/tools/misc/kibana/6.x.nix
+++ b/pkgs/development/tools/misc/kibana/6.x.nix
@@ -18,12 +18,12 @@ let
shas =
if enableUnfree
then {
- "x86_64-linux" = "1i3zmzxihplwd8n994lfxhhgygdg3qxjqgrj1difa8w3vss0zbfn";
- "x86_64-darwin" = "09a96ms9id77infxd9xxfs6r7j01mn0rz5yw3g9sl92j9ri7r52c";
+ x86_64-linux = "1xwklhqxk5rmdrgy2simwvijzq29kyq5w2w3hy53xh2i1zlnyvq3";
+ x86_64-darwin = "1qpdn28mrpggd55khzqqld6r89l0hb870rigxcw2i8p2yx3jv106";
}
else {
- "x86_64-linux" = "166rhxr0qlv1yarj2mg1c3b8mxvhl70jhz53azq7ic6laj55q7fk";
- "x86_64-darwin" = "0ngngkbl036p2mzwhp8qafi3aqzk398a218w12srfqny5n630vdk";
+ x86_64-linux = "1wpnwal2rq5v2bsp5qil9j6dplif7ql5394sy4ia5ghp2fzifxmf";
+ x86_64-darwin = "12z8i0wbw10c097glbpdy350p0h3957433f51qfx2p0ghgkzkhzv";
};
in stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz";
- sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
+ sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
};
patches = [
diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix
index 9fba3b43e11c..83651e6d17ee 100644
--- a/pkgs/development/tools/misc/kibana/7.x.nix
+++ b/pkgs/development/tools/misc/kibana/7.x.nix
@@ -18,12 +18,12 @@ let
shas =
if enableUnfree
then {
- "x86_64-linux" = "1mzycd0ljnkslz9p9jhq279bkpk35r7svhngxjnmsh11ampsvxb8";
- "x86_64-darwin" = "1bz409njdpmsagh5dg062114wpa96w7pmxwfjsizwksqyyjdwdv7";
+ x86_64-linux = "0sc5709k3z7lb8qcjpj49s6vfv69ds2wc8319ag9x776nyz1pqxi";
+ x86_64-darwin = "0zh4q46vfdwaihs838ck8fap92i3b4x10wbpmx8mcwyfk5v0fkch";
}
else {
- "x86_64-linux" = "1x3gjc9xa03m4jfnl5vjxigzcnb8ysnhxgd8618v85x4l0010v38";
- "x86_64-darwin" = "1nsbmrswv2jv2z7686i2sf6rrmxysbqi5ih6jjrbrqnk64xi18j2";
+ x86_64-linux = "1pq17fasryharvw4byybvmcf5172hcmy6cp0m8bxhkxagwilprba";
+ x86_64-darwin = "11crpx2qs2nzkzv6fvs1gqn9v4zalxkzsc5br0fy1y02lzm26zbm";
};
in stdenv.mkDerivation rec {
@@ -32,14 +32,14 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz";
- sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
+ sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
};
patches = [
# Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3.
# The test succeeds with this newer version so lets just
# disable the version check.
- ./disable-nodejs-version-check.patch
+ ./disable-nodejs-version-check-7.patch
];
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch b/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch
new file mode 100644
index 000000000000..ef4c207764c1
--- /dev/null
+++ b/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch
@@ -0,0 +1,19 @@
+diff --git a/src/setup_node_env/node_version_validator.js b/src/setup_node_env/node_version_validator.js
+index 3f611e5a..f5c60c85 100644
+--- a/src/setup_node_env/node_version_validator.js
++++ b/src/setup_node_env/node_version_validator.js
+@@ -25,11 +25,11 @@ var pkg = require('../../package.json'); // Note: This is written in ES5 so we c
+ var currentVersion = process && process.version || null;
+ var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node || null;
+ var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion;
+-var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts.
++var isVersionValid = !!currentVersion && !!requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts.
+
+ if (!isVersionValid) {
+ var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit.
+
+ console.error(errorMessage);
+ process.exit(1);
+-}
+\ No newline at end of file
++}
diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix
index 240d52ca7d0e..ace34f350599 100644
--- a/pkgs/development/tools/misc/loccount/default.nix
+++ b/pkgs/development/tools/misc/loccount/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitLab }:
buildGoPackage rec {
- name = "loccount-${version}";
+ pname = "loccount";
version = "1.2";
goPackagePath = "gitlab.com/esr/loccount";
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 98acccb252a3..1298346ef31c 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "lsof-org";
repo = "lsof";
- rev = "${version}";
+ rev = version;
sha256 = "1gd6r0nv8xz76pmvk52dgmfl0xjvkxl0s51b4jk4a0lphw3393yv";
};
diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix
index 77d4c5771f90..b8fa02306c4d 100644
--- a/pkgs/development/tools/misc/ltrace/default.nix
+++ b/pkgs/development/tools/misc/ltrace/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, elfutils, libunwind }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ltrace-0.7.3";
src = fetchurl {
diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index 42ca1a1b7d54..17837a548772 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
stdenv.mkDerivation rec {
- name = "lttng-tools-${version}";
+ pname = "lttng-tools";
version = "2.10.7";
src = fetchurl {
- url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
+ url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2";
sha256 = "04hkga0hnyjmv42mxj3njaykqmq9x4abd5qfyds5r62x1khfnwgd";
};
diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index adc4bbd5c39a..ad5276e5e1a9 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -12,11 +12,11 @@
# Debian builds with std.h (systemtap).
stdenv.mkDerivation rec {
- name = "lttng-ust-${version}";
+ pname = "lttng-ust";
version = "2.10.4";
src = fetchurl {
- url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
+ url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2";
sha256 = "0rx9q5r9qcdx3i9i0rx28p33yl52sd6f35qj7qs4li2w42xv9mbm";
};
diff --git a/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch b/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch
deleted file mode 100644
index 013ac5180afa..000000000000
--- a/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
-index f93e67a..2eb2db9 100644
---- a/src/luarocks/core/cfg.lua
-+++ b/src/luarocks/core/cfg.lua
-@@ -425,9 +425,9 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
- defaults.external_lib_extension = "dylib"
- defaults.arch = "macosx-"..target_cpu
- defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load"
-- defaults.variables.STAT = "/usr/bin/stat"
-+ defaults.variables.STAT = "stat"
- defaults.variables.STATFLAG = "-f '%A'"
-- local version = util.popen_read("sw_vers -productVersion")
-+ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12"
- version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3
- if version >= 10 then
- version = 8
-@@ -436,8 +436,8 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
- else
- defaults.gcc_rpath = false
- end
-- defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc"
-- defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc"
-+ defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." clang"
-+ defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." clang"
- defaults.web_browser = "open"
- end
-
diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index 2e0eec5ae57d..fa19b2494076 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl
+{stdenv, fetchFromGitHub
, curl, makeWrapper, which, unzip
, lua
# for 'luarocks pack'
@@ -9,11 +9,13 @@
stdenv.mkDerivation rec {
pname = "luarocks";
- version = "3.1.3";
+ version = "3.2.1";
- src = fetchurl {
- url="http://luarocks.org/releases/luarocks-${version}.tar.gz";
- sha256="04q5k6drypsnbp1wspr9ns72k8kjf62a787a6jg1bb2s95gl6wy5";
+ src = fetchFromGitHub {
+ owner = "luarocks";
+ repo = "luarocks";
+ rev = "v${version}";
+ sha256 = "0viiafmb8binksda79ah828q1dfnb6jsqlk7vyndl2xvx9yfn4y2";
};
patches = [ ./darwin-3.1.3.patch ];
diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
index 8da224f0ef8c..21611f05579b 100644
--- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
+++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
@@ -1,13 +1,14 @@
{ luarocks, fetchFromGitHub }:
luarocks.overrideAttrs(old: {
pname = "luarocks-nix";
+ version = "2019-09-07";
src = fetchFromGitHub {
- owner = "teto";
+ owner = "nix-community";
repo = "luarocks";
- rev = "38ed82ba3e5682d7d55ef9a870dfb464ca180df9";
- sha256 = "0vlzywiv3sxkpjg1fzzxicmfr6kh04fxw5q9n8vsd2075xjxg6bs";
+ rev = "fa7c367bcdad36768db5f19fd4fcdd9681a14429";
+ sha256 = "0kziwfw5gqq5xsckl7qf9wasaiy8rp42h5qrcnjx07qp47a9ldx7";
};
patches = [
- ./darwin-3.0.x.patch
+ ./darwin-3.1.3.patch
];
})
diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix
index ebe62452440e..518d128890a9 100644
--- a/pkgs/development/tools/misc/macdylibbundler/default.nix
+++ b/pkgs/development/tools/misc/macdylibbundler/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "macdylibbundler-${version}";
+stdenv.mkDerivation {
+ pname = "macdylibbundler";
version = "20180825";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix
index 23b7119e7d74..7cbd92460817 100644
--- a/pkgs/development/tools/misc/md2man/default.nix
+++ b/pkgs/development/tools/misc/md2man/default.nix
@@ -3,7 +3,7 @@
with lib;
buildGoPackage rec {
- name = "go-md2man-${version}";
+ pname = "go-md2man";
version = "1.0.6";
goPackagePath = "github.com/cpuguy83/go-md2man";
diff --git a/pkgs/development/tools/misc/moby/default.nix b/pkgs/development/tools/misc/moby/default.nix
index c45e7841d450..a5e4572d18dd 100644
--- a/pkgs/development/tools/misc/moby/default.nix
+++ b/pkgs/development/tools/misc/moby/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "moby-${version}";
+ pname = "moby";
version = "2017-07-06";
rev = "d87a3f9990ed24ebbb51695879cd640cb07a4b40";
diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix
index af3b45a8e62c..8af121707986 100644
--- a/pkgs/development/tools/misc/ninka/default.nix
+++ b/pkgs/development/tools/misc/ninka/default.nix
@@ -2,7 +2,7 @@
assert stdenv ? glibc;
-perlPackages.buildPerlPackage rec {
+perlPackages.buildPerlPackage {
pname = "ninka";
version = "2.0-pre";
diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix
index ade9954021a1..164e0e80b60c 100644
--- a/pkgs/development/tools/misc/nixbang/default.nix
+++ b/pkgs/development/tools/misc/nixbang/default.nix
@@ -2,7 +2,8 @@
let version = "0.1.2"; in
pythonPackages.buildPythonApplication {
- name = "nixbang-${version}";
+ pname = "nixbang";
+ inherit version;
namePrefix = "";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix
index a449c28ea289..dea6256824df 100644
--- a/pkgs/development/tools/misc/objconv/default.nix
+++ b/pkgs/development/tools/misc/objconv/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "objconv-${version}";
+ pname = "objconv";
version = "2.51";
src = fetchurl {
# Versioned archive of objconv sources maintained by orivej.
- url = "https://archive.org/download/objconv/${name}.zip";
+ url = "https://archive.org/download/objconv/${pname}-${version}.zip";
sha256 = "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs";
};
diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix
index 874aa04157dc..21e825ac0bf0 100644
--- a/pkgs/development/tools/misc/opengrok/default.nix
+++ b/pkgs/development/tools/misc/opengrok/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }:
stdenv.mkDerivation rec {
- name = "opengrok-${version}";
+ pname = "opengrok";
version = "1.0";
# binary distribution
src = fetchurl {
- url = "https://github.com/oracle/opengrok/releases/download/${version}/${name}.tar.gz";
+ url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "0h4rwfh8m41b7ij931gcbmkihri25m48373qf6ig0714s66xwc4i";
};
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index 7141fdcee7e7..80203dd0df9c 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, libftdi1, libusb1, pkgconfig, hidapi }:
stdenv.mkDerivation rec {
- name = "openocd-${version}";
+ pname = "openocd";
version = "0.10.0";
src = fetchurl {
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
"-Wno-implicit-fallthrough"
"-Wno-format-truncation"
"-Wno-format-overflow"
+ "-Wno-error=tautological-compare"
];
postInstall = lib.optionalString stdenv.isLinux ''
diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index 29d713a9af44..c673bd261098 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "patchelf-${version}";
+ pname = "patchelf";
version = "0.10-pre-20190328";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix
index fbb21a8b7c65..0b91953a7c7f 100644
--- a/pkgs/development/tools/misc/pmccabe/default.nix
+++ b/pkgs/development/tools/misc/pmccabe/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "pmccabe-${version}";
+ pname = "pmccabe";
version = "2.6";
src = fetchurl {
diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix
index f99c904ed01c..7bfff6328269 100644
--- a/pkgs/development/tools/misc/prelink/default.nix
+++ b/pkgs/development/tools/misc/prelink/default.nix
@@ -3,8 +3,9 @@
let
version = "20130503";
in
-stdenv.mkDerivation rec {
- name = "prelink-${version}";
+stdenv.mkDerivation {
+ pname = "prelink";
+ inherit version;
buildInputs = [
libelf stdenv.cc.libc (stdenv.lib.getOutput "static" stdenv.cc.libc)
diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix
index 8ceb3d4a4367..d9d28580210b 100644
--- a/pkgs/development/tools/misc/premake/5.nix
+++ b/pkgs/development/tools/misc/premake/5.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "premake5-${version}";
+ pname = "premake5";
version = "5.0.0-alpha12";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix
index 8f27609ababe..7182144fd200 100644
--- a/pkgs/development/tools/misc/pwndbg/default.nix
+++ b/pkgs/development/tools/misc/pwndbg/default.nix
@@ -15,7 +15,7 @@
, }:
stdenv.mkDerivation rec {
- name = "pwndbg-${version}";
+ pname = "pwndbg";
version = "2019.01.25";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix
index 19e4423f7d86..0519e4d05e04 100644
--- a/pkgs/development/tools/misc/saleae-logic/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic/default.nix
@@ -27,7 +27,6 @@ assert stdenv.hostPlatform.system == "x86_64-linux";
stdenv.mkDerivation rec {
pname = "saleae-logic";
version = "1.2.18";
- name = "${pname}-${version}";
src = fetchurl {
name = "saleae-logic-${version}-64bit.zip";
diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix
index 0c994e88e23f..b9a4658d3dee 100644
--- a/pkgs/development/tools/misc/sccache/default.nix
+++ b/pkgs/development/tools/misc/sccache/default.nix
@@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
version = "0.2.10";
- name = "sccache-${version}";
+ pname = "sccache";
src = fetchFromGitHub {
owner = "mozilla";
diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix
index a506831cd8ea..004975f10d8a 100644
--- a/pkgs/development/tools/misc/sipp/default.nix
+++ b/pkgs/development/tools/misc/sipp/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "3.5.1";
- name = "sipp-${version}";
+ pname = "sipp";
src = fetchFromGitHub {
owner = "SIPp";
diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix
index fdacdaef20fc..98c400d52851 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/pkgs/development/tools/misc/stlink/default.nix
@@ -7,7 +7,8 @@ let
version = "1.5.1";
in
stdenv.mkDerivation {
- name = "stlink-${version}";
+ pname = "stlink";
+ inherit version;
src = fetchFromGitHub {
owner = "texane";
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index acdc712786f5..c809437f6fb9 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, libunwind, buildPackages }:
stdenv.mkDerivation rec {
- name = "strace-${version}";
+ pname = "strace";
version = "5.2";
src = fetchurl {
- url = "https://strace.io/files/${version}/${name}.tar.xz";
+ url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
sha256 = "1li49i75wrdw91hchyyd8spnzfcmxcfyfb5g9zbaza89aq4bq4ym";
};
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index 7b6048eb475d..e2d507ab8013 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql
, libaio }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "sysbench-1.0.17";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix
index b50aa088ac57..9872c91ac4ba 100644
--- a/pkgs/development/tools/misc/tcptrack/default.nix
+++ b/pkgs/development/tools/misc/tcptrack/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ncurses, libpcap }:
stdenv.mkDerivation rec {
- name = "tcptrack-${version}";
+ pname = "tcptrack";
version = "1.4.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
index 82d0ec6119ea..2975d64113e8 100644
--- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix
+++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
@@ -3,7 +3,8 @@ let
version = "2.1";
in
stdenv.mkDerivation {
- name = "teensy-loader-cli-${version}";
+ pname = "teensy-loader-cli";
+ inherit version;
src = fetchgit {
url = "git://github.com/PaulStoffregen/teensy_loader_cli.git";
rev = "f5b6d7aafda9a8b014b4bb08660833ca45c136d2";
diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix
index 77b362c712c2..fb38d096ab43 100644
--- a/pkgs/development/tools/misc/tet/default.nix
+++ b/pkgs/development/tools/misc/tet/default.nix
@@ -1,8 +1,8 @@
{ fetchurl, stdenv }:
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
version = "3.8";
- name = "tet-${version}";
+ pname = "tet";
src = fetchurl {
url = http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz ;
diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix
index 63e5bea19d74..5f4478bd4fbb 100644
--- a/pkgs/development/tools/misc/texinfo/4.13a.nix
+++ b/pkgs/development/tools/misc/texinfo/4.13a.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, texinfo, ncurses, lzma }:
stdenv.mkDerivation rec {
- name = "texinfo-${version}";
+ pname = "texinfo";
version = "4.13a";
src = fetchurl {
- url = "mirror://gnu/texinfo/${name}.tar.lzma";
+ url = "mirror://gnu/texinfo/${pname}-${version}.tar.lzma";
sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d";
};
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index 613fd2673d56..7741f2d4ffbc 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -8,7 +8,7 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "texinfo-${optionalString interactive "interactive-"}${version}";
inherit version;
diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix
index c380243a898b..5e40152df8df 100644
--- a/pkgs/development/tools/misc/tie/default.nix
+++ b/pkgs/development/tools/misc/tie/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "tie-${version}";
+ pname = "tie";
version = "2.4";
src = fetchurl {
- url = "http://mirrors.ctan.org/web/tie/${name}.tar.gz";
+ url = "http://mirrors.ctan.org/web/tie/${pname}-${version}.tar.gz";
sha256 = "1m5952kdfffiz33p1jw0wv7dh272mmw28mpxw9v7lkb352zv4xsj";
};
diff --git a/pkgs/development/tools/misc/tokei/Cargo.lock.patch b/pkgs/development/tools/misc/tokei/Cargo.lock.patch
new file mode 100644
index 000000000000..46bd80a218da
--- /dev/null
+++ b/pkgs/development/tools/misc/tokei/Cargo.lock.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index db09bc4..1e4892d 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -961,7 +961,7 @@ dependencies = [
+
+ [[package]]
+ name = "tokei"
+-version = "10.0.0"
++version = "10.0.1"
+ dependencies = [
+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dirs 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index f77e30b45ae9..104aa4691ab1 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -2,26 +2,35 @@
rustPlatform.buildRustPackage rec {
pname = "tokei";
- version = "9.1.1";
+ version = "10.0.1";
src = fetchFromGitHub {
owner = "XAMPPRocky";
repo = pname;
rev = "v${version}";
- sha256 = "0gz8m5j9p7hwylyl7cdxbli9rpy1p6lsrbym4zk647819pg4k1jp";
+ sha256 = "0g8p4f8g9zb1fqzzb1qi28idskahi5nldsma6rydjyrgi9gynpa0";
};
- cargoSha256 = "19h0ybi9qq5shvr7zix0gb24a29lqkvyfc5xbgps8wqgfrhx4nqa";
+ cargoSha256 = "0pwq1scll5ga8rw4lx97s915zvp7v171b6316cin54f2zzpbrxx5";
+
+ # Patch for v10.0.1 Cargo.lock issue
+ patches = [ ./Cargo.lock.patch ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.Security
];
+ # enable all output formats
+ cargoBuildFlags = [ "--features" "all" ];
+
meta = with stdenv.lib; {
- description = "Program that displays statistics about your code";
+ description = "A program that allows you to count your code, quickly";
+ longDescription = ''
+ Tokei is a program that displays statistics about your code. Tokei will show number of files, total lines within those files and code, comments, and blanks grouped by language.
+ '';
homepage = https://github.com/XAMPPRocky/tokei;
license = with licenses; [ asl20 /* or */ mit ];
- maintainers = with maintainers; [ gebner ];
+ maintainers = with maintainers; [ gebner lilyball ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix
index 11caf8e7b20e..44744413138f 100644
--- a/pkgs/development/tools/misc/trv/default.nix
+++ b/pkgs/development/tools/misc/trv/default.nix
@@ -6,13 +6,13 @@
assert stdenv.lib.versionOlder "4.02" ocaml.version;
stdenv.mkDerivation rec {
- name = "trv-${version}";
+ pname = "trv";
version = "0.1.3";
src = fetchFromGitHub {
owner = "afiniate";
repo = "trv";
- rev = "${version}";
+ rev = version;
sha256 = "0fv0zh76djqhkzfzwv6k60rnky50pw9gn01lwhijrggrcxrrphz1";
};
diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index ebc85c19b395..bad3ecd92413 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }:
-stdenv.mkDerivation rec {
- name = "universal-ctags-${version}";
+stdenv.mkDerivation {
+ pname = "universal-ctags";
version = "unstable-2019-07-30";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix
index 0fa854f9b2a1..fb43ff61a81c 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/data.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, tcl, usb-modeswitch }:
stdenv.mkDerivation rec {
- name = "usb-modeswitch-data-${version}";
+ pname = "usb-modeswitch-data";
version = "20170806";
src = fetchurl {
- url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
+ url = "http://www.draisberghof.de/usb_modeswitch/${pname}-${version}.tar.bz2";
sha256 = "0b1wari3aza6qjggqd0hk2zsh93k1q8scgmwh6f8wr0flpr3whff";
};
diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix
index d34a94e04670..7c119c929431 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/default.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libusb1 }:
stdenv.mkDerivation rec {
- name = "usb-modeswitch-${version}";
+ pname = "usb-modeswitch";
version = "2.5.2";
src = fetchurl {
- url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
+ url = "http://www.draisberghof.de/usb_modeswitch/${pname}-${version}.tar.bz2";
sha256 = "19ifi80g9ns5dmspchjvfj4ykxssq9yrci8m227dgb3yr04srzxb";
};
diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/development/tools/misc/vtable-dumper/default.nix
index e806a7796386..2b6e349b9fde 100644
--- a/pkgs/development/tools/misc/vtable-dumper/default.nix
+++ b/pkgs/development/tools/misc/vtable-dumper/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libelf }:
stdenv.mkDerivation rec {
- name = "vtable-dumper-${version}";
+ pname = "vtable-dumper";
version = "1.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix
index d6b8eb5b95ff..e1726efc40c1 100644
--- a/pkgs/development/tools/misc/watson-ruby/default.nix
+++ b/pkgs/development/tools/misc/watson-ruby/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
- name = "watson-ruby-${version}";
+ pname = "watson-ruby";
version = (import ./gemset.nix).watson-ruby.version;
- env = bundlerEnv rec {
+ env = bundlerEnv {
name = "watson-ruby-gems-${version}";
inherit ruby;
# expects Gemfile, Gemfile.lock and gemset.nix in the same directory
diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix
index 8f3f6c1b22a7..68897105f5c7 100644
--- a/pkgs/development/tools/misc/xc3sprog/default.nix
+++ b/pkgs/development/tools/misc/xc3sprog/default.nix
@@ -5,12 +5,12 @@
stdenv.mkDerivation rec {
version = "787";
- name = "xc3sprog-${version}";
+ pname = "xc3sprog";
- src = fetchsvn rec {
+ src = fetchsvn {
url = "https://svn.code.sf.net/p/xc3sprog/code/trunk";
sha256 = "1rfhms3i7375kdlg0sdg5k52ix3xv5llj2dr30vamyg7pk74y8rx";
- rev = "${version}";
+ rev = version;
};
buildInputs = [ cmake libusb libftdi ];
diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix
index 51f4de8eacce..c187ad42c0e9 100644
--- a/pkgs/development/tools/misc/xxdiff/default.nix
+++ b/pkgs/development/tools/misc/xxdiff/default.nix
@@ -1,28 +1,51 @@
-{ stdenv, fetchurl, qt4, flex, bison, docutils }:
+{ lib, mkDerivation, fetchFromBitbucket, docutils, bison, flex, qmake
+, qtbase
+}:
-stdenv.mkDerivation rec {
- name = "xxdiff-4.0.1";
+mkDerivation rec {
+ pname = "xxdiff";
+ version = "5.0b1";
- src = fetchurl {
- url = "mirror://sourceforge/xxdiff/${name}.tar.bz2";
- sha256 = "0050qd12fvlcfdh0iwjsaxgxdq7jsl70f85fbi7pz23skpddsn5z";
+ src = fetchFromBitbucket {
+ owner = "blais";
+ repo = pname;
+ rev = "5e5f885dfc43559549a81c59e9e8c9525306356a";
+ sha256 = "0gbvxrkwkbvag3298j89smszghpr8ilxxfb0cvsknfqdf15b296w";
};
- nativeBuildInputs = [ flex bison qt4 docutils ];
+ nativeBuildInputs = [ bison docutils flex qmake ];
- buildInputs = [ qt4 ];
+ buildInputs = [ qtbase ];
- QMAKE = "qmake";
+ dontUseQmakeConfigure = true;
- configurePhase = "cd src; make -f Makefile.bootstrap";
+ # c++11 and above is needed for building with Qt 5.9+
+ NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
- installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin";
+ sourceRoot = "source/src";
- meta = with stdenv.lib; {
- homepage = http://furius.ca/xxdiff/;
+ postPatch = ''
+ substituteInPlace xxdiff.pro --replace ../bin ./bin
+ '';
+
+ preConfigure = ''
+ make -f Makefile.bootstrap
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm555 -t $out/bin ./bin/xxdiff
+ install -Dm444 -t $out/share/doc/${pname} ${src}/README
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
description = "Graphical file and directories comparator and merge tool";
+ homepage = "http://furius.ca/xxdiff/";
license = licenses.gpl2;
+ maintainers = with maintainers; [ pSub raskin ];
platforms = platforms.linux;
- maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix
deleted file mode 100644
index 1424b8fe1974..000000000000
--- a/pkgs/development/tools/misc/xxdiff/tip.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchFromBitbucket, qtbase, flex, bison, docutils }:
-
-stdenv.mkDerivation rec {
- name = "xxdiff-5.0b1";
-
- src = fetchFromBitbucket {
- owner = "blais";
- repo = "xxdiff";
- rev = "5e5f885dfc43559549a81c59e9e8c9525306356a";
- sha256 = "0gbvxrkwkbvag3298j89smszghpr8ilxxfb0cvsknfqdf15b296w";
- };
-
- nativeBuildInputs = [ flex bison docutils ];
-
- buildInputs = [ qtbase ];
-
- # Fixes build with Qt 5.9
- NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
-
- preConfigure = ''
- cd src
- make -f Makefile.bootstrap
- '';
-
- postInstall = ''
- install -D ../bin/xxdiff $out/bin/xxdiff
- '';
-
- meta = with stdenv.lib; {
- homepage = http://furius.ca/xxdiff/;
- description = "Graphical file and directories comparator and merge tool";
- license = licenses.gpl2;
- platforms = platforms.linux;
- maintainers = with maintainers; [ pSub raskin ];
- };
-}
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 2e67da18ae9a..12f0b13a6602 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -5,8 +5,8 @@
, fixDarwinDylibNames, Cocoa ? null
}:
-stdenv.mkDerivation rec {
- name = "ycmd-${version}";
+stdenv.mkDerivation {
+ pname = "ycmd";
version = "2018-09-20";
src = fetchgit {
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 76130f255fde..5520a4a30be0 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, perl, icmake, utillinux }:
stdenv.mkDerivation rec {
- name = "yodl-${version}";
+ pname = "yodl";
version = "4.02.01";
nativeBuildInputs = [ icmake ];
diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix
index 6390c1d7fd24..60e948d593fa 100644
--- a/pkgs/development/tools/mod/default.nix
+++ b/pkgs/development/tools/mod/default.nix
@@ -1,7 +1,7 @@
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
- name = "mod-${version}";
+ pname = "mod";
version = "0.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix
index 2b5f42b2cbe5..1d7784ae1cc7 100644
--- a/pkgs/development/tools/msgpack-tools/default.nix
+++ b/pkgs/development/tools/msgpack-tools/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub, cmake, unzip }:
stdenv.mkDerivation rec {
- name = "msgpack-tools-${version}";
+ pname = "msgpack-tools";
version = "0.6";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix
index 0b060624de3d..41e74bc120f1 100644
--- a/pkgs/development/tools/mustache-go/default.nix
+++ b/pkgs/development/tools/mustache-go/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "mustache-go-${version}";
+ pname = "mustache-go";
version = "1.0.1";
goPackagePath = "github.com/cbroglie/mustache";
diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix
index 07005131fb5e..6e0014b37732 100644
--- a/pkgs/development/tools/nailgun/default.nix
+++ b/pkgs/development/tools/nailgun/default.nix
@@ -9,8 +9,9 @@ let
sha256 = "1mk8pv0g2xg9m0gsb96plbh6mc24xrlyrmnqac5mlbl4637l4q95";
};
in
-stdenv.mkDerivation rec {
- name = "nailgun-${version}";
+stdenv.mkDerivation {
+ pname = "nailgun";
+ inherit version;
src = fetchFromGitHub {
owner = "facebook";
diff --git a/pkgs/development/tools/nemiver/default.nix b/pkgs/development/tools/nemiver/default.nix
new file mode 100644
index 000000000000..1f3556fc9047
--- /dev/null
+++ b/pkgs/development/tools/nemiver/default.nix
@@ -0,0 +1,88 @@
+{ stdenv
+, fetchurl
+, fetchpatch
+, pkgconfig
+, gnome3
+, gtk3
+, libxml2
+, intltool
+, itstool
+, gdb
+, boost
+, sqlite
+, libgtop
+, glibmm
+, gtkmm3
+, vte
+, gtksourceview
+, gsettings-desktop-schemas
+, gtksourceviewmm
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "nemiver";
+ version = "0.9.6";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2";
+ };
+
+ nativeBuildInputs = [
+ libxml2
+ intltool
+ itstool
+ pkgconfig
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gtk3
+ gdb
+ boost
+ sqlite
+ libgtop
+ glibmm
+ gtkmm3
+ vte
+ gtksourceview
+ gtksourceviewmm
+ gsettings-desktop-schemas
+ ];
+
+ patches = [
+ # build fixes
+ (fetchpatch {
+ url = https://gitlab.gnome.org/GNOME/nemiver/commit/e0e42221ceb77d88be64fac1c09792dc5c9e2f43.patch;
+ sha256 = "1g0ixll6yqfj6ysf50p0c7nmh3lgmb6ds15703q7ibnw7dyidvj8";
+ })
+ (fetchpatch {
+ url = https://gitlab.gnome.org/GNOME/nemiver/commit/7005393a8c4d914eac9705e7f47818d0f4de3578.patch;
+ sha256 = "1mxb1sdqdj7dm204gja8cdygx8579bjriqqbb7cna9rj0m9c8pjg";
+ })
+ (fetchpatch {
+ url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch;
+ sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7";
+ })
+ ];
+
+ configureFlags = [
+ "--enable-gsettings"
+ ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "nemiver";
+ versionPolicy = "none";
+ };
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Nemiver;
+ description = "Easy to use standalone C/C++ debugger";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.juliendehos ];
+ };
+}
diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix
index 06945f10eb23..b07ab21fdf10 100644
--- a/pkgs/development/tools/neoload/default.nix
+++ b/pkgs/development/tools/neoload/default.nix
@@ -30,7 +30,7 @@ let dotInstall4j = path: writeTextFile { name = "dot-install4j"; text = ''
sys.symlinkDir=INSTALLDIR/bin
''; };
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "neoload-4.1.4";
src = fetchurl (
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
index 57beec8f171a..e052b7244392 100644
--- a/pkgs/development/tools/node-webkit/nw12.nix
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -20,7 +20,7 @@ let
};
in stdenv.mkDerivation rec {
- name = "nwjs-${version}";
+ pname = "nwjs";
version = "0.12.3";
src = fetchurl {
diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix
index 234f5a5bfae7..068028c7da91 100644
--- a/pkgs/development/tools/nrpl/default.nix
+++ b/pkgs/development/tools/nrpl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, nim, pcre, tinycc }:
-stdenv.mkDerivation rec {
- name = "nrpl-${version}";
+stdenv.mkDerivation {
+ pname = "nrpl";
version = "20150522";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix
index 7117d7dd628f..0539e8de92be 100644
--- a/pkgs/development/tools/nsis/default.nix
+++ b/pkgs/development/tools/nsis/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchzip, scons, zlib }:
stdenv.mkDerivation rec {
- name = "nsis-${version}";
+ pname = "nsis";
version = "3.04";
src =
diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index 96516bfda48b..30f531d7db20 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -32,7 +32,7 @@ let
};
in stdenv.mkDerivation rec {
- name = "nwjs-${version}";
+ pname = "nwjs";
version = "0.33.4";
src = if sdk then fetchurl {
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix
index 7c7bf79acc7d..09de5b02737b 100644
--- a/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A stub code generator and COM binding for Objective Caml";
- homepage = "${webpage}";
+ homepage = webpage;
license = "LGPL";
maintainers = [ stdenv.lib.maintainers.roconnor ];
};
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
index a83959fba395..a7ef6d7bedd3 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -22,11 +22,11 @@ let param = {
"4.08" = {
version = "4.08+1";
sha256 = "0qplawvxwai25bi27niw2cgz2al01kcnkj8wxwhxslpi21z6pyx1"; };
- }."${ocaml.meta.branch}";
+ }.${ocaml.meta.branch};
in
stdenv.mkDerivation rec {
- name = "camlp4-${version}";
+ pname = "camlp4";
inherit (param) version;
src = fetchzip {
diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix
index 159260750a25..bde5cce6048f 100644
--- a/pkgs/development/tools/ocaml/cppo/default.nix
+++ b/pkgs/development/tools/ocaml/cppo/default.nix
@@ -26,7 +26,7 @@ let param =
}
; in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
name = "${pname}-${param.version}";
@@ -44,7 +44,7 @@ stdenv.mkDerivation (rec {
longDescription = ''
Cppo is an equivalent of the C preprocessor targeted at the OCaml language and its variants.
'';
- homepage = "${webpage}";
+ homepage = webpage;
maintainers = [ maintainers.vbgl ];
license = licenses.bsd3;
};
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 91870a570b09..fb1eb4276d62 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }:
stdenv.mkDerivation rec {
- name = "ocaml-findlib-${version}";
+ pname = "ocaml-findlib";
version = "1.8.1";
src = fetchurl {
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
index 1307635abb99..d1ff9eee8179 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
@@ -2,8 +2,8 @@
, ocaml-migrate-parsetree, ppx_tools_versioned, uchar
}:
-stdenv.mkDerivation rec {
- name = "js_of_ocaml-${version}";
+stdenv.mkDerivation {
+ pname = "js_of_ocaml";
inherit (js_of_ocaml-compiler) version src installPhase meta;
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
index ff59fa7cf8a3..e9e7f9d279ea 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "3.2.1";
- name = "js_of_ocaml-camlp4-${version}";
+ pname = "js_of_ocaml-camlp4";
src = fetchFromGitHub {
owner = "ocsigen";
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index c5a345f505b7..c15268923123 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -7,7 +7,7 @@ then throw "js_of_ocaml-compiler is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
- name = "js_of_ocaml-compiler-${version}";
+ pname = "js_of_ocaml-compiler";
version = "3.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index f88811855a2e..e535ba29aeb4 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -7,13 +7,14 @@ let version = if stdenv.lib.versionAtLeast ocaml.version "4.02"
in
stdenv.mkDerivation {
- name = "js_of_ocaml-${version}";
+ pname = "js_of_ocaml";
+ inherit version;
src = fetchurl {
url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz";
sha256 = {
"2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj";
"2.8.4" = "098ph50s9kqw6rc3qjn39zv9b5swdf4qr44afwqfkkjgjs5d7vbl";
- }."${version}";
+ }.${version};
};
buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
index e7a31c1ce2e5..5c8f4377e8d7 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
@@ -3,8 +3,8 @@
, js_of_ocaml, ocaml_lwt, lwt_log
}:
-stdenv.mkDerivation rec {
- name = "js_of_ocaml-lwt-${version}";
+stdenv.mkDerivation {
+ pname = "js_of_ocaml-lwt";
inherit (js_of_ocaml-compiler) version src installPhase meta;
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
index bf33b4e59e52..344352467e9b 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
@@ -2,8 +2,8 @@
, ocamlbuild
}:
-stdenv.mkDerivation rec {
- name = "js_of_ocaml-ocamlbuild-${version}";
+stdenv.mkDerivation {
+ pname = "js_of_ocaml-ocamlbuild";
inherit (js_of_ocaml-compiler) version src installPhase meta;
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
index 0649aee162a5..3adad22bd9c3 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
@@ -3,8 +3,8 @@
, js_of_ocaml
}:
-stdenv.mkDerivation rec {
- name = "js_of_ocaml-ppx-${version}";
+stdenv.mkDerivation {
+ pname = "js_of_ocaml-ppx";
inherit (js_of_ocaml-compiler) version src installPhase meta;
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
index ddea73b3c766..2ff9ddbcf9e1 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
@@ -2,8 +2,8 @@
, js_of_ocaml, ppx_deriving
}:
-stdenv.mkDerivation rec {
- name = "js_of_ocaml-ppx_deriving_json-${version}";
+stdenv.mkDerivation {
+ pname = "js_of_ocaml-ppx_deriving_json";
inherit (js_of_ocaml-compiler) version src installPhase meta;
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
index 1ba9ddd0ab7f..c39c985183ad 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
@@ -3,8 +3,8 @@
, js_of_ocaml, reactivedata, tyxml
}:
-stdenv.mkDerivation rec {
- name = "js_of_ocaml-tyxml-${version}";
+stdenv.mkDerivation {
+ pname = "js_of_ocaml-tyxml";
inherit (js_of_ocaml-compiler) version src installPhase meta;
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index 2364058729e8..04aeab5f4319 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.4.10";
- name = "ocaml-oasis-${version}";
+ pname = "ocaml-oasis";
# You must manually update the url, not just the version. OCamlforge keys off
# the number after download.php, not the filename.
diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix
index 87d592bd1126..e7528d4f7728 100644
--- a/pkgs/development/tools/ocaml/obelisk/default.nix
+++ b/pkgs/development/tools/ocaml/obelisk/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ocamlPackages }:
stdenv.mkDerivation rec {
- name = "obelisk-${version}";
+ pname = "obelisk";
version = "0.4.0";
src = fetchFromGitHub {
owner = "lelio-brun";
diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix
index 41cde6f8ab73..61e8e77f384b 100644
--- a/pkgs/development/tools/ocaml/obuild/default.nix
+++ b/pkgs/development/tools/ocaml/obuild/default.nix
@@ -3,7 +3,8 @@
let version = "0.1.10"; in
stdenv.mkDerivation {
- name = "obuild-${version}";
+ pname = "obuild";
+ inherit version;
src = fetchzip {
url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz";
diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix
index 74dee630d295..91e2e67eaf1b 100644
--- a/pkgs/development/tools/ocaml/ocamlmod/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
-stdenv.mkDerivation rec {
- name = "ocamlmod-${version}";
+stdenv.mkDerivation {
+ pname = "ocamlmod";
version = "0.0.9";
src = fetchurl {
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index 0ed7312660a1..cf5372bdc202 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -2,7 +2,7 @@
let
version = "1.99.19-beta";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ocaml${ocaml.version}-ocp-build-${version}";
diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
index f91ae7132005..09ab9587ddba 100644
--- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
+++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec
{
pname = "ocsigen-i18n";
- name = "${pname}-${version}";
version = "3.4.0";
buildInputs = with ocamlPackages; [ ocaml findlib ];
diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
index 182250f9a744..1ea1cd4ab380 100644
--- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
+++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
meta = {
description = "Omake build system";
- homepage = "${webpage}";
+ homepage = webpage;
license = "GPL";
platforms = ocaml.meta.platforms or [];
};
diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix
index 0f536c489eb6..da7a5b439ab1 100644
--- a/pkgs/development/tools/ocaml/omake/default.nix
+++ b/pkgs/development/tools/ocaml/omake/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
- name = "omake-${version}";
+ pname = "omake";
version = "0.10.3";
src = fetchurl {
- url = "http://download.camlcity.org/download/${name}.tar.gz";
+ url = "http://download.camlcity.org/download/${pname}-${version}.tar.gz";
sha256 = "07bdg1h5i7qnlv9xq81ad5hfypl10hxm771h4rjyl5cn8plhfcgz";
};
diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/development/tools/ocaml/opaline/default.nix
index fa5393c1871c..a49749ad716f 100644
--- a/pkgs/development/tools/ocaml/opaline/default.nix
+++ b/pkgs/development/tools/ocaml/opaline/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.3.2";
- name = "opaline-${version}";
+ pname = "opaline";
src = fetchFromGitHub {
owner = "jaapb";
diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix
index ddd8d4b9920b..53482598f134 100644
--- a/pkgs/development/tools/ocaml/opam/1.2.2.nix
+++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix
@@ -43,8 +43,8 @@ let
sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e";
};
};
-in stdenv.mkDerivation rec {
- name = "opam-${version}";
+in stdenv.mkDerivation {
+ pname = "opam";
version = "1.2.2";
buildInputs = [ unzip curl ncurses ocaml makeWrapper ];
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 452f162b2356..df4c0f2d12c2 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -59,8 +59,8 @@ let
sha256 = "0arv5zaikvcqbicdk47jpfgvjrqhqm71yq2zmj7pp6zf7bm0js6s";
};
};
-in stdenv.mkDerivation rec {
- name = "opam-${version}";
+in stdenv.mkDerivation {
+ pname = "opam";
version = "2.0.5";
buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 161c08a7f82b..28ad85b42e94 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -7,8 +7,8 @@ then throw "utop is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
+ pname = "utop";
version = "2.4.1";
- name = "utop-${version}";
src = fetchurl {
url = "https://github.com/diml/utop/archive/${version}.tar.gz";
@@ -28,8 +28,9 @@ stdenv.mkDerivation rec {
# derivation of just runtime deps so env vars created by
# setup-hooks can be saved for use at runtime
- runtime = stdenv.mkDerivation rec {
- name = "utop-runtime-env-${version}";
+ runtime = stdenv.mkDerivation {
+ pname = "utop-runtime-env";
+ inherit version;
buildInputs = [ findlib ] ++ propagatedBuildInputs;
diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix
index 137f56bee59e..cc33b675954a 100644
--- a/pkgs/development/tools/ofono-phonesim/default.nix
+++ b/pkgs/development/tools/ofono-phonesim/default.nix
@@ -7,7 +7,7 @@
, qtscript
}:
-mkDerivation rec {
+mkDerivation {
pname = "ofono-phonesim";
version = "unstable-2014-04-22";
diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix
index 725219c3d7c7..af295eb242f6 100644
--- a/pkgs/development/tools/omniorb/default.nix
+++ b/pkgs/development/tools/omniorb/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python2 }:
stdenv.mkDerivation rec {
- name = "omniorb-${version}";
+ pname = "omniorb";
version = "4.2.3";
- src = fetchurl rec {
+ src = fetchurl {
url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
sha256 = "1jlb0wps6311dmhnphn64gv46z0bl8grch4fd9dcx5dlib02lh96";
};
diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix
index 85f8955185fb..784895845e52 100644
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
- name = "omnisharp-roslyn-${version}";
+ pname = "omnisharp-roslyn";
version = "1.32.19";
src = fetchurl {
diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix
index 7064cb8285ee..0e4810f0ba41 100644
--- a/pkgs/development/tools/out-of-tree/default.nix
+++ b/pkgs/development/tools/out-of-tree/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "out-of-tree";
- version = "1.0.1";
+ version = "1.1.1";
buildInputs = [ makeWrapper ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
src = fetchgit {
rev = "refs/tags/v${version}";
url = "https://code.dumpstack.io/tools/${pname}.git";
- sha256 = "0p0ps73w6lmsdyf7irqgbhfxjg5smgbn081d06pnr1zmxvw8dryx";
+ sha256 = "048jda3vng11mg62fd3d8vs9yjsp569zlfylnkqv8sb6wd1qn66d";
};
goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 24a6404dc039..9e0da00dd529 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "packer-${version}";
+ pname = "packer";
version = "1.4.1";
goPackagePath = "github.com/hashicorp/packer";
diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix
index 82849be40b2c..54100dfdee9e 100644
--- a/pkgs/development/tools/packet/default.nix
+++ b/pkgs/development/tools/packet/default.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "packet-${version}";
+ pname = "packet";
version = "v2.2.2";
goPackagePath = "github.com/ebsarr/packet";
diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix
index 6f96b81e7a46..fac5b8e58309 100644
--- a/pkgs/development/tools/parinfer-rust/default.nix
+++ b/pkgs/development/tools/parinfer-rust/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
- name = "parinfer-rust-${version}";
+ pname = "parinfer-rust";
version = "0.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/pkgs/development/tools/parse-cli-bin/default.nix
index 616a2049c778..0f8ead579d0a 100644
--- a/pkgs/development/tools/parse-cli-bin/default.nix
+++ b/pkgs/development/tools/parse-cli-bin/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "parse-cli-bin-${version}";
+ pname = "parse-cli-bin";
version = "3.0.5";
src = fetchurl {
diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix
index b53116b888e1..9e86a29cf934 100644
--- a/pkgs/development/tools/parsing/antlr/3.4.nix
+++ b/pkgs/development/tools/parsing/antlr/3.4.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, jre}:
stdenv.mkDerivation rec {
- name = "antlr-${version}";
+ pname = "antlr";
version = "3.4";
src = fetchurl {
url ="https://www.antlr3.org/download/antlr-${version}-complete.jar";
diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix
index e6e54f8dab92..fcd7e445b8a2 100644
--- a/pkgs/development/tools/parsing/antlr/4.7.nix
+++ b/pkgs/development/tools/parsing/antlr/4.7.nix
@@ -12,7 +12,8 @@ let
runtime = {
cpp = stdenv.mkDerivation {
- name = "antlr-runtime-cpp-${version}";
+ pname = "antlr-runtime-cpp";
+ inherit version;
src = source;
outputs = [ "out" "dev" "doc" ];
@@ -35,7 +36,8 @@ let
};
antlr = stdenv.mkDerivation {
- name = "antlr-${version}";
+ pname = "antlr";
+ inherit version;
src = fetchurl {
url ="https://www.antlr.org/download/antlr-${version}-complete.jar";
sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl";
diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index 9b3fd86b5552..23ea39c6fa9f 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "byacc-${version}";
+ pname = "byacc";
version = "20190617";
src = fetchurl {
urls = [
- "ftp://ftp.invisible-island.net/byacc/${name}.tgz"
- "https://invisible-mirror.net/archives/byacc/${name}.tgz"
+ "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz"
+ "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz"
];
sha256 = "13ai0az00c86s4k94cpgh48nf5dfccpvccpw635z42wjgcb6hy7q";
};
diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix
index 7e09b0a8cd38..e555f1d59854 100644
--- a/pkgs/development/tools/parsing/flex/2.5.35.nix
+++ b/pkgs/development/tools/parsing/flex/2.5.35.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "flex-2.5.35";
src = fetchurl {
diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix
index 3a46c6c8f01e..fc2c76995839 100644
--- a/pkgs/development/tools/parsing/flex/2.6.1.nix
+++ b/pkgs/development/tools/parsing/flex/2.6.1.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, bison, m4 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "flex-2.6.1";
src = fetchurl {
diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index d7d27ac9a1cd..e46a494de76c 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "flex-${version}";
+ pname = "flex";
version = "2.6.4";
src = fetchurl {
diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix
index 681f90bbe5a6..93f1d1ee649f 100644
--- a/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/pkgs/development/tools/parsing/flexc++/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, bobcat, icmake, yodl }:
stdenv.mkDerivation rec {
- name = "flexc++-${version}";
+ pname = "flexc++";
version = "2.05.00";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix
index bf5a2374fdef..e10fe49b1e45 100644
--- a/pkgs/development/tools/parsing/hammer/default.nix
+++ b/pkgs/development/tools/parsing/hammer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, glib, pkgconfig, python, scons }:
-stdenv.mkDerivation rec {
- name = "hammer-${version}";
+stdenv.mkDerivation {
+ pname = "hammer";
version = "e7aa734";
src = fetchgit {
diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix
index 108576d0b11c..009ebe8e2ff0 100644
--- a/pkgs/development/tools/parsing/lemon/default.nix
+++ b/pkgs/development/tools/parsing/lemon/default.nix
@@ -15,8 +15,8 @@ let
};
};
-in stdenv.mkDerivation rec {
- name = "lemon-${version}";
+in stdenv.mkDerivation {
+ pname = "lemon";
version = "1.69";
phases = [ "buildPhase" "installPhase" ];
diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index d08df8265b0a..2f4db7982b71 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -5,10 +5,11 @@
let
generic = { version, sha256, license }:
stdenv.mkDerivation rec {
- name = "ragel-${version}";
+ pname = "ragel";
+ inherit version;
src = fetchurl {
- url = "https://www.colm.net/files/ragel/${name}.tar.gz";
+ url = "https://www.colm.net/files/ragel/${pname}-${version}.tar.gz";
inherit sha256;
};
diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index 1d0545f6889e..f6e35f086396 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "re2c-${version}";
+ pname = "re2c";
version = "1.0.3";
sourceRoot = "${src.name}/re2c";
diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix
index ee6a7ec78c20..f1bda9997ac6 100644
--- a/pkgs/development/tools/pax-rs/default.nix
+++ b/pkgs/development/tools/pax-rs/default.nix
@@ -2,7 +2,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "pax-rs-${version}";
+ pname = "pax-rs";
version = "0.4.0";
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix
index ce562bbf5ac5..7953a55c7d97 100644
--- a/pkgs/development/tools/pet/default.nix
+++ b/pkgs/development/tools/pet/default.nix
@@ -1,7 +1,7 @@
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
- name = "pet-${version}";
+ pname = "pet";
version = "0.3.5";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix
index 6f26a48b9c43..e4b50f317763 100644
--- a/pkgs/development/tools/pew/default.nix
+++ b/pkgs/development/tools/pew/default.nix
@@ -1,6 +1,5 @@
{ stdenv, python3Packages }:
with python3Packages; buildPythonApplication rec {
- name = "${pname}-${version}";
pname = "pew";
version = "1.1.2";
diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix
index 47b426604da0..8aaae2b1c433 100644
--- a/pkgs/development/tools/pgloader/default.nix
+++ b/pkgs/development/tools/pgloader/default.nix
@@ -2,7 +2,6 @@
stdenv.mkDerivation rec {
pname = "pgloader";
version = "3.6.1";
- name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/dimitri/pgloader/releases/download/v3.6.1/pgloader-bundle-3.6.1.tgz";
diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix
index a37de2a3f628..29b8d4d5ae1e 100644
--- a/pkgs/development/tools/phantomjs2/default.nix
+++ b/pkgs/development/tools/phantomjs2/default.nix
@@ -15,7 +15,7 @@ let
'';
in stdenv.mkDerivation rec {
- name = "phantomjs-${version}";
+ pname = "phantomjs";
version = "2.1.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix
index 8155f3016c3f..b02ae3c544fa 100644
--- a/pkgs/development/tools/profiling/EZTrace/default.nix
+++ b/pkgs/development/tools/profiling/EZTrace/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
version = "1.1-7";
- name = "EZTrace-${version}";
+ pname = "EZTrace";
src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/file/37155/eztrace-${version}.tar.gz";
diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index 5ff0d2ca2b1e..5aaf3d436ded 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "heaptrack-${version}";
+ pname = "heaptrack";
version = "1.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix
index 9130f31f21d3..120fd89377b3 100644
--- a/pkgs/development/tools/profiling/pprof/default.nix
+++ b/pkgs/development/tools/profiling/pprof/default.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "pprof-unstable-${version}";
+ pname = "pprof-unstable";
version = "2018-08-15";
rev = "781f11b1fcf71fae9d185e7189b5e686f575075a";
diff --git a/pkgs/development/tools/profiling/pyflame/default.nix b/pkgs/development/tools/profiling/pyflame/default.nix
index acb5d9d943cb..2467769ad3de 100644
--- a/pkgs/development/tools/profiling/pyflame/default.nix
+++ b/pkgs/development/tools/profiling/pyflame/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoreconfHook, coreutils, fetchFromGitHub, fetchpatch, pkgconfig
+{ stdenv, autoreconfHook, coreutils, fetchFromGitHub, fetchpatch, pkgconfig, procps
# pyflame needs one python version per ABI
# are currently supported
# * 2.6 or 2.7 for 2.x ABI
@@ -67,11 +67,12 @@ stdenv.mkDerivation rec {
full-ptrace-seize-errors
];
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig procps ];
buildInputs = [ python37 python36 python2 python35 ];
postPatch = ''
patchShebangs .
+
# some tests will fail in the sandbox
substituteInPlace tests/test_end_to_end.py \
--replace 'skipif(IS_DOCKER' 'skipif(True'
@@ -79,6 +80,32 @@ stdenv.mkDerivation rec {
# don't use patchShebangs here to be explicit about the python version
substituteInPlace utils/flame-chart-json \
--replace '#!usr/bin/env python' '#!${python3.interpreter}'
+
+ # Many tests require the build machine to have kernel.yama.ptrace_scope = 0,
+ # but hardened machines have it set to 1. On build machines that cannot run
+ # these tests, skip them to avoid breaking the build.
+ if [[ $(sysctl -n kernel.yama.ptrace_scope || echo 0) != "0" ]]; then
+ for test in \
+ test_monitor \
+ test_non_gil \
+ test_threaded \
+ test_unthreaded \
+ test_legacy_pid_handling \
+ test_exclude_idle \
+ test_exit_early \
+ test_sample_not_python \
+ test_include_ts \
+ test_include_ts_exclude_idle \
+ test_thread_dump \
+ test_no_line_numbers \
+ test_utf8_output; do
+
+ substituteInPlace tests/test_end_to_end.py \
+ --replace "def $test(" "\
+@pytest.mark.skip('build machine had kernel.yama.ptrace_scope != 0')
+def $test("
+ done
+ fi
'';
postInstall = ''
@@ -94,7 +121,7 @@ stdenv.mkDerivation rec {
PYMAJORVERSION=${lib.substring 0 1 python.version} \
PATH=${lib.makeBinPath [ coreutils ]}\
PYTHONPATH= \
- ${python.pkgs.pytest}/bin/pytest tests/
+ ${python.pkgs.pytest}/bin/pytest -v tests/
set +x
'') (lib.filter (x: x != null) buildInputs);
diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix
index 8f711e14654d..3f0b37a7175e 100644
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/pkgs/development/tools/profiling/systemtap/default.nix
@@ -14,7 +14,8 @@ let
## stap binaries
stapBuild = stdenv.mkDerivation {
- name = "systemtap-${version}";
+ pname = "systemtap";
+ inherit version;
src = fetchgit { inherit url rev sha256; };
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ elfutils gettext python2 python2Packages.setuptools ];
diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix
index 559383f45fe7..77c1df6f43e3 100644
--- a/pkgs/development/tools/protoc-gen-doc/default.nix
+++ b/pkgs/development/tools/protoc-gen-doc/default.nix
@@ -1,7 +1,7 @@
{ buildGoModule, fetchFromGitHub, lib }:
-buildGoModule rec {
- name = "protoc-gen-doc-unstable-${version}";
+buildGoModule {
+ pname = "protoc-gen-doc-unstable";
version = "2019-04-22";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix
index 10a10fa21efb..13e8c233ec39 100644
--- a/pkgs/development/tools/pup/default.nix
+++ b/pkgs/development/tools/pup/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "pup-${version}";
+ pname = "pup";
version = "0.4.0";
rev = "v${version}";
diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
index 0f1482d7953d..6a709cf8f9b1 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/pkgs/development/tools/pypi2nix/default.nix
@@ -24,7 +24,8 @@ let
};
in stdenv.mkDerivation rec {
- name = "pypi2nix-${version}";
+ pname = "pypi2nix";
+ inherit version;
srcs = [
src
click
diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index b5dfe3c8bfd9..060875924d80 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -91,7 +91,7 @@ typeshed = stdenv.mkDerivation {
phases = [ "unpackPhase" "installPhase" ];
installPhase = "cp -r $src $out";
};
-in python3.pkgs.buildPythonApplication rec {
+in python3.pkgs.buildPythonApplication {
pname = "pyre-check";
version = pyre-version;
src = pyre-src;
diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix
index 1b3bc7a21626..c8f7ccb18d59 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/development/tools/qtcreator/default.nix
@@ -11,7 +11,7 @@ let
# Fetch clang from qt vendor, this contains submodules like this:
# clang<-clang-tools-extra<-clazy.
- clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: rec {
+ clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: {
src = fetchgit {
url = "https://code.qt.io/clang/clang.git";
rev = "c12b012bb7465299490cf93c2ae90499a5c417d5";
diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix
index 6af444c7ce04..d9433f535dad 100644
--- a/pkgs/development/tools/quicktemplate/default.nix
+++ b/pkgs/development/tools/quicktemplate/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "quicktemplate";
version = "unstable-2019-07-08";
goPackagePath = "github.com/valyala/quicktemplate";
diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix
index a5683e7a953d..d92003a575e1 100644
--- a/pkgs/development/tools/rdocker/default.nix
+++ b/pkgs/development/tools/rdocker/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, openssh }:
-stdenv.mkDerivation rec {
- name = "rdocker-${version}";
+stdenv.mkDerivation {
+ pname = "rdocker";
version = "unstable-2018-07-17";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix
index 939febae693a..dfa31b30a7e4 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/pkgs/development/tools/react-native-debugger/default.nix
@@ -37,7 +37,7 @@ let
xorg.libXScrnSaver
];
in stdenv.mkDerivation rec {
- name = "react-native-debugger-${version}";
+ pname = "react-native-debugger";
version = "0.9.10";
src = fetchurl {
diff --git a/pkgs/development/tools/reflex/default.nix b/pkgs/development/tools/reflex/default.nix
index 3e69b4ffa073..b82c0694fec8 100644
--- a/pkgs/development/tools/reflex/default.nix
+++ b/pkgs/development/tools/reflex/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
- name = "reflex-${version}";
+ pname = "reflex";
version = "0.2.0";
goPackagePath = "github.com/cespare/reflex";
diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix
index 6ef724022e8c..2d5346f2112a 100644
--- a/pkgs/development/tools/reftools/default.nix
+++ b/pkgs/development/tools/reftools/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "reftools-unstable-${version}";
+ pname = "reftools-unstable";
version = "2018-09-14";
rev = "654d0ba4f96d62286ca33cd46f7674b84f76d399";
diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix
index 35aab138292d..80c64a65083f 100644
--- a/pkgs/development/tools/reno/default.nix
+++ b/pkgs/development/tools/reno/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pythonPackages }:
with pythonPackages; buildPythonApplication rec {
- name = "reno-${version}";
+ pname = "reno";
version = "2.3.2";
src = fetchurl {
- url = "mirror://pypi/r/reno/${name}.tar.gz";
+ url = "mirror://pypi/r/reno/${pname}-${version}.tar.gz";
sha256 = "018vl9fj706jjf07xdx8q6761s53mrihjn69yjq09gp0vmp1g7i4";
};
diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix
index ffd9774ee447..acf9d03843d0 100644
--- a/pkgs/development/tools/repository-managers/nexus/default.nix
+++ b/pkgs/development/tools/repository-managers/nexus/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, makeWrapper, jre_headless, gawk }:
stdenv.mkDerivation rec {
- name = "nexus-${version}";
- version = "3.16.1-02";
+ pname = "nexus";
+ version = "3.18.1-01";
src = fetchurl {
url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz";
- sha256 = "0nfcpsb7byykiwrdz01c99a6hr5ww2d4471spzpgs9i64kbjj7ln";
+ sha256 = "0z3hb1ha0yvi09hrndrzzh95g3m42pfsi0gzw7hfx9r0n8r2qgkd";
};
- sourceRoot = name;
+ sourceRoot = "${pname}-${version}";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix
index aa537df15084..507402deed66 100644
--- a/pkgs/development/tools/richgo/default.nix
+++ b/pkgs/development/tools/richgo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "richgo-${version}";
+ pname = "richgo";
version = "0.2.8";
goPackagePath = "github.com/kyoh86/richgo";
diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix
index 499cec2e6a7f..e4762796c18a 100644
--- a/pkgs/development/tools/ronn/default.nix
+++ b/pkgs/development/tools/ronn/default.nix
@@ -1,10 +1,10 @@
{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, groff }:
stdenv.mkDerivation rec {
- name = "ronn-${version}";
+ pname = "ronn";
version = env.gems.ronn.version;
- env = bundlerEnv rec {
+ env = bundlerEnv {
name = "ronn-gems";
gemdir = ./.;
};
diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix
index 72b9406211cb..e00f0ae7dd04 100644
--- a/pkgs/development/tools/rq/default.nix
+++ b/pkgs/development/tools/rq/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "rq-${version}";
+ pname = "rq";
version = "0.10.4";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index da3b27ebacc5..3a9ecb7697ab 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }:
stdenv.mkDerivation rec {
- name = "rtags-${version}";
+ pname = "rtags";
version = "2.16";
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix
index 5d965fc87a7e..9a6393977d7f 100644
--- a/pkgs/development/tools/rubocop/default.nix
+++ b/pkgs/development/tools/rubocop/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerEnv, ruby, bundlerUpdateScript }:
-bundlerEnv rec {
+bundlerEnv {
pname = "rubocop";
inherit ruby;
diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/development/tools/rucksack/default.nix
index 09008c9d63d8..85a4d0fa23dc 100644
--- a/pkgs/development/tools/rucksack/default.nix
+++ b/pkgs/development/tools/rucksack/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "3.1.0";
- name = "rucksack-${version}";
+ pname = "rucksack";
src = fetchFromGitHub {
owner = "andrewrk";
repo = "rucksack";
- rev = "${version}";
+ rev = version;
sha256 = "0bcm20hqxqnq1j0zghb9i7z9frri6bbf7rmrv5g8dd626sq07vyv";
};
diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index df782d935157..ca1c2fa45e9d 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -5,6 +5,8 @@ rustPlatform.buildRustPackage rec {
pname = "rust-bindgen";
version = "0.51.0";
+ RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update
+
src = fetchFromGitHub {
owner = "rust-lang";
repo = pname;
diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix
index 8fb0b63727a2..17103bae50a6 100644
--- a/pkgs/development/tools/rust/cargo-asm/default.nix
+++ b/pkgs/development/tools/rust/cargo-asm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
- name = "cargo-asm-${version}";
+ pname = "cargo-asm";
version = "0.1.17";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix
index f19aabae7a18..7ccc85283599 100644
--- a/pkgs/development/tools/rust/cargo-fuzz/default.nix
+++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl, runCommand, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "cargo-fuzz-${version}";
+ pname = "cargo-fuzz";
version = "0.5.3"; # Note to self: on 0.5.4, remove the hand-added Cargo.lock
src =
diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix
index 0ca12bd7bf4f..144e1d71a110 100644
--- a/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/pkgs/development/tools/rust/cargo-generate/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }:
rustPlatform.buildRustPackage rec {
- name = "cargo-generate-${version}";
+ pname = "cargo-generate";
version = "0.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix
new file mode 100644
index 000000000000..5ea935babd19
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-watch/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "cargo-watch";
+ version = "7.2.1";
+
+ src = fetchFromGitHub {
+ owner = "passcod";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "13zjsypj0ay9xb5j5fhl3yfn57kp2yngl138vmnyfk1h7gjdxpk3";
+ };
+
+ cargoSha256 = "1c3h9il3y0swvcdrrqgh5r7di522i1cc8zk1kfmx97chy8bhsqvg";
+
+ buildInputs = lib.optional stdenv.isDarwin CoreServices;
+
+ # `test with_cargo` tries to call cargo-watch as a cargo subcommand
+ # (calling cargo-watch with command `cargo watch`)
+ checkPhase = "PATH=target/debug:$PATH cargo test";
+
+ meta = with lib; {
+ description = "A Cargo subcommand for watching over Cargo project's source";
+ homepage = https://github.com/passcod/cargo-watch;
+ license = licenses.cc0;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ xrelkd ivan ];
+ };
+}
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index 945b78caccc7..d58b848c87e9 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
- name = "rust-cbindgen-${version}";
+ pname = "rust-cbindgen";
version = "0.9.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix
index 7bd49132d0ef..b152be414dac 100644
--- a/pkgs/development/tools/rust/maturin/default.nix
+++ b/pkgs/development/tools/rust/maturin/default.nix
@@ -5,16 +5,16 @@ let
inherit (darwin.apple_sdk.frameworks) Security;
in rustPlatform.buildRustPackage rec {
name = "maturin-${version}";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "PyO3";
repo = "maturin";
rev = "v${version}";
- sha256 = "0srsb305gld6zmz7qm5zk4gawqqlywdpray04z8xcij146mccci2";
+ sha256 = "180dynm9qy3mliqai4jfwxbg01jdz2a95bfyar880qmp75f35wi8";
};
- cargoSha256 = "0bscwbrzjaps4yqcrqhan56kdmh0n014w4ldsbv3sbhpw5izz335";
+ cargoSha256 = "1x61kxmbk5mazi3lmzfnixjl584cxkfv16si2smh8d9xhhz6gvpw";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index b2f6701be876..a06723fc28c8 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, substituteAll, Security }:
rustPlatform.buildRustPackage rec {
- name = "racer-${version}";
+ pname = "racer";
version = "2.1.22";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index aa33f04123f5..bfc30193eeda 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "racerd-${version}";
+ pname = "racerd";
version = "2019-03-20";
src = fetchFromGitHub {
owner = "jwilm";
diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix
index fd5bc6978310..8a87bf5cf4df 100644
--- a/pkgs/development/tools/rust/rainicorn/default.nix
+++ b/pkgs/development/tools/rust/rainicorn/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "rainicorn-${version}";
+ pname = "rainicorn";
version = "1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix
index 4e7032025c3d..32cc66f76e92 100644
--- a/pkgs/development/tools/rust/svd2rust/default.nix
+++ b/pkgs/development/tools/rust/svd2rust/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "svd2rust-${version}";
+ pname = "svd2rust";
version = "0.14.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index c6b3d0b4cd08..4cd8b328353b 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -3,7 +3,7 @@
with lib;
stdenv.mkDerivation rec {
- name = "sauce-connect-${version}";
+ pname = "sauce-connect";
version = "4.5.4";
src = fetchurl (
diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix
index bd8a013fe2d0..ab70552c2e8c 100644
--- a/pkgs/development/tools/scalafix/default.nix
+++ b/pkgs/development/tools/scalafix/default.nix
@@ -16,7 +16,7 @@ let
outputHash = "19j260prx7k010nxyvc1m9jj1ncxr73m2cym7if39360v5dc05c0";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${baseName}-${version}";
buildInputs = [ jdk makeWrapper deps ];
diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index 79afb54bfb70..1f789a6ade5d 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -16,7 +16,7 @@ let
outputHash = "1k5qn0w6hqql8yqhlma67ilp8hf0xwxwkzvwg8bkky1jvsapjsl5";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${baseName}-${version}";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix
index 05f7805a55ac..9a87f5f93694 100644
--- a/pkgs/development/tools/scry/default.nix
+++ b/pkgs/development/tools/scry/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, crystal, shards, llvm, which }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "scry";
version = "0.8.0";
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index f91285820923..eff06daac064 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -4,18 +4,18 @@
}:
let
allSpecs = {
- "x86_64-linux" = {
+ x86_64-linux = {
system = "linux64";
sha256 = "04wb6h57daxmnv3a3xrcsznawbx7r8wyi1vk1g26z2l2ppcnsbzv";
};
- "x86_64-darwin" = {
+ x86_64-darwin = {
system = "mac64";
sha256 = "0f8j7m8ardaaw8pv02vxhwkqbcm34366bln0np0j0ig21d4fag09";
};
};
- spec = allSpecs."${stdenv.hostPlatform.system}"
+ spec = allSpecs.${stdenv.hostPlatform.system}
or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}");
libs = stdenv.lib.makeLibraryPath [
@@ -27,7 +27,7 @@ let
];
in
stdenv.mkDerivation rec {
- name = "chromedriver-${version}";
+ pname = "chromedriver";
version = "76.0.3809.68";
src = fetchurl {
diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix
index a8085399b3db..3f4b8a22d648 100644
--- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix
+++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "htmlunit-driver-standalone-${version}";
+ pname = "htmlunit-driver-standalone";
version = "2.27";
src = fetchurl {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
dontUnpack = true;
- installPhase = "install -D $src $out/share/lib/${name}/${name}.jar";
+ installPhase = "install -D $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar";
meta = {
homepage = https://github.com/SeleniumHQ/htmlunit-driver;
diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix
index 82b6d7e1161a..27e87d212e68 100644
--- a/pkgs/development/tools/selenium/selendroid/default.nix
+++ b/pkgs/development/tools/selenium/selendroid/default.nix
@@ -16,7 +16,7 @@ let
};
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit name;
inherit version;
diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
index 61b74ce108d6..d3a8efaadb6a 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -8,7 +8,7 @@ let
patchVersion = "0";
in stdenv.mkDerivation rec {
- name = "selenium-server-standalone-${version}";
+ pname = "selenium-server-standalone";
version = "${minorVersion}.${patchVersion}";
src = fetchurl {
@@ -21,10 +21,10 @@ in stdenv.mkDerivation rec {
buildInputs = [ jre makeWrapper ];
installPhase = ''
- mkdir -p $out/share/lib/${name}
- cp $src $out/share/lib/${name}/${name}.jar
+ mkdir -p $out/share/lib/${pname}-${version}
+ cp $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar
makeWrapper ${jre}/bin/java $out/bin/selenium-server \
- --add-flags "-cp $out/share/lib/${name}/${name}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \
+ --add-flags "-cp $out/share/lib/${pname}-${version}/${pname}-${version}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \
--add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \
--add-flags "org.openqa.grid.selenium.GridLauncherV3"
'';
diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix
index 04076a8f0cf6..71f488c760a4 100644
--- a/pkgs/development/tools/simavr/default.nix
+++ b/pkgs/development/tools/simavr/default.nix
@@ -4,7 +4,7 @@
, GLUT }:
stdenv.mkDerivation rec {
- name = "simavr-${version}";
+ pname = "simavr";
version = "1.5";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index d8899de205fd..e7b21c40f17b 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -19,8 +19,9 @@ let
goPackagePath = "github.com/containers/skopeo";
in
-buildGoPackage rec {
- name = "skopeo-${version}";
+buildGoPackage {
+ pname = "skopeo";
+ inherit version;
inherit src goPackagePath;
outputs = [ "bin" "man" "out" ];
diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index 534c69200e02..49eea7213bd8 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -6,9 +6,9 @@ let
version="1.0.0";
name="${baseName}-${version}";
owner = "laurentj";
- repo = "${baseName}";
+ repo = baseName;
sha256="1w4sfrv520isbs7r1rlzl5y3idrpad7znw9fc92yz40jlwz7sxs4";
- rev = "${version}";
+ rev = version;
};
buildInputs = [
unzip zip
diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix
index f2f50c18e0b9..d84322bb5474 100644
--- a/pkgs/development/tools/sourcetrail/default.nix
+++ b/pkgs/development/tools/sourcetrail/default.nix
@@ -2,7 +2,7 @@
, zlib, expat, dbus, openssl, python3 }:
stdenv.mkDerivation rec {
- name = "sourcetrail-${version}";
+ pname = "sourcetrail";
version = "2019.2.39";
src = fetchurl {
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix
index c9df2703daa5..550cd9dce278 100644
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ b/pkgs/development/tools/spirv-tools/default.nix
@@ -1,23 +1,22 @@
-{ stdenv, fetchFromGitHub, cmake, python, spirv-headers }:
+{ stdenv, fetchFromGitHub, cmake, python3, spirv-headers }:
let
# Update spirv-headers rev in lockstep according to DEPs file
- version = "2019.1";
+ version = "2019.3";
in
-assert version == spirv-headers.version;
stdenv.mkDerivation rec {
- name = "spirv-tools-${version}";
+ pname = "spirv-tools";
inherit version;
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "v${version}";
- sha256 = "0vddjzhkrhrm3l3i57nxmq2smv3r1s0ka5ff2kziaahr4hqb479r";
+ sha256 = "1wvipjcjsi815ls08s3dz9hwlbb59dbl4syxkskg1k9d5jjph1a8";
};
enableParallelBuilding = true;
- buildInputs = [ cmake python ];
+ buildInputs = [ cmake python3 ];
cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ];
diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix
index 4acfa4a2b0ed..52c33f3e444c 100644
--- a/pkgs/development/tools/sqsh/default.nix
+++ b/pkgs/development/tools/sqsh/default.nix
@@ -4,11 +4,11 @@ let
mainVersion = "2.5";
in stdenv.mkDerivation rec {
- name = "sqsh-${version}";
+ pname = "sqsh";
version = "${mainVersion}.16.1";
src = fetchurl {
- url = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${name}.tgz";
+ url = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${pname}-${version}.tgz";
sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n";
};
diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix
index 21068a8b05f6..f1a1ceb9bb19 100644
--- a/pkgs/development/tools/stagit/default.nix
+++ b/pkgs/development/tools/stagit/default.nix
@@ -1,7 +1,7 @@
{ stdenv, libgit2, fetchgit }:
stdenv.mkDerivation rec {
- name = "stagit-${version}";
+ pname = "stagit";
version = "0.9.1";
src = fetchgit {
diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix
index d24c3e88b8cb..e26431b26875 100644
--- a/pkgs/development/tools/statik/default.nix
+++ b/pkgs/development/tools/statik/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoPackage {
pname = "statik";
version = "unstable-2019-07-31";
goPackagePath = "github.com/rakyll/statik";
diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix
index a3499258a999..cc865e2bd528 100644
--- a/pkgs/development/tools/textql/default.nix
+++ b/pkgs/development/tools/textql/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, sqlite }:
buildGoPackage rec {
- name = "textql-${version}";
+ pname = "textql";
version = "2.0.3";
goPackagePath = "github.com/dinedal/textql";
diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix
index f07451ae8404..50c34dc39edf 100644
--- a/pkgs/development/tools/thrust/default.nix
+++ b/pkgs/development/tools/thrust/default.nix
@@ -14,7 +14,7 @@ let
];
};
in stdenv.mkDerivation rec {
- name = "thrust-${version}";
+ pname = "thrust";
version = "0.7.6";
src = fetchurl {
diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix
index 90d36c71caa9..aab1c49a537b 100644
--- a/pkgs/development/tools/toluapp/default.nix
+++ b/pkgs/development/tools/toluapp/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "1.0.93";
- name = "toluapp-${version}";
+ pname = "toluapp";
src = fetchFromGitHub {
owner = "LuaDist";
repo = "toluapp";
- rev = "${version}";
+ rev = version;
sha256 = "0zd55bc8smmgk9j4cf0jpibb03lgsvl0knpwhplxbv93mcdnw7s0";
};
diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix
index 2bbe2cfe16df..74f1f22426f9 100644
--- a/pkgs/development/tools/tora/default.nix
+++ b/pkgs/development/tools/tora/default.nix
@@ -1,41 +1,37 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper
-, boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }:
+, boost, doxygen, openssl, mysql, postgresql, graphviz, loki
+, qscintilla, qtbase, qttools }:
-let
- qscintillaLib = (qscintilla.override { withQt5 = true; });
-
-in mkDerivation rec {
- name = "tora-${version}";
- version = "3.1";
+mkDerivation {
+ pname = "tora";
+ version = "3.2.176";
src = fetchFromGitHub {
owner = "tora-tool";
repo = "tora";
- rev = "v${version}";
- sha256 = "0wninl10bcgiljf6wnhn2rv8kmzryw78x5qvbw8s2zfjlnxjsbn7";
+ rev = "39bf2837779bf458fc72a9f0e49271152e57829f";
+ sha256 = "0fr9b542i8r6shgnz33lc3cz333fnxgmac033yxfrdjfglzk0j2k";
};
- nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ];
+ nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper qttools ];
+
buildInputs = [
- boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintillaLib qtbase
+ boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintilla qtbase
];
preConfigure = ''
- sed -i \
- 's|defaultGvHome = "/usr/bin"|defaultGvHome = "${lib.getBin graphviz}/bin"|' \
- src/widgets/toglobalsetting.cpp
-
- sed -i \
- 's|/usr/bin/dot|${lib.getBin graphviz}/bin/dot|' \
- extlibs/libermodel/dotgraph.cpp
+ substituteInPlace src/widgets/toglobalsetting.cpp \
+ --replace 'defaultGvHome = "/usr/bin"' 'defaultGvHome = "${lib.getBin graphviz}/bin"'
+ substituteInPlace extlibs/libermodel/dotgraph.cpp \
+ --replace /usr/bin/dot ${lib.getBin graphviz}/bin/dot
'';
cmakeFlags = [
"-DWANT_INTERNAL_LOKI=0"
"-DWANT_INTERNAL_QSCINTILLA=0"
# cmake/modules/FindQScintilla.cmake looks in qtbase and for the wrong library name
- "-DQSCINTILLA_INCLUDE_DIR=${qscintillaLib}/include"
- "-DQSCINTILLA_LIBRARY=${qscintillaLib}/lib/libqscintilla2.so"
+ "-DQSCINTILLA_INCLUDE_DIR=${qscintilla}/include"
+ "-DQSCINTILLA_LIBRARY=${qscintilla}/lib/libqscintilla2.so"
"-DENABLE_DB2=0"
"-DENABLE_ORACLE=0"
"-DENABLE_TERADATA=0"
diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix
index 565ec7904f18..a5c13e2266e9 100644
--- a/pkgs/development/tools/toxiproxy/default.nix
+++ b/pkgs/development/tools/toxiproxy/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "toxiproxy-${version}";
+ pname = "toxiproxy";
version = "2.1.3";
src = fetchFromGitHub {
owner = "Shopify";
diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix
index 1deb2c7a8fc0..c98529484d51 100644
--- a/pkgs/development/tools/trellis/default.nix
+++ b/pkgs/development/tools/trellis/default.nix
@@ -8,14 +8,16 @@ let
in
stdenv.mkDerivation rec {
pname = "trellis";
- version = "2019.08.09";
+ version = "2019.09.01";
+ realVersion = with stdenv.lib; with builtins;
+ "1.0-53-g${substring 0 7 (elemAt srcs 0).rev}";
srcs = [
(fetchFromGitHub {
owner = "symbiflow";
repo = "prjtrellis";
- rev = "a67379179985bb12a611c75d975548cdf6e7d12e";
- sha256 = "0vqwfsblf7ylz0jnnf532kap5s1d1zcvbavxmb6a4v32b9xfdv35";
+ rev = "98871e0e2959bc8cb4de3c7ebe2b9eddc4efe00c";
+ sha256 = "1yq7ih2xvhfvdpijmbqjq6jcngl6710kiv66hkww5ih8j5dzsq5l";
name = "trellis";
})
(fetchFromGitHub {
@@ -32,6 +34,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python3 ];
preConfigure = with builtins; ''
+ substituteInPlace libtrellis/CMakeLists.txt \
+ --replace "git describe --tags" "echo ${realVersion}"
+
rmdir database && ln -sfv ${elemAt srcs 1} ./database
source environment.sh
diff --git a/pkgs/development/tools/tychus/default.nix b/pkgs/development/tools/tychus/default.nix
index 775e26eb6a8c..01531d23c781 100644
--- a/pkgs/development/tools/tychus/default.nix
+++ b/pkgs/development/tools/tychus/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildGoPackage, CoreFoundation }:
buildGoPackage rec {
- name = "tychus-${version}";
+ pname = "tychus";
version = "0.6.3";
goPackagePath = "github.com/devlocker/tychus";
diff --git a/pkgs/development/tools/udis86/default.nix b/pkgs/development/tools/udis86/default.nix
new file mode 100644
index 000000000000..6996d5bf13fa
--- /dev/null
+++ b/pkgs/development/tools/udis86/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, python }:
+
+stdenv.mkDerivation rec {
+ pname = "udis86";
+ version = "1.7.2";
+
+ src = fetchFromGitHub {
+ owner = "vmt";
+ repo = "udis86";
+ rev = "v${version}";
+ url = "https://github.com/vmt/udis86/archive/v${version}.tar.gz";
+ sha256 = "0c60zwimim6jrm4saw36s38w5sg5v8n9mr58pkqmjrlf7q9g6am1";
+ };
+
+ nativeBuildInputs = [ autoreconfHook python ];
+
+ configureFlags = [
+ "--enable-shared"
+ ];
+
+ outputs = [ "bin" "out" "dev" "lib" ];
+
+ meta = with stdenv.lib; {
+ homepage = "http://udis86.sourceforge.net";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ timor ];
+ description = ''
+ Easy-to-use, minimalistic x86 disassembler library (libudis86)
+ '';
+ platforms = platforms.all ;
+ };
+}
diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix
index f62cd1aabb1b..796d3509c1c4 100644
--- a/pkgs/development/tools/uftrace/default.nix
+++ b/pkgs/development/tools/uftrace/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub}:
stdenv.mkDerivation rec {
- name = "uftrace-${version}";
+ pname = "uftrace";
version = "0.9.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/development/tools/unconvert/default.nix
index 1e81c5b9f86e..a6c087d7be72 100644
--- a/pkgs/development/tools/unconvert/default.nix
+++ b/pkgs/development/tools/unconvert/default.nix
@@ -5,7 +5,7 @@
}:
buildGoPackage rec {
- name = "unconvert-unstable-${version}";
+ pname = "unconvert-unstable";
version = "2018-07-03";
rev = "1a9a0a0a3594e9363e49545fb6a4e24ac4c68b7b";
diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix
index 54ace72c5fbd..895cedd70108 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/pkgs/development/tools/unity3d/default.nix
@@ -22,8 +22,8 @@ let
ver = "2018.3.0";
build = "f2";
-in stdenv.mkDerivation rec {
- name = "unity-editor-${version}";
+in stdenv.mkDerivation {
+ pname = "unity-editor";
version = "${ver}x${build}";
src = fetchurl {
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 03bbe0f52e5f..e5b23f14517d 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -55,7 +55,7 @@ in buildRubyGem rec {
postInstall =
let
pathAdditions = lib.makeSearchPath "bin"
- (map (x: "${lib.getBin x}") ([
+ (map (x: lib.getBin x) ([
libarchive
] ++ lib.optionals withLibvirt [
libguestfs
diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix
index ebeb81c90ec5..71c47a7394b7 100644
--- a/pkgs/development/tools/valadoc/default.nix
+++ b/pkgs/development/tools/valadoc/default.nix
@@ -1,10 +1,10 @@
{stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobject-introspection, expat}:
stdenv.mkDerivation rec {
version = "0.36.2";
- name = "valadoc-${version}";
+ pname = "valadoc";
src = fetchurl {
- url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0hfaskbm7y4z4jf6lxm8hg4c0b8621qn1gchxjxcngq0cpx79z9h";
};
diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix
index f6c160de65c3..f9a84937af30 100644
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/pkgs/development/tools/vcstool/default.nix
@@ -4,7 +4,6 @@
with python3Packages;
buildPythonApplication rec {
- name = "${pname}-${version}";
pname = "vcstool";
version = "0.1.36";
@@ -15,7 +14,7 @@ buildPythonApplication rec {
propagatedBuildInputs = [ pyyaml ];
- makeWrapperArgs = ["--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ git bazaar subversion ]}"];
+ makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git bazaar subversion ])];
doCheck = false; # requires network
diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix
index 9601771f75f0..df0c360f75c3 100644
--- a/pkgs/development/tools/vgo2nix/default.nix
+++ b/pkgs/development/tools/vgo2nix/default.nix
@@ -7,8 +7,8 @@
, fetchFromGitHub
}:
-buildGoPackage rec {
- name = "vgo2nix-${version}";
+buildGoPackage {
+ pname = "vgo2nix";
version = "unstable-2019-02-06";
goPackagePath = "github.com/adisbladis/vgo2nix";
diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix
index 3e8a228bacf1..27296edfac0b 100644
--- a/pkgs/development/tools/vim-vint/default.nix
+++ b/pkgs/development/tools/vim-vint/default.nix
@@ -3,7 +3,7 @@
with python3Packages;
buildPythonApplication rec {
- name = "vim-vint-${version}";
+ pname = "vim-vint";
version = "0.3.20";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix
index 42cf6f07f4d0..197f48dbbfb5 100644
--- a/pkgs/development/tools/vndr/default.nix
+++ b/pkgs/development/tools/vndr/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "vndr-unstable-${version}";
+ pname = "vndr-unstable";
version = "2018-06-23";
rev = "81cb8916aad3c8d06193f008dba3e16f82851f52";
diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix
index e87ba2b52c14..e6dccbd332e1 100644
--- a/pkgs/development/tools/vogl/default.nix
+++ b/pkgs/development/tools/vogl/default.nix
@@ -7,8 +7,8 @@
, fetchpatch
}:
-mkDerivation rec {
- name = "vogl-${version}";
+mkDerivation {
+ pname = "vogl";
version = "2016-05-13";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index 3c189d09f1c1..36d018682df9 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -1,15 +1,16 @@
{ stdenv, fetchFromGitHub, cmake, writeText, python3
, vulkan-headers, vulkan-loader, glslang
-, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
+, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland, spirv-headers }:
+
stdenv.mkDerivation rec {
- name = "vulkan-validation-layers-${version}";
- version = "1.1.106.0"; # WARNING: glslang overrides in all-packages.nix must be updated to match known-good.json!
+ pname = "vulkan-validation-layers";
+ version = "1.1.114.0";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-ValidationLayers";
rev = "sdk-${version}";
- sha256 = "1sq42j8ikll2dyi9ygaz80lx89mvq9d21pkaf49gzhg4xjcd97dp";
+ sha256 = "0f8dlrjw1nz2adhzi4sbvljys4h0dyiwafdihsdyrg3xncgffks4";
};
nativeBuildInputs = [ pkgconfig cmake python3 ];
diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix
index 8e17c531547d..23fd684b412b 100644
--- a/pkgs/development/tools/vultr/default.nix
+++ b/pkgs/development/tools/vultr/default.nix
@@ -1,14 +1,14 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "vultr-${version}";
+ pname = "vultr";
version = "1.15.0";
goPackagePath = "github.com/JamesClonk/vultr";
src = fetchFromGitHub {
owner = "JamesClonk";
repo = "vultr";
- rev = "${version}";
+ rev = version;
sha256 = "1bx2x17aa6wfn4qy9lxk8sh7shs3x5ppz2z49s0xm8qq0rs1qi92";
};
diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix
index e9ced0e753a0..f8936e27516a 100644
--- a/pkgs/development/tools/wabt/default.nix
+++ b/pkgs/development/tools/wabt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, python3 }:
stdenv.mkDerivation rec {
- name = "wabt-${version}";
+ pname = "wabt";
version = "1.0.11";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix
index d9ff6f673d87..3f721eaee2a9 100644
--- a/pkgs/development/tools/wasm-pack/default.nix
+++ b/pkgs/development/tools/wasm-pack/default.nix
@@ -8,7 +8,7 @@
}:
rustPlatform.buildRustPackage rec {
- name = "wasm-pack-${version}";
+ pname = "wasm-pack";
version = "0.8.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix
index 4a056db6c0c2..3a58e1088ea2 100644
--- a/pkgs/development/tools/watchman/default.nix
+++ b/pkgs/development/tools/watchman/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "watchman-${version}";
+ pname = "watchman";
version = "4.9.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/development/tools/wiiload/default.nix
index aaf1b20ea6f7..8db830b3284e 100644
--- a/pkgs/development/tools/wiiload/default.nix
+++ b/pkgs/development/tools/wiiload/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoconf, automake, zlib }:
stdenv.mkDerivation rec {
version = "v0.5.1";
- name = "wiiload-${version}";
+ pname = "wiiload";
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ zlib ];
diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix
index 17c64f0548b3..da1b493b0d2a 100644
--- a/pkgs/development/tools/ws/default.nix
+++ b/pkgs/development/tools/ws/default.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "ws-${version}";
+ pname = "ws";
version = "0.2.1";
rev = "e9404cb37e339333088b36f6a7909ff3be76931d";
diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
index 29717d75394a..8090aca5ff30 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/pkgs/development/tools/xcbuild/default.nix
@@ -15,8 +15,8 @@ let
rev = "c894b9e59f02203dbe4e2be657572cf88c4230c3";
sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w";
};
-in stdenv.mkDerivation rec {
- name = "xcbuild-${version}";
+in stdenv.mkDerivation {
+ pname = "xcbuild";
# Once a version is released that includes
# https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710,
diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix
index c163c4cbcf69..44a7254a3d7f 100644
--- a/pkgs/development/tools/xqilla/default.nix
+++ b/pkgs/development/tools/xqilla/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, xercesc }:
stdenv.mkDerivation rec {
- name = "xqilla-${version}";
+ pname = "xqilla";
version = "2.3.4";
src = fetchurl {
diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix
index 1a8d7f13aff5..f31a119bb657 100644
--- a/pkgs/development/tools/yaml2json/default.nix
+++ b/pkgs/development/tools/yaml2json/default.nix
@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
- name = "yaml2json-${version}";
+buildGoPackage {
+ pname = "yaml2json";
version = "unstable-2017-05-03";
goPackagePath = "github.com/bronze1man/yaml2json";
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
index 82e4402361d9..f5989390c4b0 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
+++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
@@ -406,7 +406,7 @@ in rec {
'';
};
- fixup_yarn_lock = stdenv.mkDerivation rec {
+ fixup_yarn_lock = stdenv.mkDerivation {
name = "fixup_yarn_lock";
buildInputs = [ nodejs ];
diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix
index 3520bcfc1b12..a2076668f604 100644
--- a/pkgs/development/tools/yj/default.nix
+++ b/pkgs/development/tools/yj/default.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
- name = "yj-${version}";
+ pname = "yj";
version = "4.0.0";
rev = "d9a48607cc5c812e8cf4abccc8ad26f37ab51558";
diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix
index c157ddd65a87..82fac9f6be79 100644
--- a/pkgs/development/tools/yuicompressor/default.nix
+++ b/pkgs/development/tools/yuicompressor/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- name = "yuicompressor-${version}";
+ pname = "yuicompressor";
version = "2.4.8";
src = fetchurl {
- url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${name}.jar";
+ url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar";
sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh";
};
diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix
index 4159e3690490..4db0da4f418b 100644
--- a/pkgs/development/web/csslint/default.nix
+++ b/pkgs/development/web/csslint/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.10.0";
- name = "csslint-${version}";
+ pname = "csslint";
src = fetchurl {
- url = "https://registry.npmjs.org/csslint/-/${name}.tgz";
+ url = "https://registry.npmjs.org/csslint/-/${pname}-${version}.tgz";
sha256 = "1gq2x0pf2p4jhccvn3y3kjhm1lmb4jsfdbzjdh924w8m3sr9jdid";
};
diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index 24f567891983..5427f66478f3 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -10,7 +10,7 @@ let
([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk);
in
stdenv.mkDerivation rec {
- name = "grails-${version}";
+ pname = "grails";
version = "4.0.0";
src = fetchurl {
diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index 26cec8f37306..675564b789b9 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -17,12 +17,12 @@ let
stdenv.cc.cc
];
in stdenv.mkDerivation rec {
- name = "insomnia-${version}";
- version = "6.5.3";
+ pname = "insomnia";
+ version = "6.6.2";
src = fetchurl {
url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
- sha256 = "0km7anw5xpcfr6j7pwqhv26pk7nxv1jywqlz0lpvgj6w85aafcm3";
+ sha256 = "0hlny3lac7whdbpp0pcyaa30h6x9536jsg95gj9irw2qjsx74xa7";
};
nativeBuildInputs = [
diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix
index 485c4026afae..ec1ec527c5ef 100644
--- a/pkgs/development/web/kcgi/default.nix
+++ b/pkgs/development/web/kcgi/default.nix
@@ -4,7 +4,6 @@ stdenv.mkDerivation rec {
pname = "kcgi";
version = "0.10.8";
underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version;
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "kristapsdz";
diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix
index 91b4fe15e5a0..eb3254dcd3ab 100644
--- a/pkgs/development/web/now-cli/default.nix
+++ b/pkgs/development/web/now-cli/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
- name = "now-cli-${version}";
+ pname = "now-cli";
version = "15.8.7";
# TODO: switch to building from source, if possible
diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index 58b0f0e876f8..07bb13377456 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -1,20 +1,22 @@
-{ stdenv, lib, gnome2, fetchurl, pkgs, xorg, makeWrapper, makeDesktopItem }:
+{ stdenv, fetchurl, makeDesktopItem, wrapGAppsHook
+, atk, at-spi2-atk, alsaLib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3
+, freetype, fontconfig, nss, nspr, pango, udev, libX11, libxcb, libXi
+, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes
+, libXrender, libXtst, libXScrnSaver
+}:
stdenv.mkDerivation rec {
- name = "postman-${version}";
- version = "7.0.7";
+ pname = "postman";
+ version = "7.6.0";
src = fetchurl {
url = "https://dl.pstmn.io/download/version/${version}/linux64";
- sha256 = "47be1b955759520f3a2c7dcdecb85b4c52c38df717da294ba184f46f2058014a";
- name = "${name}.tar.gz";
+ sha256 = "sha256:03y82ydkj46l7dn35y944gnghbrrhc75y3yxdyidbh8fl3xvmlfv";
+ name = "${pname}.tar.gz";
};
- nativeBuildInputs = [ makeWrapper ];
-
- dontPatchELF = true;
-
- buildPhase = ":"; # nothing to build
+ dontBuild = true; # nothing to build
+ dontConfigure = true;
desktopItem = makeDesktopItem {
name = "postman";
@@ -26,12 +28,48 @@ stdenv.mkDerivation rec {
categories = "Application;Development;";
};
+ buildInputs = [
+ stdenv.cc.cc.lib
+ atk
+ at-spi2-atk
+ alsaLib
+ cairo
+ cups
+ dbus
+ expat
+ gdk-pixbuf
+ glib
+ gtk3
+ freetype
+ fontconfig
+ nss
+ nspr
+ pango
+ udev
+ libX11
+ libxcb
+ libXi
+ libXcursor
+ libXdamage
+ libXrandr
+ libXcomposite
+ libXext
+ libXfixes
+ libXrender
+ libXtst
+ libXScrnSaver
+ ];
+
+ nativeBuildInputs = [ wrapGAppsHook ];
+
+
installPhase = ''
mkdir -p $out/share/postman
cp -R app/* $out/share/postman
+ rm $out/share/postman/Postman
mkdir -p $out/bin
- ln -s $out/share/postman/Postman $out/bin/postman
+ ln -s $out/share/postman/_Postman $out/bin/postman
mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications/
@@ -43,55 +81,21 @@ stdenv.mkDerivation rec {
ln -s $out/share/postman/resources/app/assets/icon.png $iconSizeDir/postman.png
'';
- preFixup = let
- libPath = lib.makeLibraryPath [
- stdenv.cc.cc.lib
- gnome2.pango
- gnome2.GConf
- pkgs.atk
- pkgs.alsaLib
- pkgs.cairo
- pkgs.cups
- pkgs.dbus.daemon.lib
- pkgs.expat
- pkgs.gdk-pixbuf
- pkgs.glib
- pkgs.gtk2-x11
- pkgs.freetype
- pkgs.fontconfig
- pkgs.nss
- pkgs.nspr
- pkgs.udev.lib
- xorg.libX11
- xorg.libxcb
- xorg.libXi
- xorg.libXcursor
- xorg.libXdamage
- xorg.libXrandr
- xorg.libXcomposite
- xorg.libXext
- xorg.libXfixes
- xorg.libXrender
- xorg.libX11
- xorg.libXtst
- xorg.libXScrnSaver
- ];
- in ''
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "${libPath}:$out/share/postman" \
- $out/share/postman/Postman
- patchelf --set-rpath "${libPath}" $out/share/postman/libnode.so
- patchelf --set-rpath "${libPath}" $out/share/postman/libffmpeg.so
-
- wrapProgram $out/share/postman/Postman --prefix LD_LIBRARY_PATH : ${libPath}
+ postFixup = ''
+ pushd $out/share/postman
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" _Postman
+ for file in $(find . -type f \( -name \*.node -o -name _Postman -o -name \*.so\* \) ); do
+ ORIGIN=$(patchelf --print-rpath $file); \
+ patchelf --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}:$ORIGIN" $file
+ done
+ popd
'';
meta = with stdenv.lib; {
homepage = https://www.getpostman.com;
description = "API Development Environment";
- license = stdenv.lib.licenses.postman;
+ license = licenses.postman;
platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ xurei ];
+ maintainers = with maintainers; [ xurei evanjs ];
};
}
diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix
index 24e04842dc9e..d56819be0195 100644
--- a/pkgs/development/web/remarkjs/default.nix
+++ b/pkgs/development/web/remarkjs/default.nix
@@ -17,7 +17,7 @@ let
};
in stdenv.mkDerivation rec {
- name = "remarkjs-${version}";
+ pname = "remarkjs";
version = "0.7.0";
diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix
index 10fbc98d51ab..bbdaeb5d2926 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ../../node-packages/node-env.nix {
diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix
index 266217d94e24..a625a815603d 100644
--- a/pkgs/development/web/valum/default.nix
+++ b/pkgs/development/web/valum/default.nix
@@ -2,7 +2,7 @@
, libgee, libsoup, fcgi }:
stdenv.mkDerivation rec {
- name = "valum-${version}";
+ pname = "valum";
version = "0.3.15";
src = fetchFromGitHub {
diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix
index 82faf32a3210..57fedb78407e 100644
--- a/pkgs/development/web/wml/default.nix
+++ b/pkgs/development/web/wml/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }:
-perlPackages.buildPerlPackage rec {
+perlPackages.buildPerlPackage {
pname = "wml";
version = "2.0.11";
diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix
index bda6dab14d8a..b77184e56525 100644
--- a/pkgs/development/web/woff2/default.nix
+++ b/pkgs/development/web/woff2/default.nix
@@ -1,7 +1,7 @@
{ brotli, cmake, fetchFromGitHub, stdenv }:
stdenv.mkDerivation rec {
- name = "woff2-${version}";
+ pname = "woff2";
version = "1.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix
index f0966357d93d..b9b0ccf7272c 100644
--- a/pkgs/development/web/xmlindent/default.nix
+++ b/pkgs/development/web/xmlindent/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, flex }:
stdenv.mkDerivation rec {
- name = "xmlindent-${version}";
+ pname = "xmlindent";
version = "0.2.17";
src = fetchurl {
- url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${pname}-${version}.tar.gz";
sha256 = "0k15rxh51a5r4bvfm6c4syxls8al96cx60a9mn6pn24nns3nh3rs";
};
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index 2cfddd1066ba..eeedae924405 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, zeroad-unwrapped }:
stdenv.mkDerivation rec {
- name = "0ad-data-${version}";
+ pname = "0ad-data";
inherit (zeroad-unwrapped) version;
src = fetchurl {
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 74bc52875d22..ef285f8cb935 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -9,7 +9,7 @@
assert withEditor -> wxGTK != null;
stdenv.mkDerivation rec {
- name = "0ad-${version}";
+ pname = "0ad";
version = "0.0.23b";
src = fetchurl {
diff --git a/pkgs/games/2048-in-terminal/default.nix b/pkgs/games/2048-in-terminal/default.nix
index 5d91bc04114b..446252062fac 100644
--- a/pkgs/games/2048-in-terminal/default.nix
+++ b/pkgs/games/2048-in-terminal/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ncurses }:
stdenv.mkDerivation rec {
- name = "2048-in-terminal-${version}";
+ pname = "2048-in-terminal";
version = "2017-11-29";
src = fetchFromGitHub {
diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix
index f2be128fd998..f7de15604fdc 100644
--- a/pkgs/games/90secondportraits/default.nix
+++ b/pkgs/games/90secondportraits/default.nix
@@ -11,8 +11,8 @@ let
desktopItem = makeDesktopItem {
name = "90secondportraits";
- exec = "${pname}";
- icon = "${icon}";
+ exec = pname;
+ icon = icon;
comment = "A silly speed painting game";
desktopName = "90 Second Portraits";
genericName = "90secondportraits";
@@ -21,7 +21,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix
index 02ea6f688069..19d2a01b4729 100644
--- a/pkgs/games/airstrike/default.nix
+++ b/pkgs/games/airstrike/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, SDL, SDL_image }:
stdenv.mkDerivation rec {
- name = "airstrike-pre-${version}";
+ pname = "airstrike-pre";
version = "6a";
src = fetchurl {
diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix
index 628a521126f5..89c74d83b490 100644
--- a/pkgs/games/alienarena/default.nix
+++ b/pkgs/games/alienarena/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg
, libvorbis, freetype, openal, libGLU_combined }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "alienarena-7.65";
src = fetchurl {
diff --git a/pkgs/games/amoeba/data.nix b/pkgs/games/amoeba/data.nix
index b5c7f4b730b8..fcde2d591f13 100644
--- a/pkgs/games/amoeba/data.nix
+++ b/pkgs/games/amoeba/data.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "amoeba-data-${version}";
+ pname = "amoeba-data";
version = "1.1";
src = fetchurl {
diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix
index d4ff86c424b1..943f9eb881c5 100644
--- a/pkgs/games/andyetitmoves/default.nix
+++ b/pkgs/games/andyetitmoves/default.nix
@@ -4,7 +4,7 @@ let plainName = "andyetitmoves";
version = "1.2.2";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${plainName}-${version}";
src = if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"
diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix
index 435329bdc4ab..46eb054bc8ef 100644
--- a/pkgs/games/angband/default.nix
+++ b/pkgs/games/angband/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }:
stdenv.mkDerivation rec {
+ pname = "angband";
version = "4.2.0";
- name = "angband-${version}";
src = fetchFromGitHub {
owner = "angband";
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index cd7f941ccd18..c3caf9105d05 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -19,6 +19,7 @@
, glibcLocales
, nose
, jsonschema
+, setuptools
, send2trash
, CoreAudio
# This little flag adds a huge number of dependencies, but we assume that
@@ -38,7 +39,8 @@ let
sha256-manual = "0pm5slxn78r44ggvbksz7rv9hmlnsvn9z811r6f63dsc8vm6mfml";
manual = stdenv.mkDerivation {
- name = "anki-manual-${version}";
+ pname = "anki-manual";
+ inherit version;
src = fetchFromGitHub {
owner = "dae";
repo = "ankidocs";
@@ -69,11 +71,12 @@ let
in
buildPythonApplication rec {
- name = "anki-${version}";
+ pname = "anki";
+ inherit version;
src = fetchurl {
urls = [
- "https://apps.ankiweb.net/downloads/current/${name}-source.tgz"
+ "https://apps.ankiweb.net/downloads/current/${pname}-${version}-source.tgz"
# "https://apps.ankiweb.net/downloads/current/${name}-source.tgz"
# "http://ankisrs.net/download/mirror/${name}.tgz"
# "http://ankisrs.net/download/mirror/archive/${name}.tgz"
@@ -85,7 +88,7 @@ buildPythonApplication rec {
propagatedBuildInputs = [
pyqtwebengine sqlalchemy beautifulsoup4 send2trash pyaudio requests decorator
- markdown jsonschema
+ markdown jsonschema setuptools
]
++ lib.optional plotsSupport matplotlib
++ lib.optional stdenv.isDarwin [ CoreAudio ]
diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix
index 5318108c4913..70c23664dc04 100644
--- a/pkgs/games/armagetronad/default.nix
+++ b/pkgs/games/armagetronad/default.nix
@@ -7,7 +7,8 @@ let
in
stdenv.mkDerivation {
- name = "armagetron-${version}";
+ pname = "armagetron";
+ inherit version;
src = fetchurl {
url = "https://launchpad.net/armagetronad/${versionMajor}/${versionMajor}.${versionMinor}/+download/armagetronad-${version}.src.tar.bz2";
sha256 = "157pp84wf0q3bdb72rnbm3ck0czwx2ply6lyhj8z7kfdc7csdbr3";
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index a8e9063a35f4..c224784e8f24 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -9,8 +9,8 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
- name = "arx-libertatis-${version}";
+stdenv.mkDerivation {
+ pname = "arx-libertatis";
version = "2019-02-16";
src = fetchFromGitHub {
diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix
index 593622c3008b..7d83d3a7cdb7 100644
--- a/pkgs/games/assaultcube/default.nix
+++ b/pkgs/games/assaultcube/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ file zlib ] ++ optionals client [ openal SDL SDL_image libogg libvorbis ];
targets = (optionalString server "server") + (optionalString client " client");
- makeFlags = [ "-C source/src" "CXX=c++" "${targets}" ];
+ makeFlags = [ "-C source/src" "CXX=c++" targets ];
desktop = makeDesktopItem {
name = "AssaultCube";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
genericName = "First-person shooter";
categories = "Application;Game;ActionGame;Shooter";
icon = "assaultcube.png";
- exec = "${pname}";
+ exec = pname;
};
gamedatadir = "/share/games/${pname}";
diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix
index b2c86222f2b0..37593d3bd726 100644
--- a/pkgs/games/astromenace/default.nix
+++ b/pkgs/games/astromenace/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.3.2";
- name = "astromenace-${version}";
+ pname = "astromenace";
src = fetchurl {
url = "mirror://sourceforge/openastromenace/astromenace-src-${version}.tar.bz2";
diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix
index de9eb9bbb580..b11a177e0455 100644
--- a/pkgs/games/atanks/default.nix
+++ b/pkgs/games/atanks/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, allegro }:
stdenv.mkDerivation rec {
- name = "atanks-${version}";
+ pname = "atanks";
version = "6.5";
src = fetchurl {
- url = "mirror://sourceforge/project/atanks/atanks/${name}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/atanks/atanks/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "0bijsbd51j4wsnmdxj54r92m7h8zqnvh9z3qqdig6zx7a8kjn61j";
};
diff --git a/pkgs/games/bastet/default.nix b/pkgs/games/bastet/default.nix
index 27ddec616bc8..85b6fcefdd28 100644
--- a/pkgs/games/bastet/default.nix
+++ b/pkgs/games/bastet/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, ncurses, boost }:
stdenv.mkDerivation rec {
- name = "bastet-${version}";
+ pname = "bastet";
version = "0.43.2";
buildInputs = [ ncurses boost ];
diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix
index bf58b523e76e..a35b449f92fd 100644
--- a/pkgs/games/blackshades/default.nix
+++ b/pkgs/games/blackshades/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchsvn, SDL, libGLU_combined, openal, libvorbis, freealut, SDL_image}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "blackshades-svn-110";
src = fetchsvn {
url = svn://svn.icculus.org/blackshades/trunk;
diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index af1228108d8f..d3eb2348a0d5 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -2,7 +2,7 @@
, pkgconfig, unzip}:
stdenv.mkDerivation rec {
version = "1.0";
- name = "blobby-volley-${version}";
+ pname = "blobby-volley";
src = fetchurl {
url = "mirror://sourceforge/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz";
diff --git a/pkgs/games/braincurses/default.nix b/pkgs/games/braincurses/default.nix
index 808d7e378074..deb542e3a86f 100644
--- a/pkgs/games/braincurses/default.nix
+++ b/pkgs/games/braincurses/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ncurses }:
stdenv.mkDerivation rec {
- name = "braincurses-${version}";
+ pname = "braincurses";
version = "1.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix
index 5040886eaa00..e34dfc383a1a 100644
--- a/pkgs/games/brogue/default.nix
+++ b/pkgs/games/brogue/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, SDL, ncurses, libtcod, makeDesktopItem }:
stdenv.mkDerivation rec {
- name = "brogue-${version}";
+ pname = "brogue";
version = "1.7.5";
src = fetchurl {
diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
index 6c7e9ac76a99..56d2866a2355 100644
--- a/pkgs/games/bzflag/default.nix
+++ b/pkgs/games/bzflag/default.nix
@@ -3,12 +3,11 @@
, Carbon, CoreServices }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "bzflag";
version = "2.4.18";
src = fetchurl {
- url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2";
+ url = "https://download.bzflag.org/${pname}/source/${version}/${pname}-${version}.tar.bz2";
sha256 = "1gmz31wmn3f8zq1bfilkgbf4qmi4fa0c93cs76mhg8h978pm23cx";
};
diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix
index 84a70c275a2f..b1d8a27b5a22 100644
--- a/pkgs/games/cataclysm-dda/default.nix
+++ b/pkgs/games/cataclysm-dda/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (common // rec {
name = "cataclysm-dda-${version}";
src = fetchFromCleverRaven {
- rev = "${version}";
+ rev = version;
sha256 = "00zzhx1mh1qjq668cga5nbrxp2qk6b82j5ak65skhgnlr6ii4ysc";
};
diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index 47432bca1633..3b460daefd1a 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "chessx-${version}";
+ pname = "chessx";
version = "1.5.0";
src = fetchurl {
diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix
index 47ab73ca269e..81f1ee0cd153 100644
--- a/pkgs/games/ckan/default.nix
+++ b/pkgs/games/ckan/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk2, curl }:
stdenv.mkDerivation rec {
- name = "ckan-${version}";
+ pname = "ckan";
version = "1.16.1";
src = fetchFromGitHub {
diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix
index a38678882c86..56164cfc017f 100644
--- a/pkgs/games/commandergenius/default.nix
+++ b/pkgs/games/commandergenius/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "commandergenius-${version}";
+ pname = "commandergenius";
version = "2.3.3";
src = fetchFromGitLab {
diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix
index c6ccac69b8cb..9528c6d06cb4 100644
--- a/pkgs/games/construo/default.nix
+++ b/pkgs/games/construo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11, zlib, xorgproto, libGL ? null, freeglut ? null }:
stdenv.mkDerivation rec {
- name = "construo-${version}";
+ pname = "construo";
version = "0.2.3";
src = fetchurl {
- url = "https://github.com/Construo/construo/releases/download/v${version}/${name}.tar.gz";
+ url = "https://github.com/Construo/construo/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "1wmj527hbj1qv44cdsj6ahfjrnrjwg2dp8gdick8nd07vm062qxa";
};
diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix
index 9526512f15cc..c9dcd2d9d400 100644
--- a/pkgs/games/crafty/default.nix
+++ b/pkgs/games/crafty/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "crafty-${version}";
+ pname = "crafty";
version = "25.0.1";
src = fetchurl {
diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix
index 98baafbb2fd2..b9d3a69d87b3 100644
--- a/pkgs/games/crrcsim/default.nix
+++ b/pkgs/games/crrcsim/default.nix
@@ -3,10 +3,11 @@ let
version = "0.9.13";
in
stdenv.mkDerivation rec {
- name = "crrcsim-${version}";
+ pname = "crrcsim";
+ inherit version;
src = fetchurl {
- url = "mirror://sourceforge/crrcsim/${name}.tar.gz";
+ url = "mirror://sourceforge/crrcsim/${pname}-${version}.tar.gz";
sha256 = "abe59b35ebb4322f3c48e6aca57dbf27074282d4928d66c0caa40d7a97391698";
};
diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix
index e0f35fe6d6dc..24077697218d 100644
--- a/pkgs/games/cutemaze/default.nix
+++ b/pkgs/games/cutemaze/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, qmake, qttools, qtsvg, mkDerivation }:
mkDerivation rec {
- name = "cutemaze-${version}";
+ pname = "cutemaze";
version = "1.2.5";
src = fetchurl {
- url = "https://gottcode.org/cutemaze/${name}-src.tar.bz2";
+ url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2";
sha256 = "1xrjv3h1bpbji1dl9hkcvmp6qk4j618saffl41455vhrzn170lrj";
};
diff --git a/pkgs/games/cuyo/default.nix b/pkgs/games/cuyo/default.nix
index 19d857a8e78c..24e45719f516 100644
--- a/pkgs/games/cuyo/default.nix
+++ b/pkgs/games/cuyo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, SDL, SDL_mixer, zlib }:
-stdenv.mkDerivation rec {
- name = "cuyo-${version}";
+stdenv.mkDerivation {
+ pname = "cuyo";
version = "2.1.0";
src = fetchurl {
diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix
index 52d3bdd5b79f..117ebcc1ac18 100644
--- a/pkgs/games/devilutionx/default.nix
+++ b/pkgs/games/devilutionx/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "unstable-2019-07-28";
pname = "devilutionx";
diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix
index 8b92c2e9d6fb..441e9f66981c 100644
--- a/pkgs/games/dhewm3/default.nix
+++ b/pkgs/games/dhewm3/default.nix
@@ -2,7 +2,7 @@
, openal, curl }:
stdenv.mkDerivation rec {
- name = "dhewm3-${version}";
+ pname = "dhewm3";
version = "1.5.0";
src = fetchFromGitHub {
diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix
index 6da1e8ffe4b5..7f73e047fd75 100644
--- a/pkgs/games/duckmarines/default.nix
+++ b/pkgs/games/duckmarines/default.nix
@@ -11,8 +11,8 @@ let
desktopItem = makeDesktopItem {
name = "duckmarines";
- exec = "${pname}";
- icon = "${icon}";
+ exec = pname;
+ icon = icon;
comment = "Duck-themed action puzzle video game";
desktopName = "Duck Marines";
genericName = "duckmarines";
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index a77250543107..71024f3d5c91 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -83,8 +83,9 @@ let
fi
'';
- dfhack = stdenv.mkDerivation rec {
- name = "dfhack-base-${version}";
+ dfhack = stdenv.mkDerivation {
+ pname = "dfhack-base";
+ inherit version;
# Beware of submodules
src = fetchFromGitHub {
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 652e4c184753..bcef336f342a 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -2,7 +2,7 @@
, qtdeclarative, cmake, texlive, ninja }:
stdenv.mkDerivation rec {
- name = "dwarf-therapist-${version}";
+ pname = "dwarf-therapist";
version = "41.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index e3005373b95f..6871a611784c 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -7,7 +7,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dwarf-therapist-${dwarf-therapist.version}";
wrapper = ./dwarf-therapist.in;
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index b5c80a0a56dc..291e32b6406c 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -18,12 +18,12 @@ let
# Other srcs are avilable like 32-bit mac & win, but I have only
# included the ones most likely to be needed by Nixpkgs users.
platforms = {
- "x86_64-linux" = "linux";
- "i686-linux" = "linux32";
- "x86_64-darwin" = "osx";
- "i686-darwin" = "osx32";
- "x86_64-cygwin" = "win";
- "i686-cygwin" = "win32";
+ x86_64-linux = "linux";
+ i686-linux = "linux32";
+ x86_64-darwin = "osx";
+ i686-darwin = "osx32";
+ x86_64-cygwin = "win";
+ i686-cygwin = "win32";
};
dfVersionTriple = splitString "." dfVersion;
diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix
index caa9adeefd06..a59c87306903 100644
--- a/pkgs/games/dwarf-fortress/soundsense.nix
+++ b/pkgs/games/dwarf-fortress/soundsense.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
version = "2016-1_196";
dfVersion = "0.44.12";
inherit soundPack;
- name = "soundsense-${version}";
+ pname = "soundsense";
src = fetchzip {
url = "http://df.zweistein.cz/soundsense/soundSense_${version}.zip";
sha256 = "1gkrs69l3xsh858yjp204ddp29m668j630akm7arssc9359wxqkk";
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
index e1f8e8abab80..e191d372704b 100644
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -44,7 +44,7 @@ let
in
stdenvNoCC.mkDerivation rec {
- name = "twbt-${version}";
+ pname = "twbt";
version = release.twbtRelease;
src = fetchurl {
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 06bc6ca1fe51..31b21c5a4351 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -80,7 +80,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dwarf-fortress-${dwarf-fortress.dfVersion}";
dfInit = substituteAll {
diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix
index 86d233b03785..518b63ed483c 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/games/dxx-rebirth/default.nix
@@ -9,7 +9,7 @@ let
};
in stdenv.mkDerivation rec {
- name = "dxx-rebirth-${version}";
+ pname = "dxx-rebirth";
version = "0.59.100";
src = fetchurl {
diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/games/dxx-rebirth/full.nix
index 020a4593de24..7a1e690c39df 100644
--- a/pkgs/games/dxx-rebirth/full.nix
+++ b/pkgs/games/dxx-rebirth/full.nix
@@ -2,7 +2,7 @@
, dxx-rebirth, descent1-assets, descent2-assets }:
let
- generic = ver: assets: stdenv.mkDerivation rec {
+ generic = ver: assets: stdenv.mkDerivation {
name = "d${toString ver}x-rebirth-full-${assets.version}";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix
index 68dbe12bb733..dfa57a728649 100644
--- a/pkgs/games/easyrpg-player/default.nix
+++ b/pkgs/games/easyrpg-player/default.nix
@@ -4,7 +4,7 @@
, mpg123 ? null, opusfile ? null, pcre, pixman, SDL2_mixer, speexdsp ? null, wildmidi ? null, zlib }:
stdenv.mkDerivation rec {
- name = "easyrpg-player-${version}";
+ pname = "easyrpg-player";
version = "0.6.1";
src = fetchFromGitHub {
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index 3407659d977b..2999da8fcaaf 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -18,7 +18,8 @@ let
wrapper = "eduke32-wrapper";
in stdenv.mkDerivation {
- name = "eduke32-${version}";
+ pname = "eduke32";
+ inherit version;
src = fetchurl {
url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}.tar.xz";
diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix
index 6815041c96b4..cee9be00a3ab 100644
--- a/pkgs/games/empty-epsilon/default.nix
+++ b/pkgs/games/empty-epsilon/default.nix
@@ -8,8 +8,8 @@ let
version = "${major}.${minor}.${patch}";
- serious-proton = stdenv.mkDerivation rec {
- name = "serious-proton-${version}";
+ serious-proton = stdenv.mkDerivation {
+ pname = "serious-proton";
inherit version;
src = fetchFromGitHub {
@@ -34,8 +34,8 @@ let
in
-stdenv.mkDerivation rec {
- name = "empty-epsilon-${version}";
+stdenv.mkDerivation {
+ pname = "empty-epsilon";
inherit version;
src = fetchFromGitHub {
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
index 447724a2043f..14bea8185c6f 100644
--- a/pkgs/games/endless-sky/default.nix
+++ b/pkgs/games/endless-sky/default.nix
@@ -6,8 +6,9 @@ let
version = "0.9.8";
in
-stdenv.mkDerivation rec {
- name = "endless-sky-${version}";
+stdenv.mkDerivation {
+ pname = "endless-sky";
+ inherit version;
src = fetchFromGitHub {
owner = "endless-sky";
diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix
index 742ca9591357..af002a690e4d 100644
--- a/pkgs/games/enyo-doom/default.nix
+++ b/pkgs/games/enyo-doom/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, cmake, qtbase }:
stdenv.mkDerivation rec {
- name = "enyo-doom-${version}";
+ pname = "enyo-doom";
version = "1.06.9";
src = fetchFromGitLab {
diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix
index 911308a078a5..49339e5619db 100644
--- a/pkgs/games/eternity-engine/default.nix
+++ b/pkgs/games/eternity-engine/default.nix
@@ -1,12 +1,12 @@
{ stdenv, cmake, libGL, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }:
stdenv.mkDerivation rec {
- name = "eternity-engine-${version}";
+ pname = "eternity-engine";
version = "3.42.02";
src = fetchFromGitHub {
owner = "team-eternity";
repo = "eternity";
- rev = "${version}";
+ rev = version;
sha256 = "00kpq4k23hjmzjaymw3sdda7mqk8fjq6dzf7fmdal9fm7lfmj41k";
};
diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index fba1ce01c45a..30788c7ec5c8 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
version = "0.7.5";
- name = "extremetuxracer-${version}";
+ pname = "extremetuxracer";
src = fetchurl {
url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz";
diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix
index 85433e116fbc..e06975e8db41 100644
--- a/pkgs/games/ezquake/default.nix
+++ b/pkgs/games/ezquake/default.nix
@@ -3,7 +3,6 @@
, pkgconfig, SDL2, vim }:
stdenv.mkDerivation rec {
- name = pname + "-" + version;
pname = "ezquake";
version = "3.0.1";
diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix
index 1aab0933b1bf..44ed91da1685 100644
--- a/pkgs/games/fairymax/default.nix
+++ b/pkgs/games/fairymax/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "fairymax-${version}";
+ pname = "fairymax";
version = "4.8";
src = fetchurl {
url = "http://home.hccnet.nl/h.g.muller/fmax4_8w.c";
diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix
index 2ab6e04e2d82..47f72c52c1f0 100644
--- a/pkgs/games/fish-fillets-ng/default.nix
+++ b/pkgs/games/fish-fillets-ng/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, SDL, lua5_1, pkgconfig, SDL_mixer, SDL_image, SDL_ttf}:
stdenv.mkDerivation rec {
- name = "fish-fillets-ng-${version}";
+ pname = "fish-fillets-ng";
version = "1.0.1";
src = fetchurl {
url = "mirror://sourceforge/fillets/fillets-ng-${version}.tar.gz";
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix
index 5a04e75030f6..9266428b5e7b 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/games/flightgear/default.nix
@@ -9,7 +9,8 @@ let
version = "2019.1.1";
shortVersion = builtins.substring 0 6 version;
data = stdenv.mkDerivation rec {
- name = "flightgear-base-${version}";
+ pname = "flightgear-base";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
@@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
desktopItem = makeDesktopItem {
name = "flightgear";
exec = "fgfs";
- icon = "${iconsrc}";
+ icon = iconsrc;
comment = "FlightGear Flight Simulator";
desktopName = "FlightGear";
genericName = "Flight simulator";
diff --git a/pkgs/games/fltrator/default.nix b/pkgs/games/fltrator/default.nix
index ef46ea840b79..957452aa1629 100644
--- a/pkgs/games/fltrator/default.nix
+++ b/pkgs/games/fltrator/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip, fltk, which, libjpeg }:
stdenv.mkDerivation rec {
- name = "fltrator-${version}";
+ pname = "fltrator";
version = "2.3";
src = fetchurl {
diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix
index 35bc22e87897..3ba383c74273 100644
--- a/pkgs/games/freecell-solver/default.nix
+++ b/pkgs/games/freecell-solver/default.nix
@@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec{
- name = "freecell-solver-${version}";
+ pname = "freecell-solver";
version = "4.18.0";
src = fetchurl {
- url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.xz";
+ url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${pname}-${version}.tar.xz";
sha256 = "1cmaib69pijmcpvgjvrdry8j4xys8l906l80b8z21vvyhdwrfdnn";
};
diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix
index d5efe2b3ebd9..3b8bc1288efc 100644
--- a/pkgs/games/freedink/default.nix
+++ b/pkgs/games/freedink/default.nix
@@ -5,10 +5,11 @@ let
version = "1.08.20121209";
freedink_data = stdenv.mkDerivation rec {
- name = "freedink-data-${version}";
+ pname = "freedink-data";
+ inherit version;
src = fetchurl {
- url = "mirror://gnu/freedink/${name}.tar.gz";
+ url = "mirror://gnu/freedink/${pname}-${version}.tar.gz";
sha256 = "1mhns09l1s898x18ahbcy9gabrmgsr8dv7pm0a2ivid8mhxahn1j";
};
@@ -16,10 +17,11 @@ let
};
in stdenv.mkDerivation rec {
- name = "freedink-${version}";
+ pname = "freedink";
+ inherit version;
src = fetchurl {
- url = "mirror://gnu/freedink/${name}.tar.gz";
+ url = "mirror://gnu/freedink/${pname}-${version}.tar.gz";
sha256 = "19xximbcm6506kvpf3s0q96697kmzca3yrjdr6dgphklp33zqsqr";
};
diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix
index 2ebb60f3d5db..281691d283d7 100644
--- a/pkgs/games/freedroidrpg/default.nix
+++ b/pkgs/games/freedroidrpg/default.nix
@@ -2,8 +2,9 @@
let
version = "0.16.1";
-in stdenv.mkDerivation rec {
- name = "freedroidrpg-${version}";
+in stdenv.mkDerivation {
+ pname = "freedroidrpg";
+ inherit version;
src = fetchurl {
url = "ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${stdenv.lib.versions.majorMinor version}/freedroidRPG-${version}.tar.gz";
diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix
index 125f02005a33..d0f514f239d5 100644
--- a/pkgs/games/freeorion/default.nix
+++ b/pkgs/games/freeorion/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
version = "0.4.8";
- name = "freeorion-${version}";
+ pname = "freeorion";
src = fetchFromGitHub {
owner = "freeorion";
diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix
index dd0707fe5c39..94efe1b650a7 100644
--- a/pkgs/games/freesweep/default.nix
+++ b/pkgs/games/freesweep/default.nix
@@ -2,7 +2,7 @@
updateAutotoolsGnuConfigScriptsHook }:
stdenv.mkDerivation rec {
- name = "freesweep-${version}";
+ pname = "freesweep";
version = "1.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix
index ec2cb9416661..6531d407d219 100644
--- a/pkgs/games/frogatto/data.nix
+++ b/pkgs/games/frogatto/data.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "frogatto-data";
version = "unstable-2018-12-18";
diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix
index 51975c17a8ee..4c5f1af8a9be 100644
--- a/pkgs/games/frogatto/default.nix
+++ b/pkgs/games/frogatto/default.nix
@@ -15,7 +15,7 @@ let
categories = "Application;Game;ArcadeGame;";
};
version = "unstable-2018-12-18";
-in buildEnv rec {
+in buildEnv {
name = "frogatto-${version}";
buildInputs = [ makeWrapper ];
diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix
index 5a01d2512c42..5254ff25b025 100644
--- a/pkgs/games/frogatto/engine.nix
+++ b/pkgs/games/frogatto/engine.nix
@@ -2,7 +2,7 @@
, boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf
, glew, zlib, icu, pkgconfig, cairo, libvpx }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "anura-engine";
version = "unstable-2018-11-28";
diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix
index 3b4fb6842dbb..3dbd7bd928b6 100644
--- a/pkgs/games/frotz/default.nix
+++ b/pkgs/games/frotz/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.44";
- name = "frotz-${version}";
+ pname = "frotz";
src = fetchFromGitHub {
owner = "DavidGriffith";
diff --git a/pkgs/games/galaxis/default.nix b/pkgs/games/galaxis/default.nix
index dd27f96f7d40..f5089b6395f4 100644
--- a/pkgs/games/galaxis/default.nix
+++ b/pkgs/games/galaxis/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec{
- name = "galaxis-${version}";
+ pname = "galaxis";
version = "1.10";
src = fetchurl{
- url = "http://www.catb.org/~esr/galaxis/${name}.tar.gz";
+ url = "http://www.catb.org/~esr/galaxis/${pname}-${version}.tar.gz";
sha256 = "1181x3z4r0794v2bkpigb5fablw1nayj42wvhy2am79p7j1iqq5r";
};
diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix
index dabcfb19db04..6d8d14d8de0d 100644
--- a/pkgs/games/gambatte/default.nix
+++ b/pkgs/games/gambatte/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, scons, qt4 }:
-stdenv.mkDerivation rec {
- name = "gambatte-${version}";
+stdenv.mkDerivation {
+ pname = "gambatte";
version = "2016-05-03";
src = fetchFromGitHub {
diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix
index 066cadb13b17..4c57538e234e 100644
--- a/pkgs/games/garden-of-coloured-lights/default.nix
+++ b/pkgs/games/garden-of-coloured-lights/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoconf, automake, allegro }:
stdenv.mkDerivation rec {
- name = "garden-of-coloured-lights-${version}";
+ pname = "garden-of-coloured-lights";
version = "1.0.9";
buildInputs = [ allegro autoconf automake ];
diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix
index b718a92143cb..3665467407a9 100644
--- a/pkgs/games/gcs/default.nix
+++ b/pkgs/games/gcs/default.nix
@@ -29,10 +29,10 @@ let
sha256 = "085jpp9mpv5kw00zds9sywmfq31mrlbrgahnwcjkx0z9i22amz4g";
};
in stdenv.mkDerivation rec {
- name = "gcs-${version}";
+ pname = "gcs";
version = "4.8.0";
- src = runCommand "${name}-src" { preferLocalBuild = true; } ''
+ src = runCommand "${pname}-${version}-src" { preferLocalBuild = true; } ''
mkdir -p $out
cd $out
diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix
index fc7bf7168ddf..72afca4cd2cf 100644
--- a/pkgs/games/gemrb/default.nix
+++ b/pkgs/games/gemrb/default.nix
@@ -3,7 +3,7 @@
, libiconv }:
stdenv.mkDerivation rec {
- name = "gemrb-${version}";
+ pname = "gemrb";
version = "0.8.5";
src = fetchFromGitHub {
diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix
index b9694811fa51..fb60808bab70 100644
--- a/pkgs/games/gl-117/default.nix
+++ b/pkgs/games/gl-117/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "gl-117-${version}";
+ pname = "gl-117";
version = "1.3.2";
src = fetchurl {
- url = "mirror://sourceforge/project/gl-117/gl-117/GL-117%20Source/${name}.tar.bz2";
+ url = "mirror://sourceforge/project/gl-117/gl-117/GL-117%20Source/${pname}-${version}.tar.bz2";
sha256 = "1yvg1rp1yijv0b45cz085b29x5x0g5fkm654xdv5qwh2l6803gb4";
};
diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix
index 7a720239182d..6212c1bbec19 100644
--- a/pkgs/games/gnome-hexgl/default.nix
+++ b/pkgs/games/gnome-hexgl/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "gnome-hexgl";
- version = "unstable-2019-08-21";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "alexlarsson";
repo = "gnome-hexgl";
- rev = "c6edde1250b830c7c8ee738905cb39abef67d4a6";
- sha256 = "17j236damqij8n4a37psvkfxbbc18yw03s3hs0qxgfhl4671wf6z";
+ rev = version;
+ sha256 = "08iy2iciscd2wbhh6v4cpghx8r94v1ffbgla9yb3bcsdhlag0iw4";
};
nativeBuildInputs = [
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Gthree port of HexGL";
- homepage = https://github.com/alexlarsson/gnome-hexgl;
+ homepage = "https://github.com/alexlarsson/gnome-hexgl";
license = licenses.mit;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix
index 62c5ee803047..43c60c667305 100644
--- a/pkgs/games/gnuchess/default.nix
+++ b/pkgs/games/gnuchess/default.nix
@@ -12,7 +12,7 @@ let
flex
];
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (s) name version;
src = fetchurl {
inherit (s) url sha256;
diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix
index 2952edaa78d9..fa8d59c05030 100644
--- a/pkgs/games/gnugo/default.nix
+++ b/pkgs/games/gnugo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "gnugo-${version}";
+ pname = "gnugo";
version = "3.8";
src = fetchurl {
diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix
index 64c3954ba485..4bf460836d98 100644
--- a/pkgs/games/gnujump/default.nix
+++ b/pkgs/games/gnujump/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, SDL, SDL_image, SDL_mixer }:
stdenv.mkDerivation rec {
- name = "gnujump-${version}";
+ pname = "gnujump";
version = "1.0.8";
src = fetchurl {
- url = "mirror://gnu/gnujump/${name}.tar.gz";
+ url = "mirror://gnu/gnujump/${pname}-${version}.tar.gz";
sha256 = "05syy9mzbyqcfnm0hrswlmhwlwx54f0l6zhcaq8c1c0f8dgzxhqk";
};
buildInputs = [ SDL SDL_image SDL_mixer ];
diff --git a/pkgs/games/gnushogi/default.nix b/pkgs/games/gnushogi/default.nix
index e85674550308..381b4fd59593 100644
--- a/pkgs/games/gnushogi/default.nix
+++ b/pkgs/games/gnushogi/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
- name = "gnushogi-${version}";
+ pname = "gnushogi";
version = "1.4.2";
buildInputs = [ zlib ];
src = fetchurl {
- url = "mirror://gnu/gnushogi/${name}.tar.gz";
+ url = "mirror://gnu/gnushogi/${pname}-${version}.tar.gz";
sha256 = "0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y";
};
diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix
index e89d16b788a6..f9ae137bb626 100644
--- a/pkgs/games/gogui/default.nix
+++ b/pkgs/games/gogui/default.nix
@@ -3,7 +3,8 @@
let
version = "1.4.9";
in stdenv.mkDerivation {
- name = "gogui-${version}";
+ pname = "gogui";
+ inherit version;
buildInputs = [ unzip makeWrapper ];
src = fetchurl {
url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip";
diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix
index fc73f89f66c0..f9dd851af8e9 100644
--- a/pkgs/games/gscrabble/default.nix
+++ b/pkgs/games/gscrabble/default.nix
@@ -2,7 +2,7 @@
, gtk3, wrapGAppsHook, gst_all_1, gobject-introspection
, python3Packages, gnome3, hicolor-icon-theme }:
-buildPythonApplication rec {
+buildPythonApplication {
pname = "gscrabble";
version = "unstable-2019-03-11";
diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix
index b29b045a4217..6031762d1d6b 100644
--- a/pkgs/games/gtypist/default.nix
+++ b/pkgs/games/gtypist/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, makeWrapper, libiconv, ncurses, perl, fortune}:
stdenv.mkDerivation rec {
- name = "gtypist-${version}";
+ pname = "gtypist";
version = "2.9.5";
src = fetchurl {
diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 043be5e23d9b..3ccbdf525ce0 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -3,7 +3,7 @@
, bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }:
stdenv.mkDerivation rec {
- name = "gzdoom-${version}";
+ pname = "gzdoom";
version = "4.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix
index 470e1d090fcd..a770e452ae4c 100644
--- a/pkgs/games/hawkthorne/default.nix
+++ b/pkgs/games/hawkthorne/default.nix
@@ -1,8 +1,8 @@
{ fetchgit, stdenv, love, curl, zip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.12.1";
- name = "hawkthorne-${version}";
+ pname = "hawkthorne";
src = fetchgit {
url = "https://github.com/hawkthorne/hawkthorne-journey.git";
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index ea229db6a747..b3764ea1efc8 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -9,9 +9,9 @@ let
SHA entropy pkgs.zlib sandi regex-tdfa
]);
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.0.0-beta1";
- name = "hedgewars-${version}";
+ pname = "hedgewars";
src = fetchhg {
url = "https://hg.hedgewars.org/hedgewars/";
rev = "7ab5cf405686";
diff --git a/pkgs/games/holdingnuts/default.nix b/pkgs/games/holdingnuts/default.nix
index e6d6febeac6f..c20cce723c26 100644
--- a/pkgs/games/holdingnuts/default.nix
+++ b/pkgs/games/holdingnuts/default.nix
@@ -2,12 +2,11 @@
let mirror = "http://download.holdingnuts.net";
in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "holdingnuts";
version = "0.0.5";
src = fetchurl {
- url = "${mirror}/release/${version}/${name}.tar.bz2";
+ url = "${mirror}/release/${version}/${pname}-${version}.tar.bz2";
sha256 = "0iw25jmnqzscg34v66d4zz70lvgjp4l7gi16nna6491xnqha5a8g";
};
diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix
index 760d82c026d2..b4f5e4f7f630 100644
--- a/pkgs/games/hyperrogue/default.nix
+++ b/pkgs/games/hyperrogue/default.nix
@@ -2,7 +2,7 @@
libpng, glew, makeDesktopItem }:
stdenv.mkDerivation rec {
- name = "hyperrogue-${version}";
+ pname = "hyperrogue";
version = "10.5e";
src = fetchFromGitHub {
diff --git a/pkgs/games/instead-launcher/default.nix b/pkgs/games/instead-launcher/default.nix
index 39324843e5e5..10d29657d7cf 100644
--- a/pkgs/games/instead-launcher/default.nix
+++ b/pkgs/games/instead-launcher/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, instead, qmake4Hook, zlib }:
stdenv.mkDerivation rec {
- name = "instead-launcher-${version}";
+ pname = "instead-launcher";
version = "0.7.0";
diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index b0acd789afee..b25341da01d8 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -28,7 +28,7 @@ let
];
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "instead-" + version;
src = fetchurl {
diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix
index f84b83a3010d..86f3f7214466 100644
--- a/pkgs/games/ivan/default.nix
+++ b/pkgs/games/ivan/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "ivan-${version}";
+ pname = "ivan";
version = "056";
src = fetchFromGitHub {
diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix
index 37c45e7aa603..fa0720e51fd9 100644
--- a/pkgs/games/ja2-stracciatella/default.nix
+++ b/pkgs/games/ja2-stracciatella/default.nix
@@ -26,8 +26,8 @@ let
doCheck = false;
};
in
-stdenv.mkDerivation rec {
- name = "ja2-stracciatella-${version}";
+stdenv.mkDerivation {
+ pname = "ja2-stracciatella";
inherit src;
inherit version;
diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix
index 4cea30c79e6d..e2a4cff291ba 100644
--- a/pkgs/games/klavaro/default.nix
+++ b/pkgs/games/klavaro/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, curl, gtk3 }:
stdenv.mkDerivation rec {
- name = "klavaro-${version}";
+ pname = "klavaro";
version = "3.08";
src = fetchurl {
- url = "mirror://sourceforge/klavaro/${name}.tar.bz2";
+ url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2";
sha256 = "0qmvr6d8wshwp0xvk5wbig4vlzxzcxrakhyhd32v8v3s18nhqsrc";
};
diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix
index b5f858b99ad7..0e6941a8acd5 100644
--- a/pkgs/games/lbreakout2/default.nix
+++ b/pkgs/games/lbreakout2/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintl }:
stdenv.mkDerivation rec {
- name = "lbreakout2-${version}";
+ pname = "lbreakout2";
version = "2.6.5";
buildInputs = [ SDL SDL_mixer zlib libpng libintl ];
src = fetchurl {
- url = "mirror://sourceforge/lgames/${name}.tar.gz";
+ url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i";
};
diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix
index d00072d24551..d4621682cc67 100644
--- a/pkgs/games/leela-zero/default.nix
+++ b/pkgs/games/leela-zero/default.nix
@@ -2,7 +2,7 @@
, opencl-headers, ocl-icd, qtbase , zlib }:
stdenv.mkDerivation rec {
- name = "leela-zero-${version}";
+ pname = "leela-zero";
version = "0.17";
src = fetchFromGitHub {
diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix
index daf7dd7f61f4..505d98c92dbe 100644
--- a/pkgs/games/lgogdownloader/default.nix
+++ b/pkgs/games/lgogdownloader/default.nix
@@ -2,7 +2,7 @@
, htmlcxx, rhash, tinyxml-2, help2man }:
stdenv.mkDerivation rec {
- name = "lgogdownloader-${version}";
+ pname = "lgogdownloader";
version = "3.5";
src = fetchFromGitHub {
diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix
index fef6e11d9be9..0811c01aa791 100644
--- a/pkgs/games/liberal-crime-squad/default.nix
+++ b/pkgs/games/liberal-crime-squad/default.nix
@@ -1,8 +1,8 @@
{ fetchFromGitHub, stdenv, autoreconfHook, libiconv, ncurses, SDL2, SDL2_mixer }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2016-07-06";
- name = "liberal-crime-squad-${version}";
+ pname = "liberal-crime-squad";
src = fetchFromGitHub {
owner = "Kamal-Sadek";
diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix
index 0abbfda33c7b..fb98b1a3811b 100644
--- a/pkgs/games/lincity/default.nix
+++ b/pkgs/games/lincity/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libICE, libSM, libpng12, zlib }:
stdenv.mkDerivation rec {
- name = "lincity-${version}";
+ pname = "lincity";
version = "1.13.1";
src = fetchurl {
- url = "mirror://sourceforge/lincity/${name}.tar.gz";
+ url = "mirror://sourceforge/lincity/${pname}-${version}.tar.gz";
sha256 = "0p81wl7labyfb6rgp0hi42l2akn3n7r2bnxal1wyvjylzw8vsk3v";
};
diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix
index b860d2ee58b1..3ec508040e7a 100644
--- a/pkgs/games/lincity/ng.nix
+++ b/pkgs/games/lincity/ng.nix
@@ -3,8 +3,8 @@
, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs
}:
-stdenv.mkDerivation rec {
- name = "lincity-ng-${version}";
+stdenv.mkDerivation {
+ pname = "lincity-ng";
version = "2.9beta.20170715";
src = fetchFromGitHub {
diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix
index 1fcf9c9527bd..a3c9599e7b1d 100644
--- a/pkgs/games/linux-steam-integration/default.nix
+++ b/pkgs/games/linux-steam-integration/default.nix
@@ -4,8 +4,9 @@
let
version = "0.7.3";
-in stdenv.mkDerivation rec {
- name = "linux-steam-integration-${version}";
+in stdenv.mkDerivation {
+ pname = "linux-steam-integration";
+ inherit version;
src = fetchFromGitHub {
owner = "clearlinux";
diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix
index d748c96da242..a4bd39f99982 100644
--- a/pkgs/games/liquidwar/5.nix
+++ b/pkgs/games/liquidwar/5.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, allegro }:
stdenv.mkDerivation rec {
version = "5.6.4";
- name = "liquidwar5-${version}";
+ pname = "liquidwar5";
src = fetchurl {
url = "https://download.savannah.gnu.org/releases/liquidwar/liquidwar-${version}.tar.gz";
sha256 = "18wkbfzp07yckg05b5gjy67rw06z9lxp0hzg0zwj7rz8i12jxi9j";
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
+ NIX_CFLAGS_COMPILE = [ "-lm" ];
+
meta = with stdenv.lib; {
description = ''The classic version of a quick tactics game LiquidWar'';
maintainers = [ maintainers.raskin ];
diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index af7101f216d5..800ac0fc4c7a 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -6,11 +6,11 @@
, libogg, libvorbis, libcaca, csound, cunit } :
stdenv.mkDerivation rec {
- name = "liquidwar6-${version}";
+ pname = "liquidwar6";
version = "0.6.3902";
src = fetchurl {
- url = "mirror://gnu/liquidwar6/${name}.tar.gz";
+ url = "mirror://gnu/liquidwar6/${pname}-${version}.tar.gz";
sha256 = "1976nnl83d8wspjhb5d5ivdvdxgb8lp34wp54jal60z4zad581fn";
};
diff --git a/pkgs/games/ltris/default.nix b/pkgs/games/ltris/default.nix
index 10a79a696732..d580d7586ff9 100644
--- a/pkgs/games/ltris/default.nix
+++ b/pkgs/games/ltris/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, SDL, SDL_mixer }:
stdenv.mkDerivation rec {
- name = "ltris-${version}";
+ pname = "ltris";
version = "1.0.19";
buildInputs = [ SDL SDL_mixer ];
src = fetchurl {
- url = "mirror://sourceforge/lgames/${name}.tar.gz";
+ url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
sha256 = "1895wv1fqklrj4apkz47rnkcfhfav7zjknskw6p0886j35vrwslg";
};
diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix
index da711f59af02..ed0b2be0d978 100644
--- a/pkgs/games/mar1d/default.nix
+++ b/pkgs/games/mar1d/default.nix
@@ -18,7 +18,7 @@
}:
stdenv.mkDerivation rec {
- name = "MAR1D-${version}";
+ pname = "MAR1D";
version = "0.2.0";
options = "-w${toString width}"
+ " -s${toString sensitivity}"
diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix
index de67afe45a94..14e0d881e095 100644
--- a/pkgs/games/megaglest/default.nix
+++ b/pkgs/games/megaglest/default.nix
@@ -17,12 +17,13 @@ let
};
in
stdenv.mkDerivation {
- name = "megaglest-${version}";
+ pname = "megaglest";
+ inherit version;
src = fetchFromGitHub {
owner = "MegaGlest";
repo = "megaglest-source";
- rev = "${version}";
+ rev = version;
fetchSubmodules = true;
sha256 = "0fb58a706nic14ss89zrigphvdiwy5s9dwvhscvvgrfvjpahpcws";
};
diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix
index 21d2ad87dfb8..4a37fc8f6767 100644
--- a/pkgs/games/meritous/default.nix
+++ b/pkgs/games/meritous/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }:
-stdenv.mkDerivation rec {
- name = "meritous-${version}";
+stdenv.mkDerivation {
+ pname = "meritous";
version = "1.4";
src = fetchFromGitLab {
diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 4fd44880b827..2fde729e935e 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, jre }:
-stdenv.mkDerivation rec {
- name = "minecraft-server-${version}";
+stdenv.mkDerivation {
+ pname = "minecraft-server";
version = "1.14.4";
src = fetchurl {
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 17366ae99040..52a911655373 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -24,7 +24,8 @@ let
};
};
in stdenv.mkDerivation {
- name = "minetest-${version}";
+ pname = "minetest";
+ inherit version;
src = sources.src;
diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix
index aa4a06bc7d2b..e8138f812322 100644
--- a/pkgs/games/mrrescue/default.nix
+++ b/pkgs/games/mrrescue/default.nix
@@ -11,8 +11,8 @@ let
desktopItem = makeDesktopItem {
name = "mrrescue";
- exec = "${pname}";
- icon = "${icon}";
+ exec = pname;
+ icon = icon;
comment = "Arcade-style fire fighting game";
desktopName = "Mr. Rescue";
genericName = "mrrescue";
@@ -21,7 +21,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix
index dab83ddc900d..d2646bf8d67e 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/games/mudlet/default.nix
@@ -1,46 +1,56 @@
-{ fetchurl, unzip, stdenv, makeWrapper, qtbase, yajl, libzip, hunspell
-, boost, lua5_1, luafilesystem, luazip, lrexlib-pcre, luasql-sqlite3, qmake }:
+{ fetchFromGitHub, fetchpatch, stdenv, wrapQtAppsHook, pcre, pugixml, qtbase, qtmultimedia, qttools, yajl, libzip, hunspell
+, boost, libGLU, lua, cmake, which, }:
+let
+ luaEnv = lua.withPackages(ps: with ps; [ luazip luafilesystem lrexlib-pcre luasql-sqlite3 lua-yajl luautf8 ]);
+in
stdenv.mkDerivation rec {
- name = "mudlet-${version}";
- version = "3.0.0-delta";
+ pname = "mudlet";
+ version = "4.1.2";
- src = fetchurl {
- url = "https://github.com/Mudlet/Mudlet/archive/Mudlet-${version}.tar.gz";
- sha256 = "08fhqd323kgz5s17ac5z9dhkjxcmwvcmvhzy0x1vw4rayhijfrd7";
+ src = fetchFromGitHub {
+ owner = "Mudlet";
+ repo = "Mudlet";
+ rev = "Mudlet-${version}";
+ fetchSubmodules = true;
+ sha256 = "1d6r51cj8a71hmhzsayd2far4hliwz5pnrsaj3dn39m7c0iikgdn";
};
- nativeBuildInputs = [ makeWrapper qmake ];
+ nativeBuildInputs = [ cmake wrapQtAppsHook qttools which ];
buildInputs = [
- unzip qtbase lua5_1 hunspell libzip yajl boost
- luafilesystem luazip lrexlib-pcre luasql-sqlite3
+ pcre pugixml qtbase qtmultimedia luaEnv libzip libGLU yajl boost hunspell
];
- preConfigure = "cd src";
+ WITH_FONTS = "NO";
+ WITH_UPDATER = "NO";
- installPhase = let
- luaZipPath = "${luazip}/lib/lua/5.1/?.so";
- luaFileSystemPath = "${luafilesystem}/lib/lua/5.1/?.so";
- lrexlibPath = "${lrexlib-pcre}/lib/lua/5.1/?.so";
- luasqlitePath = "${luasql-sqlite3}/lib/lua/5.1/?.so";
- in ''
+ enableParallelBuilding = true;
+
+ installPhase = ''
+ mkdir -pv $out/lib
+ cp 3rdparty/edbee-lib/edbee-lib/qslog/lib/libQsLog.so $out/lib
mkdir -pv $out/bin
- cp mudlet $out
- cp -r mudlet-lua $out
+ cp src/mudlet $out
+ mkdir -pv $out/share/mudlet
+ cp -r ../src/mudlet-lua/lua $out/share/mudlet/
- makeWrapper $out/mudlet $out/bin/mudlet \
- --set LUA_CPATH "${luaFileSystemPath};${luaZipPath};${lrexlibPath};${luasqlitePath}" \
+ mkdir -pv $out/share/applications
+ cp ../mudlet.desktop $out/share/applications/
+
+ mkdir -pv $out/share/pixmaps
+ cp -r ../mudlet.png $out/share/pixmaps/
+
+ makeQtWrapper $out/mudlet $out/bin/mudlet \
+ --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
+ --prefix LUA_PATH : "$NIX_LUA_PATH" \
--run "cd $out";
'';
- patches = [ ./libs.patch ];
-
- meta = {
+ meta = with stdenv.lib; {
description = "Crossplatform mud client";
homepage = http://mudlet.org/;
- maintainers = [ stdenv.lib.maintainers.wyvie ];
- platforms = stdenv.lib.platforms.linux;
- license = stdenv.lib.licenses.gpl2;
- broken = true;
+ maintainers = [ maintainers.wyvie maintainers.pstn ];
+ platforms = platforms.linux;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/games/mudlet/libs.patch b/pkgs/games/mudlet/libs.patch
deleted file mode 100644
index 45b693828ff2..000000000000
--- a/pkgs/games/mudlet/libs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/src.pro 2014-09-05 12:51:09.000000000 +0400
-+++ b/src/src.pro 2014-09-15 16:54:34.812560065 +0400
-@@ -85,8 +85,8 @@
- # Again according to FHS /usr/local/share/games is the corresponding place for locally built games documentation:
- isEmpty( DOCDIR ) DOCDIR = $${DATAROOTDIR}/doc/mudlet
- LIBS += -lpcre \
-- -llua5.1 \
-- -lhunspell \
-+ -llua \
-+ -lhunspell-1.6 \
- -L/usr/local/lib/ \
- -lyajl \
- -lGLU \
diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix
index 50f96a7ee2c8..daba54ce810e 100644
--- a/pkgs/games/neverball/default.nix
+++ b/pkgs/games/neverball/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libpng SDL2 libGL libjpeg SDL2_ttf libvorbis gettext physfs ];
- dontPatchElf = true;
+ dontPatchELF = true;
patchPhase = ''
sed -i -e 's@\./data@'$out/share/neverball/data@ share/base_config.h Makefile
diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix
index c806dfa5b806..a0ae03cefb75 100644
--- a/pkgs/games/newtonwars/default.nix
+++ b/pkgs/games/newtonwars/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU_combined }:
-stdenv.mkDerivation rec {
- name = "newtonwars-${version}";
+stdenv.mkDerivation {
+ pname = "newtonwars";
version = "20150609";
src = fetchFromGitHub {
diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix
index 39b3ae36f506..72235d9131bc 100644
--- a/pkgs/games/nexuiz/default.nix
+++ b/pkgs/games/nexuiz/default.nix
@@ -11,9 +11,10 @@
let
version = "2.5.2";
- version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}";
+ version_short = stdenv.lib.replaceChars [ "." ] [ "" ] version;
in stdenv.mkDerivation {
- name = "nexuiz-${version}";
+ pname = "nexuiz";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/nexuiz/nexuiz-${version_short}.zip";
diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix
index bcbbc9e7756b..6f700ad32045 100644
--- a/pkgs/games/njam/default.nix
+++ b/pkgs/games/njam/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "njam-1.25";
src = fetchurl {
diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix
index c70744ea2991..6c6bb9f78bab 100644
--- a/pkgs/games/odamex/default.nix
+++ b/pkgs/games/odamex/default.nix
@@ -1,6 +1,6 @@
{ stdenv, cmake, fetchurl, pkgconfig, SDL, SDL_mixer, SDL_net }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "odamex-0.7.0";
src = fetchurl {
url = mirror://sourceforge/odamex/odamex-src-0.7.0.tar.bz2;
diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix
index 921ed8a72f33..618e78553a54 100644
--- a/pkgs/games/onscripter-en/default.nix
+++ b/pkgs/games/onscripter-en/default.nix
@@ -3,7 +3,7 @@
, SDL, SDL_image, SDL_mixer, SDL_ttf }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "onscripter-en-20110930";
src = fetchurl {
diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix
index 8ac020f3ce09..141e0151cfbd 100644
--- a/pkgs/games/openarena/default.nix
+++ b/pkgs/games/openarena/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl, openal }:
-stdenv.mkDerivation rec {
- name = "openarena-${version}";
+stdenv.mkDerivation {
+ pname = "openarena";
version = "0.8.8";
src = fetchurl {
diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix
index fa0411196318..cce643e9f7db 100644
--- a/pkgs/games/openclonk/default.nix
+++ b/pkgs/games/openclonk/default.nix
@@ -11,7 +11,7 @@ let
};
in stdenv.mkDerivation rec {
version = "8.1";
- name = "openclonk-${version}";
+ pname = "openclonk";
src = fetchurl {
url = "https://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2";
diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix
index d2f1e27b10ec..751eb6d5933e 100644
--- a/pkgs/games/opendune/default.nix
+++ b/pkgs/games/opendune/default.nix
@@ -7,7 +7,7 @@
# - download dune2 into [datadir] http://www.bestoldgames.net/eng/old-games/dune-2.php
stdenv.mkDerivation rec {
- name = "opendune-${version}";
+ pname = "opendune";
version = "0.9";
src = fetchFromGitHub {
diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix
index 3c4e85a91e5a..d59afc330a79 100644
--- a/pkgs/games/opendungeons/default.nix
+++ b/pkgs/games/opendungeons/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ogre, cegui, boost, sfml, openal, cmake, ois, pkgconfig }:
stdenv.mkDerivation rec {
- name = "opendungeons-${version}";
+ pname = "opendungeons";
version = "0.7.1";
src = fetchFromGitHub {
diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix
index 1da23a98f71f..9109d2667c3f 100644
--- a/pkgs/games/openjk/default.nix
+++ b/pkgs/games/openjk/default.nix
@@ -19,7 +19,7 @@ let
genericName = "Jedi Academy";
categories = "Game;";
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "OpenJK";
version = "2019-06-24";
diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index 8cfcb1478288..d9c992199c40 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -12,12 +12,12 @@ let
});
in mkDerivation rec {
version = "0.45.0";
- name = "openmw-${version}";
+ pname = "openmw";
src = fetchFromGitHub {
owner = "OpenMW";
repo = "openmw";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "1r87zrsnza2v9brksh809zzqj6zhk5xj15qs8iq11v1bscm2a2j4";
};
diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index e7636e8320e7..d546ff8481e4 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -28,7 +28,7 @@ let
sha256 = "1yb1ynkfmiankii3fngr9km5wbc07rp30nh0apkj6wryrhy7imgm";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit name;
src = openrct2-src;
diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix
index 63fb24dc4d7d..f35077c084aa 100644
--- a/pkgs/games/openrw/default.nix
+++ b/pkgs/games/openrw/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, xlibsWrapper, openal
, SDL2, boost, ffmpeg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2017-09-17";
- name = "openrw-${version}";
+ pname = "openrw";
src = fetchgit {
url = "https://github.com/rwengine/openrw";
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index e0acf60144ed..de05e1944f39 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "openspades-${version}";
+ pname = "openspades";
version = "0.1.3";
devPakVersion = "33";
diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 91969a335f8f..e3c23ad26716 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -28,11 +28,11 @@ let
in
stdenv.mkDerivation rec {
- name = "openttd-${version}";
+ pname = "openttd";
version = "1.9.2";
src = fetchurl {
- url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${name}-source.tar.xz";
+ url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
sha256 = "0jjnnzp1a2l8j1cla28pr460lx6cg4ql3acqfxhxv8a5a4jqrzzr";
};
diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix
index c91f9807581e..2dae58df9765 100644
--- a/pkgs/games/opentyrian/default.nix
+++ b/pkgs/games/opentyrian/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, fetchzip, SDL, SDL_net}:
stdenv.mkDerivation rec {
- name = "opentyrian-${version}";
+ pname = "opentyrian";
version = "2.1.20130907";
src = fetchurl {
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index 211172cee203..9b3d92a350d3 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -3,7 +3,8 @@
let version = "1.0.0.2018.10.08"; in
stdenv.mkDerivation {
- name = "openxcom-${version}";
+ pname = "openxcom";
+ inherit version;
src = fetchFromGitHub {
owner = "SupSuper";
repo = "OpenXcom";
diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix
index 377dc8652292..97fb3ebd19fa 100644
--- a/pkgs/games/orthorobot/default.nix
+++ b/pkgs/games/orthorobot/default.nix
@@ -11,8 +11,8 @@ let
desktopItem = makeDesktopItem {
name = "orthorobot";
- exec = "${pname}";
- icon = "${icon}";
+ exec = pname;
+ icon = icon;
comment = "Robot game";
desktopName = "Orthorobot";
genericName = "orthorobot";
@@ -21,7 +21,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/games/pacvim/default.nix b/pkgs/games/pacvim/default.nix
index 59e7c874d141..d7805ad66fb5 100644
--- a/pkgs/games/pacvim/default.nix
+++ b/pkgs/games/pacvim/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ncurses }:
-stdenv.mkDerivation rec {
- name = "pacvim-${version}";
+stdenv.mkDerivation {
+ pname = "pacvim";
version = "2018-05-16";
src = fetchFromGitHub {
owner = "jmoon018";
diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix
index c73c346512f9..28487a7f8e8a 100644
--- a/pkgs/games/performous/default.nix
+++ b/pkgs/games/performous/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "performous-${version}";
+ pname = "performous";
version = "1.1";
meta = with stdenv.lib; {
diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix
index 6beb68b97abc..dc47e5aa58e8 100644
--- a/pkgs/games/pingus/default.nix
+++ b/pkgs/games/pingus/default.nix
@@ -2,7 +2,7 @@
, pkgconfig, libGLU_combined}:
let
s = # Generated upstream information
- rec {
+ {
baseName="pingus";
version="0.7.6";
name="pingus-0.7.6";
@@ -11,7 +11,7 @@ let
sha256="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (s) name version;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [scons SDL SDL_image boost libpng SDL_mixer libGLU_combined];
diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix
index 6991735962d7..4cfd7de6a55f 100644
--- a/pkgs/games/pro-office-calculator/default.nix
+++ b/pkgs/games/pro-office-calculator/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }:
stdenv.mkDerivation rec {
version = "1.0.13";
- name = "pro-office-calculator-${version}";
+ pname = "pro-office-calculator";
src = fetchFromGitHub {
owner = "RobJinman";
diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix
index 924101c2d4a8..610be7efdce9 100644
--- a/pkgs/games/qgo/default.nix
+++ b/pkgs/games/qgo/default.nix
@@ -7,8 +7,8 @@
, qttranslations
}:
-stdenv.mkDerivation rec {
- name = "qgo-${version}";
+stdenv.mkDerivation {
+ pname = "qgo";
version = "unstable-2017-12-18";
meta = with stdenv.lib; {
diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix
index dfd384761921..f161f53bfe1e 100644
--- a/pkgs/games/qqwing/default.nix
+++ b/pkgs/games/qqwing/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, perl, autoconf, automake, libtool }:
stdenv.mkDerivation rec {
- name = "qqwing-${version}";
+ pname = "qqwing";
version = "1.3.4";
src = fetchFromGitHub {
diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix
index 1564ba19bd2e..c831163be970 100644
--- a/pkgs/games/quake2/yquake2/default.nix
+++ b/pkgs/games/quake2/yquake2/default.nix
@@ -14,7 +14,7 @@ let
wrapper = import ./wrapper.nix { inherit stdenv lib buildEnv makeWrapper yquake2; };
yquake2 = stdenv.mkDerivation rec {
- name = "yquake2-${version}";
+ pname = "yquake2";
version = "7.30";
src = fetchFromGitHub {
@@ -66,7 +66,7 @@ let
};
};
-in rec {
+in {
inherit yquake2;
yquake2-ctf = wrapper {
diff --git a/pkgs/games/quake3/content/demo.nix b/pkgs/games/quake3/content/demo.nix
index 88ba8679e8a7..0d8a64f14cdc 100644
--- a/pkgs/games/quake3/content/demo.nix
+++ b/pkgs/games/quake3/content/demo.nix
@@ -3,7 +3,8 @@
let
version = "1.11-6";
in stdenv.mkDerivation {
- name = "quake3-demodata-${version}";
+ pname = "quake3-demodata";
+ inherit version;
src = fetchurl {
url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-${version}.x86.gz.sh";
diff --git a/pkgs/games/quake3/content/pointrelease.nix b/pkgs/games/quake3/content/pointrelease.nix
index f35aaaad3527..e34064d93b05 100644
--- a/pkgs/games/quake3/content/pointrelease.nix
+++ b/pkgs/games/quake3/content/pointrelease.nix
@@ -3,7 +3,8 @@
let
version = "1.32b-3";
in stdenv.mkDerivation {
- name = "quake3-pointrelease-${version}";
+ pname = "quake3-pointrelease";
+ inherit version;
src = fetchurl {
url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${version}.x86.run";
diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index 7bc0863a33f8..a592455486b2 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -2,8 +2,8 @@
, curl, speex, opusfile, libogg, libvorbis, libopus, libjpeg, mumble, freetype
}:
-stdenv.mkDerivation rec {
- name = "ioquake3-git-${version}";
+stdenv.mkDerivation {
+ pname = "ioquake3-git";
version = "2019-05-29";
src = fetchFromGitHub {
diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix
index f61b0e237925..a8d740ea5128 100644
--- a/pkgs/games/quakespasm/default.nix
+++ b/pkgs/games/quakespasm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, SDL, fetchurl, gzip, libvorbis, libmad }:
stdenv.mkDerivation rec {
- name = "quakespasm-${version}";
+ pname = "quakespasm";
majorVersion = "0.93";
version = "${majorVersion}.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1bimv18f6rzhyjz78yvw2vqr5n0kdqbcqmq7cb3m951xgsxfcgpd";
};
- sourceRoot = "${name}/Quake";
+ sourceRoot = "${pname}-${version}/Quake";
buildInputs = [
gzip SDL libvorbis libmad
diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index 4cd073869dc8..114f862888d4 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@@ -1,7 +1,7 @@
{ stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }:
stdenv.mkDerivation rec {
- name = "vkquake-${version}";
+ pname = "vkquake";
majorVersion = "1.01";
version = "${majorVersion}.0";
diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix
index d11315cd6dfa..1347f88cc2cb 100644
--- a/pkgs/games/racer/default.nix
+++ b/pkgs/games/racer/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, allegro, libjpeg, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "racer-1.1";
src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix
index c44072309b19..79d657e668dc 100644
--- a/pkgs/games/residualvm/default.nix
+++ b/pkgs/games/residualvm/default.nix
@@ -9,7 +9,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "0.1.1";
- name = "residualvm-${version}";
+ pname = "residualvm";
src = fetchurl {
url = "mirror://sourceforge/residualvm/residualvm-${version}-sources.tar.bz2";
diff --git a/pkgs/games/rftg/default.nix b/pkgs/games/rftg/default.nix
index b6a74ad8be65..9ab63553053f 100644
--- a/pkgs/games/rftg/default.nix
+++ b/pkgs/games/rftg/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "rftg-${version}";
+ pname = "rftg";
version = "0.9.4";
src = fetchurl {
diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index 274a095de6f4..09550339f83d 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
version = "0.4.7.0";
- name = "rigsofrods-${version}";
+ pname = "rigsofrods";
src = fetchFromGitHub {
owner = "RigsOfRods";
diff --git a/pkgs/games/riko4/default.nix b/pkgs/games/riko4/default.nix
index 7cbfacd0b409..1ddca346fbb7 100644
--- a/pkgs/games/riko4/default.nix
+++ b/pkgs/games/riko4/default.nix
@@ -4,8 +4,8 @@ let
# Newer versions of sdl-gpu don't work with Riko4 (corrupted graphics),
# and this library does not have a proper release version, so let the
# derivation for this stay next to the Riko4 derivation for now.
- sdl-gpu = stdenv.mkDerivation rec {
- name = "sdl-gpu-${version}";
+ sdl-gpu = stdenv.mkDerivation {
+ pname = "sdl-gpu";
version = "2018-11-01";
src = fetchFromGitHub {
owner = "grimfang4";
@@ -27,7 +27,7 @@ let
in
stdenv.mkDerivation rec {
- name = "riko4-${version}";
+ pname = "riko4";
version = "0.1.0";
src = fetchFromGitHub {
owner = "incinirate";
diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix
index ac6fdee1f6b5..c940c90b8841 100644
--- a/pkgs/games/rimshot/default.nix
+++ b/pkgs/games/rimshot/default.nix
@@ -11,8 +11,8 @@ let
desktopItem = makeDesktopItem {
name = "rimshot";
- exec = "${pname}";
- icon = "${icon}";
+ exec = pname;
+ icon = icon;
comment = "Create your own music";
desktopName = "Rimshot";
genericName = "rimshot";
@@ -21,7 +21,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/games/robotfindskitten/default.nix
index 00d73f95bdb3..fa1eb338a89b 100644
--- a/pkgs/games/robotfindskitten/default.nix
+++ b/pkgs/games/robotfindskitten/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "robotfindskitten-${version}";
+ pname = "robotfindskitten";
version = "2.7182818.701";
src = fetchurl {
- url = "mirror://sourceforge/project/rfk/robotfindskitten-POSIX/mayan_apocalypse_edition/${name}.tar.gz";
+ url = "mirror://sourceforge/project/rfk/robotfindskitten-POSIX/mayan_apocalypse_edition/${pname}-${version}.tar.gz";
sha256 = "06fp6b4li50mzw83j3pkzqspm6dpgxgxw03b60xkxlkgg5qa6jbp";
};
diff --git a/pkgs/games/rrootage/default.nix b/pkgs/games/rrootage/default.nix
index 8b07a38c7bb7..459ff238b4a4 100644
--- a/pkgs/games/rrootage/default.nix
+++ b/pkgs/games/rrootage/default.nix
@@ -10,7 +10,8 @@ let
};
in stdenv.mkDerivation {
- name = "rrootage-${version}";
+ pname = "rrootage";
+ inherit version;
src = fetchurl {
url = "http://downloads.sourceforge.net/rrootage/rRootage-${version}.tar.gz";
sha256 = "01zzg4ih3kmbhsn1p9zr7g8srv1d2dhrp8cdd86y9qq233idnkln";
diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix
index a56365778fb1..77d1888b86e7 100644
--- a/pkgs/games/runelite/default.nix
+++ b/pkgs/games/runelite/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, jre, makeDesktopItem, lib }:
stdenv.mkDerivation rec {
- name = "runelite-${version}";
+ pname = "runelite";
version = "1.6.0";
src = fetchurl {
@@ -18,7 +18,7 @@
name = "RuneLite";
type = "Application";
exec = "runelite";
- icon = "${icon}";
+ icon = icon;
comment = "Open source Old School RuneScape client";
terminal = "false";
desktopName = "RuneLite";
diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix
index 79fef6740023..345ce33fca0a 100644
--- a/pkgs/games/scid-vs-pc/default.nix
+++ b/pkgs/games/scid-vs-pc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper, makeDesktopItem }:
stdenv.mkDerivation rec {
- name = "scid-vs-pc-${version}";
+ pname = "scid-vs-pc";
version = "4.20";
src = fetchurl {
diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix
index 301991c1a6fd..048a8fdc09b4 100644
--- a/pkgs/games/scid/default.nix
+++ b/pkgs/games/scid/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }:
-stdenv.mkDerivation rec {
- name = "scid-${version}";
+stdenv.mkDerivation {
+ pname = "scid";
version = "4.3";
src = fetchurl {
diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix
index 430b22c9ba97..1527f61c4d0f 100644
--- a/pkgs/games/scorched3d/default.nix
+++ b/pkgs/games/scorched3d/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "44";
- name = "scorched3d-${version}";
+ pname = "scorched3d";
src = fetchurl {
url = "mirror://sourceforge/scorched3d/Scorched3D-${version}-src.tar.gz";
sha256 = "1fldi9pn7cz6hc9h70pacgb7sbykzcac44yp3pkhn0qh4axj10qw";
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index 2ebc2c82e506..cb8223daa2b0 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "scummvm-${version}";
+ pname = "scummvm";
version = "2.0.0";
src = fetchurl {
- url = "http://scummvm.org/frs/scummvm/${version}/${name}.tar.xz";
+ url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz";
sha256 = "0q6aiw97wsrf8cjw9vjilzhqqsr2rw2lll99s8i5i9svan6l314p";
};
diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix
index 9f90c9f14aac..7811b4b7373f 100644
--- a/pkgs/games/sdlmame/default.nix
+++ b/pkgs/games/sdlmame/default.nix
@@ -2,15 +2,15 @@
stdenv.mkDerivation rec {
version = "0.151.u0-1";
- name = "sdlmame-${version}";
+ pname = "sdlmame";
src = if stdenv.hostPlatform.system == "x86_64-linux"
then fetchurl {
- url = "http://seblu.net/a/archive/packages/s/sdlmame/${name}-x86_64.pkg.tar.xz";
+ url = "http://seblu.net/a/archive/packages/s/sdlmame/${pname}-${version}-x86_64.pkg.tar.xz";
sha256 = "1j9vjxhrhsskrlk5wr7al4wk2hh3983kcva42mqal09bmc8qg3m9";
}
else fetchurl {
- url = "http://seblu.net/a/archive/packages/s/sdlmame/${name}-i686.pkg.tar.xz";
+ url = "http://seblu.net/a/archive/packages/s/sdlmame/${pname}-${version}-i686.pkg.tar.xz";
sha256 = "1i38j9ml66pyxzm0zzf1fv4lb40f6w47cdgaw846q91pzakkkqn7";
};
diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix
index 58ed85c79fdb..ed6ac781cae1 100644
--- a/pkgs/games/sienna/default.nix
+++ b/pkgs/games/sienna/default.nix
@@ -11,8 +11,8 @@ let
desktopItem = makeDesktopItem {
name = "sienna";
- exec = "${pname}";
- icon = "${icon}";
+ exec = pname;
+ icon = icon;
comment = "Fast-paced one button platformer";
desktopName = "Sienna";
genericName = "sienna";
@@ -21,7 +21,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix
index de91f26d95de..a998a86370d9 100644
--- a/pkgs/games/sil/default.nix
+++ b/pkgs/games/sil/default.nix
@@ -9,7 +9,7 @@ let
'';
in
stdenv.mkDerivation rec {
- name = "Sil-${version}";
+ pname = "Sil";
version = "1.3.0";
src = fetchzip {
diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index 5cbb3c1796f1..d8ab792bb62a 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -106,8 +106,9 @@ let
passthru.binaries = binaries;
};
- binaries = stdenv.mkDerivation rec {
- name = "simutrans-${version}";
+ binaries = stdenv.mkDerivation {
+ pname = "simutrans";
+ inherit version;
src = binary_src;
diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix
index e8d915dd31a5..e035bc436cc1 100644
--- a/pkgs/games/snipes/default.nix
+++ b/pkgs/games/snipes/default.nix
@@ -6,8 +6,8 @@ let
sha256 = "06n8gq18js0bv4svx84ljzhs9zmi81wy0zqcqj3b4g0rsrkr20a7";
};
-in stdenv.mkDerivation rec {
- name = "snipes-${version}";
+in stdenv.mkDerivation {
+ pname = "snipes";
version = "20180930";
src = fetchFromGitHub {
diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix
index 7f9f49f363a8..2ffd3f3d053b 100644
--- a/pkgs/games/soi/default.nix
+++ b/pkgs/games/soi/default.nix
@@ -2,12 +2,12 @@
, boost, eigen2, lua, luabind, libGLU_combined, SDL }:
stdenv.mkDerivation rec {
- name = "soi-${version}";
+ pname = "soi";
version = "0.1.2";
src = fetchurl {
url = "mirror://sourceforge/project/soi/Spheres%20of%20Influence-${version}-Source.tar.bz2";
- name = "${name}.tar.bz2";
+ name = "${pname}-${version}.tar.bz2";
sha256 = "03c3wnvhd42qh8mi68lybf8nv6wzlm1nx16d6pdcn2jzgx1j2lzd";
};
diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/games/space-orbit/default.nix
index 162db9672699..2b69dfccad15 100644
--- a/pkgs/games/space-orbit/default.nix
+++ b/pkgs/games/space-orbit/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "space-orbit-${version}";
+ pname = "space-orbit";
version = "1.01";
patchversion = "9";
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 1dcf432ccd48..9bfd917d1aa0 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
- name = "spring-${version}";
+ pname = "spring";
version = "104.0";
src = fetchurl {
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 8df4450d13d1..b7c9b691c043 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -3,7 +3,7 @@
, makeWrapper, glib, minizip, alure, pcre, jsoncpp }:
stdenv.mkDerivation rec {
- name = "springlobby-${version}";
+ pname = "springlobby";
version = "0.267";
src = fetchurl {
diff --git a/pkgs/games/stardust/default.nix b/pkgs/games/stardust/default.nix
index 1408b66ab41b..9de9bd37e8dc 100644
--- a/pkgs/games/stardust/default.nix
+++ b/pkgs/games/stardust/default.nix
@@ -2,11 +2,11 @@
, libXi, libXmu, libXext, libGLU_combined }:
stdenv.mkDerivation rec {
- name = "stardust-${version}";
+ pname = "stardust";
version = "0.1.13";
src = fetchurl {
- url = "http://iwar.free.fr/IMG/gz/${name}.tar.gz";
+ url = "http://iwar.free.fr/IMG/gz/${pname}-${version}.tar.gz";
sha256 = "19rs9lz5y5g2yiq1cw0j05b11digw40gar6rw8iqc7bk3s8355xp";
};
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index a851b5b8d978..8e4f5b866bbc 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -26,7 +26,7 @@ let
libs = [ "lib/${gnuArch}" "lib" "usr/lib/${gnuArch}" "usr/lib" ];
bins = [ "bin" "usr/bin" ];
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "steam-runtime-wrapped";
nativeBuildInputs = [ perl ];
diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix
index 9bbdf0474e1a..0276122655fe 100644
--- a/pkgs/games/steam/steam.nix
+++ b/pkgs/games/steam/steam.nix
@@ -4,8 +4,9 @@ let
traceLog = "/tmp/steam-trace-dependencies.log";
version = "1.0.0.61";
-in stdenv.mkDerivation rec {
- name = "steam-original-${version}";
+in stdenv.mkDerivation {
+ pname = "steam-original";
+ inherit version;
src = fetchurl {
url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
diff --git a/pkgs/games/steam/steamcmd.nix b/pkgs/games/steam/steamcmd.nix
index 1ea7f0677877..a38122702f25 100644
--- a/pkgs/games/steam/steamcmd.nix
+++ b/pkgs/games/steam/steamcmd.nix
@@ -2,8 +2,8 @@
, steamRoot ? "~/.local/share/Steam"
}:
-stdenv.mkDerivation rec {
- name = "steamcmd-${version}";
+stdenv.mkDerivation {
+ pname = "steamcmd";
version = "20180104"; # According to steamcmd_linux.tar.gz mtime
src = fetchurl {
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index 864888741660..b29d22dfe736 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "stepmania-${version}";
+ pname = "stepmania";
version = "5.1.0-b2";
src = fetchFromGitHub {
diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
index 13033c7f9f0a..eea92b43b520 100644
--- a/pkgs/games/stockfish/default.nix
+++ b/pkgs/games/stockfish/default.nix
@@ -9,7 +9,8 @@ in
stdenv.mkDerivation {
- name = "stockfish-${version}";
+ pname = "stockfish";
+ inherit version;
src = fetchurl {
url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz";
diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix
index 3865d8fbef9e..6b3da08b70c7 100644
--- a/pkgs/games/stuntrally/default.nix
+++ b/pkgs/games/stuntrally/default.nix
@@ -2,7 +2,7 @@
, makeWrapper, enet, libXcursor, bullet, openal }:
stdenv.mkDerivation rec {
- name = "stunt-rally-${version}";
+ pname = "stunt-rally";
version = "2.6.1";
src = fetchurl {
diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix
index cee65bfa5638..6cfabc4ee6a7 100644
--- a/pkgs/games/supertux/default.nix
+++ b/pkgs/games/supertux/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "supertux-${version}";
+ pname = "supertux";
version = "0.6.0";
src = fetchurl {
diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix
index e18faf7c304e..136bac8800ed 100644
--- a/pkgs/games/tdm/default.nix
+++ b/pkgs/games/tdm/default.nix
@@ -10,7 +10,7 @@ let
desktopName = pname;
name = pname;
exec = "@out@/bin/${pname}";
- icon = "${pname}";
+ icon = pname;
terminal = "False";
comment = "The Dark Mod - stealth FPS inspired by the Thief series";
type = "Application";
diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix
index 13d296e5961a..5432824ce6c0 100644
--- a/pkgs/games/terraria-server/default.nix
+++ b/pkgs/games/terraria-server/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, file, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "terraria-server-${version}";
+ pname = "terraria-server";
version = "1.3.5.3";
urlVersion = lib.replaceChars ["."] [""] version;
diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix
index 68114bb75652..9cc3bf7149ff 100644
--- a/pkgs/games/the-butterfly-effect/default.nix
+++ b/pkgs/games/the-butterfly-effect/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, qt5, box2d, which, cmake, gettext }:
stdenv.mkDerivation rec {
- name = "tbe-${version}";
+ pname = "tbe";
version = "0.9.3.1";
src = fetchgit {
diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix
index 929641cfab54..b0901fcb9a0f 100644
--- a/pkgs/games/the-powder-toy/default.nix
+++ b/pkgs/games/the-powder-toy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, scons, pkgconfig, SDL2, lua, fftwFloat, zlib, bzip2 }:
stdenv.mkDerivation rec {
- name = "the-powder-toy-${version}";
+ pname = "the-powder-toy";
version = "94.1";
src = fetchFromGitHub {
diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix
index f230a70c0880..fb3ebf36db3b 100644
--- a/pkgs/games/tinyfugue/default.nix
+++ b/pkgs/games/tinyfugue/default.nix
@@ -8,7 +8,7 @@ with stdenv.lib;
assert sslSupport -> openssl != null;
stdenv.mkDerivation rec {
- name = "tinyfugue-${version}";
+ pname = "tinyfugue";
version = "50b8";
verUrl = "5.0%20beta%208";
diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix
index ec529676463f..c04920d7aa2c 100644
--- a/pkgs/games/tome4/default.nix
+++ b/pkgs/games/tome4/default.nix
@@ -8,7 +8,7 @@ let
desktopName = pname;
name = pname;
exec = "@out@/bin/${pname}";
- icon = "${pname}";
+ icon = pname;
terminal = "False";
comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal.";
type = "Application";
diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix
index 8549a860d8e8..b5ff38b93a10 100644
--- a/pkgs/games/trackballs/default.nix
+++ b/pkgs/games/trackballs/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "trackballs-${version}";
+ pname = "trackballs";
version = "1.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix
index 470856af90e6..802bdb08a87c 100644
--- a/pkgs/games/tremulous/default.nix
+++ b/pkgs/games/tremulous/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal, runtimeShell }:
stdenv.mkDerivation rec {
- name = "tremulous-${version}";
+ pname = "tremulous";
version = "1.1.0";
src1 = fetchurl {
- url = "mirror://sourceforge/tremulous/${name}.zip";
+ url = "mirror://sourceforge/tremulous/${pname}-${version}.zip";
sha256 = "11w96y7ggm2sn5ncyaffsbg0vy9pblz2av71vqp9725wbbsndfy7";
};
# http://tremulous.net/wiki/Client_versions
diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix
index ddf0782b210d..603fb3ef491b 100644
--- a/pkgs/games/tuxpaint/default.nix
+++ b/pkgs/games/tuxpaint/default.nix
@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
version = "0.9.22";
- name = "tuxpaint-${version}";
+ pname = "tuxpaint";
src = fetchurl {
- url = "mirror://sourceforge/tuxpaint/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz";
sha256 = "1qrbrdck9yxpcg3si6jb9i11w8lw9h4hqad0pfaxgyiniqpr7gca";
};
diff --git a/pkgs/games/ue4/default.nix b/pkgs/games/ue4/default.nix
index fa28dcefa5e0..a32da556cc90 100644
--- a/pkgs/games/ue4/default.nix
+++ b/pkgs/games/ue4/default.nix
@@ -18,7 +18,7 @@ let
];
in
stdenv.mkDerivation rec {
- name = "ue4-${version}";
+ pname = "ue4";
version = "4.10.2";
sourceRoot = "UnrealEngine-${version}-release";
src = requireFile {
diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix
index b9cc8a6cd6dd..2020066ee651 100644
--- a/pkgs/games/ue4demos/default.nix
+++ b/pkgs/games/ue4demos/default.nix
@@ -57,7 +57,7 @@ let
};
in {
- tappy_chicken = buildDemo rec {
+ tappy_chicken = buildDemo {
name = "ue4demos-tappy_chicken";
src = fetchurl {
urls = urls "tappy_chicken.zip";
@@ -65,7 +65,7 @@ in {
};
};
- swing_ninja = buildDemo rec {
+ swing_ninja = buildDemo {
name = "ue4demos-swing_ninja";
src = fetchurl {
urls = urls "swing_ninja.zip";
@@ -73,7 +73,7 @@ in {
};
};
- card_game = buildDemo rec {
+ card_game = buildDemo {
name = "ue4demos-card_game";
src = fetchurl {
urls = urls "card_game.zip";
@@ -81,7 +81,7 @@ in {
};
};
- vehicle_game = buildDemo rec {
+ vehicle_game = buildDemo {
name = "ue4demos-vehicle_game";
src = fetchurl {
urls = urls "vehicle_game.zip";
@@ -89,7 +89,7 @@ in {
};
};
- shooter_game = buildDemo rec {
+ shooter_game = buildDemo {
name = "ue4demos-shooter_game";
src = fetchurl {
urls = urls "shooter_game.zip";
@@ -97,7 +97,7 @@ in {
};
};
- strategy_game = buildDemo rec {
+ strategy_game = buildDemo {
name = "ue4demos-strategy_game";
src = fetchurl {
urls = urls "strategy_game.zip";
@@ -105,7 +105,7 @@ in {
};
};
- black_jack = buildDemo rec {
+ black_jack = buildDemo {
name = "ue4demos-black_jack";
src = fetchurl {
urls = urls "black_jack.zip";
@@ -113,7 +113,7 @@ in {
};
};
- landscape_mountains = buildDemo rec {
+ landscape_mountains = buildDemo {
name = "ue4demos-landscape_mountains";
src = fetchurl {
urls = urls "landscape_mountains.zip";
@@ -121,7 +121,7 @@ in {
};
};
- matinee_demo = buildDemo rec {
+ matinee_demo = buildDemo {
name = "ue4demos-matinee_demo";
src = fetchurl {
urls = urls "matinee_demo.zip";
@@ -129,7 +129,7 @@ in {
};
};
- elemental_demo = buildDemo rec {
+ elemental_demo = buildDemo {
name = "ue4demos-elemental_demo";
src = fetchurl {
urls = urls "elemental_demo.zip";
@@ -137,7 +137,7 @@ in {
};
};
- effects_cave_demo = buildDemo rec {
+ effects_cave_demo = buildDemo {
name = "ue4demos-effects_cave_demo";
src = fetchurl {
urls = urls "effects_cave_demo.zip";
@@ -145,7 +145,7 @@ in {
};
};
- realistic_rendering = buildDemo rec {
+ realistic_rendering = buildDemo {
name = "ue4demos-realistic_rendering";
src = fetchurl {
urls = urls "realistic_rendering_demo.zip";
@@ -153,7 +153,7 @@ in {
};
};
- reflections_subway = buildDemo rec {
+ reflections_subway = buildDemo {
name = "ue4demos-reflections_subway";
src = fetchurl {
urls = urls "reflections_subway_demo.zip";
@@ -161,7 +161,7 @@ in {
};
};
- scifi_hallway_demo = buildDemo rec {
+ scifi_hallway_demo = buildDemo {
name = "ue4demos-scifi_hallway_demo";
src = fetchurl {
urls = urls "sci-fi_hallway_demo.zip";
@@ -169,7 +169,7 @@ in {
};
};
- mobile_temple_demo = buildDemo rec {
+ mobile_temple_demo = buildDemo {
name = "ue4demos-mobile_temple_demo";
src = fetchurl {
urls = urls "mobile_temple_demo.zip";
@@ -177,7 +177,7 @@ in {
};
};
- stylized_demo = buildDemo rec {
+ stylized_demo = buildDemo {
name = "ue4demos-stylized_demo";
src = fetchurl {
urls = urls "stylized_demo.zip";
@@ -185,7 +185,7 @@ in {
};
};
- blueprint_examples_demo = buildDemo rec {
+ blueprint_examples_demo = buildDemo {
name = "ue4demos-blueprint_examples_demo";
src = fetchurl {
urls = urls "blueprint_examples_demo.zip";
diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix
index 63da46854857..a7ad366aa195 100644
--- a/pkgs/games/ultimatestunts/default.nix
+++ b/pkgs/games/ultimatestunts/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, SDL, libGLU_combined, SDL_image, freealut, openal, libvorbis,
pkgconfig}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ultimate-stunts-0.7.6.1";
src = fetchurl {
url = mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-0761.tar.gz;
diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix
index f3eec52098d0..8dd8222e55e4 100644
--- a/pkgs/games/ultrastardx/default.nix
+++ b/pkgs/games/ultrastardx/default.nix
@@ -11,7 +11,7 @@ let
];
in stdenv.mkDerivation rec {
- name = "ultrastardx-${version}";
+ pname = "ultrastardx";
version = "2017.8.0";
src = fetchFromGitHub {
owner = "UltraStar-Deluxe";
diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix
index be1b5bd11956..ee3890aeea5b 100644
--- a/pkgs/games/unnethack/default.nix
+++ b/pkgs/games/unnethack/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, utillinux, ncurses, flex, bison }:
stdenv.mkDerivation rec {
- name = "unnethack-${version}";
+ pname = "unnethack";
version = "5.2.0";
src = fetchgit {
diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix
index 00592f7c39bb..638900c9e898 100644
--- a/pkgs/games/uqm/default.nix
+++ b/pkgs/games/uqm/default.nix
@@ -27,7 +27,7 @@ let
];
in stdenv.mkDerivation rec {
- name = "uqm-${version}";
+ pname = "uqm";
version = "0.7.0";
src = fetchurl {
diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix
index 1cd87541b8c3..999799de58d8 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/pkgs/games/urbanterror/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip, SDL, libGLU_combined, openal, curl, libXxf86vm }:
stdenv.mkDerivation rec {
- name = "urbanterror-${version}";
+ pname = "urbanterror";
version = "4.3.4";
srcs =
diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix
index 7039ff44a09b..1790f0830638 100644
--- a/pkgs/games/ut2004/demo.nix
+++ b/pkgs/games/ut2004/demo.nix
@@ -7,7 +7,7 @@ let
else throw "Unsupported architecture";
in stdenv.mkDerivation rec {
- name = "ut2004-demo-${version}";
+ pname = "ut2004-demo";
version = "3334";
src = fetchurl {
diff --git a/pkgs/games/vapor/default.nix b/pkgs/games/vapor/default.nix
index 0209fd83b1c6..2e4fdf1af96c 100644
--- a/pkgs/games/vapor/default.nix
+++ b/pkgs/games/vapor/default.nix
@@ -12,8 +12,8 @@ let
desktopItem = makeDesktopItem {
name = "Vapor";
- exec = "${pname}";
- icon = "${icon}";
+ exec = pname;
+ icon = icon;
comment = "LÖVE Distribution Client";
desktopName = "Vapor";
genericName = "vapor";
@@ -22,7 +22,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix
index 6c571da561c5..e018dfd664d3 100644
--- a/pkgs/games/vdrift/default.nix
+++ b/pkgs/games/vdrift/default.nix
@@ -10,7 +10,8 @@
let
version = "git";
bin = stdenv.mkDerivation {
- name = "vdrift-${version}";
+ pname = "vdrift";
+ inherit version;
src = fetchFromGitHub {
owner = "vdrift";
diff --git a/pkgs/games/vitetris/default.nix b/pkgs/games/vitetris/default.nix
index d57559a4d804..7f552bdd5d66 100644
--- a/pkgs/games/vitetris/default.nix
+++ b/pkgs/games/vitetris/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, lib }:
stdenv.mkDerivation rec {
- name = "vitetris-${version}";
+ pname = "vitetris";
version = "0.58.0";
src = fetchFromGitHub {
diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/games/vms-empire/default.nix
index 91f77277d9ec..1d4545f17b14 100644
--- a/pkgs/games/vms-empire/default.nix
+++ b/pkgs/games/vms-empire/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec{
- name = "vms-empire-${version}";
+ pname = "vms-empire";
version = "1.14";
src = fetchurl{
- url = "http://www.catb.org/~esr/vms-empire/${name}.tar.gz";
+ url = "http://www.catb.org/~esr/vms-empire/${pname}-${version}.tar.gz";
sha256 = "0cymzhivvaahgqz0p11w25a710ls4w0jhyqj789jas5s07nvd890";
};
diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix
index c1a9a2a7defb..9ea9ec7bd12f 100644
--- a/pkgs/games/voxelands/default.nix
+++ b/pkgs/games/voxelands/default.nix
@@ -2,11 +2,11 @@
, libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, xlibsWrapper, pkgconfig }:
stdenv.mkDerivation rec {
- name = "voxelands-${version}";
+ pname = "voxelands";
version = "1512.00";
src = fetchurl {
- url = "http://voxelands.com/downloads/${name}-src.tar.bz2";
+ url = "http://voxelands.com/downloads/${pname}-${version}-src.tar.bz2";
sha256 = "0bims0y0nyviv2f2nxfj37s3258cjbfp9xd97najz0yylnk3qdfw";
};
diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix
index 04712b3ebff6..c3896f6cf71e 100644
--- a/pkgs/games/warmux/default.nix
+++ b/pkgs/games/warmux/default.nix
@@ -4,8 +4,8 @@
, gettext, intltool, libtool, perl
}:
-stdenv.mkDerivation rec {
- name = "warmux-${version}";
+stdenv.mkDerivation {
+ pname = "warmux";
version = "unstable-2017-10-20";
src = fetchFromGitHub {
diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix
index 5333dad68798..6282658fc152 100644
--- a/pkgs/games/warsow/default.nix
+++ b/pkgs/games/warsow/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, warsow-engine, makeWrapper }:
stdenv.mkDerivation rec {
- name = "warsow-${version}";
+ pname = "warsow";
version = "2.1.2";
src = fetchurl {
- url = "http://slice.sh/warsow/${name}.tar.gz";
+ url = "http://slice.sh/warsow/${pname}-${version}.tar.gz";
sha256 = "07y2airw5qg3s1bf1c63a6snjj22riz0mqhk62jmfm9nrarhavrc";
};
diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix
index 6165cacfdca5..d99a7c44240e 100644
--- a/pkgs/games/warzone2100/default.nix
+++ b/pkgs/games/warzone2100/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, lib, fetchurl, perl, unzip, zip, which, pkgconfig
-, qtbase, qtscript, SDL2, libtheora, openal, glew, physfs, fribidi, libXrandr
+{ stdenv, mkDerivation, fetchurl, autoconf, automake
+, perl, unzip, zip, which, pkgconfig, qtbase, qtscript
+, SDL2, libtheora, openal, glew, physfs, fribidi, libXrandr
, withVideos ? false
}:
@@ -11,17 +12,24 @@ let
};
in
-stdenv.mkDerivation rec {
- version = "3.2.3";
- name = "${pname}-${version}";
+mkDerivation rec {
+ inherit pname;
+ version = "3.3.0";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/releases/${version}/${name}.tar.xz";
- sha256 = "10kmpr4cby95zwqsl1zwx95d9achli6khq7flv6xmrq30a39xazw";
+ url = "mirror://sourceforge/${pname}/releases/${version}/${pname}-${version}_src.tar.xz";
+ sha256 = "1s0n67rh32g0bgq72p4qzkcqjlw58gc70r4r6gl9k90pil9chj6c";
};
- buildInputs = [ qtbase qtscript SDL2 libtheora openal glew physfs fribidi libXrandr ];
- nativeBuildInputs = [ perl zip unzip pkgconfig ];
+ buildInputs = [
+ qtbase qtscript SDL2 libtheora openal
+ glew physfs fribidi libXrandr
+ ];
+ nativeBuildInputs = [
+ perl zip unzip pkgconfig autoconf automake
+ ];
+
+ preConfigure = "./autogen.sh";
postPatch = ''
substituteInPlace lib/exceptionhandler/dumpinfo.cpp \
@@ -36,7 +44,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- postInstall = lib.optionalString withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz";
+ postInstall = stdenv.lib.optionalString withVideos
+ "cp ${sequences_src} $out/share/warzone2100/sequences.wz";
meta = with stdenv.lib; {
description = "A free RTS game, originally developed by Pumpkin Studios";
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index bf9e1cdd6354..64231b9c39c7 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -8,10 +8,8 @@ stdenv.mkDerivation rec {
pname = "wesnoth";
version = "1.14.7";
- name = "${pname}-${version}";
-
src = fetchurl {
- url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
+ url = "mirror://sourceforge/sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0j2yvkcggj5k0r2cqk8ndnj77m37a00srfd9qg7pdpqffbinqpj7";
};
diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix
index daf56b27e5d2..6f3bc2c11959 100644
--- a/pkgs/games/widelands/default.nix
+++ b/pkgs/games/widelands/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "widelands-${version}";
+ pname = "widelands";
version = "19";
meta = with stdenv.lib; {
diff --git a/pkgs/games/xjump/default.nix b/pkgs/games/xjump/default.nix
index 028b5f49b66a..afac2de9fcec 100644
--- a/pkgs/games/xjump/default.nix
+++ b/pkgs/games/xjump/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libX11, libXt, libXpm, libXaw, localStateDir?null }:
-stdenv.mkDerivation rec {
- name = "xjump-${version}";
+stdenv.mkDerivation {
+ pname = "xjump";
version = "2.9.3";
src = fetchFromGitHub {
owner = "hugomg";
diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix
index a0fc6d5ca718..d9bba3fdbdce 100644
--- a/pkgs/games/xmoto/default.nix
+++ b/pkgs/games/xmoto/default.nix
@@ -3,7 +3,7 @@
, SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }:
stdenv.mkDerivation rec {
- name = "xmoto-${version}";
+ pname = "xmoto";
version = "0.5.11";
src = fetchurl {
diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix
index cd927a820aaa..aefc8ad98767 100644
--- a/pkgs/games/xpilot/bloodspilot-client.nix
+++ b/pkgs/games/xpilot/bloodspilot-client.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.5.0";
- name = "bloodspilot-client-${version}";
+ pname = "bloodspilot-client";
src = fetchurl {
url = "mirror://sourceforge/project/bloodspilot/client-sdl/v${version}/bloodspilot-client-sdl-${version}.tar.gz";
diff --git a/pkgs/games/xpilot/bloodspilot-server.nix b/pkgs/games/xpilot/bloodspilot-server.nix
index 42bcb3263169..2f37680bbaab 100644
--- a/pkgs/games/xpilot/bloodspilot-server.nix
+++ b/pkgs/games/xpilot/bloodspilot-server.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, expat }:
stdenv.mkDerivation rec {
- name = "bloodspilot-xpilot-fxi-server-${version}";
+ pname = "bloodspilot-xpilot-fxi-server";
version = "1.4.6";
src = fetchurl {
diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix
index 2ae25e957bb2..d0fe9f61896e 100644
--- a/pkgs/games/xpilot/default.nix
+++ b/pkgs/games/xpilot/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, libX11, libSM, SDL, libGLU_combined, expat, SDL_ttf
, SDL_image, zlib, libXxf86misc }:
stdenv.mkDerivation rec {
- name = "xpilot-ng-${version}";
+ pname = "xpilot-ng";
version = "4.7.3";
src = fetchurl {
- url = "mirror://sourceforge/xpilot/xpilot_ng/${name}/${name}.tar.gz";
+ url = "mirror://sourceforge/xpilot/xpilot_ng/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "02a7pnp88kh88fzda5q8mzlckk6y9r5fw47j00h26wbsfly0k1zj";
};
buildInputs = [
diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix
index 07ed50d4e7b3..b3011fbce77a 100644
--- a/pkgs/games/xsnow/default.nix
+++ b/pkgs/games/xsnow/default.nix
@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
version = "1.42";
- name = "xsnow-${version}";
+ pname = "xsnow";
src = fetchurl {
- url = "https://janswaal.home.xs4all.nl/Xsnow/${name}.tar.gz";
+ url = "https://janswaal.home.xs4all.nl/Xsnow/${pname}-${version}.tar.gz";
sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh";
};
diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix
index 0aa0c97f07d2..62cdaccc2975 100644
--- a/pkgs/games/xsok/default.nix
+++ b/pkgs/games/xsok/default.nix
@@ -2,7 +2,6 @@
, withNethackLevels ? true
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "xsok";
version = "1.02";
diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix
index cf08db68cf03..3f6062c4f686 100644
--- a/pkgs/games/xsokoban/default.nix
+++ b/pkgs/games/xsokoban/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11, xorgproto, libXpm, libXt }:
stdenv.mkDerivation rec {
- name = "xsokoban-${version}";
+ pname = "xsokoban";
version = "3.3c";
src = fetchurl {
- url = "https://www.cs.cornell.edu/andru/release/${name}.tar.gz";
+ url = "https://www.cs.cornell.edu/andru/release/${pname}-${version}.tar.gz";
sha256 = "006lp8y22b9pi81x1a9ldfgkl1fbmkdzfw0lqw5y9svmisbafbr9";
};
diff --git a/pkgs/games/xtris/default.nix b/pkgs/games/xtris/default.nix
index 9203389355c7..8f5f832058cc 100644
--- a/pkgs/games/xtris/default.nix
+++ b/pkgs/games/xtris/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchzip, xorg }:
stdenv.mkDerivation rec {
- name = "xtris-${version}";
+ pname = "xtris";
version = "1.15";
src = fetchzip {
diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix
index a5d9098242bd..3d5160bb591c 100644
--- a/pkgs/games/zandronum/fmod.nix
+++ b/pkgs/games/zandronum/fmod.nix
@@ -6,7 +6,7 @@ let
in
stdenv.mkDerivation rec {
- name = "fmod-${version}";
+ pname = "fmod";
version = "4.44.64";
shortVersion = builtins.replaceStrings [ "." ] [ "" ] version;
diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix
index 3d5da2391157..0722e4bbbf95 100644
--- a/pkgs/games/zangband/default.nix
+++ b/pkgs/games/zangband/default.nix
@@ -1,12 +1,11 @@
{ stdenv, fetchurl, ncurses, flex, bison, autoconf, automake, m4, coreutils }:
stdenv.mkDerivation rec {
- name = pname + "-" + version;
pname = "zangband";
version = "2.7.4b";
src = fetchurl {
- url = "mirror://sourceforge/project/${pname}/${pname}-src/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/${pname}/${pname}-src/${version}/${pname}-${version}.tar.gz";
sha256 = "0kkz6f9myhjnr3308sdab8q186rd55lapvcp38w8qmakdbhc828j";
};
diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix
index d2b94a14fe41..f6fde241129b 100644
--- a/pkgs/games/zdoom/default.nix
+++ b/pkgs/games/zdoom/default.nix
@@ -3,7 +3,7 @@
, libsndfile, mpg123 }:
stdenv.mkDerivation rec {
- name = "zdoom-${version}";
+ pname = "zdoom";
majorVersion = "2.8";
version = "${majorVersion}.1";
diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix
index fa2cafa298ac..430d5269a68e 100644
--- a/pkgs/games/zdoom/zdbsp.nix
+++ b/pkgs/games/zdoom/zdbsp.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, unzip, zlib }:
stdenv.mkDerivation rec {
- name = "zdbsp-${version}";
+ pname = "zdbsp";
version = "1.19";
src = fetchurl {
diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix
index da2f256aeb71..c14eda2968e0 100644
--- a/pkgs/games/zod/default.nix
+++ b/pkgs/games/zod/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer
, mysql, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "zod-engine-2011-03-18";
src = fetchurl {
diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
index 01c35d99ae7e..5ff131dad9dd 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -8,7 +8,7 @@ let
, extraMeta ? {}
, version ? "2.1"
, ... } @ args:
- stdenv.mkDerivation (rec {
+ stdenv.mkDerivation ({
name = "arm-trusted-firmware-${platform}-${version}";
inherit version;
@@ -53,7 +53,7 @@ let
} // extraMeta;
} // builtins.removeAttrs args [ "extraMeta" ]);
-in rec {
+in {
inherit buildArmTrustedFirmware;
armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec {
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
index e7b4f81f7e04..735ea6232471 100644
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ b/pkgs/misc/base16-builder/node-packages.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ../../development/node-packages/node-env.nix {
diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix
index 6292b8183b28..d6e606324c4e 100644
--- a/pkgs/misc/brightnessctl/default.nix
+++ b/pkgs/misc/brightnessctl/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, coreutils }:
stdenv.mkDerivation rec {
- name = "brightnessctl-${version}";
+ pname = "brightnessctl";
version = "0.4";
src = fetchFromGitHub {
owner = "Hummer12007";
repo = "brightnessctl";
- rev = "${version}";
+ rev = version;
sha256 = "1n1gb8ldgqv3vs565yhk1w4jfvrviczp94r8wqlkv5q6ab43c8w9";
};
diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix
index f0be3cad723c..5e7596032b3d 100644
--- a/pkgs/misc/cups/cups-pk-helper.nix
+++ b/pkgs/misc/cups/cups-pk-helper.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.2.6";
- name = "cups-pk-helper-${version}";
+ pname = "cups-pk-helper";
src = fetchurl {
url = "https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz";
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 789aabce0435..6e27fdb0a524 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -9,10 +9,10 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "cups-${version}";
+ pname = "cups";
# After 2.2.6, CUPS requires headers only available in macOS 10.12+
- version = if stdenv.isDarwin then "2.2.6" else "2.2.11";
+ version = if stdenv.isDarwin then "2.2.6" else "2.2.12";
passthru = { inherit version; };
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
sha256 = if version == "2.2.6"
then "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"
- else "0v5p10lyv8wv48s8ghkhjmdrxg6iwj8hn36v1ilkz46n7y0i107m";
+ else "1a4sgx5y7z16flmpnchd2ix294bnzy0v8mdkd96a4j27kr2anq8g";
};
outputs = [ "out" "lib" "dev" "man" ];
diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix
index 08cc222e4a5b..948e5ed72ab1 100644
--- a/pkgs/misc/cups/drivers/brlaser/default.nix
+++ b/pkgs/misc/cups/drivers/brlaser/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, zlib, cups }:
stdenv.mkDerivation rec {
- name = "brlaser-${version}";
+ pname = "brlaser";
version = "4";
src = fetchFromGitHub {
diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix
index 9c5ef1d02836..b6219e1c749e 100644
--- a/pkgs/misc/cups/drivers/canon/default.nix
+++ b/pkgs/misc/cups/drivers/canon/default.nix
@@ -13,7 +13,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "canon-cups-ufr2-2.90";
src = src_canon;
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index 2634b7128719..13e3013267bf 100644
--- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb, libtool
, withDebug ? false }:
-stdenv.mkDerivation rec {
- name = "cnijfilter2-${version}";
+stdenv.mkDerivation {
+ pname = "cnijfilter2";
version = "5.30";
diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
index 27b86ab89198..a09311a8292d 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
@@ -6,8 +6,8 @@
/* this derivation is basically just a transcription of the rpm .spec
file included in the tarball */
-stdenv.mkDerivation rec {
- name = "cnijfilter-${version}";
+stdenv.mkDerivation {
+ pname = "cnijfilter";
/* important note about versions: cnijfilter packages seem to use
versions in a non-standard way. the version indicates which
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
index c8e5ddd09b14..8866b425ca8f 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
@@ -11,8 +11,8 @@ let arch =
else if stdenv.hostPlatform.system == "i686-linux" then "32"
else throw "Unsupported system ${stdenv.hostPlatform.system}";
-in stdenv.mkDerivation rec {
- name = "cnijfilter-${version}";
+in stdenv.mkDerivation {
+ pname = "cnijfilter";
/* important note about versions: cnijfilter packages seem to use
versions in a non-standard way. the version indicates which
diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix
index 8abda27a5cf2..c2b912007d88 100644
--- a/pkgs/misc/cups/drivers/dymo/default.nix
+++ b/pkgs/misc/cups/drivers/dymo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, cups, ... }:
stdenv.mkDerivation rec {
- name = "cups-dymo-${version}";
+ pname = "cups-dymo";
version = "1.4.0.5";
# exposed version and 'real' version may differ
diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix
index 83093da9c0aa..ad8b0089a871 100644
--- a/pkgs/misc/cups/drivers/estudio/default.nix
+++ b/pkgs/misc/cups/drivers/estudio/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, perl }:
-stdenv.mkDerivation rec {
- name = "cups-toshiba-estudio-${version}";
+stdenv.mkDerivation {
+ pname = "cups-toshiba-estudio";
version = "7.89";
src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
index ffcc46d66e36..23651a57df8c 100644
--- a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
+++ b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
@@ -6,7 +6,7 @@ let
else throw "Unsupported system: ${stdenv.hostPlatform.system}";
in
stdenv.mkDerivation rec {
- name = "fxlinuxprint-${version}";
+ pname = "fxlinuxprint";
version = "1.1.2-1";
src = fetchzip {
diff --git a/pkgs/misc/cups/drivers/googlecloudprint/default.nix b/pkgs/misc/cups/drivers/googlecloudprint/default.nix
index b3fc87fbf1da..0dcd518de842 100644
--- a/pkgs/misc/cups/drivers/googlecloudprint/default.nix
+++ b/pkgs/misc/cups/drivers/googlecloudprint/default.nix
@@ -14,7 +14,7 @@ let pythonEnv = python2.buildEnv.override {
};
in stdenv.mkDerivation rec {
- name = "cups-googlecloudprint-${version}";
+ pname = "cups-googlecloudprint";
version = "20160502";
src = fetchFromGitHub {
diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
index 55b0deea9717..90f9a8e943ab 100644
--- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
+++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "hll2390dw-cups-${version}";
+ pname = "hll2390dw-cups";
version = "4.0.0-1";
src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix
index 9b40e4ff50e1..cd4c049e67f7 100644
--- a/pkgs/misc/cups/drivers/kyocera/default.nix
+++ b/pkgs/misc/cups/drivers/kyocera/default.nix
@@ -9,8 +9,8 @@ let
libPath = lib.makeLibraryPath [ cups ];
in
-stdenv.mkDerivation rec {
- name = "cups-kyocera-${version}";
+stdenv.mkDerivation {
+ pname = "cups-kyocera";
version = "1.1203";
dontPatchELF = true;
diff --git a/pkgs/misc/cups/drivers/kyodialog3/default.nix b/pkgs/misc/cups/drivers/kyodialog3/default.nix
index bcd2914da0ce..fa16a136f977 100644
--- a/pkgs/misc/cups/drivers/kyodialog3/default.nix
+++ b/pkgs/misc/cups/drivers/kyodialog3/default.nix
@@ -15,7 +15,7 @@ let
debRegion = if region == "EU" then "EU." else "";
in
stdenv.mkDerivation rec {
- name = "cups-kyodialog3-${version}";
+ pname = "cups-kyodialog3";
version = "8.1601";
dontStrip = true;
diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
index 72a40f41f885..c7484e6d30b0 100644
--- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, mfcj470dwlpr, makeWrapper}:
stdenv.mkDerivation rec {
- name = "mfcj470dw-cupswrapper-${version}";
+ pname = "mfcj470dw-cupswrapper";
version = "3.0.0-1";
src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
index f31dd9061ec3..befafd855bcf 100644
--- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }:
stdenv.mkDerivation rec {
- name = "mfcj470dw-cupswrapper-${version}";
+ pname = "mfcj470dw-cupswrapper";
version = "3.0.0-1";
src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
index 4b31ccf38774..4ec9e3fc6c8e 100644
--- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, mfcj6510dwlpr, makeWrapper}:
stdenv.mkDerivation rec {
- name = "mfcj6510dw-cupswrapper-${version}";
+ pname = "mfcj6510dw-cupswrapper";
version = "3.0.0-1";
src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
index 9d9535ce37b0..b12ef18e46c4 100644
--- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
@@ -20,7 +20,7 @@
# The user can run brprintconf_mfcj6510dw in the shell.
stdenv.mkDerivation rec {
- name = "mfcj6510dwlpr-${version}";
+ pname = "mfcj6510dwlpr";
version = "3.0.0-1";
src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
index 8e31cd2956a5..91110104bc96 100644
--- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
@@ -1,11 +1,11 @@
{ coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, stdenv, which }:
stdenv.mkDerivation rec {
- name = "mfcl2700dnlpr-${version}";
+ pname = "mfcl2700dnlpr";
version = "3.2.0-1";
src = fetchurl {
- url = "https://download.brother.com/welcome/dlf102085/${name}.i386.deb";
+ url = "https://download.brother.com/welcome/dlf102085/${pname}-${version}.i386.deb";
sha256 = "170qdzxlqikzvv2wphvfb37m19mn13az4aj88md87ka3rl5knk4m";
};
diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
index 2099291d434b..b58e7b4faa44 100644
--- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2720dwlpr }:
stdenv.mkDerivation rec {
- name = "mfcl2720dwcupswrapper-${version}";
+ pname = "mfcl2720dwcupswrapper";
version = "3.2.0-1";
src = fetchurl {
- url = "https://download.brother.com/welcome/dlf101802/${name}.i386.deb";
+ url = "https://download.brother.com/welcome/dlf101802/${pname}-${version}.i386.deb";
sha256 = "6d131926ce22c51b1854d2b91e426cc7ecbf5d6dabd698ef51a417090e35c598";
};
diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
index 8dbc56fe846d..b4b16563610a 100644
--- a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
@@ -1,11 +1,11 @@
{ pkgs, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }:
stdenv.mkDerivation rec {
- name = "mfcl2720dwlpr-${version}";
+ pname = "mfcl2720dwlpr";
version = "3.2.0-1";
src = fetchurl {
- url = "https://download.brother.com/welcome/dlf101801/${name}.i386.deb";
+ url = "https://download.brother.com/welcome/dlf101801/${pname}-${version}.i386.deb";
sha256 = "088217e9ad118ec1e7f3d3f8f60f3bd839fe2c7d7c1136b249e9ac648dc742af";
};
diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
index 0da85498723f..f2303a45a2f3 100644
--- a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2740dwlpr }:
stdenv.mkDerivation rec {
- name = "mfcl2740dwcupswrapper-${version}";
+ pname = "mfcl2740dwcupswrapper";
version = "3.2.0-1";
src = fetchurl {
- url = "https://download.brother.com/welcome/dlf101726/${name}.i386.deb";
+ url = "https://download.brother.com/welcome/dlf101726/${pname}-${version}.i386.deb";
sha256 = "078453e19f20ab6c7fc4d63c3e09f162f3d1410c04c23a294b6ffbd720b35ffb";
};
diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
index 6d3cf18e5296..c2209806724a 100644
--- a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
@@ -1,11 +1,11 @@
{ pkgsi686Linux, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }:
stdenv.mkDerivation rec {
- name = "mfcl2740dwlpr-${version}";
+ pname = "mfcl2740dwlpr";
version = "3.2.0-1";
src = fetchurl {
- url = "https://download.brother.com/welcome/dlf101727/${name}.i386.deb";
+ url = "https://download.brother.com/welcome/dlf101727/${pname}-${version}.i386.deb";
sha256 = "10a2bc672bd54e718b478f3afc7e47d451557f7d5513167d3ad349a3d00bffaf";
};
diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
index 17040498acc0..50f3b583e42f 100644
--- a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
@@ -2,11 +2,11 @@
mfcl8690cdwlpr, perl, stdenv}:
stdenv.mkDerivation rec {
- name = "mfcl8690cdwcupswrapper-${version}";
+ pname = "mfcl8690cdwcupswrapper";
version = "1.4.0-0";
src = fetchurl {
- url = "http://download.brother.com/welcome/dlf103250/${name}.i386.deb";
+ url = "http://download.brother.com/welcome/dlf103250/${pname}-${version}.i386.deb";
sha256 = "1bl9r8mmj4vnanwpfjqgq3c9lf2v46wp5k6r2n9iqprf7ldd1kb2";
};
diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
index a521b3ea0218..0e088401c0a0 100644
--- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
@@ -2,11 +2,11 @@
makeWrapper, perl, pkgs, stdenv, which }:
stdenv.mkDerivation rec {
- name = "mfcl8690cdwlpr-${version}";
+ pname = "mfcl8690cdwlpr";
version = "1.3.0-0";
src = fetchurl {
- url = "http://download.brother.com/welcome/dlf103241/${name}.i386.deb";
+ url = "http://download.brother.com/welcome/dlf103241/${pname}-${version}.i386.deb";
sha256 = "0x8zd4b1psmw1znp2ibncs37xm5mljcy9yza2rx8jm8lp0a3l85v";
};
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
index b395d73a2669..8c906db642e1 100644
--- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
@@ -7,7 +7,7 @@ let
else "i386";
in stdenv.mkDerivation rec {
- name = "samsung-unified-linux-driver-${version}";
+ pname = "samsung-unified-linux-driver";
version = "1.00.36";
src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix
index b2c4bbb0f203..9135441a6e7d 100644
--- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix
+++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix
@@ -7,7 +7,7 @@ let
else "i386";
in stdenv.mkDerivation rec {
- name = "samsung-unified-linux-driver-${version}";
+ pname = "samsung-unified-linux-driver";
version = "1.00.37";
src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
index df0a270a5b2b..5dc397930706 100644
--- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
@@ -18,7 +18,7 @@
let
cups' = stdenv.lib.getLib cups;
in stdenv.mkDerivation rec {
- name = "samsung-UnifiedLinuxDriver-${version}";
+ pname = "samsung-UnifiedLinuxDriver";
version = "4.00.39";
src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix
index 547e25b6514e..f81fa27503fd 100644
--- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix
+++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix
@@ -20,7 +20,7 @@ let
appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else "";
libPath = stdenv.lib.makeLibraryPath [ cups libusb ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}";
in stdenv.mkDerivation rec {
- name = "samsung-UnifiedLinuxDriver-${version}";
+ pname = "samsung-UnifiedLinuxDriver";
version = "4.01.17";
src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/misc/cups/drivers/zj-58/default.nix
index 9321cf526bee..87a023af1ca7 100644
--- a/pkgs/misc/cups/drivers/zj-58/default.nix
+++ b/pkgs/misc/cups/drivers/zj-58/default.nix
@@ -1,9 +1,8 @@
{stdenv, fetchFromGitHub, cups}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "cups-zj-58";
version = "2018-02-22";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "klirichek";
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 2a0a4369860a..927755fdb743 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -8,11 +8,11 @@ let
binPath = stdenv.lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ];
in stdenv.mkDerivation rec {
- name = "cups-filters-${version}";
+ pname = "cups-filters";
version = "1.25.0";
src = fetchurl {
- url = "https://openprinting.org/download/cups-filters/${name}.tar.xz";
+ url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz";
sha256 = "1laiscq8yvynw862calkgbz9irrdkmd5l821q6a6wik1ifd186c1";
};
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index d865a8906cfb..5c9db63a63d9 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -27,29 +27,22 @@ in
let plugins = {
v330 = stdenv.mkDerivation rec {
name = "iscan-v330-bundle";
- version = "1.0.1";
- pluginVersion = "0.2.0";
+ version = "2.30.4";
src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz";
- sha256 = "f6fa455f04cdfbc3d38526573260746e9546830de93ba182d0365f557d2f7df9";
+ sha256 = "16iq5gmfcgkvcx5hixggxgb8lwin5gjdhnq0zabgpfqg11n2w21q";
};
- buildInputs = [ patchelf rpm ];
+ nativeBuildInputs = [ autoPatchelfHook rpm ];
installPhase = ''
- ${rpm}/bin/rpm2cpio "plugins/esci-interpreter-perfection-v330-${pluginVersion}-1.x86_64.rpm" | ${cpio}/bin/cpio -idmv
+ ${rpm}/bin/rpm2cpio plugins/esci-interpreter-perfection-v330-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out{,/share,/lib}
cp -r ./usr/share/{iscan-data,esci}/ $out/share/
cp -r ./usr/lib64/esci $out/lib
'';
- preFixup = ''
- lib=$out/lib/esci/libesci-interpreter-perfection-v330.so
- rpath=${gcc.cc.lib}/lib/
- patchelf --set-rpath $rpath $lib
- '';
-
passthru = {
registrationCommand = ''
$registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin"
@@ -60,28 +53,22 @@ let plugins = {
};
x770 = stdenv.mkDerivation rec {
pname = "iscan-gt-x770-bundle";
- version = "1.0.1";
- pluginVersion = "2.1.2-1";
+ version = "2.30.4";
- nativeBuildInputs = [ patchelf rpm ];
+ nativeBuildInputs = [ autoPatchelfHook rpm ];
src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz";
- sha256 = "0m9c60rszzdvq1pqfzygzzrjycm1giy465lj29108j7hsnfcv56r";
+ sha256 = "1cz4z3wz216s77z185m665jcgdslil5gn4dsi118nv1fm17z3jik";
};
installPhase = ''
cd plugins
- ${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-${pluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
+ ${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out
cp -r usr/share $out
cp -r usr/lib64 $out/lib
mv $out/share/iscan $out/share/esci
mv $out/lib/iscan $out/lib/esci
'';
- preFixup = ''
- lib=$out/lib/esci/libesint7C.so
- rpath=${gcc.cc.lib}/lib/
- patchelf --set-rpath $rpath $lib
- '';
passthru = {
registrationCommand = ''
$registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin"
@@ -92,26 +79,22 @@ let plugins = {
};
f720 = stdenv.mkDerivation rec {
pname = "iscan-gt-f720-bundle";
- version = "1.0.1";
- pluginVersion = "0.1.1-2";
+ version = "2.30.4";
- buildInputs = [ patchelf ];
+ nativeBuildInputs= [ autoPatchelfHook ];
+ buildInputs = [ gcc.cc.lib ];
src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz";
- sha256 = "0dvikq5ad6wid3lxw1amar8lsbr50g39g6zlmcjxdcsg0wb1qspp";
+ sha256 = "12rivh00n9mhagy5yjl1m0bv7ypbig6brqkxm0a12xy0mjq7yv8y";
};
installPhase = ''
cd plugins
- ${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-${pluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
+ ${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out
cp -r usr/share $out
cp -r usr/lib64 $out/lib
'';
- preFixup = ''
- lib=$out/lib/esci/libesci-interpreter-gt-f720.so
- rpath=${gcc.cc.lib}/lib/
- patchelf --set-rpath $rpath $lib
- '';
+
passthru = {
registrationCommand = ''
$registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin"
@@ -123,32 +106,24 @@ let plugins = {
};
s80 = stdenv.mkDerivation rec {
pname = "iscan-gt-s80-bundle";
- version = "1.0.1";
- esciPluginVersion = "0.2.1-1";
- esdipPluginVersion = "1.0.0-5";
+ version = "2.30.4";
- buildInputs = [ patchelf ];
+ nativeBuildInputs = [ autoPatchelfHook ];
+ buildInputs = [ gcc.cc.lib libtool ];
src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz";
- sha256 = "14j11znx5ga2ykpyg6kjg7lbrddyr9pwxrsa82dmdishd1j7zji9";
+ sha256 = "1ran75zsxcdci00jakngkz6p9lj4q483hjapmf80p68rzhpmdr5y";
};
installPhase = ''
cd plugins
- ${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-${esciPluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
- ${rpm}/bin/rpm2cpio iscan-plugin-esdip-${esdipPluginVersion}.ltdl7.x86_64.rpm | ${cpio}/bin/cpio -idmv
+ ${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+ ${rpm}/bin/rpm2cpio iscan-plugin-esdip-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out
cp -r usr/share $out
cp -r usr/lib64 $out/lib
mkdir $out/share/esci
'';
- preFixup = ''
- rpath=${gcc.cc.lib}/lib/
- patchelf --set-rpath $rpath $out/lib/esci/libesci-interpreter-gt-s80.so
- patchelf --set-rpath $rpath $out/lib/esci/libesci-interpreter-gt-s50.so
- patchelf --set-rpath $rpath $out/lib/iscan/esdip
- patchelf --set-rpath $rpath $out/lib/iscan/libesdtr.so.0
- patchelf --set-rpath $rpath $out/lib/iscan/libesdtr2.so.0
- '';
+
passthru = {
registrationCommand = ''
$registry --add interpreter usb 0x04b8 0x0136 "$plugin/lib/esci/libesci-interpreter-gt-s80.so"
@@ -163,19 +138,19 @@ let plugins = {
};
network = stdenv.mkDerivation rec {
pname = "iscan-nt-bundle";
- version = "1.0.0";
- ntPluginVersion = "1.1.1-1";
+ # for the version, look for the driver of XP-750 in the search page
+ version = "2.30.4";
buildInputs = [ stdenv.cc.cc.lib ];
nativeBuildInputs = [ autoPatchelfHook ];
src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz";
- sha256 = "1k3dmv4ml21k6mafvcvgfymb1acpcdxpvyrbfh2yf07jzmn5if4f";
+ sha256 = "1l0y4dy88y91jdq66pxrxqmiwsxwy0rd7x4bh0cw08r4iyhjqprz";
};
installPhase = ''
cd plugins
- ${rpm}/bin/rpm2cpio iscan-network-nt-${ntPluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
+ ${rpm}/bin/rpm2cpio iscan-network-nt-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out
cp -r usr/share $out
@@ -200,12 +175,12 @@ let fwdir = symlinkJoin {
};
in
let iscan-data = stdenv.mkDerivation rec {
- name = "iscan-data-${version}";
- version = "1.39.0-1";
+ pname = "iscan-data";
+ version = "1.39.1-2";
src = fetchurl {
url = "http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}.tar.gz";
- sha256 = "0pvm67gqyvzhnv5qyfbaz802l4sbgvaf0zb8wz60k1wcasb99vv1";
+ sha256 = "04zrvbnxf1k6zinrd13hwnbzscc3qhmwlvx3k2jhjys2lginw7w4";
};
buildInputs = [
@@ -216,12 +191,12 @@ let iscan-data = stdenv.mkDerivation rec {
};
in
stdenv.mkDerivation rec {
- name = "iscan-${version}";
- version = "2.30.3-1";
+ pname = "iscan";
+ version = "2.30.4-2";
src = fetchurl {
url = "http://support.epson.net/linux/src/scanner/iscan/iscan_${version}.tar.gz";
- sha256 = "0ryy946h7ddmxh866hfszqfyff1qy4svpsk7w3739v75f4awr9li";
+ sha256 = "1ma76jj0k3bz0fy06fiyl4di4y77rcryb0mwjmzs5ms2vq9rjysr";
};
nativeBuildInputs = [ pkgconfig ];
@@ -243,7 +218,7 @@ stdenv.mkDerivation rec {
];
patchFlags = "-p0";
- configureFlags = [ "--disable-static" "--enable-dependency-reduction" "--disable-frontend"];
+ configureFlags = [ "--enable-dependency-reduction" "--disable-frontend"];
postConfigure = ''
echo '#define NIX_ESCI_PREFIX "'${fwdir}'"' >> config.h
diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/misc/drivers/epson-201106w/default.nix
index c61bfb806c59..0fa637e040e2 100644
--- a/pkgs/misc/drivers/epson-201106w/default.nix
+++ b/pkgs/misc/drivers/epson-201106w/default.nix
@@ -6,7 +6,8 @@ let
in
stdenv.mkDerivation {
- name = "epson-201106w-${version}";
+ pname = "epson-201106w";
+ inherit version;
src = fetchurl {
url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm";
diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix
index 1dac6034fdab..fe52b104a528 100644
--- a/pkgs/misc/drivers/epson-alc1100/default.nix
+++ b/pkgs/misc/drivers/epson-alc1100/default.nix
@@ -9,7 +9,8 @@ let
};
in
stdenv.mkDerivation {
- name = "epson-alc1100-${version}";
+ pname = "epson-alc1100";
+ inherit version;
src = fetchurl {
url = "http://a1227.g.akamai.net/f/1227/40484/7d/download.ebz.epson.net/dsc/f/01/00/01/58/65/cd71929d2bf41ebf7e96f68fa9f1279556545ef1/Epson-ALC1100-filter-1.2.tar.gz";
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
index ce95ca00e110..3d6fb8f081ab 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cups }:
-stdenv.mkDerivation rec {
- name = "epson-escpr-${version}";
+stdenv.mkDerivation {
+ pname = "epson-escpr";
version = "1.6.16";
src = fetchurl {
diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix
index 9ce6f5d7b010..2110de6e4c11 100644
--- a/pkgs/misc/drivers/epson-escpr2/default.nix
+++ b/pkgs/misc/drivers/epson-escpr2/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cups, busybox }:
stdenv.mkDerivation rec {
- name = "epson-inkjet-printer-escpr2-${version}";
+ pname = "epson-inkjet-printer-escpr2";
version = "1.0.29";
src = fetchurl {
- url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${name}-1lsb3.2.src.rpm";
+ url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${pname}-${version}-1lsb3.2.src.rpm";
sha256 = "064br52akpw5yrxb2wqw2klv4jrvyipa7w0rjj974xgyi781lqs5";
};
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
unpackPhase = ''
rpm2cpio $src | cpio -idmv
- tar xvf ${name}-1lsb3.2.tar.gz
- cd ${name}
+ tar xvf ${pname}-${version}-1lsb3.2.tar.gz
+ cd ${pname}-${version}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/misc/drivers/epson_201207w/default.nix
index 2a92f8a59d91..9da1a8269ab1 100644
--- a/pkgs/misc/drivers/epson_201207w/default.nix
+++ b/pkgs/misc/drivers/epson_201207w/default.nix
@@ -5,7 +5,8 @@ let
in
stdenv.mkDerivation {
- name = "epson_201207w-${version}";
+ pname = "epson_201207w";
+ inherit version;
src = fetchurl {
url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201207w-${version}-1lsb3.2.src.rpm";
diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix
index ebea49d9540a..779325c99b0b 100644
--- a/pkgs/misc/drivers/hplip/3.16.11.nix
+++ b/pkgs/misc/drivers/hplip/3.16.11.nix
@@ -28,14 +28,14 @@ let
};
hplipPlatforms = {
- "i686-linux" = "x86_32";
- "x86_64-linux" = "x86_64";
- "armv6l-linux" = "arm32";
- "armv7l-linux" = "arm32";
- "aarch64-linux" = "arm64";
+ i686-linux = "x86_32";
+ x86_64-linux = "x86_64";
+ armv6l-linux = "arm32";
+ armv7l-linux = "arm32";
+ aarch64-linux = "arm64";
};
- hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}"
+ hplipArch = hplipPlatforms.${stdenv.hostPlatform.system}
or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}");
pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ];
diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix
index 68220392fd00..d95eb85168e2 100644
--- a/pkgs/misc/drivers/hplip/3.18.5.nix
+++ b/pkgs/misc/drivers/hplip/3.18.5.nix
@@ -30,14 +30,14 @@ let
};
hplipPlatforms = {
- "i686-linux" = "x86_32";
- "x86_64-linux" = "x86_64";
- "armv6l-linux" = "arm32";
- "armv7l-linux" = "arm32";
- "aarch64-linux" = "arm64";
+ i686-linux = "x86_32";
+ x86_64-linux = "x86_64";
+ armv6l-linux = "arm32";
+ armv7l-linux = "arm32";
+ aarch64-linux = "arm64";
};
- hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}"
+ hplipArch = hplipPlatforms.${stdenv.hostPlatform.system}
or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}");
pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ];
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 851aa9f3f882..978fd9b9e039 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -30,13 +30,13 @@ let
};
hplipPlatforms = {
- "i686-linux" = "x86_32";
- "x86_64-linux" = "x86_64";
- "armv6l-linux" = "arm32";
- "armv7l-linux" = "arm32";
+ i686-linux = "x86_32";
+ x86_64-linux = "x86_64";
+ armv6l-linux = "arm32";
+ armv7l-linux = "arm32";
};
- hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}"
+ hplipArch = hplipPlatforms.${stdenv.hostPlatform.system}
or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}");
pluginArches = [ "x86_32" "x86_64" "arm32" ];
diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix
index 31b13baf7964..2dd32a93219d 100644
--- a/pkgs/misc/drivers/moltengamepad/default.nix
+++ b/pkgs/misc/drivers/moltengamepad/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, udev }:
-stdenv.mkDerivation rec {
- name = "moltengamepad-git-${version}";
+stdenv.mkDerivation {
+ pname = "moltengamepad-git";
version = "2016-05-04";
src = fetchFromGitHub {
diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix
index a7d5710a2793..cd322bf8fdb7 100644
--- a/pkgs/misc/drivers/postscript-lexmark/default.nix
+++ b/pkgs/misc/drivers/postscript-lexmark/default.nix
@@ -3,7 +3,8 @@ let
version = "20160218";
in
stdenv.mkDerivation {
- name = "postscript-lexmark-${version}";
+ pname = "postscript-lexmark";
+ inherit version;
src = fetchurl {
url = "https://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS/noarch/openprinting-ppds-postscript-lexmark-${version}-1lsb3.2.noarch.rpm";
diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix
index d44c90d198a9..4b19932450ec 100644
--- a/pkgs/misc/drivers/steamcontroller/default.nix
+++ b/pkgs/misc/drivers/steamcontroller/default.nix
@@ -4,8 +4,8 @@
with python3Packages;
-buildPythonApplication rec {
- name = "steamcontroller-${version}";
+buildPythonApplication {
+ pname = "steamcontroller";
version = "2017-08-11";
src = fetchFromGitHub {
diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix
index 35a9bd2e3844..be199936426c 100644
--- a/pkgs/misc/drivers/sundtek/default.nix
+++ b/pkgs/misc/drivers/sundtek/default.nix
@@ -17,7 +17,8 @@ in
url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz";
sha256 = "15y6r5w306pcq4g1rn9f7vf70f3a7qhq237ngaf0wxh2nr0aamxp";
};
- name = "sundtek-${version}";
+ pname = "sundtek";
+ inherit version;
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix
index c942ec59f37e..1ed279d2998b 100644
--- a/pkgs/misc/drivers/xboxdrv/default.nix
+++ b/pkgs/misc/drivers/xboxdrv/default.nix
@@ -4,7 +4,8 @@
let
version = "0.8.8";
in stdenv.mkDerivation {
- name = "xboxdrv-${version}";
+ pname = "xboxdrv";
+ inherit version;
src = fetchurl {
url = "https://github.com/xboxdrv/xboxdrv/archive/v${version}.tar.gz";
diff --git a/pkgs/misc/dumb/default.nix b/pkgs/misc/dumb/default.nix
index 36f6ca5b8c0c..829367aa3299 100644
--- a/pkgs/misc/dumb/default.nix
+++ b/pkgs/misc/dumb/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, allegro, SDL2 }:
stdenv.mkDerivation rec {
- name = "dumb-${version}";
+ pname = "dumb";
version = "2.0.3";
enableParallelBuilding = true;
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix
index 5a37b1b32c5b..2e6ccd0a4918 100644
--- a/pkgs/misc/emulators/atari++/default.nix
+++ b/pkgs/misc/emulators/atari++/default.nix
@@ -2,7 +2,7 @@
with stdenv.lib;
stdenv.mkDerivation rec{
- name = "atari++-${version}";
+ pname = "atari++";
version = "1.81";
src = fetchurl {
diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix
index 4806c7f9e0f1..228da6870947 100644
--- a/pkgs/misc/emulators/atari800/default.nix
+++ b/pkgs/misc/emulators/atari800/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec{
- name = "atari800-${version}";
+ pname = "atari800";
version = "4.0.0";
src = fetchurl {
- url = "mirror://sourceforge/atari800/atari800/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/atari800/atari800/${version}/${pname}-${version}.tar.gz";
sha256 = "1dcynsf8i52y7zyg62bkbhl3rdd22ss95zs2s9jm4y5jvn4vks88";
};
diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix
index 601503dc07ec..a725d9c9b086 100644
--- a/pkgs/misc/emulators/attract-mode/default.nix
+++ b/pkgs/misc/emulators/attract-mode/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "attract-mode-${version}";
+ pname = "attract-mode";
version = "2.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix
index 666f953f6b57..39a7e38e0346 100644
--- a/pkgs/misc/emulators/blastem/default.nix
+++ b/pkgs/misc/emulators/blastem/default.nix
@@ -2,8 +2,8 @@
let
vasm =
- stdenv.mkDerivation rec {
- name = "vasm-${version}";
+ stdenv.mkDerivation {
+ pname = "vasm";
version = "1.8c";
src = fetchFromGitHub {
owner = "mbitsnbites";
@@ -18,8 +18,8 @@ let
'';
};
in
-stdenv.mkDerivation rec {
- name = "blastem-${version}";
+stdenv.mkDerivation {
+ pname = "blastem";
version = "0.5.1";
src = fetchurl {
url = "https://www.retrodev.com/repos/blastem/archive/3d48cb0c28be.tar.gz";
diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix
index a560ecd0a21d..127770328707 100644
--- a/pkgs/misc/emulators/ccemux/default.nix
+++ b/pkgs/misc/emulators/ccemux/default.nix
@@ -25,7 +25,7 @@ let
desktopItem = makeDesktopItem {
name = "CCEmuX";
exec = "ccemux";
- icon = "${desktopIcon}";
+ icon = desktopIcon;
comment = "A modular ComputerCraft emulator";
desktopName = "CCEmuX";
genericName = "ComputerCraft Emulator";
@@ -34,7 +34,8 @@ let
in
stdenv.mkDerivation rec {
- name = "ccemux-${version}";
+ pname = "ccemux";
+ inherit version;
src = jar;
dontUnpack = true;
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
index 33c5d3cebf14..71beaf125481 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, kernel }:
stdenv.mkDerivation rec {
- name = "vhba-${version}";
+ pname = "vhba";
version = "20190410";
src = fetchurl {
diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix
index 3e8f78c44115..d8717b46eef4 100644
--- a/pkgs/misc/emulators/citra/default.nix
+++ b/pkgs/misc/emulators/citra/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }:
-stdenv.mkDerivation rec {
- name = "citra-${version}";
+stdenv.mkDerivation {
+ pname = "citra";
version = "2019-05-25";
# Submodules
diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix
index 70e7351e295c..bdec34e396f7 100644
--- a/pkgs/misc/emulators/darcnes/default.nix
+++ b/pkgs/misc/emulators/darcnes/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libX11, libXt, libXext, libXaw }:
stdenv.mkDerivation rec {
- name = "darcnes-${version}";
+ pname = "darcnes";
version = "9b0401";
src = fetchurl {
diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix
index d177012546e9..6bb5be3c7137 100644
--- a/pkgs/misc/emulators/desmume/default.nix
+++ b/pkgs/misc/emulators/desmume/default.nix
@@ -10,11 +10,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "desmume-${version}";
+ pname = "desmume";
version = "0.9.11";
src = fetchurl {
- url = "mirror://sourceforge/project/desmume/desmume/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/desmume/desmume/${version}/${pname}-${version}.tar.gz";
sha256 = "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs";
};
diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
index a14f18da4669..303c2f82d9ef 100644
--- a/pkgs/misc/emulators/dolphin-emu/default.nix
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -5,7 +5,7 @@
, libpulseaudio ? null }:
stdenv.mkDerivation rec {
- name = "dolphin-emu-${version}";
+ pname = "dolphin-emu";
version = "5.0";
src = fetchFromGitHub {
@@ -22,6 +22,12 @@ stdenv.mkDerivation rec {
name = "dolphin-emu-5.0-soundtouch-exception-fix.patch";
sha256 = "0yd3l46nja5qiknnl30ryad98f3v8911jwnr67hn61dzx2kwbbaw";
})
+ # Fix build with gcc 8
+ (fetchpatch {
+ url = "https://salsa.debian.org/games-team/dolphin-emu/raw/9b7b4aeac1b60dcf28bdcafbed6bc498b2aeb0ad/debian/patches/03_gcc8.patch";
+ name = "03_gcc8.patch";
+ sha256 = "1da95gb8c95kd5cjhdvg19cv2z863lj3va5gx3bqc7g8r36glqxr";
+ })
];
postPatch = ''
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index ab8ec6868cf2..e96b2e07890e 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -20,7 +20,7 @@ let
startupNotify = "false";
};
in stdenv.mkDerivation rec {
- name = "dolphin-emu-${version}";
+ pname = "dolphin-emu";
version = "5.0-10879";
src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix
index 9dec1ecacae0..d8f5f1cbdb03 100644
--- a/pkgs/misc/emulators/emulationstation/default.nix
+++ b/pkgs/misc/emulators/emulationstation/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen
, freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }:
-stdenv.mkDerivation rec {
- name = "emulationstation-${version}";
+stdenv.mkDerivation {
+ pname = "emulationstation";
version = "2.0.1a";
src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix
index edf4fe017a2e..6950e12e889a 100644
--- a/pkgs/misc/emulators/epsxe/default.nix
+++ b/pkgs/misc/emulators/epsxe/default.nix
@@ -4,7 +4,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "epsxe-${version}";
+ pname = "epsxe";
version = "2.0.5";
src = let
diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix
index 882bf13f4eaf..079af05e794d 100644
--- a/pkgs/misc/emulators/firebird-emu/default.nix
+++ b/pkgs/misc/emulators/firebird-emu/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }:
stdenv.mkDerivation rec {
- name = "firebird-emu-${version}";
+ pname = "firebird-emu";
version = "1.4";
src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix
index 9856c93eda2d..7e1272faf11b 100644
--- a/pkgs/misc/emulators/fs-uae/default.nix
+++ b/pkgs/misc/emulators/fs-uae/default.nix
@@ -4,11 +4,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "fs-uae-${version}";
+ pname = "fs-uae";
version = "2.8.4";
src = fetchurl {
- url = "https://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz";
+ url = "https://fs-uae.net/fs-uae/stable/${version}/${pname}-${version}.tar.gz";
sha256 = "19ccb3gbpjwwazqc9pyin3jicjl27m2gyvy5bb5zysq0mxpzassj";
};
diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix
index 418d6440b694..da53b4f8c557 100644
--- a/pkgs/misc/emulators/gens-gs/default.nix
+++ b/pkgs/misc/emulators/gens-gs/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 SDL nasm zlib libpng libGLU_combined ];
- # Work around build failures on recent GTK+.
+ # Work around build failures on recent GTK.
# See http://ubuntuforums.org/showthread.php?p=10535837
NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE";
diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix
index ea2d6bbfecc8..04c5b441f013 100644
--- a/pkgs/misc/emulators/gxemul/default.nix
+++ b/pkgs/misc/emulators/gxemul/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "gxemul-${version}";
+ pname = "gxemul";
version = "0.6.0.1";
src = fetchurl {
- url = "http://gxemul.sourceforge.net/src/${name}.tar.gz";
+ url = "http://gxemul.sourceforge.net/src/${pname}-${version}.tar.gz";
sha256 = "1afd9l0igyv7qgc0pn3rkdgrl5d0ywlyib0qhg4li23zilyq5407";
};
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin;
- mkdir -p $out/share/${name};
+ mkdir -p $out/share/${pname}-${version};
cp gxemul $out/bin;
- cp -r doc $out/share/${name};
- cp -r demos $out/share/${name};
+ cp -r doc $out/share/${pname}-${version};
+ cp -r demos $out/share/${pname}-${version};
cp -r ./man $out/;
'';
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index 1349fa0f0b6f..ad96ca36bc16 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -10,7 +10,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "higan-${version}";
+ pname = "higan";
version = "106";
sourceName = "higan_v${version}-source";
diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix
index 32d3013d842c..da6a7c8bf2f3 100644
--- a/pkgs/misc/emulators/kega-fusion/default.nix
+++ b/pkgs/misc/emulators/kega-fusion/default.nix
@@ -3,8 +3,8 @@
let
libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ];
-in stdenv.mkDerivation rec {
- name = "kega-fusion-${version}";
+in stdenv.mkDerivation {
+ pname = "kega-fusion";
version = "3.63x";
src = fetchurl {
diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix
index 32201c48ee98..edb70ba72648 100644
--- a/pkgs/misc/emulators/libdsk/default.nix
+++ b/pkgs/misc/emulators/libdsk/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libdsk-${version}";
+ pname = "libdsk";
version = "1.5.10";
src = fetchurl {
- url = "https://www.seasip.info/Unix/LibDsk/${name}.tar.gz";
+ url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz";
sha256 = "0ndkwyf8dp252v4yhqphvi32gmz9m5kkdqwv0aw92cz7mfbnp36g";
};
diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index 9101c1587c25..74c456cfb105 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -2,11 +2,11 @@
, libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }:
stdenv.mkDerivation rec {
- name = "mednafen-${version}";
+ pname = "mednafen";
version = "0.9.48";
src = fetchurl {
- url = "https://mednafen.github.io/releases/files/${name}.tar.xz";
+ url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz";
sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k";
};
diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix
index 75eeeea4c008..146d53202614 100644
--- a/pkgs/misc/emulators/mednafen/server.nix
+++ b/pkgs/misc/emulators/mednafen/server.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "mednafen-server-${version}";
+ pname = "mednafen-server";
version = "0.5.2";
src = fetchurl {
diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix
index c62d9c90ca79..40390068e7be 100644
--- a/pkgs/misc/emulators/mednaffe/default.nix
+++ b/pkgs/misc/emulators/mednaffe/default.nix
@@ -4,7 +4,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "mednaffe-${version}";
+ pname = "mednaffe";
version = "0.8.6";
src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
index 039bc57e6031..6dc7bc30f322 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -14,7 +14,7 @@ let
startupNotify = "false";
};
in stdenv.mkDerivation rec {
- name = "mgba-${version}";
+ pname = "mgba";
version = "0.7.2";
src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix
index 9ff99110eccf..460dd7ad5fb5 100644
--- a/pkgs/misc/emulators/mupen64plus/default.nix
+++ b/pkgs/misc/emulators/mupen64plus/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }:
stdenv.mkDerivation rec {
- name = "mupen64plus-${version}";
+ pname = "mupen64plus";
version = "2.5";
src = fetchurl {
diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix
index 5bc7bcec9d41..4f02d0f147d4 100644
--- a/pkgs/misc/emulators/nestopia/default.nix
+++ b/pkgs/misc/emulators/nestopia/default.nix
@@ -5,12 +5,12 @@
stdenv.mkDerivation rec {
version = "1.47";
- name = "nestopia-${version}";
+ pname = "nestopia";
src = fetchFromGitHub {
owner = "rdanbrook";
repo = "nestopia";
- rev = "${version}";
+ rev = version;
sha256 = "0frr0gvjh5mxzdhj0ii3sh671slgnzlm8naqlc4h87rx4p4sz2y2";
};
diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix
index d2539cbc8171..6ac6f93750e5 100644
--- a/pkgs/misc/emulators/openmsx/default.nix
+++ b/pkgs/misc/emulators/openmsx/default.nix
@@ -6,9 +6,9 @@
, freetype, tcl, zlib
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
- name = "openmsx-${version}";
+ pname = "openmsx";
version = "git-2017-11-02";
src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix
index 851c05c0578b..1924452e2abe 100644
--- a/pkgs/misc/emulators/pcsx2/default.nix
+++ b/pkgs/misc/emulators/pcsx2/default.nix
@@ -3,7 +3,7 @@
, wxGTK30, zlib }:
stdenv.mkDerivation rec {
- name = "pcsx2-${version}";
+ pname = "pcsx2";
version = "1.4.0";
src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix
index 5af3042bde4d..8f1e5e02c186 100644
--- a/pkgs/misc/emulators/pcsxr/default.nix
+++ b/pkgs/misc/emulators/pcsxr/default.nix
@@ -3,7 +3,7 @@
, fetchpatch }:
stdenv.mkDerivation rec {
- name = "pcsxr-${version}";
+ pname = "pcsxr";
version = "1.9.94";
# codeplex does not support direct downloading
@@ -67,14 +67,14 @@ stdenv.mkDerivation rec {
];
postInstall = ''
- mkdir -p "$out/share/doc/${name}"
+ mkdir -p "$out/share/doc/${pname}-${version}"
cp README \
AUTHORS \
doc/keys.txt \
doc/tweaks.txt \
ChangeLog.df \
ChangeLog \
- "$out/share/doc/${name}"
+ "$out/share/doc/${pname}-${version}"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
index 159eefad6662..619938ba5c64 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -5,7 +5,7 @@ assert withGamepads -> (SDL2 != null);
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "ppsspp-${version}";
+ pname = "ppsspp";
version = "1.4.2";
src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix
index 65cc0bd9c05a..ca8d87b38005 100644
--- a/pkgs/misc/emulators/qmc2/default.nix
+++ b/pkgs/misc/emulators/qmc2/default.nix
@@ -8,11 +8,11 @@
}:
stdenv.mkDerivation rec {
- name = "qmc2-${version}";
+ pname = "qmc2";
version = "0.195";
src = fetchurl {
- url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${pname}-${version}.tar.gz";
sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns";
};
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 3f20390fba73..fbde2ff54c9e 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -67,7 +67,7 @@ in with stdenv.lib.licenses;
buildPhase = "make";
};
- beetle-pce-fast = let der = (mkLibRetroCore rec {
+ beetle-pce-fast = let der = (mkLibRetroCore {
core = "mednafen-pce-fast";
src = fetchRetro {
repo = "beetle-pce-fast-libretro";
@@ -81,7 +81,7 @@ in with stdenv.lib.licenses;
name = "beetle-pce-fast-${der.version}";
};
- beetle-psx = let der = (mkLibRetroCore rec {
+ beetle-psx = let der = (mkLibRetroCore {
core = "mednafen-psx";
src = fetchRetro {
repo = "beetle-psx-libretro";
@@ -95,7 +95,7 @@ in with stdenv.lib.licenses;
name = "beetle-psx-${der.version}";
};
- beetle-saturn = let der = (mkLibRetroCore rec {
+ beetle-saturn = let der = (mkLibRetroCore {
core = "mednafen-saturn";
src = fetchRetro {
repo = "beetle-saturn-libretro";
@@ -110,7 +110,7 @@ in with stdenv.lib.licenses;
meta.platforms = [ "x86_64-linux" ];
};
- bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore rec {
+ bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore {
core = bname + "-accuracy";
src = fetchRetro {
repo = bname;
@@ -204,7 +204,7 @@ in with stdenv.lib.licenses;
license = gpl2;
};
- genesis-plus-gx = mkLibRetroCore rec {
+ genesis-plus-gx = mkLibRetroCore {
core = "genesis-plus-gx";
src = fetchRetro {
repo = "Genesis-Plus-GX";
@@ -215,7 +215,7 @@ in with stdenv.lib.licenses;
license = "Non-commercial";
};
- higan-sfc = (mkLibRetroCore rec {
+ higan-sfc = (mkLibRetroCore {
core = "higan-sfc";
src = fetchFromGitLab {
owner = "higan";
@@ -346,7 +346,7 @@ in with stdenv.lib.licenses;
buildPhase = "make";
};
- quicknes = (mkLibRetroCore rec {
+ quicknes = (mkLibRetroCore {
core = "quicknes";
src = fetchRetro {
repo = "QuickNES_Core";
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index ee7ff114ec8f..f26769cd28dd 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -26,7 +26,7 @@ let
};
in stdenv.mkDerivation rec {
- name = "retroarch-bare-${version}";
+ pname = "retroarch-bare";
version = "1.7.5";
src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
index 1072a66e0eac..d751c4f7fc43 100644
--- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
+++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
@@ -17,8 +17,8 @@ let
in
-stdenv.mkDerivation rec {
- name = "kodi-retroarch-advanced-launchers-${version}";
+stdenv.mkDerivation {
+ pname = "kodi-retroarch-advanced-launchers";
version = "0.2";
dontBuild = true;
diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix
index 2537669bbc42..44571de3489d 100644
--- a/pkgs/misc/emulators/retrofe/default.nix
+++ b/pkgs/misc/emulators/retrofe/default.nix
@@ -2,8 +2,8 @@
, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell
}:
-stdenv.mkDerivation rec {
- name = "retrofe-${version}";
+stdenv.mkDerivation {
+ pname = "retrofe";
version = "0.6.169";
src = fetchhg {
diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix
index 4c44377c11e6..674222dc3555 100644
--- a/pkgs/misc/emulators/rpcs3/default.nix
+++ b/pkgs/misc/emulators/rpcs3/default.nix
@@ -9,8 +9,8 @@ let
majorVersion = "0.0.6";
gitVersion = "8187-790962425"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
in
-stdenv.mkDerivation rec {
- name = "rpcs3-${version}";
+stdenv.mkDerivation {
+ pname = "rpcs3";
version = "${majorVersion}-${gitVersion}";
src = fetchgit {
diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix
index a58f95875ccf..0ae92121cab1 100644
--- a/pkgs/misc/emulators/snes9x-gtk/default.nix
+++ b/pkgs/misc/emulators/snes9x-gtk/default.nix
@@ -2,7 +2,7 @@
, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, portaudio }:
stdenv.mkDerivation rec {
- name = "snes9x-gtk-${version}";
+ pname = "snes9x-gtk";
version = "1.57";
src = fetchFromGitHub {
diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
index 41ba5a3b2e61..c2d98cda060d 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "stella-${version}";
+ pname = "stella";
version = "4.6.1";
src = fetchurl {
- url = "mirror://sourceforge/project/stella/stella/${version}/${name}-src.tar.gz";
+ url = "mirror://sourceforge/project/stella/stella/${version}/${pname}-${version}-src.tar.gz";
sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1";
};
diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix
index c8712d208590..4df9086a317f 100644
--- a/pkgs/misc/emulators/vbam/default.nix
+++ b/pkgs/misc/emulators/vbam/default.nix
@@ -14,7 +14,7 @@
}:
stdenv.mkDerivation rec {
- name = "visualboyadvance-m-${version}";
+ pname = "visualboyadvance-m";
version = "2.1.3";
src = fetchFromGitHub {
owner = "visualboyadvance-m";
diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix
index a2d462fd990e..ed8652d08f1b 100644
--- a/pkgs/misc/emulators/yabause/default.nix
+++ b/pkgs/misc/emulators/yabause/default.nix
@@ -2,11 +2,11 @@
, freeglut ? null, openal ? null, SDL2 ? null }:
stdenv.mkDerivation rec {
- name = "yabause-${version}";
+ pname = "yabause";
version = "0.9.15";
src = fetchurl {
- url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz";
+ url = "https://download.tuxfamily.org/yabause/releases/${version}/${pname}-${version}.tar.gz";
sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23";
};
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 446aac629829..5b80a5536259 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -36,10 +36,11 @@ let
in
stdenv.mkDerivation rec {
- name = "ghostscript-${version}";
+ pname = "ghostscript";
+ inherit version;
src = fetchurl {
- url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${name}.tar.xz";
+ url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${pname}-${version}.tar.xz";
inherit sha512;
};
diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix
index 991be274ecc9..e866a1937d69 100644
--- a/pkgs/misc/gnash/default.nix
+++ b/pkgs/misc/gnash/default.nix
@@ -64,8 +64,8 @@ assert length toolkits == 0 -> throw "at least one GUI toolkit must be enabled"
assert length renderers == 0 -> throw "at least one renderer must be enabled";
-stdenv.mkDerivation rec {
- name = "gnash-${version}";
+stdenv.mkDerivation {
+ pname = "gnash";
version = "0.8.11-2019-30-01";
src = fetchgit {
diff --git a/pkgs/misc/gnuk/default.nix b/pkgs/misc/gnuk/default.nix
index f3d5450c94ba..4597fa40390d 100644
--- a/pkgs/misc/gnuk/default.nix
+++ b/pkgs/misc/gnuk/default.nix
@@ -1,6 +1,6 @@
{ callPackage, fetchgit, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "1.0.4";
src = fetchgit {
diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
index 8c9838ccec53..cb487677881a 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/pkgs/misc/jackaudio/jack1.nix
@@ -14,7 +14,7 @@ let
optCelt = shouldUsePkg celt;
in
stdenv.mkDerivation rec {
- name = "jack1-${version}";
+ pname = "jack1";
version = "0.125.0";
src = fetchurl {
diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix
index 7f355bc81560..0c3370814bc3 100644
--- a/pkgs/misc/libcardiacarrest/default.nix
+++ b/pkgs/misc/libcardiacarrest/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "libcardiacarrest-${version}";
+ pname = "libcardiacarrest";
version = "12.2.8"; # .
src = fetchFromGitHub {
diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix
index bb3ade6b616f..5e3f1bb79811 100644
--- a/pkgs/misc/lightspark/default.nix
+++ b/pkgs/misc/lightspark/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "lightspark";
repo = "lightspark";
- rev = "${version}";
+ rev = version;
sha256 = "0chydd516wfi73n8dvivk6nwxb9kjimdfghyv9sffmqmza0mv13s";
};
diff --git a/pkgs/misc/logging/beats/5.x.nix b/pkgs/misc/logging/beats/5.x.nix
deleted file mode 100644
index fb8bb5a85c8b..000000000000
--- a/pkgs/misc/logging/beats/5.x.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchFromGitHub, elk5Version, buildGoPackage, libpcap }:
-
-let beat = package : extraArgs : buildGoPackage (rec {
- name = "${package}-${version}";
- version = elk5Version;
-
- src = fetchFromGitHub {
- owner = "elastic";
- repo = "beats";
- rev = "v${version}";
- sha256 = "0sslcwjdf7zb9xj2c98jid3rb09l96m22k3af48gppimxg1lkh9b";
- };
-
- goPackagePath = "github.com/elastic/beats";
-
- subPackages = [ package ];
-
- meta = with stdenv.lib; {
- homepage = https://www.elastic.co/products/beats;
- license = licenses.asl20;
- maintainers = with maintainers; [ fadenb basvandijk ];
- platforms = platforms.linux;
- };
- } // extraArgs);
-in {
- filebeat5 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";};
- heartbeat5 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";};
- metricbeat5 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";};
- packetbeat5 = beat "packetbeat" {
- buildInputs = [ libpcap ];
- meta.description = "Network packet analyzer that ships data to Elasticsearch";
- meta.longDescription = ''
- Packetbeat is an open source network packet analyzer that ships the
- data to Elasticsearch.
-
- Think of it like a distributed real-time Wireshark with a lot more
- analytics features. The Packetbeat shippers sniff the traffic between
- your application processes, parse on the fly protocols like HTTP, MySQL,
- PostgreSQL, Redis or Thrift and correlate the messages into transactions.
- '';
- };
-}
diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix
index 2f7e38692eb1..fe1f655246ef 100644
--- a/pkgs/misc/logging/beats/6.x.nix
+++ b/pkgs/misc/logging/beats/6.x.nix
@@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
owner = "elastic";
repo = "beats";
rev = "v${version}";
- sha256 = "0if08dxibdnqpsxs8f6hvw147j0j8bavhcm11scn28j9id65absq";
+ sha256 = "0jkiz5dfdi9zsji04ipcmcj7pml9294v455y7s2c22k24gyzbaw8";
};
goPackagePath = "github.com/elastic/beats";
diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix
index 12e08dfeec69..7d0feef38682 100644
--- a/pkgs/misc/logging/beats/7.x.nix
+++ b/pkgs/misc/logging/beats/7.x.nix
@@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
owner = "elastic";
repo = "beats";
rev = "v${version}";
- sha256 = "1ca6a4zm062jpqwhmd8ivvzha1cvrw7mg5342vnmn99xdlr1pk9j";
+ sha256 = "0715fgqw6mqms4zld8wyf6appvvpfb1hglcmcn852c66a8zwr2r2";
};
goPackagePath = "github.com/elastic/beats";
diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix
index 1a064e8c627d..5af75be690cb 100644
--- a/pkgs/misc/long-shebang/default.nix
+++ b/pkgs/misc/long-shebang/default.nix
@@ -1,7 +1,8 @@
{ stdenv, fetchurl }: let
version = "1.2.0";
in stdenv.mkDerivation {
- name = "long-shebang-${version}";
+ pname = "long-shebang";
+ inherit version;
src = fetchurl {
url = "https://github.com/shlevy/long-shebang/releases/download/v${version}/long-shebang-${version}.tar.xz";
diff --git a/pkgs/misc/mnemonicode/default.nix b/pkgs/misc/mnemonicode/default.nix
index d977d822351e..ec0dd0b1fd52 100644
--- a/pkgs/misc/mnemonicode/default.nix
+++ b/pkgs/misc/mnemonicode/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "mnemonicode-${version}";
+stdenv.mkDerivation {
+ pname = "mnemonicode";
version = "2015-11-30";
src = fetchFromGitHub {
owner = "singpolyma";
diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix
index fe9e8d3f4b00..d701bd654d21 100644
--- a/pkgs/misc/mxt-app/default.nix
+++ b/pkgs/misc/mxt-app/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec{
version="1.28";
- name = "mxt-app-${version}";
+ pname = "mxt-app";
src = fetchFromGitHub {
owner = "atmel-maxtouch";
diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix
index 25441a30d86b..ea2435c50ae1 100644
--- a/pkgs/misc/sailsd/default.nix
+++ b/pkgs/misc/sailsd/default.nix
@@ -10,11 +10,11 @@ let
in
stdenv.mkDerivation rec {
version = "0.2.0";
- name = "sailsd-${version}";
+ pname = "sailsd";
src = fetchFromGitHub {
owner = "sails-simulator";
repo = "sailsd";
- rev = "${version}";
+ rev = version;
sha256 = "147cr4aw1kw4gv3bhn0cska855kmyah8m70vdw1q2lwz56lbf4mb";
};
diff --git a/pkgs/misc/scream-receivers/default.nix b/pkgs/misc/scream-receivers/default.nix
index aa88bd8a96c8..2ca00ccc9cea 100644
--- a/pkgs/misc/scream-receivers/default.nix
+++ b/pkgs/misc/scream-receivers/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "duncanthrax";
repo = "scream";
- rev = "${version}";
+ rev = version;
sha256 = "1iqhs7m0fv3vfld7h288j5j0jc5xdihaghd0jd9qrk68mj2g6g9w";
};
diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix
index cd5db3067f41..d25f253bd005 100644
--- a/pkgs/misc/screensavers/betterlockscreen/default.nix
+++ b/pkgs/misc/screensavers/betterlockscreen/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "betterlockscreen-${version}";
+ pname = "betterlockscreen";
version = "3.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix
index 6b28c39f7679..b1c2ec5c3bda 100644
--- a/pkgs/misc/screensavers/electricsheep/default.nix
+++ b/pkgs/misc/screensavers/electricsheep/default.nix
@@ -3,7 +3,6 @@
, glee }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "electricsheep";
version = "2.7b33-2017-10-20";
diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix
index b3c48cb40249..ae61291b0879 100644
--- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix
+++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix
@@ -1,7 +1,7 @@
{ stdenv, i3lock, imagemagick, scrot, playerctl, fetchFromGitLab }:
stdenv.mkDerivation rec {
- name = "i3lock-pixeled-${version}";
+ pname = "i3lock-pixeled";
version = "1.2.1";
src = fetchFromGitLab {
diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix
index 0b840448f2c0..e3d3b109d1a9 100644
--- a/pkgs/misc/screensavers/light-locker/default.nix
+++ b/pkgs/misc/screensavers/light-locker/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
meson
ninja
pkgconfig
+ wrapGAppsHook
];
buildInputs = [
@@ -45,7 +46,6 @@ stdenv.mkDerivation rec {
libXext
libXxf86vm
systemd
- wrapGAppsHook
];
mesonFlags = [
diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix
index 9855e8688867..f69b0794ce3a 100644
--- a/pkgs/misc/screensavers/physlock/default.nix
+++ b/pkgs/misc/screensavers/physlock/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, pam, systemd }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "11-dev";
- name = "physlock-${version}";
+ pname = "physlock";
src = fetchFromGitHub {
owner = "muennich";
repo = "physlock";
diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix
index 404346bba631..fb80f9922ce9 100644
--- a/pkgs/misc/screensavers/pipes/default.nix
+++ b/pkgs/misc/screensavers/pipes/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgs }:
stdenv.mkDerivation rec {
- name = "pipes-${version}";
+ pname = "pipes";
version = "1.3.0";
src = fetchurl {
diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix
index e8b9346a8727..7f6d99297ab1 100644
--- a/pkgs/misc/screensavers/rss-glx/default.nix
+++ b/pkgs/misc/screensavers/rss-glx/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.9.1";
- name = "rss-glx-${version}";
+ pname = "rss-glx";
src = fetchurl {
url = "mirror://sourceforge/rss-glx/rss-glx_${version}.tar.bz2";
diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix
index b6f82cd45d7c..4d4e1c1fc418 100644
--- a/pkgs/misc/screensavers/xautolock/default.nix
+++ b/pkgs/misc/screensavers/xautolock/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "xautolock-${version}";
+ pname = "xautolock";
version = "2.2-7-ga23dd5c";
# This repository contains xautolock-2.2 plus various useful patches that
diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index c3cfbaf23b3f..c08b16a0a1d3 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
curlOpts = "--user-agent 'Mozilla/5.0'";
};
- # Optionally, it can use GTK+.
+ # Optionally, it can use GTK.
buildInputs = [ pam libX11 libXext libXinerama libXdmcp libXt ];
# Don't try to install `xlock' setuid. Password authentication works
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index d68ac0f9fc19..1dcf16585f0b 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "7.0.2";
- name = "seafile-shared-${version}";
+ pname = "seafile-shared";
src = fetchFromGitHub {
owner = "haiwen";
diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix
index 2556e7d9d837..1993b4bcce40 100644
--- a/pkgs/misc/sndio/default.nix
+++ b/pkgs/misc/sndio/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, alsaLib }:
stdenv.mkDerivation rec {
- name = "sndio-${version}";
+ pname = "sndio";
version = "1.6.0";
enableParallelBuilding = true;
buildInputs = [ alsaLib ];
diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix
index 6db3b44b6866..1072bac7816a 100644
--- a/pkgs/misc/sound-of-sorting/default.nix
+++ b/pkgs/misc/sound-of-sorting/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchgit
, SDL2, wxGTK }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
- name = "sound-of-sorting-${version}";
+ pname = "sound-of-sorting";
version = "unstable-2015-07-21";
src = fetchgit {
diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix
index ec8ef076c2fc..d0d3fbdf2d73 100644
--- a/pkgs/misc/stabber/default.nix
+++ b/pkgs/misc/stabber/default.nix
@@ -4,8 +4,8 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
- name = "stabber-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "stabber-unstable";
version = "2016-11-09";
src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/adapta-kde/default.nix b/pkgs/misc/themes/adapta-kde/default.nix
index 875973c9d3f5..a7624d2889bb 100644
--- a/pkgs/misc/themes/adapta-kde/default.nix
+++ b/pkgs/misc/themes/adapta-kde/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "adapta-kde-theme-${version}";
+ pname = "adapta-kde-theme";
version = "20180512";
src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index 6d2a16cbfd23..02812b1f9397 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }:
stdenv.mkDerivation rec {
- name = "adapta-gtk-theme-${version}";
+ pname = "adapta-gtk-theme";
version = "3.95.0.11";
src = fetchFromGitHub {
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- description = "An adaptive Gtk+ theme based on Material Design Guidelines";
+ description = "An adaptive GTK theme based on Material Design Guidelines";
homepage = https://github.com/adapta-project/adapta-gtk-theme;
license = with licenses; [ gpl2 cc-by-sa-30 ];
platforms = platforms.linux;
diff --git a/pkgs/misc/themes/albatross/default.nix b/pkgs/misc/themes/albatross/default.nix
index 14fe0f21d80e..870b348cc320 100644
--- a/pkgs/misc/themes/albatross/default.nix
+++ b/pkgs/misc/themes/albatross/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "Albatross-${version}";
+ pname = "Albatross";
version = "1.7.4";
src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/arc-kde/default.nix b/pkgs/misc/themes/arc-kde/default.nix
index 42ff954a46ba..decdbdfac2dc 100644
--- a/pkgs/misc/themes/arc-kde/default.nix
+++ b/pkgs/misc/themes/arc-kde/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "arc-kde-theme-${version}";
+stdenv.mkDerivation {
+ pname = "arc-kde-theme";
version = "2017-11-09";
src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix
index 4b7702ed6359..7ffefb1d67f6 100644
--- a/pkgs/misc/themes/blackbird/default.nix
+++ b/pkgs/misc/themes/blackbird/default.nix
@@ -3,10 +3,9 @@
stdenv.mkDerivation rec {
pname = "Blackbird";
version = "2017-12-13";
- name = "${pname}-${version}";
src = fetchFromGitHub {
- repo = "${pname}";
+ repo = pname;
owner = "shimmerproject";
rev = "a1c5674c0ec38b4cc8ba41d2c0e6187987ae7eb4";
sha256 = "0xskcw36ci2ykra5gir5pkrawh2qkcv18p4fp2kxivssbd20d4jw";
diff --git a/pkgs/misc/themes/clearlooks-phenix/default.nix b/pkgs/misc/themes/clearlooks-phenix/default.nix
index daeb7d7ad36d..04929a4cb4d1 100644
--- a/pkgs/misc/themes/clearlooks-phenix/default.nix
+++ b/pkgs/misc/themes/clearlooks-phenix/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "7.0.1";
- name = "clearlooks-phenix-${version}";
+ pname = "clearlooks-phenix";
src = fetchurl {
url = "https://github.com/jpfleury/clearlooks-phenix/archive/${version}.tar.gz";
diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix
index f0bb2bf729dc..74f0a54ccef3 100644
--- a/pkgs/misc/themes/e17gtk/default.nix
+++ b/pkgs/misc/themes/e17gtk/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "e17gtk-${version}";
+ pname = "e17gtk";
version = "3.22.2";
src = fetchFromGitHub {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "An Enlightenment-like GTK+ theme with sharp corners";
+ description = "An Enlightenment-like GTK theme with sharp corners";
homepage = https://github.com/tsujan/E17gtk;
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/misc/themes/equilux-theme/default.nix b/pkgs/misc/themes/equilux-theme/default.nix
index bc4b57e8b58e..f24524eb6b97 100644
--- a/pkgs/misc/themes/equilux-theme/default.nix
+++ b/pkgs/misc/themes/equilux-theme/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:
stdenv.mkDerivation rec {
- name = "equilux-theme-${version}";
+ pname = "equilux-theme";
version = "20181029";
src = fetchFromGitHub {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
inherit (src.meta) homepage;
- description = "A Material Design theme for GNOME/GTK+ based desktop environments";
+ description = "A Material Design theme for GNOME/GTK based desktop environments";
license = licenses.gpl2;
platforms = platforms.all;
maintainers = [ maintainers.fpletz ];
diff --git a/pkgs/misc/themes/gtk2/gtk-engines/default.nix b/pkgs/misc/themes/gtk2/gtk-engines/default.nix
index 966190a5e768..2f56f6eb4c5c 100644
--- a/pkgs/misc/themes/gtk2/gtk-engines/default.nix
+++ b/pkgs/misc/themes/gtk2/gtk-engines/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [ intltool gtk2 ];
meta = {
- description = "Theme engines for GTK+ 2";
+ description = "Theme engines for GTK 2";
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/misc/themes/jade1/default.nix b/pkgs/misc/themes/jade1/default.nix
index e6096ef829d0..ebeb7f2d8665 100644
--- a/pkgs/misc/themes/jade1/default.nix
+++ b/pkgs/misc/themes/jade1/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
stdenv.mkDerivation rec {
- name = "theme-jade1-${version}";
+ pname = "theme-jade1";
version = "3.3";
src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/misc/themes/kde2/default.nix
index 8adf6a1e4330..fac8c38eecae 100644
--- a/pkgs/misc/themes/kde2/default.nix
+++ b/pkgs/misc/themes/kde2/default.nix
@@ -5,7 +5,8 @@
let
version = "2017-03-15";
in mkDerivation rec {
- name = "kde2-decoration-${version}";
+ pname = "kde2-decoration";
+ inherit version;
src = fetchFromGitHub {
owner = "repos-holder";
diff --git a/pkgs/misc/themes/numix-solarized/default.nix b/pkgs/misc/themes/numix-solarized/default.nix
index 97a018f929e3..4fd06fae61bc 100644
--- a/pkgs/misc/themes/numix-solarized/default.nix
+++ b/pkgs/misc/themes/numix-solarized/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "20170810";
- name = "numix-solarized-gtk-theme-${version}";
+ pname = "numix-solarized-gtk-theme";
src = fetchFromGitHub {
owner = "Ferdi265";
diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/misc/themes/numix-sx/default.nix
index 9001ad9e5a3a..72e87e2e2740 100644
--- a/pkgs/misc/themes/numix-sx/default.nix
+++ b/pkgs/misc/themes/numix-sx/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, gtk-engine-murrine }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2017-04-24";
- name = "numix-sx-gtk-theme-${version}";
+ pname = "numix-sx-gtk-theme";
src = fetchurl {
url = "https://dl.opendesktop.org/api/files/download/id/1493077417/Numix-SX.tar.xz";
diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix
index eb4b8c76301b..e01f8174e9ea 100644
--- a/pkgs/misc/themes/numix/default.nix
+++ b/pkgs/misc/themes/numix/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "2.6.7";
- name = "numix-gtk-theme-${version}";
+ pname = "numix-gtk-theme";
src = fetchFromGitHub {
repo = "numix-gtk-theme";
diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/misc/themes/onestepback/default.nix
index 5e4f8ffa3d46..64ead2f75f4b 100644
--- a/pkgs/misc/themes/onestepback/default.nix
+++ b/pkgs/misc/themes/onestepback/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "onestepback-${version}";
+ pname = "onestepback";
version = "0.991";
srcs = [
diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/misc/themes/paper/default.nix
index 8bcb48812a3e..e7235a900cf9 100644
--- a/pkgs/misc/themes/paper/default.nix
+++ b/pkgs/misc/themes/paper/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2016-08-16";
- name = "paper-gtk-theme-${version}";
+ pname = "paper-gtk-theme";
src = fetchFromGitHub {
owner = "snwh";
diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix
index 348b4ae4eb94..0071e386e88c 100644
--- a/pkgs/misc/themes/qtcurve/default.nix
+++ b/pkgs/misc/themes/qtcurve/default.nix
@@ -8,7 +8,8 @@
let
version = "1.9";
in mkDerivation {
- name = "qtcurve-${version}";
+ pname = "qtcurve";
+ inherit version;
src = fetchurl {
url = "http://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz";
sha256 = "169gdny1cdld0qnx3nqvx568zjzdba4pwp3gxapc1hdh2cymw7r8";
diff --git a/pkgs/misc/themes/solarc/default.nix b/pkgs/misc/themes/solarc/default.nix
index 55cd6e1dac04..96843e8d78b4 100644
--- a/pkgs/misc/themes/solarc/default.nix
+++ b/pkgs/misc/themes/solarc/default.nix
@@ -2,8 +2,8 @@
gtk-engine-murrine, gtk3
}:
-stdenv.mkDerivation rec {
- name = "solarc-gtk-theme-${version}";
+stdenv.mkDerivation {
+ pname = "solarc-gtk-theme";
version = "1.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
index 06d42da79362..81c681f53715 100644
--- a/pkgs/misc/themes/vertex/default.nix
+++ b/pkgs/misc/themes/vertex/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "theme-vertex";
version = "20170128";
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 6fe1a2081d22..6f1c8af390c8 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -13,7 +13,7 @@ let
, extraMakeFlags ? []
, extraMeta ? {}
, ... } @ args:
- stdenv.mkDerivation (rec {
+ stdenv.mkDerivation ({
pname = "uboot-${defconfig}";
inherit version;
@@ -86,10 +86,10 @@ let
} // extraMeta;
} // removeAttrs args [ "extraMeta" ]);
-in rec {
+in {
inherit buildUBoot;
- ubootTools = buildUBoot rec {
+ ubootTools = buildUBoot {
defconfig = "allnoconfig";
installDir = "$out/bin";
hardeningDisable = [];
@@ -108,45 +108,45 @@ in rec {
];
};
- ubootA20OlinuxinoLime = buildUBoot rec {
+ ubootA20OlinuxinoLime = buildUBoot {
defconfig = "A20-OLinuXino-Lime_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootBananaPi = buildUBoot rec {
+ ubootBananaPi = buildUBoot {
defconfig = "Bananapi_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootBananaPim64 = buildUBoot rec {
+ ubootBananaPim64 = buildUBoot {
defconfig = "bananapi_m64_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootBeagleboneBlack = buildUBoot rec {
+ ubootBeagleboneBlack = buildUBoot {
defconfig = "am335x_boneblack_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["MLO" "u-boot.img"];
};
# http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master
- ubootClearfog = buildUBoot rec {
+ ubootClearfog = buildUBoot {
defconfig = "clearfog_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-spl.kwb"];
};
- ubootGuruplug = buildUBoot rec {
+ ubootGuruplug = buildUBoot {
defconfig = "guruplug_defconfig";
extraMeta.platforms = ["armv5tel-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootJetsonTK1 = buildUBoot rec {
+ ubootJetsonTK1 = buildUBoot {
defconfig = "jetson-tk1_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
@@ -157,114 +157,114 @@ in rec {
'';
};
- ubootNovena = buildUBoot rec {
+ ubootNovena = buildUBoot {
defconfig = "novena_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.bin" "SPL"];
};
- ubootOdroidXU3 = buildUBoot rec {
+ ubootOdroidXU3 = buildUBoot {
defconfig = "odroid-xu3_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-dtb.bin"];
};
- ubootOrangePiPc = buildUBoot rec {
+ ubootOrangePiPc = buildUBoot {
defconfig = "orangepi_pc_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootOrangePiZeroPlus2H5 = buildUBoot rec {
+ ubootOrangePiZeroPlus2H5 = buildUBoot {
defconfig = "orangepi_zero_plus2_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootPcduino3Nano = buildUBoot rec {
+ ubootPcduino3Nano = buildUBoot {
defconfig = "Linksprite_pcDuino3_Nano_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootPine64 = buildUBoot rec {
+ ubootPine64 = buildUBoot {
defconfig = "pine64_plus_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootPine64LTS = buildUBoot rec {
+ ubootPine64LTS = buildUBoot {
defconfig = "pine64-lts_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootPinebook = buildUBoot rec {
+ ubootPinebook = buildUBoot {
defconfig = "pinebook_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootQemuAarch64 = buildUBoot rec {
+ ubootQemuAarch64 = buildUBoot {
defconfig = "qemu_arm64_defconfig";
extraMeta.platforms = ["aarch64-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootQemuArm = buildUBoot rec {
+ ubootQemuArm = buildUBoot {
defconfig = "qemu_arm_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootRaspberryPi = buildUBoot rec {
+ ubootRaspberryPi = buildUBoot {
defconfig = "rpi_defconfig";
extraMeta.platforms = ["armv6l-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootRaspberryPi2 = buildUBoot rec {
+ ubootRaspberryPi2 = buildUBoot {
defconfig = "rpi_2_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootRaspberryPi3_32bit = buildUBoot rec {
+ ubootRaspberryPi3_32bit = buildUBoot {
defconfig = "rpi_3_32b_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootRaspberryPi3_64bit = buildUBoot rec {
+ ubootRaspberryPi3_64bit = buildUBoot {
defconfig = "rpi_3_defconfig";
extraMeta.platforms = ["aarch64-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootRaspberryPiZero = buildUBoot rec {
+ ubootRaspberryPiZero = buildUBoot {
defconfig = "rpi_0_w_defconfig";
extraMeta.platforms = ["armv6l-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootSheevaplug = buildUBoot rec {
+ ubootSheevaplug = buildUBoot {
defconfig = "sheevaplug_defconfig";
extraMeta.platforms = ["armv5tel-linux"];
filesToInstall = ["u-boot.bin"];
};
- ubootSopine = buildUBoot rec {
+ ubootSopine = buildUBoot {
defconfig = "sopine_baseboard_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
- ubootUtilite = buildUBoot rec {
+ ubootUtilite = buildUBoot {
defconfig = "cm_fx6_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-with-nand-spl.imx"];
@@ -276,7 +276,7 @@ in rec {
# sf probe; sf update $loadaddr 0 80000
};
- ubootWandboard = buildUBoot rec {
+ ubootWandboard = buildUBoot {
defconfig = "wandboard_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.img" "SPL"];
diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix
index e49b4b519f1c..9dd43f5fe7e0 100644
--- a/pkgs/misc/uboot/rock64.nix
+++ b/pkgs/misc/uboot/rock64.nix
@@ -5,7 +5,7 @@
rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a";
sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz";
};
-in buildUBoot rec {
+in buildUBoot {
version = "2017.09";
src = fetchFromGitHub {
diff --git a/pkgs/misc/uboot/rockpro64.nix b/pkgs/misc/uboot/rockpro64.nix
index 45f6d5de2a9a..436e1bcdf878 100644
--- a/pkgs/misc/uboot/rockpro64.nix
+++ b/pkgs/misc/uboot/rockpro64.nix
@@ -5,7 +5,7 @@
rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a";
sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz";
};
-in buildUBoot rec {
+in buildUBoot {
version = "2017.09";
src = fetchFromGitHub {
diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix
index e10fa1b06b78..a0b6be3a418c 100644
--- a/pkgs/misc/urbit/default.nix
+++ b/pkgs/misc/urbit/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "urbit-${version}";
+ pname = "urbit";
version = "0.7.3";
src = fetchFromGitHub {
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index cf1ea84a9c5b..f3b46348e75c 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,12 +61,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2019-08-18";
+ version = "2019-09-01";
src = fetchFromGitHub {
owner = "w0rp";
repo = "ale";
- rev = "73812c3e41c1c7fcf1705811f35ac4c9ccec003e";
- sha256 = "166hgzyx1j1n717icj0mq2n8jkg4kpi1iy5gk3q0l28nd88w5hlb";
+ rev = "6e18c03d80c323e740f87103fc05955b5c61b54e";
+ sha256 = "0jgqmliy48fqdhc1lnsbvkgg24z85n7dv8z6k6xxnilcsrhfzds2";
};
};
@@ -303,23 +303,23 @@ let
coc-git = buildVimPluginFrom2Nix {
pname = "coc-git";
- version = "2019-08-20";
+ version = "2019-09-09";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-git";
- rev = "d778033c08580768d2a48b78f4c1b7ab63af12bd";
- sha256 = "1bxx8y5yp9v95clp8dic8q8zr85dl7i2qq4iibmazg9hzcigc3s6";
+ rev = "67d6df228ffca7e6247139184fcb53003ccf7810";
+ sha256 = "1xmm07k9c3kzyx4wrkamdpfh1pykihlrs35qcgy8wgqr9msqj9bq";
};
};
coc-go = buildVimPluginFrom2Nix {
pname = "coc-go";
- version = "2019-08-23";
+ version = "2019-09-07";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-go";
- rev = "27ef3358055b68c5b592c920c9d0e8aa1522c71e";
- sha256 = "1v1lwkxzwi1l20561m1nxbmgmjgzn83lvx0mb2c4z3p7brbjmv0y";
+ rev = "16005f9249196c54cd85f0407152d04a4c487b30";
+ sha256 = "06jky64f2l4j5sn4v8ij5594afc85d4gk2mxd315j5b16sy661l3";
};
};
@@ -413,12 +413,12 @@ let
coc-pairs = buildVimPluginFrom2Nix {
pname = "coc-pairs";
- version = "2019-08-07";
+ version = "2019-09-09";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-pairs";
- rev = "51e404a60fa0461ebfaea4ba1311357b8825e73f";
- sha256 = "0sz45z7i7fqnvl4968dalksz9qk0al6a57wyyhyl7rx1wv67vaya";
+ rev = "318e8123b11d231ceb48c0e7dd9864881115d873";
+ sha256 = "0r9cnqn6mr6b9g7ahjhfxr7s82a6wcwxhwm22s6vparaa45k4mk0";
};
};
@@ -479,12 +479,12 @@ let
coc-snippets = buildVimPluginFrom2Nix {
pname = "coc-snippets";
- version = "2019-08-17";
+ version = "2019-09-08";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-snippets";
- rev = "ffd2b091e5bb5995aac95d1ebe98f87f3df763b1";
- sha256 = "1n23nvfh99jvnmf901g5zck8hyx3qq5cr4vz119a7ra5dj4bka95";
+ rev = "9a8da3f5548e1f894fdd3b9600e17007f7ad9b26";
+ sha256 = "14vk80bg0cgs14n3kfpg6rkgxvvrnyz4s4wms0iqi9hq622i0znz";
};
};
@@ -545,12 +545,12 @@ let
coc-tsserver = buildVimPluginFrom2Nix {
pname = "coc-tsserver";
- version = "2019-08-27";
+ version = "2019-09-09";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-tsserver";
- rev = "c80ae7b19b038f380639e1c5b5e3c3a0b9252f6c";
- sha256 = "06pd5k72sa3d6psdkcdar70b456p2dqzbbk2x166gkxavjqjkyid";
+ rev = "30cf468536a47c994133bb0b5614f305dd6441fe";
+ sha256 = "1nkx1wmhmic4xavb5pnssv14cb6k3znc2jlfcc3ipanm0a6bwkpx";
};
};
@@ -788,34 +788,34 @@ let
denite-git = buildVimPluginFrom2Nix {
pname = "denite-git";
- version = "2019-07-08";
+ version = "2019-09-09";
src = fetchFromGitHub {
owner = "chemzqm";
repo = "denite-git";
- rev = "b3b3742f263475cc0e16c1c03845e46d0c0faa16";
- sha256 = "15m7y4mzzysfhmmzwj7q6y8d2rcczn6fvicw77j7njssf9fmwc10";
+ rev = "db4ad6c3717272fc347a46466e4337bba6b4c4cc";
+ sha256 = "0rlv9q7fzgiapann3r83szr87mfpxcvhmrsjzrxrimqk3m992wa2";
};
};
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2019-08-29";
+ version = "2019-09-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "161d4a7cd490dad3a708e8461e11f3bf2af2c0ea";
- sha256 = "026lkyd768v4a0pyfzrlsqyln4bvmhp99p4vjhmmi079vjs7z7b1";
+ rev = "dedeed5cb3fab46465a1f30efa4875c4937ed2f7";
+ sha256 = "1c65mhc4dw0zf1azqfnjf7l5gp2pxayq8qv0j1lvlqpn6q6gg1di";
};
};
deol-nvim = buildVimPluginFrom2Nix {
pname = "deol-nvim";
- version = "2019-07-18";
+ version = "2019-09-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deol.nvim";
- rev = "53ff81bd27dc86dafe209687df9ed8f3c205601c";
- sha256 = "1dq3457rd6jda4w4ajlq2gdiaz5nhcnfg4b4v47xzdcd63bcssir";
+ rev = "474b72a8541e529a1628084c277e6e0aa7f80fda";
+ sha256 = "00kwij67csk9yp64r8lfrc9m0jm5mqckf4c9a3489azfjn8da097";
};
};
@@ -831,6 +831,17 @@ let
};
};
+ deoplete-dictionary = buildVimPluginFrom2Nix {
+ pname = "deoplete-dictionary";
+ version = "2019-04-16";
+ src = fetchFromGitHub {
+ owner = "deoplete-plugins";
+ repo = "deoplete-dictionary";
+ rev = "e0879df5dce25b96d6a2a6f52a1a5e41d12b5992";
+ sha256 = "05p707b15fzhf0laqy3q0hi34vxpljy86cd5qvpjzx5h0ry32p09";
+ };
+ };
+
deoplete-fish = buildVimPluginFrom2Nix {
pname = "deoplete-fish";
version = "2018-09-15";
@@ -879,12 +890,12 @@ let
deoplete-lsp = buildVimPluginFrom2Nix {
pname = "deoplete-lsp";
- version = "2019-07-15";
+ version = "2019-09-09";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete-lsp";
- rev = "c0172e8d458054b8dea037bbcfef523cde7add93";
- sha256 = "1j6904wk4qr4i4h8qn2rikzw1kp6r5dc4475x38i8xngx1ap4x24";
+ rev = "9e5ab5d5ea955711bce2a64535ec42d9e76aa3fe";
+ sha256 = "1552fr18drc8q7qha8gbfckp906fihx8xdpj7z7y0yiw20bc4kk3";
};
};
@@ -912,12 +923,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
- version = "2019-08-31";
+ version = "2019-09-09";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "93722cc5d0a1877fdad0845330b3a41c5e392a34";
- sha256 = "0ay5j8drbd0m8hn9zpxsd56z2y07imm8lmkvfamja353mwb8nlh9";
+ rev = "48b1643509e4ef3a4af6cf57df35e6c6ac1275ce";
+ sha256 = "192lph0kbs4mmbsz1jsjmrmy3an53bkd4lzyvn615r24qfbpcz14";
};
};
@@ -1024,12 +1035,12 @@ let
falcon = buildVimPluginFrom2Nix {
pname = "falcon";
- version = "2019-08-29";
+ version = "2019-09-09";
src = fetchFromGitHub {
owner = "fenetikm";
repo = "falcon";
- rev = "f5ec61dade10692257e5f45609bb42f8fbf07c23";
- sha256 = "08j1rhah96k7w4x569w84qxgn4ishia0xxy102z8v5zgxjpcyhld";
+ rev = "96eace33dd16d553a9318f08209f108ec69c5cd7";
+ sha256 = "09q9rk69xrj30knfdq5s4xxmiwnazs1l7lrsqwxpn0ggq8ryk5qd";
};
};
@@ -1046,12 +1057,12 @@ let
fastfold = buildVimPluginFrom2Nix {
pname = "fastfold";
- version = "2019-03-28";
+ version = "2019-09-03";
src = fetchFromGitHub {
owner = "konfekt";
repo = "fastfold";
- rev = "69d455dcf1ee40bf050a0d1e94f49f02bb2f4832";
- sha256 = "1hk9ir47c7rds3fya9vd2rsvc2mfj602fhqvz1h0acvxkqy34lsk";
+ rev = "cf38299fee6f6a9b0bc5874545ed3a2415b6b3c5";
+ sha256 = "1x2ab1fjiqwmaph2r5dga4bv128ppzb8kpr3bjh6hvmcfabsh1f6";
};
};
@@ -1135,12 +1146,12 @@ let
ghcid = buildVimPluginFrom2Nix {
pname = "ghcid";
- version = "2019-08-21";
+ version = "2019-09-08";
src = fetchFromGitHub {
owner = "ndmitchell";
repo = "ghcid";
- rev = "12cbd4cf3109459a1577be30da82cffe22bdf4b6";
- sha256 = "0wzcpk9wsdhmz888g2x9b1ljf437agq536bd2d801dzv3ynqf4jl";
+ rev = "586dd9652f9fa76d342557029abd4bbcb744f2f4";
+ sha256 = "115zw4b8jxyalm0qhqjzzakaqc2bzy6bf0jm7kkfhyv3lfqwf19p";
};
};
@@ -1333,12 +1344,12 @@ let
iosvkem = buildVimPluginFrom2Nix {
pname = "iosvkem";
- version = "2019-08-20";
+ version = "2019-09-04";
src = fetchFromGitHub {
owner = "neutaaaaan";
repo = "iosvkem";
- rev = "9c5d1e70f5335cc995e61ceba870818a946f26c3";
- sha256 = "0ppd8x9rh2mqd743zsvxakzha878lg7c7a3as5nlfjpb89g5dmn6";
+ rev = "f9e6b5e8a72c4b3c542074d881e694daa60c79df";
+ sha256 = "1l9p8hxrv3rybbv9w3f74l4wngjyjw7jzylw38jbmsn7bgr1m336";
};
};
@@ -1400,12 +1411,12 @@ let
julia-vim = buildVimPluginFrom2Nix {
pname = "julia-vim";
- version = "2019-06-26";
+ version = "2019-09-03";
src = fetchFromGitHub {
owner = "JuliaEditorSupport";
repo = "julia-vim";
- rev = "072e4861412e841d308aabc928112ccaedf07135";
- sha256 = "1250a011mib5na5c769x2djjyz3rwhcdw80rmkvzv1xy7crxf5xn";
+ rev = "995eae2c333ac9a2ca1d31c8d7845680f4ac28b0";
+ sha256 = "14d3r06nffxpbvffnh2b4i0q187cv5wsvq62mh2h1ifq95bj07s5";
};
};
@@ -1466,12 +1477,12 @@ let
lh-vim-lib = buildVimPluginFrom2Nix {
pname = "lh-vim-lib";
- version = "2019-07-16";
+ version = "2019-09-02";
src = fetchFromGitHub {
owner = "LucHermitte";
repo = "lh-vim-lib";
- rev = "0add378423b813b15ff281a1b8176e95f444f301";
- sha256 = "1fjlp7h0fd6dbw32m056sy9z7745py9f091jmcspfvqj5mfpkg8f";
+ rev = "8adf0b269a1732b43644e2f6083113a4d5704a8b";
+ sha256 = "0na11kdp2nksyg1whf89sa4ss909srdqp94i28m5fdngv3z46wqs";
};
};
@@ -1488,12 +1499,12 @@ let
lightline-vim = buildVimPluginFrom2Nix {
pname = "lightline-vim";
- version = "2019-08-20";
+ version = "2019-09-09";
src = fetchFromGitHub {
owner = "itchyny";
repo = "lightline.vim";
- rev = "8b3aa1632c08784928458b2b85faf5c89feefccf";
- sha256 = "0bxvxkk0zps2qxnzp8dip7ngpv9b1a74y2wjzjqqvxzljk81a714";
+ rev = "c9ab296e856bed4e694180efb6ffb692cf18ed8f";
+ sha256 = "1sw71fyihcyjb6vlwzw5wah6q1dz2mfcswm594wrdkjxm71i0c0d";
};
};
@@ -1708,12 +1719,12 @@ let
neomake = buildVimPluginFrom2Nix {
pname = "neomake";
- version = "2019-08-22";
+ version = "2019-09-03";
src = fetchFromGitHub {
owner = "neomake";
repo = "neomake";
- rev = "723336c47844d7f58b7c37a6c3e62ddabcdf392b";
- sha256 = "0psiadnx4qzqzn6p2yc7az5l624xb5mczn3y39irbdrl6l2rcd81";
+ rev = "776a6f6e27330e38324b7ad4873329760adf72e3";
+ sha256 = "0lxqqknp1xmaa8ys5ck5m9pyxv0hbpaba1bsv6fx6j6jb71nz590";
};
};
@@ -1763,12 +1774,12 @@ let
neoterm = buildVimPluginFrom2Nix {
pname = "neoterm";
- version = "2019-08-20";
+ version = "2019-09-01";
src = fetchFromGitHub {
owner = "kassio";
repo = "neoterm";
- rev = "c96ff95c9a41d716bbdca41b4cc2dc62e4b188a1";
- sha256 = "0jbrgsdljh9n1cr3dpgq83gpd3hx7ss4hbc0i0hls15laczlzipc";
+ rev = "f53fa5177c01180ea538290657721e1accbb02fe";
+ sha256 = "0v162hpl881dhb61vkyi4bvny5zn74pknlyh1liyhw6jy5hgc9b8";
};
};
@@ -1807,11 +1818,11 @@ let
nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree";
- version = "2019-08-28";
+ version = "2019-09-09";
src = fetchFromGitHub {
owner = "scrooloose";
repo = "nerdtree";
- rev = "3d508aedce35e1d952d3ce92378ad27ea5960fa6";
+ rev = "51fc75efdb8ac58c853492c3f61d854f65ed78ec";
sha256 = "098g4qq3h8nklynj4qnj02f6ivw10q07c69ssdrhgjwilpgv4nrk";
};
};
@@ -1895,12 +1906,12 @@ let
nvimdev-nvim = buildVimPluginFrom2Nix {
pname = "nvimdev-nvim";
- version = "2019-08-21";
+ version = "2019-09-03";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvimdev.nvim";
- rev = "d27d00b3c529adc13c9882e7a3cb5c63df038dcc";
- sha256 = "1z6i891h574yg3s1y96vwik1pxhy707rn5rsqqb7yxnfw6xy57cq";
+ rev = "83c2a2aab7f2f7ae8c004c52aaddc8b15065ba90";
+ sha256 = "0i0ds5mfx2k03ivncw795xr3p9iig1b4pqj4mbr7b7hs3984jh08";
};
};
@@ -2819,12 +2830,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2019-08-26";
+ version = "2019-09-09";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "6409c7b317a283333a720f48cca5f259c1ea29ef";
- sha256 = "1wr7202idpyydnjbkc7sk8wr02ipdq40x4rwhi955yx76gwl111a";
+ rev = "63d8764f9d19def6d279b91e690ac2aa5662828d";
+ sha256 = "0sxjw1dmidw242m1ma607g957hz2w080ln4m4ac90wi1qssp8132";
};
};
@@ -2874,12 +2885,12 @@ let
vim-autoformat = buildVimPluginFrom2Nix {
pname = "vim-autoformat";
- version = "2019-08-19";
+ version = "2019-09-02";
src = fetchFromGitHub {
owner = "Chiel92";
repo = "vim-autoformat";
- rev = "69f7f2d80d3722f62847a58443da1d6cdf81b292";
- sha256 = "0vxblych7afny8i8kyk2f85xc9k2y4sv7i9jf3mkpykimsq2w4hm";
+ rev = "2842eb24dc9d3b9a6585a9f744fc0d62f692dabc";
+ sha256 = "1n0l1n5ymr9fgmf4cq42hdnnb4lxdkh9yaxv18gadncchwzp7cvj";
};
};
@@ -3215,12 +3226,12 @@ let
vim-elixir = buildVimPluginFrom2Nix {
pname = "vim-elixir";
- version = "2019-08-22";
+ version = "2019-09-06";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "vim-elixir";
- rev = "e9d495bb85981467105c375f665b10249b7bcc53";
- sha256 = "1lm2lhj9sqijc5b7yqa0vs56n2jg0q0xlxs4mf1pjwhdi0wmqd5y";
+ rev = "e8d59d115c8153a7de9872b3c4419f2354c0f14b";
+ sha256 = "1q6bk8rqsdwgbyckwdnq4kv6gy5wjqrhdm06sip5x53mnkhmpf5p";
};
};
@@ -3259,12 +3270,12 @@ let
vim-fireplace = buildVimPluginFrom2Nix {
pname = "vim-fireplace";
- version = "2019-08-19";
+ version = "2019-09-01";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fireplace";
- rev = "0b46f733955c63a73dc49c316f8bc97a4119fddc";
- sha256 = "1q8mnd6sd0nl8i13jvzkl79sbz0ncvx015bihymglj8wcpzrrwni";
+ rev = "ea9fa306a731a105511cc5faecbaf7d58c94dfcf";
+ sha256 = "1l1wzgr4ly25yablz299pfrgl47ys51hljhhzcfdivvkrrzjpdd5";
};
};
@@ -3325,12 +3336,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2019-08-23";
+ version = "2019-09-09";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "b97a9abe29c39c4e1a45ae199dbb470df362f538";
- sha256 = "0lf5r91ba9xzzy1vs6g81mdgghcyica6xiir1xpg2aqksk0aidri";
+ rev = "35f1095f9b3ce70768bdd75dae76437cfa69dd02";
+ sha256 = "0d806k1prgsa0mgc779p3ngqjyd8shrf2i18xi58vsndrvsgn96v";
};
};
@@ -3369,12 +3380,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2019-08-28";
+ version = "2019-09-05";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "88d396f1b49747fadbbde5c038a85067d94954e5";
- sha256 = "02blbk7vq5p25713ys30djkivks4ywg69drh9apyb3g5mjwi60m6";
+ rev = "b71ab64dc16a4665c3214f109000a11d30708079";
+ sha256 = "1pqd9zf311s0in5x3njzcxkw6zyqa2vpznl5ahd4b9hk4qvcm2v8";
};
};
@@ -3402,12 +3413,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2019-08-23";
+ version = "2019-09-08";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "635b9e7f27905070788cef60c0ba520209bf4f09";
- sha256 = "0zmymzafryi7mchv8wz3ynxi8a597c69zvx2s57xyhhczpcah4ms";
+ rev = "925d29a73db14133d11361792a2e0393e1e2b457";
+ sha256 = "167s9dadk1nl0kw14p0mq7pkwhxg9xb5gkmhqh96rpz1z2730jw7";
};
};
@@ -3424,12 +3435,12 @@ let
vim-grepper = buildVimPluginFrom2Nix {
pname = "vim-grepper";
- version = "2019-08-30";
+ version = "2019-09-04";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-grepper";
- rev = "1b9cec58509ba2bc212ad21e4a58eb3acf501b9f";
- sha256 = "1rhp1rb97v9fv7w4qs350k5gqslbmkjn3lrq2a5bgnhar5xybs4k";
+ rev = "ebe6d1ffd1fb2faada867c56a55f44cbaa0248e3";
+ sha256 = "0axgpc72q4zn3l9b23v03akz1p1y5vy3gkzma4qw9avgbwhq5870";
};
};
@@ -3733,12 +3744,12 @@ let
vim-jsx-pretty = buildVimPluginFrom2Nix {
pname = "vim-jsx-pretty";
- version = "2019-08-26";
+ version = "2019-09-07";
src = fetchFromGitHub {
owner = "MaxMEllon";
repo = "vim-jsx-pretty";
- rev = "9a0f7e8072f4e7e80c74b1e24fa82e359046b25a";
- sha256 = "1l5cwlbmihzxldpxlvn5gc47s0awqs908skzq43cy44iql829hir";
+ rev = "6871eb1696478a8e295bab3e5ae7aae05faa2605";
+ sha256 = "0i80d5vdd5ycx0g0h00raa3g48xhgw3wf3blp1m3hwap6cxy9p8h";
};
};
@@ -3854,12 +3865,12 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
- version = "2019-08-22";
+ version = "2019-09-05";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
- rev = "c2a8fad6bc39a8a90fccee32a34861969f55ad5a";
- sha256 = "16hb0lan77ics7192cpnw2i2aigbab5g63pq0j992vja7pmh6hab";
+ rev = "ff86c97cb41c1e415dfd1a3c42dfd817ff541f6d";
+ sha256 = "1lr72qxzpq4i748sb4q52ln18awxpxqqcsf13wr95d4wvrn50y61";
};
};
@@ -4118,12 +4129,12 @@ let
vim-plug = buildVimPluginFrom2Nix {
pname = "vim-plug";
- version = "2019-08-17";
+ version = "2019-09-03";
src = fetchFromGitHub {
owner = "junegunn";
repo = "vim-plug";
- rev = "ebd534c88bfd49f8d3c758d96ad04ce3f77ee6f8";
- sha256 = "1r3ic5mii9q4kqpwyq37cjbrrzj93fhj9b46zqkb5i1nw2vydl6l";
+ rev = "46f843aafe6a284765c484397fdc5ad9bb77147a";
+ sha256 = "1c9xnjfzr0s6vp6yb7j3sqclj7kazwcmsqvm0whzx1yx5dbisnv7";
};
};
@@ -4140,12 +4151,12 @@ let
vim-polyglot = buildVimPluginFrom2Nix {
pname = "vim-polyglot";
- version = "2019-07-01";
+ version = "2019-09-06";
src = fetchFromGitHub {
owner = "sheerun";
repo = "vim-polyglot";
- rev = "3ddca5da461ebfaa82104f82e3cbf19d1c326ade";
- sha256 = "0f3l0sknj4zbgmk7yx028f2qz72gdh1lnqra96c2n3xszpdvim22";
+ rev = "fbc2af9e820d85e17cd08023f4dcc66545735d58";
+ sha256 = "03lrnrhhhxmz5dbbsxhnnrff8myc21qrxsskfd2k6yh1hr9wwa5p";
};
};
@@ -4239,12 +4250,12 @@ let
vim-rhubarb = buildVimPluginFrom2Nix {
pname = "vim-rhubarb";
- version = "2019-08-19";
+ version = "2019-09-02";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-rhubarb";
- rev = "9edacf9d5b4d6e0570af33f88500f51ec4288c2e";
- sha256 = "0m91nvxjkgmbgaib3q27rk2nzkpxx18pa8nrv143r2k8na9bry0p";
+ rev = "75ad917e4978b4620c3b0eff1722880d2d53a9f4";
+ sha256 = "1qxlaqbfliv2w4r7bw04h3m19g8f89v9070f59k9zbz3gv8g3hzv";
};
};
@@ -4261,12 +4272,12 @@ let
vim-ruby = buildVimPluginFrom2Nix {
pname = "vim-ruby";
- version = "2019-07-13";
+ version = "2019-09-05";
src = fetchFromGitHub {
owner = "vim-ruby";
repo = "vim-ruby";
- rev = "1aa8f0cd0411c093d81f4139d151f93808e53966";
- sha256 = "04ng7mjjdacajkmx20pfwlfh1h43sh6sx58id830q9jjl7kvyhhp";
+ rev = "1c70532339889b7794a52b956f389b4f9ab9b3eb";
+ sha256 = "1rj06j71f08b1may9pm27xf6k19bcw3jq3jbwndd975qram7zcr0";
};
};
@@ -4316,12 +4327,12 @@ let
vim-sensible = buildVimPluginFrom2Nix {
pname = "vim-sensible";
- version = "2019-08-22";
+ version = "2019-09-01";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-sensible";
- rev = "b9febff7aac028a851d2568d3dcef91d9b6971bc";
- sha256 = "00852qj3v3py63k23rrxmx8w5yrin3q21vz9css0xg12l5r1j1wv";
+ rev = "5dc6eb2d8026b4ce812a5a9c966d232b1f50c9c7";
+ sha256 = "05mig86l1hi0q1y5sj7bp09i1lwbyn7v9xp3hd853fv7z026fza0";
};
};
@@ -4404,12 +4415,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2019-08-11";
+ version = "2019-09-03";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "5dc42dbc6c4d9b5068ddde901b79c5e483c42114";
- sha256 = "00kf6a5k0gkync0pgw3d3b7gdm6ykb14lvybiaprvbsnxnflgw95";
+ rev = "55b29ff83e9f5b43a138fb42100be6d7b5777d0d";
+ sha256 = "0zkxmj3l1jj1q9qigm13xksc7f3a7n7ik5yxgn4gxdpi9z79as4d";
};
};
@@ -4514,12 +4525,12 @@ let
vim-table-mode = buildVimPluginFrom2Nix {
pname = "vim-table-mode";
- version = "2019-04-25";
+ version = "2019-09-05";
src = fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-table-mode";
- rev = "865563f78506b8090d3839644bc667493b4b68f4";
- sha256 = "0544dlnqpm3r6amlww9pa5991js1rs5qblhqqfagwdaxaxpzxa64";
+ rev = "934778947e28fc8e570e34efdb5f90d5c99fdac7";
+ sha256 = "1klvr8xal8iyv6wga324xhq26a31dxp2qlsz0qyri8y4hkrappkf";
};
};
@@ -4558,12 +4569,12 @@ let
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
- version = "2019-08-29";
+ version = "2019-09-01";
src = fetchFromGitHub {
owner = "janko-m";
repo = "vim-test";
- rev = "1b82c6929e9d87ca756569c1640320d027498364";
- sha256 = "0hf76jlv916jpdncfgh2wyczpj4c7rzak3m1j3vnysav000p3vhd";
+ rev = "5aaa872eb7519909b87abb2b0f13600aa2210771";
+ sha256 = "0wvjf3fhhj9qm5p7azk2dgi3aa1qw16pzm5nkl2jr5gn2cmlphd8";
};
};
@@ -4712,12 +4723,12 @@ let
vim-visual-multi = buildVimPluginFrom2Nix {
pname = "vim-visual-multi";
- version = "2019-08-23";
+ version = "2019-09-01";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-visual-multi";
- rev = "473427fc6e5aabdf69ad0ca28808de841d70bdb8";
- sha256 = "0cnj7z3r9cws283wrpg1a40ykpk0lwjkb44gp77996cggr9nqbjz";
+ rev = "d55e496786f064c022861c944cf38562006a4e9a";
+ sha256 = "1c049z9qgbc0g80zvixz0cqglq2qcg2pfmzjvp4gg5yq4k27r25y";
};
};
@@ -4866,12 +4877,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2019-08-27";
+ version = "2019-09-09";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "23a3b356ba1e90d4a9dbb085712376cab83ab19e";
- sha256 = "1rp3jfsx991k2jl7wr8b32la5b881pn17k6dy27lwpw0sd0x3ha4";
+ rev = "cb90d583b7d584d87d306b2b99abdbb097588196";
+ sha256 = "06308ji2r3733w9rgwphqdqkharf7hc3xliylzbl9hh6fmk3hj55";
};
};
@@ -5009,24 +5020,24 @@ let
yats-vim = buildVimPluginFrom2Nix {
pname = "yats-vim";
- version = "2019-08-23";
+ version = "2019-09-05";
src = fetchFromGitHub {
owner = "HerringtonDarkholme";
repo = "yats.vim";
- rev = "24fa9013a5a5d053262830553e81f84d9bf7552f";
- sha256 = "17mjrlzb60vkgvyiag11xmrf8a5sp94z1rx1mzcc4ys6j1if9136";
+ rev = "d9af5fc9fd7f11fa1219a9acb6f4243105e60b38";
+ sha256 = "1wlrxibj8q2l0lfzkg3wvzivkgz67xvi7vgrih4dgrs7a639dyl0";
fetchSubmodules = true;
};
};
youcompleteme = buildVimPluginFrom2Nix {
pname = "youcompleteme";
- version = "2019-08-10";
+ version = "2019-08-31";
src = fetchFromGitHub {
owner = "valloric";
repo = "youcompleteme";
- rev = "afd69b382844315812fd48912eaa9fa47cba3a8d";
- sha256 = "1x4q1l7dw0axm3hywj5p77057jh0qac7khk2clpdilfwhak0jp07";
+ rev = "5274b73fc26deb5704733e0efbb4b2d53dc6dc9c";
+ sha256 = "03kpq7mw4dimaahf9q6qm6nblzw7hr0p7i6m6x3b9ilkka5q13rz";
fetchSubmodules = true;
};
};
@@ -5066,12 +5077,12 @@ let
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
- version = "2019-08-14";
+ version = "2019-09-05";
src = fetchFromGitHub {
owner = "zig-lang";
repo = "zig.vim";
- rev = "defc660d235152e82271a48bd89bfcc9fa58b432";
- sha256 = "0x6yaiwc3nnyxcrjfdllhx3s7kfspy5ggm3crhd2s81gq9lrxc3q";
+ rev = "06e918ba082bbe41544208430d6946b547ce3530";
+ sha256 = "1sfh1xmsf8smgr7vpj6r11gp3wmw5zzf095w2li9rw8l2g54cwql";
};
};
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 681f91f66486..a919e17afa5f 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -50,6 +50,7 @@ dannyob/quickfixstatus
darfink/starsearch.vim
dart-lang/dart-vim-plugin
davidhalter/jedi-vim
+deoplete-plugins/deoplete-dictionary
deoplete-plugins/deoplete-jedi
derekelkins/agda-vim
derekwyatt/vim-scala
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 44bc7ec3ced1..d1b1bc846ebd 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -253,7 +253,7 @@ let
# TODO: proper quoting
toNix = x:
if (builtins.isString x) then "'${x}'"
- else if builtins.isAttrs x && builtins ? out then toNix "${x}" # a derivation
+ else if builtins.isAttrs x && builtins ? out then toNix x # a derivation
else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toNix n}: ${toNix v}") x)}}"
else if builtins.isList x then "[${lib.concatMapStringsSep ", " toNix x}]"
else throw "turning ${lib.generators.toPretty {} x} into a VimL thing not implemented yet";
@@ -264,7 +264,7 @@ let
${lib.concatMapStrings (plugin: ''
let g:nix_plugin_locations['${plugin.pname}'] = "${plugin.rtp}"
'') plugins}
- let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins."vim-addon-manager".rtp}"
+ let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins.vim-addon-manager.rtp}"
let g:vim_addon_manager = {}
@@ -316,7 +316,7 @@ let
++ (builtins.map (link packageName "opt") opt)
);
packDir = (packages:
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
name = "vim-pack-dir";
src = ./.;
installPhase = lib.concatStringsSep
@@ -513,7 +513,7 @@ rec {
name = "vim_with_custom_plugin";
vimrcConfig.vam.knownPlugins =
vimPlugins // ({
- "vim-trailing-whitespace" = buildVimPluginFrom2Nix {
+ vim-trailing-whitespace = buildVimPluginFrom2Nix {
name = "vim-trailing-whitespace";
src = fetchFromGitHub {
owner = "bronson";
diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index 73b533f368ef..bd9eeae92810 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -83,8 +83,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "cpptools";
publisher = "ms-vscode";
- version = "0.25.0";
- sha256 = "0vqqc0j9ahhb9a8wrhjjb34rfdj7msqsza3443bi4206gkiwpp3n";
+ version = "0.25.1";
+ sha256 = "1i66m6l4q8vkygn24v5s06kxaxm9gdd8y75fjyzz189pnmijj1as";
};
buildInputs = [
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index c47422531206..e1b928b13731 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -10,7 +10,7 @@ in
# So an extension's attribute name should be of the form:
# "${mktplcRef.publisher}.${mktplcRef.name}".
#
-rec {
+{
alanz.vscode-hie-server = buildVscodeMarketplaceExtension {
mktplcRef = {
diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index 423f39f9bbcc..f4ebea8e4383 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -23,9 +23,9 @@ let
else throw "Only x86_64 Linux and Darwin are supported.";
languageServerSha256 = {
- "linux-x64" = "0j9251f8dfccmg0x9gzg1cai4k5zd0alcfpb0443gs4jqakl0lr2";
- "osx-x64" = "070qwwl08fa24rsnln4i5x9mfriqaw920l6v2j8d1r0zylxnyjsa";
- }."${arch}";
+ linux-x64 = "0j9251f8dfccmg0x9gzg1cai4k5zd0alcfpb0443gs4jqakl0lr2";
+ osx-x64 = "070qwwl08fa24rsnln4i5x9mfriqaw920l6v2j8d1r0zylxnyjsa";
+ }.${arch};
# version is languageServerVersion in the package.json
languageServer = extractNuGet rec {
diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix
index c8cda8482bf1..a841acdca94e 100644
--- a/pkgs/misc/xosd/default.nix
+++ b/pkgs/misc/xosd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11, libXext, libXt, xorgproto }:
stdenv.mkDerivation rec {
- name = "xosd-${version}";
+ pname = "xosd";
version = "2.2.14";
src = fetchurl {
- url = "mirror://sourceforge/libxosd/${name}.tar.gz";
+ url = "mirror://sourceforge/libxosd/${pname}-${version}.tar.gz";
sha256 = "025m7ha89q29swkc7s38knnbn8ysl24g2h5s7imfxflm91psj7sg";
};
diff --git a/pkgs/os-specific/bsd/default.nix b/pkgs/os-specific/bsd/default.nix
index a75c132b55a2..ee7158e2a8c5 100644
--- a/pkgs/os-specific/bsd/default.nix
+++ b/pkgs/os-specific/bsd/default.nix
@@ -1,5 +1,5 @@
{ callPackages, recurseIntoAttrs }:
-rec {
+{
netbsd = recurseIntoAttrs (callPackages ./netbsd {});
}
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 93b6f4a62097..7370901f3193 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -38,14 +38,14 @@ let
HOST_SH = "${buildPackages.bash}/bin/sh";
MACHINE_ARCH = {
- "i686" = "i386";
+ i686 = "i386";
}.${stdenv'.hostPlatform.parsed.cpu.name}
or stdenv'.hostPlatform.parsed.cpu.name;
MACHINE = {
- "x86_64" = "amd64";
- "aarch64" = "evbarm64";
- "i686" = "i386";
+ x86_64 = "amd64";
+ aarch64 = "evbarm64";
+ i686 = "i386";
}.${stdenv'.hostPlatform.parsed.cpu.name}
or stdenv'.hostPlatform.parsed.cpu.name;
@@ -79,7 +79,7 @@ let
##
## START BOOTSTRAPPING
##
- makeMinimal = mkDerivation rec {
+ makeMinimal = mkDerivation {
path = "tools/make";
sha256 = "1xbzfd4i7allrkk1if74a8ymgpizyj0gkvdigzzj37qar7la7nc1";
version = "8.0";
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 4d33fc0f3f88..ba5002c8c48f 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -4,7 +4,7 @@ let
# sadly needs to be exported because security_tool needs it
sdk = stdenv.mkDerivation rec {
version = "10.12";
- name = "MacOS_SDK-${version}";
+ pname = "MacOS_SDK";
# This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.12.merged-1.sucatalog, which we found by:
# 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
index 7002f82fe561..a7b2bd7d981d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, appleDerivation, developer_cmds }:
-appleDerivation rec {
+appleDerivation {
buildInputs = [ developer_cmds ];
installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index 7b19194be96e..99d670028032 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -3,7 +3,7 @@
, copyfile, removefile, libresolv, Libnotify, libplatform, libpthread
, mDNSResponder, launchd, libutil, hfs, darling }:
-appleDerivation rec {
+appleDerivation {
dontBuild = true;
dontFixup = true;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
index 4a0180dda7ae..eadf18e028ee 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
@@ -1,6 +1,6 @@
{ stdenv, appleDerivation, xcbuildHook }:
-appleDerivation rec {
+appleDerivation {
nativeBuildInputs = [ xcbuildHook ];
# These PBXcp calls should be patched in xcbuild to allow them to
diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
index b2d8522f3264..21971ea2e284 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
@@ -1,6 +1,6 @@
{ stdenv, appleDerivation, xcbuildHook }:
-appleDerivation rec {
+appleDerivation {
nativeBuildInputs = [ xcbuildHook ];
patchPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
index f0394a20c2cc..5de84d2a6e5d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
@@ -1,6 +1,6 @@
{ stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }:
-appleDerivation rec {
+appleDerivation {
nativeBuildInputs = [ xcbuildHook ];
buildInputs = [ zlib bzip2 lzma ncurses libutil ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
index 9ca0f3b4e56d..82be7dc860ec 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
@@ -1,7 +1,7 @@
{ stdenv, appleDerivation, xcbuildHook
, openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }:
-appleDerivation rec {
+appleDerivation {
nativeBuildInputs = [ xcbuildHook ];
buildInputs = [ openssl_1_0_2 xnu Librpcsvc libpcap developer_cmds ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix
index 28dcbdcb4a2a..6a0c819a0a31 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "551.1";
- name = "objc4-${version}";
+ pname = "objc4";
src = fetchapplesource {
inherit version;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
index 5b2322915dc9..b87dadd391d2 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
@@ -1,6 +1,6 @@
{ stdenv, appleDerivation, xcbuildHook }:
-appleDerivation rec {
+appleDerivation {
nativeBuildInputs = [ xcbuildHook ];
patchPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
index 39c903a2e7b9..03556296ca1d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
@@ -1,7 +1,7 @@
{ stdenv, appleDerivation, lib
, Librpcsvc, apple_sdk, pam, CF, openbsm }:
-appleDerivation rec {
+appleDerivation {
# xcbuild fails with:
# /nix/store/fc0rz62dh8vr648qi7hnqyik6zi5sqx8-xcbuild-wrapper/nix-support/setup-hook: line 1: 9083 Segmentation fault: 11 xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build
# see issue facebook/xcbuild#188
diff --git a/pkgs/os-specific/darwin/chunkwm/default.nix b/pkgs/os-specific/darwin/chunkwm/default.nix
index 9dd1205c1146..12b358126512 100644
--- a/pkgs/os-specific/darwin/chunkwm/default.nix
+++ b/pkgs/os-specific/darwin/chunkwm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, Carbon, Cocoa, ScriptingBridge }:
stdenv.mkDerivation rec {
- name = "chunkwm-${version}";
+ pname = "chunkwm";
version = "0.4.9";
src = fetchzip {
url = "http://github.com/koekeishiya/chunkwm/archive/v${version}.tar.gz";
diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix
index a9051fd1279f..5c63b8e0dfb3 100644
--- a/pkgs/os-specific/darwin/duti/default.nix
+++ b/pkgs/os-specific/darwin/duti/default.nix
@@ -2,7 +2,6 @@
stdenv.mkDerivation rec {
pname = "duti";
- name = "${pname}-${version}";
version = "1.5.4pre";
src = fetchFromGitHub {
owner = "moretension";
diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix
index 190c0ae22131..e374bd2f11c6 100644
--- a/pkgs/os-specific/darwin/goku/default.nix
+++ b/pkgs/os-specific/darwin/goku/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "goku-${version}";
+ pname = "goku";
version = "0.1.11";
src = fetchurl {
diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix
index 3ff03aace4ee..be8554983074 100644
--- a/pkgs/os-specific/darwin/iproute2mac/default.nix
+++ b/pkgs/os-specific/darwin/iproute2mac/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.2.1";
- name = "iproute2mac-${version}";
+ pname = "iproute2mac";
src = fetchFromGitHub {
owner = "brona";
diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix
index fb7bb12a493f..90f92b0b6443 100644
--- a/pkgs/os-specific/darwin/khd/default.nix
+++ b/pkgs/os-specific/darwin/khd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, Carbon, Cocoa }:
stdenv.mkDerivation rec {
- name = "khd-${version}";
+ pname = "khd";
version = "3.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix
index 3076392ecb26..c3fa76f50960 100644
--- a/pkgs/os-specific/darwin/kwm/default.nix
+++ b/pkgs/os-specific/darwin/kwm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
- name = "kwm-${version}";
+ pname = "kwm";
version = "4.0.5";
src = fetchzip {
diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix
index 0b59ecb2299e..02821fe61ef9 100644
--- a/pkgs/os-specific/darwin/lsusb/default.nix
+++ b/pkgs/os-specific/darwin/lsusb/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.0";
- name = "lsusb-${version}";
+ pname = "lsusb";
src = fetchFromGitHub {
owner = "jlhonora";
diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix
index 75f1113e9f08..12bf02bf89ff 100644
--- a/pkgs/os-specific/darwin/m-cli/default.nix
+++ b/pkgs/os-specific/darwin/m-cli/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "m-cli-${version}";
+ pname = "m-cli";
version = "0.2.5";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix
index 960e0677da1e..23b5ded1fe61 100644
--- a/pkgs/os-specific/darwin/opencflite/default.nix
+++ b/pkgs/os-specific/darwin/opencflite/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, icu, libuuid, tzdata }:
stdenv.mkDerivation rec {
- name = "opencflite-${version}";
+ pname = "opencflite";
version = "476.19.0";
src = fetchurl {
- url = "mirror://sourceforge/opencflite/${name}.tar.gz";
+ url = "mirror://sourceforge/opencflite/${pname}-${version}.tar.gz";
sha256 = "0jgmzs0ycl930hmzcvx0ykryik56704yw62w394q1q3xw5kkjn9v";
};
diff --git a/pkgs/os-specific/darwin/osxfuse/default.nix b/pkgs/os-specific/darwin/osxfuse/default.nix
index 404e752c279e..e1a00c71cb85 100644
--- a/pkgs/os-specific/darwin/osxfuse/default.nix
+++ b/pkgs/os-specific/darwin/osxfuse/default.nix
@@ -16,8 +16,7 @@ let
'';
in
-stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+stdenv.mkDerivation {
pname = "osxfuse";
inherit version;
diff --git a/pkgs/os-specific/darwin/qes/default.nix b/pkgs/os-specific/darwin/qes/default.nix
index aa7bfb5c3be7..21b0d605021d 100644
--- a/pkgs/os-specific/darwin/qes/default.nix
+++ b/pkgs/os-specific/darwin/qes/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, Carbon }:
-stdenv.mkDerivation rec {
- name = "qes-${version}";
+stdenv.mkDerivation {
+ pname = "qes";
version = "0.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
index 631c59523e2a..9f5f8aa44228 100644
--- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
+++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "reattach-to-user-namespace-${version}";
+ pname = "reattach-to-user-namespace";
version = "2.7";
src = fetchurl {
diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
index 713847313c2c..ba5d3e9255bc 100644
--- a/pkgs/os-specific/darwin/skhd/default.nix
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, Carbon }:
stdenv.mkDerivation rec {
- name = "skhd-${version}";
+ pname = "skhd";
version = "0.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix
index b18c603a911b..9efa230d3b72 100644
--- a/pkgs/os-specific/darwin/smimesign/default.nix
+++ b/pkgs/os-specific/darwin/smimesign/default.nix
@@ -1,7 +1,7 @@
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
- name = "smimesign-${version}";
+ pname = "smimesign";
version = "v0.0.13";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix
index fcbcfe00a3e7..50c6d4fd2f41 100644
--- a/pkgs/os-specific/darwin/trash/default.nix
+++ b/pkgs/os-specific/darwin/trash/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.9.2";
- name = "trash-${version}";
+ pname = "trash";
src = fetchFromGitHub {
owner = "ali-rantakari";
diff --git a/pkgs/os-specific/darwin/wifi-password/default.nix b/pkgs/os-specific/darwin/wifi-password/default.nix
new file mode 100644
index 000000000000..801e180f7344
--- /dev/null
+++ b/pkgs/os-specific/darwin/wifi-password/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ version = "0.1.0";
+ pname = "wifi-password";
+
+ src = fetchFromGitHub {
+ owner = "rauchg";
+ repo = pname;
+ rev = version;
+ sha256 = "0sfvb40h7rz9jzp4l9iji3jg80paklqsbmnk5h7ipsv2xbsplp64";
+ };
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp wifi-password.sh $out/bin/wifi-password
+ '';
+
+ meta = {
+ homepage = https://github.com/rauchg/wifi-password;
+ description = "Get the password of the wifi you're on";
+ platforms = stdenv.lib.platforms.darwin;
+ license = stdenv.lib.licenses.mit;
+ maintainers = [ stdenv.lib.maintainers.nikitavoloboev ];
+ };
+}
diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
index bb9dc0a03b5f..d25edff49560 100644
--- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
+++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
@@ -14,9 +14,9 @@ let
minSdkVersion = "9.0";
iosPlatformArch = { parsed, ... }: {
- "armv7a" = "armv7";
- "aarch64" = "arm64";
- "x86_64" = "x86_64";
+ armv7a = "armv7";
+ aarch64 = "arm64";
+ x86_64 = "x86_64";
}.${parsed.cpu.name};
in
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
index 37de98780b69..cc7317f5520a 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "acpi-${version}";
+ pname = "acpi";
version = "1.7";
src = fetchurl {
- url = "mirror://sourceforge/acpiclient/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/acpiclient/${version}/${pname}-${version}.tar.gz";
sha256 = "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp";
};
diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix
index 99d1cf38f0ac..d58aec4a97c9 100644
--- a/pkgs/os-specific/linux/acpid/default.nix
+++ b/pkgs/os-specific/linux/acpid/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "acpid-2.0.31";
+ name = "acpid-2.0.32";
src = fetchurl {
url = "mirror://sourceforge/acpid2/${name}.tar.xz";
- sha256 = "1hrc0xm6q12knbgzhq0i8g2rfrkwcvh1asd7k9rs3nc5xmlwd7gw";
+ sha256 = "0zhmxnhnhg4v1viw82yjr22kram6k5k1ixznhayk8cnw7q5x7lpj";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix
index 14b10e6752bb..743e8f3576b0 100644
--- a/pkgs/os-specific/linux/alsa-tools/default.nix
+++ b/pkgs/os-specific/linux/alsa-tools/default.nix
@@ -3,11 +3,11 @@
# some use gtk2, some gtk3 (and some even fltk13).
stdenv.mkDerivation rec {
- name = "alsa-tools-${version}";
+ pname = "alsa-tools";
version = "1.1.7";
src = fetchurl {
- url = "mirror://alsa/tools/${name}.tar.bz2";
+ url = "mirror://alsa/tools/${pname}-${version}.tar.bz2";
sha256 = "1xjfghr9s0j6n91kgs95cc4r6qrjsgc4yj2w0nir3xpnm0l36950";
};
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index 09c430bcd53b..6f23d1903188 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils, fftw}:
stdenv.mkDerivation rec {
- name = "alsa-utils-${version}";
+ pname = "alsa-utils";
version = "1.1.9";
src = fetchurl {
- url = "mirror://alsa/utils/${name}.tar.bz2";
+ url = "mirror://alsa/utils/${pname}-${version}.tar.bz2";
sha256 = "0fi11b7r8hg1bdjw74s8sqx8rc4qb310jaj9lsia9labvfyjrpsx";
};
diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix
index 2f5c392c1730..fee8d1e7a420 100644
--- a/pkgs/os-specific/linux/anbox/kmod.nix
+++ b/pkgs/os-specific/linux/anbox/kmod.nix
@@ -1,6 +1,6 @@
{ stdenv, kernel, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "anbox-modules";
version = "2019-07-13-" + kernel.version;
diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index b03636d6f7f6..aed0ed374a78 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -5,7 +5,7 @@
# services.udev.packages = [ pkgs.android-udev-rules ];
stdenv.mkDerivation rec {
- name = "android-udev-rules-${version}";
+ pname = "android-udev-rules";
version = "20190315";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix
index 5d002bf72eac..5144add3a37f 100644
--- a/pkgs/os-specific/linux/atop/default.nix
+++ b/pkgs/os-specific/linux/atop/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.4.0";
- name = "atop-${version}";
+ pname = "atop";
src = fetchurl {
url = "https://www.atoptool.nl/download/atop-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index d7d25e696642..456872cdbd48 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -2,7 +2,7 @@
let base = "batman-adv-2019.2"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${base}-${kernel.version}";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix
index 50c48098ab08..7ce2fea69245 100644
--- a/pkgs/os-specific/linux/beegfs/default.nix
+++ b/pkgs/os-specific/linux/beegfs/default.nix
@@ -26,8 +26,9 @@ let
"upgrade/beegfs_mirror_md/build"
];
-in stdenv.mkDerivation rec {
- name = "beegfs-${version}";
+in stdenv.mkDerivation {
+ pname = "beegfs";
+ inherit version;
src = fetchurl {
url = "https://git.beegfs.com/pub/v7/repository/archive.tar.bz2?ref=${version}";
diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix
index 054236398769..3a4c2ef7d9f7 100644
--- a/pkgs/os-specific/linux/bolt/default.nix
+++ b/pkgs/os-specific/linux/bolt/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
domain = "gitlab.freedesktop.org";
owner = "bolt";
repo = "bolt";
- rev = "${version}";
+ rev = version;
sha256 = "1qamls0fll0qc27lqavf56hv1yj6v6n4ry90g7bcnwpvccmd82yd";
};
diff --git a/pkgs/os-specific/linux/bpftool/default.nix b/pkgs/os-specific/linux/bpftool/default.nix
index ac444c28d75d..c54e3e38e9b5 100644
--- a/pkgs/os-specific/linux/bpftool/default.nix
+++ b/pkgs/os-specific/linux/bpftool/default.nix
@@ -3,7 +3,7 @@
, linuxPackages_latest
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "bpftool";
inherit (linuxPackages_latest.kernel) version src;
diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix
index a2ebc0cdc530..7f5cd206f32c 100644
--- a/pkgs/os-specific/linux/bpftrace/default.nix
+++ b/pkgs/os-specific/linux/bpftrace/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "bpftrace-${version}";
+ pname = "bpftrace";
version = "0.9.1";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix
index d77539fb89ed..44c2cfff5a2b 100644
--- a/pkgs/os-specific/linux/cachefilesd/default.nix
+++ b/pkgs/os-specific/linux/cachefilesd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "cachefilesd-${version}";
+ pname = "cachefilesd";
version = "0.10.10";
src = fetchurl {
- url = "https://people.redhat.com/dhowells/fscache/${name}.tar.bz2";
+ url = "https://people.redhat.com/dhowells/fscache/${pname}-${version}.tar.bz2";
sha256 = "00hsw4cdlm13wijlygp8f0aq6gxdp0skbxs9r2vh5ggs3s2hj0qd";
};
diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix
index 0c32c3f5e62a..7f16ecb9e6d4 100644
--- a/pkgs/os-specific/linux/can-isotp/default.nix
+++ b/pkgs/os-specific/linux/can-isotp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, kernel, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "can-isotp-${version}";
+stdenv.mkDerivation {
+ pname = "can-isotp";
version = "20180629";
hardeningDisable = [ "pic" ];
diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix
index 616c99c8f46a..6e26ef4bbce8 100644
--- a/pkgs/os-specific/linux/can-utils/default.nix
+++ b/pkgs/os-specific/linux/can-utils/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "can-utils-${version}";
+stdenv.mkDerivation {
+ pname = "can-utils";
# There are no releases (source archives or git tags), so use the date of the
# latest commit in git master as version number.
version = "20170830";
diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix
index 674b695b1eee..fc2faa5b8f57 100644
--- a/pkgs/os-specific/linux/checkpolicy/default.nix
+++ b/pkgs/os-specific/linux/checkpolicy/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, bison, flex, libsepol }:
stdenv.mkDerivation rec {
- name = "checkpolicy-${version}";
- version = "2.7";
+ pname = "checkpolicy";
+ version = "2.9";
inherit (libsepol) se_release se_url;
src = fetchurl {
url = "${se_url}/${se_release}/checkpolicy-${version}.tar.gz";
- sha256 = "009j9jc0hi4l7k8f21hn8fm25n0mqgzdpd4nk30nds6d3nglf4sl";
+ sha256 = "13jz6f8zdrijvn5w1j102b36fs41z0q8ii74axw48cj550mw6im9";
};
nativeBuildInputs = [ bison flex ];
diff --git a/pkgs/os-specific/linux/chromium-xorg-conf/default.nix b/pkgs/os-specific/linux/chromium-xorg-conf/default.nix
new file mode 100644
index 000000000000..58038923890b
--- /dev/null
+++ b/pkgs/os-specific/linux/chromium-xorg-conf/default.nix
@@ -0,0 +1,8 @@
+{fetchgit }:
+
+fetchgit {
+ name = "chromium-xorg-conf";
+ url = "https://chromium.googlesource.com/chromiumos/platform/xorg-conf";
+ rev = "26fb9d57e195c7e467616b35b17e2b5d279c1514";
+ sha256 = "0643y3l3hjk4mv4lm3h9z56h990q6k11hcr10lcqppgsii0d3zcf";
+}
diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index ba66bd309bc3..ea6a6e775722 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -2,11 +2,11 @@
, kerberos, keyutils, pam, talloc }:
stdenv.mkDerivation rec {
- name = "cifs-utils-${version}";
+ pname = "cifs-utils";
version = "6.9";
src = fetchurl {
- url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2";
+ url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2";
sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q";
};
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 298f5e30d018..f826ddd423d8 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -67,7 +67,7 @@ assert journalSupport -> systemd != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "conky-${version}";
+ pname = "conky";
version = "1.11.5";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix
index 755e88b46cbc..20c441ffae2f 100644
--- a/pkgs/os-specific/linux/conntrack-tools/default.nix
+++ b/pkgs/os-specific/linux/conntrack-tools/default.nix
@@ -3,11 +3,11 @@
, libnetfilter_cthelper, systemd }:
stdenv.mkDerivation rec {
- name = "conntrack-tools-${version}";
+ pname = "conntrack-tools";
version = "1.4.5";
src = fetchurl {
- url = "https://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2";
+ url = "https://www.netfilter.org/projects/conntrack-tools/files/${pname}-${version}.tar.bz2";
sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin";
};
diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix
index d813376da8e5..8ea3e3445cce 100644
--- a/pkgs/os-specific/linux/consoletools/default.nix
+++ b/pkgs/os-specific/linux/consoletools/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, SDL }:
stdenv.mkDerivation rec {
- name = "linuxconsoletools-${version}";
+ pname = "linuxconsoletools";
version = "1.6.1";
src = fetchurl {
- url = "mirror://sourceforge/linuxconsole/${name}.tar.bz2";
+ url = "mirror://sourceforge/linuxconsole/${pname}-${version}.tar.bz2";
sha256 = "0d2r3j916fl2y7pk1y82b9fvbr10dgs1gw7rqwzfpispdidb1mp9";
};
diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix
index 940913d6a6c8..84c113c648cd 100644
--- a/pkgs/os-specific/linux/crda/default.nix
+++ b/pkgs/os-specific/linux/crda/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libgcrypt, libnl, pkgconfig, python2Packages, wireless-regdb }:
stdenv.mkDerivation rec {
- name = "crda-${version}";
+ pname = "crda";
version = "3.18";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 0821fbdc15cf..354eea40b24b 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -3,11 +3,11 @@
, which, python, makeWrapper, docbook_xml_dtd_45 }:
stdenv.mkDerivation rec {
- name = "criu-${version}";
+ pname = "criu";
version = "3.12";
src = fetchurl {
- url = "https://download.openvz.org/criu/${name}.tar.bz2";
+ url = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2";
sha256 = "1z0fpym8fi2jqx99himqs8pm5l4mzrswjqxcyfwjmbabzb77dwhf";
};
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index 82b0bb2f3565..5f5005d8b97d 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -2,7 +2,7 @@
, dbus, linuxHeaders, systemd }:
stdenv.mkDerivation rec {
- name = "dbus-broker-${version}";
+ pname = "dbus-broker";
version = "21";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/os-specific/linux/devmem2/default.nix
index cd1400b41fc2..77fa7fe3b1b6 100644
--- a/pkgs/os-specific/linux/devmem2/default.nix
+++ b/pkgs/os-specific/linux/devmem2/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "devmem2-2004-08-05";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix
index e8c1e9bfe5e5..a880f699b699 100644
--- a/pkgs/os-specific/linux/directvnc/default.nix
+++ b/pkgs/os-specific/linux/directvnc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }:
-stdenv.mkDerivation rec {
- name = "directvnc-${version}";
+stdenv.mkDerivation {
+ pname = "directvnc";
version = "0.7.7.2015-04-16";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index 2ea939ccdb09..7ce5535313c2 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -10,7 +10,7 @@ let
libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 evdi ];
in stdenv.mkDerivation rec {
- name = "displaylink-${version}";
+ pname = "displaylink";
version = "4.4.24";
src = requireFile rec {
diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix
index 534e57354474..1d67b16a4921 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/pkgs/os-specific/linux/dmtcp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, bash, perl, python }:
stdenv.mkDerivation rec {
- name = "dmtcp-${version}";
+ pname = "dmtcp";
version = "2.5.2";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix
index 936dbf719a87..f5b7e44a3fbc 100644
--- a/pkgs/os-specific/linux/dropwatch/default.nix
+++ b/pkgs/os-specific/linux/dropwatch/default.nix
@@ -4,7 +4,6 @@
stdenv.mkDerivation rec {
pname = "dropwatch";
version = "1.5";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "nhorman";
diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix
index 63b766b21a5c..25d0eb1fd029 100644
--- a/pkgs/os-specific/linux/dstat/default.nix
+++ b/pkgs/os-specific/linux/dstat/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "dstat-${version}";
+ pname = "dstat";
format = "other";
version = "0.7.3";
diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/os-specific/linux/ebtables/default.nix
index 9d92575b6687..23bd39ff3885 100644
--- a/pkgs/os-specific/linux/ebtables/default.nix
+++ b/pkgs/os-specific/linux/ebtables/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ebtables-${version}";
+ pname = "ebtables";
version = "2.0.10-4";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix
index 744ab80d74f9..ddc8ee64ba00 100644
--- a/pkgs/os-specific/linux/eventstat/default.nix
+++ b/pkgs/os-specific/linux/eventstat/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchzip, ncurses }:
stdenv.mkDerivation rec {
- name = "eventstat-${version}";
+ pname = "eventstat";
version = "0.04.07";
src = fetchzip {
url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/os-specific/linux/extrace/default.nix
index 28a92d31eaa2..6aaaaec1b13e 100644
--- a/pkgs/os-specific/linux/extrace/default.nix
+++ b/pkgs/os-specific/linux/extrace/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "extrace-${version}";
+ pname = "extrace";
version = "0.7";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index 94ea85f433d9..b99f719f8361 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python3, which }:
stdenv.mkDerivation rec {
- name = "fatrace-${version}";
+ pname = "fatrace";
version = "0.13";
src = fetchurl {
- url = "https://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2";
+ url = "https://launchpad.net/fatrace/trunk/${version}/+download/${pname}-${version}.tar.bz2";
sha256 = "0hrh45bpzncw0jkxw3x2smh748r65k2yxvfai466043bi5q0d2vx";
};
diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix
index defb45d7a861..c8fc633f8bd3 100644
--- a/pkgs/os-specific/linux/fbterm/default.nix
+++ b/pkgs/os-specific/linux/fbterm/default.nix
@@ -1,7 +1,7 @@
{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}:
let
s = # Generated upstream information
- rec {
+ {
baseName="fbterm";
version="1.7.0";
name="fbterm-1.7.0";
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
index 1cc0e7ae4ca7..58cd88b4dce0 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
@@ -3,7 +3,8 @@
let version = "5.100.138"; in
stdenv.mkDerivation {
- name = "b43-firmware-${version}";
+ pname = "b43-firmware";
+ inherit version;
src = fetchurl {
url = "http://www.lwfinger.com/b43-firmware/broadcom-wl-${version}.tar.bz2";
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
index 2637beb517a3..959c0c74618e 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, b43FirmwareCutter }:
stdenv.mkDerivation rec {
- name = "b43-firmware-${version}";
+ pname = "b43-firmware";
version = "6.30.163.46";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
index a57a6f1d70f6..4d5271a9ddfe 100644
--- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
@@ -4,7 +4,7 @@
# this packages as they expect the firmware to be named "BCM.hcd"
# see: https://github.com/NixOS/nixpkgs/pull/25478#issuecomment-299034865
stdenv.mkDerivation rec {
- name = "broadcom-bt-firmware-${version}";
+ pname = "broadcom-bt-firmware";
version = "12.0.1.1012";
src = fetchurl {
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cabextract bt-fw-converter ];
unpackCmd = ''
- mkdir -p ${name}
- cabextract $src --directory ${name}
+ mkdir -p ${pname}-${version}
+ cabextract $src --directory ${pname}-${version}
'';
installPhase = ''
diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
index 8927e1a28e7c..9a99881be462 100644
--- a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
+++ b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, perl, perlPackages, bluez }:
stdenv.mkDerivation rec {
- name = "bt-fw-converter-${version}";
+ pname = "bt-fw-converter";
version = "2017-02-19";
rev = "2d8b34402df01c6f7f4b8622de9e8b82fadf4153";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
buildInputs = [ perl perlPackages.RegexpGrammars bluez ];
unpackCmd = ''
- mkdir -p ${name}
- cp $src ${name}/bt-fw-converter.pl
+ mkdir -p ${pname}-${version}
+ cp $src ${pname}-${version}/bt-fw-converter.pl
'';
installPhase = ''
diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
index 5f8f6c542521..c9723c944ab1 100644
--- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
@@ -35,7 +35,8 @@ in
stdenv.mkDerivation {
- name = "facetimehd-firmware-${version}";
+ pname = "facetimehd-firmware";
+ inherit version;
src = fetchurl {
url = dmgUrl;
sha256 = "0xqkl4yds0n9fdjvnk0v5mj382q02crry6wm2q7j3ncdqwsv02sv";
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index c251e3963e7b..380444f02693 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- name = "firmware-linux-nonfree-${version}";
+ pname = "firmware-linux-nonfree";
version = "2019-07-17";
src = fetchgit {
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index b4d5d54137cd..9fdf9ca0bc15 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -1,18 +1,69 @@
-{ stdenv, fetchurl, substituteAll, gtk-doc, pkgconfig, gobject-introspection, intltool
-, libgudev, polkit, libxmlb, gusb, sqlite, libarchive, glib-networking
-, libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, gnu-efi
-, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl
-, ninja, gcab, gnutls, python3, wrapGAppsHook, json-glib, bash-completion
-, shared-mime-info, umockdev, vala, makeFontsConf, freefont_ttf
-, cairo, freetype, fontconfig, pango
-, bubblewrap, efibootmgr, flashrom, tpm2-tools
-}:
-
# Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc
+{ stdenv
+, fetchurl
+, substituteAll
+, gtk-doc
+, pkgconfig
+, gobject-introspection
+, intltool
+, libgudev
+, polkit
+, libxmlb
+, gusb
+, sqlite
+, libarchive
+, glib-networking
+, libsoup
+, help2man
+, gpgme
+, libxslt
+, elfutils
+, libsmbios
+, efivar
+, gnu-efi
+, libyaml
+, valgrind
+, meson
+, libuuid
+, colord
+, docbook_xml_dtd_43
+, docbook_xsl
+, ninja
+, gcab
+, gnutls
+, python3
+, wrapGAppsHook
+, json-glib
+, bash-completion
+, shared-mime-info
+, umockdev
+, vala
+, makeFontsConf
+, freefont_ttf
+, cairo
+, freetype
+, fontconfig
+, pango
+, bubblewrap
+, efibootmgr
+, flashrom
+, tpm2-tools
+, nixosTests
+}:
+
let
- python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]);
- installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]);
+ python = python3.withPackages (p: with p; [
+ pygobject3
+ pycairo
+ pillow
+ setuptools
+ ]);
+
+ installedTestsPython = python3.withPackages (p: with p; [
+ pygobject3
+ requests
+ ]);
fontsConf = makeFontsConf {
fontDirectories = [ freefont_ttf ];
@@ -26,30 +77,70 @@ let
# only redfish for x86_64
haveRedfish = stdenv.isx86_64;
- # Currently broken on Aarch64
- haveFlashrom = isx86;
+ # # Currently broken on Aarch64
+ # haveFlashrom = isx86;
+ # Experimental in 1.2.10
+ haveFlashrom = false;
-in stdenv.mkDerivation rec {
+in
+
+stdenv.mkDerivation rec {
pname = "fwupd";
- version = "1.2.8";
+ version = "1.2.10";
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
- sha256 = "0qbvq52c0scn1h99i1rf2la6rrhckin6gb02k7l0v3g07mxs20wc";
+ sha256 = "0inngs7i48akm9c7fmdsf9zjif595rkaba69rl76jfwfv8r21vjb";
};
outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
nativeBuildInputs = [
- meson ninja gtk-doc pkgconfig gobject-introspection intltool shared-mime-info
- valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook vala
+ meson
+ ninja
+ gtk-doc
+ pkgconfig
+ gobject-introspection
+ intltool
+ shared-mime-info
+ valgrind
+ gcab
+ docbook_xml_dtd_43
+ docbook_xsl
+ help2man
+ libxslt
+ python
+ wrapGAppsHook
+ vala
];
buildInputs = [
- polkit libxmlb gusb sqlite libarchive libsoup elfutils gnu-efi libyaml
- libgudev colord gpgme libuuid gnutls glib-networking json-glib umockdev
- bash-completion cairo freetype fontconfig pango efivar
- ] ++ stdenv.lib.optionals haveDell [ libsmbios ];
+ polkit
+ libxmlb
+ gusb
+ sqlite
+ libarchive
+ libsoup
+ elfutils
+ gnu-efi
+ libyaml
+ libgudev
+ colord
+ gpgme
+ libuuid
+ gnutls
+ glib-networking
+ json-glib
+ umockdev
+ bash-completion
+ cairo
+ freetype
+ fontconfig
+ pango
+ efivar
+ ] ++ stdenv.lib.optionals haveDell [
+ libsmbios
+ ];
patches = [
./fix-paths.patch
@@ -65,7 +156,12 @@ in stdenv.mkDerivation rec {
];
postPatch = ''
- patchShebangs .
+ patchShebangs \
+ libfwupd/generate-version-script.py \
+ meson_post_install.sh \
+ po/make-images \
+ po/make-images.sh \
+ po/test-deps
# we cannot use placeholder in substituteAll
# https://github.com/NixOS/nix/issues/1846
@@ -85,9 +181,12 @@ in stdenv.mkDerivation rec {
# doCheck = true;
preFixup = let
- binPath = [ efibootmgr bubblewrap tpm2-tools ] ++ stdenv.lib.optional haveFlashrom flashrom;
- in
- ''
+ binPath = [
+ efibootmgr
+ bubblewrap
+ tpm2-tools
+ ] ++ stdenv.lib.optional haveFlashrom flashrom;
+ in ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
# See programs reached with fu_common_find_program_in_path in source
@@ -128,6 +227,10 @@ in stdenv.mkDerivation rec {
FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
+ # error: “PolicyKit files are missing”
+ # https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428
+ PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions";
+
# TODO: wrapGAppsHook wraps efi capsule even though it is not elf
dontWrapGApps = true;
# so we need to wrap the executables manually
@@ -157,11 +260,15 @@ in stdenv.mkDerivation rec {
"pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service"
"pki/fwupd-metadata/LVFS-CA.pem"
];
+
+ tests = {
+ installedTests = nixosTests.fwupd;
+ };
};
meta = with stdenv.lib; {
homepage = https://fwupd.org/;
- maintainers = with maintainers; [];
+ maintainers = with maintainers; [ jtojnar ];
license = [ licenses.gpl2 ];
platforms = platforms.linux;
};
diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix
index 5b14546c90fd..70a0bdbe2406 100644
--- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix
@@ -2,7 +2,8 @@
let
version = "12";
in stdenv.mkDerivation {
- name = "fwupdate-${version}";
+ pname = "fwupdate";
+ inherit version;
src = fetchurl {
url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2";
sha256 = "00w7jsg7wrlq4cpfz26m9rbv2jwyf0sansf343vfq02fy5lxars1";
diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
index b60ce6f1b4af..421a3300f7b0 100644
--- a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "openelec-dvb-firmware-${version}";
+ pname = "openelec-dvb-firmware";
version = "0.0.51";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
index e64c4c09ebd9..e9ee91a2de7b 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "raspberrypi-wireless-firmware-${version}";
+stdenv.mkDerivation {
+ pname = "raspberrypi-wireless-firmware";
version = "2018-08-20";
srcs = [
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
index 4685f6757179..1ea2b5e4e3d4 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
-stdenv.mkDerivation rec {
- name = "raspberrypi-tools-${version}";
+stdenv.mkDerivation {
+ pname = "raspberrypi-tools";
version = "2018-10-03";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix
index 0a6364f07df5..bf3d2ef8d6db 100644
--- a/pkgs/os-specific/linux/flashbench/default.nix
+++ b/pkgs/os-specific/linux/flashbench/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
- name = "flashbench-${version}";
+stdenv.mkDerivation {
+ pname = "flashbench";
version = "2012-06-06";
src = fetchgit {
diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix
index 1594ddf288a9..db88ff05812e 100644
--- a/pkgs/os-specific/linux/forkstat/default.nix
+++ b/pkgs/os-specific/linux/forkstat/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
- name = "forkstat-${version}";
+ pname = "forkstat";
version = "0.02.11";
src = fetchurl {
url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix
index a091b2f17c5e..a6c5a6593d1c 100644
--- a/pkgs/os-specific/linux/freefall/default.nix
+++ b/pkgs/os-specific/linux/freefall/default.nix
@@ -1,9 +1,9 @@
{ stdenv, kernel }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (kernel) version src;
- name = "freefall-${version}";
+ pname = "freefall";
postPatch = ''
cd tools/laptop/freefall
diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix
index da787d84d79d..cdd42e98f06b 100644
--- a/pkgs/os-specific/linux/fscrypt/default.nix
+++ b/pkgs/os-specific/linux/fscrypt/default.nix
@@ -3,16 +3,18 @@
# Don't use this for anything important yet!
buildGoPackage rec {
- name = "fscrypt-${version}";
- version = "0.2.4";
+ pname = "fscrypt";
+ version = "unstable-2019-08-29";
goPackagePath = "github.com/google/fscrypt";
+ goDeps = ./deps.nix;
+
src = fetchFromGitHub {
owner = "google";
repo = "fscrypt";
- rev = "v${version}";
- sha256 = "10gbyqzgi30as1crvqbb4rc5p8zzbzk1q5j080h1gnz56qzwivr8";
+ rev = "8a3acda2011e9a080ee792c1e11646e6118a4930";
+ sha256 = "17h6r5lqiz0cw9vsixv48a1p78nd7bs1kncg6p4lfagl7kr5hpls";
};
buildInputs = [ pam ];
diff --git a/pkgs/os-specific/linux/fscrypt/deps.nix b/pkgs/os-specific/linux/fscrypt/deps.nix
new file mode 100644
index 000000000000..5d3e8a89a91f
--- /dev/null
+++ b/pkgs/os-specific/linux/fscrypt/deps.nix
@@ -0,0 +1,66 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "v1.2.0";
+ sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "v0.8.0";
+ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+ };
+ }
+ {
+ goPackagePath = "github.com/urfave/cli";
+ fetch = {
+ type = "git";
+ url = "https://github.com/urfave/cli";
+ rev = "v1.20.0";
+ sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "614d502a4dac";
+ sha256 = "1rcyvsl8b8pk7h8lwl0fpiflrx8zs121wi5490ln0qnvkk8d4bwy";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "8a410e7b638d";
+ sha256 = "0hp0l8f6fir5gmgrjq0mhh5ikc0rlrm72774228800kfwqjrxxny";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "1d60e4601c6f";
+ sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "d99a578cf41b";
+ sha256 = "10q9xx4pmnq92qn6ff4xp7n1hx766wvw2rf7pqcd6rx5plgwz8cm";
+ };
+ }
+]
diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/os-specific/linux/fscryptctl/default.nix
index 8622dc001a87..ecab0350d789 100644
--- a/pkgs/os-specific/linux/fscryptctl/default.nix
+++ b/pkgs/os-specific/linux/fscryptctl/default.nix
@@ -3,7 +3,7 @@
# Don't use this for anything important yet!
stdenv.mkDerivation rec {
- name = "fscryptctl-unstable-${version}";
+ pname = "fscryptctl-unstable";
version = "2017-10-23";
goPackagePath = "github.com/google/fscrypt";
diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix
index 915431c0cb1f..4d283d5dc0c6 100644
--- a/pkgs/os-specific/linux/ftop/default.nix
+++ b/pkgs/os-specific/linux/ftop/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "ftop-${version}";
+ pname = "ftop";
version = "1.0";
src = fetchurl {
- url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ftop/${name}.tar.bz2";
+ url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ftop/${pname}-${version}.tar.bz2";
sha256 = "3a705f4f291384344cd32c3dd5f5f6a7cd7cea7624c83cb7e923966dbcd47f82";
};
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index f829f1da424e..35c91c5ec071 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -10,12 +10,13 @@
let
isFuse3 = stdenv.lib.hasPrefix "3" version;
in stdenv.mkDerivation rec {
- name = "fuse-${version}";
+ pname = "fuse";
+ inherit version;
src = fetchFromGitHub {
owner = "libfuse";
repo = "libfuse";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = sha256Hash;
};
diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 4531de86b1b3..b5df553a97c3 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -2,12 +2,12 @@
, json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }:
stdenv.mkDerivation rec {
- name = "fwts-${version}";
- version = "19.07.00";
+ pname = "fwts";
+ version = "19.08.00";
src = fetchzip {
- url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz";
- sha256 = "04h99ri3nzhxr2js2a04bcj6zm17zlybqzv528j6hr6v0pv5wn4p";
+ url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
+ sha256 = "14v4vxvfsl008xalsmlhl9wh89xlrfffh3pky9m90flaizdzwyp4";
stripRoot = false;
};
diff --git a/pkgs/os-specific/linux/gfxtablet/default.nix b/pkgs/os-specific/linux/gfxtablet/default.nix
index 9fc052c5ac1b..56fa4f1d7d68 100644
--- a/pkgs/os-specific/linux/gfxtablet/default.nix
+++ b/pkgs/os-specific/linux/gfxtablet/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.4";
- name = "gfxtablet-uinput-driver-${version}";
+ pname = "gfxtablet-uinput-driver";
buildInputs = [
linuxHeaders
diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
index fc308285dd6d..03018c98818c 100644
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, autoreconfHook, pam, qrencode }:
stdenv.mkDerivation rec {
- name = "google-authenticator-libpam-${version}";
+ pname = "google-authenticator-libpam";
version = "1.06";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/os-specific/linux/gpu-switch/default.nix
index d56253c6cedd..ea1051c5f058 100644
--- a/pkgs/os-specific/linux/gpu-switch/default.nix
+++ b/pkgs/os-specific/linux/gpu-switch/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "gpu-switch-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "gpu-switch-unstable";
version = "2017-04-28";
src = fetchFromGitHub {
owner = "0xbb";
diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix
index 7f64ed227719..bea70da995bd 100644
--- a/pkgs/os-specific/linux/gradm/default.nix
+++ b/pkgs/os-specific/linux/gradm/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "gradm-${version}";
+ pname = "gradm";
version = "3.1-201608131257";
src = fetchurl {
- url = "http://grsecurity.net/stable/${name}.tar.gz";
+ url = "http://grsecurity.net/stable/${pname}-${version}.tar.gz";
sha256 = "0y5565rhil5ciprwz7nx4s4ah7dsxx7zrkg42dbq0mcg8m316xrb";
};
diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix
index acafa0376f5c..8e6db2a5774b 100644
--- a/pkgs/os-specific/linux/guvcview/default.nix
+++ b/pkgs/os-specific/linux/guvcview/default.nix
@@ -6,7 +6,7 @@ assert pulseaudioSupport -> libpulseaudio != null;
stdenv.mkDerivation rec {
version = "2.0.6";
- name = "guvcview-${version}";
+ pname = "guvcview";
src = fetchurl {
url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/pkgs/os-specific/linux/hdapsd/default.nix
index 53924a782df7..893eb4fdd999 100644
--- a/pkgs/os-specific/linux/hdapsd/default.nix
+++ b/pkgs/os-specific/linux/hdapsd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
let version = "20141203"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "hdapsd-"+version;
src = fetchurl {
diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix
index 15bdabcc3dc8..3d759001d01c 100644
--- a/pkgs/os-specific/linux/hibernate/default.nix
+++ b/pkgs/os-specific/linux/hibernate/default.nix
@@ -2,8 +2,9 @@
let version = "2.0";
in
- stdenv.mkDerivation rec {
- name = "hibernate-${version}";
+ stdenv.mkDerivation {
+ pname = "hibernate";
+ inherit version;
src = fetchurl {
url = "http://tuxonice.nigelcunningham.com.au/files/hibernate-script-${version}.tar.gz";
sha256 = "0ib5bac3spbcwmhf8f9apjbll8x7fgqj4k1s5q3srijh793rfifh";
diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 7629a20473b2..e90470cd5891 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:
stdenv.mkDerivation rec {
- name = "hostapd-${version}";
+ pname = "hostapd";
version = "2.8";
src = fetchurl {
- url = "https://w1.fi/releases/${name}.tar.gz";
+ url = "https://w1.fi/releases/${pname}-${version}.tar.gz";
sha256 = "1c74rrazkhy4lr7pwgwa2igzca7h9l4brrs7672kiv7fwqmm57wj";
};
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index dfca87e27165..38335682ddb8 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "hwdata-${version}";
+ pname = "hwdata";
version = "0.316";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix
index f89747dc200d..a209f1ab4bb9 100644
--- a/pkgs/os-specific/linux/hyperv-daemons/default.nix
+++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, python, kernel, makeWrapper, writeText }:
let
- daemons = stdenv.mkDerivation rec {
- name = "hyperv-daemons-bin-${version}";
+ daemons = stdenv.mkDerivation {
+ pname = "hyperv-daemons-bin";
inherit (kernel) src version;
nativeBuildInputs = [ makeWrapper ];
@@ -54,8 +54,8 @@ let
WantedBy=hyperv-daemons.target
'';
-in stdenv.mkDerivation rec {
- name = "hyperv-daemons-${version}";
+in stdenv.mkDerivation {
+ pname = "hyperv-daemons";
inherit (kernel) version;
diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix
index 5b061183356c..1b87619faa32 100644
--- a/pkgs/os-specific/linux/i2c-tools/default.nix
+++ b/pkgs/os-specific/linux/i2c-tools/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, read-edid }:
stdenv.mkDerivation rec {
- name = "i2c-tools-${version}";
+ pname = "i2c-tools";
version = "4.1";
src = fetchurl {
- url = "https://www.kernel.org/pub/software/utils/i2c-tools/${name}.tar.xz";
+ url = "https://www.kernel.org/pub/software/utils/i2c-tools/${pname}-${version}.tar.xz";
sha256 = "1m97hpwqfaqjl9xvr4pvz2vdrsdvxbcn0nnx8pamnyc3s7pikcjp";
};
diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index ac5f9fc5ba30..2f792cb7ea74 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -2,7 +2,7 @@
, withGui ? false, qtbase }:
stdenv.mkDerivation rec {
- name = "i7z-${version}";
+ pname = "i7z";
version = "0.27.3";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/ifenslave/default.nix b/pkgs/os-specific/linux/ifenslave/default.nix
index b9390d1d5893..1b22c1eafd3b 100644
--- a/pkgs/os-specific/linux/ifenslave/default.nix
+++ b/pkgs/os-specific/linux/ifenslave/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ifenslave-${version}";
+ pname = "ifenslave";
version = "1.1.0";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix
index 6de3b19afd7e..69ec6560d83d 100644
--- a/pkgs/os-specific/linux/ima-evm-utils/default.nix
+++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }:
stdenv.mkDerivation rec {
- name = "ima-evm-utils-${version}";
+ pname = "ima-evm-utils";
version = "1.1";
src = fetchgit {
diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix
index cd0fc01384bc..c6248ee90836 100644
--- a/pkgs/os-specific/linux/input-utils/default.nix
+++ b/pkgs/os-specific/linux/input-utils/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, linuxHeaders }:
stdenv.mkDerivation rec {
- name = "input-utils-${version}";
+ pname = "input-utils";
version = "1.3";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix
index 38069981723d..1f67208db8b9 100644
--- a/pkgs/os-specific/linux/intel-ocl/default.nix
+++ b/pkgs/os-specific/linux/intel-ocl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }:
stdenv.mkDerivation rec {
- name = "intel-ocl-${version}";
+ pname = "intel-ocl";
version = "5.0-63503";
src = fetchzip {
diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/os-specific/linux/iomelt/default.nix
index 932b81438982..7b41b095091d 100644
--- a/pkgs/os-specific/linux/iomelt/default.nix
+++ b/pkgs/os-specific/linux/iomelt/default.nix
@@ -2,7 +2,8 @@
let version = "0.7";
in stdenv.mkDerivation {
- name = "iomelt-${version}";
+ pname = "iomelt";
+ inherit version;
src = fetchurl {
url = "http://iomelt.com/s/iomelt-${version}.tar.gz";
sha256 = "1jhrdm5b7f1bcbrdwcc4yzg26790jxl4d2ndqiwd9brl2g5537im";
diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix
index a9be26a20262..5a0555f66805 100644
--- a/pkgs/os-specific/linux/iptstate/default.nix
+++ b/pkgs/os-specific/linux/iptstate/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libnetfilter_conntrack, ncurses }:
stdenv.mkDerivation rec {
- name = "iptstate-${version}";
+ pname = "iptstate";
version = "2.2.6";
src = fetchurl {
- url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${name}.tar.bz2";
+ url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "bef8eb67a4533e53079f397b71e91dd34da23f8cbd65cb2d5b67cb907b00c068";
};
diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix
index 67a123a37648..f5d80dc5258c 100644
--- a/pkgs/os-specific/linux/ipvsadm/default.nix
+++ b/pkgs/os-specific/linux/ipvsadm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libnl, popt, gnugrep }:
stdenv.mkDerivation rec {
- name = "ipvsadm-${version}";
+ pname = "ipvsadm";
version = "1.30";
src = fetchurl {
- url = "mirror://kernel/linux/utils/kernel/ipvsadm/${name}.tar.xz";
+ url = "mirror://kernel/linux/utils/kernel/ipvsadm/${pname}-${version}.tar.xz";
sha256 = "033srm20n3114aci3b6cwxnkm7n68k09di2aziiryg27vxq3smwm";
};
diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix
index e606e3db6ee6..8dc9e2694d47 100644
--- a/pkgs/os-specific/linux/irqbalance/default.nix
+++ b/pkgs/os-specific/linux/irqbalance/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }:
stdenv.mkDerivation rec {
- name = "irqbalance-${version}";
+ pname = "irqbalance";
version = "1.6.0";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index a37e65f8cb50..3386a7f92062 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "kbd-${version}";
+ pname = "kbd";
version = "2.0.4";
src = fetchurl {
- url = "mirror://kernel/linux/utils/kbd/${name}.tar.xz";
+ url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz";
sha256 = "124swm93dm4ca0pifgkrand3r9gvj3019d4zkfxsj9djpvv0mnaz";
};
diff --git a/pkgs/os-specific/linux/kbd/keymaps.nix b/pkgs/os-specific/linux/kbd/keymaps.nix
index 32c9f6906806..b3d5fe1b63cc 100644
--- a/pkgs/os-specific/linux/kbd/keymaps.nix
+++ b/pkgs/os-specific/linux/kbd/keymaps.nix
@@ -2,7 +2,7 @@
{
dvp = stdenv.mkDerivation rec {
- name = "dvp-${version}";
+ pname = "dvp";
version = "1.2.1";
src = fetchurl {
@@ -18,8 +18,8 @@
'';
};
- neo = stdenv.mkDerivation rec {
- name = "neo-${version}";
+ neo = stdenv.mkDerivation {
+ pname = "neo";
version = "2476";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix
index 44a63c9f1ece..6df3e4fffe70 100644
--- a/pkgs/os-specific/linux/kbdlight/default.nix
+++ b/pkgs/os-specific/linux/kbdlight/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "kbdlight-${version}";
+ pname = "kbdlight";
version = "1.3";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 1e9b1c276d0c..1699324546d1 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -7,7 +7,8 @@ let
makeLinuxHeaders = { src, version, patches ? [] }: stdenvNoCC.mkDerivation {
inherit src;
- name = "linux-headers-${version}";
+ pname = "linux-headers";
+ inherit version;
ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or stdenvNoCC.hostPlatform.kernelArch;
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index b392dc853d35..4ad222b83e44 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -123,6 +123,7 @@ let
IPV6_FOU_TUNNEL = whenAtLeast "4.7" module;
NET_CLS_BPF = whenAtLeast "4.4" module;
NET_ACT_BPF = whenAtLeast "4.4" module;
+ NET_SCHED = yes;
L2TP_V3 = yes;
L2TP_IP = module;
L2TP_ETH = module;
@@ -144,7 +145,7 @@ let
NF_TABLES_IPV4 = whenAtLeast "4.17" yes;
NF_TABLES_ARP = whenAtLeast "4.17" yes;
NF_TABLES_IPV6 = whenAtLeast "4.17" yes;
- NF_TABLES_BRIDGE = whenAtLeast "4.17" yes;
+ NF_TABLES_BRIDGE = whenBetween "4.17" "5.3" yes;
};
wireless = {
@@ -157,6 +158,9 @@ let
ATH9K_AHB = option yes; # Ditto, AHB bus
B43_PHY_HT = option yes;
BCMA_HOST_PCI = option yes;
+ RTW88 = whenAtLeast "5.2" module;
+ RTW88_8822BE = whenAtLeast "5.2" yes;
+ RTW88_8822CE = whenAtLeast "5.2" yes;
};
fb = {
@@ -567,6 +571,7 @@ let
});
misc = {
+ HID_BATTERY_STRENGTH = yes;
MODULE_COMPRESS = yes;
MODULE_COMPRESS_XZ = yes;
KERNEL_XZ = yes;
@@ -629,8 +634,8 @@ let
IDLE_PAGE_TRACKING = yes;
IRDA_ULTRA = whenOlder "4.17" yes; # Ultra (connectionless) protocol
- JOYSTICK_IFORCE_232 = option yes; # I-Force Serial joysticks and wheels
- JOYSTICK_IFORCE_USB = option yes; # I-Force USB joysticks and wheels
+ JOYSTICK_IFORCE_232 = { optional = true; tristate = whenOlder "5.3" "y"; }; # I-Force Serial joysticks and wheels
+ JOYSTICK_IFORCE_USB = { optional = true; tristate = whenOlder "5.3" "y"; }; # I-Force USB joysticks and wheels
JOYSTICK_XPAD_FF = option yes; # X-Box gamepad rumble support
JOYSTICK_XPAD_LEDS = option yes; # LED Support for Xbox360 controller 'BigX' LED
@@ -697,6 +702,8 @@ let
PREEMPT = no;
PREEMPT_VOLUNTARY = yes;
+
+ X86_AMD_PLATFORM_DEVICE = yes;
} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
# Enable CPU/memory hotplug support
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 527811c2b8d6..e6e1bd842363 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -93,7 +93,8 @@ let
configfile = stdenv.mkDerivation {
inherit ignoreConfigErrors autoModules preferBuiltin kernelArch;
- name = "linux-config-${version}";
+ pname = "linux-config";
+ inherit version;
generateConfig = ./generate-config.pl;
@@ -150,8 +151,8 @@ let
moduleStructuredConfig = (lib.evalModules {
modules = [
module
- { settings = commonStructuredConfig; }
- { settings = structuredExtraConfig; }
+ { settings = commonStructuredConfig; _file = "pkgs/os-specific/linux/kernel/common-config.nix"; }
+ { settings = structuredExtraConfig; _file = "structuredExtraConfig"; }
]
++ structuredConfigFromPatches
;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index a3b77ee8d96c..0a0ccaffa7d2 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.141";
+ version = "4.14.143";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "05rs411rw10hhnfzvaxmcik3pq20i1i05shvvra4bv164f0z1f8b";
+ sha256 = "14rxck0dd0rirj09aj4xsbylcvvfrgqxr1fx0c570dxr7kqg4d15";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index fb25fbb7ddcd..16277e6c85ff 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.69";
+ version = "4.19.72";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "11yrw8ixd5ni9rlpndqsz2ihx6k8qaf35a1lf164lkhaa85pd4f0";
+ sha256 = "0v8zypwyc9bcmm16hbvk092h9qnwqc0f6m61bz2ml499pnrvdz7r";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 0d3ce63325f6..9f03e200f1bd 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.190";
+ version = "4.4.192";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1rf28cjrrmj7mm8xqlfld6k20ddk15j4mmyarqibjx9pk9acij7y";
+ sha256 = "0fwak1hrahcky1hdk4h8693rjpx65c2sqzfm1x71nhhysa6r3fig";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 0008219efb9a..9b91ced27d00 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.190";
+ version = "4.9.192";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "05ha3snfk0vdqk9i27icwpq2if0h2jvshavn69ldwqm4h2h1r2py";
+ sha256 = "0m4d6b5sfcx3iv0agia080fbcn9icyqzgzxp946zv93hrq6306ks";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix
deleted file mode 100644
index ad3b292656e9..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-5.1.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
-
-with stdenv.lib;
-
-buildLinux (args // rec {
- version = "5.1.21";
-
- # modDirVersion needs to be x.y.z, will automatically add .0 if needed
- modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
-
- # branchVersion needs to be x.y
- extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
-
- src = fetchurl {
- url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1xj1wfhjz2s5a8j6zx3fsd7rrrkvw5waszzylf2gn3ag6615yjan";
- };
-} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix
index bf28ac53df09..47e57b8bb0aa 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.2.11";
+ version = "5.2.14";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1y9kn1zny3xpmbi5an3g7hbzywnycys8chfaw6laij1xk4gq6ahc";
+ sha256 = "136fs0pn5acg40rlq51zl5001rk8fx01gi2ffd58cspfgx3kckf6";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 5eb050cbdff9..e4a4e40f370c 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -4,8 +4,8 @@
# Update this if linux_latest-libre fails to build.
# $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+'
- rev = "16330";
- sha256 = "1d7rsq2m6lp1784cgdg95aspgrnzxm6q9dxqalxja5cac8n6p11y";
+ rev = "16604";
+ sha256 = "0d2dh52zv073zr74ilspy0fy3ivys5pq32j7fljs4fwi2bcljf51";
}
, ...
}:
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index d2e1a35cb2e6..1b4700a2e392 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -4,7 +4,7 @@ let
modDirVersion = "4.14.98";
tag = "1.20190215";
in
-lib.overrideDerivation (buildLinux (args // rec {
+lib.overrideDerivation (buildLinux (args // {
version = "${modDirVersion}-${tag}";
inherit modDirVersion;
@@ -16,9 +16,9 @@ lib.overrideDerivation (buildLinux (args // rec {
};
defconfig = {
- "armv6l-linux" = "bcmrpi_defconfig";
- "armv7l-linux" = "bcm2709_defconfig";
- "aarch64-linux" = "bcmrpi3_defconfig";
+ armv6l-linux = "bcmrpi_defconfig";
+ armv7l-linux = "bcm2709_defconfig";
+ aarch64-linux = "bcmrpi3_defconfig";
}.${stdenv.hostPlatform.system} or (throw "linux_rpi not supported on '${stdenv.hostPlatform.system}'");
features = {
diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index 4516af19a4e7..0b2ed76a4b4b 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args:
-buildLinux (args // rec {
+buildLinux (args // {
version = "5.1.2019.08.21";
modDirVersion = "5.1.0";
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 59b406a91eec..e653a6459df9 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,15 +3,15 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.2-rc7";
- extraMeta.branch = "5.2";
+ version = "5.3-rc8";
+ extraMeta.branch = "5.3";
# modDirVersion needs to be x.y.z, will always add .0
modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg;
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
- sha256 = "1128jb1y4gia5icv614ycp3c5mkvrb2l2wn20765b3si256g68n4";
+ sha256 = "01pr8xb9akjzafl8zkpwwkmlsjxghv5bx0larkjqdakjfspqnhzj";
};
# Should the testing kernels ever be built on Hydra?
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 7a663fca6948..88e990501f9a 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -190,7 +190,6 @@ let
# To save space, exclude a bunch of unneeded stuff when copying.
(cd .. && rsync --archive --prune-empty-dirs \
--exclude='/build/' \
- --exclude='/Documentation/' \
* $dev/lib/modules/${modDirVersion}/source/)
cd $dev/lib/modules/${modDirVersion}/source
@@ -278,7 +277,8 @@ in
assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null;
assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null;
stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // {
- name = "linux-${version}";
+ pname = "linux";
+ inherit version;
enableParallelBuilding = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index edca017b3c70..b80320db282e 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -1,6 +1,6 @@
{ fetchpatch }:
-rec {
+{
bridge_stp_helper =
{ name = "bridge-stp-helper";
patch = ./bridge-stp-helper.patch;
@@ -23,7 +23,7 @@ rec {
cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches;
- tag_hardened = rec {
+ tag_hardened = {
name = "tag-hardened";
patch = ./tag-hardened.patch;
};
@@ -58,7 +58,7 @@ rec {
};
};
- export_kernel_fpu_functions = rec {
+ export_kernel_fpu_functions = {
name = "export_kernel_fpu_functions";
patch = ./export_kernel_fpu_functions.patch;
};
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index 8adb862a265f..3d3215e6b4bf 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -1,15 +1,15 @@
{ stdenv, buildPackages, fetchurl, zlib }:
stdenv.mkDerivation rec {
- name = "kexec-tools-${version}";
- version = "2.0.19";
+ pname = "kexec-tools";
+ version = "2.0.20";
src = fetchurl {
urls = [
- "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz"
- "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"
+ "mirror://kernel/linux/utils/kernel/kexec/${pname}-${version}.tar.xz"
+ "http://horms.net/projects/kexec/kexec-tools/${pname}-${version}.tar.xz"
];
- sha256 = "03jyi4c47ywclycf3a253xpqs7p6ys8inz9q66b8m3xc6nrh307d";
+ sha256 = "1j7qlhxk1rbv9jbj8wd6hb7zl8p2mp29ymrmccgmsi0m0dzhgn6s";
};
hardeningDisable = [ "format" "pic" "relro" "pie" ];
diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix
index 1d9497a7eddf..7d6ee61030c1 100644
--- a/pkgs/os-specific/linux/keyutils/default.nix
+++ b/pkgs/os-specific/linux/keyutils/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "keyutils-${version}";
+ pname = "keyutils";
version = "1.6";
src = fetchurl {
- url = "https://people.redhat.com/dhowells/keyutils/${name}.tar.bz2";
+ url = "https://people.redhat.com/dhowells/keyutils/${pname}-${version}.tar.bz2";
sha256 = "05bi5ja6f3h3kdi7p9dihlqlfrsmi1wh1r2bdgxc0180xh6g5bnk";
};
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 8cae61d56a92..8e224c8f33b8 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -8,7 +8,7 @@ let
in
stdenv.mkDerivation rec {
- name = "klibc-${version}";
+ pname = "klibc";
version = "2.0.4";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/klibc/shrunk.nix b/pkgs/os-specific/linux/klibc/shrunk.nix
index f01f3b6a4ec3..b5b9783c6e7d 100644
--- a/pkgs/os-specific/linux/klibc/shrunk.nix
+++ b/pkgs/os-specific/linux/klibc/shrunk.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
# name due to the sed hackery below. Once patchelf 0.4 is in the
# tree, we can do this properly.
#name = "${klibc.name}-shrunk";
- name = "${klibc.name}";
+ name = klibc.name;
buildCommand = ''
mkdir -p $out/lib
cp -prd ${klibc.out}/lib/klibc/bin $out/
diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index 266c94fd8c84..55ae78219d18 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -4,7 +4,8 @@ let
version = "22-1.1ubuntu1"; # Zesty
in stdenv.mkDerivation {
- name = "kmod-blacklist-${version}";
+ pname = "kmod-blacklist";
+ inherit version;
src = fetchurl {
url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz";
diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix
index f738b9f6da5f..12463c736a62 100644
--- a/pkgs/os-specific/linux/kmscube/default.nix
+++ b/pkgs/os-specific/linux/kmscube/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkgconfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "kmscube-2018-06-17";
src = fetchgit {
diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix
index 0c333feab1c1..96bb91175dc8 100644
--- a/pkgs/os-specific/linux/ldm/default.nix
+++ b/pkgs/os-specific/linux/ldm/default.nix
@@ -7,7 +7,8 @@ let
git = https://github.com/LemonBoy/ldm.git;
in
stdenv.mkDerivation rec {
- name = "ldm-${version}";
+ pname = "ldm";
+ inherit version;
# There is a stable release, but we'll use the lvm branch, which
# contains important fixes for LVM setups.
diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/pkgs/os-specific/linux/ledger-udev-rules/default.nix
index 28027fd4510a..96c60f6ea56e 100644
--- a/pkgs/os-specific/linux/ledger-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/ledger-udev-rules/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ledger-udev-rules";
version = "unstable-2019-02-13";
diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix
index 949c8135df7b..fef7a3236b30 100644
--- a/pkgs/os-specific/linux/libaio/default.nix
+++ b/pkgs/os-specific/linux/libaio/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.3.110";
- name = "libaio-${version}";
+ pname = "libaio";
src = fetchurl {
- url = "https://fedorahosted.org/releases/l/i/libaio/${name}.tar.gz";
+ url = "https://fedorahosted.org/releases/l/i/libaio/${pname}-${version}.tar.gz";
sha256 = "0zjzfkwd1kdvq6zpawhzisv7qbq1ffs343i5fs9p498pcf7046g0";
};
diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index a23c0cb09269..1294bd3d2680 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -5,7 +5,7 @@
with builtins;
stdenv.mkDerivation rec {
- name = "libbpf-${version}";
+ pname = "libbpf";
version = "0.0.3pre114_${substring 0 7 src.rev}";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix
index 981e928ba659..d0fc97d0dd35 100644
--- a/pkgs/os-specific/linux/libcap-ng/default.nix
+++ b/pkgs/os-specific/linux/libcap-ng/default.nix
@@ -3,13 +3,13 @@
assert python2 != null || python3 != null -> swig != null;
stdenv.mkDerivation rec {
- name = "libcap-ng-${version}";
+ pname = "libcap-ng";
# When updating make sure to test that the version with
# all of the python bindings still works
version = "0.7.9";
src = fetchurl {
- url = "${meta.homepage}/${name}.tar.gz";
+ url = "${meta.homepage}/${pname}-${version}.tar.gz";
sha256 = "0a0k484kwv0zilry2mbl9k56cnpdhsjxdxin17jas6kkyfy345aa";
};
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 87f354aa75d3..9c730bb96597 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, attr, perl, pam }:
stdenv.mkDerivation rec {
- name = "libcap-${version}";
+ pname = "libcap";
version = "2.27";
src = fetchurl {
- url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${name}.tar.xz";
+ url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz";
sha256 = "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs";
};
@@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
postInstall = ''
rm "$lib"/lib/*.a
- mkdir -p "$doc/share/doc/${name}"
- cp License "$doc/share/doc/${name}/"
+ mkdir -p "$doc/share/doc/${pname}-${version}"
+ cp License "$doc/share/doc/${pname}-${version}/"
'' + stdenv.lib.optionalString (pam != null) ''
mkdir -p "$pam/lib/security"
mv "$lib"/lib/security "$pam/lib"
diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix
index 1e920247a754..026b43fc615d 100644
--- a/pkgs/os-specific/linux/libcgroup/default.nix
+++ b/pkgs/os-specific/linux/libcgroup/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, pam, yacc, flex }:
stdenv.mkDerivation rec {
- name = "libcgroup-${version}";
+ pname = "libcgroup";
version = "0.41";
src = fetchurl {
- url = "mirror://sourceforge/libcg/${name}.tar.bz2";
+ url = "mirror://sourceforge/libcg/${pname}-${version}.tar.bz2";
sha256 = "0lgvyq37gq84sk30sg18admxaj0j0p5dq3bl6g74a1ppgvf8pqz4";
};
diff --git a/pkgs/os-specific/linux/libevdevc/default.nix b/pkgs/os-specific/linux/libevdevc/default.nix
new file mode 100644
index 000000000000..e3dfbd3d6c22
--- /dev/null
+++ b/pkgs/os-specific/linux/libevdevc/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, coreutils, pkgconfig, glib, jsoncpp }:
+
+stdenv.mkDerivation rec {
+ name = "libevdevc";
+ version = "2.0.1";
+ src = fetchFromGitHub {
+ owner = "hugegreenbug";
+ repo = "libevdevc";
+ rev = "v${version}";
+ sha256 = "0ry30krfizh87yckmmv8n082ad91mqhhbbynx1lfidqzb6gdy2dd";
+ };
+
+ postPatch = ''
+ substituteInPlace common.mk \
+ --replace /bin/echo ${coreutils}/bin/echo
+ substituteInPlace include/module.mk \
+ --replace /usr/include /include
+ '';
+
+ makeFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ];
+
+ meta = with stdenv.lib; {
+ description = "ChromiumOS libevdev. Renamed to avoid conflicts with the standard libevdev found in Linux distros.";
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ homepage = "https://chromium.googlesource.com/chromiumos/platform/libevdev/";
+ maintainers = with maintainers; [ kcalvinalvin ];
+ };
+}
diff --git a/pkgs/os-specific/linux/libgestures/default.nix b/pkgs/os-specific/linux/libgestures/default.nix
new file mode 100644
index 000000000000..4c51525727af
--- /dev/null
+++ b/pkgs/os-specific/linux/libgestures/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, pkgconfig, glib, jsoncpp }:
+
+stdenv.mkDerivation rec {
+ name = "libgestures-${version}";
+ version = "2.0.1";
+ src = fetchFromGitHub {
+ owner = "hugegreenbug";
+ repo = "libgestures";
+ rev = "v${version}";
+ sha256 = "0dfvads2adzx4k8cqc1rbwrk1jm2wn9wl2jk51m26xxpmh1g0zab";
+ };
+ patches = [ ./include-fix.patch ];
+
+ postPatch = ''
+ substituteInPlace Makefile \
+ --replace -Werror -Wno-error \
+ --replace '$(DESTDIR)/usr/include' '$(DESTDIR)/include'
+ '';
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib jsoncpp ];
+
+
+ makeFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ];
+
+ meta = with stdenv.lib; {
+ description = "ChromiumOS libgestures modified to compile for Linux.";
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ homepage = "https://chromium.googlesource.com/chromiumos/platform/gestures";
+ maintainers = with maintainers; [ kcalvinalvin ];
+ };
+}
diff --git a/pkgs/os-specific/linux/libgestures/include-fix.patch b/pkgs/os-specific/linux/libgestures/include-fix.patch
new file mode 100644
index 000000000000..851be4771434
--- /dev/null
+++ b/pkgs/os-specific/linux/libgestures/include-fix.patch
@@ -0,0 +1,12 @@
+diff -ur a/include/gestures/include/finger_metrics.h b/include/gestures/include/finger_metrics.h
+--- a/include/gestures/include/finger_metrics.h 1970-01-01 09:00:01.000000000 +0900
++++ b/include/gestures/include/finger_metrics.h 2018-12-01 16:58:51.590718511 +0900
+@@ -5,6 +5,8 @@
+ #ifndef GESTURES_FINGER_METRICS_H_
+ #define GESTURES_FINGER_METRICS_H_
+
++#include
++
+ #include "gestures/include/gestures.h"
+ #include "gestures/include/prop_registry.h"
+#include "gestures/include/vector.h"
diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index 34d10d3aa5fb..0789d53b4344 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -2,7 +2,7 @@
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, swig ? null, python}:
stdenv.mkDerivation rec {
- name = "libnl-${version}";
+ pname = "libnl";
version = "3.4.0";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix
index 5dab4b34f466..a09bb2a6ceb4 100644
--- a/pkgs/os-specific/linux/libratbag/default.nix
+++ b/pkgs/os-specific/linux/libratbag/default.nix
@@ -2,7 +2,7 @@
, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 }:
stdenv.mkDerivation rec {
- name = "libratbag-${version}";
+ pname = "libratbag";
version = "0.9.905";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 51e1a3220941..d8a2298f3d3f 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -8,15 +8,15 @@ assert enablePython -> swig != null && python != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "libselinux-${version}";
- version = "2.7";
+ pname = "libselinux";
+ version = "2.9";
inherit (libsepol) se_release se_url;
- outputs = [ "bin" "out" "dev" "man" "py" ];
+ outputs = [ "bin" "out" "dev" "man" ] ++ optional enablePython "py";
src = fetchurl {
url = "${se_url}/${se_release}/libselinux-${version}.tar.gz";
- sha256 = "0mwcq78v6ngbq06xmb9dvilpg0jnl2vs9fgrpakhmmiskdvc1znh";
+ sha256 = "14r69mgmz7najf9wbizvp68q56mqx4yjbkxjlbcqg5a47s3wik0v";
};
nativeBuildInputs = [ pkgconfig ] ++ optionals enablePython [ swig python ];
@@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
"MAN3DIR=$(man)/share/man/man3"
"MAN5DIR=$(man)/share/man/man5"
"MAN8DIR=$(man)/share/man/man8"
- "PYSITEDIR=$(py)/${python.sitePackages}"
+ "PYTHON=python"
+ "PYTHONLIBDIR=$(py)/${python.sitePackages}"
"SBINDIR=$(bin)/sbin"
"SHLIBDIR=$(out)/lib"
diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index 59f5f11d0769..70b2508451bb 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -5,26 +5,30 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "libsemanage-${version}";
- version = "2.7";
+ pname = "libsemanage";
+ version = "2.9";
inherit (libsepol) se_release se_url;
src = fetchurl {
url = "${se_url}/${se_release}/libsemanage-${version}.tar.gz";
- sha256 = "0xnlp1yg8b1aqc6kq3pss1i1nl06rfj4x4pyl5blasnf2ivlgs87";
- };
+ sha256 = "075w6y3l9hiy5hicgwrmijyxmhfyd1r7cnc08qxyg4j46jfk8xi5";
+ };
+
+ outputs = [ "out" "dev" "man" ] ++ optional enablePython "py";
nativeBuildInputs = [ bison flex pkgconfig ];
buildInputs = [ libsepol libselinux bzip2 audit ]
++ optionals enablePython [ swig python ];
- preBuild = ''
- makeFlagsArray+=("PREFIX=$out")
- makeFlagsArray+=("DESTDIR=$out")
- makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
- makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
- makeFlagsArray+=("PYSITEDIR=$out/lib/${python.libPrefix}/site-packages")
- '';
+ makeFlags = [
+ "PREFIX=$(out)"
+ "INCLUDEDIR=$(dev)/include"
+ "MAN3DIR=$(man)/share/man/man3"
+ "MAN5DIR=$(man)/share/man/man5"
+ "PYTHON=python"
+ "PYTHONLIBDIR=$(py)/${python.sitePackages}"
+ "DEFAULT_SEMANAGE_CONF_LOCATION=$(out)/etc/selinux/semanage.conf"
+ ];
installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ];
diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index f16c241a0a1f..03bd0252c5ca 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, flex }:
stdenv.mkDerivation rec {
- name = "libsepol-${version}";
- version = "2.7";
- se_release = "20170804";
- se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
+ pname = "libsepol";
+ version = "2.9";
+ se_release = "20190315";
+ se_url = "https://github.com/SELinuxProject/selinux/releases/download";
outputs = [ "bin" "out" "dev" "man" ];
src = fetchurl {
url = "${se_url}/${se_release}/libsepol-${version}.tar.gz";
- sha256 = "1rzr90d3f1g5wy1b8sh6fgnqb9migys2zgpjmpakn6lhxkc3p7fn";
+ sha256 = "0p8x7w73jn1nysx1d7416wqrhbi0r6isrjxib7jf68fi72q14jx3";
};
nativeBuildInputs = [ flex ];
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index 874faf7799b3..d0ae18528534 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
- name = "libsmbios-${version}";
+ pname = "libsmbios";
version = "2.4.2";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/os-specific/linux/libudev0-shim/default.nix
index c0c6ad54579c..ecdc658f2f1e 100644
--- a/pkgs/os-specific/linux/libudev0-shim/default.nix
+++ b/pkgs/os-specific/linux/libudev0-shim/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, udev }:
stdenv.mkDerivation rec {
- name = "libudev0-shim-${version}";
+ pname = "libudev0-shim";
version = "1";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/libwebcam/default.nix b/pkgs/os-specific/linux/libwebcam/default.nix
index 879e85a0c945..5cccc82b8430 100644
--- a/pkgs/os-specific/linux/libwebcam/default.nix
+++ b/pkgs/os-specific/linux/libwebcam/default.nix
@@ -9,7 +9,6 @@
stdenv.mkDerivation rec {
pname = "libwebcam";
version = "0.2.5";
- name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/${pname}/source/${pname}-src-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix
index 1856c8861cc4..6a0dd34d021d 100644
--- a/pkgs/os-specific/linux/light/default.nix
+++ b/pkgs/os-specific/linux/light/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.2";
- name = "light-${version}";
+ pname = "light";
src = fetchFromGitHub {
owner = "haikarainen";
repo = "light";
diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix
index 0536ba064a3d..b9e58cb5a4c7 100644
--- a/pkgs/os-specific/linux/lm-sensors/default.nix
+++ b/pkgs/os-specific/linux/lm-sensors/default.nix
@@ -5,7 +5,7 @@
assert sensord -> rrdtool != null;
stdenv.mkDerivation rec {
- name = "lm-sensors-${version}";
+ pname = "lm-sensors";
version = "3.5.0";
src = fetchzip {
diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix
index 3c7ceb1270c0..74abd12868d5 100644
--- a/pkgs/os-specific/linux/lockdep/default.nix
+++ b/pkgs/os-specific/linux/lockdep/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "lockdep-${version}";
+ pname = "lockdep";
version = "4.1.2";
fullver = "4.1.2";
diff --git a/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/pkgs/os-specific/linux/logitech-udev-rules/default.nix
index c215d9401940..369f412fbfc5 100644
--- a/pkgs/os-specific/linux/logitech-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/logitech-udev-rules/default.nix
@@ -3,8 +3,8 @@
# ltunifi and solaar both provide udev rules but solaar's rules are more
# up-to-date so we simply use that instead of having to maintain our own rules
-stdenv.mkDerivation rec {
- name = "logitech-udev-rules-${version}";
+stdenv.mkDerivation {
+ pname = "logitech-udev-rules";
inherit (solaar) version;
buildCommand = ''
diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix
index 93cab433c9c6..63155e66678a 100644
--- a/pkgs/os-specific/linux/lsiutil/default.nix
+++ b/pkgs/os-specific/linux/lsiutil/default.nix
@@ -12,8 +12,9 @@ let
in
-stdenv.mkDerivation rec {
- name = "lsiutils-${version}";
+stdenv.mkDerivation {
+ pname = "lsiutils";
+ inherit version;
srcs = [ src "Source/lsiutil.tar.gz" ];
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 469096d014d7..9944250bf307 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -7,7 +7,8 @@ let
in
stdenv.mkDerivation {
- name = "lvm2-${version}";
+ pname = "lvm2";
+ inherit version;
src = fetchgit {
url = "git://sourceware.org/git/lvm2.git";
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 17063851cee2..fff66fe328a5 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -8,7 +8,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "lxc-${version}";
+ pname = "lxc";
version = "3.2.1";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix
index c335031f2e56..ec76cda97692 100644
--- a/pkgs/os-specific/linux/macchanger/default.nix
+++ b/pkgs/os-specific/linux/macchanger/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, texinfo }:
stdenv.mkDerivation rec {
- name = "macchanger-${version}";
+ pname = "macchanger";
version = "1.7.0";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix
index 0a6fc3c977c8..7c72c8a2dbf5 100644
--- a/pkgs/os-specific/linux/mba6x_bl/default.nix
+++ b/pkgs/os-specific/linux/mba6x_bl/default.nix
@@ -1,6 +1,6 @@
{ fetchFromGitHub, kernel, stdenv }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "mba6x_bl-2016-12-08";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix
index 9528b9be7f7d..8b62ce76409e 100644
--- a/pkgs/os-specific/linux/mbpfan/default.nix
+++ b/pkgs/os-specific/linux/mbpfan/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "mbpfan-${version}";
+ pname = "mbpfan";
version = "2.1.1";
src = fetchFromGitHub {
owner = "dgraziotin";
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index f7f2193eaa09..a58bfc321d3c 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, utillinux }:
stdenv.mkDerivation rec {
- name = "mcelog-${version}";
+ pname = "mcelog";
version = "164";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix
index 34f19db524ce..1a24ae3b9a26 100644
--- a/pkgs/os-specific/linux/microcode/amd.nix
+++ b/pkgs/os-specific/linux/microcode/amd.nix
@@ -1,6 +1,6 @@
{ stdenv, firmwareLinuxNonfree, libarchive }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "amd-ucode-${firmwareLinuxNonfree.version}";
src = firmwareLinuxNonfree;
diff --git a/pkgs/os-specific/linux/microcode/iucode-tool.nix b/pkgs/os-specific/linux/microcode/iucode-tool.nix
index 485272b1401b..c81a0c9097af 100644
--- a/pkgs/os-specific/linux/microcode/iucode-tool.nix
+++ b/pkgs/os-specific/linux/microcode/iucode-tool.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "iucode-tool-${version}";
+ pname = "iucode-tool";
version = "2.3.1";
src = fetchFromGitLab {
diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix
index b65486cb2fe1..6b67401b9b23 100644
--- a/pkgs/os-specific/linux/miraclecast/default.nix
+++ b/pkgs/os-specific/linux/miraclecast/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
, glib, readline, pcre, systemd, udev }:
-stdenv.mkDerivation rec {
- name = "miraclecast-${version}";
+stdenv.mkDerivation {
+ pname = "miraclecast";
version = "1.0-20190403";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix
index 533cd90a2d3c..297faa2a6042 100644
--- a/pkgs/os-specific/linux/mmc-utils/default.nix
+++ b/pkgs/os-specific/linux/mmc-utils/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
- name = "mmc-utils-${version}";
- version = "2018-03-27";
+stdenv.mkDerivation {
+ pname = "mmc-utils";
+ version = "2018-12-14";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git";
- rev = "b4fe0c8c0e57a74c01755fa9362703b60d7ee49d";
- sha256 = "01llwan5j40mv5p867f31lm87qh0hcyhy892say60y5pxc0mzpyn";
+ rev = "aef913e31b659462fe6b9320d241676cba97f67b";
+ sha256 = "1mak9rqjp6yvqk2h5hfil5a9gfx138h62n3cryckfbhr6fmaylm7";
};
makeFlags = "CC=${stdenv.cc.targetPrefix}cc";
diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix
index ac083e545fed..766c01eed3fc 100644
--- a/pkgs/os-specific/linux/molly-guard/default.nix
+++ b/pkgs/os-specific/linux/molly-guard/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, dpkg, busybox, systemd }:
stdenv.mkDerivation rec {
- name = "molly-guard-${version}";
+ pname = "molly-guard";
version = "0.6.3";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/msr-tools/default.nix b/pkgs/os-specific/linux/msr-tools/default.nix
index 128f3eac2635..f7b81bd3915d 100644
--- a/pkgs/os-specific/linux/msr-tools/default.nix
+++ b/pkgs/os-specific/linux/msr-tools/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "msr-tools-${version}";
+ pname = "msr-tools";
version = "1.3";
src = fetchurl {
- url = "https://01.org/sites/default/files/downloads/msr-tools/${name}.zip";
+ url = "https://01.org/sites/default/files/downloads/msr-tools/${pname}-${version}.zip";
sha256 = "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr";
};
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix
index 078f894f73eb..afe07a5c4dbe 100644
--- a/pkgs/os-specific/linux/multipath-tools/default.nix
+++ b/pkgs/os-specific/linux/multipath-tools/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }:
stdenv.mkDerivation rec {
- name = "multipath-tools-${version}";
+ pname = "multipath-tools";
version = "0.8.2";
src = fetchurl {
- name = "${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
url = "https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=snapshot;h=refs/tags/${version};sf=tgz";
sha256 = "0x6cjlb9mjrmpaqk5v6v47qz6n9zyqmw13i7pq5x6ppwyqdxhn5s";
};
diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix
index 42f745b02e30..3cd8f224ce46 100644
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/pkgs/os-specific/linux/net-tools/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "net-tools-${version}";
+ pname = "net-tools";
version = "1.60_p20170221182432";
src = fetchurl {
- url = "mirror://gentoo/distfiles/${name}.tar.xz";
+ url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz";
sha256 = "08r4r2a24g5bm8jwgfa998gs1fld7fgbdf7pilrpsw1m974xn04a";
};
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 12fdbabcc0b4..3f53c0f58178 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -8,11 +8,11 @@ let
in
stdenv.mkDerivation rec {
- name = "nfs-utils-${version}";
+ pname = "nfs-utils";
version = "2.4.1";
src = fetchurl {
- url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz";
+ url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz";
sha256 = "0dkp11a7i01c378ri68bf6k56z27kz8zzvpqm7mip6s7jkd4l9w5";
};
diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index 23852559436d..9b4f2f1c544a 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -7,12 +7,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "0.9.1";
- name = "nftables-${version}";
+ version = "0.9.2";
+ pname = "nftables";
src = fetchurl {
- url = "https://netfilter.org/projects/nftables/files/${name}.tar.bz2";
- sha256 = "1kjg3dykf2aw76d76viz1hm0rav57nfbdwlngawgn2slxmlbplza";
+ url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2";
+ sha256 = "1x8kalbggjq44j4916i6vyv1rb20dlh1dcsf9xvzqsry2j063djw";
};
configureFlags = [
diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix
index 5f425c9685cf..cb6dd4ab946c 100644
--- a/pkgs/os-specific/linux/nmon/default.nix
+++ b/pkgs/os-specific/linux/nmon/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, ncurses }:
stdenv.mkDerivation rec {
- name = "nmon-${version}";
+ pname = "nmon";
version = "16k";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix
index 2db2e12bb961..f2188ee37cb4 100644
--- a/pkgs/os-specific/linux/numactl/default.nix
+++ b/pkgs/os-specific/linux/numactl/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "numactl-${version}";
- version = "2.0.12";
+ pname = "numactl";
+ version = "2.0.13";
src = fetchFromGitHub {
- owner = "numactl";
- repo = "numactl";
+ owner = pname;
+ repo = pname;
rev = "v${version}";
- sha256 = "0crhpxwakp0gvd7wwpbkfd3brnrdf89lkbf03axnbrs0b6kaygg2";
+ sha256 = "08xj0n27qh0ly8hjallnx774gicz15nfq0yyxz8zhgy6pq8l33vv";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 467d930aaf58..2b1b37db344d 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -62,7 +62,10 @@ installPhase() {
sed -E "s#(libnvidia-opencl)#$i/lib/\\1#" nvidia.icd > nvidia.icd.fixed
install -Dm644 nvidia.icd.fixed $i/etc/OpenCL/vendors/nvidia.icd
if [ -e nvidia_icd.json.template ]; then
+ # template patching for version < 435
sed "s#__NV_VK_ICD__#$i/lib/libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json
+ fi
+ if [ -e nvidia_icd.json ]; then
install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json
fi
if [ "$useGLVND" = "1" ]; then
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 2290a7e80a1e..c41ce5994a1b 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -20,16 +20,16 @@ if ((!lib.versionOlder args.version "391")
in
rec {
# Policy: use the highest stable version as the default (on our master).
- stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_430 else legacy_390;
+ stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_43x else legacy_390;
# No active beta right now
beta = stable;
- stable_430 = generic {
- version = "430.40";
- sha256_64bit = "1myzhy1mf27dcx0admm3pbbkfdd9p66lw0cq2mz1nwds92gqj07p";
- settingsSha256 = "0rg9dxg02pnpi0a1yi3a41wn6kmlk0dm6dvfbazyqi4gbzr12qrl";
- persistencedSha256 = "0findlrs5v1m7gl0vxkpd04lh54pib80w5vp4j77qb5snhgvckhq";
+ stable_43x = generic {
+ version = "435.21";
+ sha256_64bit = "0v3pq677ab01qdmwl5dawk8hn39qlwj05p8s9qzh9irmrlnc1izs";
+ settingsSha256 = "1p13cz79kncwx5067a3d7dbz6a1ibp611zynp1qdxpa65hwp2pxa";
+ persistencedSha256 = "0br8znxhz2ryzdj0j4jhqzvdgw9h899q8yz0p9429xz4wxkavgdr";
};
# Last one supporting x86
diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index cfe79d4c0b79..4f8a0b686640 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -2,7 +2,7 @@ nvidia_x11: sha256:
{ stdenv, fetchFromGitHub, m4 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "nvidia-persistenced";
inherit (nvidia_x11) version;
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index 1867c1a133af..101f61f30207 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -40,7 +40,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "nvidia-settings";
inherit (nvidia_x11) version;
inherit src;
diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix
index bead5f84eac9..4040d70260c5 100644
--- a/pkgs/os-specific/linux/odp-dpdk/default.nix
+++ b/pkgs/os-specific/linux/odp-dpdk/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "odp-dpdk-${version}";
+ pname = "odp-dpdk";
version = "1.19.0.0_DPDK_17.11";
src = fetchurl {
- url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${name}.tar.gz";
+ url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz";
sha256 = "05bwjaxl9hqc6fbkp95nniq11g3kvzmlxw0bq55i7p2v35nv38px";
};
diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix
index 93cf33979f4b..855754a6bc1b 100644
--- a/pkgs/os-specific/linux/ofp/default.nix
+++ b/pkgs/os-specific/linux/ofp/default.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
- name = "ofp-${version}";
+ pname = "ofp";
version = "2.0.0";
src = fetchFromGitHub {
owner = "OpenFastPath";
repo = "ofp";
- rev = "${version}";
+ rev = version;
sha256 = "05902593fycgkwzk5g7wzgk0k40nrrgybplkdka3rqnlj6aydhqf";
};
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index a2644fcbc3fd..274e960a89b0 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "open-iscsi-${version}";
+ pname = "open-iscsi";
version = "2.0.877";
nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ];
diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix
index 21d32af3ba83..7b34c1029bae 100644
--- a/pkgs/os-specific/linux/open-isns/default.nix
+++ b/pkgs/os-specific/linux/open-isns/default.nix
@@ -1,7 +1,7 @@
{ stdenv, openssl, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "open-isns-${version}";
+ pname = "open-isns";
version = "0.99";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix
new file mode 100644
index 000000000000..355108f56e46
--- /dev/null
+++ b/pkgs/os-specific/linux/openrazer/driver.nix
@@ -0,0 +1,39 @@
+{ coreutils
+, fetchFromGitHub
+, kernel
+, stdenv
+, utillinux
+}:
+
+let
+ common = import ../../../development/python-modules/openrazer/common.nix { inherit stdenv fetchFromGitHub; };
+in
+stdenv.mkDerivation (common // {
+ name = "openrazer-${common.version}-${kernel.version}";
+
+ nativeBuildInputs = kernel.moduleBuildDependencies;
+
+ buildFlags = [
+ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.version}/build"
+ ];
+
+ installPhase = ''
+ binDir="$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/hid"
+ mkdir -p "$binDir"
+ cp -v driver/*.ko "$binDir"
+ RAZER_MOUNT_OUT="$out/bin/razer_mount"
+ RAZER_RULES_OUT="$out/etc/udev/rules.d/99-razer.rules"
+ install -m 644 -v -D install_files/udev/99-razer.rules $RAZER_RULES_OUT
+ install -m 755 -v -D install_files/udev/razer_mount $RAZER_MOUNT_OUT
+ substituteInPlace $RAZER_RULES_OUT \
+ --replace razer_mount $RAZER_MOUNT_OUT
+ substituteInPlace $RAZER_MOUNT_OUT \
+ --replace /usr/bin/logger ${utillinux}/bin/logger \
+ --replace chgrp ${coreutils}/bin/chgrp \
+ --replace "PATH='/sbin:/bin:/usr/sbin:/usr/bin'" ""
+ '';
+
+ meta = common.meta // {
+ description = "An entirely open source Linux driver that allows you to manage your Razer peripherals on GNU/Linux";
+ };
+})
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index a2a272f1b3a5..bf26b9e2b28b 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -8,10 +8,10 @@ let
_kernel = kernel;
in stdenv.mkDerivation rec {
version = "2.5.4";
- name = "openvswitch-${version}";
+ pname = "openvswitch";
src = fetchurl {
- url = "http://openvswitch.org/releases/${name}.tar.gz";
+ url = "http://openvswitch.org/releases/${pname}-${version}.tar.gz";
sha256 = "1lji87wg953lqcdf02f1zv2m54vhd2x9jd03bb91lnlb4qlhifiv";
};
diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix
index e1525a951a96..5d7357cb8380 100644
--- a/pkgs/os-specific/linux/pagemon/default.nix
+++ b/pkgs/os-specific/linux/pagemon/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ncurses }:
stdenv.mkDerivation rec {
- name = "pagemon-${version}";
+ pname = "pagemon";
version = "0.01.16";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 1f2a7d3edf27..d1a035d74480 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4 }:
stdenv.mkDerivation rec {
- name = "linux-pam-${version}";
+ pname = "linux-pam";
version = "1.3.1";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix
index 10856bb52c9c..a1c91516ce00 100644
--- a/pkgs/os-specific/linux/pam_pgsql/default.nix
+++ b/pkgs/os-specific/linux/pam_pgsql/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }:
stdenv.mkDerivation rec {
- name = "pam_pgsql-${version}";
+ pname = "pam_pgsql";
version = "0.7.3.2";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix
index 72846e185ebd..6e9ab379dbcf 100644
--- a/pkgs/os-specific/linux/pam_u2f/default.nix
+++ b/pkgs/os-specific/linux/pam_u2f/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libu2f-host, libu2f-server, pam }:
stdenv.mkDerivation rec {
- name = "pam_u2f-${version}";
+ pname = "pam_u2f";
version = "1.0.8";
src = fetchurl {
- url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz";
+ url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz";
sha256 = "16awjzx348imjz141fzzldy00qpdmw2g37rnq430w5mnzak078jj";
};
diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix
index 8fdd2356c30d..754f6bcac333 100644
--- a/pkgs/os-specific/linux/paxctl/default.nix
+++ b/pkgs/os-specific/linux/paxctl/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, elf-header }:
stdenv.mkDerivation rec {
- name = "paxctl-${version}";
+ pname = "paxctl";
version = "0.9";
src = fetchurl {
- url = "https://pax.grsecurity.net/${name}.tar.gz";
+ url = "https://pax.grsecurity.net/${pname}-${version}.tar.gz";
sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53";
};
diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix
index c1500e51ac37..e01f84576ced 100644
--- a/pkgs/os-specific/linux/paxtest/default.nix
+++ b/pkgs/os-specific/linux/paxtest/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, paxctl }:
stdenv.mkDerivation rec {
- name = "paxtest-${version}";
+ pname = "paxtest";
version = "0.9.15";
src = fetchurl {
- url = "https://www.grsecurity.net/~spender/${name}.tar.gz";
+ url = "https://www.grsecurity.net/~spender/${pname}-${version}.tar.gz";
sha256 = "0zv6vlaszlik98gj9200sv0irvfzrvjn46rnr2v2m37x66288lym";
};
diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix
index 6365175290ad..c00bd67f95c2 100644
--- a/pkgs/os-specific/linux/pcm/default.nix
+++ b/pkgs/os-specific/linux/pcm/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "201902";
- name = "pcm-${version}";
+ pname = "pcm";
src = fetchFromGitHub {
owner = "opcm";
repo = "pcm";
- rev = "${version}";
+ rev = version;
sha256 = "15kh5ry2w1zj2mbg98hlayw8g53jy79q2ixj2wm48g8vagamv77z";
};
diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix
index 1155a793b014..f3e63133d1e1 100644
--- a/pkgs/os-specific/linux/pflask/default.nix
+++ b/pkgs/os-specific/linux/pflask/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, python, wafHook }:
stdenv.mkDerivation rec {
- name = "pflask-${version}";
+ pname = "pflask";
version = "git-2015-12-17";
rev = "599418bb6453eaa0ccab493f9411f13726c1a636";
diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix
index 523f7382a2cf..044f75cbd6fb 100644
--- a/pkgs/os-specific/linux/pipework/default.nix
+++ b/pkgs/os-specific/linux/pipework/default.nix
@@ -2,8 +2,8 @@
, bridge-utils, iproute, lxc, openvswitch, docker, busybox, dhcpcd, dhcp
}:
-stdenv.mkDerivation rec {
- name = "pipework-${version}";
+stdenv.mkDerivation {
+ pname = "pipework";
version = "2017-08-22";
src = fetchFromGitHub {
owner = "jpetazzo";
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index a7bb4a81510d..0d92c7c69098 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -16,7 +16,7 @@ let
};
in stdenv.mkDerivation rec {
- name = "pktgen-${version}";
+ pname = "pktgen";
version = "3.5.0";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
index 43f184f384dd..24213cd2fb5a 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -5,7 +5,8 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0";
let
version = "1.0.beta1-9e810b1";
in stdenv.mkDerivation {
- name = "ply-${version}";
+ pname = "ply";
+ inherit version;
nativeBuildInputs = [ autoreconfHook flex yacc p7zip ];
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix
index 2092a50041f1..b074c6d72443 100644
--- a/pkgs/os-specific/linux/plymouth/default.nix
+++ b/pkgs/os-specific/linux/plymouth/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "plymouth-${version}";
+ pname = "plymouth";
version = "0.9.4";
src = fetchurl {
- url = "https://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz";
+ url = "https://www.freedesktop.org/software/plymouth/releases/${pname}-${version}.tar.xz";
sha256 = "0l8kg7b2vfxgz9gnrn0v2w4jvysj2cirp0nxads5sy05397pl6aa";
};
diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix
index cd0e277b2c6b..0981a0b5a4bd 100644
--- a/pkgs/os-specific/linux/pmount/default.nix
+++ b/pkgs/os-specific/linux/pmount/default.nix
@@ -8,7 +8,7 @@
assert stdenv.lib.hasSuffix "/" mediaDir;
stdenv.mkDerivation rec {
- name = "pmount-${version}";
+ pname = "pmount";
version = "0.9.23";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix
index a7cac46ae6a0..9d229c50000e 100644
--- a/pkgs/os-specific/linux/policycoreutils/default.nix
+++ b/pkgs/os-specific/linux/policycoreutils/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, gettext, libsepol, libselinux, libsemanage }:
stdenv.mkDerivation rec {
- name = "policycoreutils-${version}";
- version = "2.7";
+ pname = "policycoreutils";
+ version = "2.9";
inherit (libsepol) se_release se_url;
src = fetchurl {
url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz";
- sha256 = "1x742c7lkw30namhkw87yg7z384qzqjz0pvmqs0lk19v6958l6qa";
+ sha256 = "0yqg5ws5gbl1cbn8msxdk1c3ilmmx58qg5dx883kqyq0517k8g65";
};
postPatch = ''
@@ -20,13 +20,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gettext ];
buildInputs = [ libsepol libselinux libsemanage ];
- preBuild = ''
- makeFlagsArray+=("PREFIX=$out")
- makeFlagsArray+=("DESTDIR=$out")
- makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions")
- makeFlagsArray+=("LOCALEDIR=$out/share/locale")
- makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
- '';
+ makeFlags = [
+ "PREFIX=$(out)"
+ "SBINDIR=$(out)/sbin"
+ "ETCDIR=$(out)/etc"
+ "BASHCOMPLETIONDIR=$out/share/bash-completion/completions"
+ "LOCALEDIR=$(out)/share/locale"
+ "MAN5DIR=$(out)/share/man/man5"
+ ];
meta = with stdenv.lib; {
description = "SELinux policy core utilities";
diff --git a/pkgs/os-specific/linux/pps-tools/default.nix b/pkgs/os-specific/linux/pps-tools/default.nix
index e4f7d4b3616e..f50bfcec781c 100644
--- a/pkgs/os-specific/linux/pps-tools/default.nix
+++ b/pkgs/os-specific/linux/pps-tools/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "redlab-i";
- repo = "${baseName}";
+ repo = baseName;
rev = "v${version}";
sha256 = "1yh9g0l59dkq4ci0wbb03qin3c3cizfngmn9jy1vwm5zm6axlxhf";
};
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index 1a4919a5d9d4..3daab3917e84 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -17,7 +17,7 @@ in
stdenv.mkDerivation rec {
version = "${prl_major}.2.1-41615";
prl_major = "12";
- name = "prl-tools-${version}";
+ pname = "prl-tools";
# We download the full distribution to extract prl-tools-lin.iso from
# => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
diff --git a/pkgs/os-specific/linux/procdump/default.nix b/pkgs/os-specific/linux/procdump/default.nix
index aa7d0ec46043..0185d3022bc2 100644
--- a/pkgs/os-specific/linux/procdump/default.nix
+++ b/pkgs/os-specific/linux/procdump/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, bash, coreutils, gdb, zlib }:
stdenv.mkDerivation rec {
- name = "procdump-${version}";
+ pname = "procdump";
version = "1.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 1ed85bc94cb7..1f39a99ea0bf 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -13,7 +13,7 @@
}:
stdenv.mkDerivation rec {
- name = "procps-${version}";
+ pname = "procps";
version = "3.3.15";
# The project's releases are on SF, but git repo on gitlab.
diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix
index 1ef3b71884fd..f8eb8c0a969f 100644
--- a/pkgs/os-specific/linux/pscircle/default.nix
+++ b/pkgs/os-specific/linux/pscircle/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, meson, pkgconfig, ninja, cairo }:
stdenv.mkDerivation rec {
- name = "pscircle-${version}";
+ pname = "pscircle";
version = "1.3.1";
src = fetchFromGitLab {
diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix
index 68e51afdf1bb..413b7d5dcbdf 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "psmisc";
version = "23.2";
- name = "${pname}-${version}";
src = fetchFromGitLab {
owner = pname;
diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix
index 36ad73c48d68..c013a0107eab 100644
--- a/pkgs/os-specific/linux/radeontop/default.nix
+++ b/pkgs/os-specific/linux/radeontop/default.nix
@@ -2,7 +2,7 @@
, ncurses, libdrm, libpciaccess, libxcb }:
stdenv.mkDerivation rec {
- name = "radeontop-${version}";
+ pname = "radeontop";
version = "2019-06-03";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index e604f73de2dd..ce0e8707ff57 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -7,7 +7,8 @@ let
version = "25.0";
in stdenv.mkDerivation {
- name = "rdma-core-${version}";
+ pname = "rdma-core";
+ inherit version;
src = fetchFromGitHub {
owner = "linux-rdma";
diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix
index 3e57bbc11bdc..815005ae290e 100644
--- a/pkgs/os-specific/linux/read-edid/default.nix
+++ b/pkgs/os-specific/linux/read-edid/default.nix
@@ -1,11 +1,11 @@
{ stdenv, lib, fetchurl, cmake, libx86 }:
stdenv.mkDerivation rec {
- name = "read-edid-${version}";
+ pname = "read-edid";
version = "3.0.2";
src = fetchurl {
- url = "http://www.polypux.org/projects/read-edid/${name}.tar.gz";
+ url = "http://www.polypux.org/projects/read-edid/${pname}-${version}.tar.gz";
sha256 = "0vqqmwsgh2gchw7qmpqk6idgzcm5rqf2fab84y7gk42v1x2diin7";
};
diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/os-specific/linux/regionset/default.nix
index ee7325edbe70..3cb964f364d3 100644
--- a/pkgs/os-specific/linux/regionset/default.nix
+++ b/pkgs/os-specific/linux/regionset/default.nix
@@ -2,7 +2,8 @@
let version = "0.2"; in
stdenv.mkDerivation {
- name = "regionset-${version}";
+ pname = "regionset";
+ inherit version;
src = fetchurl {
url = "http://linvdr.org/download/regionset/regionset-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix
index bd25dc65ec85..c078fb18c4ee 100644
--- a/pkgs/os-specific/linux/reptyr/default.nix
+++ b/pkgs/os-specific/linux/reptyr/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.7.0";
- name = "reptyr-${version}";
+ pname = "reptyr";
src = fetchFromGitHub {
owner = "nelhage";
diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix
index 8c7b75a881f4..710eba642cb0 100644
--- a/pkgs/os-specific/linux/rewritefs/default.nix
+++ b/pkgs/os-specific/linux/rewritefs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }:
-stdenv.mkDerivation rec {
- name = "rewritefs-${version}";
+stdenv.mkDerivation {
+ pname = "rewritefs";
version = "2017-08-14";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix
index ecaa4e89d49d..1f5b31d0deb6 100644
--- a/pkgs/os-specific/linux/roccat-tools/default.nix
+++ b/pkgs/os-specific/linux/roccat-tools/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "roccat-tools-${version}";
+ pname = "roccat-tools";
version = "5.9.0";
src = fetchurl {
- url = "mirror://sourceforge/roccat/${name}.tar.bz2";
+ url = "mirror://sourceforge/roccat/${pname}-${version}.tar.bz2";
sha256 = "12j02rzbz3iqxprz8cj4kcfcdgnqlva142ci177axqmckcq6crvg";
};
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index f524bee35210..81c1f8ab0f52 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "rtl8812au-${kernel.version}-${version}";
- version = "5.2.20.2_28373.20180619";
+ version = "5.2.20.2_28373.20190903";
src = fetchFromGitHub {
owner = "zebulon2";
repo = "rtl8812au-driver-5.2.20";
- rev = "ac063a4b1a87855e10f6cd1f358aaccbeee9b9c1";
- sha256 = "1cmsv22q4k6p2wzm73k60kxbjhcgx4hqr0x3djvqrlv4rzz75l92";
+ rev = "30d47a0a3f43ccb19e8fd59fe93d74a955147bf2";
+ sha256 = "1fy0f8ihxd0i5kr8gmky8v8xl0ns6bhxfdn64c97c5irzdvg37sr";
};
nativeBuildInputs = [ bc ];
diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix
index b29b1f639cf7..447f9127d607 100644
--- a/pkgs/os-specific/linux/rtlwifi_new/default.nix
+++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix
@@ -5,7 +5,7 @@ with lib;
let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtlwifi";
in stdenv.mkDerivation rec {
- name = "rtlwifi_new-${version}";
+ pname = "rtlwifi_new";
version = "2018-02-17";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/os-specific/linux/schedtool/default.nix
index 2c02ef924c3f..316c98000795 100644
--- a/pkgs/os-specific/linux/schedtool/default.nix
+++ b/pkgs/os-specific/linux/schedtool/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "schedtool-${version}";
+ pname = "schedtool";
version = "1.3.0";
src = fetchFromGitHub {
owner = "freequaos";
repo = "schedtool";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "1wdw6fnf9a01xfjhdah3mn8bp1bvahf2lfq74i6hk5b2cagkppyp";
};
diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix
index a8d5112c63b9..5517f163b3e0 100644
--- a/pkgs/os-specific/linux/sdparm/default.nix
+++ b/pkgs/os-specific/linux/sdparm/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "sdparm-${version}";
+ pname = "sdparm";
version = "1.10";
src = fetchurl {
- url = "http://sg.danny.cz/sg/p/${name}.tar.xz";
+ url = "http://sg.danny.cz/sg/p/${pname}-${version}.tar.xz";
sha256 = "1jjq3lzgfy4r76rc26q02lv4wm5cb4dx5nh913h489zjrr4f3jbx";
};
diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix
index 527c94de46b3..2ca88c32f13f 100644
--- a/pkgs/os-specific/linux/selinux-python/default.nix
+++ b/pkgs/os-specific/linux/selinux-python/default.nix
@@ -7,14 +7,14 @@ with stdenv.lib;
with python3.pkgs;
stdenv.mkDerivation rec {
- name = "selinux-python-${version}";
- version = "2.7";
- se_release = "20170804";
- se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
+ pname = "selinux-python";
+ version = "2.9";
+
+ inherit (libsepol) se_release se_url;
src = fetchurl {
url = "${se_url}/${se_release}/selinux-python-${version}.tar.gz";
- sha256 = "1va0y4b7cah7rprh04b3ylmwqgnivpkw5z2zw68nrafdbsbcn5s2";
+ sha256 = "1pjzsyay5535cxcjag7y7k193ajry0s0xc3dqv5905qd7cwval1n";
};
nativeBuildInputs = [ wrapPython ];
@@ -23,17 +23,19 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace sepolicy/Makefile --replace "echo --root" "echo --prefix"
+ substituteInPlace sepolgen/src/share/Makefile --replace "/var/lib/sepolgen" \
+ "\$PREFIX/var/lib/sepolgen"
'';
- preBuild = ''
- makeFlagsArray+=("PREFIX=$out")
- makeFlagsArray+=("DESTDIR=$out")
- makeFlagsArray+=("LOCALEDIR=$out/share/locale")
- makeFlagsArray+=("LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a")
- makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions")
- makeFlagsArray+=("PYTHON=${python3}/bin/python")
- makeFlagsArray+=("PYTHONLIBDIR=lib/${python3.libPrefix}/site-packages")
- '';
+ makeFlags = [
+ "PREFIX=$(out)"
+ "LOCALEDIR=$(out)/share/locale"
+ "BASHCOMPLETIONDIR=$(out)/share/bash-completion/completions"
+ "PYTHON=python"
+ "PYTHONLIBDIR=$(out)/${python.sitePackages}"
+ "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a"
+ ];
+
postFixup = ''
wrapPythonPrograms
diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix
index 71d2ee6e80af..5343c5fae1a9 100644
--- a/pkgs/os-specific/linux/selinux-sandbox/default.nix
+++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix
@@ -8,13 +8,13 @@ with stdenv.lib;
with python3.pkgs;
stdenv.mkDerivation rec {
- name = "selinux-sandbox-${version}";
- version = "2.7";
- se_release = "20170804";
+ pname = "selinux-sandbox";
+ version = "2.9";
+ inherit (policycoreutils) se_release se_url;
src = fetchurl {
- url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${se_release}/selinux-sandbox-${version}.tar.gz";
- sha256 = "0hf5chm90iapb42njaps6p5460ys3ajh5446ja544vdbh01n544l";
+ url = "${se_url}/${se_release}/selinux-sandbox-${version}.tar.gz";
+ sha256 = "0qj20jyi8v1653xdqj5yak3wwbvg5bw8f2jmx8fpahl6y1bmz481";
};
nativeBuildInputs = [ wrapPython ];
@@ -42,10 +42,10 @@ stdenv.mkDerivation rec {
--replace "/usr/bin/test" "${coreutils}/bin/test" \
'';
- preBuild = ''
- makeFlagsArray+=("PREFIX=$out")
- makeFlagsArray+=("DESTDIR=$out")
- '';
+ makeFlags = [
+ "PREFIX=$(out)"
+ "SYSCONFDIR=$(out)/etc/sysconfig"
+ ];
postFixup = ''
wrapPythonPrograms
diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix
index 10ba1a3c7d07..bf1f36835b47 100644
--- a/pkgs/os-specific/linux/semodule-utils/default.nix
+++ b/pkgs/os-specific/linux/semodule-utils/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, libsepol }:
stdenv.mkDerivation rec {
- name = "semodule-utils-${version}";
- version = "2.7";
+ pname = "semodule-utils";
+ version = "2.9";
inherit (libsepol) se_release se_url;
src = fetchurl {
- url = "${se_url}/${se_release}/${name}.tar.gz";
- sha256 = "1fl60x4w8rn5bcwy68sy48aydwsn1a17d48slni4sfx4c8rqpjch";
+ url = "${se_url}/${se_release}/${pname}-${version}.tar.gz";
+ sha256 = "01yrwnd3calmw6r8kdh8ld7i7fb250n2yqqqk9p0ymrlwsg6g0w0";
};
buildInputs = [ libsepol ];
diff --git a/pkgs/os-specific/linux/sepolgen/default.nix b/pkgs/os-specific/linux/sepolgen/default.nix
index 4067e5f70e27..53250b345e83 100644
--- a/pkgs/os-specific/linux/sepolgen/default.nix
+++ b/pkgs/os-specific/linux/sepolgen/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libsepol, python }:
stdenv.mkDerivation rec {
- name = "sepolgen-${version}";
+ pname = "sepolgen";
version = "1.2.2";
inherit (libsepol) se_release se_url;
diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/os-specific/linux/service-wrapper/default.nix
index f2ed3c4a7834..150262158da4 100644
--- a/pkgs/os-specific/linux/service-wrapper/default.nix
+++ b/pkgs/os-specific/linux/service-wrapper/default.nix
@@ -4,7 +4,7 @@ let
name = "service-wrapper-${version}";
version = "19.04"; # Akin to Ubuntu Release
in
-runCommand "${name}" {
+runCommand name {
script = substituteAll {
src = ./service-wrapper.sh;
isExecutable = true;
diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix
index 039d875060a2..1e82c4921595 100644
--- a/pkgs/os-specific/linux/setools/default.nix
+++ b/pkgs/os-specific/linux/setools/default.nix
@@ -8,13 +8,13 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "setools";
- version = "2017-11-10";
+ version = "4.2.0";
src = fetchFromGitHub {
- owner = "TresysTechnology";
+ owner = "SELinuxProject";
repo = pname;
- rev = "a1aa0f33f5c428d3f9fe82960ed5de36f38047f7";
- sha256 = "0iyj35fff93cprjkzbkg9dn5xz8dg5h2kjx3476fl625nxxskndn";
+ rev = version;
+ sha256 = "1bjwcvr6rjx79cdcvaxn68bdrnl4f2a8gnnqsngdxhkhwpddksjy";
};
nativeBuildInputs = [ bison flex swig ];
@@ -34,8 +34,8 @@ buildPythonApplication rec {
'';
meta = {
- description = "SELinux Tools";
- homepage = https://github.com/TresysTechnology/setools/wiki;
+ description = "SELinux Policy Analysis Tools";
+ homepage = https://github.com/SELinuxProject/setools;
license = licenses.gpl2;
platforms = platforms.linux;
};
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 6b808f0d6a63..b4c5c0bac841 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -18,13 +18,13 @@ let
in
stdenv.mkDerivation rec {
- name = "shadow-${version}";
+ pname = "shadow";
version = "4.6";
src = fetchFromGitHub {
owner = "shadow-maint";
repo = "shadow";
- rev = "${version}";
+ rev = version;
sha256 = "1llcv77lvpc4h3rgww9ms736kbdisiylcr2z02863f41afxbwl82";
};
diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix
index de12b3719af3..f40652922d85 100644
--- a/pkgs/os-specific/linux/smem/default.nix
+++ b/pkgs/os-specific/linux/smem/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, python }:
stdenv.mkDerivation rec {
- name = "smem-${version}";
+ pname = "smem";
version = "1.5";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix
index 10b33b176d21..f2fa48b9efbe 100644
--- a/pkgs/os-specific/linux/smemstat/default.nix
+++ b/pkgs/os-specific/linux/smemstat/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "smemstat-${version}";
+ pname = "smemstat";
version = "0.02.05";
src = fetchurl {
url = "https://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/speedometer/default.nix b/pkgs/os-specific/linux/speedometer/default.nix
index 449edf481a95..6f2e6306003b 100644
--- a/pkgs/os-specific/linux/speedometer/default.nix
+++ b/pkgs/os-specific/linux/speedometer/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "speedometer-${version}";
+ pname = "speedometer";
version = "2.8";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 80c5c1f650ba..3dbdb99549a1 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -11,11 +11,11 @@ let
docbookFiles = "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml";
in
stdenv.mkDerivation rec {
- name = "sssd-${version}";
+ pname = "sssd";
version = "1.16.4";
src = fetchurl {
- url = "https://fedorahosted.org/released/sssd/${name}.tar.gz";
+ url = "https://fedorahosted.org/released/sssd/${pname}-${version}.tar.gz";
sha256 = "0ngr7cgimyjc6flqkm7psxagp1m4jlzpqkn28pliifbmdg6i5ckb";
};
diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix
index c7543aee9337..ef13e5ded024 100644
--- a/pkgs/os-specific/linux/syscall_limiter/default.nix
+++ b/pkgs/os-specific/linux/syscall_limiter/default.nix
@@ -5,8 +5,8 @@
, which
}:
-stdenv.mkDerivation rec {
- name = "syscall_limiter-${version}";
+stdenv.mkDerivation {
+ pname = "syscall_limiter";
version = "2017-01-23";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index cf1f2f242f47..399244e47ee1 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -4,14 +4,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "sysdig-${version}";
- version = "0.26.2";
+ pname = "sysdig";
+ version = "0.26.4";
src = fetchFromGitHub {
owner = "draios";
repo = "sysdig";
rev = version;
- sha256 = "1a74cvvy3lhilibc3lzcsvs6pwrdvdx2580qgckp1lrra9gf5hga";
+ sha256 = "1v2j1ns17wyj7xl91p6wy1iwfx2fnn8af9nm939skc6229m87zzn";
};
nativeBuildInputs = [ cmake perl ];
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index 8965b5da4f49..8631ddf01d08 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchurl, nasm, perl, python, libuuid, mtools, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "syslinux-2015-11-09";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index b7f1af618feb..90b33e183cef 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod
+{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
, xz, pam, acl, libuuid, m4, utillinux, libffi
, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
, audit, lz4, bzip2, libmicrohttpd, pcre2
@@ -15,17 +15,20 @@
, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools
}:
-stdenv.mkDerivation rec {
- version = "242";
- name = "systemd-${version}";
+let
+ pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
+
+in stdenv.mkDerivation {
+ version = "243";
+ pname = "systemd";
# When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
# Also fresh patches should be cherry-picked from that tree to our current one.
src = fetchFromGitHub {
owner = "NixOS";
repo = "systemd";
- rev = "5fb35fbc783516e2014115c3488134a2afb8494c";
- sha256 = "0pyjvzzh8nnxv4z58n82lz1mjnzv44sylcjgkvw8sp35vx1ryxfh";
+ rev = "7019836a26ebdc1ba20c03d06dbb3a613833bd0f";
+ sha256 = "0ywaq5jfy177k4q5hwr43v66sz62l1bqhgyxs2vk9m1d5kvrjwk6";
};
outputs = [ "out" "lib" "man" "dev" ];
@@ -100,6 +103,13 @@ stdenv.mkDerivation rec {
"-Dsulogin-path=${utillinux}/bin/sulogin"
"-Dmount-path=${utillinux}/bin/mount"
"-Dumount-path=${utillinux}/bin/umount"
+ "-Dcreate-log-dirs=false"
+ # Upstream uses cgroupsv2 by default. To support docker and other
+ # container managers we still need v1.
+ "-Ddefault-hierarchy=hybrid"
+ # Upstream defaulted to disable manpages since they optimize for the much
+ # more frequent development builds
+ "-Dman=true"
];
preConfigure = ''
@@ -221,6 +231,6 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21Plus;
platforms = platforms.linux;
priority = 10;
- maintainers = [ maintainers.eelco ];
+ maintainers = with maintainers; [ eelco andir ];
};
}
diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix
index fc4b38724a7d..bb640e6fa5e1 100644
--- a/pkgs/os-specific/linux/tbs/default.nix
+++ b/pkgs/os-specific/linux/tbs/default.nix
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
name = "tbs-2018.04.18-${kernel.version}";
srcs = [ media build ];
- sourceRoot = "${build.name}";
+ sourceRoot = build.name;
preConfigure = ''
make dir DIR=../${media.name}
diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix
index 5df7bb827aad..309d69ebad5c 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/default.nix
+++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix
@@ -4,7 +4,7 @@ let
vanillaVersion = "7.6.q";
patchLevel = "26";
in stdenv.mkDerivation rec {
- name = "tcp-wrappers-${version}";
+ pname = "tcp-wrappers";
version = "${vanillaVersion}-${patchLevel}";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix
index faf47c96a5e6..299ac8ad2203 100644
--- a/pkgs/os-specific/linux/thunderbolt/default.nix
+++ b/pkgs/os-specific/linux/thunderbolt/default.nix
@@ -7,7 +7,7 @@
}:
stdenv.mkDerivation rec {
- name = "thunderbolt-${version}";
+ pname = "thunderbolt";
version = "0.9.3";
src = fetchFromGitHub {
owner = "01org";
diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix
index 3c833de8b0c3..47b89f138c52 100644
--- a/pkgs/os-specific/linux/tiptop/default.nix
+++ b/pkgs/os-specific/linux/tiptop/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, libxml2, ncurses, bison, flex }:
stdenv.mkDerivation rec {
- name = "tiptop-${version}";
+ pname = "tiptop";
version = "2.3.1";
src = fetchurl {
- url = "${meta.homepage}/releases/${name}.tar.gz";
+ url = "${meta.homepage}/releases/${pname}-${version}.tar.gz";
sha256 = "10j1138y3cj3hsmfz4w0bmk90523b0prqwi9nhb4z8xvjnf49i2i";
};
diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix
index 53b6cbc3401a..dfcf4c9937b1 100644
--- a/pkgs/os-specific/linux/tiscamera/default.nix
+++ b/pkgs/os-specific/linux/tiscamera/default.nix
@@ -16,12 +16,11 @@
stdenv.mkDerivation rec {
pname = "tiscamera";
version = "0.9.1";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "TheImagingSource";
repo = pname;
- rev = "v-${name}";
+ rev = "v-${pname}-${version}";
sha256 = "143yp6bpzj3rqfnrcnlrcwggay37fg6rkphh4w9y9v7v4wllzf87";
};
diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix
index 880fd61ec2c6..9fde84060247 100644
--- a/pkgs/os-specific/linux/tomb/default.nix
+++ b/pkgs/os-specific/linux/tomb/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "tomb-${version}";
+ pname = "tomb";
version = "2.6";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/os-specific/linux/tpacpi-bat/default.nix
index b4e584f2979b..bb6d51669e6e 100644
--- a/pkgs/os-specific/linux/tpacpi-bat/default.nix
+++ b/pkgs/os-specific/linux/tpacpi-bat/default.nix
@@ -2,7 +2,7 @@
# Requires the acpi_call kernel module in order to run.
stdenv.mkDerivation rec {
- name = "tpacpi-bat-${version}";
+ pname = "tpacpi-bat";
version = "3.1";
src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index 3133602b44eb..567dcd1068c5 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }:
-stdenv.mkDerivation rec {
- name = "trace-cmd-${version}";
+stdenv.mkDerivation {
+ pname = "trace-cmd";
version = "2.8.3";
src = fetchgit (import ./src.nix);
diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
index 8e49af771394..b73de3193d22 100644
--- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
+++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
@@ -1,5 +1,5 @@
{ stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }:
-mkDerivation rec {
+mkDerivation {
pname = "kernelshark";
version = "0.9.8";
diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix
index a97cca4dfa76..eb8f55ac6655 100644
--- a/pkgs/os-specific/linux/undervolt/default.nix
+++ b/pkgs/os-specific/linux/undervolt/default.nix
@@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "georgewhewell";
repo = "undervolt";
- rev = "${version}";
+ rev = version;
sha256 = "1d934lp8yczrfslmwff6fxzd4arja2vg00s5kwdr949bxpa6w59c";
};
diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix
index 739bd4471927..d4f83eb8caf6 100644
--- a/pkgs/os-specific/linux/untie/default.nix
+++ b/pkgs/os-specific/linux/untie/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "untie-${version}";
+ pname = "untie";
version = "0.3";
src = fetchurl {
- url = "http://guichaz.free.fr/untie/files/${name}.tar.bz2";
+ url = "http://guichaz.free.fr/untie/files/${pname}-${version}.tar.bz2";
sha256 = "1334ngvbi4arcch462mzi5vxvxck4sy1nf0m58116d9xmx83ak0m";
};
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 14458356a790..d787acae61b4 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -1,53 +1,58 @@
{ stdenv
, fetchurl
, pkgconfig
-, dbus-glib
-, intltool
, libxslt
, docbook_xsl
, udev
, libgudev
, libusb1
+, glib
, gobject-introspection
-, useSystemd ? true, systemd
+, gettext
+, systemd
+, useIMobileDevice ? true
+, libimobiledevice
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "upower";
- version = "0.99.10";
+ version = "0.99.11";
+
+ outputs = [ "out" "dev" ];
src = fetchurl {
- url = https://gitlab.freedesktop.org/upower/upower/uploads/c438511024b9bc5a904f8775cfc8e4c4/upower-0.99.10.tar.xz;
- sha256 = "17d2bclv5fgma2y3g8bsn9pdvspn1zrzismzdnzfivc0f2wm28k4";
+ url = https://gitlab.freedesktop.org/upower/upower/uploads/93cfe7c8d66ed486001c4f3f55399b7a/upower-0.99.11.tar.xz;
+ sha256 = "1vxxvmz2cxb1qy6ibszaz5bskqdy9nd9fxspj9fv3gfmrjzzzdb4";
};
nativeBuildInputs = [
+ docbook_xsl
+ gettext
+ gobject-introspection
+ libxslt
pkgconfig
];
buildInputs = [
- dbus-glib
- intltool
- libxslt
- docbook_xsl
- udev
libgudev
libusb1
- gobject-introspection
+ udev
+ systemd
]
- ++ stdenv.lib.optional useSystemd systemd
+ ++ stdenv.lib.optional useIMobileDevice libimobiledevice
;
+ propagatedBuildInputs = [
+ glib
+ ];
+
configureFlags = [
- "--with-backend=linux"
"--localstatedir=/var"
- ]
- ++ stdenv.lib.optional useSystemd [
- "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
- "--with-systemdutildir=${placeholder ''out''}/lib/systemd"
- "--with-udevrulesdir=${placeholder ''out''}/lib/udev/rules.d"
- ]
- ;
+ "--with-backend=linux"
+ "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
+ "--with-systemdutildir=${placeholder "out"}/lib/systemd"
+ "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
+ ];
doCheck = false; # fails with "env: './linux/integration-test': No such file or directory"
diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix
index 1c5678b81e03..a9983561345e 100644
--- a/pkgs/os-specific/linux/usbguard/default.nix
+++ b/pkgs/os-specific/linux/usbguard/default.nix
@@ -1,11 +1,8 @@
{
stdenv, fetchurl, lib,
- pkgconfig, libxml2, libxslt,
- dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, audit,
- withGui ? true,
- qtbase ? null,
- qttools ? null,
- qtsvg ? null,
+ pkgconfig, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl, asciidoc,
+ dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf,
+ audit,
libgcrypt ? null,
libsodium ? null
}:
@@ -15,20 +12,23 @@ with stdenv.lib;
assert libgcrypt != null -> libsodium == null;
stdenv.mkDerivation rec {
- version = "0.7.4";
- name = "usbguard-${version}";
+ version = "0.7.5";
+ pname = "usbguard";
repo = "https://github.com/USBGuard/usbguard";
src = fetchurl {
- url = "${repo}/releases/download/${name}/${name}.tar.gz";
- sha256 = "1qkskd6q5cwlh2cpcsbzmmmgk6w63z0825wlb2sjwqq3kfgwjb3k";
+ url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
+ sha256 = "0jj56sls13ryfgz6vajq8p4dm3grgb6rf2cmga6sckmzd4chk65b";
};
nativeBuildInputs = [
+ asciidoc
pkgconfig
libxslt # xsltproc
libxml2 # xmllint
+ docbook_xml_dtd_45
+ docbook_xsl
];
buildInputs = [
@@ -41,8 +41,7 @@ stdenv.mkDerivation rec {
audit
]
++ (lib.optional (libgcrypt != null) libgcrypt)
- ++ (lib.optional (libsodium != null) libsodium)
- ++ (lib.optionals withGui [ qtbase qtsvg qttools ]);
+ ++ (lib.optional (libsodium != null) libsodium);
configureFlags = [
"--with-bundled-catch"
@@ -51,8 +50,7 @@ stdenv.mkDerivation rec {
"--with-polkit"
]
++ (lib.optional (libgcrypt != null) "--with-crypto-library=gcrypt")
- ++ (lib.optional (libsodium != null) "--with-crypto-library=sodium")
- ++ (lib.optional withGui "--with-gui-qt=qt5");
+ ++ (lib.optional (libsodium != null) "--with-crypto-library=sodium");
enableParallelBuilding = true;
diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix
index 497b5c191669..61f2c4540465 100644
--- a/pkgs/os-specific/linux/usbip/default.nix
+++ b/pkgs/os-specific/linux/usbip/default.nix
@@ -1,10 +1,15 @@
{ stdenv, kernel, udev, autoconf, automake, libtool }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "usbip-${kernel.name}";
src = kernel.src;
+ patches = [
+ # fixes build with gcc8
+ ./fix-snprintf-truncation.patch
+ ];
+
nativeBuildInputs = [ autoconf automake libtool ];
buildInputs = [ udev ];
diff --git a/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch b/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch
new file mode 100644
index 000000000000..63fca9ddbfe5
--- /dev/null
+++ b/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch
@@ -0,0 +1,13 @@
+diff --git a/tools/usb/usbip/libsrc/vhci_driver.c b/tools/usb/usbip/libsrc/vhci_driver.c
+index 8159fd98680b..7d6eb3e3fe1e 100644
+--- a/tools/usb/usbip/libsrc/vhci_driver.c
++++ b/tools/usb/usbip/libsrc/vhci_driver.c
+@@ -111,7 +111,7 @@ static int parse_status(const char *value)
+ static int refresh_imported_device_list(void)
+ {
+ const char *attr_status;
+- char status[MAX_STATUS_NAME+1] = "status";
++ char status[MAX_STATUS_NAME+2] = "status";
+ int i, ret;
+
+ for (i = 0; i < vhci_driver->ncontrollers; i++) {
diff --git a/pkgs/os-specific/linux/usbtop/default.nix b/pkgs/os-specific/linux/usbtop/default.nix
new file mode 100644
index 000000000000..0ff8fcf0ddf7
--- /dev/null
+++ b/pkgs/os-specific/linux/usbtop/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub
+, cmake
+, libpcap, boost }:
+
+stdenv.mkDerivation rec {
+ pname = "usbtop";
+ version = "1.0";
+
+ src = fetchFromGitHub {
+ owner = "aguinet";
+ repo = pname;
+ rev = "release-${version}";
+ sha256 = "0qbad0aq6j4jrh90l6a0akk71wdzhyzmy6q8wl138axyj2bp9kss";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ libpcap boost ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/aguinet/usbtop";
+ description = "A top utility that shows an estimated instantaneous bandwidth on USB buses and devices";
+ maintainers = with maintainers; [ etu ];
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 0962bd911329..b79a2cd342a8 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -8,10 +8,11 @@ let
patchVersion = "2";
in stdenv.mkDerivation rec {
- name = "util-linux-${version}";
+ pname = "util-linux";
+ inherit version;
src = fetchurl {
- url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
+ url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${pname}-${version}.tar.xz";
sha256 = "15yf2dh4jd1kg6066hydlgdhhs2j3na13qld8yx30qngqvmfh6v3";
};
diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix
index 1a40ec50c999..cfb93684f3bd 100644
--- a/pkgs/os-specific/linux/uvcdynctrl/default.nix
+++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.3.0";
- name = "uvcdynctrl-${version}";
+ pname = "uvcdynctrl";
src = fetchFromGitHub {
owner = "cshorler";
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index ede9fa682809..73db222d390c 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -1,44 +1,46 @@
-{ stdenv, lib, fetchurl, pkgconfig, perl, mkDerivation
+{ stdenv, lib, fetchurl, pkgconfig, perl
, libjpeg, udev
, withUtils ? true
-, withGUI ? true, alsaLib, libX11, qtbase, libGLU
+, withGUI ? true, alsaLib, libX11, qtbase, libGLU, wrapQtAppsHook
}:
# See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT)
-mkDerivation rec {
- name = "v4l-utils-${version}";
- version = "1.16.6";
+let
+ withQt = withUtils && withGUI;
+
+# we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt
+in stdenv.mkDerivation rec {
+ pname = "v4l-utils";
+ version = "1.16.7";
src = fetchurl {
- url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
- sha256 = "1bkqlrizx0j2rd6ybam2x17bjrpwzl4v4szmnzm3cmixis3w3npr";
+ url = "https://linuxtv.org/downloads/${pname}/${pname}-${version}.tar.bz2";
+ sha256 = "1ng0x3wj3a1ckfd00yxa4za43xms92gdp7rdag060b7p39z7m4gf";
};
- outputs = [ "out" "dev" ];
+ outputs = [ "out" ] ++ lib.optional withUtils "lib" ++ [ "dev" ];
- configureFlags =
- if withUtils then [
- "--with-udevdir=${placeholder "out"}/lib/udev"
- ] else [
- "--disable-v4l-utils"
- ];
+ configureFlags = (if withUtils then [
+ "--with-localedir=${placeholder "lib"}/share/locale"
+ "--with-udevdir=${placeholder "out"}/lib/udev"
+ ] else [
+ "--disable-v4l-utils"
+ ]);
postFixup = ''
# Create symlink for V4l1 compatibility
ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h"
'';
- nativeBuildInputs = [ pkgconfig perl ];
+ nativeBuildInputs = [ pkgconfig perl ] ++ lib.optional withQt wrapQtAppsHook;
- buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase libGLU ];
+ buildInputs = [ udev ] ++ lib.optionals withQt [ alsaLib libX11 qtbase libGLU ];
propagatedBuildInputs = [ libjpeg ];
- NIX_CFLAGS_COMPILE = lib.optional (withUtils && withGUI) "-std=c++11";
-
postPatch = ''
- patchShebangs .
+ patchShebangs utils/cec-ctl/msg2ctl.pl
'';
meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 02e08bec7ad7..c2dca6696165 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -3,8 +3,8 @@
# module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
assert stdenv.lib.versionAtLeast kernel.version "3.10";
-stdenv.mkDerivation rec {
- name = "wireguard-${version}";
+stdenv.mkDerivation {
+ pname = "wireguard";
inherit (wireguard-tools) src version;
preConfigure = ''
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index fa7250f7cee8..69525c92ede9 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -6,10 +6,10 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "2.9";
- name = "wpa_supplicant-${version}";
+ pname = "wpa_supplicant";
src = fetchurl {
- url = "https://w1.fi/releases/${name}.tar.gz";
+ url = "https://w1.fi/releases/${pname}-${version}.tar.gz";
sha256 = "05qzak1mssnxcgdrafifxh9w86a4ha69qabkg4bsigk499xyxggw";
};
diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix
index 7911a2172ba0..1c2aaa8ee01d 100644
--- a/pkgs/os-specific/linux/x86info/default.nix
+++ b/pkgs/os-specific/linux/x86info/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.30";
- name = "x86info-${version}";
+ pname = "x86info";
src = fetchurl {
- url = "http://codemonkey.org.uk/projects/x86info/${name}.tgz";
+ url = "http://codemonkey.org.uk/projects/x86info/${pname}-${version}.tgz";
sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y";
};
diff --git a/pkgs/os-specific/linux/xf86-input-cmt/default.nix b/pkgs/os-specific/linux/xf86-input-cmt/default.nix
new file mode 100644
index 000000000000..2422b70b0685
--- /dev/null
+++ b/pkgs/os-specific/linux/xf86-input-cmt/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, pkgconfig, xorgserver, xorgproto,
+ utilmacros, libgestures, libevdevc }:
+
+stdenv.mkDerivation rec {
+ name = "xf86-input-cmt-${version}";
+ version = "2.0.2";
+ src = fetchFromGitHub {
+ owner = "hugegreenbug";
+ repo = "xf86-input-cmt";
+ rev = "v${version}";
+ sha256 = "1cnwf518nc0ybc1r3rsgc1gcql1k3785khffv0i4v3akrm9wdw98";
+ };
+
+ postPatch = ''
+ patchShebangs ./apply_patches.sh
+ ./apply_patches.sh
+ '';
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [
+ xorgserver xorgproto utilmacros
+ libgestures libevdevc
+ ];
+
+ configureFlags = [
+ "--with-sdkdir=${placeholder "out"}"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Chromebook touchpad driver.";
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ homepage = "www.github.com/hugegreenbug/xf86-input-cmt";
+ maintainers = with maintainers; [ kcalvinalvin ];
+ };
+}
diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix
index 5f7bca097bf6..440a797a7232 100644
--- a/pkgs/os-specific/linux/xsensors/default.nix
+++ b/pkgs/os-specific/linux/xsensors/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, gtk2, pkgconfig, lm_sensors }:
stdenv.mkDerivation rec {
- name = "xsensors-${version}";
+ pname = "xsensors";
version = "0.70";
src = fetchurl {
url = "http://www.linuxhardware.org/xsensors/xsensors-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 03e11d1a8ed9..1b9b5a3ba515 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -30,7 +30,7 @@ let
Linux v${kernel.version} is not yet supported by zfsonlinux v${version}.
${stdenv.lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."}
''
- else stdenv.mkDerivation rec {
+ else stdenv.mkDerivation {
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
src = fetchFromGitHub {
@@ -163,7 +163,7 @@ in {
];
};
- zfsUnstable = common rec {
+ zfsUnstable = common {
# comment/uncomment if breaking kernel versions are known
# incompatibleKernelVersion = "4.19";
diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix
index 3738760bb290..a6c74d029c57 100644
--- a/pkgs/os-specific/windows/cygwin-setup/default.nix
+++ b/pkgs/os-specific/windows/cygwin-setup/default.nix
@@ -5,7 +5,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "cygwin-setup-${version}";
+ pname = "cygwin-setup";
version = "20131101";
src = fetchcvs {
diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix
index 88af53dd046e..fedfea15ccb0 100644
--- a/pkgs/os-specific/windows/libgnurx/default.nix
+++ b/pkgs/os-specific/windows/libgnurx/default.nix
@@ -3,9 +3,10 @@
let
version = "2.5.1";
in stdenv.mkDerivation rec {
- name = "libgnurx-${version}";
+ pname = "libgnurx";
+ inherit version;
src = fetchurl {
- url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${name}-src.tar.gz";
+ url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${pname}-${version}-src.tar.gz";
sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi";
};
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index a7d4f09b90e9..022aaffe5961 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -3,7 +3,8 @@
let
version = "5.0.4";
in stdenv.mkDerivation {
- name = "mingw-w64-${version}";
+ pname = "mingw-w64";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix
index de0f36dac5fa..257067339674 100644
--- a/pkgs/os-specific/windows/pthread-w32/default.nix
+++ b/pkgs/os-specific/windows/pthread-w32/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
-stdenv.mkDerivation rec {
- name = "pthreads-w32-${version}";
+stdenv.mkDerivation {
+ pname = "pthreads-w32";
version = "2.9.1";
src = fetchzip {
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix
index 8446578507d8..c63b234031b7 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -38,6 +38,8 @@ let
"-Wno-error=int-in-bool-context"
"-Wno-error=maybe-uninitialized"
"-Wno-error=unused-function"
+ "-Wno-error=ignored-qualifiers"
+ "-Wno-error=catch-value"
];
};
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 9538747da6d1..14a0df257471 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -4,13 +4,13 @@
}:
stdenv.mkDerivation rec {
- name = "rabbitmq-server-${version}";
+ pname = "rabbitmq-server";
version = "3.7.17";
# when updating, consider bumping elixir version in all-packages.nix
src = fetchurl {
- url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz";
+ url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "1ychgvjbi6ikapfcp4rgwa0vihhs1f34c2advb7833jym8alazrr";
};
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index dca2c0721856..0c1c69982fa1 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -50,7 +50,7 @@ with versionMap.${majorVersion};
stdenv.mkDerivation rec {
version = "${scalaVersion}-${kafkaVersion}";
- name = "apache-kafka-${version}";
+ pname = "apache-kafka";
src = fetchurl {
url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz";
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 47ef9934a5e8..1e5ba46d3823 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -6,9 +6,9 @@
}:
let
- common = {version, sha256, externals}: stdenv.mkDerivation rec {
+ common = {version, sha256, externals}: stdenv.mkDerivation {
inherit version;
- name = "asterisk-${version}";
+ pname = "asterisk";
buildInputs = [ jansson libedit libxml2 libxslt ncurses openssl sqlite
dmidecode libuuid newt
diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index 46160fee24b4..c9dcba283825 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "atlassian-confluence-${version}";
+ pname = "atlassian-confluence";
version = "6.15.8";
src = fetchurl {
- url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz";
+ url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
sha256 = "17pcgjv6rj2jxzmwx82941zhrrmprkchjhnnadnxq4709zsyb4q3";
};
diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix
index 1d0e28ac9f28..81b90091e669 100644
--- a/pkgs/servers/atlassian/crowd.nix
+++ b/pkgs/servers/atlassian/crowd.nix
@@ -2,11 +2,11 @@
, port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }:
stdenv.mkDerivation rec {
- name = "atlassian-crowd-${version}";
+ pname = "atlassian-crowd";
version = "3.4.5";
src = fetchurl {
- url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz";
+ url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz";
sha256 = "1k72aar68iqiaf0l75i6pp81dpsllqkp69f70hja754hrzvhz8j3";
};
diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index 3a05c2d8d610..2b7117f419f5 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "atlassian-jira-${version}";
+ pname = "atlassian-jira";
version = "8.3.2";
src = fetchurl {
diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix
index 528dc8a48a0b..58ebbf88f78a 100644
--- a/pkgs/servers/beanstalkd/default.nix
+++ b/pkgs/servers/beanstalkd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "1.11";
- name = "beanstalkd-${version}";
+ pname = "beanstalkd";
installPhase=''make install "PREFIX=$out"'';
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index e54394a9a7d5..d4b4441408e7 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -6,11 +6,12 @@ let
generic = { version, sha256, enableIPv6 ? false }:
stdenv.mkDerivation rec {
- name = "bird-${version}";
+ pname = "bird";
+ inherit version;
src = fetchurl {
inherit sha256;
- url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz";
+ url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz";
};
nativeBuildInputs = [ flex bison ];
diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix
index 4b71aaeca3ad..ee8925e11709 100644
--- a/pkgs/servers/brickd/default.nix
+++ b/pkgs/servers/brickd/default.nix
@@ -11,8 +11,9 @@ daemonlib = fetchgit {
in
-stdenv.mkDerivation rec {
- name = "brickd-${version}";
+stdenv.mkDerivation {
+ pname = "brickd";
+ inherit version;
src = fetchgit {
url = "git://github.com/Tinkerforge/brickd.git";
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 61316d0a60a1..675f1beb891d 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
- name = "caddy-${version}";
+ pname = "caddy";
version = "1.0.0";
goPackagePath = "github.com/mholt/caddy";
diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix
index befa36edd9e2..c9a39b691e7c 100644
--- a/pkgs/servers/cayley/default.nix
+++ b/pkgs/servers/cayley/default.nix
@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "cayley-${version}";
- version = "0.6.1";
+ pname = "cayley";
+ version = "0.7.5";
goPackagePath = "github.com/cayleygraph/cayley";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "cayleygraph";
repo = "cayley";
rev = "v${version}";
- sha256 = "1r0kw3y32bqm7g37svzrch2qj9n45p93xmsrf7dj1cg4wwkb65ry";
+ sha256 = "1zfxa9z6spi6xw028mvbc7c3g517gn82g77ywr6picl47fr2blnd";
};
goDeps = ./deps.nix;
diff --git a/pkgs/servers/cayley/deps.nix b/pkgs/servers/cayley/deps.nix
index 1e6fadf9f4d8..eb3dce827bd3 100644
--- a/pkgs/servers/cayley/deps.nix
+++ b/pkgs/servers/cayley/deps.nix
@@ -1,272 +1,471 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
- goPackagePath = "github.com/badgerodon/peg";
+ goPackagePath = "github.com/badgerodon/peg";
fetch = {
type = "git";
url = "https://github.com/badgerodon/peg";
- rev = "9e5f7f4d07ca576562618c23e8abadda278b684f";
+ rev = "9e5f7f4d07ca576562618c23e8abadda278b684f";
sha256 = "12vd7hzdgknn8byz77lmvcrz9m5lvmffdnz2wwk83304przkra11";
};
}
{
- goPackagePath = "github.com/boltdb/bolt";
+ goPackagePath = "github.com/boltdb/bolt";
fetch = {
type = "git";
url = "https://github.com/boltdb/bolt";
- rev = "a705895fdad108f053eae7ee011ed94a0541ee13";
- sha256 = "0ql67l2hmjhplkl80j9a49qlra4qx671il5rgn58afkvk20cgq2r";
+ rev = "e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd";
+ sha256 = "1sjxzz88bw0y37mk3xvwb9j5v7bz3r80rwg79jml6liqk1arnl99";
};
}
{
- goPackagePath = "github.com/cznic/mathutil";
+ goPackagePath = "github.com/cznic/mathutil";
fetch = {
type = "git";
url = "https://github.com/cznic/mathutil";
- rev = "f9551431b78e71ee24939a1e9d8f49f43898b5cd";
- sha256 = "1158mlwzryyna1qslr9v88i0k8x6m8vs4rljnnwh04rmd63ksj75";
+ rev = "1447ad269d64ca91aa8d7079baa40b6fc8b965e7";
+ sha256 = "1r9c20k2h65g38yxf3vd46nbayx1cz5w4q4yr1xfggcs0mmrb87i";
};
}
{
- goPackagePath = "github.com/davecgh/go-spew";
+ goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
- rev = "2df174808ee097f90d259e432cc04442cf60be21";
- sha256 = "0jghd5dmwqpcjbxij9yjj8sjzll9s65i2qnxd8rdzwh77xdsfm9g";
+ rev = "346938d642f2ec3594ed81d874461961cd0faa76";
+ sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
};
}
{
- goPackagePath = "github.com/dlclark/regexp2";
+ goPackagePath = "github.com/dennwc/graphql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dennwc/graphql";
+ rev = "12cfed44bc5de083875506a36d30f9798f9bca47";
+ sha256 = "1rfsxjjsik5618y2741lcyw56a4d4l6r04sbj1igrvcck9bz0k6a";
+ };
+ }
+ {
+ goPackagePath = "github.com/dlclark/regexp2";
fetch = {
type = "git";
url = "https://github.com/dlclark/regexp2";
- rev = "4009c9dc49dd8906bfd4d479c255470d6a477ce5";
- sha256 = "1r6f0q1jvn1lkwqlrmmg5d90p6zss8s64jyp91hp6i97vpahq8xz";
+ rev = "902a5ce7a7812e2ba9f73b9d96c09d5136df39cd";
+ sha256 = "0ypmdayq50ilbmqa1wjq5nvs9igbxkzlc8phlknw244935wz3v15";
};
}
{
- goPackagePath = "github.com/dop251/goja";
+ goPackagePath = "github.com/dop251/goja";
fetch = {
type = "git";
url = "https://github.com/dop251/goja";
- rev = "64f863c4eb0329df18ecd1dab1e03609556bfaca";
- sha256 = "0smipfs7fja286nvlr7q4b8f815br0nia0k4xp8y5fvprrzrm64h";
+ rev = "ef8c030e3c96c5054c2f10ef925e7041e0583c07";
+ sha256 = "15419apwdpbl0lgnl9xj9wyl05vpiz6jqgj8zbcyxhzy0wycj445";
};
}
{
- goPackagePath = "github.com/gogo/protobuf";
+ goPackagePath = "github.com/fsnotify/fsnotify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fsnotify/fsnotify";
+ rev = "4da3e2cfbabc9f751898f250b49f2439785783a1";
+ sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-kivik/couchdb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-kivik/couchdb";
+ rev = "74d231fe43245e77840213724894264f0f61ffd3";
+ sha256 = "0ga6d6y44wg8ync73wcyc7q7r3sr5vdj5qkn3yqn9yn4p0k2w89i";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-kivik/kivik";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-kivik/kivik";
+ rev = "2a1f6b9dd407886bc59c0c28faed28fbce3b0ece";
+ sha256 = "0fpa62mriyiyl5dh5kg8858bqrwiwscpbkg9np69lk302znxalij";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-kivik/pouchdb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-kivik/pouchdb";
+ rev = "bbd1ab79be17c809842e193b1f84e924b6b599ba";
+ sha256 = "15kv6i94j73c8zzy5hnmf051d3i65wxc07hvass9lc4g5ad7f9vf";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-sourcemap/sourcemap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-sourcemap/sourcemap";
+ rev = "b019cc30c1eaa584753491b0d8f8c1534bf1eb44";
+ sha256 = "03k44fdrnknba05f7cd58lq4rzk7jdpiqksmc0wxrdzwschrbgw8";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-sql-driver/mysql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-sql-driver/mysql";
+ rev = "147bd02c2c516cf9a8878cb75898ee8a9eea0228";
+ sha256 = "0s75nilz1jx0vgc69jgmys95lsq9j9nfdjcc8inc8mhzh3qpjb74";
+ };
+ }
+ {
+ goPackagePath = "github.com/gogo/protobuf";
fetch = {
type = "git";
url = "https://github.com/gogo/protobuf";
- rev = "50d1bd39ce4e7a96b75e3e040be9caf79dbb4c61";
- sha256 = "09cad9j98pdqh1sp191j92ng6lvw9la3k3v6m5mv38nwirpwzra1";
+ rev = "30433562cfbf487fe1df7cd26c7bab168d2f14d0";
+ sha256 = "155iv0jqgh0d8cykghw3ifwk8pjyyq1w4gr9khhf78n01k6180hj";
};
}
{
- goPackagePath = "github.com/golang/glog";
+ goPackagePath = "github.com/golang/glog";
fetch = {
type = "git";
url = "https://github.com/golang/glog";
- rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
+ rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
};
}
{
- goPackagePath = "github.com/golang/protobuf";
+ goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
- rev = "888eb0692c857ec880338addf316bd662d5e630e";
- sha256 = "1vhx2dwr71hma9z3dfb3l1yrkjlry0glwxknxzyp9ds51i6pjiq0";
+ rev = "18c9bb3261723cd5401db4d0c9fbc5c3b6c70fe8";
+ sha256 = "0fbf8ymrcb23imkhlrlyq6i0x5w8gxzilljjsgd4hnvjgpgp3r4v";
};
}
{
- goPackagePath = "github.com/hashicorp/go-cleanhttp";
+ goPackagePath = "github.com/golang/snappy";
fetch = {
type = "git";
- url = "https://github.com/hashicorp/go-cleanhttp";
- rev = "ad28ea4487f05916463e2423a55166280e8254b5";
- sha256 = "0xw0qas3ixg8p2xh09hhc81km0mfn9lbnfgrdb309hzcwhmiyqjm";
+ url = "https://github.com/golang/snappy";
+ rev = "553a641470496b2327abcac10b36396bd98e45c9";
+ sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk";
};
}
{
- goPackagePath = "github.com/julienschmidt/httprouter";
+ goPackagePath = "github.com/gopherjs/gopherjs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gopherjs/gopherjs";
+ rev = "558a9132744c22476178edf3126fd35a9754f565";
+ sha256 = "13mn0li83amgm4fgsm6l3shs2r4kjddr10xn0ydnr9ymg1y887vi";
+ };
+ }
+ {
+ goPackagePath = "github.com/gopherjs/jsbuiltin";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gopherjs/jsbuiltin";
+ rev = "67703bfb044e3192fbcab025c3aeaeedafad1f2f";
+ sha256 = "1k0df0z9fiyzbr1g1736zdp238j9z82q3gwkk060h2n84rg4c7lh";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/hcl";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/hcl";
+ rev = "7fa7fff964d035e8a162cce3a164b3ad02ad651b";
+ sha256 = "0p3dyhpc0ajakcww3a45n750z2030xqhlswzf51d5rzid27681wp";
+ };
+ }
+ {
+ goPackagePath = "github.com/imdario/mergo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/imdario/mergo";
+ rev = "0d4b488675fdec1dde48751b05ab530cf0b630e1";
+ sha256 = "071rram7aib70f3gk4ansgwns82w9i6m1px8mgc8x4rs9ana4qhf";
+ };
+ }
+ {
+ goPackagePath = "github.com/inconshreveable/mousetrap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/inconshreveable/mousetrap";
+ rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+ };
+ }
+ {
+ goPackagePath = "github.com/jackc/pgx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jackc/pgx";
+ rev = "606697ffdfe6603013560dbc171656de57b4f542";
+ sha256 = "0818yb2vjjwwmscdab7wnxbyiabvy544icdczdlr5kswbqq5h25m";
+ };
+ }
+ {
+ goPackagePath = "github.com/julienschmidt/httprouter";
fetch = {
type = "git";
url = "https://github.com/julienschmidt/httprouter";
- rev = "b59a38004596b696aca7aa2adccfa68760864d86";
- sha256 = "0j1w2fkcghyw3lcsc13lwf2zqar9xyni2g7fqp4aq8g08ii7paac";
+ rev = "6f3f3919c8781ce5c0509c83fffc887a7830c938";
+ sha256 = "1hmqdpv2zywwglmnjnxfn27mkac81n3nqs1wandlpybsww4vn4kx";
};
}
{
- goPackagePath = "github.com/lib/pq";
+ goPackagePath = "github.com/lib/pq";
fetch = {
type = "git";
url = "https://github.com/lib/pq";
- rev = "0dad96c0b94f8dee039aa40467f767467392a0af";
- sha256 = "06c38iy37251mh8jy9s8n97b01pjnqpq8ii77nnmqh1dsph37jz4";
+ rev = "2704adc878c21e1329f46f6e56a1c387d788ff94";
+ sha256 = "160fmvi7bczxw3i3h5s821hv029ph5ld8x3c36b4cz2sr30wp110";
};
}
{
- goPackagePath = "github.com/linkeddata/gojsonld";
+ goPackagePath = "github.com/linkeddata/gojsonld";
fetch = {
type = "git";
url = "https://github.com/linkeddata/gojsonld";
- rev = "a223ef39bb925d36d4c410d3e35b0e34e370cc31";
- sha256 = "1i3vl7gbkq2xl2wyv0kszj0x32vp8jw1cf0ngpdqdhdvnbfi1w7i";
+ rev = "4f5db6791326b8962ede4edbba693edcf20fd1ad";
+ sha256 = "11g1kygkn55whaf49q2bzxk0w8b3nhdhiaixsj2ik65j8bl9g2cq";
};
}
{
- goPackagePath = "github.com/pborman/uuid";
+ goPackagePath = "github.com/magiconair/properties";
+ fetch = {
+ type = "git";
+ url = "https://github.com/magiconair/properties";
+ rev = "51463bfca2576e06c62a8504b5c0f06d61312647";
+ sha256 = "0d7hr78y8gg2mrm5z4jjgm2w3awkznz383b7wvyzk3l33jw6i288";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/mapstructure";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/mapstructure";
+ rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096";
+ sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86";
+ };
+ }
+ {
+ goPackagePath = "github.com/pborman/uuid";
fetch = {
type = "git";
url = "https://github.com/pborman/uuid";
- rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4";
- sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn";
+ rev = "1b00554d822231195d1babd97ff4a781231955c9";
+ sha256 = "0rjkcf85sagdwzsycj1bbjyx5bgmrc1i8l5qf1f44z24rhbbkaan";
};
}
{
- goPackagePath = "github.com/peterh/liner";
+ goPackagePath = "github.com/pelletier/go-buffruneio";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pelletier/go-buffruneio";
+ rev = "c37440a7cf42ac63b919c752ca73a85067e05992";
+ sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2";
+ };
+ }
+ {
+ goPackagePath = "github.com/pelletier/go-toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pelletier/go-toml";
+ rev = "fe206efb84b2bc8e8cfafe6b4c1826622be969e3";
+ sha256 = "1dlabfpnlzvwf4i86idy8ilqpjsl8yqfgdv0nv5cccm8gkcans5w";
+ };
+ }
+ {
+ goPackagePath = "github.com/peterh/liner";
fetch = {
type = "git";
url = "https://github.com/peterh/liner";
- rev = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced";
- sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48";
+ rev = "88609521dc4b6c858fd4c98b628147da928ce4ac";
+ sha256 = "0jacb2fqgiccb98v1875j5xvj01l1z2laga1kgr8lhd0nl22r96k";
};
}
{
- goPackagePath = "github.com/pmezard/go-difflib";
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "e881fd58d78e04cf6d0de1217f8707c8cc2249bc";
+ sha256 = "0vfhj598jp6dzy4pbyjdrqxzb5kppw8ggvfh78g80nz11r34xnzs";
+ };
+ }
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
- rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d";
+ rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d";
sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs";
};
}
{
- goPackagePath = "github.com/robertkrimen/otto";
- fetch = {
- type = "git";
- url = "https://github.com/robertkrimen/otto";
- rev = "d1b4d8ef0e0e4b088c8328c95ca63ab9ebd8fc9d";
- sha256 = "0i31p3paz3n7qi2v1g77lm3cx2hssgwgcfpar4qc2vj7m4766884";
- };
- }
- {
- goPackagePath = "github.com/russross/blackfriday";
+ goPackagePath = "github.com/russross/blackfriday";
fetch = {
type = "git";
url = "https://github.com/russross/blackfriday";
- rev = "17bb7999de6cfb791d4f8986cc00b3309b370cdb";
- sha256 = "1md0sjw69mj359cb4c8ghzllcbn2lnkvby1203wl0pf5wbyfvm5s";
+ rev = "b253417e1cb644d645a0a3bb1fa5034c8030127c";
+ sha256 = "1knj8vabymhmkg12cj3hnpqf3b74wwrvqib12yczcvpi52xaqi20";
};
}
{
- goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+ goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
fetch = {
type = "git";
url = "https://github.com/shurcooL/sanitized_anchor_name";
- rev = "8e87604bec3c645a4eeaee97dfec9f25811ff20d";
- sha256 = "05b6yj23c3xx446kanhaj1l83av8676z7si8n1f4sqy2pp7s966v";
+ rev = "79c90efaf01eddc01945af5bc1797859189b830b";
+ sha256 = "1dj8v91gv1ssw2j88gjzr1hw0n63qqxykjzfbvspyi529xn3ji3y";
};
}
{
- goPackagePath = "github.com/sirupsen/logrus";
+ goPackagePath = "github.com/spf13/afero";
fetch = {
type = "git";
- url = "https://github.com/sirupsen/logrus";
- rev = "08a8a7c27e3d058a8989316a850daad1c10bf4ab";
- sha256 = "1fbh1b42alvpbw87v0v2hanliaqp6fm4h9n7byk921mcv6dai8fl";
+ url = "https://github.com/spf13/afero";
+ rev = "9be650865eab0c12963d8753212f4f9c66cdcf12";
+ sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34";
};
}
{
- goPackagePath = "github.com/stretchr/testify";
+ goPackagePath = "github.com/spf13/cast";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cast";
+ rev = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4";
+ sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cobra";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cobra";
+ rev = "7b1b6e8dc027253d45fc029bc269d1c019f83a34";
+ sha256 = "1nhnlpmbqq1ggix7jaxmzr8awk1zrrzag4vzq1p5q5l25d6kih35";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/jwalterweatherman";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/jwalterweatherman";
+ rev = "fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66";
+ sha256 = "0404b7bzx7cq1b2bgdb3gs7gjzm4vvg1hl2y9mcm4m6vz56vbcz8";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/pflag";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/pflag";
+ rev = "f1d95a35e132e8a1868023a08932b14f0b8b8fcb";
+ sha256 = "0fwvkyq36jvy2gid81031ll7qaj8jxr5g36fff7hhkp3hh4kz6zh";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/viper";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/viper";
+ rev = "0967fc9aceab2ce9da34061253ac10fb99bba5b2";
+ sha256 = "016syis0rvccp2indjqi1vnz3wk7c9dhkvkgam0j79sb019kl80f";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
- rev = "f390dcf405f7b83c997eac1b06768bb9f44dec18";
- sha256 = "1l3z0ggdcjspfmm6k9glmh52a9x50806k6yldxql73p4bpynsd9g";
+ rev = "87b1dfb5b2fa649f52695dd9eae19abe404a4308";
+ sha256 = "1iyfxs3nxdn1fyfqv3gggxcxab66a3m6cmjkhqhcapxm3qvgbrlc";
};
}
{
- goPackagePath = "github.com/syndtr/goleveldb";
+ goPackagePath = "github.com/syndtr/goleveldb";
fetch = {
type = "git";
url = "https://github.com/syndtr/goleveldb";
- rev = "4875955338b0a434238a31165cb87255ab6e9e4a";
- sha256 = "0786j6kizrlskqz196ng4d13363d44whl849jcv1q07yab2nq40i";
+ rev = "b89cc31ef7977104127d34c1bd31ebd1a9db2199";
+ sha256 = "0pbmssaw7fsgspv0jr3hsd1208qqxcvy4faks9hypqgl5gwday4p";
};
}
{
- goPackagePath = "github.com/syndtr/gosnappy";
+ goPackagePath = "github.com/tylertreat/BoomFilters";
fetch = {
type = "git";
- url = "https://github.com/syndtr/gosnappy";
- rev = "156a073208e131d7d2e212cb749feae7c339e846";
- sha256 = "08lf8smnp4imj5fkph9sbqzb4a5n191q9m6b2c5kamp19i9h2y6z";
+ url = "https://github.com/tylertreat/BoomFilters";
+ rev = "37e169ae37ed529d93ecacb509c0dc80078478fc";
+ sha256 = "15wwdsxxvkgxbxv3v0ywnwjwndpmps49n3a49z7bzjl7r2nsm7qv";
};
}
{
- goPackagePath = "golang.org/x/net";
+ goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "6a513affb38dc9788b449d59ffed099b8de18fa0";
- sha256 = "1g07c05s3ccq0086f0f200k9cfjjzxd4r9nrdilkmy44lbhhrval";
+ rev = "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344";
+ sha256 = "09xpndqc6a2r0lw42cyl1pkhfddl01sd9c3qqjjwp3vmxm004whv";
};
}
{
- goPackagePath = "golang.org/x/sys";
+ goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "a646d33e2ee3172a661fc09bca23bb4889a41bc8";
- sha256 = "1jniqg2nv5zhdzfm9gwfx0s9q8mwxrgcxdbkd6cddk9w0qgji9dc";
+ rev = "9ccfe848b9db8435a24c424abbc07a921adf1df5";
+ sha256 = "0wn3p7nrf9lx5svnya5mxy5b8cxqs2rp8lxc477szna313m1jhs4";
};
}
{
- goPackagePath = "golang.org/x/text";
+ goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
- rev = "5a42fa2464759cbb7ee0af9de00b54d69f09a29c";
- sha256 = "0far6mb2ikwzr7icn0yqi9ygl8kv2wsaasyprbqb9qapr0dqjw0s";
+ rev = "470f45bf29f4147d6fbd7dfd0a02a848e49f5bf4";
+ sha256 = "1yzh1qxwd0xkh0k04hwp7yii21i26b4ngxvm1g98qlji1g2wbjbc";
};
}
{
- goPackagePath = "google.golang.org/appengine";
+ goPackagePath = "google.golang.org/appengine";
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
- rev = "4f7eeb5305a4ba1966344836ba4af9996b7b4e05";
- sha256 = "09pgvlk5ay3f0avi1bawpy8khi3rmkfl36l2yr3ryp8z12i9k2qj";
+ rev = "170382fa85b10b94728989dfcf6cc818b335c952";
+ sha256 = "0dqx24qc7h53p16xnkwn2jpk3wjjlvv48akqk74vx31pr2nn0g56";
};
}
{
- goPackagePath = "gopkg.in/mgo.v2";
+ goPackagePath = "gopkg.in/mgo.v2";
fetch = {
type = "git";
- url = "https://gopkg.in/mgo.v2";
- rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a";
- sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj";
+ url = "https://github.com/go-mgo/mgo";
+ rev = "3f83fa5005286a7fe593b055f0d7771a7dce4655";
+ sha256 = "19vwb6qlcyh3nh6pkk0bynwmr5cmi6mm4hdz01lwb4ybnkzxryc7";
};
}
{
- goPackagePath = "github.com/go-sql-driver/mysql";
+ goPackagePath = "gopkg.in/olivere/elastic.v5";
fetch = {
type = "git";
- url = "https://github.com/go-sql-driver/mysql";
- rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034";
- sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5";
+ url = "https://github.com/olivere/elastic";
+ rev = "79ff368708b3a2a9da641dc831d95fd0782bf4ef";
+ sha256 = "1lq8nhjnkf246nl5h40ldh1qz2yx73yaqfmsh9ddvkwn4173c7jj";
};
}
{
- goPackagePath = "github.com/dennwc/graphql";
+ goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
- url = "https://github.com/dennwc/graphql";
- rev = "fd5c4aa13f2119414084f229600de0d73f174436";
- sha256 = "11f9jwfc2j646732gkcjb332ih9fxh04j31zmhvqswx75gvk9wzs";
+ url = "https://github.com/go-yaml/yaml";
+ rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";
+ sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
};
}
-]
+]
\ No newline at end of file
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index 8530d8cb068e..e48dec7d20c8 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "clickhouse-${version}";
+ pname = "clickhouse";
version = "19.13.1.11";
src = fetchFromGitHub {
diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix
index 21a5bad72fc8..bf8623f0a893 100644
--- a/pkgs/servers/cloud-print-connector/default.nix
+++ b/pkgs/servers/cloud-print-connector/default.nix
@@ -8,7 +8,7 @@
# - https://github.com/Mic92/dotfiles/blob/ba2a01144cfdc71c829d872a3fc816c64663ad7f/nixos/vms/matchbox/modules/cloud-print-connector.nix
buildGoPackage rec {
- name = "cloud-print-connector-unstable-${version}";
+ pname = "cloud-print-connector-unstable";
version = "1.16";
rev = "481ad139cc023a3ba65e769f08f277368fa8a5de";
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index 1b3e5466ec39..c448e4936f64 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -7,7 +7,7 @@
}:
stdenv.mkDerivation rec {
- name = "slurm-${version}";
+ pname = "slurm";
version = "19.05.2.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
owner = "SchedMD";
repo = "slurm";
# The release tags use - instead of .
- rev = "${builtins.replaceStrings ["."] ["-"] name}";
+ rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "1k19z0qyjr6nwqxv93wbnnhy498788rc4fl9zyf0smc5yq1zbjir";
};
diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix
index 84985b8f0eb3..93794ce7052e 100644
--- a/pkgs/servers/confluent-platform/default.nix
+++ b/pkgs/servers/confluent-platform/default.nix
@@ -2,7 +2,7 @@
, jre, makeWrapper, bash, gnused }:
stdenv.mkDerivation rec {
- name = "confluent-platform-${version}";
+ pname = "confluent-platform";
version = "5.3.0";
scalaVersion = "2.12";
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index d364c2a5bcdf..b7c2e01e97a2 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "consul-${version}";
- version = "1.5.2";
+ pname = "consul";
+ version = "1.6.0";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/consul";
@@ -17,9 +17,9 @@ buildGoPackage rec {
# to apply your changes as patches on top of a release commit.
src = fetchFromGitHub {
owner = "hashicorp";
- repo = "consul";
+ repo = pname;
inherit rev;
- sha256 = "1fn9xxdszil4zdal08cyq6gbs2larpr4zmjmv2w2ykiacbfhpa6h";
+ sha256 = "16rngyv9dp19gjbjwfvnmlfxbq67fxs55hgvvcyn9mplm1j0bb52";
};
preBuild = ''
diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix
index ad15db070f41..2fbd0bbfb3da 100644
--- a/pkgs/servers/coturn/default.nix
+++ b/pkgs/servers/coturn/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, openssl, libevent }:
stdenv.mkDerivation rec {
- name = "coturn-${version}";
+ pname = "coturn";
version = "4.5.1.1";
src = fetchFromGitHub {
owner = "coturn";
repo = "coturn";
- rev = "${version}";
+ rev = version;
sha256 = "12x604lgva1d3g4wvl3f66rdj6lkjk5cqr0l3xas33xgzgm13pwr";
};
diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix
index 8b2895392bec..a528cd2ca26e 100644
--- a/pkgs/servers/couchpotato/default.nix
+++ b/pkgs/servers/couchpotato/default.nix
@@ -3,7 +3,7 @@
with pythonPackages;
buildPythonApplication rec {
- name = "couchpotato-${version}";
+ pname = "couchpotato";
version = "3.0.1";
disabled = isPy3k;
diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix
index 1c093facde5c..24e607f4b00c 100644
--- a/pkgs/servers/dante/default.nix
+++ b/pkgs/servers/dante/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pam, libkrb5, cyrus_sasl, miniupnpc }:
stdenv.mkDerivation rec {
- name = "dante-${version}";
+ pname = "dante";
version = "1.4.2";
src = fetchurl {
- url = "https://www.inet.no/dante/files/${name}.tar.gz";
+ url = "https://www.inet.no/dante/files/${pname}-${version}.tar.gz";
sha256 = "1bfafnm445afrmyxvvcl8ckq0p59yzykmr3y8qvryzrscd85g8ms";
};
diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix
index 93db472270e2..29d00caa0236 100644
--- a/pkgs/servers/demoit/default.nix
+++ b/pkgs/servers/demoit/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
}:
-buildGoPackage rec {
+buildGoPackage {
pname = "demoit";
version = "unstable-2019-05-10";
goPackagePath = "github.com/dgageot/demoit";
diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix
index 5056df06e598..489f2e297bb4 100644
--- a/pkgs/servers/dgraph/default.nix
+++ b/pkgs/servers/dgraph/default.nix
@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "dgraph-${version}";
- version = "0.8.2";
+ pname = "dgraph";
+ version = "1.0.17";
goPackagePath = "github.com/dgraph-io/dgraph";
@@ -10,32 +10,26 @@ buildGoPackage rec {
owner = "dgraph-io";
repo = "dgraph";
rev = "v${version}";
- sha256 = "0zc5bda8m2srjbk0gy1nnm0bya8if0kmk1szqr1qv3xifdzmi4nf";
+ sha256 = "05z1xwbd76q49zyqahh9krvq78dgkzr22qc6srr4djds0l7y6x5i";
};
- extraOutputsToInstall = [ "dashboard" ];
+ # see licensing
+ buildFlags = [ "-tags oss" ];
goDeps = ./deps.nix;
- subPackages = [ "cmd/dgraph" "cmd/dgraphloader" "cmd/bulkloader"];
-
- # let's move the dashboard to a different output, to prevent $bin from
- # depending on $out
- # TODO: provide a proper npm application for the dashboard.
- postPatch = ''
- mv dashboard/* $dashboard
- '';
+ subPackages = [ "dgraph"];
preBuild = ''
export buildFlagsArray="-ldflags=\
- -X github.com/dgraph-io/dgraph/x.dgraphVersion=${version} \
- -X github.com/dgraph-io/dgraph/cmd/dgraph/main.uiDir=$dashboard/src/assets/"
+ -X github.com/dgraph-io/dgraph/x.dgraphVersion=${version}"
'';
meta = {
homepage = "https://dgraph.io/";
description = "Fast, Distributed Graph DB";
maintainers = with stdenv.lib.maintainers; [ sigma ];
- license = stdenv.lib.licenses.agpl3;
+ # Apache 2.0 because we use only build tag "oss"
+ license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/servers/dgraph/deps.nix b/pkgs/servers/dgraph/deps.nix
index 89e00e0d8cb3..602233d635e6 100644
--- a/pkgs/servers/dgraph/deps.nix
+++ b/pkgs/servers/dgraph/deps.nix
@@ -1,11 +1,47 @@
[
+ {
+ goPackagePath = "cloud.google.com/go";
+ fetch = {
+ type = "git";
+ url = "https://code.googlesource.com/gocloud";
+ rev = "v0.34.0";
+ sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai";
+ };
+ }
+ {
+ goPackagePath = "contrib.go.opencensus.io/exporter/jaeger";
+ fetch = {
+ type = "git";
+ url = "https://github.com/census-ecosystem/opencensus-go-exporter-jaeger";
+ rev = "v0.1.0";
+ sha256 = "0dhf0fhjfk8m6zx7xys5mj51c8gxvlahi4y5fx8l7b7b56bh1rmy";
+ };
+ }
+ {
+ goPackagePath = "contrib.go.opencensus.io/exporter/prometheus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/census-ecosystem/opencensus-go-exporter-prometheus";
+ rev = "6bf73eaafbe9";
+ sha256 = "1509l1xcgp662j7rglmrs35innpbi2s0r14vj9ps6d55j42kifm0";
+ };
+ }
{
goPackagePath = "github.com/AndreasBriese/bbloom";
fetch = {
type = "git";
url = "https://github.com/AndreasBriese/bbloom";
- rev = "28f7e881ca57bc00e028f9ede9f0d9104cfeef5e";
- sha256 = "03cqhqvdz8c9by5w5ls4kwnnwlm6b2kkslc6m120fanw1lgamfzp";
+ rev = "e2d15f34fcf9";
+ sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds";
+ };
+ }
+ {
+ goPackagePath = "github.com/BurntSushi/toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/toml";
+ rev = "v0.3.1";
+ sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
};
}
{
@@ -13,26 +49,44 @@
fetch = {
type = "git";
url = "https://github.com/MakeNowJust/heredoc";
- rev = "1d91351acdc1cb2f2c995864674b754134b86ca7";
+ rev = "1d91351acdc1";
sha256 = "0ia1r8ibqmx6zv3wmsvgkpqlhwk79z9l38nzp4gd4f1kcb46856x";
};
}
+ {
+ goPackagePath = "github.com/apache/thrift";
+ fetch = {
+ type = "git";
+ url = "https://github.com/apache/thrift";
+ rev = "v0.12.0";
+ sha256 = "0g2g61rs189nimg3631wxfwdx12dsdz70qvncczlyvn34pcj7yby";
+ };
+ }
+ {
+ goPackagePath = "github.com/armon/consul-api";
+ fetch = {
+ type = "git";
+ url = "https://github.com/armon/consul-api";
+ rev = "eb2c6b5be1b6";
+ sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";
+ };
+ }
{
goPackagePath = "github.com/beorn7/perks";
fetch = {
type = "git";
url = "https://github.com/beorn7/perks";
- rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
- sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+ rev = "v1.0.0";
+ sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
};
}
{
- goPackagePath = "github.com/bkaradzic/go-lz4";
+ goPackagePath = "github.com/bgentry/speakeasy";
fetch = {
type = "git";
- url = "https://github.com/bkaradzic/go-lz4";
- rev = "7224d8d8f27ef618c0a95f1ae69dbb0488abc33a";
- sha256 = "10lmya17vdqg2pvqni0p73iahni48s1v11ya9a0hcz4jh5vw4dkb";
+ url = "https://github.com/bgentry/speakeasy";
+ rev = "v0.1.0";
+ sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s";
};
}
{
@@ -40,17 +94,8 @@
fetch = {
type = "git";
url = "https://github.com/blevesearch/bleve";
- rev = "a7ebb8480579777c6cd1c4750d2e6b5ff2b49bdd";
- sha256 = "121jhd158slf4050kmghz25jrvv7gbsan31wr0nxyw9z32lyf6yx";
- };
- }
- {
- goPackagePath = "github.com/blevesearch/blevex";
- fetch = {
- type = "git";
- url = "https://github.com/blevesearch/blevex";
- rev = "507dcd576550f9f3260f11495ba2de4e96773a3e";
- sha256 = "0i9azysvia99fjpx525qnc5rcgv45hfvl3zcs58gvgqyxpzpc78z";
+ rev = "e1f5e6cdcd76";
+ sha256 = "1b2iip9vz71lqvjmj8v21sisk0z2gdsjd5v9750v3q4a3ik3x8m2";
};
}
{
@@ -58,7 +103,7 @@
fetch = {
type = "git";
url = "https://github.com/blevesearch/go-porterstemmer";
- rev = "23a2c8e5cf1f380f27722c6d2ae8896431dc7d0e";
+ rev = "v1.0.2";
sha256 = "0rcfbrad79xd114h3dhy5d3zs3b5bcgqwm3h5ih1lk69zr9wi91d";
};
}
@@ -67,17 +112,26 @@
fetch = {
type = "git";
url = "https://github.com/blevesearch/segment";
- rev = "762005e7a34fd909a84586299f1dd457371d36ee";
+ rev = "762005e7a34f";
sha256 = "1nrm145sm0xlhqy3d12yipnb16ikjz9ykjcskmkgm7vjm47xkmfl";
};
}
{
- goPackagePath = "github.com/cockroachdb/cmux";
+ goPackagePath = "github.com/blevesearch/snowballstem";
fetch = {
type = "git";
- url = "https://github.com/cockroachdb/cmux";
- rev = "30d10be492927e2dcae0089c374c455d42414fcb";
- sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx";
+ url = "https://github.com/blevesearch/snowballstem";
+ rev = "26b06a2c243d";
+ sha256 = "096wgbpb7qyx055451gam3zb26acaiazjmd58av7ykslmb7wa5gm";
+ };
+ }
+ {
+ goPackagePath = "github.com/client9/misspell";
+ fetch = {
+ type = "git";
+ url = "https://github.com/client9/misspell";
+ rev = "v0.3.4";
+ sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
};
}
{
@@ -85,7 +139,7 @@
fetch = {
type = "git";
url = "https://github.com/codahale/hdrhistogram";
- rev = "3a0bb77429bd3a61596f5e8a3172445844342120";
+ rev = "3a0bb77429bd";
sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57";
};
}
@@ -94,8 +148,53 @@
fetch = {
type = "git";
url = "https://github.com/coreos/etcd";
- rev = "9d43462d174c664f5edf313dec0de31e1ef4ed47";
- sha256 = "0qxqjxhhciaacag1jz2rlncmlgw861ig2yx993ylvfm30jvyj2cj";
+ rev = "v3.3.10";
+ sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-etcd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-etcd";
+ rev = "v2.0.0";
+ sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-semver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-semver";
+ rev = "v0.2.0";
+ sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-systemd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-systemd";
+ rev = "39ca1b05acc7";
+ sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/pkg";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/pkg";
+ rev = "3ac0863d7acf";
+ sha256 = "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l";
+ };
+ }
+ {
+ goPackagePath = "github.com/cpuguy83/go-md2man";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cpuguy83/go-md2man";
+ rev = "v1.0.10";
+ sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i";
};
}
{
@@ -103,8 +202,8 @@
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
- rev = "6d212800a42e8ab5c146b8ace3490ee17e5225f9";
- sha256 = "01i0n1s4j7khb7n6mz2wymniz37q0vbzkgfv7rbi6p9hpg227q93";
+ rev = "v1.1.1";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
@@ -112,8 +211,26 @@
fetch = {
type = "git";
url = "https://github.com/dgraph-io/badger";
- rev = "64df7f57d9ee20d7b28de4a3eea90bf8d7310a77";
- sha256 = "1ikgzn2l62kb238n0wm6s95py5ypv71p09w7zyvzkjf34x675mzz";
+ rev = "v1.6.0";
+ sha256 = "1vzibjqhb10q6s2chbzlwndij2d9ybjnq7h28hx4akr119avd0d5";
+ };
+ }
+ {
+ goPackagePath = "github.com/dgraph-io/dgo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dgraph-io/dgo";
+ rev = "f8969c1ddf8f";
+ sha256 = "08ycdpxry15r9vgaqrqxcdbw8z216asqarhxq76smi5a82mr56qa";
+ };
+ }
+ {
+ goPackagePath = "github.com/dgrijalva/jwt-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dgrijalva/jwt-go";
+ rev = "v3.2.0";
+ sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
};
}
{
@@ -121,8 +238,71 @@
fetch = {
type = "git";
url = "https://github.com/dgryski/go-farm";
- rev = "d1e51a4af19092715f4ce7d8257fe5bc8f8be727";
- sha256 = "00iijjzdg8g6jbzhdbfw8s2rf0k25gxw4x7h7r6mkxcq18n69182";
+ rev = "6a90982ecee2";
+ sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix";
+ };
+ }
+ {
+ goPackagePath = "github.com/dustin/go-humanize";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dustin/go-humanize";
+ rev = "v1.0.0";
+ sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
+ };
+ }
+ {
+ goPackagePath = "github.com/fatih/color";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fatih/color";
+ rev = "v1.7.0";
+ sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
+ };
+ }
+ {
+ goPackagePath = "github.com/fsnotify/fsnotify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fsnotify/fsnotify";
+ rev = "v1.4.7";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "github.com/ghodss/yaml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ghodss/yaml";
+ rev = "25d852aebe32";
+ sha256 = "1w9yq0bxzygc4qwkwwiy7k1k1yviaspcqqv18255k2xkjv5ipccz";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-ini/ini";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-ini/ini";
+ rev = "v1.39.0";
+ sha256 = "0j7pyl5v7xfzkhsyz193iq56ilan69pp11g2n5jw1k4h4g8s4k9b";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-kit/kit";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-kit/kit";
+ rev = "v0.8.0";
+ sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-logfmt/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-logfmt/logfmt";
+ rev = "v0.4.0";
+ sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9";
};
}
{
@@ -130,8 +310,8 @@
fetch = {
type = "git";
url = "https://github.com/gogo/protobuf";
- rev = "e57a569e1882958f6b188cb42231d6db87701f2a";
- sha256 = "0r3jpmp6wp4xyrh1ikr8iqld3rg4r1yhv99zxw5zd7d2zprw9yfc";
+ rev = "v1.2.0";
+ sha256 = "1c3y5m08mvrgvlw0kb9pldh3kkqcj99pa8gqmk1g3hp8ih3b2dv0";
};
}
{
@@ -139,17 +319,53 @@
fetch = {
type = "git";
url = "https://github.com/golang/geo";
- rev = "31fb0106dc4a947e5aaee1fe186e56447f839510";
+ rev = "31fb0106dc4a";
sha256 = "00w4kwm98hrgr3ggfdk1h7qa5gp00z4s0j0iwgwd9rgadb59kb2c";
};
}
+ {
+ goPackagePath = "github.com/golang/glog";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/glog";
+ rev = "23def4e6c14b";
+ sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/groupcache";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/groupcache";
+ rev = "02826c3e7903";
+ sha256 = "0w46bsllddfij66nrg8jbfjsr54birvfww8a2fj9fmgyig5syn2x";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/mock";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/mock";
+ rev = "v1.1.1";
+ sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy";
+ };
+ }
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
- rev = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef";
- sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib";
+ rev = "v1.3.2";
+ sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/btree";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/btree";
+ rev = "e89373fe6b4a";
+ sha256 = "0jlkjjlf8ilifgsb2bv0jfgl4cxl1bypx7a6pjkwz3xf6k8jd7mj";
};
}
{
@@ -157,26 +373,305 @@
fetch = {
type = "git";
url = "https://github.com/google/codesearch";
- rev = "a45d81b686e85d01f2838439deaf72126ccd5a96";
+ rev = "v1.0.0";
sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny";
};
}
+ {
+ goPackagePath = "github.com/google/go-cmp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-cmp";
+ rev = "v0.3.0";
+ sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/uuid";
+ rev = "v1.0.0";
+ sha256 = "1922bjrnx66692dm0rrc1ckmznsaqx920ww4jzsds3xzrwf15mqv";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/websocket";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/websocket";
+ rev = "4201258b820c";
+ sha256 = "1kpdg3m46kp15ixl9ahhchhadyiblz0qpcxzylp8jhffc1rnxjb7";
+ };
+ }
+ {
+ goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc-ecosystem/go-grpc-middleware";
+ rev = "f849b5445de4";
+ sha256 = "0hscypgj0nd1407jp6y4qrnrr0mrhc4wgxz9b3mj1cs3pkvi61vc";
+ };
+ }
+ {
+ goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc-ecosystem/go-grpc-prometheus";
+ rev = "v1.2.0";
+ sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl";
+ };
+ }
+ {
+ goPackagePath = "github.com/grpc-ecosystem/grpc-gateway";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc-ecosystem/grpc-gateway";
+ rev = "v1.4.1";
+ sha256 = "0lqpwwyhgw12iw2pfynb8wb06dqfj26rr55sh1v02nvrxbpzfp0a";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/golang-lru";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/golang-lru";
+ rev = "v0.5.0";
+ sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/hcl";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/hcl";
+ rev = "v1.0.0";
+ sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
+ };
+ }
+ {
+ goPackagePath = "github.com/hpcloud/tail";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hpcloud/tail";
+ rev = "v1.0.0";
+ sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
+ };
+ }
+ {
+ goPackagePath = "github.com/inconshreveable/mousetrap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/inconshreveable/mousetrap";
+ rev = "v1.0.0";
+ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+ };
+ }
+ {
+ goPackagePath = "github.com/jonboulle/clockwork";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jonboulle/clockwork";
+ rev = "v0.1.0";
+ sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl";
+ };
+ }
+ {
+ goPackagePath = "github.com/json-iterator/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/json-iterator/go";
+ rev = "v1.1.6";
+ sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r";
+ };
+ }
+ {
+ goPackagePath = "github.com/julienschmidt/httprouter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/julienschmidt/httprouter";
+ rev = "v1.2.0";
+ sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
+ };
+ }
+ {
+ goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+ fetch = {
+ type = "git";
+ url = "https://github.com/konsorten/go-windows-terminal-sequences";
+ rev = "v1.0.1";
+ sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/logfmt";
+ rev = "b84e30acd515";
+ sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pty";
+ rev = "v1.0.0";
+ sha256 = "1c8xbp4d4fbmvml70nc7w3jii2fxv4q0141d2zmzi480d5h8xvrv";
+ };
+ }
+ {
+ goPackagePath = "github.com/magiconair/properties";
+ fetch = {
+ type = "git";
+ url = "https://github.com/magiconair/properties";
+ rev = "v1.8.0";
+ sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-colorable";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-colorable";
+ rev = "v0.0.9";
+ sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "v0.0.4";
+ sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-runewidth";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-runewidth";
+ rev = "v0.0.2";
+ sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
+ };
+ }
{
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
fetch = {
type = "git";
url = "https://github.com/matttproud/golang_protobuf_extensions";
- rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+ rev = "v1.0.1";
sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
};
}
+ {
+ goPackagePath = "github.com/minio/minio-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/minio/minio-go";
+ rev = "774475480ffe";
+ sha256 = "1rnzvij1cnqb3brwpyv79bdbaa1sgygyw1x84376fli2pj0n3572";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/go-homedir";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/go-homedir";
+ rev = "v1.1.0";
+ sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/mapstructure";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/mapstructure";
+ rev = "v1.1.2";
+ sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
+ };
+ }
+ {
+ goPackagePath = "github.com/modern-go/concurrent";
+ fetch = {
+ type = "git";
+ url = "https://github.com/modern-go/concurrent";
+ rev = "bacd9c7ef1dd";
+ sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+ };
+ }
+ {
+ goPackagePath = "github.com/modern-go/reflect2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/modern-go/reflect2";
+ rev = "v1.0.1";
+ sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
+ };
+ }
+ {
+ goPackagePath = "github.com/mwitkow/go-conntrack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mwitkow/go-conntrack";
+ rev = "cc309e4a2223";
+ sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
+ };
+ }
+ {
+ goPackagePath = "github.com/olekukonko/tablewriter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/olekukonko/tablewriter";
+ rev = "a0225b3f23b5";
+ sha256 = "0bp9r6xzy6d3p7l2hjmvr25y3rp3p8c9xv1agkllkksm45ng6681";
+ };
+ }
+ {
+ goPackagePath = "github.com/onsi/ginkgo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/onsi/ginkgo";
+ rev = "v1.7.0";
+ sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg";
+ };
+ }
+ {
+ goPackagePath = "github.com/onsi/gomega";
+ fetch = {
+ type = "git";
+ url = "https://github.com/onsi/gomega";
+ rev = "v1.4.3";
+ sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
+ };
+ }
+ {
+ goPackagePath = "github.com/paulmach/go.geojson";
+ fetch = {
+ type = "git";
+ url = "https://github.com/paulmach/go.geojson";
+ rev = "40612a87147b";
+ sha256 = "037j7apv0jljhvn6vk85nhy0ql862nxr5zbmi6a30qdfclrf2q4k";
+ };
+ }
+ {
+ goPackagePath = "github.com/pelletier/go-toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pelletier/go-toml";
+ rev = "v1.2.0";
+ sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
+ };
+ }
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
- rev = "17b591df37844cde689f4d5813e5cea0927d8dd2";
- sha256 = "1f400f1682h1wdjknlh1ad95rbss09g0ia36a8w102bf2f1qfq8l";
+ rev = "v0.8.1";
+ sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
};
}
{
@@ -184,7 +679,7 @@
fetch = {
type = "git";
url = "https://github.com/pkg/profile";
- rev = "5b67d428864e92711fcbd2f8629456121a56d91f";
+ rev = "v1.2.1";
sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr";
};
}
@@ -193,7 +688,7 @@
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
- rev = "792786c7400a136282c1664665ae0a8db921c6c2";
+ rev = "v1.0.0";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
@@ -202,8 +697,8 @@
fetch = {
type = "git";
url = "https://github.com/prometheus/client_golang";
- rev = "310ce84375bb84c5cbbf0d05069c92daa5673740";
- sha256 = "11awb5bjkwqj7va3v7fgniwqkjqhmhjkp01rdvnv4xfp1laxwn7v";
+ rev = "v1.0.0";
+ sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6";
};
}
{
@@ -211,8 +706,8 @@
fetch = {
type = "git";
url = "https://github.com/prometheus/client_model";
- rev = "6f3806018612930941127f2a7c6c453ba2c527d2";
- sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4";
+ rev = "fd36f4220a90";
+ sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
};
}
{
@@ -220,8 +715,8 @@
fetch = {
type = "git";
url = "https://github.com/prometheus/common";
- rev = "0866df4b85a18d652b6965be022d007cdf076822";
- sha256 = "0zw4rxs6zh9vgxz5wwhjnwa6mgac8jh7mb63viircgh08r889chp";
+ rev = "v0.6.0";
+ sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l";
};
}
{
@@ -229,8 +724,98 @@
fetch = {
type = "git";
url = "https://github.com/prometheus/procfs";
- rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2";
- sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np";
+ rev = "v0.0.2";
+ sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
+ };
+ }
+ {
+ goPackagePath = "github.com/russross/blackfriday";
+ fetch = {
+ type = "git";
+ url = "https://github.com/russross/blackfriday";
+ rev = "v1.5.2";
+ sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c";
+ };
+ }
+ {
+ goPackagePath = "github.com/sirupsen/logrus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sirupsen/logrus";
+ rev = "v1.2.0";
+ sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
+ };
+ }
+ {
+ goPackagePath = "github.com/soheilhy/cmux";
+ fetch = {
+ type = "git";
+ url = "https://github.com/soheilhy/cmux";
+ rev = "v0.1.4";
+ sha256 = "1f736g68d9vwlyfb6g0fxkr0r875369xafk30cz8kaq5niaqwv0h";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/afero";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/afero";
+ rev = "v1.1.2";
+ sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cast";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cast";
+ rev = "v1.3.0";
+ sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cobra";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cobra";
+ rev = "v0.0.5";
+ sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/jwalterweatherman";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/jwalterweatherman";
+ rev = "v1.0.0";
+ sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/pflag";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/pflag";
+ rev = "v1.0.3";
+ sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/viper";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/viper";
+ rev = "v1.3.2";
+ sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/objx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/objx";
+ rev = "v0.1.1";
+ sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
};
}
{
@@ -238,17 +823,17 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
- rev = "976c720a22c8eb4eb6a0b4348ad85ad12491a506";
- sha256 = "0a2gxvqzacrj9k8h022zhr8fchhn9afc6a511m07j71dzw9g4y3m";
+ rev = "v1.3.0";
+ sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
};
}
{
- goPackagePath = "github.com/tebeka/snowball";
+ goPackagePath = "github.com/tmc/grpc-websocket-proxy";
fetch = {
type = "git";
- url = "https://github.com/tebeka/snowball";
- rev = "6b06bd306c4e4442a63e546752278920ae487934";
- sha256 = "110akijkb55k5h7m6mra8fircvi4sxd5xq7lcjgyiqj96srq8v2k";
+ url = "https://github.com/tmc/grpc-websocket-proxy";
+ rev = "89b8d40f7ca8";
+ sha256 = "1bg6m0cycy5sww175zkbnhi9lvzb08iicc8xka8klrgaa9mc5nsk";
};
}
{
@@ -256,17 +841,134 @@
fetch = {
type = "git";
url = "https://github.com/twpayne/go-geom";
- rev = "6753ad11e46b04e21b3f286b342e73a8c4be8216";
+ rev = "6753ad11e46b";
sha256 = "0qyrdnp7j7lmj0qb0p7k45m757zvbwn78s1apiy46zfnb5415df1";
};
}
+ {
+ goPackagePath = "github.com/ugorji/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ugorji/go";
+ rev = "e444a5086c43";
+ sha256 = "1ri318sf41fdzhj186dg96pixvlhmk1255ymccc9zfayy3z6li3h";
+ };
+ }
+ {
+ goPackagePath = "github.com/urfave/cli";
+ fetch = {
+ type = "git";
+ url = "https://github.com/urfave/cli";
+ rev = "v1.20.0";
+ sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
+ };
+ }
+ {
+ goPackagePath = "github.com/willf/bitset";
+ fetch = {
+ type = "git";
+ url = "https://github.com/willf/bitset";
+ rev = "71fa2377963f";
+ sha256 = "092lpf2qm3zyvm35inam4b7y3kjpvpx7ylkgn31x6wbxfbamp37a";
+ };
+ }
+ {
+ goPackagePath = "github.com/xiang90/probing";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xiang90/probing";
+ rev = "43a291ad63a2";
+ sha256 = "1z22ms16j5j42775mf31isanwx2pwr1d8wqw8006dczjv36qnz5i";
+ };
+ }
+ {
+ goPackagePath = "github.com/xordataexchange/crypt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xordataexchange/crypt";
+ rev = "b2862e3d0a77";
+ sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y";
+ };
+ }
+ {
+ goPackagePath = "go.etcd.io/bbolt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/etcd-io/bbolt";
+ rev = "v1.3.2";
+ sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2";
+ };
+ }
+ {
+ goPackagePath = "go.etcd.io/etcd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/etcd-io/etcd";
+ rev = "a943ad0ee4c9";
+ sha256 = "1p0s383qw7rdcg2zs5ysk70dkjhpyyqn2qgqgbxdvrv5cjgna1hm";
+ };
+ }
+ {
+ goPackagePath = "go.opencensus.io";
+ fetch = {
+ type = "git";
+ url = "https://github.com/census-instrumentation/opencensus-go";
+ rev = "v0.21.0";
+ sha256 = "14s0a12xdzjvad0dgksgv8m3hh7nc585abvjkvyk6r67a29lxj6x";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/atomic";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/atomic";
+ rev = "v1.3.2";
+ sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/multierr";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/multierr";
+ rev = "v1.1.0";
+ sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
+ };
+ }
+ {
+ goPackagePath = "go.uber.org/zap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/uber-go/zap";
+ rev = "v1.9.1";
+ sha256 = "19a1i6fipqj8w7h6qjmg1sfbg18yzzqsgfn0vmr55hkgc0y6nmny";
+ };
+ }
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
- rev = "22ddb68eccda408bbf17759ac18d3120ce0d4f3f";
- sha256 = "07ks6qal02iz24vv54qyb90wmsg9vwqc14abf68rakprpy26qwsg";
+ rev = "c2843e01d9a2";
+ sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/exp";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/exp";
+ rev = "509febef88a4";
+ sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/lint";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/lint";
+ rev = "5614ed5bae6f";
+ sha256 = "0fzn0zjv0x92xvfdq3a0v9w5sgkhr7hxkfy9zaqi8i57807z8bnx";
};
}
{
@@ -274,8 +976,26 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "d1e1b351919c6738fdeb9893d5c998b161464f0c";
- sha256 = "0qzbfah03z992zyygfp7imjjas5np2gcar5aanx5y3av5g68ggjp";
+ rev = "da137c7871d7";
+ sha256 = "1qsiyr3irmb6ii06hivm9p2c7wqyxczms1a9v1ss5698yjr3fg47";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/oauth2";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/oauth2";
+ rev = "e64efc72b421";
+ sha256 = "0djvwz2avx7knsjbl434vw1wqbrg53xp1kh599gfixn5icrggz4m";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "e225da77a7e6";
+ sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p";
};
}
{
@@ -283,8 +1003,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "abf9c25f54453410d0c6668e519582a9e1115027";
- sha256 = "0dmpqjfif2zg6776d366js60k21g81jvsr3jm9dc7fv7w3282al4";
+ rev = "04f50cda93cb";
+ sha256 = "0hmfsz9y1ingwsn482hlzzmzs7kr3cklm0ana0mbdk70isw2bxnw";
};
}
{
@@ -292,8 +1012,44 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
- rev = "1cbadb444a806fd9430d14ad08967ed91da4fa0a";
- sha256 = "0ih9ysagh4ylj08393497sscf3yziybc6acg4mrh0wa7mld75j56";
+ rev = "v0.3.0";
+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/time";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/time";
+ rev = "fbb02b2291d2";
+ sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/tools";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/tools";
+ rev = "e65039ee4138";
+ sha256 = "0c094599cf70wdrms49a3879qkq122pqlp2av444gs2pvc8apdcx";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/api";
+ fetch = {
+ type = "git";
+ url = "https://code.googlesource.com/google-api-go-client";
+ rev = "v0.3.2";
+ sha256 = "1x1nbsd3gjgmv833gpgq79m5d15p31k1dfn8gglkvjanjiin747j";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/appengine";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/appengine";
+ rev = "v1.4.0";
+ sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn";
};
}
{
@@ -301,8 +1057,8 @@
fetch = {
type = "git";
url = "https://github.com/google/go-genproto";
- rev = "1e559d0a00eef8a9a43151db4665280bd8dd5886";
- sha256 = "1dfm8zd9mif1aswks79wgyi7n818s5brbdnnrrlg79whfhaf20hd";
+ rev = "5fe7a883aa19";
+ sha256 = "0qjkwig0r42q0j2qv57s4ahsgmmp41dz3ih3rnaqg0619n5w7lbs";
};
}
{
@@ -310,8 +1066,71 @@
fetch = {
type = "git";
url = "https://github.com/grpc/grpc-go";
- rev = "f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3";
- sha256 = "1li8rn2s4f8qc77npamlm2ijin44scb8vvd8c4cr0l7za2m89jfn";
+ rev = "v1.19.0";
+ sha256 = "1znqwpj7ix3dpzx4zch0q70sdl3z5lvbb7v3q4i8sf8kas3yv71v";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/airbrake/gobrake.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/airbrake/gobrake.v2";
+ rev = "v2.0.9";
+ sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/alecthomas/kingpin.v2";
+ rev = "v2.2.6";
+ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/check.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/check.v1";
+ rev = "20d25e280405";
+ sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/cheggaaa/pb.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/cheggaaa/pb.v1";
+ rev = "v1.0.25";
+ sha256 = "0vxqiw6f3xyv0zy3g4lksf8za0z8i0hvfpw92hqimsy84f79j3dp";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/fsnotify.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/fsnotify.v1";
+ rev = "v1.4.7";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2";
+ rev = "v2.1.2";
+ sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/tomb.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/tomb.v1";
+ rev = "dd632973f1e7";
+ sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
};
}
{
@@ -319,8 +1138,17 @@
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
- rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0";
- sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam";
+ rev = "v2.2.2";
+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
+ };
+ }
+ {
+ goPackagePath = "honnef.co/go/tools";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dominikh/go-tools";
+ rev = "c2f93a96b099";
+ sha256 = "07lg29aiap80ca9f201jzng9vjr168cv3qmvjmbd7v5pmww9kmr8";
};
}
]
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index c45098b2ae09..b4ad70f8277f 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }:
stdenv.mkDerivation rec {
- name = "dictd-${version}";
+ pname = "dictd";
version = "1.12.1";
src = fetchurl {
diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix
index 065218a5b95d..442ef45d1bff 100644
--- a/pkgs/servers/dict/dictd-db.nix
+++ b/pkgs/servers/dict/dictd-db.nix
@@ -7,7 +7,7 @@ let
makeDictdDB src name "{.,bin}" locale;
makeDictdDB = src: _name: _subdir: _locale:
- stdenv.mkDerivation rec {
+ stdenv.mkDerivation {
name = "dictd-db-${_name}";
inherit src;
locale = _locale;
diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix
index 13e4757fe89e..b7dbf04026d2 100644
--- a/pkgs/servers/dict/dictd-wiktionary.nix
+++ b/pkgs/servers/dict/dictd-wiktionary.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "20161001";
- name = "dict-db-wiktionary-${version}";
+ pname = "dict-db-wiktionary";
data = fetchurl {
url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
sha256 = "0g3k7kxp2nzg0v56i4cz253af3aqvhn1lwkys2fnam51cn3yqm7m";
diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix
index 8a1bb6313ad2..2c97101d9cbb 100644
--- a/pkgs/servers/dict/dictd-wordnet.nix
+++ b/pkgs/servers/dict/dictd-wordnet.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "542";
- name = "dict-db-wordnet-${version}";
+ pname = "dict-db-wordnet";
buildInputs = [python wordnet];
convert = ./wordnet_structures.py;
diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix
index f5c0cf230af3..4ac4328c35fc 100644
--- a/pkgs/servers/dict/libmaa.nix
+++ b/pkgs/servers/dict/libmaa.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.3.2";
- name = "libmaa-${version}";
+ pname = "libmaa";
src = fetchurl {
url = "mirror://sourceforge/dict/libmaa-${version}.tar.gz";
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
buildInputs = [ libtool ];
# configureFlags = [ "--datadir=/run/current-system/share/dictd" ];
+ NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation";
+
meta = with stdenv.lib; {
description = "Dict protocol server and client";
maintainers = [ ];
diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix
index aefa3af83363..cf81d9b4b9af 100644
--- a/pkgs/servers/diod/default.nix
+++ b/pkgs/servers/diod/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "diod-${version}";
+ pname = "diod";
version = "1.0.24";
src = fetchurl {
- url = "https://github.com/chaos/diod/releases/download/${version}/${name}.tar.gz";
+ url = "https://github.com/chaos/diod/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "17wckwfsqj61yixz53nwkc35z66arb1x3napahpi64m7q68jn7gl";
};
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 0b40b99cfc16..af914ae6cd72 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -11,10 +11,11 @@ assert enablePython -> python3 != null;
let version = "9.14.4"; in
stdenv.mkDerivation rec {
- name = "bind-${version}";
+ pname = "bind";
+ inherit version;
src = fetchurl {
- url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
+ url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz";
sha256 = "0gxqws7ml15lwkjw9mdcd759gv5kk3s9m17j3vrp9448ls1gnbii";
};
diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index 214c3e91f0ef..def78223f127 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "coredns-${version}";
+ pname = "coredns";
version = "1.3.1";
goPackagePath = "github.com/coredns/coredns";
diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix
index 6757542050af..cb004a596d22 100644
--- a/pkgs/servers/dns/dnsdist/default.nix
+++ b/pkgs/servers/dns/dnsdist/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, systemd
, boost, libsodium, libedit, re2
, net_snmp, lua, protobuf, openssl }: stdenv.mkDerivation rec {
- name = "dnsdist-${version}";
+ pname = "dnsdist";
version = "1.3.2";
src = fetchurl {
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 718028b2bc0c..8191bf5acbf1 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -6,7 +6,7 @@ let inherit (stdenv.lib) optional optionals; in
# Note: ATM only the libraries have been tested in nixpkgs.
stdenv.mkDerivation rec {
- name = "knot-dns-${version}";
+ pname = "knot-dns";
version = "2.8.3";
src = fetchurl {
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 1d8896bfc10f..22b1f2a67e2c 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -22,11 +22,11 @@ exportLuaPathsFor = luaPkgs: ''
'';
unwrapped = stdenv.mkDerivation rec {
- name = "knot-resolver-${version}";
+ pname = "knot-resolver";
version = "4.2.0";
src = fetchurl {
- url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
+ url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
sha256 = "b37ff9ceefbaa4e4527d183fb1bbb63e641d34d9889ce92715128bc1423c7ef4";
};
diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 4fa32050c682..531e00e578f8 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -15,11 +15,12 @@
}:
stdenv.mkDerivation rec {
- name = "nsd-4.2.1";
+ pname = "nsd";
+ version = "4.2.2";
src = fetchurl {
- url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
- sha256 = "07w753lfrmpf2rv0115pak2zqywv57mq6bwzwwmypc4cjsihwz6i";
+ url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz";
+ sha256 = "1ys608jyp5scc957q4brm094c97sxlwymina7d2nvzi51aa37cw3";
};
prePatch = ''
diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix
index fcddd569b361..0a584ce1acaa 100644
--- a/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/pkgs/servers/dns/pdns-recursor/default.nix
@@ -7,7 +7,7 @@ assert enableProtoBuf -> protobuf != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "pdns-recursor-${version}";
+ pname = "pdns-recursor";
version = "4.2.0";
src = fetchurl {
diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
index 3c63b6d8eb75..1b23f6520215 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig
-, boost, libyamlcpp, libsodium, sqlite, protobuf, botan2, libressl
+, boost, libyamlcpp, libsodium, sqlite, protobuf, botan2, openssl
, mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC
}:
stdenv.mkDerivation rec {
- name = "powerdns-${version}";
+ pname = "powerdns";
version = "4.1.13";
src = fetchurl {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip
- libyamlcpp libsodium curl opendbx unixODBC botan2 libressl
+ libyamlcpp libsodium curl opendbx unixODBC botan2 openssl
];
# nix destroy with-modules arguments, when using configureFlags
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
"--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote"
--with-sqlite3
--with-socketdir=/var/lib/powerdns
- --with-libcrypto=${libressl.dev}
+ --with-libcrypto=${openssl.dev}
--enable-libsodium
--enable-botan
--enable-tools
diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix
index e71abb8bc00f..b3402933f9fe 100644
--- a/pkgs/servers/echoip/default.nix
+++ b/pkgs/servers/echoip/default.nix
@@ -1,25 +1,23 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
- name = "echoip-${version}";
- version = "unstable-2018-11-20";
-
- goPackagePath = "github.com/mpolden/echoip";
+buildGoModule {
+ pname = "echoip";
+ version = "unstable-2019-07-12";
src = fetchFromGitHub {
owner = "mpolden";
repo = "echoip";
- rev = "4bfaf671b9f75a7b2b37543b2991401cbf57f1f0";
- sha256 = "0n5d9i8cc5lqgy5apqd3zhyl3h1xjacf612z8xpvbm75jnllcvxy";
+ rev = "fb5fac92d2173c2a5b07ed4ecc7b5fefe8484ed2";
+ sha256 = "17gkh1qfxasvxy25lmjdwk5fsjkcp7lmw9si3xzf01m7qnj5zi4b";
};
- goDeps = ./deps.nix;
+ modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly";
- outputs = [ "bin" "out" ];
+ outputs = [ "out" "index" ];
postInstall = ''
- mkdir -p $out
- cp $src/index.html $out/index.html
+ mkdir -p $index
+ cp $src/index.html $index/index.html
'';
meta = with lib; {
diff --git a/pkgs/servers/echoip/deps.nix b/pkgs/servers/echoip/deps.nix
deleted file mode 100644
index 4e4f0799bdae..000000000000
--- a/pkgs/servers/echoip/deps.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
-
- {
- goPackagePath = "github.com/davecgh/go-spew";
- fetch = {
- type = "git";
- url = "https://github.com/davecgh/go-spew";
- rev = "v1.1.1";
- sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
- };
- }
-
- {
- goPackagePath = "github.com/jessevdk/go-flags";
- fetch = {
- type = "git";
- url = "https://github.com/jessevdk/go-flags";
- rev = "v1.4.0";
- sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a";
- };
- }
-
- {
- goPackagePath = "github.com/oschwald/geoip2-golang";
- fetch = {
- type = "FromGitHub";
- owner = "oschwald";
- repo = "geoip2-golang";
- rev = "v1.2.1";
- sha256 = "0zpgpz577rghvgis6ji9l99pq87z5izbgzmnbyn3dy533bayrgpw";
- };
- }
-
- {
- goPackagePath = "github.com/oschwald/maxminddb-golang";
- fetch = {
- type = "git";
- url = "https://github.com/oschwald/maxminddb-golang";
- rev = "v1.2.1";
- sha256 = "0nlip5a2yiig0sv9y3ky4kn8730236wal3zjcs4yfgnw6nxl3rjr";
- };
- }
-
- {
- goPackagePath = "github.com/pmezard/go-difflib";
- fetch = {
- type = "git";
- url = "https://github.com/pmezard/go-difflib";
- rev = "v1.0.0";
- sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
- };
- }
-
- {
- goPackagePath = "github.com/stretchr/testify";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/testify";
- rev = "v1.2.2";
- sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
- };
- }
-
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "37707fdb30a5";
- sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg";
- };
- }
-]
diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix
index d52fdd14301d..5293b18368e7 100644
--- a/pkgs/servers/elasticmq-server-bin/default.nix
+++ b/pkgs/servers/elasticmq-server-bin/default.nix
@@ -3,10 +3,9 @@
stdenv.mkDerivation rec {
pname = "elasticmq-server";
version = "0.14.6";
- name = "${pname}-${version}";
src = fetchurl {
- url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${name}.jar";
+ url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${pname}-${version}.jar";
sha256 = "1cp2pmkc6gx7gr6109jlcphlky5rr6s1wj528r6hyhzdc01sjhhz";
};
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index d3c5555fa6ad..5a693fd75291 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -3,7 +3,7 @@
with lib;
buildGoPackage rec {
- name = "etcd-${version}";
+ pname = "etcd";
version = "3.3.13"; # After updating check that nixos tests pass
rev = "v${version}";
diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix
index 5e2381ada1d1..1e05c856ab5e 100644
--- a/pkgs/servers/exhibitor/default.nix
+++ b/pkgs/servers/exhibitor/default.nix
@@ -1,6 +1,6 @@
{ fetchFromGitHub, maven, jdk, makeWrapper, stdenv, ... }:
stdenv.mkDerivation rec {
- name = "exhibitor-${version}";
+ pname = "exhibitor";
version = "1.5.6";
src = fetchFromGitHub {
diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix
index 8bab12116b02..c8ddcf438f7b 100644
--- a/pkgs/servers/fcgiwrap/default.nix
+++ b/pkgs/servers/fcgiwrap/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkgconfig }:
stdenv.mkDerivation rec {
- name = "fcgiwrap-${version}";
+ pname = "fcgiwrap";
version = "1.1.0";
src = fetchurl {
diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix
index 5ce680e36460..7be7416d04d5 100644
--- a/pkgs/servers/felix/default.nix
+++ b/pkgs/servers/felix/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "apache-felix-${version}";
+ pname = "apache-felix";
version = "5.6.1";
src = fetchurl {
url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz";
diff --git a/pkgs/servers/felix/remoteshell.nix b/pkgs/servers/felix/remoteshell.nix
index 3ac3c98718f7..2fe628db0466 100644
--- a/pkgs/servers/felix/remoteshell.nix
+++ b/pkgs/servers/felix/remoteshell.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.1.2";
- name = "apache-felix-remoteshell-bundle-${version}";
+ pname = "apache-felix-remoteshell-bundle";
src = fetchurl {
url = "http://apache.proserve.nl/felix/org.apache.felix.shell.remote-${version}.jar";
sha256 = "147zw5ppn98wfl3pr32isyb267xm3gwsvdfdvjr33m9g2v1z69aq";
diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix
index d5671921abad..999718160215 100644
--- a/pkgs/servers/fingerd/bsd-fingerd/default.nix
+++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix
@@ -2,7 +2,7 @@
# !!! Duplication: this package is almost exactly the same as `bsd-fingerd'.
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "bsd-fingerd-0.17";
src = fetchurl {
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index caf7d8360f07..40780c9a97b2 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -39,7 +39,7 @@
stdenv.mkDerivation rec {
version = "2.5.7.27050-0";
- name = "firebird-${version}";
+ pname = "firebird";
# enableParallelBuilding = false; build fails
@@ -51,7 +51,6 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--with-serivec-port=${builtins.toString port}"
"--with-service-name=${serviceName}"
- # "--disable-static"
"--with-system-editline"
"--with-fblog=/var/log/firebird"
"--with-fbconf=/etc/firebird"
diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index 87e4a22b0514..ac7733986ce6 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -21,8 +21,8 @@ let
, rev ? "refs/tags/${version}"
, officialRelease ? true
, patches ? []
- }: stdenv.mkDerivation rec {
- name = "foundationdb-${version}";
+ }: stdenv.mkDerivation {
+ pname = "foundationdb";
inherit version;
src = fetchFromGitHub {
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index b29c5298b77d..b3ca7038ebeb 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -29,7 +29,7 @@ in with builtins; {
# Older versions use the bespoke 'vsmake' build system
# ------------------------------------------------------
- foundationdb51 = vsmakeBuild rec {
+ foundationdb51 = vsmakeBuild {
version = "5.1.7";
branch = "release-5.1";
sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06";
@@ -42,7 +42,7 @@ in with builtins; {
];
};
- foundationdb52 = vsmakeBuild rec {
+ foundationdb52 = vsmakeBuild {
version = "5.2.8";
branch = "release-5.2";
sha256 = "1kbmmhk2m9486r4kyjlc7bb3wd50204i0p6dxcmvl6pbp1bs0wlb";
@@ -55,7 +55,7 @@ in with builtins; {
];
};
- foundationdb60 = vsmakeBuild rec {
+ foundationdb60 = vsmakeBuild {
version = "6.0.18";
branch = "release-6.0";
sha256 = "0q1mscailad0z7zf1nypv4g7gx3damfp45nf8nzyq47nsw5gz69p";
@@ -68,7 +68,7 @@ in with builtins; {
# 6.1 and later versions should always use CMake
# ------------------------------------------------------
- foundationdb61 = cmakeBuild rec {
+ foundationdb61 = cmakeBuild {
version = "6.1.10";
branch = "release-6.1";
sha256 = "1v278zlrki3da2i2258j2b4rk4fq6d9bj623z01bjrvmaqxc2gry";
diff --git a/pkgs/servers/foundationdb/python.nix b/pkgs/servers/foundationdb/python.nix
index 55b834c54369..e4256fab0fa9 100644
--- a/pkgs/servers/foundationdb/python.nix
+++ b/pkgs/servers/foundationdb/python.nix
@@ -1,6 +1,6 @@
{ buildPythonPackage, lib, foundationdb }:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "foundationdb";
version = foundationdb.version;
diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix
index 0eb71492be3e..0265e18861e0 100644
--- a/pkgs/servers/foundationdb/vsmake.nix
+++ b/pkgs/servers/foundationdb/vsmake.nix
@@ -12,7 +12,7 @@ let
# hysterical raisins dictate a version of boost this old. however,
# we luckily do not need to build anything, we just need the header
# files.
- boost152 = stdenv49.mkDerivation rec {
+ boost152 = stdenv49.mkDerivation {
name = "boost-headers-1.52.0";
src = fetchurl {
@@ -45,8 +45,8 @@ let
, officialRelease ? true
, patches ? []
- }: stdenv.mkDerivation rec {
- name = "foundationdb-${version}";
+ }: stdenv.mkDerivation {
+ pname = "foundationdb";
inherit version;
src = fetchFromGitHub {
diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix
index ed36b33bdebc..6c6eb2b0c091 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/pkgs/servers/freeradius/default.nix
@@ -42,7 +42,7 @@ assert withRest -> curl != null && withJson;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "freeradius-${version}";
+ pname = "freeradius";
version = "3.0.19";
src = fetchurl {
diff --git a/pkgs/servers/gnatsd/default.nix b/pkgs/servers/gnatsd/default.nix
index e8e08271b3bc..1bb2ebc4f868 100644
--- a/pkgs/servers/gnatsd/default.nix
+++ b/pkgs/servers/gnatsd/default.nix
@@ -3,7 +3,7 @@
with lib;
buildGoPackage rec {
- name = "gnatsd-${version}";
+ pname = "gnatsd";
version = "1.4.0";
rev = "v${version}";
diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/servers/gopher/gofish/default.nix
index 754cba588258..1bec32e5125b 100644
--- a/pkgs/servers/gopher/gofish/default.nix
+++ b/pkgs/servers/gopher/gofish/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
- name = "gofish-${version}";
+ pname = "gofish";
version = "1.2";
src = fetchurl {
- url = "mirror://sourceforge/project/gofish/gofish/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/gofish/gofish/${version}/${pname}-${version}.tar.gz";
sha256 = "0br5nvlna86k4ya4q13gz0i7nlmk225lqmpfiqlkldxkr473kf0s";
};
diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
index ebade244bdf7..da24b0a0e26e 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/pkgs/servers/gotty/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "gotty-${version}";
+ pname = "gotty";
version = "0.0.13";
rev = "v${version}";
diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix
index c4be1f3c3b34..ff127e705e50 100644
--- a/pkgs/servers/h2/default.nix
+++ b/pkgs/servers/h2/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchzip, jre, makeWrapper }:
stdenv.mkDerivation rec {
- name = "h2-${version}";
+ pname = "h2";
version = "1.4.193";
diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix
index 6a33ac638d21..3d05933f5130 100644
--- a/pkgs/servers/hbase/default.nix
+++ b/pkgs/servers/hbase/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper }:
stdenv.mkDerivation rec {
- name = "hbase-${version}";
+ pname = "hbase";
version = "0.98.24";
src = fetchurl {
diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix
index 58033edb07d7..7bc2da8b0239 100644
--- a/pkgs/servers/hitch/default.nix
+++ b/pkgs/servers/hitch/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, docutils, libev, openssl, pkgconfig }:
stdenv.mkDerivation rec {
version = "1.5.0";
- name = "hitch-${version}";
+ pname = "hitch";
src = fetchurl {
- url = "https://hitch-tls.org/source/${name}.tar.gz";
+ url = "https://hitch-tls.org/source/${pname}-${version}.tar.gz";
sha256 = "02sd2p3jsbnqmldsjwzk5qcjc45k9n1x4ygjkx0kxxwjj9lm9hhf";
};
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index 5f8884cbd3b7..5d4d88e1cda8 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -58,6 +58,10 @@ in python.pkgs.buildPythonApplication rec {
# no tests implemented
doCheck = false;
+ postPatch = ''
+ substituteInPlace setup.py --replace "pyyaml==5.1" "pyyaml"
+ '';
+
meta = with lib; {
description = "Sandboxed python execution environment for writing automation apps for Home Assistant";
homepage = https://github.com/home-assistant/appdaemon;
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 8a2c8d0e7195..104a11ad2817 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,11 +2,12 @@
# Do not edit!
{
- version = "0.93.2";
+ version = "0.96.2";
components = {
"abode" = ps: with ps; [ ];
"acer_projector" = ps: with ps; [ pyserial ];
"actiontec" = ps: with ps; [ ];
+ "adguard" = ps: with ps; [ ];
"ads" = ps: with ps; [ ];
"aftership" = ps: with ps; [ ];
"air_quality" = ps: with ps; [ ];
@@ -31,8 +32,10 @@
"api" = ps: with ps; [ aiohttp-cors ];
"apns" = ps: with ps; [ ];
"apple_tv" = ps: with ps; [ pyatv ];
+ "aprs" = ps: with ps; [ ];
"aqualogic" = ps: with ps; [ ];
"aquostv" = ps: with ps; [ ];
+ "arcam_fmj" = ps: with ps; [ ];
"arduino" = ps: with ps; [ ];
"arest" = ps: with ps; [ ];
"arlo" = ps: with ps; [ ha-ffmpeg ];
@@ -43,6 +46,7 @@
"asuswrt" = ps: with ps; [ ];
"august" = ps: with ps; [ ];
"aurora" = ps: with ps; [ ];
+ "aurora_abb_powerone" = ps: with ps; [ ];
"auth" = ps: with ps; [ aiohttp-cors ];
"automatic" = ps: with ps; [ aiohttp-cors ];
"automation" = ps: with ps; [ aiohttp-cors ];
@@ -50,6 +54,7 @@
"awair" = ps: with ps; [ ];
"aws" = ps: with ps; [ ];
"axis" = ps: with ps; [ ];
+ "azure_event_hub" = ps: with ps; [ ];
"baidu" = ps: with ps; [ ];
"bayesian" = ps: with ps; [ ];
"bbb_gpio" = ps: with ps; [ ];
@@ -125,12 +130,13 @@
"deconz" = ps: with ps; [ ];
"decora" = ps: with ps; [ ];
"decora_wifi" = ps: with ps; [ ];
- "default_config" = ps: with ps; [ pynacl aiohttp-cors distro sqlalchemy zeroconf ];
+ "default_config" = ps: with ps; [ pynacl aiohttp-cors distro netdisco sqlalchemy zeroconf ];
"deluge" = ps: with ps; [ deluge-client ];
"demo" = ps: with ps; [ aiohttp-cors ];
"denon" = ps: with ps; [ ];
"denonavr" = ps: with ps; [ ];
"deutsche_bahn" = ps: with ps; [ ];
+ "device_automation" = ps: with ps; [ aiohttp-cors ];
"device_sun_light_trigger" = ps: with ps; [ ];
"device_tracker" = ps: with ps; [ ];
"dht" = ps: with ps; [ ];
@@ -174,6 +180,7 @@
"eight_sleep" = ps: with ps; [ ];
"eliqonline" = ps: with ps; [ ];
"elkm1" = ps: with ps; [ ];
+ "elv" = ps: with ps; [ ];
"emby" = ps: with ps; [ ];
"emoncms" = ps: with ps; [ ];
"emoncms_history" = ps: with ps; [ ];
@@ -183,6 +190,7 @@
"enocean" = ps: with ps; [ ];
"enphase_envoy" = ps: with ps; [ ];
"entur_public_transport" = ps: with ps; [ ];
+ "environment_canada" = ps: with ps; [ ];
"envirophat" = ps: with ps; [ ];
"envisalink" = ps: with ps; [ ];
"ephember" = ps: with ps; [ ];
@@ -233,6 +241,7 @@
"fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
"fritzbox_netmonitor" = ps: with ps; [ fritzconnection ];
"fritzdect" = ps: with ps; [ ];
+ "fronius" = ps: with ps; [ ];
"frontend" = ps: with ps; [ aiohttp-cors ];
"frontier_silicon" = ps: with ps; [ ];
"futurenow" = ps: with ps; [ ];
@@ -256,6 +265,7 @@
"gogogate2" = ps: with ps; [ ];
"google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
"google_assistant" = ps: with ps; [ aiohttp-cors ];
+ "google_cloud" = ps: with ps; [ google_cloud_texttospeech ];
"google_domains" = ps: with ps; [ ];
"google_maps" = ps: with ps; [ ];
"google_pubsub" = ps: with ps; [ google_cloud_pubsub ];
@@ -364,6 +374,7 @@
"lcn" = ps: with ps; [ ];
"lg_netcast" = ps: with ps; [ ];
"lg_soundbar" = ps: with ps; [ ];
+ "life360" = ps: with ps; [ ];
"lifx" = ps: with ps; [ aiolifx aiolifx-effects ];
"lifx_cloud" = ps: with ps; [ ];
"lifx_legacy" = ps: with ps; [ ];
@@ -408,6 +419,7 @@
"mastodon" = ps: with ps; [ ];
"matrix" = ps: with ps; [ matrix-client ];
"maxcube" = ps: with ps; [ ];
+ "mcp23017" = ps: with ps; [ ];
"media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ];
"media_player" = ps: with ps; [ aiohttp-cors ];
"mediaroom" = ps: with ps; [ ];
@@ -478,6 +490,7 @@
"noaa_tides" = ps: with ps; [ ];
"norway_air" = ps: with ps; [ ];
"notify" = ps: with ps; [ ];
+ "notion" = ps: with ps; [ ];
"nsw_fuel_station" = ps: with ps; [ ];
"nsw_rural_fire_service_feed" = ps: with ps; [ ];
"nuheat" = ps: with ps; [ ];
@@ -530,6 +543,7 @@
"ping" = ps: with ps; [ ];
"pioneer" = ps: with ps; [ ];
"pjlink" = ps: with ps; [ ];
+ "plaato" = ps: with ps; [ aiohttp-cors ];
"plant" = ps: with ps; [ ];
"plex" = ps: with ps; [ ];
"plum_lightpad" = ps: with ps; [ ];
@@ -554,6 +568,7 @@
"pyload" = ps: with ps; [ ];
"python_script" = ps: with ps; [ ];
"qbittorrent" = ps: with ps; [ ];
+ "qld_bushfire" = ps: with ps; [ ];
"qnap" = ps: with ps; [ ];
"qrcode" = ps: with ps; [ pillow ];
"quantum_gateway" = ps: with ps; [ ];
@@ -574,6 +589,8 @@
"rejseplanen" = ps: with ps; [ ];
"remember_the_milk" = ps: with ps; [ httplib2 ];
"remote" = ps: with ps; [ ];
+ "remote_rpi_gpio" = ps: with ps; [ ];
+ "repetier" = ps: with ps; [ ];
"rest" = ps: with ps; [ ];
"rest_command" = ps: with ps; [ ];
"rflink" = ps: with ps; [ ];
@@ -632,7 +649,9 @@
"sleepiq" = ps: with ps; [ ];
"sma" = ps: with ps; [ ];
"smappee" = ps: with ps; [ ];
+ "smarthab" = ps: with ps; [ ];
"smartthings" = ps: with ps; [ aiohttp-cors ];
+ "smarty" = ps: with ps; [ ];
"smhi" = ps: with ps; [ ];
"smtp" = ps: with ps; [ ];
"snapcast" = ps: with ps; [ snapcast ];
@@ -640,7 +659,10 @@
"snmp" = ps: with ps; [ pysnmp ];
"sochain" = ps: with ps; [ ];
"socialblade" = ps: with ps; [ ];
- "solaredge" = ps: with ps; [ ];
+ "solaredge" = ps: with ps; [ stringcase ];
+ "solaredge_local" = ps: with ps; [ ];
+ "solax" = ps: with ps; [ ];
+ "somfy" = ps: with ps; [ ];
"somfy_mylink" = ps: with ps; [ ];
"sonarr" = ps: with ps; [ ];
"songpal" = ps: with ps; [ ];
@@ -657,6 +679,7 @@
"sql" = ps: with ps; [ sqlalchemy ];
"squeezebox" = ps: with ps; [ ];
"srp_energy" = ps: with ps; [ ];
+ "ssdp" = ps: with ps; [ netdisco ];
"starlingbank" = ps: with ps; [ ];
"startca" = ps: with ps; [ xmltodict ];
"statistics" = ps: with ps; [ ];
@@ -664,6 +687,7 @@
"steam_online" = ps: with ps; [ ];
"stiebel_eltron" = ps: with ps; [ ];
"stream" = ps: with ps; [ aiohttp-cors av ];
+ "streamlabswater" = ps: with ps; [ ];
"stride" = ps: with ps; [ ];
"sun" = ps: with ps; [ ];
"supervisord" = ps: with ps; [ ];
@@ -703,7 +727,7 @@
"tensorflow" = ps: with ps; [ numpy pillow protobuf ];
"tesla" = ps: with ps; [ ];
"tfiac" = ps: with ps; [ ];
- "thermoworks_smoke" = ps: with ps; [ ];
+ "thermoworks_smoke" = ps: with ps; [ stringcase ];
"thethingsnetwork" = ps: with ps; [ ];
"thingspeak" = ps: with ps; [ ];
"thinkingcleaner" = ps: with ps; [ ];
@@ -724,9 +748,10 @@
"touchline" = ps: with ps; [ ];
"tplink" = ps: with ps; [ ];
"tplink_lte" = ps: with ps; [ ];
- "traccar" = ps: with ps; [ ];
+ "traccar" = ps: with ps; [ stringcase ];
"trackr" = ps: with ps; [ ];
"tradfri" = ps: with ps; [ ];
+ "trafikverket_train" = ps: with ps; [ ];
"trafikverket_weatherstation" = ps: with ps; [ ];
"transmission" = ps: with ps; [ transmissionrpc ];
"transport_nsw" = ps: with ps; [ ];
@@ -740,11 +765,10 @@
"twitch" = ps: with ps; [ ];
"twitter" = ps: with ps; [ ];
"ubee" = ps: with ps; [ ];
- "uber" = ps: with ps; [ ];
"ubus" = ps: with ps; [ ];
"ue_smart_radio" = ps: with ps; [ ];
"uk_transport" = ps: with ps; [ ];
- "unifi" = ps: with ps; [ aiounifi pyunifi ];
+ "unifi" = ps: with ps; [ aiounifi ];
"unifi_direct" = ps: with ps; [ pexpect ];
"universal" = ps: with ps; [ ];
"upc_connect" = ps: with ps; [ defusedxml ];
@@ -760,6 +784,7 @@
"utility_meter" = ps: with ps; [ ];
"uvc" = ps: with ps; [ ];
"vacuum" = ps: with ps; [ ];
+ "vallox" = ps: with ps; [ ];
"vasttrafik" = ps: with ps; [ ];
"velbus" = ps: with ps; [ ];
"velux" = ps: with ps; [ ];
@@ -771,6 +796,7 @@
"viaggiatreno" = ps: with ps; [ ];
"vizio" = ps: with ps; [ ];
"vlc" = ps: with ps; [ ];
+ "vlc_telnet" = ps: with ps; [ ];
"voicerss" = ps: with ps; [ ];
"volkszaehler" = ps: with ps; [ ];
"volumio" = ps: with ps; [ ];
@@ -782,6 +808,7 @@
"water_heater" = ps: with ps; [ ];
"waterfurnace" = ps: with ps; [ ];
"watson_iot" = ps: with ps; [ ];
+ "watson_tts" = ps: with ps; [ ];
"waze_travel_time" = ps: with ps; [ WazeRouteCalculator ];
"weather" = ps: with ps; [ ];
"webhook" = ps: with ps; [ aiohttp-cors ];
@@ -799,6 +826,7 @@
"wsdot" = ps: with ps; [ ];
"wunderground" = ps: with ps; [ ];
"wunderlist" = ps: with ps; [ ];
+ "wwlln" = ps: with ps; [ ];
"x10" = ps: with ps; [ ];
"xbox_live" = ps: with ps; [ ];
"xeoma" = ps: with ps; [ ];
@@ -816,7 +844,7 @@
"yeelight" = ps: with ps; [ ];
"yeelightsunflower" = ps: with ps; [ ];
"yessssms" = ps: with ps; [ ];
- "yi" = ps: with ps; [ ha-ffmpeg ];
+ "yi" = ps: with ps; [ aioftp ha-ffmpeg ];
"yr" = ps: with ps; [ xmltodict ];
"yweather" = ps: with ps; [ yahooweather ];
"zabbix" = ps: with ps; [ ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 03f247e3bc5f..30e4b99ccbcf 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, python3, protobuf3_6
+{ lib, fetchurl, fetchFromGitHub, python3, protobuf3_6
# Look up dependencies of specified components in component-packages.nix
, extraComponents ? []
@@ -26,20 +26,24 @@ let
"0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f")
(mkOverride "attrs" "19.1.0"
"f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399")
- (mkOverride "bcrypt" "3.1.6"
- "44636759d222baa62806bbceb20e96f75a015a6381690d1bc2eda91c01ec02ea")
+ (mkOverride "bcrypt" "3.1.7"
+ "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42")
(mkOverride "pyjwt" "1.7.1"
"8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96")
- (mkOverride "cryptography" "2.6.1"
- "26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6")
- (mkOverride "cryptography_vectors" "2.6.1" # required by cryptography==2.6.1
- "03f38115dccb266dd96538f94067442a877932c2322661bdc5bf2502c76658af")
+ (mkOverride "cryptography" "2.7"
+ "e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6")
+ (mkOverride "cryptography_vectors" "2.7" # required by cryptography==2.7
+ "f12dfb9bd669a68004074cb5b26df6e93ed1a95ebd1a999dff0a840212ff68bc")
+ (mkOverride "importlib-metadata" "0.18"
+ "cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db")
(mkOverride "python-slugify" "3.0.2"
"57163ffb345c7e26063435a27add1feae67fa821f1ef4b2f292c25847575d758")
- (mkOverride "requests" "2.21.0"
- "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e")
- (mkOverride "ruamel_yaml" "0.15.94"
- "0939bcb399ad037ef903d74ccf2f8a074f06683bc89133ad19305067d34487c8")
+ (mkOverride "pyyaml" "5.1.1"
+ "b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955")
+ (mkOverride "requests" "2.22.0"
+ "11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4")
+ (mkOverride "ruamel_yaml" "0.15.97"
+ "17dbf6b7362e7aee8494f7a0f5cffd44902a6331fe89ef0853b855a7930ab845")
(mkOverride "voluptuous" "0.11.5"
"567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef")
(mkOverride "voluptuous-serialize" "2.1.0"
@@ -61,10 +65,6 @@ let
};
})
- (self: super: {
- pyyaml = super.pyyaml_3;
- })
-
# hass-frontend does not exist in python3.pkgs
(self: super: {
hass-frontend = self.callPackage ./frontend.nix { };
@@ -98,7 +98,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "0.93.2";
+ hassVersion = "0.96.2";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -113,13 +113,14 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "home-assistant";
rev = version;
- sha256 = "01zdg6yfj6qal8jpr9bskmq25crrvz7w3vifrfxmlqws6hv35gc8";
+ sha256 = "0qxdsr7zh2yqzignbhi8gcp67ba6gcp2yiyr1rww33a42r4fi0g5";
};
propagatedBuildInputs = [
# From setup.py
- aiohttp astral async-timeout attrs bcrypt certifi jinja2 pyjwt cryptography pip
- python-slugify pytz pyyaml requests ruamel_yaml voluptuous voluptuous-serialize
+ aiohttp astral async-timeout attrs bcrypt certifi importlib-metadata jinja2
+ pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml
+ voluptuous voluptuous-serialize
# From http, frontend and recorder components and auth.mfa_modules.totp
sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode
] ++ componentBuildInputs ++ extraBuildInputs;
@@ -144,6 +145,6 @@ in with py.pkgs; buildPythonApplication rec {
homepage = https://home-assistant.io/;
description = "Open-source home automation platform running on Python 3";
license = licenses.asl20;
- maintainers = with maintainers; [ f-breidenstein dotlambda globin ];
+ maintainers = with maintainers; [ fleaz dotlambda globin ];
};
}
diff --git a/pkgs/servers/http/4store/default.nix b/pkgs/servers/http/4store/default.nix
index 664953ca34dc..6e4be4a36fea 100644
--- a/pkgs/servers/http/4store/default.nix
+++ b/pkgs/servers/http/4store/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
- name = "4store-${version}";
+ pname = "4store";
version = "1.1.6";
src = fetchFromGitHub {
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 3c3d4c20df1b..638617141457 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert http2Support -> nghttp2 != null;
stdenv.mkDerivation rec {
- version = "2.4.39";
- name = "apache-httpd-${version}";
+ version = "2.4.41";
+ pname = "apache-httpd";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
- sha256 = "18ngvsjq65qxk3biggnkhkq8jlll9dsg9n3csra9p99sfw2rvjml";
+ sha256 = "0h7a31yxwyh7h521frnmlppl0h7sh9icc3ka6vlmlcg5iwllhg8k";
};
# FIXME: -dev depends on -doc
diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
index 8a773631ee6c..6bad43a62f0a 100644
--- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "mod_auth_mellon-${version}";
+ pname = "mod_auth_mellon";
version = "0.13.1";
src = fetchFromGitHub {
diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index ff767d9ad437..a6f4f9926710 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -10,7 +10,8 @@ let
};
in
stdenv.mkDerivation {
- name = "mod_fastcgi-${version}";
+ pname = "mod_fastcgi";
+ inherit version;
src = fetchurl {
url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz";
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index a0fa4b4bca96..0e17cc40efe3 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, apacheHttpd, python, ncurses }:
stdenv.mkDerivation rec {
- name = "mod_wsgi-${version}";
+ pname = "mod_wsgi";
version = "4.6.7";
src = fetchurl {
diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix
index aa826a9c528b..65ec2510d342 100644
--- a/pkgs/servers/http/apt-cacher-ng/default.nix
+++ b/pkgs/servers/http/apt-cacher-ng/default.nix
@@ -13,7 +13,7 @@
}:
stdenv.mkDerivation rec {
- name = "apt-cacher-ng-${version}";
+ pname = "apt-cacher-ng";
version = "3.2";
src = fetchurl {
diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix
index b3c4abfed906..a9d806f9de84 100644
--- a/pkgs/servers/http/couchdb/2.0.0.nix
+++ b/pkgs/servers/http/couchdb/2.0.0.nix
@@ -2,14 +2,14 @@
, coreutils, bash, makeWrapper, python3 }:
stdenv.mkDerivation rec {
- name = "couchdb-${version}";
+ pname = "couchdb";
version = "2.3.1";
# when updating this, please consider bumping the OTP version
# in all-packages.nix
src = fetchurl {
- url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
+ url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";
sha256 = "0z926hjqyhxhyr65kqxwpmp80nyfqbig6d9dy8dqflpb87n8rss3";
};
diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 2299f732a76e..f2e5e67dd7ac 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -2,11 +2,11 @@
, sphinx, which, file, pkgconfig, getopt }:
stdenv.mkDerivation rec {
- name = "couchdb-${version}";
+ pname = "couchdb";
version = "1.7.1";
src = fetchurl {
- url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
+ url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";
sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i";
};
diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix
index 3efc97f6296b..42de9904f90a 100644
--- a/pkgs/servers/http/darkhttpd/default.nix
+++ b/pkgs/servers/http/darkhttpd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "darkhttpd-${version}";
+ pname = "darkhttpd";
version = "1.12";
src = fetchurl {
- url = "https://unix4lyfe.org/darkhttpd/${name}.tar.bz2";
+ url = "https://unix4lyfe.org/darkhttpd/${pname}-${version}.tar.bz2";
sha256 = "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155";
};
diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix
index 19b2d01f5be8..395504e49703 100644
--- a/pkgs/servers/http/gatling/default.nix
+++ b/pkgs/servers/http/gatling/default.nix
@@ -4,10 +4,11 @@ let
version = "0.15";
in
stdenv.mkDerivation rec {
- name = "gatling-${version}";
+ pname = "gatling";
+ inherit version;
src = fetchurl {
- url = "https://www.fefe.de/gatling/${name}.tar.xz";
+ url = "https://www.fefe.de/gatling/${pname}-${version}.tar.xz";
sha256 = "194srqyja3pczpbl6l169zlvx179v7ln0m6yipmhvj6hrv82k8vg";
};
diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix
index afa48eeafc2e..26c320499e55 100644
--- a/pkgs/servers/http/h2o/default.nix
+++ b/pkgs/servers/http/h2o/default.nix
@@ -6,7 +6,7 @@
with builtins;
stdenv.mkDerivation rec {
- name = "h2o-${version}";
+ pname = "h2o";
version = "2.2.6";
src = fetchFromGitHub {
diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix
index 742db5567075..a3bcb64e6c05 100644
--- a/pkgs/servers/http/hiawatha/default.nix
+++ b/pkgs/servers/http/hiawatha/default.nix
@@ -16,7 +16,7 @@
}:
stdenv.mkDerivation rec {
- name = "hiawatha-${version}";
+ pname = "hiawatha";
version = "10.9";
src = fetchFromGitLab {
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 80a3d6b105cb..5ce44322e92f 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "jetty-${version}";
+ pname = "jetty";
version = "9.4.16.v20190411";
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix
index 878211ebf024..f692832e882b 100644
--- a/pkgs/servers/http/lwan/default.nix
+++ b/pkgs/servers/http/lwan/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "lwan";
version = "0.1";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "lpereira";
diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/servers/http/micro-httpd/default.nix
index b636f79e6c60..d99af7a81aef 100644
--- a/pkgs/servers/http/micro-httpd/default.nix
+++ b/pkgs/servers/http/micro-httpd/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "micro-httpd-20140814";
src = fetchurl {
diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix
index b18e1ea162f0..3c29ddb8e0a6 100644
--- a/pkgs/servers/http/myserver/default.nix
+++ b/pkgs/servers/http/myserver/default.nix
@@ -4,10 +4,11 @@
let version = "0.11"; in
stdenv.mkDerivation rec {
- name = "myserver-${version}";
+ pname = "myserver";
+ inherit version;
src = fetchurl {
- url = "mirror://gnu/myserver/${version}/${name}.tar.xz";
+ url = "mirror://gnu/myserver/${version}/${pname}-${version}.tar.xz";
sha256 = "02y3vv4hxpy5h710y79s8ipzshhc370gbz1wm85x0lnq5nqxj2ax";
};
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index d670e1592c27..3edbed22b6b6 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -21,7 +21,8 @@ let
in
stdenv.mkDerivation {
- name = "nginx-${version}";
+ pname = "nginx";
+ inherit version;
src = fetchurl {
url = "https://nginx.org/download/nginx-${version}.tar.gz";
@@ -69,7 +70,10 @@ stdenv.mkDerivation {
++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"
++ map (mod: "--add-module=${mod.src}") modules;
- NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
+ NIX_CFLAGS_COMPILE = [
+ "-I${libxml2.dev}/include/libxml2"
+ "-Wno-error=implicit-fallthrough"
+ ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
configurePlatforms = [];
diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix
index 479c9e41aa91..bef7f43ea71f 100644
--- a/pkgs/servers/http/nix-binary-cache/default.nix
+++ b/pkgs/servers/http/nix-binary-cache/default.nix
@@ -3,7 +3,7 @@
, lighttpd, iproute }:
stdenv.mkDerivation rec {
version = "2014-06-29-1";
- name = "nix-binary-cache-${version}";
+ pname = "nix-binary-cache";
phases = ["installPhase"];
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 6bb4ce46a43b..3990c5de8185 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -4,7 +4,7 @@ gd, geoip, perl }:
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "openresty-${version}";
+ pname = "openresty";
version = "1.15.8.1";
src = fetchurl {
diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix
index c38ca046a35b..19d0b9a2641c 100644
--- a/pkgs/servers/http/pshs/default.nix
+++ b/pkgs/servers/http/pshs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, file, qrencode, miniupnpc }:
stdenv.mkDerivation rec {
- name = "pshs-${version}";
+ pname = "pshs";
version = "0.3.3";
src = fetchFromGitHub {
diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix
index b5d5d5f7992d..d118e8af66d4 100644
--- a/pkgs/servers/http/spawn-fcgi/default.nix
+++ b/pkgs/servers/http/spawn-fcgi/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchsvn, autoconf, automake }:
stdenv.mkDerivation rec {
- name = "spawn-fcgi-${version}";
+ pname = "spawn-fcgi";
version = "1.6.4";
src = fetchsvn {
diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix
index cac31ed9d595..a7ea61de0420 100644
--- a/pkgs/servers/http/tengine/default.nix
+++ b/pkgs/servers/http/tengine/default.nix
@@ -11,7 +11,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "2.3.1";
- name = "tengine-${version}";
+ pname = "tengine";
src = fetchurl {
url = "https://github.com/alibaba/tengine/archive/${version}.tar.gz";
diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix
index 6e012c98737e..b72439bc37a2 100644
--- a/pkgs/servers/http/thttpd/default.nix
+++ b/pkgs/servers/http/thttpd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "thttpd-${version}";
+ pname = "thttpd";
version = "2.29";
src = fetchurl {
- url = "https://acme.com/software/thttpd/${name}.tar.gz";
+ url = "https://acme.com/software/thttpd/${pname}-${version}.tar.gz";
sha256 = "15x3h4b49wgfywn82i3wwbf38mdns94mbi4ma9xiwsrjv93rzh4r";
};
diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix
index 5da89200816f..59a4ab6e5b49 100644
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/pkgs/servers/http/tomcat/axis2/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, apacheAnt, jdk, unzip }:
stdenv.mkDerivation rec {
- name = "axis2-${version}";
+ pname = "axis2";
version = "1.7.9";
src = fetchurl {
- url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip";
+ url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${pname}-${version}-bin.zip";
sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac";
};
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index fded6bdfafba..38b4974e1554 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -3,11 +3,11 @@
let
common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec {
- name = "apache-tomcat-${version}";
+ pname = "apache-tomcat";
version = "${versionMajor}.${versionMinor}";
src = fetchurl {
- url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${name}.tar.gz";
+ url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${pname}-${version}.tar.gz";
inherit sha256;
};
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index f802024ea876..8d015a92a8f1 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -4,7 +4,6 @@
, withPHP73 ? false, php73
, withPerl ? true, perl
, withPerldevel ? false, perldevel
-, withRuby_2_3 ? false, ruby_2_3
, withRuby_2_4 ? false, ruby_2_4
, withRuby ? true, ruby
, withSSL ? true, openssl ? null
@@ -16,12 +15,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "1.10.0";
- name = "unit-${version}";
+ pname = "unit";
src = fetchFromGitHub {
owner = "nginx";
repo = "unit";
- rev = "${version}";
+ rev = version;
sha256 = "00y7hc6bzn38f9mcqxnzddnwwsiba4ss9vwd9vgc95sj0yvv885a";
};
@@ -33,7 +32,6 @@ stdenv.mkDerivation rec {
++ optional withPHP73 php73
++ optional withPerl perl
++ optional withPerldevel perldevel
- ++ optional withRuby_2_3 ruby_2_3
++ optional withRuby_2_4 ruby_2_4
++ optional withRuby ruby
++ optional withSSL openssl;
@@ -53,7 +51,6 @@ stdenv.mkDerivation rec {
${optionalString withPHP73 "./configure php --module=php73 --config=${php73.dev}/bin/php-config --lib-path=${php73}/lib"}
${optionalString withPerl "./configure perl --module=perl --perl=${perl}/bin/perl"}
${optionalString withPerldevel "./configure perl --module=perl529 --perl=${perldevel}/bin/perl"}
- ${optionalString withRuby_2_3 "./configure ruby --module=ruby23 --ruby=${ruby_2_3}/bin/ruby"}
${optionalString withRuby_2_4 "./configure ruby --module=ruby24 --ruby=${ruby_2_4}/bin/ruby"}
${optionalString withRuby "./configure ruby --module=ruby --ruby=${ruby}/bin/ruby"}
'';
diff --git a/pkgs/servers/http/webfs/default.nix b/pkgs/servers/http/webfs/default.nix
index 3fb3890f9c4e..79c7d9e9eca1 100644
--- a/pkgs/servers/http/webfs/default.nix
+++ b/pkgs/servers/http/webfs/default.nix
@@ -7,11 +7,11 @@ let
};
in
stdenv.mkDerivation rec {
- name = "webfs-${version}";
+ pname = "webfs";
version = "1.21";
src = fetchurl {
- url = "https://www.kraxel.org/releases/webfs/${name}.tar.gz";
+ url = "https://www.kraxel.org/releases/webfs/${pname}-${version}.tar.gz";
sha256 = "98c1cb93473df08e166e848e549f86402e94a2f727366925b1c54ab31064a62a";
};
diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix
index 5d6b47d28b5d..707b48786483 100644
--- a/pkgs/servers/http/webhook/default.nix
+++ b/pkgs/servers/http/webhook/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "webhook-${version}";
+ pname = "webhook";
version = "2.6.8";
goPackagePath = "github.com/adnanh/webhook";
diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix
index 827f6122b573..109f7bc06dcd 100644
--- a/pkgs/servers/http/yaws/default.nix
+++ b/pkgs/servers/http/yaws/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, erlang, pam, perl }:
stdenv.mkDerivation rec {
- name = "yaws-${version}";
+ pname = "yaws";
version = "2.0.6";
src = fetchurl {
- url = "http://yaws.hyber.org/download/${name}.tar.gz";
+ url = "http://yaws.hyber.org/download/${pname}-${version}.tar.gz";
sha256 = "03nh97g7smsgm6sw5asssmlq7zgx6y2gnn7jn0lv2x5mkf5nzyb9";
};
diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix
index 912e520180e6..6ac37a98deea 100644
--- a/pkgs/servers/hydron/default.nix
+++ b/pkgs/servers/hydron/default.nix
@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, ffmpeg-full, graphicsmagick
, quicktemplate, go-bindata, easyjson }:
-buildGoPackage rec {
- name = "hydron-unstable-${version}";
+buildGoPackage {
+ pname = "hydron-unstable";
version = "2019-02-17";
goPackagePath = "github.com/bakape/hydron";
goDeps = ./deps.nix;
diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix
index 280df5f00d2a..9cdfd8d2b338 100644
--- a/pkgs/servers/icingaweb2/default.nix
+++ b/pkgs/servers/icingaweb2/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec {
- name = "icingaweb2-${version}";
+ pname = "icingaweb2";
version = "2.7.1";
src = fetchFromGitHub {
diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix
index fdad63d67af4..8171f61c112d 100644
--- a/pkgs/servers/identd/nullidentdmod/default.nix
+++ b/pkgs/servers/identd/nullidentdmod/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
- name = "nullidentdmod-${version}";
+ pname = "nullidentdmod";
version = "1.3";
src = fetchFromGitHub {
diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix
index e60a1f54f424..85d1186f525a 100644
--- a/pkgs/servers/identd/oidentd/default.nix
+++ b/pkgs/servers/identd/oidentd/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, bison, flex }:
stdenv.mkDerivation rec {
- name = "oidentd-${version}";
+ pname = "oidentd";
version = "2.4.0";
nativeBuildInputs = [ bison flex ];
src = fetchurl {
- url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${name}.tar.gz";
+ url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${pname}-${version}.tar.gz";
sha256 = "132bzlbjp437lrlxv5k9aqa1q9w5pghk02rnazg33cw6av00q2li";
};
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix
index f57c94cd1084..9823a36d7545 100644
--- a/pkgs/servers/interlock/default.nix
+++ b/pkgs/servers/interlock/default.nix
@@ -3,7 +3,7 @@
, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "interlock-${version}";
+ pname = "interlock";
version = "2016.04.13";
rev = "v${version}";
diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix
index 002760ff0fd3..c056a543aa1d 100644
--- a/pkgs/servers/irker/default.nix
+++ b/pkgs/servers/irker/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitLab, python, pkgconfig
, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }:
-stdenv.mkDerivation rec {
- name = "irker-${version}";
+stdenv.mkDerivation {
+ pname = "irker";
version = "2017-02-12";
src = fetchFromGitLab {
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 8369cdce4d53..0299c0281480 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, mono, curl, makeWrapper }:
stdenv.mkDerivation rec {
- name = "jackett-${version}";
+ pname = "jackett";
version = "0.11.589";
src = fetchurl {
@@ -12,11 +12,11 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper ];
installPhase = ''
- mkdir -p $out/{bin,share/${name}}
- cp -r * $out/share/${name}
+ mkdir -p $out/{bin,share/${pname}-${version}}
+ cp -r * $out/share/${pname}-${version}
makeWrapper "${mono}/bin/mono" $out/bin/Jackett \
- --add-flags "$out/share/${name}/JackettConsole.exe" \
+ --add-flags "$out/share/${pname}-${version}/JackettConsole.exe" \
--prefix LD_LIBRARY_PATH ':' "${curl.out}/lib"
'';
diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix
index bbf39e5be466..2f8241e7b09d 100644
--- a/pkgs/servers/jetbrains/youtrack.nix
+++ b/pkgs/servers/jetbrains/youtrack.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, jre, gawk }:
stdenv.mkDerivation rec {
- name = "youtrack-${version}";
+ pname = "youtrack";
version = "2018.2.44329";
jar = fetchurl {
- url = "https://download.jetbrains.com/charisma/${name}.jar";
+ url = "https://download.jetbrains.com/charisma/${pname}-${version}.jar";
sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk";
};
diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix
index 3ebcaf7286b4..bec8ccbbf18d 100644
--- a/pkgs/servers/kippo/default.nix
+++ b/pkgs/servers/kippo/default.nix
@@ -60,10 +60,10 @@ let
};
in stdenv.mkDerivation rec {
- name = "kippo-${version}";
+ pname = "kippo";
version = "0.8";
src = fetchurl {
- url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${name}.tar.gz";
+ url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kippo/${pname}-${version}.tar.gz";
sha256 = "0rd2mk36d02qd24z8s4xyy64fy54rzpar4379iq4dcjwg7l7f63d";
};
buildInputs = with pythonPackages; [ pycrypto pyasn1 twisted_13 ];
diff --git a/pkgs/servers/kwakd/default.nix b/pkgs/servers/kwakd/default.nix
index 7c7755dee482..e65e6b5ab59a 100644
--- a/pkgs/servers/kwakd/default.nix
+++ b/pkgs/servers/kwakd/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, stdenv }:
-stdenv.mkDerivation rec {
- name = "kwakd-${version}";
+stdenv.mkDerivation {
+ pname = "kwakd";
version = "0.5";
src = fetchFromGitHub {
diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix
index fc88d645f27a..43ddc5f7b0f4 100644
--- a/pkgs/servers/lidarr/default.nix
+++ b/pkgs/servers/lidarr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }:
stdenv.mkDerivation rec {
- name = "lidarr-${version}";
+ pname = "lidarr";
version = "0.6.2.883";
src = fetchurl {
diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix
index 2e17001abc50..798bda8e306e 100644
--- a/pkgs/servers/livepeer/default.nix
+++ b/pkgs/servers/livepeer/default.nix
@@ -3,7 +3,7 @@
}:
buildGoPackage rec {
- name = "livepeer-${version}";
+ pname = "livepeer";
version = "0.2.4";
goPackagePath = "github.com/livepeer/go-livepeer";
diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix
index 080cbc897756..5a318c311af8 100644
--- a/pkgs/servers/mail/archiveopteryx/default.nix
+++ b/pkgs/servers/mail/archiveopteryx/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, openssl, perl, zlib, jam }:
stdenv.mkDerivation rec {
version = "3.2.0";
- name = "archiveopteryx-${version}";
+ pname = "archiveopteryx";
src = fetchurl {
- url = "http://archiveopteryx.org/download/${name}.tar.bz2";
+ url = "http://archiveopteryx.org/download/${pname}-${version}.tar.bz2";
sha256 = "0i0zg8di8nbh96qnyyr156ikwcsq1w9b2291bazm5whb351flmqx";
};
diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
index dce0b9174092..b7d791f34166 100644
--- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, dovecot, openssl }:
stdenv.mkDerivation rec {
- name = "dovecot-pigeonhole-${version}";
+ pname = "dovecot-pigeonhole";
version = "0.5.7.2";
src = fetchurl {
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 25a94cd27bfa..fcafd5817d4e 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -7,11 +7,11 @@
}:
stdenv.mkDerivation rec {
- name = "exim-4.92.1";
+ name = "exim-4.92.2";
src = fetchurl {
url = "https://ftp.exim.org/pub/exim/exim4/${name}.tar.xz";
- sha256 = "1d14vs6jdw2bm9m33w2szxpv8rppbk7hvszq9p0n9i3svmqshr1c";
+ sha256 = "0m56jsh2fzvwj4rdpcc3pkd5vsi40cjrpzalis7l1zq33m4axmq1";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix
index 019c84d2898b..429d735ffcd0 100644
--- a/pkgs/servers/mail/mailhog/default.nix
+++ b/pkgs/servers/mail/mailhog/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "MailHog-${version}";
+ pname = "MailHog";
version = "1.0.0";
rev = "v${version}";
diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
new file mode 100644
index 000000000000..e9f66b92be29
--- /dev/null
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, python2 }:
+
+stdenv.mkDerivation rec {
+ pname = "mailman";
+ version = "2.1.29";
+
+ src = fetchurl {
+ url = "mirror://gnu/mailman/${pname}-${version}.tgz";
+ sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243";
+ };
+
+ buildInputs = [ python2 python2.pkgs.dnspython ];
+
+ patches = [ ./fix-var-prefix.patch ];
+
+ configureFlags = [
+ "--without-permcheck"
+ "--with-cgi-ext=.cgi"
+ "--with-var-prefix=/var/lib/mailman"
+ ];
+
+ installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'.
+
+ makeFlags = [ "DIRSETGID=:" ];
+
+ meta = {
+ homepage = https://www.gnu.org/software/mailman/;
+ description = "Free software for managing electronic mail discussion and e-newsletter lists";
+ license = stdenv.lib.licenses.gpl2Plus;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.peti ];
+ };
+}
diff --git a/pkgs/servers/mail/mailman/settings.py b/pkgs/servers/mail/mailman/settings.py
new file mode 100644
index 000000000000..5f246db41ad1
--- /dev/null
+++ b/pkgs/servers/mail/mailman/settings.py
@@ -0,0 +1,512 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 1998-2019 by the Free Software Foundation, Inc.
+#
+# This file is part of Postorius.
+#
+# Postorius is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# Postorius is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Postorius. If not, see .
+
+"""
+Django settings for postorius project.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.9/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/1.9/ref/settings/
+"""
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+import os
+
+# Compatibility with Bootstrap 3
+from django.contrib.messages import constants as messages
+
+
+BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = '$!-7^wl#wiifjbh)5@f7ji%x!vp7s1vzbvwt26hxv$idixq0u0'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = False
+
+ADMINS = (
+ #('Admin', 'webmaster@example.com'),
+)
+
+SITE_ID = 1
+
+# Hosts/domain names that are valid for this site; required if DEBUG is False
+# See https://docs.djangoproject.com/en/1.8/ref/settings/#allowed-hosts
+ALLOWED_HOSTS = [
+ "localhost", # Archiving API from Mailman, keep it.
+ "127.0.0.1",
+ # Add here all production URLs you may have.
+ @ALLOWED_HOSTS@
+]
+
+# Mailman API credentials
+MAILMAN_REST_API_URL = 'http://localhost:8001'
+MAILMAN_REST_API_USER = 'restadmin'
+MAILMAN_REST_API_PASS = 'restpass'
+MAILMAN_ARCHIVER_KEY = "@ARCHIVER_KEY@"
+MAILMAN_ARCHIVER_FROM = ('127.0.0.1', '::1')
+
+# Application definition
+
+INSTALLED_APPS = (
+ 'hyperkitty',
+ 'postorius',
+ 'django_mailman3',
+ # Uncomment the next line to enable the admin:
+ 'django.contrib.admin',
+ # Uncomment the next line to enable admin documentation:
+ # 'django.contrib.admindocs',
+ 'django.contrib.auth',
+ 'django.contrib.contenttypes',
+ 'django.contrib.sessions',
+ 'django.contrib.sites',
+ 'django.contrib.messages',
+ 'django.contrib.staticfiles',
+ 'rest_framework',
+ 'django_gravatar',
+ 'compressor',
+ 'haystack',
+ 'django_extensions',
+ 'django_q',
+ 'allauth',
+ 'allauth.account',
+ 'allauth.socialaccount',
+ 'django_mailman3.lib.auth.fedora',
+ 'allauth.socialaccount.providers.openid',
+ 'allauth.socialaccount.providers.github',
+ 'allauth.socialaccount.providers.gitlab',
+ 'allauth.socialaccount.providers.google',
+ #'allauth.socialaccount.providers.facebook',
+ #'allauth.socialaccount.providers.twitter',
+ 'allauth.socialaccount.providers.stackexchange',
+)
+
+
+MIDDLEWARE = (
+ 'django.middleware.security.SecurityMiddleware',
+ 'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.middleware.common.CommonMiddleware',
+ 'django.middleware.csrf.CsrfViewMiddleware',
+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
+ 'django.contrib.messages.middleware.MessageMiddleware',
+ 'django.middleware.clickjacking.XFrameOptionsMiddleware',
+ 'django_mailman3.middleware.TimezoneMiddleware',
+)
+
+ROOT_URLCONF = 'urls'
+
+
+TEMPLATES = [
+ {
+ 'BACKEND': 'django.template.backends.django.DjangoTemplates',
+ 'DIRS': [],
+ 'APP_DIRS': True,
+ 'OPTIONS': {
+ 'context_processors': [
+ 'django.template.context_processors.debug',
+ 'django.template.context_processors.i18n',
+ 'django.template.context_processors.media',
+ 'django.template.context_processors.static',
+ 'django.template.context_processors.tz',
+ 'django.template.context_processors.csrf',
+ 'django.template.context_processors.request',
+ 'django.contrib.auth.context_processors.auth',
+ 'django.contrib.messages.context_processors.messages',
+ 'django_mailman3.context_processors.common',
+ 'hyperkitty.context_processors.common',
+ ],
+ },
+ },
+]
+
+WSGI_APPLICATION = 'wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/1.9/ref/settings/#databases
+
+DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.sqlite3',
+ 'NAME': '/var/lib/mailman-web/mailman-web.db'
+ }
+}
+
+# Password validation
+# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+ {
+ 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+ },
+ {
+ 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+ },
+ {
+ 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+ },
+ {
+ 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+ },
+]
+
+
+# If you're behind a proxy, use the X-Forwarded-Host header
+# See https://docs.djangoproject.com/en/1.8/ref/settings/#use-x-forwarded-host
+# USE_X_FORWARDED_HOST = True
+
+# And if your proxy does your SSL encoding for you, set SECURE_PROXY_SSL_HEADER
+# https://docs.djangoproject.com/en/1.8/ref/settings/#secure-proxy-ssl-header
+# SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
+# SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_SCHEME', 'https')
+
+# Other security settings
+# SECURE_SSL_REDIRECT = True
+# If you set SECURE_SSL_REDIRECT to True, make sure the SECURE_REDIRECT_EXEMPT
+# contains at least this line:
+# SECURE_REDIRECT_EXEMPT = [
+# "archives/api/mailman/.*", # Request from Mailman.
+# ]
+# SESSION_COOKIE_SECURE = True
+# SECURE_CONTENT_TYPE_NOSNIFF = True
+# SECURE_BROWSER_XSS_FILTER = True
+# CSRF_COOKIE_SECURE = True
+# CSRF_COOKIE_HTTPONLY = True
+# X_FRAME_OPTIONS = 'DENY'
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/1.9/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.9/howto/static-files/
+
+
+# Absolute path to the directory static files should be collected to.
+# Don't put anything in this directory yourself; store your static files
+# in apps' "static/" subdirectories and in STATICFILES_DIRS.
+# Example: "/var/www/example.com/static/"
+STATIC_ROOT = 'static'
+
+# URL prefix for static files.
+# Example: "http://example.com/static/", "http://static.example.com/"
+STATIC_URL = '/static/'
+
+# Additional locations of static files
+STATICFILES_DIRS = (
+ # Put strings here, like "/home/html/static" or "C:/www/django/static".
+ # Always use forward slashes, even on Windows.
+ # Don't forget to use absolute paths, not relative paths.
+ # BASE_DIR + '/static/',
+)
+
+# List of finder classes that know how to find static files in
+# various locations.
+STATICFILES_FINDERS = (
+ 'django.contrib.staticfiles.finders.FileSystemFinder',
+ 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+ # 'django.contrib.staticfiles.finders.DefaultStorageFinder',
+ 'compressor.finders.CompressorFinder',
+)
+
+# Django 1.6+ defaults to a JSON serializer, but it won't work with
+# django-openid, see
+# https://bugs.launchpad.net/django-openid-auth/+bug/1252826
+SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
+
+
+LOGIN_URL = 'account_login'
+LOGIN_REDIRECT_URL = 'hk_root'
+LOGOUT_URL = 'account_logout'
+
+
+# If you enable internal authentication, this is the address that the emails
+# will appear to be coming from. Make sure you set a valid domain name,
+# otherwise the emails may get rejected.
+# https://docs.djangoproject.com/en/1.8/ref/settings/#default-from-email
+DEFAULT_FROM_EMAIL = "@SERVER_EMAIL@"
+
+# If you enable email reporting for error messages, this is where those emails
+# will appear to be coming from. Make sure you set a valid domain name,
+# otherwise the emails may get rejected.
+# https://docs.djangoproject.com/en/1.8/ref/settings/#std:setting-SERVER_EMAIL
+SERVER_EMAIL = "@SERVER_EMAIL@"
+
+
+MESSAGE_TAGS = {
+ messages.ERROR: 'danger'
+}
+
+
+#
+# Social auth
+#
+AUTHENTICATION_BACKENDS = (
+ 'django.contrib.auth.backends.ModelBackend',
+ 'allauth.account.auth_backends.AuthenticationBackend',
+)
+
+# Django Allauth
+ACCOUNT_AUTHENTICATION_METHOD = "username_email"
+ACCOUNT_EMAIL_REQUIRED = True
+ACCOUNT_EMAIL_VERIFICATION = "mandatory"
+ACCOUNT_DEFAULT_HTTP_PROTOCOL = "https"
+ACCOUNT_UNIQUE_EMAIL = True
+
+SOCIALACCOUNT_PROVIDERS = {
+ 'openid': {
+ 'SERVERS': [
+ dict(id='yahoo',
+ name='Yahoo',
+ openid_url='http://me.yahoo.com'),
+ ],
+ },
+ 'google': {
+ 'SCOPE': ['profile', 'email'],
+ 'AUTH_PARAMS': {'access_type': 'online'},
+ },
+ 'facebook': {
+ 'METHOD': 'oauth2',
+ 'SCOPE': ['email'],
+ 'FIELDS': [
+ 'email',
+ 'name',
+ 'first_name',
+ 'last_name',
+ 'locale',
+ 'timezone',
+ ],
+ 'VERSION': 'v2.4',
+ },
+ 'gitlab': {
+ 'GITLAB_URL': 'https://gitlab.com',
+ 'SCOPE': ['read_user'],
+ },
+}
+
+
+#
+# Gravatar
+# https://github.com/twaddington/django-gravatar
+#
+# Gravatar base url.
+# GRAVATAR_URL = 'http://cdn.libravatar.org/'
+# Gravatar base secure https url.
+# GRAVATAR_SECURE_URL = 'https://seccdn.libravatar.org/'
+# Gravatar size in pixels.
+# GRAVATAR_DEFAULT_SIZE = '80'
+# An image url or one of the following: 'mm', 'identicon', 'monsterid',
+# 'wavatar', 'retro'.
+# GRAVATAR_DEFAULT_IMAGE = 'mm'
+# One of the following: 'g', 'pg', 'r', 'x'.
+# GRAVATAR_DEFAULT_RATING = 'g'
+# True to use https by default, False for plain http.
+# GRAVATAR_DEFAULT_SECURE = True
+
+# These can be set to override the defaults but are not mandatory:
+# EMAIL_CONFIRMATION_TEMPLATE = 'postorius/address_confirmation_message.txt'
+# EMAIL_CONFIRMATION_SUBJECT = 'Confirmation needed'
+
+#
+# django-compressor
+# https://pypi.python.org/pypi/django_compressor
+#
+COMPRESS_PRECOMPILERS = (
+ ('text/x-scss', '/run/current-system/sw/bin/sassc -t compressed {infile} {outfile}'),
+ ('text/x-sass', '/run/current-system/sw/bin/sassc -t compressed {infile} {outfile}'),
+)
+# On a production setup, setting COMPRESS_OFFLINE to True will bring a
+# significant performance improvement, as CSS files will not need to be
+# recompiled on each requests. It means running an additional "compress"
+# management command after each code upgrade.
+# http://django-compressor.readthedocs.io/en/latest/usage/#offline-compression
+COMPRESS_ENABLED = True
+COMPRESS_OFFLINE = True
+
+# Needed for debug mode
+# INTERNAL_IPS = ('127.0.0.1',)
+
+
+#
+# Full-text search engine
+#
+HAYSTACK_CONNECTIONS = {
+ 'default': {
+ 'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
+ 'PATH': "/var/lib/mailman-web/fulltext_index",
+ # You can also use the Xapian engine, it's faster and more accurate,
+ # but requires another library.
+ # http://django-haystack.readthedocs.io/en/v2.4.1/installing_search_engines.html#xapian
+ # Example configuration for Xapian:
+ #'ENGINE': 'xapian_backend.XapianEngine'
+ },
+}
+
+
+#
+# REST framework
+#
+REST_FRAMEWORK = {
+ 'PAGE_SIZE': 10,
+ 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
+ 'DEFAULT_FILTER_BACKENDS': (
+ 'rest_framework.filters.OrderingFilter',
+ ),
+}
+
+
+#
+# Asynchronous tasks
+#
+Q_CLUSTER = {
+ 'timeout': 300,
+ 'save_limit': 100,
+ 'orm': 'default',
+}
+
+
+# A sample logging configuration. The only tangible logging
+# performed by this configuration is to send an email to
+# the site admins on every HTTP 500 error when DEBUG=False.
+# See http://docs.djangoproject.com/en/dev/topics/logging for
+# more details on how to customize your logging configuration.
+LOGGING = {
+ 'version': 1,
+ 'disable_existing_loggers': False,
+ 'filters': {
+ 'require_debug_false': {
+ '()': 'django.utils.log.RequireDebugFalse'
+ }
+ },
+ 'handlers': {
+ 'console': {
+ 'class': 'logging.StreamHandler',
+ 'formatter': 'simple',
+ },
+ 'mail_admins': {
+ 'level': 'ERROR',
+ 'filters': ['require_debug_false'],
+ 'class': 'django.utils.log.AdminEmailHandler'
+ },
+ 'file':{
+ 'level': 'INFO',
+ #'class': 'logging.handlers.RotatingFileHandler',
+ 'class': 'logging.handlers.WatchedFileHandler',
+ 'filename': 'mailman-web.log',
+ 'formatter': 'verbose',
+ },
+ },
+ 'loggers': {
+ 'django': {
+ 'handlers': ['console', 'file'],
+ 'level': 'INFO',
+ },
+ 'django.request': {
+ 'handlers': ['console', 'mail_admins', 'file'],
+ 'level': 'ERROR',
+ 'propagate': True,
+ },
+ 'postorius': {
+ 'handlers': ['console', 'file'],
+ 'level': 'INFO',
+ },
+ 'django': {
+ 'handlers': ['file'],
+ 'level': 'ERROR',
+ 'propagate': True,
+ },
+ 'hyperkitty': {
+ 'handlers': ['file'],
+ 'level': 'DEBUG',
+ 'propagate': True,
+ },
+ },
+ 'formatters': {
+ 'simple': {
+ 'format': '%(levelname)s: %(message)s'
+ },
+ 'verbose': {
+ 'format': '%(levelname)s %(asctime)s %(process)d %(name)s %(message)s'
+ },
+ 'simple': {
+ 'format': '%(levelname)s %(message)s'
+ },
+ },
+ #'root': {
+ # 'handlers': ['file'],
+ # 'level': 'INFO',
+ #},
+}
+
+
+POSTORIUS_TEMPLATE_BASE_URL = "http://localhost:8000"
+
+
+# Using the cache infrastructure can significantly improve performance on a
+# production setup. This is an example with a local Memcached server.
+#CACHES = {
+# 'default': {
+# 'BACKEND': 'django.core.cache.backends.memcached.PyLibMCCache',
+# 'LOCATION': '127.0.0.1:11211',
+# }
+#}
+
+
+# When DEBUG is True, don't actually send emails to the SMTP server, just store
+# them in a directory. This way you won't accidentally spam your mailing-lists
+# while you're fiddling with the code.
+if DEBUG == True:
+ EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
+ EMAIL_FILE_PATH = '/tmp/hyperkitty-emails'
+
+
+#
+# HyperKitty-specific
+#
+# Only display mailing-lists from the same virtual host as the webserver
+FILTER_VHOST = False
+# Disable singleton locking for Django-Q tasks.
+HYPERKITTY_DISABLE_SINGLETON_TASKS = False
+# Maximum time between two task runs with same function and arguments.
+# This setting is mostly meant for Mailman Developers and should be used
+# with caution.
+# Default set to 10mins.
+HYPERKITTY_TASK_LOCK_TIMEOUT = 10 * 60
+
+
+try:
+ from settings_local import *
+except ImportError:
+ pass
diff --git a/pkgs/servers/mail/mailman/urls.py b/pkgs/servers/mail/mailman/urls.py
new file mode 100644
index 000000000000..9e18da2a218a
--- /dev/null
+++ b/pkgs/servers/mail/mailman/urls.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 1998-2019 by the Free Software Foundation, Inc.
+#
+# This file is part of Postorius.
+#
+# Postorius is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# Postorius is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Postorius. If not, see .
+
+
+from django.conf.urls import include, url
+from django.contrib import admin
+from django.urls import reverse_lazy
+from django.views.generic import RedirectView
+
+
+urlpatterns = [
+ url(r'^$', RedirectView.as_view(url=reverse_lazy('hk_root'))),
+ url(r'^hyperkitty/', include('hyperkitty.urls')),
+ url(r'^postorius/', include('postorius.urls')),
+ url(r'', include('django_mailman3.urls')),
+ url(r'^accounts/', include('allauth.urls')),
+ # Django admin
+ url(r'^admin/', admin.site.urls),
+]
diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix
new file mode 100644
index 000000000000..b0ead765a605
--- /dev/null
+++ b/pkgs/servers/mail/mailman/web.nix
@@ -0,0 +1,37 @@
+{ stdenv, python, hyperkitty, postorius, buildPythonPackage
+, serverEMail ? "postmaster@example.org"
+, archiverKey ? "SecretArchiverAPIKey"
+, allowedHosts ? []
+}:
+
+let
+
+ allowedHostsString = stdenv.lib.concatMapStringsSep ", " (x: "\""+x+"\"") allowedHosts;
+
+in
+
+# We turn those Djando configuration files into a make-shift Python library so
+# that Nix users can use this package as a part of their buildInputs to import
+# the code. Also, this package implicitly provides an environment in which the
+# Django app can be run.
+
+buildPythonPackage {
+ name = "mailman-web-0";
+
+ propagatedBuildInputs = [ hyperkitty postorius ];
+
+ unpackPhase = ":";
+ buildPhase = ":";
+ setuptoolsCheckPhase = ":";
+
+ installPhase = ''
+ d=$out/${python.sitePackages}
+ install -D -m 444 ${./urls.py} $d/urls.py
+ install -D -m 444 ${./wsgi.py} $d/wsgi.py
+ substitute ${./settings.py} $d/settings.py \
+ --subst-var-by SERVER_EMAIL '${serverEMail}' \
+ --subst-var-by ARCHIVER_KEY '${archiverKey}' \
+ --subst-var-by ALLOWED_HOSTS '${allowedHostsString}'
+ chmod 444 $d/settings.py
+ '';
+}
diff --git a/pkgs/servers/mail/mailman/wsgi.py b/pkgs/servers/mail/mailman/wsgi.py
new file mode 100644
index 000000000000..5bdbc5114739
--- /dev/null
+++ b/pkgs/servers/mail/mailman/wsgi.py
@@ -0,0 +1,17 @@
+"""
+WSGI config for meh project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.9/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+application = get_wsgi_application()
diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix
index 98b270ad7d41..2c1c07e502a7 100644
--- a/pkgs/servers/mail/mlmmj/default.nix
+++ b/pkgs/servers/mail/mlmmj/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
- name = "mlmmj-${version}";
+ pname = "mlmmj";
version = "1.3.0";
src = fetchurl {
- url = "http://mlmmj.org/releases/${name}.tar.gz";
+ url = "http://mlmmj.org/releases/${pname}-${version}.tar.gz";
sha256 = "1sghqvwizvm1a9w56r34qy5njaq1c26bagj85r60h32gh3fx02bn";
};
diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix
index 4b753bdf0cdb..7738c4eb3d4a 100644
--- a/pkgs/servers/mail/nullmailer/default.nix
+++ b/pkgs/servers/mail/nullmailer/default.nix
@@ -5,7 +5,7 @@ assert tls -> gnutls != null;
stdenv.mkDerivation rec {
version = "2.2";
- name = "nullmailer-${version}";
+ pname = "nullmailer";
src = fetchurl {
url = "https://untroubled.org/nullmailer/nullmailer-${version}.tar.gz";
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 2e1b3a4f7980..fdc2b3fd2c42 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- name = "opensmtpd-${version}";
+ pname = "opensmtpd";
version = "6.4.2p1";
nativeBuildInputs = [ autoconf automake libtool bison ];
buildInputs = [ libasr libevent zlib libressl db pam ];
src = fetchurl {
- url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
+ url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
sha256 = "0pgv080ai7d98l9340jadp9wjiaqj2qvgpqhilcz0kps2mdiawbd";
};
diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix
index 1d4ad63c37d2..71b27facbab6 100644
--- a/pkgs/servers/mail/opensmtpd/extras.nix
+++ b/pkgs/servers/mail/opensmtpd/extras.nix
@@ -10,11 +10,11 @@
}:
stdenv.mkDerivation rec {
- name = "opensmtpd-extras-${version}";
+ pname = "opensmtpd-extras";
version = "6.4.0";
src = fetchurl {
- url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
+ url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
sha256 = "09k25l7zy5ch3fk6qphni2h0rxdp8wacmfag1whi608dgimrhrnb";
};
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index a4b0b921adb2..39845f12f03c 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -24,12 +24,12 @@ let
in stdenv.mkDerivation rec {
- name = "postfix-${version}";
+ pname = "postfix";
version = "3.4.6";
src = fetchurl {
- url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
+ url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
sha256 = "09p3vg2xlh6iq45gp6zanbp1728fc31r7zz71r131vh20ssajx6n";
};
diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix
index 8c00bcdbee25..8a92843e43ec 100644
--- a/pkgs/servers/mail/postfix/pfixtools.nix
+++ b/pkgs/servers/mail/postfix/pfixtools.nix
@@ -22,7 +22,8 @@ let
in
stdenv.mkDerivation {
- name = "pfixtools-${version}";
+ pname = "pfixtools";
+ inherit version;
src = pfixtoolsSrc;
@@ -41,7 +42,10 @@ stdenv.mkDerivation {
--replace /bin/bash ${bash}/bin/bash;
'';
- NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=nonnull-compare";
+ NIX_CFLAGS_COMPILE = [
+ "-Wno-error=unused-result" "-Wno-error=nonnull-compare"
+ "-Wno-error=format-truncation"
+ ];
makeFlags = "DESTDIR=$(out) prefix=";
diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix
index f13c57e3b35d..49854927e57f 100644
--- a/pkgs/servers/mail/postsrsd/default.nix
+++ b/pkgs/servers/mail/postsrsd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, help2man }:
stdenv.mkDerivation rec {
- name = "postsrsd-${version}";
+ pname = "postsrsd";
version = "1.6";
src = fetchFromGitHub {
diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/pkgs/servers/mail/pypolicyd-spf/default.nix
index d5e410a86c1f..5da94ca80269 100644
--- a/pkgs/servers/mail/pypolicyd-spf/default.nix
+++ b/pkgs/servers/mail/pypolicyd-spf/default.nix
@@ -1,12 +1,12 @@
{ lib, buildPythonApplication, fetchurl, pyspf }:
buildPythonApplication rec {
- name = "pypolicyd-spf-${version}";
+ pname = "pypolicyd-spf";
majorVersion = "2.0";
version = "${majorVersion}.2";
src = fetchurl {
- url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz";
+ url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "1nm8y1jjgx6mxrbcxrbdnmkf8vglwp0wiw6jipzh641wb24gi76z";
};
diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix
new file mode 100644
index 000000000000..9d7730e399f3
--- /dev/null
+++ b/pkgs/servers/mail/rmilter/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, cmake, bison, flex, pkgconfig, openssl, pcre
+, libmilter, opendkim, libmemcached, glib }:
+
+let patchedLibmilter = stdenv.lib.overrideDerivation libmilter (_ : {
+ patches = libmilter.patches ++ [ ./fd-passing-libmilter.patch ];
+});
+in
+
+stdenv.mkDerivation rec {
+ pname = "rmilter";
+ version = "1.10.0";
+
+ src = fetchFromGitHub {
+ owner = "vstakhov";
+ repo = "rmilter";
+ rev = version;
+ sha256 = "1gbp6jah88l6xqgflim01ycyp63l733bgir65fxnnrmifj1qzymh";
+ };
+
+ nativeBuildInputs = [ bison cmake flex pkgconfig ];
+ buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim glib ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/vstakhov/rmilter;
+ license = licenses.asl20;
+ description = ''
+ Daemon to integrate rspamd and milter compatible MTA, for example
+ postfix or sendmail
+ '';
+ maintainers = with maintainers; [ avnik fpletz ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 67a647b236b4..0823ed2fe4b8 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -1,10 +1,11 @@
{ stdenv, lib, fetchFromGitHub, cmake, perl
, file, glib, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu
-, hyperscan, libfann, gd, jemalloc, openblas
+, hyperscan, libfann, gd, jemalloc, openblas, lua
, withFann ? true
, withGd ? false
, withBlas ? true
, withHyperscan ? stdenv.isx86_64
+, withLuaJIT ? stdenv.isx86_64
}:
assert withHyperscan -> stdenv.isx86_64;
@@ -13,7 +14,7 @@ let libmagic = file; # libmagic provided by file package ATM
in
stdenv.mkDerivation rec {
- name = "rspamd-${version}";
+ pname = "rspamd";
version = "1.9.4";
src = fetchFromGitHub {
@@ -24,11 +25,12 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkgconfig perl ];
- buildInputs = [ glib libevent libmagic luajit openssl pcre sqlite ragel icu jemalloc ]
+ buildInputs = [ glib libevent libmagic openssl pcre sqlite ragel icu jemalloc ]
++ lib.optional withFann libfann
++ lib.optional withGd gd
++ lib.optional withHyperscan hyperscan
- ++ lib.optional withBlas openblas;
+ ++ lib.optional withBlas openblas
+ ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua;
cmakeFlags = [
"-DDEBIAN_BUILD=ON"
@@ -39,10 +41,11 @@ stdenv.mkDerivation rec {
"-DENABLE_JEMALLOC=ON"
] ++ lib.optional withFann "-DENABLE_FANN=ON"
++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON"
- ++ lib.optional withGd "-DENABLE_GD=ON";
+ ++ lib.optional withGd "-DENABLE_GD=ON"
+ ++ lib.optional (!withLuaJIT) "-DENABLE_TORCH=OFF";
meta = with stdenv.lib; {
- homepage = https://rspamd.com;
+ homepage = "https://rspamd.com";
license = licenses.asl20;
description = "Advanced spam filtering system";
maintainers = with maintainers; [ avnik fpletz globin ];
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 8da9cef58a75..ab9a69afdcb8 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -36,6 +36,7 @@ in buildPythonApplication rec {
];
propagatedBuildInputs = [
+ setuptools
bcrypt
bleach
canonicaljson
diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix
index 9e5a9ffe780d..673d3f1f21bb 100644
--- a/pkgs/servers/matterbridge/default.nix
+++ b/pkgs/servers/matterbridge/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchurl }:
buildGoPackage rec {
- name = "matterbridge-${version}";
+ pname = "matterbridge";
version = "1.11.0";
goPackagePath = "github.com/42wim/matterbridge";
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 2fc8232f0a28..2919647e5734 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -4,7 +4,8 @@ let
version = "5.9.0";
mattermost-server = buildGoPackage rec {
- name = "mattermost-server-${version}";
+ pname = "mattermost-server";
+ inherit version;
src = fetchFromGitHub {
owner = "mattermost";
@@ -23,7 +24,8 @@ let
};
mattermost-webapp = stdenv.mkDerivation {
- name = "mattermost-webapp-${version}";
+ pname = "mattermost-webapp";
+ inherit version;
src = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix
index 6707055eaa6b..bb6d1584a670 100644
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/pkgs/servers/mattermost/matterircd.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "matterircd-${version}";
+ pname = "matterircd";
version = "0.18.2";
src = fetchFromGitHub {
diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index 7499f203136c..5ee491a0b8a0 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -28,6 +28,7 @@ buildPythonPackage rec {
telethon-session-sqlalchemy
pillow
lxml
+ setuptools
];
# `alembic` (a database migration tool) is only needed for the initial setup,
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index 824f8ea20259..cdce369bbf96 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -1,24 +1,22 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
- name = "mautrix-unstable-${version}";
- version = "2019-07-04";
-
- goPackagePath = "maunium.net/go/mautrix-whatsapp";
+buildGoModule {
+ pname = "mautrix-unstable";
+ version = "2019-09-03";
src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
- rev = "29f5ae45c4b22f463003b23e355b951831f08b3e";
- sha256 = "12209m3x01i7bnnkg57ag1ivsk6n6pqaqfin7y02irgi3i3rm31r";
+ rev = "22fb5c125db1a0a3a8be8e8e09e92bb38718e6bf";
+ sha256 = "03wd6mn9jr1hr3qxg1r707ibi1s9511y97bfrmzka4mrsymgamxa";
};
- goDeps = ./deps.nix;
+ modSha256 = "14bqxx2hcr8yhcd5hi087pyc1hzqmr13p2fqb3nnsx12j7n07gww";
meta = with stdenv.lib; {
homepage = https://github.com/tulir/mautrix-whatsapp;
description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge";
license = licenses.agpl3;
- maintainers = with maintainers; [ vskilet ];
+ maintainers = with maintainers; [ vskilet ma27 ];
};
}
diff --git a/pkgs/servers/mautrix-whatsapp/deps.nix b/pkgs/servers/mautrix-whatsapp/deps.nix
deleted file mode 100644
index 2dd35846bf5d..000000000000
--- a/pkgs/servers/mautrix-whatsapp/deps.nix
+++ /dev/null
@@ -1,211 +0,0 @@
-# NOTE: this file isn't entirely generated, while performing the bump
-# from 2019-02-24 to 2019-06-01, a lot of stuff broke during `vgo2nix` as the
-# tool is unable to parse `replace` statements atm.
-#
-# The following sources were altered manually:
-# * github.com/Rhymen/go-whatsapp -> github.com/tulir/go-whatsapp (at 36ed380bdc18)
-# * github.com/golang/protobuf: v1.2.0 -> v1.3.1
-# * maunium.net/go/mautrix: v0.1.0-alpha3 -> ca5d9535b6cc
-# * maunium.net/go/mautrix-appservice: v0.1.0-alpha3 -> 6e6c9bb47548
-
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
- {
- goPackagePath = "github.com/Rhymen/go-whatsapp";
- fetch = {
- type = "git";
- url = "https://github.com/tulir/go-whatsapp";
- rev = "36ed380bdc188e35fe804d6dd4809ee170136670";
- sha256 = "1ida4j5hgqc5djwfsaqp8g6iynn150rwj42kqk9q2srwz5075n4p";
- };
- }
- {
- goPackagePath = "github.com/fatih/color";
- fetch = {
- type = "git";
- url = "https://github.com/fatih/color";
- rev = "v1.7.0";
- sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "v1.3.1";
- sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
- };
- }
- {
- goPackagePath = "github.com/gorilla/mux";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/mux";
- rev = "v1.6.2";
- sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
- };
- }
- {
- goPackagePath = "github.com/gorilla/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/websocket";
- rev = "v1.4.0";
- sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
- };
- }
- {
- goPackagePath = "github.com/lib/pq";
- fetch = {
- type = "git";
- url = "https://github.com/lib/pq";
- rev = "v1.1.1";
- sha256 = "0g64wlg1l1ybq4x44idksl4pgm055s58jxc6r6x4qhqm5q76h0km";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-colorable";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-colorable";
- rev = "v0.0.9";
- sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-isatty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-isatty";
- rev = "v0.0.4";
- sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-sqlite3";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-sqlite3";
- rev = "v1.10.0";
- sha256 = "1zmz6asplixfihxhj11spgfs0v3xzb3nv0hlq6n6zsg781ni31xx";
- };
- }
- {
- goPackagePath = "github.com/pkg/errors";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/errors";
- rev = "v0.8.1";
- sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
- };
- }
- {
- goPackagePath = "gopkg.in/russross/blackfriday.v2";
- fetch = {
- type = "git";
- url = "https://github.com/russross/blackfriday";
- rev = "v2.0.1";
- sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j";
- };
- }
- {
- goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
- fetch = {
- type = "git";
- url = "https://github.com/shurcooL/sanitized_anchor_name";
- rev = "v1.0.0";
- sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f";
- };
- }
- {
- goPackagePath = "github.com/skip2/go-qrcode";
- fetch = {
- type = "git";
- url = "https://github.com/skip2/go-qrcode";
- rev = "dc11ecdae0a9";
- sha256 = "0mc70hsn5x2a66a9sbwlq51cng2s1aq7rw4pr9pif4xdzflkl057";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "b8fe1690c613";
- sha256 = "1mbfpbrirsz8fsdkibm9l4sccpm774p9201mpmfh4hxshz3girq3";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "915654e7eabc";
- sha256 = "0fzd7n2yc4qnnf2wk21zxy6gb01xviq2z1dzrbqcn8p1s4fjsqw5";
- };
- }
- {
- goPackagePath = "golang.org/x/sync";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sync";
- rev = "37e7f081c4d4";
- sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm";
- };
- }
- {
- goPackagePath = "gopkg.in/check.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/check.v1";
- rev = "788fd7840127";
- sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "v2.2.2";
- sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
- };
- }
- {
- goPackagePath = "maunium.net/go/mauflag";
- fetch = {
- type = "git";
- url = "https://github.com/tulir/mauflag.git";
- rev = "v1.0.0";
- sha256 = "09jv1819jwq5i29y6ngf4j4ii6qwlshydvprfvsfplc419dkz1vx";
- };
- }
- {
- goPackagePath = "maunium.net/go/maulogger";
- fetch = {
- type = "git";
- url = "https://github.com/tulir/maulogger.git";
- rev = "v2.0.0";
- sha256 = "0qz4cpaqvcmrj3fb2bb6yrhw3k5h51crskricyqgg1b7aklphan5";
- };
- }
- {
- goPackagePath = "maunium.net/go/mautrix";
- fetch = {
- type = "git";
- url = "https://github.com/tulir/mautrix-go.git";
- rev = "ca5d9535b6ccee8fdf473f9cc935932ef3e53ae7";
- sha256 = "1qrh77c8vh2k6ffwf0cymjmhcp7d0rdad1ixqx5r1xig27f7v0qg";
- };
- }
- {
- goPackagePath = "maunium.net/go/mautrix-appservice";
- fetch = {
- type = "git";
- url = "https://github.com/tulir/mautrix-appservice-go.git";
- rev = "6e6c9bb4754849443cb3c64d9510f8d2eb3e668d";
- sha256 = "1zwsfvgxs2zbc6yvgnk16w2wkh891kihrzar3qzz9cvsgjznlyvy";
- };
- }
-]
diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix
index 33b7674cf9e5..33151c4063b3 100644
--- a/pkgs/servers/mediatomb/default.nix
+++ b/pkgs/servers/mediatomb/default.nix
@@ -3,7 +3,7 @@
, pkgconfig, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "mediatomb-${version}";
+ pname = "mediatomb";
version = "0.12.1";
src = fetchgit {
diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix
index 06e9f3fc961f..47530ba9db60 100644
--- a/pkgs/servers/meguca/default.nix
+++ b/pkgs/servers/meguca/default.nix
@@ -2,8 +2,8 @@
, ghostscript, graphicsmagick, quicktemplate, go-bindata, easyjson
, nodePackages, emscripten, opencv, statik }:
-buildGoPackage rec {
- name = "meguca-unstable-${version}";
+buildGoPackage {
+ pname = "meguca-unstable";
version = "2019-03-12";
goPackagePath = "github.com/bakape/meguca";
goDeps = ./server_deps.nix;
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index f30b5af6cad5..a9873261d78e 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.5.16";
- name = "memcached-${version}";
+ pname = "memcached";
src = fetchurl {
- url = "https://memcached.org/files/${name}.tar.gz";
+ url = "https://memcached.org/files/${pname}-${version}.tar.gz";
sha256 = "0nnccb697jhdn5gqrh3phibzs6xr4nf4ryv7nmyv5vf11n4jr8j5";
};
diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix
index fe1f1c6760d8..8430f2d61e8e 100644
--- a/pkgs/servers/mesos-dns/default.nix
+++ b/pkgs/servers/mesos-dns/default.nix
@@ -1,7 +1,7 @@
{ buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "mesos-dns-${version}";
+ pname = "mesos-dns";
version = "0.1.2";
rev = "v${version}";
diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index 76bd69891c18..5babc638e26f 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
- version = "0.32.10";
+ version = "0.33.2";
src = fetchurl {
url = "http://downloads.metabase.com/v${version}/metabase.jar";
- sha256 = "0dzwwwvsi9pr40xbqws02yzjgx89ygjiybjd0n73hj69v6j9f2rn";
+ sha256 = "0sbh3xc4scp3qflnd0v7bd224w43rby20nzxb7xn2c80jwninnnl";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix
index d367bcfd2e31..6f9c22ebecf0 100644
--- a/pkgs/servers/meteor/default.nix
+++ b/pkgs/servers/meteor/default.nix
@@ -4,7 +4,7 @@ let
version = "1.8.1";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit version;
pname = "meteor";
src = fetchurl {
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index a20793a849cf..b6a70864cc5c 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "minio-${version}";
+ pname = "minio";
version = "2019-02-26T19-51-46Z";
src = fetchFromGitHub {
diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix
index 10c8811c548f..0761468bd1ff 100644
--- a/pkgs/servers/mirrorbits/default.nix
+++ b/pkgs/servers/mirrorbits/default.nix
@@ -2,7 +2,7 @@
, pkgconfig, zlib, geoip }:
buildGoPackage rec {
- name = "mirrorbits-${version}";
+ pname = "mirrorbits";
version = "0.4";
rev = "v${version}";
@@ -24,6 +24,11 @@ buildGoPackage rec {
rm -rf testing
'';
+ # Fix build with go >=1.12
+ preBuild = ''
+ sed -i s/"_Ctype_struct_GeoIPRecordTag"/"C.struct_GeoIPRecordTag"/ ./go/src/github.com/etix/geoip/geoip.go
+ '';
+
goPackagePath = "github.com/etix/mirrorbits";
goDeps = ./deps.nix;
diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix
index a7fb0b3b3a77..1afe1e8b9462 100644
--- a/pkgs/servers/misc/airsonic/default.nix
+++ b/pkgs/servers/misc/airsonic/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "airsonic-${version}";
+ pname = "airsonic";
version = "10.4.0";
src = fetchurl {
diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix
index 50e754791e6d..be5188f177ac 100644
--- a/pkgs/servers/misc/subsonic/default.nix
+++ b/pkgs/servers/misc/subsonic/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre }:
stdenv.mkDerivation rec {
- name = "subsonic-${version}";
+ pname = "subsonic";
version = "6.1.5";
src = fetchurl {
@@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
# for a directory to be created in the unpack phase.
unpackPhase = ''
runHook preUnpack
- mkdir ${name}
- tar -C ${name} -xzf $src
+ mkdir ${pname}-${version}
+ tar -C ${pname}-${version} -xzf $src
runHook postUnpack
'';
installPhase = ''
runHook preInstall
mkdir $out
- cp -r ${name}/* $out
+ cp -r ${pname}-${version}/* $out
runHook postInstall
'';
diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix
index f15b7ca2e821..0ab921a6f6f8 100644
--- a/pkgs/servers/misc/taskserver/default.nix
+++ b/pkgs/servers/misc/taskserver/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, libuuid, gnutls, makeWrapper }:
stdenv.mkDerivation rec {
- name = "taskserver-${version}";
+ pname = "taskserver";
version = "1.1.0";
enableParallelBuilding = true;
diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix
index c8eb07319245..957bb59b1214 100644
--- a/pkgs/servers/monitoring/bosun/default.nix
+++ b/pkgs/servers/monitoring/bosun/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "bosun-${version}";
+ pname = "bosun";
version = "0.5.0";
src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index d6f3e18e49bc..029d87009560 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -1,7 +1,7 @@
{ stdenv, go, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "cadvisor-${version}";
+ pname = "cadvisor";
version = "0.34.0";
src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix
index a888549bb6aa..707d0129f70b 100644
--- a/pkgs/servers/monitoring/consul-alerts/default.nix
+++ b/pkgs/servers/monitoring/consul-alerts/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "consul-alerts-${version}";
+ pname = "consul-alerts";
version = "0.5.0";
rev = "v${version}";
diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix
index efa62e261b74..5d6f0fc3bfe9 100644
--- a/pkgs/servers/monitoring/facette/default.nix
+++ b/pkgs/servers/monitoring/facette/default.nix
@@ -2,12 +2,12 @@
, go, pkgconfig, nodejs, nodePackages, pandoc, rrdtool }:
stdenv.mkDerivation rec {
- name = "facette-${version}";
+ pname = "facette";
version = "0.4.1";
src = fetchFromGitHub {
owner = "facette";
repo = "facette";
- rev = "${version}";
+ rev = version;
sha256 = "0p28s2vn18cqg8p7bzhb38wky0m98d5xv3wvf1nmg1kmwhwim6mi";
};
nativeBuildInputs = [ go pkgconfig nodejs nodePackages.npm pandoc ];
diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix
index 1004947d5b12..502ff10b0929 100644
--- a/pkgs/servers/monitoring/grafana-reporter/default.nix
+++ b/pkgs/servers/monitoring/grafana-reporter/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildGoPackage rec {
- name = "reporter-${version}";
+ pname = "reporter";
version = "2.1.0";
rev = "v${version}";
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 910c89157793..615edeb81ec1 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,8 +1,9 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
buildGoPackage rec {
- version = "6.3.4";
- name = "grafana-${version}";
+ pname = "grafana";
+ version = "6.3.5";
+
goPackagePath = "github.com/grafana/grafana";
excludedPackages = [ "release_publisher" ];
@@ -11,12 +12,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "06xbz6y1vmj44ppm2gbb71qiv8myd5ysygi3s06d6dia07ngw3v2";
+ sha256 = "0qimqdlxkvh31n730gp1wl1va0bza69bw90nyzrmfb34733pmni2";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "0lhfy3crwis6464icxq0h3hgxvk2dgk6w7k6z2mmaxqm0j15scc8";
+ sha256 = "1rw2ws610ba2vl5kv3yay8s69xkqzisrl6q27zxa5kj48khvy101";
};
postPatch = ''
diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix
index 969a58aff85d..f33a418fe5ce 100644
--- a/pkgs/servers/monitoring/kapacitor/default.nix
+++ b/pkgs/servers/monitoring/kapacitor/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "kapacitor-${version}";
+ pname = "kapacitor";
version = "1.5.1";
goPackagePath = "github.com/influxdata/kapacitor";
diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix
index af5f2880a0f8..cc67bdfa56db 100644
--- a/pkgs/servers/monitoring/lcdproc/default.nix
+++ b/pkgs/servers/monitoring/lcdproc/default.nix
@@ -2,7 +2,7 @@
, doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }:
stdenv.mkDerivation rec {
- name = "lcdproc-${version}";
+ pname = "lcdproc";
version = "0.5.9";
src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix
index 97ddba0ff738..35de5f231b47 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
version = "0.3.0";
- name = "grafana-loki-${version}";
+ pname = "grafana-loki";
goPackagePath = "github.com/grafana/loki";
doCheck = true;
diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix
index 45e380379d2f..5459d58ceb9f 100644
--- a/pkgs/servers/monitoring/longview/default.nix
+++ b/pkgs/servers/monitoring/longview/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.1.5";
- name = "longview-${version}";
+ pname = "longview";
src = fetchFromGitHub {
owner = "linode";
diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix
index 5044aef2bb53..31a6501ea3a5 100644
--- a/pkgs/servers/monitoring/mtail/default.nix
+++ b/pkgs/servers/monitoring/mtail/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, gotools, buildGoPackage }:
buildGoPackage rec {
- name = "mtail-${version}";
+ pname = "mtail";
version = "3.0.0-rc4";
goPackagePath = "github.com/google/mtail";
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 34beada87e82..183cc3a2b955 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "2.0.49";
- name = "munin-${version}";
+ pname = "munin";
src = fetchFromGitHub {
owner = "munin-monitoring";
diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index 92713a43ea22..475d79a090af 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip }:
stdenv.mkDerivation rec {
- name = "nagios-${version}";
+ pname = "nagios";
version = "4.4.4";
src = fetchurl {
- url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz";
+ url = "mirror://sourceforge/nagios/nagios-4.x/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "0nkbv8lzpiknddiq0466dlpp3hw8lqmaidk8931hp4664cdsaw57";
};
diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
index cdfd8ab9beeb..35d02a5f9e2c 100644
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, file, openssl, makeWrapper, which, curl, fetchpatch }:
stdenv.mkDerivation rec {
- name = "check_ssl_cert-${version}";
+ pname = "check_ssl_cert";
version = "1.80.0";
src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix
index 401f9ffc4066..2dc1bdf9681c 100644
--- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix
+++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "newrelic-sysmond-${version}";
+ pname = "newrelic-sysmond";
version = "2.3.0.132";
src = fetchurl {
diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix
index cb12fe819a95..9f23cc3e54c3 100644
--- a/pkgs/servers/monitoring/plugins/default.nix
+++ b/pkgs/servers/monitoring/plugins/default.nix
@@ -11,7 +11,7 @@ let
binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net_snmp procps ];
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "monitoring-plugins-${majorVersion}${minorVersion}";
src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix
index 888cef61fcb6..dfa13c805e59 100644
--- a/pkgs/servers/monitoring/plugins/esxi.nix
+++ b/pkgs/servers/monitoring/plugins/esxi.nix
@@ -2,7 +2,7 @@
let
bName = "check_esxi_hardware";
- pName = stdenv.lib.replaceStrings [ "_" ] [ "-" ] "${bName}";
+ pName = stdenv.lib.replaceStrings [ "_" ] [ "-" ] bName;
in python2Packages.buildPythonApplication rec {
name = "${pName}-${version}";
diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
index c47e627f8169..b09990e31209 100644
--- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix
+++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
@@ -5,18 +5,16 @@ let
glplugin = fetchFromGitHub {
owner = "lausser";
repo = "GLPlugin";
- rev = "e8e1a2907a54435c932b3e6c584ba1d679754849";
- sha256 = "0wb55a9pmgbilfffx0wkiikg9830qd66j635ypczqp4basslpq5b";
+ rev = "ef3107f01afe55fad5452e64ac5bbea00b18a8d5";
+ sha256 = "047fwrycsl2vmpi4wl46fs6f8y191d6qc9ms5rvmrj1dm2r828ws";
};
generic = { pname, version, sha256, description, buildInputs, ... }:
- let
- name' = "${stdenv.lib.replaceStrings [ "-" ] [ "_" ] "${pname}"}-${version}";
- in stdenv.mkDerivation {
- name = "${pname}-${version}";
+ stdenv.mkDerivation {
+ inherit pname version;
src = fetchurl {
- url = "https://labs.consol.de/assets/downloads/nagios/${name'}.tar.gz";
+ url = "https://labs.consol.de/assets/downloads/nagios/${pname}-${version}.tar.bz";
inherit sha256;
};
@@ -55,24 +53,24 @@ let
in {
check-mssql-health = generic {
pname = "check_mssql_health";
- version = "2.6.4.14";
- sha256 = "0w6gybrs7imx169l8740s0ax3adya867fw0abrampx59mnsj5pm1";
+ version = "2.6.4.15";
+ sha256 = "12z0b3c2p18viy7s93r6bbl8fvgsqh80136d07118qhxshp1pwxg";
description = "Check plugin for Microsoft SQL Server.";
buildInputs = [ perlPackages.DBDsybase ];
};
check-nwc-health = generic {
pname = "check_nwc_health";
- version = "7.0.1.3";
- sha256 = "0rgd6zgd7kplx3z72n8zbzwkh8vnd83361sk9ibh6ng78sds1sl5";
+ version = "7.10.0.6";
+ sha256 = "092rhaqnk3403z0y60x38vgh65gcia3wrd6gp8mr7wszja38kxv2";
description = "Check plugin for network equipment.";
buildInputs = [ perlPackages.NetSNMP ];
};
check-ups-health = generic {
pname = "check_ups_health";
- version = "2.8.2.2";
- sha256 = "1gc2wjsymay2vk5ywc1jj9cvrbhs0fs851x8l4nc75df2g75v521";
+ version = "2.8.3.3";
+ sha256 = "0qc2aglppwr9ms4p53kh9nr48625sqrbn46xs0k9rx5sv8hil9hm";
description = "Check plugin for UPSs.";
buildInputs = [ perlPackages.NetSNMP ];
};
diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix
index 9f03c9ea96f6..9b4f3144a372 100644
--- a/pkgs/servers/monitoring/plugins/uptime.nix
+++ b/pkgs/servers/monitoring/plugins/uptime.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
-stdenv.mkDerivation rec {
- name = "check-uptime-${version}";
+stdenv.mkDerivation {
+ pname = "check-uptime";
version = "20161112";
src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/plugins/wmic-bin.nix b/pkgs/servers/monitoring/plugins/wmic-bin.nix
new file mode 100644
index 000000000000..c8f4eb77c468
--- /dev/null
+++ b/pkgs/servers/monitoring/plugins/wmic-bin.nix
@@ -0,0 +1,46 @@
+{ stdenv, lib, fetchFromGitHub, autoPatchelfHook, popt }:
+
+stdenv.mkDerivation rec {
+ pname = "wmic-bin";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "R-Vision";
+ repo = "wmi-client";
+ rev = version;
+ sha256 = "1w1mdbiwz37wzry1q38h8dyjaa6iggmsb9wcyhhlawwm1vj50w48";
+ };
+
+ buildInputs = [ popt ];
+
+ nativeBuildInputs = [ autoPatchelfHook ];
+
+ dontConfigure = true;
+ dontBuild = true;
+ doInstallCheck = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm755 bin/wmic_ubuntu_x64 $out/bin/wmic
+ install -Dm644 -t $out/share/doc/wmic LICENSE README.md
+
+ runHook postInstall
+ '';
+
+ installCheckPhase = ''
+ runHook preInstallCheck
+
+ $out/bin/wmic --help >/dev/null
+
+ runHook postInstallCheck
+ '';
+
+ meta = with stdenv.lib; {
+ description = "WMI client for Linux (binary)";
+ homepage = "https://www.openvas.org";
+ license = licenses.mit;
+ maintainers = with maintainers; [ peterhoeg ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index acdb3423107d..f1dbf0e51445 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -1,7 +1,7 @@
{ stdenv, go, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "alertmanager-${version}";
+ pname = "alertmanager";
version = "0.18.0";
rev = "v${version}";
diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
new file mode 100644
index 000000000000..21c469694c83
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ pname = "aws-s3-exporter";
+ version = "0.3.0";
+
+ goPackagePath = "github.com/ribbybibby/s3_exporter";
+
+ goDeps = ./aws-s3-exporter_deps.nix;
+
+ src = fetchFromGitHub {
+ owner = "ribbybibby";
+ repo = "s3_exporter";
+ rev = "v${version}";
+ sha256 = "062qi4rfqkxwknncwcvx4g132bxhkn2bhbxi4l90wl93v6sdp9l2";
+ };
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "Exports Prometheus metrics about S3 buckets and objects";
+ homepage = "https://github.com/ribbybibby/s3_exporter";
+ license = licenses.asl20;
+ maintainers = [ maintainers.mmahut ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix
new file mode 100644
index 000000000000..5ca160cb16f9
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix
@@ -0,0 +1,336 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+ {
+ goPackagePath = "github.com/alecthomas/template";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/template";
+ rev = "a0175ee3bccc";
+ sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/units";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/units";
+ rev = "2efee857e7cf";
+ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+ };
+ }
+ {
+ goPackagePath = "github.com/aws/aws-sdk-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/aws/aws-sdk-go";
+ rev = "v1.20.1";
+ sha256 = "0nhdkkcm11d2n2974kph6jjhddkp1fjbcpfgmalabc798gmqfg54";
+ };
+ }
+ {
+ goPackagePath = "github.com/beorn7/perks";
+ fetch = {
+ type = "git";
+ url = "https://github.com/beorn7/perks";
+ rev = "v1.0.0";
+ sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "v1.1.1";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-kit/kit";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-kit/kit";
+ rev = "v0.8.0";
+ sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-logfmt/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-logfmt/logfmt";
+ rev = "v0.3.0";
+ sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-stack/stack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-stack/stack";
+ rev = "v1.8.0";
+ sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
+ };
+ }
+ {
+ goPackagePath = "github.com/gogo/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gogo/protobuf";
+ rev = "v1.1.1";
+ sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "v1.3.1";
+ sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
+ };
+ }
+ {
+ goPackagePath = "github.com/jmespath/go-jmespath";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jmespath/go-jmespath";
+ rev = "c2b33e8439af";
+ sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";
+ };
+ }
+ {
+ goPackagePath = "github.com/json-iterator/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/json-iterator/go";
+ rev = "v1.1.6";
+ sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r";
+ };
+ }
+ {
+ goPackagePath = "github.com/julienschmidt/httprouter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/julienschmidt/httprouter";
+ rev = "v1.2.0";
+ sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
+ };
+ }
+ {
+ goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+ fetch = {
+ type = "git";
+ url = "https://github.com/konsorten/go-windows-terminal-sequences";
+ rev = "v1.0.2";
+ sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/logfmt";
+ rev = "b84e30acd515";
+ sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
+ };
+ }
+ {
+ goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/matttproud/golang_protobuf_extensions";
+ rev = "v1.0.1";
+ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+ };
+ }
+ {
+ goPackagePath = "github.com/modern-go/concurrent";
+ fetch = {
+ type = "git";
+ url = "https://github.com/modern-go/concurrent";
+ rev = "bacd9c7ef1dd";
+ sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+ };
+ }
+ {
+ goPackagePath = "github.com/modern-go/reflect2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/modern-go/reflect2";
+ rev = "v1.0.1";
+ sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
+ };
+ }
+ {
+ goPackagePath = "github.com/mwitkow/go-conntrack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mwitkow/go-conntrack";
+ rev = "cc309e4a2223";
+ sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "v0.8.0";
+ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+ };
+ }
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "v1.0.0";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_golang";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_golang";
+ rev = "v0.9.4";
+ sha256 = "0s134fj4i7k6pxdmxwkdi7amb1882yq33spv15hg3pkpbd3h311p";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_model";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_model";
+ rev = "fd36f4220a90";
+ sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/common";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/common";
+ rev = "v0.4.1";
+ sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/procfs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/procfs";
+ rev = "v0.0.2";
+ sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
+ };
+ }
+ {
+ goPackagePath = "github.com/sirupsen/logrus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sirupsen/logrus";
+ rev = "v1.4.2";
+ sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/objx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/objx";
+ rev = "v0.1.1";
+ sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "v1.3.0";
+ sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "c2843e01d9a2";
+ sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "d28f0bde5980";
+ sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "37e7f081c4d4";
+ sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "b47fdc937951";
+ sha256 = "17k4qwql2zizrxwjd0qv0gccwgyyv2axiha1vh5lrjfps1h5kli7";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "v0.3.2";
+ sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/tools";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/tools";
+ rev = "90fa682c2a6e";
+ sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/alecthomas/kingpin.v2";
+ rev = "v2.2.6";
+ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/check.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/check.v1";
+ rev = "20d25e280405";
+ sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "v2.2.1";
+ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ };
+ }
+]
diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
index db58c7e14e5f..07c8a14ce0b3 100644
--- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "bind_exporter-${version}";
+ pname = "bind_exporter";
version = "20161221-${stdenv.lib.strings.substring 0 7 rev}";
rev = "4e1717c7cd5f31c47d0c37274464cbaabdd462ba";
diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 9803ba09e16a..983eb6bf6c84 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "blackbox_exporter-${version}";
- version = "0.14.0";
+ pname = "blackbox_exporter";
+ version = "0.15.0";
rev = version;
goPackagePath = "github.com/prometheus/blackbox_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "prometheus";
repo = "blackbox_exporter";
- sha256 = "1v5n59p9jl6y1ka9mqp0ibx1kpcb3gbpl0i6bhqpbr154frmqm4x";
+ sha256 = "06llb37xpn5zjnqkw526vbk4mfdiwrv3yg7aw4365p3gz5dk085i";
};
doCheck = true;
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
index 0d6fbac60e5d..ce4bacfc9b7c 100644
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "collectd-exporter-${version}";
+ pname = "collectd-exporter";
version = "0.3.1";
rev = version;
diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix
index 47abcb33ee79..aaee2e8d770d 100644
--- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "consul_exporter-${version}";
+ pname = "consul_exporter";
version = "0.3.0";
goPackagePath = "github.com/prometheus/consul_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 627186e47ac3..e55d0018b882 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,54 +1,46 @@
-{ stdenv, go, buildGoPackage, fetchFromGitHub }:
+{ lib, go, buildGoPackage, fetchFromGitHub }:
let
goPackagePath = "github.com/prometheus/prometheus";
-in rec {
- buildPrometheus = { version, sha256, doCheck ? true, ... }@attrs:
- let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in
- buildGoPackage ({
- name = "prometheus-${version}";
+in
+buildGoPackage rec {
+ pname = "prometheus";
+ version = "2.12.0";
- inherit goPackagePath;
+ inherit goPackagePath;
- src = fetchFromGitHub {
- rev = "v${version}";
- owner = "prometheus";
- repo = "prometheus";
- inherit sha256;
- };
-
- buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in ''
- -ldflags=
- -X ${t}.Version=${version}
- -X ${t}.Revision=unknown
- -X ${t}.Branch=unknown
- -X ${t}.BuildUser=nix@nixpkgs
- -X ${t}.BuildDate=unknown
- -X ${t}.GoVersion=${stdenv.lib.getVersion go}
- '';
-
- preInstall = ''
- mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
- cp -a $src/documentation/* $bin/share/doc/prometheus
- cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
- '';
-
- meta = with stdenv.lib; {
- description = "Service monitoring system and time series database";
- homepage = https://prometheus.io;
- license = licenses.asl20;
- maintainers = with maintainers; [ benley fpletz globin ];
- platforms = platforms.unix;
- };
- } // attrs');
-
- prometheus_1 = buildPrometheus {
- version = "1.8.2";
- sha256 = "088flpg3qgnj9afl9vbaa19v2s1d21yxy38nrlv5m7cxwy2pi5pv";
- };
-
- prometheus_2 = buildPrometheus {
- version = "2.12.0";
+ src = fetchFromGitHub {
+ rev = "v${version}";
+ owner = "prometheus";
+ repo = "prometheus";
sha256 = "1ci9dc512c1hry1b8jqif0mrnks6w3yagwm3jf69ihcwilr2n7vs";
};
+
+ buildFlagsArray = let
+ t = "${goPackagePath}/vendor/github.com/prometheus/common/version";
+ in ''
+ -ldflags=
+ -X ${t}.Version=${version}
+ -X ${t}.Revision=unknown
+ -X ${t}.Branch=unknown
+ -X ${t}.BuildUser=nix@nixpkgs
+ -X ${t}.BuildDate=unknown
+ -X ${t}.GoVersion=${lib.getVersion go}
+ '';
+
+ preInstall = ''
+ mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
+ cp -a $src/documentation/* $bin/share/doc/prometheus
+ cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
+ '';
+
+ doCheck = true;
+
+ meta = with lib; {
+ description = "Service monitoring system and time series database";
+ homepage = "https://prometheus.io";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ benley fpletz globin willibutz ];
+ platforms = platforms.unix;
+ };
}
diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
index 4e32630ae227..d1cb5dcec9cb 100644
--- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "dnsmasq_exporter-${version}";
+ pname = "dnsmasq_exporter";
version = "0.1.0";
goPackagePath = "github.com/google/dnsmasq_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
index 6b9b2f6b799f..479ff174d114 100644
--- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "dovecot_exporter-${version}";
+ pname = "dovecot_exporter";
version = "0.1.3";
goPackagePath = "github.com/kumina/dovecot_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
index 071035b2a4ac..95b0db7dbc60 100644
--- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "fritzbox-exporter-${version}";
+ pname = "fritzbox-exporter";
version = "v1.0-32-g90fc0c5";
rev = "90fc0c572d3340803f7c2aafc4b097db7af1f871";
diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
index b2a0e3875891..4a84db38f78d 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "haproxy_exporter-${version}";
+ pname = "haproxy_exporter";
version = "0.8.0";
rev = "v${version}";
diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix
index aeb7b7445a5d..4d92532c90e1 100644
--- a/pkgs/servers/monitoring/prometheus/json-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix
@@ -1,8 +1,8 @@
# This file was generated by go2nix.
{ buildGoPackage, fetchFromGitHub, fetchpatch, lib }:
-buildGoPackage rec {
- name = "prometheus-json-exporter-${version}";
+buildGoPackage {
+ pname = "prometheus-json-exporter";
version = "unstable-2017-10-06";
goPackagePath = "github.com/kawamuray/prometheus-json-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix
index 85720108def8..1e29eefba2b2 100644
--- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
- name = "mailexporter-${version}";
+buildGoPackage {
+ pname = "mailexporter";
version = "2019-07-14";
goPackagePath = "github.com/cherti/mailexporter";
diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
index ade9bb87d993..04fbc7fbed93 100644
--- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "mesos_exporter-${version}";
+ pname = "mesos_exporter";
version = "0.1.0";
rev = version;
diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
index 8b6c54d41f91..7d4607738027 100644
--- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
buildGoPackage rec {
- name = "minio-exporter-${version}";
+ pname = "minio-exporter";
version = "0.2.0";
rev = "v${version}";
diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
index 6108e0d9de39..f5c438a87dc1 100644
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "mysqld_exporter-${version}";
+ pname = "mysqld_exporter";
version = "0.11.0";
rev = "v${version}";
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index 9de720306d8d..cc527c29ac21 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "nginx_exporter-${version}";
+ pname = "nginx_exporter";
version = "0.4.2";
goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter";
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index fd90e4c39bb1..857a7667c13f 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "node_exporter-${version}";
+ pname = "node_exporter";
version = "0.18.1";
rev = "v${version}";
diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
index 36009c421ef5..5d62ff8c50f9 100644
--- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "openvpn_exporter-unstable-${version}";
+ pname = "openvpn_exporter-unstable";
version = "2017-05-15";
rev = "a2a179a222144fa9a10030367045f075375a2803";
diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
index 9a34f0c948d1..8202a8c8c29f 100644
--- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
@@ -4,7 +4,7 @@
with stdenv.lib;
buildGoPackage rec {
- name = "postfix_exporter-${version}";
+ pname = "postfix_exporter";
version = "0.1.2";
goPackagePath = "github.com/kumina/postfix_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
index 0887d971ddf7..abc7db8086bb 100644
--- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildGoPackage rec {
- name = "postgres_exporter-${version}";
+ pname = "postgres_exporter";
version = "0.5.1";
goPackagePath = "github.com/wrouesnel/postgres_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/pkgs/servers/monitoring/prometheus/process-exporter.nix
new file mode 100644
index 000000000000..a29ab6496332
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/process-exporter.nix
@@ -0,0 +1,31 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ pname = "process-exporter";
+ version = "0.5.0";
+
+ goPackagePath = "github.com/ncabatoff/process-exporter";
+
+ goDeps = ./process-exporter_deps.nix;
+
+ src = fetchFromGitHub {
+ owner = "ncabatoff";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "129vqry3l8waxcyvx83wg0dvh3qg4pr3rl5fw7vmhgdzygbaq3bq";
+ };
+
+ postPatch = ''
+ substituteInPlace proc/read_test.go --replace /bin/cat cat
+ '';
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "Prometheus exporter that mines /proc to report on selected processes";
+ homepage = "https://github.com/ncabatoff/process-exporter";
+ license = licenses.mit;
+ maintainers = with maintainers; [ maintainers."1000101" ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix
new file mode 100644
index 000000000000..c8880119207b
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix
@@ -0,0 +1,156 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+ {
+ goPackagePath = "github.com/beorn7/perks";
+ fetch = {
+ type = "git";
+ url = "https://github.com/beorn7/perks";
+ rev = "3a771d992973";
+ sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "v1.1.0";
+ sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-cmp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-cmp";
+ rev = "v0.2.0";
+ sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pretty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pretty";
+ rev = "v0.1.0";
+ sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pty";
+ rev = "v1.1.1";
+ sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/text";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/text";
+ rev = "v0.1.0";
+ sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+ };
+ }
+ {
+ goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/matttproud/golang_protobuf_extensions";
+ rev = "v1.0.1";
+ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+ };
+ }
+ {
+ goPackagePath = "github.com/ncabatoff/fakescraper";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ncabatoff/fakescraper";
+ rev = "15938421d91a";
+ sha256 = "1in2iakq6xly9r8gk0mfim8n0glbjzpa07hkaj1rlrm0i11jlc6f";
+ };
+ }
+ {
+ goPackagePath = "github.com/ncabatoff/go-seq";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ncabatoff/go-seq";
+ rev = "b08ef85ed833";
+ sha256 = "1x88x285n4wf221pp7ccmh2ai7rgcnwz764gn8k861qg30jl1ky6";
+ };
+ }
+ {
+ goPackagePath = "github.com/ncabatoff/procfs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ncabatoff/procfs";
+ rev = "9ced60d7b905";
+ sha256 = "19756h4lw5v8f0xr70cl8gd0wfqcnszrhhgawqhyinnir82rz728";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_golang";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_golang";
+ rev = "v0.8.0";
+ sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_model";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_model";
+ rev = "5c3871d89910";
+ sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/common";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/common";
+ rev = "c7de2306084e";
+ sha256 = "11dqfm2d0m4sjjgyrnayman96g59x2apmvvqby9qmww2qj2k83ig";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/procfs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/procfs";
+ rev = "ea9eea638872";
+ sha256 = "1j99qszynx2asac82bhzhk0g1nav87nfgkb1cz5a2iywj81liirj";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "37e7f081c4d4";
+ sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/check.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/check.v1";
+ rev = "788fd7840127";
+ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "v2.2.1";
+ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ };
+ }
+]
diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix
index 5e4ebb581400..c101e55bc871 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json.nix
@@ -1,9 +1,9 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "prom2json-${version}";
+ pname = "prom2json";
version = "0.1.0";
- rev = "${version}";
+ rev = version;
goPackagePath = "github.com/prometheus/prom2json";
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 1c00f734c19e..48afc610c615 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -1,7 +1,7 @@
{ stdenv, go, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "pushgateway-${version}";
+ pname = "pushgateway";
version = "0.8.0";
rev = "v${version}";
diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
index 34120ad3fdae..c6af09743ce9 100644
--- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
@@ -1,8 +1,8 @@
# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
- name = "rabbitmq_exporter-${version}";
+buildGoPackage {
+ pname = "rabbitmq_exporter";
version = "0.25.2";
goPackagePath = "github.com/kbudde/rabbitmq_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index be8fbd3d85cb..dfa81d4da832 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub, net_snmp }:
buildGoPackage rec {
- name = "snmp_exporter-${version}";
- version = "0.13.0";
+ pname = "snmp_exporter";
+ version = "0.15.0";
goPackagePath = "github.com/prometheus/snmp_exporter";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "prometheus";
repo = "snmp_exporter";
rev = "v${version}";
- sha256 = "071v9qqhp2hcbgml94dm1l212qi18by88r9755npq9ycrsmawkll";
+ sha256 = "1cnz1wapxs3fkghzy6v90s56vd0ngynypyapcpbmx5y66rlpdxx6";
};
buildInputs = [ net_snmp ];
diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
index 792e0b33aee1..f4aa8344f777 100644
--- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "statsd_exporter-${version}";
+ pname = "statsd_exporter";
version = "0.9.0";
rev = version;
diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
index 0c5cc6267659..07b5055831e7 100644
--- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "surfboard_exporter-${version}";
+ pname = "surfboard_exporter";
version = "2.0.0";
goPackagePath = "github.com/ipstatic/surfboard_exporter";
diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
index 1cf4c022e8fa..5682c3ccd2a0 100644
--- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "unifi-exporter-${version}";
+ pname = "unifi-exporter";
version = "0.4.0+git1";
rev = "9a4e69fdea91dd0033bda4842998d751b40a6130";
diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
index b7221a9d8361..d5272e9b08a2 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- name = "riemann-${version}";
+ pname = "riemann";
version = "0.3.3";
src = fetchurl {
- url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2";
+ url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2";
sha256 = "11xcmmp5k78vr5ch42zwx9ym84y6kf81z9zwawqybvx7wmlbpdiq";
};
diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix
index ab8365c23f81..eb98e45c36c3 100644
--- a/pkgs/servers/monitoring/seyren/default.nix
+++ b/pkgs/servers/monitoring/seyren/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- name = "seyren-${version}";
+ pname = "seyren";
version = "1.1.0";
src = fetchurl {
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index ee3b9d818ce1..bf2a5935d1d2 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "telegraf-${version}";
+ pname = "telegraf";
version = "1.10.2";
goPackagePath = "github.com/influxdata/telegraf";
@@ -13,7 +13,7 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "influxdata";
repo = "telegraf";
- rev = "${version}";
+ rev = version;
sha256 = "0g27yczb49xf8nbhkzx7lv8378613afq9qx1gr5yhlpfrl4sgb69";
};
diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix
index 1de1edfa8e11..95f8ca4432b3 100644
--- a/pkgs/servers/monitoring/uchiwa/default.nix
+++ b/pkgs/servers/monitoring/uchiwa/default.nix
@@ -7,11 +7,12 @@ let
src = fetchFromGitHub {
inherit owner repo sha256;
- rev = "${version}";
+ rev = version;
};
backend = buildGoPackage {
- name = "uchiwa-backend-${version}";
+ pname = "uchiwa-backend";
+ inherit version;
goPackagePath = "github.com/${owner}/${repo}";
inherit src;
postInstall = ''
@@ -26,8 +27,9 @@ let
inherit src;
};
-in stdenv.mkDerivation rec {
- name = "uchiwa-${version}";
+in stdenv.mkDerivation {
+ pname = "uchiwa";
+ inherit version;
inherit src;
diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix
index 4c3479d8662e..fe90d4d6408b 100644
--- a/pkgs/servers/monitoring/zipkin/default.nix
+++ b/pkgs/servers/monitoring/zipkin/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, makeWrapper, jre}:
stdenv.mkDerivation rec {
version = "1.28.1";
- name = "zipkin-server-${version}";
+ pname = "zipkin-server";
src = fetchurl {
url = "https://search.maven.org/remotecontent?filepath=io/zipkin/java/zipkin-server/${version}/zipkin-server-${version}-exec.jar";
sha256 = "02369fkv0kbl1isq6y26fh2zj5wxv3zck522m5wypsjlcfcw2apa";
diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index d8aed78e28ae..76b00b4cb29c 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.16";
- name = "libmpdclient-${version}";
+ pname = "libmpdclient";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 740fd4739ab7..7fcb5f945791 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -39,7 +39,7 @@ let
minor = "23";
in stdenv.mkDerivation rec {
- name = "mpd-${version}";
+ pname = "mpd";
version = "${major}${if minor == "" then "" else "." + minor}";
src = fetchFromGitHub {
diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index 06cef9cefab7..3357f7a16c12 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -3,7 +3,7 @@
, systemd ? null, withSystemd ? stdenv.isLinux }:
stdenv.mkDerivation rec {
- name = "mosquitto-${version}";
+ pname = "mosquitto";
version = "1.6.4";
src = fetchFromGitHub {
diff --git a/pkgs/servers/mumsi/default.nix b/pkgs/servers/mumsi/default.nix
index 4465febf39a9..3cc3f338f2f6 100644
--- a/pkgs/servers/mumsi/default.nix
+++ b/pkgs/servers/mumsi/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, boost
, log4cpp, pjsip, openssl, alsaLib, mumlib }:
-with lib; stdenv.mkDerivation rec {
+with lib; stdenv.mkDerivation {
pname = "mumsi";
version = "unstable-2018-12-12";
diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix
index cc73b2e1f6f2..079c877ab7a3 100644
--- a/pkgs/servers/nats-streaming-server/default.nix
+++ b/pkgs/servers/nats-streaming-server/default.nix
@@ -3,7 +3,7 @@
with lib;
buildGoPackage rec {
- name = "nats-streaming-server-${version}";
+ pname = "nats-streaming-server";
version = "0.11.2";
rev = "v${version}";
diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix
index 955547289bc6..0f1a8e120f65 100644
--- a/pkgs/servers/news/leafnode/default.nix
+++ b/pkgs/servers/news/leafnode/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pcre }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "leafnode-2.0.0.alpha20121101a.12";
src = fetchurl {
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index ac5e5cff94b3..69b1f28d2d68 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "nextcloud-${version}";
+ pname = "nextcloud";
version = "16.0.4";
src = fetchurl {
- url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
+ url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
sha256 = "1l7ckzyqz7g4ny8s2q4xal72p57ldfjs947sk2ya2df93qjh0qz0";
};
diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix
index d7c36b0cb416..a89604c4e7cd 100644
--- a/pkgs/servers/nginx-sso/default.nix
+++ b/pkgs/servers/nginx-sso/default.nix
@@ -1,7 +1,7 @@
{ buildGoPackage, fetchFromGitHub, stdenv }:
buildGoPackage rec {
- name = "nginx-sso-${version}";
+ pname = "nginx-sso";
version = "0.16.1";
rev = "v${version}";
diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix
index c5290709b625..d3b80aa00feb 100644
--- a/pkgs/servers/nosql/aerospike/default.nix
+++ b/pkgs/servers/nosql/aerospike/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, openssl, zlib }:
stdenv.mkDerivation rec {
- name = "aerospike-server-${version}";
+ pname = "aerospike-server";
version = "4.2.0.4";
src = fetchFromGitHub {
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake libtool ];
buildInputs = [ openssl zlib ];
+ NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation";
+
preBuild = ''
patchShebangs build/gen_version
substituteInPlace build/gen_version --replace 'git describe' 'echo ${version}'
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 11695d753e28..52e6c787bef2 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -33,13 +33,13 @@ let
"-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF"
# also avoid using builder's /proc/cpuinfo
] ++
- { "westmere" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- "sandybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- "ivybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- "haswell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- "broadwell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- "skylake" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
- "skylake-avx512" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+ { westmere = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+ sandybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+ ivybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+ haswell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+ broadwell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+ skylake = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+ skylake-avx512 = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
}.${stdenv.hostPlatform.platform.gcc.arch or ""} or [ "-DHAVE_SSE42=OFF" "-DASM_OPTIMIZATIONS=OFF" ];
enableParallelBuilding = true;
@@ -53,7 +53,6 @@ let
};
};
in {
- arangodb_3_2 = common { version = "3.2.18"; sha256 = "05mfrx1g6dh1bzzqs23nvk0rg3v8y2dhdam4lym55pzlhqa7lf0x"; };
arangodb_3_3 = common { version = "3.3.23.1"; sha256 = "0bnbiispids7jcgrgcmanf9jqgvk0vaflrvgalz587jwr2zf21k8"; };
arangodb_3_4 = common { version = "3.4.7"; sha256 = "1wr2xvi5lnl6f2ryyxdwn4wnfiaz0rrf58ja1k19m7b6w3264iim"; };
arangodb_3_5 = common { version = "3.5.0-rc.7"; sha256 = "1sdmbmyml9d3ia3706bv5901qqmh4sxk7js5b9hyfjqpcib10d1k"; };
diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index 05f572c8caaa..fd0a97d029d5 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -15,12 +15,12 @@ let
in
stdenv.mkDerivation rec {
- name = "cassandra-${version}";
+ pname = "cassandra";
inherit version;
src = fetchurl {
inherit sha256;
- url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz";
+ url = "mirror://apache/cassandra/${version}/apache-${pname}-${version}-bin.tar.gz";
};
nativeBuildInputs = [ makeWrapper coreutils ];
@@ -30,16 +30,16 @@ stdenv.mkDerivation rec {
mv * $out
# Clean up documentation.
- mkdir -p $out/share/doc/${name}
+ mkdir -p $out/share/doc/${pname}-${version}
mv $out/CHANGES.txt \
$out/LICENSE.txt \
$out/NEWS.txt \
$out/NOTICE.txt \
$out/javadoc \
- $out/share/doc/${name}
+ $out/share/doc/${pname}-${version}
if [[ -d $out/doc ]]; then
- mv "$out/doc/"* $out/share/doc/${name}
+ mv "$out/doc/"* $out/share/doc/${pname}-${version}
rmdir $out/doc
fi
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index c06b84324191..bc1aee8a6876 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -15,7 +15,7 @@ in
stdenv.mkDerivation rec {
- name = "EventStore-${version}";
+ pname = "EventStore";
version = "5.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 842c988d9b33..4c4ac4c5cb63 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -20,8 +20,9 @@ let version = "3.4.10";
"yaml"
] ++ optionals stdenv.isLinux [ "tcmalloc" ];
-in stdenv.mkDerivation rec {
- name = "mongodb-${version}";
+in stdenv.mkDerivation {
+ pname = "mongodb";
+ inherit version;
src = fetchurl {
url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz";
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index 9b173e538d34..f471017a3367 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "neo4j-${version}";
+ pname = "neo4j";
version = "3.5.8";
src = fetchurl {
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 118edb60156d..9b785917bfbe 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "5.0.5";
- name = "redis-${version}";
+ pname = "redis";
src = fetchurl {
- url = "http://download.redis.io/releases/${name}.tar.gz";
+ url = "http://download.redis.io/releases/${pname}-${version}.tar.gz";
sha256 = "0xd3ak527cnkz2cn422l2ag9nsa6mhv7y2y49zwqy7fjk6bh0f91";
};
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index a1a9072f5cab..63c1b3b5fd77 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "rethinkdb-${version}";
+ pname = "rethinkdb";
version = "2.3.6";
src = fetchurl {
- url = "https://download.rethinkdb.com/dist/${name}.tgz";
+ url = "https://download.rethinkdb.com/dist/${pname}-${version}.tgz";
sha256 = "0a6wlgqa2flf87jrp4fq4y9aihwyhgwclmss56z03b8hd5k5j8f4";
};
diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix
index 36b29b57bf97..4ebcbafde5dc 100644
--- a/pkgs/servers/nosql/riak-cs/2.1.1.nix
+++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam
, Carbon ? null, Cocoa ? null }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "riak_cs-2.1.1";
buildInputs = [
diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix
index 1524ca207009..5fe4ce45f84b 100644
--- a/pkgs/servers/nosql/riak-cs/stanchion.nix
+++ b/pkgs/servers/nosql/riak-cs/stanchion.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam
, Carbon ? null, Cocoa ? null }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "stanchion-2.1.1";
buildInputs = [
diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix
index 170b0d5f22f9..efa43f7a844f 100644
--- a/pkgs/servers/nosql/riak/2.2.0.nix
+++ b/pkgs/servers/nosql/riak/2.2.0.nix
@@ -25,7 +25,7 @@ let
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "riak-2.2.0";
buildInputs = [
diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix
index d48587c924e7..19352984712a 100644
--- a/pkgs/servers/nsq/default.nix
+++ b/pkgs/servers/nsq/default.nix
@@ -1,7 +1,7 @@
{ buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "nsq-${version}";
+ pname = "nsq";
version = "0.3.5";
rev = "v${version}";
diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix
index 22f09994ebf0..8155a9510613 100644
--- a/pkgs/servers/openafs/1.6/default.nix
+++ b/pkgs/servers/openafs/1.6/default.nix
@@ -6,8 +6,8 @@
with (import ./srcs.nix { inherit fetchurl; });
-stdenv.mkDerivation rec {
- name = "openafs-${version}";
+stdenv.mkDerivation {
+ pname = "openafs";
inherit version srcs;
nativeBuildInputs = [ autoconf automake flex yacc perl which libxslt ];
diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix
index 6f771e2bf33a..d410a4e55e57 100644
--- a/pkgs/servers/openafs/1.6/module.nix
+++ b/pkgs/servers/openafs/1.6/module.nix
@@ -7,7 +7,7 @@ let
modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "openafs-${version}-${kernel.modDirVersion}";
inherit version src;
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
index c77bef6ad24e..fca872a4a2b5 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/servers/openafs/1.8/default.nix
@@ -7,8 +7,8 @@
with (import ./srcs.nix { inherit fetchurl; });
-stdenv.mkDerivation rec {
- name = "openafs-${version}";
+stdenv.mkDerivation {
+ pname = "openafs";
inherit version srcs;
depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 958fcd578c2b..95084458f47f 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -7,7 +7,7 @@ let
modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "openafs-${version}-${kernel.modDirVersion}";
inherit version src;
diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 8eca1fb7790b..c0018529ea8b 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}:
stdenv.mkDerivation rec {
- name = "osrm-backend-${version}";
+ pname = "osrm-backend";
version = "5.22.0";
src = fetchFromGitHub {
diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix
index 1f58c309aa5e..67e125d7a8cc 100644
--- a/pkgs/servers/p910nd/default.nix
+++ b/pkgs/servers/p910nd/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "p910nd-${version}";
+ pname = "p910nd";
version = "0.97";
src = fetchurl {
sha256 = "0vy2qf386dif1nqznmy3j953mq7c4lk6j2hgyzkbmfi4msiq1jaa";
- url = "mirror://sourceforge/p910nd/${name}.tar.bz2";
+ url = "mirror://sourceforge/p910nd/${pname}-${version}.tar.bz2";
};
postPatch = ''
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 2f2b1195cf32..267bd4c2600f 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -9,7 +9,7 @@
, dataDir ? "/var/lib/plex"
}:
-buildFHSUserEnv rec {
+buildFHSUserEnv {
name = "plexmediaserver";
inherit (plexRaw) meta;
diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 36b4bd96fbde..cbe0dae3e14a 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -10,7 +10,6 @@
stdenv.mkDerivation rec {
version = "1.16.5.1554-1e5ff713d";
pname = "plexmediaserver";
- name = "${pname}-${version}";
# Fetch the source
src = fetchurl {
diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix
index a7a0791b8520..a6b65cde89f9 100644
--- a/pkgs/servers/polipo/default.nix
+++ b/pkgs/servers/polipo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, texinfo }:
stdenv.mkDerivation rec {
- name = "polipo-${version}";
+ pname = "polipo";
version = "1.1.1";
src = fetchurl {
- url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/${name}.tar.gz";
+ url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/${pname}-${version}.tar.gz";
sha256 = "05g09sg9qkkhnc2mxldm1w1xkxzs2ylybkjzs28w8ydbjc3pand2";
};
diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix
index 7997d0ebcd8b..d1351afa0b30 100644
--- a/pkgs/servers/prayer/default.nix
+++ b/pkgs/servers/prayer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, openssl, db, zlib, uwimap, html-tidy, pam}:
+{ stdenv, fetchurl, fetchpatch, perl, openssl, db, zlib, uwimap, html-tidy, pam}:
let
ssl = stdenv.lib.optionals uwimap.withSSL
@@ -12,7 +12,20 @@ stdenv.mkDerivation rec {
sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda";
};
- patches = [ ./install.patch ];
+ patches = [
+ ./install.patch
+
+ # fix build errors which result from openssl changes
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/p/prayer/1.3.5-dfsg1-6/debian/patches/disable_ssl3.patch";
+ sha256 = "1rx4bidc9prh4gffipykp144cyi3zd6qzd990s2aad3knzv5bkdd";
+ })
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/p/prayer/1.3.5-dfsg1-6/debian/patches/openssl1.1.patch";
+ sha256 = "0zinylvq3bcifdmki867gir49pbjx6qb5h019hawwif2l4jmlxw1";
+ })
+ ];
+
postPatch = ''
sed -i -e s/gmake/make/ -e 's/LDAP_ENABLE.*= true/LDAP_ENABLE=false/' \
${ssl} \
diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix
index 6aaaf95fae16..7e6b92a03764 100644
--- a/pkgs/servers/ps3netsrv/default.nix
+++ b/pkgs/servers/ps3netsrv/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
- name = "ps3netsrv-${version}";
+stdenv.mkDerivation {
+ pname = "ps3netsrv";
version = "1.1.0";
enableParallelBuilding = true;
diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix
index 1d8f0c36caec..fc130965cf10 100644
--- a/pkgs/servers/quagga/default.nix
+++ b/pkgs/servers/quagga/default.nix
@@ -2,11 +2,11 @@
pkgconfig, c-ares }:
stdenv.mkDerivation rec {
- name = "quagga-${version}";
+ pname = "quagga";
version = "1.2.4";
src = fetchurl {
- url = "mirror://savannah/quagga/${name}.tar.gz";
+ url = "mirror://savannah/quagga/${pname}-${version}.tar.gz";
sha256 = "1lsksqxij5f1llqn86pkygrf5672kvrqn1kvxghi169hqf1c0r73";
};
diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index a293643a6f6d..854f73be1871 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }:
stdenv.mkDerivation rec {
- name = "radarr-${version}";
+ pname = "radarr";
version = "0.2.0.1358";
src = fetchurl {
@@ -12,11 +12,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
- mkdir -p $out/{bin,share/${name}}
- cp -r * $out/share/${name}/.
+ mkdir -p $out/{bin,share/${pname}-${version}}
+ cp -r * $out/share/${pname}-${version}/.
makeWrapper "${mono}/bin/mono" $out/bin/Radarr \
- --add-flags "$out/share/${name}/Radarr.exe" \
+ --add-flags "$out/share/${pname}-${version}/Radarr.exe" \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
curl sqlite libmediainfo ]}
'';
diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix
index 13db868845a0..bfc681c921b9 100644
--- a/pkgs/servers/radicale/1.x.nix
+++ b/pkgs/servers/radicale/1.x.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "radicale-${version}";
+ pname = "radicale";
version = "1.1.6";
src = fetchurl {
diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix
index 3dcb6605a61e..840f63f3e058 100644
--- a/pkgs/servers/rippled/default.nix
+++ b/pkgs/servers/rippled/default.nix
@@ -49,7 +49,7 @@ let
postFetch = "cd $out && git tag ${rev}";
};
- soci = fetchgit rec {
+ soci = fetchgit {
url = "https://github.com/SOCI/soci.git";
rev = "3a1f602b3021b925d38828e3ff95f9e7f8887ff7";
sha256 = "0lnps42cidlrn43h13b9yc8cs3fwgz7wb6a1kfc9rnw7swkh757f";
@@ -84,7 +84,7 @@ let
postFetch = "cd $out && git tag ${rev}";
};
- google-test = fetchgit rec {
+ google-test = fetchgit {
url = "https://github.com/google/googletest.git";
rev = "c3bb0ee2a63279a803aaad956b9b26d74bf9e6e2";
sha256 = "0pj5b6jnrj5lrccz2disr8hklbnzd8hwmrwbfqmvhiwb9q9p0k2k";
@@ -92,7 +92,7 @@ let
fetchSubmodules = false;
};
- google-benchmark = fetchgit rec {
+ google-benchmark = fetchgit {
url = "https://github.com/google/benchmark.git";
rev = "5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8";
sha256 = "0qg70j47zqnrbszlgrzmxpr4g88kq0gyq6v16bhaggfm83c6mg6i";
@@ -100,7 +100,7 @@ let
fetchSubmodules = false;
};
in stdenv.mkDerivation rec {
- name = "rippled-${version}";
+ pname = "rippled";
version = "1.2.1";
src = fetchFromGitHub {
diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix
index 903f38617fcb..ed1362a0a528 100644
--- a/pkgs/servers/routinator/default.nix
+++ b/pkgs/servers/routinator/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "routinator";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "NLnetLabs";
repo = pname;
rev = "v${version}";
- sha256 = "075dp092pgwnky96smv5v6sx9vj7hd5bif8rb1q4x6077ci5jixw";
+ sha256 = "13xfnlaqjisi9fm1p7ydhgrh86ccbfwkxbnrv8abdx80jwb0lm15";
};
- cargoSha256 = "0qxp3pjmrr53n59c2wcdnbqgk259zcj9gd11wpqf7kj3wlzrnwvy";
+ cargoSha256 = "13sx7mbirhrd0is7gvnk0mir5qizbhrlvsn0v55ibf3bybjsb644";
meta = with stdenv.lib; {
description = "An RPKI Validator written in Rust";
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index fc28f621959b..00d01b01efee 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -1,8 +1,8 @@
{ fetchgit, stdenv, pkgconfig, libnsl, libtirpc, autoreconfHook
, useSystemd ? true, systemd }:
-stdenv.mkDerivation rec {
- name = "rpcbind-${version}";
+stdenv.mkDerivation {
+ pname = "rpcbind";
version = "1.2.5";
src = fetchgit {
diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix
index b2e40a8ede0e..4d8ead30add6 100644
--- a/pkgs/servers/rt/default.nix
+++ b/pkgs/servers/rt/default.nix
@@ -31,12 +31,12 @@
#
# Good luck.
stdenv.mkDerivation rec {
- name = "rt-${version}";
+ pname = "rt";
version = "4.4.4";
src = fetchurl {
- url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz";
+ url = "https://download.bestpractical.com/pub/rt/release/${pname}-${version}.tar.gz";
sha256 = "1108jhz1gvalcfnbzgpbk7fkxzxkkc7m74a3bnwyjzldlyj1dhrl";
};
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index 364fcb118ce4..57c774ebcb05 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -6,7 +6,6 @@ let
in stdenv.mkDerivation rec {
version = "2.3.9";
pname = "sabnzbd";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = pname;
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 2a4093d412ff..9bec174a58aa 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -19,11 +19,11 @@
with lib;
stdenv.mkDerivation rec {
- name = "samba-${version}";
+ pname = "samba";
version = "4.10.6";
src = fetchurl {
- url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
+ url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
sha256 = "0hpgdqlyczj98pkh2ldglvvnkrb1q541r3qikdvxq0qjvd9fpywy";
};
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
[ "--with-static-modules=NONE"
"--with-shared-modules=ALL"
"--with-system-mitkrb5"
- "--with-system-mitkdc" "${krb5Full}"
+ "--with-system-mitkdc" krb5Full
"--enable-fhs"
"--sysconfdir=/etc"
"--localstatedir=/var"
diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix
index 1a168608bec2..f48ace22f8fb 100644
--- a/pkgs/servers/scylladb/default.nix
+++ b/pkgs/servers/scylladb/default.nix
@@ -30,7 +30,7 @@
libtool,
thrift
}:
-gcc8Stdenv.mkDerivation rec {
+gcc8Stdenv.mkDerivation {
pname = "scylladb";
version = "3.0.5";
diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix
deleted file mode 100644
index 6142d751dab1..000000000000
--- a/pkgs/servers/search/elasticsearch/5.x.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless
-, utillinux, gnugrep, coreutils }:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
- version = elk5Version;
- name = "elasticsearch-${version}";
-
- src = fetchurl {
- url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
- sha256 = "0zy7awb2cm2fk3c7zc7v8b8pl0jw49awqwpa1jvilmvx6dcml0vb";
- };
-
- patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ];
-
- buildInputs = [ makeWrapper jre_headless utillinux ];
-
- installPhase = ''
- mkdir -p $out
- cp -R bin config lib modules plugins $out
-
- chmod -x $out/bin/*.*
-
- wrapProgram $out/bin/elasticsearch \
- --prefix ES_CLASSPATH : "$out/lib/*" \
- --prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \
- --set JAVA_HOME "${jre_headless}" \
- --set ES_JVM_OPTIONS "$out/config/jvm.options"
-
- wrapProgram $out/bin/elasticsearch-plugin \
- --prefix ES_CLASSPATH : "$out/lib/*" \
- --set JAVA_HOME "${jre_headless}"
- '';
-
- meta = {
- description = "Open Source, Distributed, RESTful Search Engine";
- license = licenses.asl20;
- platforms = platforms.unix;
- maintainers = [
- maintainers.apeschar
- ];
- };
-}
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix
index fffc84b2d281..04e81fe150a9 100644
--- a/pkgs/servers/search/elasticsearch/6.x.nix
+++ b/pkgs/servers/search/elasticsearch/6.x.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation (rec {
url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
sha256 =
if enableUnfree
- then "1a88yyl0x4bsx92m3wjsz1fgm76gbfdzcd4bzp2x652rha667vfh"
- else "04fa0fk25d5yxcjdj0bwqvdrswgwj31fwjvbq4gpg66c6bqwzcn6";
+ then "09dy3iyzk460vra6na6vk7d3mzpbv4cl0pl7kjmybxy947j7hh42"
+ else "0s04xz3j4psyhawvy503sp2nl5s0gswmpd9wfvwnavgcrr23wk39";
};
patches = [ ./es-home-6.x.patch ];
diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix
index ddb1d2299cbb..318919203699 100644
--- a/pkgs/servers/search/elasticsearch/7.x.nix
+++ b/pkgs/servers/search/elasticsearch/7.x.nix
@@ -17,12 +17,12 @@ let
shas =
if enableUnfree
then {
- "x86_64-linux" = "1jkfllafcjqhfydsy90jx2ghpv5cmm6gabv206niwg9qc6y6r1ik";
- "x86_64-darwin" = "1lgyxq3yahdww0wpqmpc1mz57kmk5hy2drb1dha69k9l0ibmjf18";
+ x86_64-linux = "0x1ws6iqflvzphg2srvdrn4xrr5wd5fnykkc9h006mj9rb5lp1k9";
+ x86_64-darwin = "0yjzgsbsgwa6gbp270fqfm1klm6f8n4s2xmay62gdgvnsj543cxz";
}
else {
- "x86_64-linux" = "0pg22wi2xcjla44azfvn9c58r4xq3x9jiwh7qb0d8f3nv30vfd10";
- "x86_64-darwin" = "0d9xg3bf06mr7mw2bd16gb2xrfjncrhj19846rrj4j5gb2qjz0x2";
+ x86_64-linux = "1nl6yic1j422l2c7mf8wv0ylfx6marrwm7d181z9nzdswq509kpg";
+ x86_64-darwin = "1sy4an9d1faifr3n2y45kalrd22yb68dnpjhi9h8q73c21gp8pzf";
};
in
stdenv.mkDerivation (rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation (rec {
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz";
- sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
+ sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
};
patches = [ ./es-home-6.x.patch ];
diff --git a/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch b/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
deleted file mode 100644
index ccdca1e53afc..000000000000
--- a/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -rupN a/bin/elasticsearch b/bin/elasticsearch
---- a/bin/elasticsearch 2017-05-17 10:53:49.444487071 +0200
-+++ b/bin/elasticsearch 2017-05-17 10:55:52.755081523 +0200
-@@ -129,12 +129,7 @@ ES_JAVA_OPTS="$(parse_jvm_options "$ES_J
- # If an include wasn't specified in the environment, then search for one...
- if [ "x$ES_INCLUDE" = "x" ]; then
- # Locations (in order) to use when searching for an include file.
-- for include in /usr/share/elasticsearch/elasticsearch.in.sh \
-- /usr/local/share/elasticsearch/elasticsearch.in.sh \
-- /opt/elasticsearch/elasticsearch.in.sh \
-- ~/.elasticsearch.in.sh \
-- "$ES_HOME/bin/elasticsearch.in.sh" \
-- "`dirname "$0"`"/elasticsearch.in.sh; do
-+ for include in "`dirname "$0"`"/elasticsearch.in.sh; do
- if [ -r "$include" ]; then
- . "$include"
- break
-diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh
---- a/bin/elasticsearch.in.sh 2017-04-28 19:41:47.000000000 +0200
-+++ b/bin/elasticsearch.in.sh 2017-05-17 10:56:49.303519788 +0200
-@@ -1,13 +1 @@
- #!/bin/bash
--
--# check in case a user was using this mechanism
--if [ "x$ES_CLASSPATH" != "x" ]; then
-- cat >&2 << EOF
--Error: Don't modify the classpath with ES_CLASSPATH. Best is to add
--additional elements via the plugin mechanism, or if code must really be
--added to the main classpath, add jars to lib/ (unsupported).
--EOF
-- exit 1
--fi
--
--ES_CLASSPATH="$ES_HOME/lib/*"
-diff -rupN a/bin/elasticsearch-plugin b/bin/elasticsearch-plugin
---- a/bin/elasticsearch-plugin 2018-04-13 01:21:55.000000000 +0900
-+++ b/bin/elasticsearch-plugin 2018-06-28 19:08:54.700969245 +0900
-@@ -88,4 +88,4 @@ if [ -e "$CONF_DIR" ]; then
- path_props=("${path_props[@]}" -Des.path.conf="$CONF_DIR")
- fi
-
--exec "$JAVA" $ES_JAVA_OPTS -Delasticsearch "${path_props[@]}" -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginCli "${args[@]}"
-+exec "$JAVA" $ES_JAVA_OPTS -Delasticsearch "${path_props[@]}" -cp "$ES_CLASSPATH" org.elasticsearch.plugins.PluginCli "${args[@]}"
diff --git a/pkgs/servers/search/elasticsearch/es-home-5.x.patch b/pkgs/servers/search/elasticsearch/es-home-5.x.patch
deleted file mode 100644
index cee0137312f1..000000000000
--- a/pkgs/servers/search/elasticsearch/es-home-5.x.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -rupN a/bin/elasticsearch b/bin/elasticsearch
---- a/bin/elasticsearch 2017-05-17 10:53:42.214686741 +0200
-+++ b/bin/elasticsearch 2017-05-17 10:53:49.444487071 +0200
-@@ -105,7 +105,11 @@ while [ -h "$SCRIPT" ] ; do
- done
-
- # determine elasticsearch home
--ES_HOME=`dirname "$SCRIPT"`/..
-+
-+if [ -z "$ES_HOME" ]; then
-+ echo "You must set the ES_HOME var" >&2
-+ exit 1
-+fi
-
- # make ELASTICSEARCH_HOME absolute
- ES_HOME=`cd "$ES_HOME"; pwd`
-diff -rupN a/bin/elasticsearch-plugin b/bin/elasticsearch-plugin
---- a/bin/elasticsearch-plugin 2017-05-17 10:53:42.214686741 +0200
-+++ b/bin/elasticsearch-plugin 2017-05-17 10:53:49.445487044 +0200
-@@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do
- done
-
- # determine elasticsearch home
--ES_HOME=`dirname "$SCRIPT"`/..
-+if [ -z "$ES_HOME" ]; then
-+ echo "You must set the ES_HOME var" >&2
-+ exit 1
-+fi
-
- # make ELASTICSEARCH_HOME absolute
- ES_HOME=`cd "$ES_HOME"; pwd`
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index b296fb3b425c..9fd49e96fa29 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
- name = "groonga-${version}";
+ pname = "groonga";
version = "9.0.6";
src = fetchurl {
- url = "https://packages.groonga.org/source/groonga/${name}.tar.gz";
+ url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
sha256 = "0d1p8v7qd97h3znp84a1w40hbg834n3wxp6gaa8mbnff16s18kl7";
};
diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index 7ba23f61fedb..6241380ea0c6 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -6,8 +6,9 @@
}
}:
-stdenv.mkDerivation rec {
- name = "sphinxsearch-${version}";
+stdenv.mkDerivation {
+ pname = "sphinxsearch";
+ inherit version;
src = mainSrc;
configureFlags = [
diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix
index 4c5f71cb37d6..585fc2b73ef9 100644
--- a/pkgs/servers/serf/default.nix
+++ b/pkgs/servers/serf/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "serf-${version}";
+ pname = "serf";
version = "0.8.1";
rev = "v${version}";
diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix
index 2ab3bf666857..03d86c209f07 100644
--- a/pkgs/servers/serviio/default.nix
+++ b/pkgs/servers/serviio/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "serviio-${version}";
+ pname = "serviio";
version = "2.0";
src = fetchurl {
- url = "http://download.serviio.org/releases/${name}-linux.tar.gz";
+ url = "http://download.serviio.org/releases/${pname}-${version}-linux.tar.gz";
sha256 = "1zq1ax0pdxfn0nw0vm7s23ik47w8nwh1n83a7yka8dnknxjf5nng";
};
diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix
index e5312b92902e..1c726c477648 100644
--- a/pkgs/servers/shairplay/default.nix
+++ b/pkgs/servers/shairplay/default.nix
@@ -2,7 +2,7 @@
, avahi, libao }:
stdenv.mkDerivation rec {
- name = "shairplay-unstable-${version}";
+ pname = "shairplay-unstable";
version = "2018-08-24";
src = fetchFromGitHub {
diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index 639fa322525b..40b88c34e8d6 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "3.3.2";
- name = "shairport-sync-${version}";
+ pname = "shairport-sync";
src = fetchFromGitHub {
sha256 = "14f09sj2rxmixd5yjmwp82j49rxn1fvcxkvh7qjif893xgk98a3w";
diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix
index 70bf5c32b3d4..af1992fc8699 100644
--- a/pkgs/servers/shellinabox/default.nix
+++ b/pkgs/servers/shellinabox/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.20";
- name = "shellinabox-${version}";
+ pname = "shellinabox";
src = fetchFromGitHub {
owner = "shellinabox";
diff --git a/pkgs/servers/sickbeard/default.nix b/pkgs/servers/sickbeard/default.nix
index 6dc044092ad5..6cca58a175e8 100644
--- a/pkgs/servers/sickbeard/default.nix
+++ b/pkgs/servers/sickbeard/default.nix
@@ -2,7 +2,7 @@
let
pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "sickbeard";
version = "2016-03-21";
diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix
index f4a37f85c6cb..cbde11e3dc0c 100644
--- a/pkgs/servers/sickbeard/sickrage.nix
+++ b/pkgs/servers/sickbeard/sickrage.nix
@@ -7,7 +7,7 @@ python2.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "SickRage";
repo = "SickRage";
- rev = "${version}";
+ rev = version;
sha256 = "0lzklpsxqrb73inbv8almnhbnb681pmi44gzc8i4sjwmdksiiif9";
};
diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix
index 083a224d1558..3ac32509ba3b 100644
--- a/pkgs/servers/simplehttp2server/default.nix
+++ b/pkgs/servers/simplehttp2server/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "simplehttp2server-${version}";
+ pname = "simplehttp2server";
version = "3.1.3";
goPackagePath = "github.com/GoogleChromeLabs/simplehttp2server";
diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix
index a8a00f37f3fb..f6f914b7cbd5 100644
--- a/pkgs/servers/sks/default.nix
+++ b/pkgs/servers/sks/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromBitbucket, ocaml, zlib, db, perl, camlp4 }:
stdenv.mkDerivation rec {
- name = "sks-${version}";
+ pname = "sks";
version = "1.1.6";
src = fetchFromBitbucket {
owner = "skskeyserver";
repo = "sks-keyserver";
- rev = "${version}";
+ rev = version;
sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm";
};
diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix
index 82d79785b11c..2fc67008b892 100644
--- a/pkgs/servers/skydns/default.nix
+++ b/pkgs/servers/skydns/default.nix
@@ -1,9 +1,9 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "skydns-${version}";
+ pname = "skydns";
version = "2.5.3a";
- rev = "${version}";
+ rev = version;
goPackagePath = "github.com/skynetservices/skydns";
diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix
index 3409fc00066f..730d1bbdddce 100644
--- a/pkgs/servers/smcroute/default.nix
+++ b/pkgs/servers/smcroute/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libcap }:
stdenv.mkDerivation rec {
- name = "smcroute-${version}";
+ pname = "smcroute";
version = "2.4.4";
src = fetchFromGitHub {
diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix
index 7eaa5b3e8a05..2b21bef7d6f6 100644
--- a/pkgs/servers/softether/4.25.nix
+++ b/pkgs/servers/softether/4.25.nix
@@ -14,7 +14,7 @@ let
in
stdenv.mkDerivation rec {
- name = "softether-${version}";
+ pname = "softether";
version = "4.25";
build = "9656";
compiledDate = "2018.01.15";
diff --git a/pkgs/servers/softether/4.29.nix b/pkgs/servers/softether/4.29.nix
index e26e8f057b6d..1d80752a41a5 100644
--- a/pkgs/servers/softether/4.29.nix
+++ b/pkgs/servers/softether/4.29.nix
@@ -3,7 +3,7 @@
, dataDir ? "/var/lib/softether" }:
stdenv.mkDerivation rec {
- name = "softether-${version}";
+ pname = "softether";
version = "4.29";
build = "9680";
diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index 116d687ad269..7b80b021bde7 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }:
stdenv.mkDerivation rec {
- name = "sonarr-${version}";
+ pname = "sonarr";
version = "2.0.0.5338";
src = fetchurl {
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index 22ec301bceda..ba395c5e7f6b 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -12,14 +12,14 @@ let
in
buildGoPackage rec {
- name = "cockroach-${version}";
- version = "19.1.1";
+ pname = "cockroach";
+ version = "19.1.4";
goPackagePath = "github.com/cockroachdb/cockroach";
src = fetchurl {
url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz";
- sha256 = "1vbz5j0y9ri8c99k8fc5rnwigay478p1mac5g402639ilkqd41fc";
+ sha256 = "1bqzs844ildvyh4332vapsqhfkwcvjmgkkmn3i8ndd89q5yic6fq";
};
inherit nativeBuildInputs buildInputs;
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 7d34dd8d63be..ac14015c4cf3 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -218,7 +218,7 @@ server = stdenv.mkDerivation (common // {
});
connector-c = stdenv.mkDerivation rec {
- name = "mariadb-connector-c-${version}";
+ pname = "mariadb-connector-c";
version = "2.3.7";
src = fetchurl {
@@ -259,7 +259,7 @@ connector-c = stdenv.mkDerivation rec {
};
galera = stdenv.mkDerivation rec {
- name = "mariadb-galera-${version}";
+ pname = "mariadb-galera";
version = "25.3.26";
src = fetchFromGitHub {
@@ -286,7 +286,7 @@ galera = stdenv.mkDerivation rec {
installPhase = ''
# copied with modifications from scripts/packages/freebsd.sh
- GALERA_LICENSE_DIR="$share/licenses/${name}"
+ GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}"
install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
install -m 555 "garb/garbd" "$out/bin/garbd"
install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so"
diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 287054a750b4..245bd811c1a2 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -4,9 +4,10 @@
let
version = "11.33.3";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
- name = "monetdb-${version}";
+ pname = "monetdb";
+ inherit version;
src = fetchurl {
url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix
index a50d623acbce..062de0c2368c 100644
--- a/pkgs/servers/sql/oracle-xe/default.nix
+++ b/pkgs/servers/sql/oracle-xe/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "oracle-xe-${version}";
+ pname = "oracle-xe";
version = "11.2.0";
src = requireFile {
- name = "${name}-1.0.x86_64.rpm";
+ name = "${pname}-${version}-1.0.x86_64.rpm";
sha256 = "0s2jj2xn56v5ys6hxb7l7045hw9c1mm1lhj4p2fvqbs02kqchab6";
url = "http://www.oracle.com/technetwork/"
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper ];
unpackCmd = ''
- (mkdir -p "${name}" && cd "${name}" &&
+ (mkdir -p "${pname}-${version}" && cd "${pname}-${version}" &&
${rpmextract}/bin/rpmextract "$curSrc")
'';
diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix
index c77330bd2ace..7f8f0786e038 100644
--- a/pkgs/servers/sql/percona/5.6.x.nix
+++ b/pkgs/servers/sql/percona/5.6.x.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, bison, ncurses, openssl, zlib, libaio, perl }:
stdenv.mkDerivation rec {
- name = "percona-server-${version}";
+ pname = "percona-server";
version = "5.6.43-84.3";
src = fetchurl {
diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix
index dcaa8d5e1fad..30be61a805a7 100644
--- a/pkgs/servers/sql/pgbouncer/default.nix
+++ b/pkgs/servers/sql/pgbouncer/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, libevent, c-ares, pkg-config }:
stdenv.mkDerivation rec {
- name = "pgbouncer-${version}";
+ pname = "pgbouncer";
version = "1.10.0";
src = fetchurl {
- url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz";
+ url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz";
sha256 = "1m8vsxyna5grs5p0vnxf3fxxnkk9aqjf3qmr2bbkpkhlzr11986q";
};
diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix
index ba75bd28bccc..32c30836f6dc 100644
--- a/pkgs/servers/sql/pgpool/default.nix
+++ b/pkgs/servers/sql/pgpool/default.nix
@@ -3,11 +3,10 @@
stdenv.mkDerivation rec {
pname = "pgpool-II";
version = "4.0.6";
- name = "${pname}-${version}";
src = fetchurl {
- name = "${name}.tar.gz";
- url = "http://www.pgpool.net/download.php?f=${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
+ url = "http://www.pgpool.net/download.php?f=${pname}-${version}.tar.gz";
sha256 = "0blmbqczyrgzykby2z3xzmhzd8kgij9izxv50n5cjn5azf7dn8g5";
};
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 7e536e22d947..0ca6f35ae7ad 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -20,11 +20,11 @@ let
icuEnabled = atLeast "10";
in stdenv.mkDerivation rec {
- name = "postgresql-${version}";
+ pname = "postgresql";
inherit version;
src = fetchurl {
- url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+ url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2";
inherit sha256;
};
@@ -168,14 +168,6 @@ let
in self: {
- postgresql_9_4 = self.callPackage generic {
- version = "9.4.24";
- psqlSchema = "9.4";
- sha256 = "0acl1wmah3r1a0qjjmpc256glccrjnzq4pkwklx4d9s6vmkks9aj";
- this = self.postgresql_9_4;
- inherit self;
- };
-
postgresql_9_5 = self.callPackage generic {
version = "9.5.19";
psqlSchema = "9.5";
diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
index 2866c94d3d7f..8e30683737db 100644
--- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, postgresql, protobufc }:
stdenv.mkDerivation rec {
- name = "cstore_fdw-${version}";
+ pname = "cstore_fdw";
version = "1.6.2";
nativeBuildInputs = [ protobufc ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
index 15d670171899..1e5824d60d85 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_cron";
- version = "1.1.4";
+ version = "1.2.0";
buildInputs = [ postgresql ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "citusdata";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "0wkqgrm3v999hjcc82h24jv1pib6f6bw8jsv83hgk6g3iv6xsjg9";
+ sha256 = "1hkrk6jxl20k2b0ngchblwkrzigl77jaq1gvininp4yhjdlgaks8";
};
installPhase = ''
diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
index 040ff8b80fe7..9a61e3c835da 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, postgresql }:
stdenv.mkDerivation rec {
- name = "pg_hll-${version}";
+ pname = "pg_hll";
version = "2.12";
buildInputs = [ postgresql ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
index 381a174838e5..7b64de381f3e 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }:
stdenv.mkDerivation rec {
- name = "pg_repack-${version}";
+ pname = "pg_repack";
version = "1.4.4";
buildInputs = [ postgresql openssl zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
index b9015be781e9..c368929db5dc 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, postgresql }:
stdenv.mkDerivation rec {
- name = "pg_topn-${version}";
+ pname = "pg_topn";
version = "2.2.2";
buildInputs = [ postgresql ];
diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
index c68ba9b17288..9576c4186118 100644
--- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, postgresql }:
-stdenv.mkDerivation rec {
- name = "pgjwt-${version}";
+stdenv.mkDerivation {
+ pname = "pgjwt";
version = "unstable-2017-04-24";
src = fetchFromGitHub {
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
sign() and verify() functions to create and verify JSON Web Tokens.
'';
license = licenses.mit;
+ platforms = postgresql.meta.platforms;
maintainers = with maintainers; [spinus];
};
}
diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
index 7dc70ee976cf..15a220670008 100644
--- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://pgroonga.github.io/";
license = licenses.postgresql;
+ platforms = postgresql.meta.platforms;
maintainers = with maintainers; [ DerTim1 ];
};
}
diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
index 6e1c6e3a4fca..0b97c79c9384 100644
--- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "A PostgreSQL/PostGIS extension that provides geospatial routing functionality";
homepage = https://pgrouting.org/;
maintainers = [ maintainers.steve-chavez ];
- platforms = platforms.linux;
+ platforms = postgresql.meta.platforms;
license = licenses.gpl2;
};
}
diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix
index 7dd6a5882b25..804356e9f6be 100644
--- a/pkgs/servers/sql/postgresql/ext/pgtap.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, postgresql, perl, perlPackages, which }:
stdenv.mkDerivation rec {
- name = "pgtap-${version}";
+ pname = "pgtap";
version = "1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 63b8a39b0e27..88090636ff21 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -13,14 +13,14 @@
, libiconv
}:
stdenv.mkDerivation rec {
- name = "postgis-${version}";
- version = "2.5.2";
+ pname = "postgis";
+ version = "2.5.3";
outputs = [ "out" "doc" ];
src = fetchurl {
url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
- sha256 = "0pnva72f2w4jcgnl1y7nw5rdly4ipx3hji4c9yc9s0hna1n2ijxn";
+ sha256 = "16jm9v9y25dhfwd4hvhnynj6k3ikjbr3z3dpn8py50gr82fjds3j";
};
buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]
@@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Geographic Objects for PostgreSQL";
homepage = https://postgis.net/;
+ changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS";
license = licenses.gpl2;
maintainers = [ maintainers.marcweber ];
inherit (postgresql.meta) platforms;
diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix
new file mode 100644
index 000000000000..6dc3be727c65
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }:
+
+stdenv.mkDerivation rec {
+ pname = "repmgr";
+ version = "4.4.0";
+
+ src = fetchFromGitHub {
+ owner = "2ndQuadrant";
+ repo = "repmgr";
+ rev = "v${version}";
+ sha256 = "185789f7igvlqyqcb8kf42jjq8g0wbs2aqd9kimrq5kf4srwgpim";
+ };
+
+ installPhase = ''
+ mkdir -p $out/{lib,share/postgresql/extension}
+
+ cp *.so $out/lib
+ cp *.sql $out/share/postgresql/extension
+ cp *.control $out/share/postgresql/extension
+ '';
+
+ buildInputs = [ postgresql openssl zlib readline ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://repmgr.org/";
+ description = "Replication manager for PostgreSQL cluster";
+ license = licenses.postgresql;
+ platforms = postgresql.meta.platforms;
+ maintainers = with maintainers; [ zimbatm ];
+ };
+}
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 77da47b00e0d..5f9959958206 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -7,7 +7,7 @@
# }
stdenv.mkDerivation rec {
- name = "timescaledb-${version}";
+ pname = "timescaledb";
version = "1.4.1";
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
index 7be23003b584..77e4cd9df7ae 100644
--- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
+++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, postgresql }:
-stdenv.mkDerivation rec {
- name = "tsearch-extras-${version}";
+stdenv.mkDerivation {
+ pname = "tsearch-extras";
version = "0.4";
src = fetchFromGitHub {
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
description = "Provides a few PostgreSQL functions for a lower-level data full text search";
homepage = https://github.com/zulip/tsearch_extras/;
license = licenses.postgresql;
+ platforms = postgresql.meta.platforms;
maintainers = with maintainers; [ DerTim1 ];
};
}
diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix
index ebce90d34518..a6821373389f 100644
--- a/pkgs/servers/sql/postgresql/packages.nix
+++ b/pkgs/servers/sql/postgresql/packages.nix
@@ -50,4 +50,6 @@ self: super: {
pg_partman = super.callPackage ./ext/pg_partman.nix { };
pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { };
+
+ repmgr = super.callPackage ./ext/repmgr.nix { };
}
diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/servers/sql/sqlite/jdbc/default.nix
index 4e40d8761526..f5444bb06836 100644
--- a/pkgs/servers/sql/sqlite/jdbc/default.nix
+++ b/pkgs/servers/sql/sqlite/jdbc/default.nix
@@ -2,7 +2,6 @@
stdenv.mkDerivation rec {
pname = "sqlite-jdbc";
- name = "${pname}-${version}";
version = "3.25.2";
src = fetchMavenArtifact {
@@ -15,7 +14,7 @@ stdenv.mkDerivation rec {
phases = [ "installPhase" ];
installPhase = ''
- install -m444 -D ${src}/share/java/*${name}.jar "$out/share/java/${name}.jar"
+ install -m444 -D ${src}/share/java/*${pname}-${version}.jar "$out/share/java/${pname}-${version}.jar"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix
index 455409557592..f7b4dd84d329 100644
--- a/pkgs/servers/sslh/default.nix
+++ b/pkgs/servers/sslh/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre }:
stdenv.mkDerivation rec {
- name = "sslh-${version}";
+ pname = "sslh";
version = "1.20";
src = fetchurl {
diff --git a/pkgs/servers/tacacsplus/default.nix b/pkgs/servers/tacacsplus/default.nix
new file mode 100644
index 000000000000..400298d15d58
--- /dev/null
+++ b/pkgs/servers/tacacsplus/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, tcp_wrappers, flex, bison, perl }:
+
+stdenv.mkDerivation rec {
+ pname = "tacacsplus";
+ version = "4.0.4.28";
+
+ src = fetchurl {
+ url = "ftp://ftp.shrubbery.net/pub/tac_plus/tacacs-F${version}.tar.gz";
+ sha256 = "17i18z3s58c8yy8jxp01q3hzz5nirs4cjxms18zzkli6ip4jszql";
+ };
+
+ nativeBuildInputs = [ flex bison ];
+ buildInputs = [ tcp_wrappers perl ];
+
+ meta = with stdenv.lib; {
+ description = "A protocol for authentication, authorization and accounting (AAA) services for routers and network devices";
+ homepage = "http://www.shrubbery.net/tac_plus/";
+ license = licenses.free;
+ maintainers = [ maintainers."0x4A6F" ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
index d074ddf4d72e..67d441e76c74 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
version = "2.1.33";
pname = "Tautulli";
- name = "${pname}-${version}";
pythonPath = [ python.pkgs.setuptools ];
buildInputs = [ python.pkgs.setuptools ];
diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix
index 967eea25d3fb..ac3dccdab738 100644
--- a/pkgs/servers/tegola/default.nix
+++ b/pkgs/servers/tegola/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "tegola-${version}";
+ pname = "tegola";
version = "0.8.1";
rev = "8b2675a63624ad1d69a8d2c84a6a3f3933e25ca1";
diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix
index e645ef2dc354..3a83f1a08c25 100644
--- a/pkgs/servers/teleport/default.nix
+++ b/pkgs/servers/teleport/default.nix
@@ -2,15 +2,15 @@
{ stdenv, buildGoPackage, zip, fetchFromGitHub }:
buildGoPackage rec {
- name = "teleport-${version}";
- version = "4.0.2";
+ pname = "teleport";
+ version = "4.0.4";
# This repo has a private submodule "e" which fetchgit cannot handle without failing.
src = fetchFromGitHub {
owner = "gravitational";
repo = "teleport";
rev = "v${version}";
- sha256 = "0rnjw297pkkhpqisrs5ghgvzlklk7kbhrz7rhr91b5rx3lr9c1ny";
+ sha256 = "1ady9nh1mi1lb9a868w6ylncz2r6x7mk33ajiymn2frpcwk9m2l9";
};
goPackagePath = "github.com/gravitational/teleport";
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index f793f05fef42..1707eb403b70 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, bash, go-bindata}:
buildGoPackage rec {
- name = "traefik-${version}";
+ pname = "traefik";
version = "1.7.14";
goPackagePath = "github.com/containous/traefik";
diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index 48cf589e55d1..84b7b325b46f 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "trezord-go-${version}";
+ pname = "trezord-go";
version = "2.0.27";
# Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix
index ce8947bcdda6..c1694316f3ed 100644
--- a/pkgs/servers/tt-rss/default.nix
+++ b/pkgs/servers/tt-rss/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "tt-rss-${version}";
+ pname = "tt-rss";
version = "2019-01-29";
rev = "c7c9c5fb0ab6b3d4ea3078865670d6c1dfe2ecac";
diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
index 6fad061ce996..0600640155be 100644
--- a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
+++ b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec {
- name = "tt-rss-plugin-auth-ldap-${version}";
+ pname = "tt-rss-plugin-auth-ldap";
version = "2.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
index 27416537e331..fd6ca9909470 100644
--- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
+++ b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
- name = "tt-rss-plugin-ff-instagram-${version}";
+{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation {
+ pname = "tt-rss-plugin-ff-instagram";
version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6
src = fetchFromGitHub {
diff --git a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
index 702b95b3f0e3..7c3d6a5b57e2 100644
--- a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
+++ b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
- name = "tt-rss-plugin-tumblr-gdpr-${version}";
+ pname = "tt-rss-plugin-tumblr-gdpr";
version = "2.1";
src = fetchFromGitHub {
diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix
index d0b279eb859b..c35667546c66 100644
--- a/pkgs/servers/tt-rss/theme-feedly/default.nix
+++ b/pkgs/servers/tt-rss/theme-feedly/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec {
- name = "tt-rss-theme-feedly-${version}";
+ pname = "tt-rss-theme-feedly";
version = "2.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix
index e05d9e919d17..7fad204a0189 100644
--- a/pkgs/servers/tvheadend/default.nix
+++ b/pkgs/servers/tvheadend/default.nix
@@ -5,8 +5,9 @@
let
version = "4.2.8";
-in stdenv.mkDerivation rec {
- name = "tvheadend-${version}";
+in stdenv.mkDerivation {
+ pname = "tvheadend";
+ inherit version;
src = fetchFromGitHub {
owner = "tvheadend";
@@ -24,6 +25,8 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation";
+
# disable dvbscan, as having it enabled causes a network download which
# cannot happen during build.
configureFlags = [
diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix
index 9e9816c941d9..cddfdf9f48f6 100644
--- a/pkgs/servers/udpt/default.nix
+++ b/pkgs/servers/udpt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, boost, sqlite, cmake, gtest }:
-stdenv.mkDerivation rec {
- name = "udpt-${version}";
+stdenv.mkDerivation {
+ pname = "udpt";
version = "2017-09-27";
enableParallelBuilding = true;
diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix
index ba628360aaa7..0dfec772a188 100644
--- a/pkgs/servers/uftp/default.nix
+++ b/pkgs/servers/uftp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation rec {
- name = "uftp-${version}";
+ pname = "uftp";
version = "4.10";
src = fetchurl {
diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix
index 52866784faa9..6483973546c6 100644
--- a/pkgs/servers/uhub/default.nix
+++ b/pkgs/servers/uhub/default.nix
@@ -4,7 +4,7 @@
assert tlsSupport -> openssl != null;
stdenv.mkDerivation rec {
- name = "uhub-${version}";
+ pname = "uhub";
version = "0.5.0";
src = fetchFromGitHub {
diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix
index 9bccd5b99fb0..3fb2817277aa 100644
--- a/pkgs/servers/ums/default.nix
+++ b/pkgs/servers/ums/default.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
- name = "ums-${version}";
+ pname = "ums";
version = "6.2.2";
src = fetchurl {
- url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${name}" + "-Java8.tgz";
+ url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + "-Java8.tgz";
sha256 = "1qa999la9hixy0pdj9phjvr6lwqycgdvm94nc1606vz0ivf95b15";
- name = "${name}.tgz";
+ name = "${pname}-${version}.tgz";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index 5a04d2317f41..3ca91cfd6256 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -2,8 +2,9 @@
let
generic = { version, sha256, suffix ? "" }:
- stdenv.mkDerivation rec {
- name = "unifi-controller-${version}";
+ stdenv.mkDerivation {
+ pname = "unifi-controller";
+ inherit version;
src = fetchurl {
url = "https://dl.ubnt.com/unifi/${version}${suffix}/unifi_sysvinit_all.deb";
@@ -18,8 +19,6 @@ let
runHook postUnpack
'';
- doConfigure = false;
-
installPhase = ''
runHook preInstall
@@ -39,7 +38,7 @@ let
};
};
-in rec {
+in {
# https://community.ui.com/releases / https://www.ui.com/download/unifi
# Outdated FAQ: https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions
@@ -53,11 +52,4 @@ in rec {
version = "5.11.39";
sha256 = "0v1gnvdazxa3bcbq8hl6796yw0mxzki2xn4s5im5k5ngmfmnswyj";
};
-
- # TODO: update as it is outdated
- unifiTesting = generic {
- version = "5.11.18";
- suffix = "-996baf2ca5";
- sha256 = "14yyfn39ix8bnn0cb6bn0ly6pqxg81lvy83y40bk0y8vxfg6maqc";
- };
}
diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index 6f5f7170dbd9..85fa6cd80063 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -48,11 +48,11 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "
in
stdenv.mkDerivation rec {
- name = "uwsgi-${version}";
+ pname = "uwsgi";
version = "2.0.18";
src = fetchurl {
- url = "https://projects.unbit.it/downloads/${name}.tar.gz";
+ url = "https://projects.unbit.it/downloads/${pname}-${version}.tar.gz";
sha256 = "10zmk4npknigmbqcq1wmhd461dk93159px172112vyq0i19sqwj9";
};
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index c9f0f2b84bbe..8a63ed3ea7f1 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -4,10 +4,11 @@
let
common = { version, sha256, python, extraNativeBuildInputs ? [] }:
stdenv.mkDerivation rec {
- name = "varnish-${version}";
+ pname = "varnish";
+ inherit version;
src = fetchurl {
- url = "https://varnish-cache.org/_downloads/${name}.tgz";
+ url = "https://varnish-cache.org/_downloads/${pname}-${version}.tgz";
inherit sha256;
};
diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/pkgs/servers/web-apps/cryptpad/bower-packages.nix
index 8d3d3def695f..9b87924e0b96 100644
--- a/pkgs/servers/web-apps/cryptpad/bower-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/bower-packages.nix
@@ -13,7 +13,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
(fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a")
(fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9")
(fetchbower "chainpad-crypto" "0.2.2" "^0.2.0" "1zmhc24zgg7jkb6c7r5syhxmlk61vmcsa2l0ip37dk52ygl6yfg5")
- (fetchbower "chainpad-listmap" "0.5.2" "^0.5.0" "0zmg6y5pzf75i84mlnvif6v1g7f4s1vyyzd6ng9ql4b9sdlf4zpc")
+ (fetchbower "chainpad-listmap" "0.7.0" "^0.7.0" "141hk4x7kwzgiazsghyg4h4df519m72qh3xfb3lzwy245c2nh1ak")
(fetchbower "chainpad" "5.1.2" "^5.1.0" "1qzdbaf15vaz2573dzm4sxi28m56hi1gi2z00f5ilayxshrbdrlc")
(fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg")
(fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l")
@@ -22,7 +22,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
(fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556")
(fetchbower "bootstrap" "4.3.1" "^v4.0.0" "081xw746bshhy8m14x7y8y6ryl38jz3l5545v62vjzr6b4609xd9")
(fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1")
- (fetchbower "nthen" "0.1.10" "^0.1.5" "0ipaydp1g63hgjis9qpp4nzf7p0b06g0xnz8nlxnwarkknci55y8")
+ (fetchbower "nthen" "0.1.7" "0.1.7" "03yap5ildigaw4rwxmxs37pcwhq415iham8w39zd56ka98gpfxa5")
(fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf")
(fetchbower "bootstrap-tokenfield" "0.12.1" "^0.12.1" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6")
(fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811")
@@ -33,7 +33,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
(fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi")
(fetchbower "jszip" "Stuk/jszip#3.2.2" "Stuk/jszip#^3.1.5" "1k0va2ps2x29d1virg51n5s5rdjk21zfh7h14nnljcfnvxvk3rpp")
(fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5")
- (fetchbower "chainpad-netflux" "0.7.6" "^0.7.0" "02qjk0qv423r2ksxma49i4l45p42j20ifr2rrr23dz0fq44j6llc")
- (fetchbower "netflux-websocket" "0.1.20" "^0.1.19" "0bpkkg4vfyhiwwf2d2hxld6zsppjx4clknrwsivp4m0vx2ddc54s")
+ (fetchbower "chainpad-netflux" "0.9.0" "^0.9.0" "0qx9ihnpmcrmg2lwkpm330bhj8zsp1gdxxrbsd05bwd8pm2x11av")
+ (fetchbower "netflux-websocket" "0.1.20" "^0.1.20" "1xwqq7nw7fmhglndbplarkdzxfmkq831aqs8nm6qj0hz2ggbibhz")
(fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz")
]; }
diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix
index f406aa83e350..77e529f26abf 100644
--- a/pkgs/servers/web-apps/cryptpad/default.nix
+++ b/pkgs/servers/web-apps/cryptpad/default.nix
@@ -15,7 +15,6 @@ let
bowerPackages = buildBowerComponents {
name = "${cryptpad.name}-bower-packages";
# this list had to be tweaked by hand:
- # * remove the # in the sortablejs dependency
# * add the second bootstrap ~3.1.1 entry
generated = ./bower-packages.nix;
src = cryptpad.src;
diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/pkgs/servers/web-apps/cryptpad/generate.sh
index fd3c93368912..8abf47409d4e 100755
--- a/pkgs/servers/web-apps/cryptpad/generate.sh
+++ b/pkgs/servers/web-apps/cryptpad/generate.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages.node2nix nodePackages.bower2nix
+#! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix nodePackages.bower2nix
set -euo pipefail
node2nix -6 \
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
index b2a943dc2dfc..9fb93c020854 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
@@ -49,13 +49,13 @@ let
sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
};
};
- "chainpad-server-3.0.3" = {
+ "chainpad-server-3.0.5" = {
name = "chainpad-server";
packageName = "chainpad-server";
- version = "3.0.3";
+ version = "3.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-3.0.3.tgz";
- sha512 = "NRfV7FFBEYy4ZVX7h0P5znu55X8v5K4iGWeMGihkfWZLKu70GmCPUTwpBCP79dUvnCToKEa4/e8aoSPcvZC8pA==";
+ url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-3.0.5.tgz";
+ sha512 = "USKOMSHsNjnme81Qy3nQ+ji9eCkBPokYH4T82LVHAI0aayTSCXcTPUDLVGDBCRqe8NsXU4io1WPXn1KiZwB8fA==";
};
};
"content-disposition-0.5.2" = {
@@ -364,13 +364,13 @@ let
sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
};
};
- "nthen-0.1.10" = {
+ "nthen-0.1.8" = {
name = "nthen";
packageName = "nthen";
- version = "0.1.10";
+ version = "0.1.8";
src = fetchurl {
- url = "https://registry.npmjs.org/nthen/-/nthen-0.1.10.tgz";
- sha512 = "W5LOhoFlQZSVg9SnRUJHgm3lOiT3HV6xq+Qo0dGKju2FWsDrKPwcgbJ9o5CORGz7UKKVhPScY9wOJHUogVG2UA==";
+ url = "https://registry.npmjs.org/nthen/-/nthen-0.1.8.tgz";
+ sha512 = "Oh2CwIbhj+wUT94lQV7LKmmgw3UYAGGd8oLIqp6btQN3Bz3PuWp4BuvtUo35H3rqDknjPfKx5P6mt7v+aJNjcw==";
};
};
"on-finished-2.3.0" = {
@@ -619,14 +619,14 @@ let
};
in
{
- "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" = nodeEnv.buildNodePackage {
+ "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.0.1" = nodeEnv.buildNodePackage {
name = "cryptpad";
packageName = "cryptpad";
- version = "2.25.0";
+ version = "3.0.1";
src = fetchgit {
url = "https://github.com/xwiki-labs/cryptpad.git";
- rev = "0b17df3302fc4a7683a8790f305c8a2c7b1b4fe8";
- sha256 = "261531da1745f9ff930bce3729afba2b7a52ee02f51340426ecf6b19204a21b7";
+ rev = "4e5f6edac4f9a3a7a4756eb543d29dc9d1eef32a";
+ sha256 = "f32a93316b717246d1563baec70f9e1e7e5ec1be4f325a473cc37e656afa13cd";
};
dependencies = [
sources."accepts-1.3.7"
@@ -634,7 +634,7 @@ in
sources."async-limiter-1.0.1"
sources."body-parser-1.18.3"
sources."bytes-3.0.0"
- sources."chainpad-server-3.0.3"
+ sources."chainpad-server-3.0.5"
sources."content-disposition-0.5.2"
sources."content-type-1.0.4"
sources."cookie-0.3.1"
@@ -669,7 +669,7 @@ in
sources."mime-types-2.1.24"
sources."ms-2.0.0"
sources."negotiator-0.6.2"
- sources."nthen-0.1.10"
+ sources."nthen-0.1.8"
sources."on-finished-2.3.0"
sources."parseurl-1.3.3"
sources."path-to-regexp-0.1.7"
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.json b/pkgs/servers/web-apps/cryptpad/node-packages.json
index c37d984ae121..c0c86f9848a6 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.json
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.json
@@ -1,3 +1,3 @@
[
- { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" }
+ { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.0.1" }
]
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix
index 36c5996286ff..82739d484f28 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-6_x}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
@@ -14,4 +14,4 @@ in
import ./node-packages-generated.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servers/web-apps/frab/default.nix b/pkgs/servers/web-apps/frab/default.nix
index d6a5128b8130..0b0583f1fb6f 100644
--- a/pkgs/servers/web-apps/frab/default.nix
+++ b/pkgs/servers/web-apps/frab/default.nix
@@ -11,7 +11,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "frab-2016-12-28";
src = fetchFromGitHub {
diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix
index 4f47890cc87a..77822365f9c7 100644
--- a/pkgs/servers/web-apps/moodle/default.nix
+++ b/pkgs/servers/web-apps/moodle/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, writeText }:
let
- version = "3.7.1";
+ version = "3.7.2";
stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);
in
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
- sha256 = "0xfriw0nfaf9hlcjviwg2acwpd192jf2ahw8sw3s6bj3pr1isxmd";
+ sha256 = "1mvrmpqkcz7m7yplqi0lwgnal79n747f7nwcgd2nfrvz7jv3s8ir";
};
phpConfig = writeText "config.php" ''
diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix
index e4dd9b0f2dc7..3d43862cbe0e 100644
--- a/pkgs/servers/web-apps/morty/default.nix
+++ b/pkgs/servers/web-apps/morty/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "morty-${version}";
+ pname = "morty";
version = "0.2.0";
goPackagePath = "github.com/asciimoo/morty";
diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
index a53c726587f2..1b61632824f2 100644
--- a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
+++ b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "pgpkeyserver-lite-${version}";
+stdenv.mkDerivation {
+ pname = "pgpkeyserver-lite";
version = "2017-07-18";
src = fetchFromGitHub {
diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix
index 946606e37013..5c105e85a872 100644
--- a/pkgs/servers/web-apps/restya-board/default.nix
+++ b/pkgs/servers/web-apps/restya-board/default.nix
@@ -15,7 +15,7 @@ let
in
stdenv.mkDerivation rec {
- name = "rstya-board-${version}";
+ pname = "rstya-board";
version = "0.6";
src = fetchurl {
diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix
index 615efa3b3672..f6000fc42117 100644
--- a/pkgs/servers/web-apps/selfoss/default.nix
+++ b/pkgs/servers/web-apps/selfoss/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "selfoss-${version}";
+ pname = "selfoss";
version = "2.18";
src = fetchurl {
- url = "https://github.com/SSilence/selfoss/releases/download/${version}/${name}.zip";
+ url = "https://github.com/SSilence/selfoss/releases/download/${version}/${pname}-${version}.zip";
sha256 = "1vd699r1kjc34n8avggckx2b0daj5rmgrj997sggjw2inaq4cg8b";
};
diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index 0ec31e7dc4fa..f5bce90c2341 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "shaarli-${version}";
+ pname = "shaarli";
version = "0.11.1";
src = fetchurl {
diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix
index 5fd941e9467c..ef0a4331d41d 100644
--- a/pkgs/servers/web-apps/shaarli/material-theme.nix
+++ b/pkgs/servers/web-apps/shaarli/material-theme.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "shaarli-material-${version}";
+ pname = "shaarli-material";
version = "0.10.4";
src = fetchFromGitHub {
diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix
index 0c51b6b13cdd..4be14b37bd2b 100644
--- a/pkgs/servers/web-apps/virtlyst/default.nix
+++ b/pkgs/servers/web-apps/virtlyst/default.nix
@@ -2,7 +2,7 @@
, qtbase, libvirt, cutelyst, grantlee }:
stdenv.mkDerivation rec {
- name = "virtlyst-${version}";
+ pname = "virtlyst";
version = "1.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix
index eafe916d02ca..a105531ff4e6 100644
--- a/pkgs/servers/web-apps/wallabag/default.nix
+++ b/pkgs/servers/web-apps/wallabag/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "wallabag-${version}";
+ pname = "wallabag";
version = "2.3.8";
# remember to rm -r var/cache/* after a rebuild or unexpected errors will occur
diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix
index 30ab9374cba0..352c5a80e1f4 100644
--- a/pkgs/servers/webmetro/default.nix
+++ b/pkgs/servers/webmetro/default.nix
@@ -2,7 +2,6 @@
rustPlatform.buildRustPackage rec {
pname = "webmetro";
- name = "${pname}-${version}";
version = "unstable-20180426";
src = fetchFromGitHub {
diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix
index 92350595dd85..84904d48b1ee 100644
--- a/pkgs/servers/x11/quartz-wm/default.nix
+++ b/pkgs/servers/x11/quartz-wm/default.nix
@@ -2,7 +2,8 @@
let version = "1.3.1";
in stdenv.mkDerivation {
- name = "quartz-wm-${version}";
+ pname = "quartz-wm";
+ inherit version;
src = fetchurl {
url = "http://xquartz-dl.macosforge.org/src/quartz-wm-${version}.tar.xz";
sha256 = "1j8zd3p7rhay1s3sxq6anw78k5s59mx44xpqla2ianl62346a5g9";
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 66d4643de39f..e752f3ad834e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -58,11 +58,11 @@ lib.makeScope newScope (self: with self; {
}) {};
encodings = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
- name = "encodings-1.0.4";
+ name = "encodings-1.0.5";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/font/encodings-1.0.4.tar.bz2;
- sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf";
+ url = mirror://xorg/individual/font/encodings-1.0.5.tar.bz2;
+ sha256 = "0caafx0yqqnqyvbalxhh3mb0r9v36xmcy5zjhygb2i508dhy35mx";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -703,11 +703,11 @@ lib.makeScope newScope (self: with self; {
}) {};
libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation {
- name = "libX11-1.6.7";
+ name = "libX11-1.6.8";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2;
- sha256 = "0j0k5bjz4kd7rx6z09n5ggxbzbi84wf78xx25ikx6jmsxwq9w3li";
+ url = mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2;
+ sha256 = "1mbkwhhprhf49s2iwx7kiliprsdvd690zk44x3h53ql9q52si2dj";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -898,11 +898,11 @@ lib.makeScope newScope (self: with self; {
}) {};
libXi = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation {
- name = "libXi-1.7.9";
+ name = "libXi-1.7.10";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2;
- sha256 = "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2";
+ url = mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2;
+ sha256 = "0q8hz3slga3w3ch8wp0k7ay9ilhz315qnab0w1y2x9w3cf7hv8rn";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -1132,11 +1132,11 @@ lib.makeScope newScope (self: with self; {
}) {};
libpciaccess = callPackage ({ stdenv, pkgconfig, fetchurl, zlib }: stdenv.mkDerivation {
- name = "libpciaccess-0.14";
+ name = "libpciaccess-0.16";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2;
- sha256 = "197jbcpvp4z4x6j705mq2y4fsnnypy6f85y8xalgwhgx5bhl7x9x";
+ url = mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2;
+ sha256 = "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -1275,11 +1275,11 @@ lib.makeScope newScope (self: with self; {
}) {};
sessreg = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation {
- name = "sessreg-1.1.1";
+ name = "sessreg-1.1.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2;
- sha256 = "1qd66mg2bnppqz4xgdjzif2488zl82vx2c26ld3nb8pnyginm9vq";
+ url = mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2;
+ sha256 = "0crczl25zynkrslmm8sjaxszhrh4i33m7h5fg4wfdb3k8aarxjyz";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -1379,11 +1379,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xauth = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation {
- name = "xauth-1.0.10";
+ name = "xauth-1.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/xauth-1.0.10.tar.bz2;
- sha256 = "0kgwz9rmxjfdvi2syf8g0ms5rr5cgyqx4n0n1m960kyz7k745zjs";
+ url = mirror://xorg/individual/app/xauth-1.1.tar.bz2;
+ sha256 = "032klzzw8r09z36x1272ssd79bcisz8j5p8gbdy111fiknvx27bd";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@@ -2458,11 +2458,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation {
- name = "xinput-1.6.2";
+ name = "xinput-1.6.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/xinput-1.6.2.tar.bz2;
- sha256 = "1i75mviz9dyqyf7qigzmxq8vn31i86aybm662fzjz5c086dx551n";
+ url = mirror://xorg/individual/app/xinput-1.6.3.tar.bz2;
+ sha256 = "1vb6xdd1xmk5f7pwc5zcbxfray5sf1vbnscqwf2yl8lv7gfq38im";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 80b0addd6ec8..7e081b664b33 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -340,7 +340,7 @@ self: super:
installFlags = "sdkdir=\${out}/include/xorg";
});
- xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: rec {
+ xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
installFlags = "sdkdir=\${dev}/include/xorg";
});
@@ -468,7 +468,7 @@ self: super:
${name}
- <_description>${layout.description}
+ ${layout.description}
${layout.description}
@@ -484,8 +484,8 @@ self: super:
${name}
- <_shortDescription>${name}
- <_description>${layout.description}
+ ${name}
+ ${layout.description}
${concatMapStrings (lang: "${lang}\n") layout.languages}
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index beeffc21e562..05b035197c1c 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -19,14 +19,14 @@ mirror://xorg/individual/app/ico-1.0.5.tar.bz2
mirror://xorg/individual/app/listres-1.0.4.tar.bz2
mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2
mirror://xorg/individual/app/oclock-1.0.4.tar.bz2
-mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2
+mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2
mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2
mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2
mirror://xorg/individual/app/transset-1.0.2.tar.bz2
mirror://xorg/individual/app/twm-1.0.10.tar.bz2
mirror://xorg/individual/app/viewres-1.0.5.tar.bz2
mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2
-mirror://xorg/individual/app/xauth-1.0.10.tar.bz2
+mirror://xorg/individual/app/xauth-1.1.tar.bz2
mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2
mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2
mirror://xorg/individual/app/xclock-1.0.8.tar.bz2
@@ -47,7 +47,7 @@ mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2
mirror://xorg/individual/app/xgc-1.0.5.tar.bz2
mirror://xorg/individual/app/xhost-1.0.8.tar.bz2
mirror://xorg/individual/app/xinit-1.4.1.tar.bz2
-mirror://xorg/individual/app/xinput-1.6.2.tar.bz2
+mirror://xorg/individual/app/xinput-1.6.3.tar.bz2
mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2
mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2
mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2
@@ -132,7 +132,7 @@ mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2
-mirror://xorg/individual/font/encodings-1.0.4.tar.bz2
+mirror://xorg/individual/font/encodings-1.0.5.tar.bz2
mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2
mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2
@@ -174,10 +174,10 @@ mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2
mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2
mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2
mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
-mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2
+mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2
mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2
+mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2
mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2
mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2
@@ -190,7 +190,7 @@ mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2
mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2
-mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2
+mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2
mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2
mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2
mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2
diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix
index 0a008227b9fb..af526730ca97 100644
--- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix
+++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.3";
- name = "xcb-util-xrm-${version}";
+ pname = "xcb-util-xrm";
src = fetchurl {
- url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${name}.tar.bz2";
+ url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "118cj1ybw86pgw0l5whn9vbg5n5b0ijcpx295mwahzi004vz671h";
};
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix
index f18a50fe7e92..cd5fac60abe4 100644
--- a/pkgs/servers/x11/xquartz/default.nix
+++ b/pkgs/servers/x11/xquartz/default.nix
@@ -137,7 +137,7 @@ in stdenv.mkDerivation {
ruby ${./patch_plist.rb} \
${stdenv.lib.escapeShellArg (builtins.toXML {
XQUARTZ_DEFAULT_CLIENT = "${xterm}/bin/xterm";
- XQUARTZ_DEFAULT_SHELL = "${shell}";
+ XQUARTZ_DEFAULT_SHELL = shell;
XQUARTZ_DEFAULT_STARTX = "@STARTX@";
FONTCONFIG_FILE = "@FONTCONFIG_FILE@";
})} \
diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix
index b0d3dccf30f2..c25c4baf13b8 100644
--- a/pkgs/servers/xmpp/biboumi/default.nix
+++ b/pkgs/servers/xmpp/biboumi/default.nix
@@ -2,7 +2,7 @@
libiconv, botan2, systemd, pkgconfig, udns, pandoc, coreutils } :
stdenv.mkDerivation rec {
- name = "biboumi-${version}";
+ pname = "biboumi";
version = "8.3";
src = fetchurl {
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 7e092c523493..335de9ea153a 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -45,7 +45,8 @@ in stdenv.mkDerivation rec {
LANG = "en_US.UTF-8";
deps = stdenv.mkDerivation {
- name = "ejabberd-deps-${version}";
+ pname = "ejabberd-deps";
+ inherit version;
inherit src;
diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix
index 0e6fcd5e9896..ab377e3d53b1 100644
--- a/pkgs/servers/xmpp/openfire/default.nix
+++ b/pkgs/servers/xmpp/openfire/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre }:
stdenv.mkDerivation rec {
- name = "openfire-${version}";
+ pname = "openfire";
version = "3_6_3";
src = fetchurl {
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 928c48329656..549b55705c49 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -15,10 +15,10 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "0.11.2"; # also update communityModules
- name = "prosody-${version}";
+ pname = "prosody";
src = fetchurl {
- url = "https://prosody.im/downloads/source/${name}.tar.gz";
+ url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
sha256 = "0ca8ivqb4hxqka08pwnaqi1bqxrdl8zw47g6z7nw9q5r57fgc4c9";
};
@@ -54,12 +54,12 @@ stdenv.mkDerivation rec {
cp -r $communityModules/mod_${module} $out/lib/prosody/modules/
'') (withCommunityModules ++ withOnlyInstalledCommunityModules)}
wrapProgram $out/bin/prosody \
- --prefix LUA_PATH ';' "$NIX_LUA_PATH" \
- --prefix LUA_CPATH ';' "$NIX_LUA_CPATH"
+ --prefix LUA_PATH ';' "$LUA_PATH" \
+ --prefix LUA_CPATH ';' "$LUA_CPATH"
wrapProgram $out/bin/prosodyctl \
--add-flags '--config "/etc/prosody/prosody.cfg.lua"' \
- --prefix LUA_PATH ';' "$NIX_LUA_PATH" \
- --prefix LUA_CPATH ';' "$NIX_LUA_CPATH"
+ --prefix LUA_PATH ';' "$LUA_PATH" \
+ --prefix LUA_CPATH ';' "$LUA_CPATH"
'';
passthru.communityModules = withCommunityModules;
diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix
index 8df8499d11eb..7db8ec3b6049 100644
--- a/pkgs/servers/xmpp/pyIRCt/default.nix
+++ b/pkgs/servers/xmpp/pyIRCt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } :
stdenv.mkDerivation rec {
- name = "pyIRCt-${version}";
+ pname = "pyIRCt";
version = "0.4";
src = fetchurl {
@@ -15,22 +15,21 @@ stdenv.mkDerivation rec {
xmpppy pythonIRClib
];
- /* doConfigure should be removed if not needed */
# phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)];
installPhase = ''
- mkdir -p $out/bin $out/share/${name}
+ mkdir -p $out/bin $out/share/${pname}-${version}
sed -e 's@/usr/bin/@${python}/bin/@' -i irc.py
sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py
sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py
sed -e '/configFiles/iimport os' -i config.py
- cp * $out/share/${name}
+ cp * $out/share/${pname}-${version}
cat > $out/bin/pyIRCt < $out/bin/pyMAILt </dev/null
+}
+
+# Return success if the specified file is an ELF object
+# and its e_type is ET_DYN (shared object file)
+isELFDyn() {
+ grep -ao -P '^\177ELF.{11}\x00\x03' "$1" >/dev/null
+}
+
# Return success if the specified file is a script (i.e. starts with
# "#!").
isScript() {
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 390c7f1123ec..8344c9dfb2b8 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -8,21 +8,21 @@
, bootstrapFiles ?
let table = {
- "glibc" = {
- "i686-linux" = import ./bootstrap-files/i686.nix;
- "x86_64-linux" = import ./bootstrap-files/x86_64.nix;
- "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix;
- "armv6l-linux" = import ./bootstrap-files/armv6l.nix;
- "armv7l-linux" = import ./bootstrap-files/armv7l.nix;
- "aarch64-linux" = import ./bootstrap-files/aarch64.nix;
- "mipsel-linux" = import ./bootstrap-files/loongson2f.nix;
- "powerpc64le-linux" = import ./bootstrap-files/ppc64le.nix;
+ glibc = {
+ i686-linux = import ./bootstrap-files/i686.nix;
+ x86_64-linux = import ./bootstrap-files/x86_64.nix;
+ armv5tel-linux = import ./bootstrap-files/armv5tel.nix;
+ armv6l-linux = import ./bootstrap-files/armv6l.nix;
+ armv7l-linux = import ./bootstrap-files/armv7l.nix;
+ aarch64-linux = import ./bootstrap-files/aarch64.nix;
+ mipsel-linux = import ./bootstrap-files/loongson2f.nix;
+ powerpc64le-linux = import ./bootstrap-files/ppc64le.nix;
};
- "musl" = {
- "aarch64-linux" = import ./bootstrap-files/aarch64-musl.nix;
- "armv6l-linux" = import ./bootstrap-files/armv6l-musl.nix;
- "x86_64-linux" = import ./bootstrap-files/x86_64-musl.nix;
- "powerpc64le-linux" = import ./bootstrap-files/ppc64le-musl.nix;
+ musl = {
+ aarch64-linux = import ./bootstrap-files/aarch64-musl.nix;
+ armv6l-linux = import ./bootstrap-files/armv6l-musl.nix;
+ x86_64-linux = import ./bootstrap-files/x86_64-musl.nix;
+ powerpc64le-linux = import ./bootstrap-files/ppc64le-musl.nix;
};
};
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index ba53a6f1d142..f6e0df161ad0 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -121,8 +121,8 @@ in
cc = let
nativePrefix = { # switch
- "i686-solaris" = "/usr/gnu";
- "x86_64-solaris" = "/opt/local/gcc47";
+ i686-solaris = "/usr/gnu";
+ x86_64-solaris = "/opt/local/gcc47";
}.${system} or "/usr";
in
import ../../build-support/cc-wrapper {
diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix
index 73b359ffe6a4..810d5d97829b 100644
--- a/pkgs/test/macos-sierra-shared/default.nix
+++ b/pkgs/test/macos-sierra-shared/default.nix
@@ -25,7 +25,7 @@ let
meta.platforms = lib.platforms.darwin;
}) count;
- finalExe = stdenv.mkDerivation rec {
+ finalExe = stdenv.mkDerivation {
name = "${prefix}-final-asdf";
unpackPhase = ''
src=$PWD
diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix
index c9bf7141804c..db17788cea00 100644
--- a/pkgs/tools/X11/autocutsel/default.nix
+++ b/pkgs/tools/X11/autocutsel/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.10.0";
- name = "autocutsel-${version}";
+ pname = "autocutsel";
src = fetchurl {
- url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${name}.tar.gz";
+ url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "0gsys2dzh4az51ndcsabhlbbrjn2nm75lnjr45kg6r8sm8q66dx2";
};
diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix
index 488c97ad36b5..66d845b0587f 100644
--- a/pkgs/tools/X11/bgs/default.nix
+++ b/pkgs/tools/X11/bgs/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "bgs-${version}";
+ pname = "bgs";
version = "0.8";
src = fetchurl {
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 0d764a4cbd10..f5a8fd24f5e6 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -56,10 +56,11 @@ let
};
in stdenv.mkDerivation rec {
- name = "bumblebee-${version}";
+ pname = "bumblebee";
+ inherit version;
src = fetchurl {
- url = "https://bumblebee-project.org/${name}.tar.gz";
+ url = "https://bumblebee-project.org/${pname}-${version}.tar.gz";
sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h";
};
diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix
index 57f32ed82250..b54a7303ff87 100644
--- a/pkgs/tools/X11/caffeine-ng/default.nix
+++ b/pkgs/tools/X11/caffeine-ng/default.nix
@@ -1,22 +1,27 @@
{ gdk-pixbuf, glib, gobject-introspection, gtk3, lib, libnotify,
- pythonPackages, wrapGAppsHook
+ python3Packages, wrapGAppsHook
}:
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "caffeine-ng";
version = "3.4.2";
- src = pythonPackages.fetchPypi{
+ src = python3Packages.fetchPypi{
inherit pname version;
sha256="05k8smjlfjcccgmp8qi04l7106k46fs4p8fl5bdqqjwv6pwl7y4w";
};
nativeBuildInputs = [ wrapGAppsHook glib ];
- buildInputs = [ gdk-pixbuf gobject-introspection libnotify gtk3 ];
- pythonPath = with pythonPackages; [
- dbus-python docopt ewmh pygobject3 pyxdg
- setproctitle setuptools setuptools_scm wheel
+ buildInputs = [
+ gdk-pixbuf gobject-introspection libnotify gtk3
+ python3Packages.setuptools_scm
];
+ pythonPath = with python3Packages; [
+ dbus-python docopt ewmh pygobject3 pyxdg
+ setproctitle
+ ];
+
+ doCheck = false; # There are no tests.
postBuild = ''
mkdir -p $out/share
diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index 173963135f87..5327e0f8c8f9 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, perl, xkeyboard_config }:
stdenv.mkDerivation rec {
- name = "ckbcomp-${version}";
+ pname = "ckbcomp";
version = "1.193";
src = fetchFromGitLab {
diff --git a/pkgs/tools/X11/dispad/default.nix b/pkgs/tools/X11/dispad/default.nix
index 1d119220e585..7c1457d3e2ae 100644
--- a/pkgs/tools/X11/dispad/default.nix
+++ b/pkgs/tools/X11/dispad/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libX11, libXi, libconfuse }:
stdenv.mkDerivation rec {
- name = "dispad-${version}";
+ pname = "dispad";
version = "0.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix
index 28f7edcfd043..f15d099016a5 100644
--- a/pkgs/tools/X11/dragon-drop/default.nix
+++ b/pkgs/tools/X11/dragon-drop/default.nix
@@ -1,7 +1,7 @@
{ stdenv, gtk, pkgconfig, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "dragon-drop-${version}";
+ pname = "dragon-drop";
version = "1.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix
index 3283cea1db52..ff84dde6f99b 100644
--- a/pkgs/tools/X11/ffcast/default.nix
+++ b/pkgs/tools/X11/ffcast/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, autoreconfHook, perl, libX11 }:
stdenv.mkDerivation rec {
- name = "ffcast-${version}";
+ pname = "ffcast";
version = "2.5.0";
src = fetchFromGitHub {
owner = "lolilolicon";
repo = "FFcast";
- rev = "${version}";
+ rev = version;
sha256 = "047y32bixhc8ksr98vwpgd0k1xxgsv2vs0n3kc2xdac4krc9454h";
};
diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix
index c750a5ce1c66..01d82b4a112c 100644
--- a/pkgs/tools/X11/go-sct/default.nix
+++ b/pkgs/tools/X11/go-sct/default.nix
@@ -1,7 +1,7 @@
{ stdenv, xorg, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "go-sct-${version}";
+ pname = "go-sct";
version = "20180605-${stdenv.lib.strings.substring 0 7 rev}";
rev = "eb1e851f2d5017038d2b8e3653645c36d3a279f4";
diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix
index 1a7fc91311e5..976cabc33f8b 100644
--- a/pkgs/tools/X11/grobi/default.nix
+++ b/pkgs/tools/X11/grobi/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
-buildGoPackage rec {
+buildGoPackage {
version = "0.5.1";
- name = "grobi-${version}";
+ pname = "grobi";
goPackagePath = "github.com/fd0/grobi";
diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix
index cf2227403b01..239dfa0963b2 100644
--- a/pkgs/tools/X11/hsetroot/default.nix
+++ b/pkgs/tools/X11/hsetroot/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoconf, automake, imlib2, libtool, libX11, pkgconfig, xorgproto }:
stdenv.mkDerivation rec {
- name = "hsetroot-${version}";
+ pname = "hsetroot";
version = "1.0.2";
# The primary download site seems to no longer exist; use Gentoo's mirror for now.
diff --git a/pkgs/tools/X11/jumpapp/default.nix b/pkgs/tools/X11/jumpapp/default.nix
index 5d3810c7d64d..38de9e9f80b6 100644
--- a/pkgs/tools/X11/jumpapp/default.nix
+++ b/pkgs/tools/X11/jumpapp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, perl, pandoc, fetchFromGitHub, xdotool, wmctrl, xprop, nettools }:
stdenv.mkDerivation rec {
- name = "jumpapp-${version}";
+ pname = "jumpapp";
version = "1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix
index 7863542d1900..5eb74a267983 100644
--- a/pkgs/tools/X11/keynav/default.nix
+++ b/pkgs/tools/X11/keynav/default.nix
@@ -2,7 +2,7 @@
, libXinerama, libXrandr, glib, cairo, xdotool }:
let release = "20180821"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "keynav-0.${release}.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix
index f7d8914722a9..1472e39c83c2 100644
--- a/pkgs/tools/X11/ksuperkey/default.nix
+++ b/pkgs/tools/X11/ksuperkey/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, libX11, libXtst, pkgconfig, xorgproto, libXi }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ksuperkey-git-2015-07-21";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix
index eda5703d6a86..95aa15840da6 100644
--- a/pkgs/tools/X11/nitrogen/default.nix
+++ b/pkgs/tools/X11/nitrogen/default.nix
@@ -3,10 +3,11 @@
let version = "1.6.1";
in
stdenv.mkDerivation rec {
- name = "nitrogen-${version}";
+ pname = "nitrogen";
+ inherit version;
src = fetchurl {
- url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz";
+ url = "http://projects.l3ib.org/nitrogen/files/${pname}-${version}.tar.gz";
sha256 = "0zc3fl1mbhq0iyndy4ysmy8vv5c7xwf54rbgamzfhfvsgdq160pl";
};
diff --git a/pkgs/tools/X11/numlockx/default.nix b/pkgs/tools/X11/numlockx/default.nix
index 2c4807e4661f..b59e9dc30ac8 100644
--- a/pkgs/tools/X11/numlockx/default.nix
+++ b/pkgs/tools/X11/numlockx/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, libX11, libXext, autoconf }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
version = "1.2";
pname = "numlockx";
diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix
index b0ef813b455a..c2bcfe788e64 100644
--- a/pkgs/tools/X11/nx-libs/default.nix
+++ b/pkgs/tools/X11/nx-libs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo,
libpng, libtool, libxml2, pkgconfig, which, xorg }:
stdenv.mkDerivation rec {
- name = "nx-libs-${version}";
+ pname = "nx-libs";
version = "3.5.99.21";
src = fetchFromGitHub {
owner = "ArcticaProject";
diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix
index 2e02338631b4..6b1b353b09be 100644
--- a/pkgs/tools/X11/obconf/default.nix
+++ b/pkgs/tools/X11/obconf/default.nix
@@ -2,7 +2,7 @@
imlib2, libstartup_notification, makeWrapper, libSM }:
stdenv.mkDerivation rec {
- name = "obconf-${version}";
+ pname = "obconf";
version = "2.0.4";
src = fetchurl {
diff --git a/pkgs/tools/X11/oblogout/default.nix b/pkgs/tools/X11/oblogout/default.nix
index 33470beca2de..9acd113d0ab3 100644
--- a/pkgs/tools/X11/oblogout/default.nix
+++ b/pkgs/tools/X11/oblogout/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, intltool, file, pythonPackages, cairo }:
-pythonPackages.buildPythonApplication rec {
- name = "oblogout-unstable-${version}";
+pythonPackages.buildPythonApplication {
+ pname = "oblogout-unstable";
version = "2009-11-18";
src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/tools/X11/run-scaled/default.nix
index ea661b0f8c7b..fc0068e6e278 100644
--- a/pkgs/tools/X11/run-scaled/default.nix
+++ b/pkgs/tools/X11/run-scaled/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, makeWrapper, bc, xorgserver, xpra, xrandr }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "git-2018-06-03";
- name = "run-scaled-${version}";
+ pname = "run-scaled";
src = fetchFromGitHub {
owner = "kaueraal";
diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/tools/X11/runningx/default.nix
index 1323da585c89..31e2320e1b9f 100644
--- a/pkgs/tools/X11/runningx/default.nix
+++ b/pkgs/tools/X11/runningx/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libX11 }:
-stdenv.mkDerivation rec {
- name = "runningx-${version}";
+stdenv.mkDerivation {
+ pname = "runningx";
version = "1.0";
src = fetchurl {
diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix
index 92f24f2b4aa4..8b4a1e19572a 100644
--- a/pkgs/tools/X11/screen-message/default.nix
+++ b/pkgs/tools/X11/screen-message/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3, hicolor-icon-theme }:
stdenv.mkDerivation rec {
- name = "screen-message-${version}";
+ pname = "screen-message";
version = "0.25";
src = fetchurl {
diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix
index b8714fc9ecaf..bb113c90849c 100644
--- a/pkgs/tools/X11/setroot/default.nix
+++ b/pkgs/tools/X11/setroot/default.nix
@@ -6,7 +6,7 @@ assert enableXinerama -> libXinerama != null;
stdenv.mkDerivation rec {
version = "2.0.2";
- name = "setroot-${version}";
+ pname = "setroot";
src = fetchFromGitHub {
owner = "ttzhou";
diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix
index 16462f5243b7..4fd9678733dd 100644
--- a/pkgs/tools/X11/skippy-xd/default.nix
+++ b/pkgs/tools/X11/skippy-xd/default.nix
@@ -9,7 +9,7 @@ let
in
stdenv.mkDerivation rec {
version = "git-2015-03-01";
- name = "skippy-xd-${version}";
+ pname = "skippy-xd";
inherit buildInputs;
src = fetchgit {
url = "https://github.com/richardgv/skippy-xd/";
diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix
index 2b58dd6c9115..30f99cd40f29 100644
--- a/pkgs/tools/X11/sselp/default.nix
+++ b/pkgs/tools/X11/sselp/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.2";
- name = "sselp-${version}";
+ pname = "sselp";
src = fetchurl {
- url = "https://dl.suckless.org/tools/${name}.tar.gz";
+ url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz";
sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd";
};
diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index 47b54bec312c..92afa30e6168 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk }:
stdenv.mkDerivation rec {
- name = "virtualgl-lib-${version}";
+ pname = "virtualgl-lib";
version = "2.6.2";
src = fetchurl {
diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix
index a5a75c9df4f5..f906a6d403e6 100644
--- a/pkgs/tools/X11/wayv/default.nix
+++ b/pkgs/tools/X11/wayv/default.nix
@@ -1,6 +1,5 @@
{stdenv, fetchFromGitHub, libX11}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "wayv";
version = "0.3";
diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix
index cd9d6aecdefb..e8b2be4b7837 100644
--- a/pkgs/tools/X11/winswitch/default.nix
+++ b/pkgs/tools/X11/winswitch/default.nix
@@ -3,12 +3,12 @@
let
base = pythonPackages.buildPythonApplication rec {
- name = "winswitch-${version}";
+ pname = "winswitch";
namePrefix = "";
version = "0.12.23";
src = fetchurl {
- url = "http://winswitch.org/src/${name}.src.tar.bz2";
+ url = "http://winswitch.org/src/${pname}-${version}.src.tar.bz2";
sha256 = "1m0akjcdlsgng426rwvzlcl76kjm993icj0pggvha40cizig1yd9";
};
diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix
index 4200293ed080..fe5c70f6ce23 100644
--- a/pkgs/tools/X11/wmutils-core/default.nix
+++ b/pkgs/tools/X11/wmutils-core/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libxcb }:
stdenv.mkDerivation rec {
- name = "wmutils-core-${version}";
+ pname = "wmutils-core";
version = "1.1";
src = fetchurl {
diff --git a/pkgs/tools/X11/wmutils-opt/default.nix b/pkgs/tools/X11/wmutils-opt/default.nix
index c01aa8dc75fa..c12303038623 100644
--- a/pkgs/tools/X11/wmutils-opt/default.nix
+++ b/pkgs/tools/X11/wmutils-opt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libxcb }:
stdenv.mkDerivation rec {
- name = "wmutils-opt-${version}";
+ pname = "wmutils-opt";
version = "1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix
index 496fa422877a..1a6e99f0393d 100644
--- a/pkgs/tools/X11/wpgtk/default.nix
+++ b/pkgs/tools/X11/wpgtk/default.nix
@@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec {
longDescription = ''
In short, wpgtk is a colorscheme/wallpaper manager with a template system attached which lets you create templates from any textfile and will replace keywords on it on the fly, allowing for great styling and theming possibilities.
- wpgtk uses pywal as its colorscheme generator, but builds upon it with a UI and other features, such as the abilty to mix and edit the colorschemes generated and save them with their respective wallpapers, having light and dark themes, hackable and fast GTK+ theme made specifically for wpgtk and custom keywords and values to replace in templates.
+ wpgtk uses pywal as its colorscheme generator, but builds upon it with a UI and other features, such as the abilty to mix and edit the colorschemes generated and save them with their respective wallpapers, having light and dark themes, hackable and fast GTK theme made specifically for wpgtk and custom keywords and values to replace in templates.
INFO: To work properly, this tool needs "programs.dconf.enable = true" on nixos or dconf installed. A reboot may be required after installing dconf.
'';
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index 169f420357e6..acf0fc9aabfd 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -3,7 +3,7 @@
autoreconfHook, pkgconfig }:
stdenv.mkDerivation rec {
- name = "x11vnc-${version}";
+ pname = "x11vnc";
version = "0.9.16";
src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix
index cb01d0a4d4a4..6075f0070f90 100644
--- a/pkgs/tools/X11/x2vnc/default.nix
+++ b/pkgs/tools/X11/x2vnc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, xorg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "x2vnc-1.7.2";
src = fetchurl {
diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix
index 5a08cf5c817e..d52698b0ed7e 100644
--- a/pkgs/tools/X11/xannotate/default.nix
+++ b/pkgs/tools/X11/xannotate/default.nix
@@ -1,6 +1,5 @@
{stdenv, fetchFromBitbucket, libX11}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "xannotate";
version = "20150301";
diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix
index 79ef4cb56dcb..a648eefcdde1 100644
--- a/pkgs/tools/X11/xautomation/default.nix
+++ b/pkgs/tools/X11/xautomation/default.nix
@@ -2,7 +2,8 @@
let version = "1.09"; in
stdenv.mkDerivation {
- name = "xautomation-${version}";
+ pname = "xautomation";
+ inherit version;
src = fetchurl {
url = "https://www.hoopajoo.net/static/projects/xautomation-${version}.tar.gz";
sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf";
diff --git a/pkgs/tools/X11/xbanish/default.nix b/pkgs/tools/X11/xbanish/default.nix
index 142d7d17fe77..af522cca9e10 100644
--- a/pkgs/tools/X11/xbanish/default.nix
+++ b/pkgs/tools/X11/xbanish/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
version = "1.6";
pname = "xbanish";
- name = "${pname}-${version}";
buildInputs = [
libX11 libXi libXt libXfixes libXext
@@ -11,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "jcs";
- repo = "${pname}";
+ repo = pname;
rev = "v${version}";
sha256 = "0vp8ja68hpmqkl61zyjar3czhmny1hbm74m8f393incfz1ymr3i8";
};
diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix
index 987293878d82..bb83effe6011 100644
--- a/pkgs/tools/X11/xbindkeys-config/default.nix
+++ b/pkgs/tools/X11/xbindkeys-config/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }:
stdenv.mkDerivation rec {
- name = "xbindkeys-config-${version}";
+ pname = "xbindkeys-config";
version = "0.1.3";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix
index 4e4e49bd9468..23e0ce63e5b4 100644
--- a/pkgs/tools/X11/xbindkeys/default.nix
+++ b/pkgs/tools/X11/xbindkeys/default.nix
@@ -2,7 +2,8 @@
let version = "1.8.6"; in
stdenv.mkDerivation {
- name = "xbindkeys-${version}";
+ pname = "xbindkeys";
+ inherit version;
src = fetchurl {
url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz";
sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc";
diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix
index 1d42f791fb5c..48cab6529ccb 100644
--- a/pkgs/tools/X11/xcwd/default.nix
+++ b/pkgs/tools/X11/xcwd/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, libX11 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2016-09-30";
- name = "xcwd-${version}";
+ pname = "xcwd";
src = fetchFromGitHub {
owner = "schischi";
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 44016b801e5d..f1e6e28627c7 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -16,11 +16,11 @@ let
in
stdenv.mkDerivation rec {
- name = "xdg-utils-${version}";
+ pname = "xdg-utils";
version = "1.1.3";
src = fetchurl {
- url = "https://portland.freedesktop.org/download/${name}.tar.gz";
+ url = "https://portland.freedesktop.org/download/${pname}-${version}.tar.gz";
sha256 = "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p";
};
diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix
index bb6abfa9b586..d20714befba1 100644
--- a/pkgs/tools/X11/xdotool/default.nix
+++ b/pkgs/tools/X11/xdotool/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }:
stdenv.mkDerivation rec {
- name = "xdotool-${version}";
+ pname = "xdotool";
version = "3.20160805.1";
src = fetchurl {
diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index edafbf5525bf..b1770af2406e 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -2,7 +2,7 @@
, xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf, Security }:
rustPlatform.buildRustPackage rec {
- name = "xidlehook-${version}";
+ pname = "xidlehook";
version = "0.7.0";
doCheck = false;
diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix
index 43b46fcb8d7b..9aee0d778c46 100644
--- a/pkgs/tools/X11/xinput_calibrator/default.nix
+++ b/pkgs/tools/X11/xinput_calibrator/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "xinput_calibrator";
version = "0.7.5";
- name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/tias/${pname}/archive/v${version}.tar.gz";
sha256 = "d8edbf84523d60f52311d086a1e3ad0f3536f448360063dd8029bf6290aa65e9";
diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix
index c49a3dedb126..a837e73983f9 100644
--- a/pkgs/tools/X11/xkb-switch/default.nix
+++ b/pkgs/tools/X11/xkb-switch/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, libX11, libxkbfile }:
stdenv.mkDerivation rec {
- name = "xkb-switch-${version}";
+ pname = "xkb-switch";
version = "1.6.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/xloadimage/default.nix b/pkgs/tools/X11/xloadimage/default.nix
index a58d16ab82e8..3bd9f5256835 100644
--- a/pkgs/tools/X11/xloadimage/default.nix
+++ b/pkgs/tools/X11/xloadimage/default.nix
@@ -21,7 +21,7 @@ let
in
stdenv.mkDerivation rec {
version = "4.1";
- name = "xloadimage-${version}";
+ pname = "xloadimage";
src = fetchurl {
url = "mirror://debian/pool/main/x/xloadimage/xloadimage_${version}.orig.tar.gz";
diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix
index fd944f400446..13a18efccba6 100644
--- a/pkgs/tools/X11/xmacro/default.nix
+++ b/pkgs/tools/X11/xmacro/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11, libXtst, xorgproto, libXi }:
stdenv.mkDerivation rec {
- name = "xmacro-${version}";
+ pname = "xmacro";
version = "0.4.6";
src = fetchurl {
- url = "http://download.sarine.nl/xmacro/${name}.tar.gz";
+ url = "http://download.sarine.nl/xmacro/${pname}-${version}.tar.gz";
sha256 = "1p9jljxyn4j6piljiyi2xv6f8jhjbzhabprp8p0qmqxaxgdipi61";
};
diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/tools/X11/xmagnify/default.nix
index 463df6ad9351..dfd28e317718 100644
--- a/pkgs/tools/X11/xmagnify/default.nix
+++ b/pkgs/tools/X11/xmagnify/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, libX11, xorgproto }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "xmagnify-0.1.0";
src = fetchFromGitLab {
diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix
index a84f101cdf7b..58569dcd59cf 100644
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/pkgs/tools/X11/xnee/default.nix
@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
version = "3.19";
- name = "xnee-${version}";
+ pname = "xnee";
src = fetchurl {
- url = "mirror://gnu/xnee/${name}.tar.gz";
+ url = "mirror://gnu/xnee/${pname}-${version}.tar.gz";
sha256 = "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j";
};
diff --git a/pkgs/tools/X11/xosview2/default.nix b/pkgs/tools/X11/xosview2/default.nix
index 8acabeef2188..5dfe74fd3734 100644
--- a/pkgs/tools/X11/xosview2/default.nix
+++ b/pkgs/tools/X11/xosview2/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11 }:
stdenv.mkDerivation rec {
- name = "xosview2-${version}";
+ pname = "xosview2";
version = "2.3.1";
src = fetchurl {
- url = "mirror://sourceforge/xosview/${name}.tar.gz";
+ url = "mirror://sourceforge/xosview/${pname}-${version}.tar.gz";
sha256 = "1drp0n6qjbxyc0104a3aw2g94rh5p218wmrqwxh3kwwm7pmr9xip";
};
diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix
index 435f2b2e9801..dfac2cf88a55 100644
--- a/pkgs/tools/X11/xpointerbarrier/default.nix
+++ b/pkgs/tools/X11/xpointerbarrier/default.nix
@@ -1,6 +1,6 @@
{ stdenv, xorg, fetchgit }:
stdenv.mkDerivation rec {
- name = "xpointerbarrier-${version}";
+ pname = "xpointerbarrier";
version = "18.06";
src = fetchgit {
url = "https://www.uninformativ.de/git/xpointerbarrier.git";
diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix
index d6fab2b19103..770024aa4ba5 100644
--- a/pkgs/tools/X11/xpra/libfakeXinerama.nix
+++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11, libXinerama }:
stdenv.mkDerivation rec {
- name = "libfakeXinerama-${version}";
+ pname = "libfakeXinerama";
version = "0.1.0";
src = fetchurl {
- url = "https://www.xpra.org/src/${name}.tar.bz2";
+ url = "https://www.xpra.org/src/${pname}-${version}.tar.bz2";
sha256 = "0gxb8jska2anbb3c1m8asbglgnwylgdr44x9lr8yh91hjxsqadkx";
};
diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/tools/X11/xrectsel/default.nix
index e54ced714e76..4712192eacff 100644
--- a/pkgs/tools/X11/xrectsel/default.nix
+++ b/pkgs/tools/X11/xrectsel/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, autoreconfHook, libX11 }:
stdenv.mkDerivation rec {
- name = "xrectsel-${version}";
+ pname = "xrectsel";
version = "0.3.2";
src = fetchFromGitHub {
owner = "lolilolicon";
repo = "xrectsel";
- rev = "${version}";
+ rev = version;
sha256 = "0prl4ky3xzch6xcb673mcixk998d40ngim5dqc5374b1ls2r6n7l";
};
diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix
index 4f9b7bcb42e9..6f75d2360cf4 100644
--- a/pkgs/tools/X11/xrestop/default.nix
+++ b/pkgs/tools/X11/xrestop/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, xorg, pkgconfig, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
- name = "xrestop-${version}";
+ pname = "xrestop";
version = "0.4";
src = fetchurl {
diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix
index a7a7c2b6c0d5..8766e3c0d54d 100644
--- a/pkgs/tools/X11/xsecurelock/default.nix
+++ b/pkgs/tools/X11/xsecurelock/default.nix
@@ -3,7 +3,7 @@
, pam, apacheHttpd, imagemagick, pamtester, xscreensaver, xset }:
stdenv.mkDerivation rec {
- name = "xsecurelock-${version}";
+ pname = "xsecurelock";
version = "1.4.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix
index 2f84711e61c4..bee6cdb748f1 100644
--- a/pkgs/tools/X11/xsettingsd/default.nix
+++ b/pkgs/tools/X11/xsettingsd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, scons, pkgconfig, libX11 }:
stdenv.mkDerivation rec {
- name = "xsettingsd-${version}";
+ pname = "xsettingsd";
version = "1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix
index 8db15a8f0334..aae31d649f44 100644
--- a/pkgs/tools/X11/xtrace/default.nix
+++ b/pkgs/tools/X11/xtrace/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "xtrace";
version = "1.4.0";
- src = fetchFromGitLab rec {
+ src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "debian";
repo = pname;
diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix
index 368012b468f3..3c1dc3de2b42 100644
--- a/pkgs/tools/X11/xvkbd/default.nix
+++ b/pkgs/tools/X11/xvkbd/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, imake, libXt, libXaw, libXtst
, libXi, libXpm, xorgproto, gccmakedep, Xaw3d }:
-stdenv.mkDerivation rec {
- name = "xvkbd-${version}";
+stdenv.mkDerivation {
+ pname = "xvkbd";
version = "3.9";
src = fetchurl {
url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.9.tar.gz";
diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix
index b6b87fffb47b..7b30e5c58155 100644
--- a/pkgs/tools/X11/xwinmosaic/default.nix
+++ b/pkgs/tools/X11/xwinmosaic/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.4.2";
- name = "xwinmosaic-${version}";
+ pname = "xwinmosaic";
src = fetchgit {
url = "https://github.com/soulthreads/xwinmosaic/";
diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix
index dbbdb0c04e91..b9d48f545749 100644
--- a/pkgs/tools/X11/xwinwrap/default.nix
+++ b/pkgs/tools/X11/xwinwrap/default.nix
@@ -4,7 +4,8 @@ let
version = "4";
in
stdenv.mkDerivation {
- name = "xwinwrap-${version}";
+ pname = "xwinwrap";
+ inherit version;
src = fetchbzr {
url = https://code.launchpad.net/~shantanu-goel/xwinwrap/devel;
diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix
index 827a19d4bed7..6e89421d390b 100644
--- a/pkgs/tools/admin/acme.sh/default.nix
+++ b/pkgs/tools/admin/acme.sh/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools }:
stdenv.mkDerivation rec {
- name = "acme.sh-${version}";
+ pname = "acme.sh";
version = "2.8.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/admin/adtool/default.nix b/pkgs/tools/admin/adtool/default.nix
index 7ece3acbd679..5522fd7a68be 100644
--- a/pkgs/tools/admin/adtool/default.nix
+++ b/pkgs/tools/admin/adtool/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openldap }:
stdenv.mkDerivation rec {
- name = "adtool-${version}";
+ pname = "adtool";
version = "1.3.3";
src = fetchurl {
- url = "https://gp2x.org/adtool/${name}.tar.gz";
+ url = "https://gp2x.org/adtool/${pname}-${version}.tar.gz";
sha256 = "1awmpjamrwivi69i0j2fyrziy9s096ckviqd9c4llc3990mfsn4n";
};
diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
index 02386a135f11..b3e688c681d9 100644
--- a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
+++ b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
@@ -1,7 +1,7 @@
{ buildGoPackage, fetchFromGitHub, lib, ... }:
buildGoPackage rec {
- name = "amazon-ecr-credential-helper-${version}";
+ pname = "amazon-ecr-credential-helper";
version = "0.3.0";
goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper";
diff --git a/pkgs/tools/admin/aws-env/default.nix b/pkgs/tools/admin/aws-env/default.nix
index 37bf0e6c45d3..dff375207976 100644
--- a/pkgs/tools/admin/aws-env/default.nix
+++ b/pkgs/tools/admin/aws-env/default.nix
@@ -3,7 +3,6 @@
buildGoPackage rec {
pname = "aws-env";
version = "0.4";
- name = "${pname}-${version}";
rev = "v${version}";
goPackagePath = "github.com/Droplr/aws-env";
diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix
index e03e7f345351..830dcee26e43 100644
--- a/pkgs/tools/admin/aws-rotate-key/default.nix
+++ b/pkgs/tools/admin/aws-rotate-key/default.nix
@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "aws-rotate-key-${version}";
- version = "1.0.4";
+ pname = "aws-rotate-key";
+ version = "1.0.6";
goPackagePath = "github.com/Fullscreen/aws-rotate-key";
@@ -10,7 +10,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "Fullscreen";
repo = "aws-rotate-key";
- sha256 = "14bcs434646qdywws55r1a1v8ncwz8n0yljaa8zb5796pv4445wf";
+ sha256 = "sha256:1w9704g1l2b0y6g6mk79g28kk0yaswpgljkk85d0i10wyxq4icby";
};
goDeps = ./deps.nix;
diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index 03b0ff5c0016..ddecd15b6ade 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -1,6 +1,5 @@
{ buildGoPackage, lib, fetchFromGitHub }:
buildGoPackage rec {
- name = "${pname}-${version}";
pname = "aws-vault";
version = "4.5.1";
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index b07db4472627..33526ba11dfc 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -28,11 +28,11 @@ let
in py.pkgs.buildPythonApplication rec {
pname = "awscli";
- version = "1.16.170"; # N.B: if you change this, change botocore to a matching version too
+ version = "1.16.215"; # N.B: if you change this, change botocore to a matching version too
src = py.pkgs.fetchPypi {
inherit pname version;
- sha256 = "12kh62imdfy8whvqzdrmdq4zw70gj1g3smqldf4lqpjfzss7cy92";
+ sha256 = "13r32z8iyza4gvpf81l6l2ywv37yxi4bb08ry7cli5m6ny9xqlq8";
};
# No tests included
diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix
index d2b6a5dca9ff..6d590b8975b9 100644
--- a/pkgs/tools/admin/awslogs/default.nix
+++ b/pkgs/tools/admin/awslogs/default.nix
@@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "jorgebastida";
repo = "awslogs";
- rev = "${version}";
+ rev = version;
sha256 = "0vdpld7r7y78x1lcd5z3qsx047dwichxb8f3447yzl75fnsm75dc";
};
diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/tools/admin/bluemix-cli/default.nix
index 8b6395d85d04..f97a6e5df891 100644
--- a/pkgs/tools/admin/bluemix-cli/default.nix
+++ b/pkgs/tools/admin/bluemix-cli/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "bluemix-cli-${version}";
+ pname = "bluemix-cli";
version = "0.8.0";
src =
diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix
index 3ac9e3c0e946..e4b27d98dff9 100644
--- a/pkgs/tools/admin/bubblewrap/default.nix
+++ b/pkgs/tools/admin/bubblewrap/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libxslt, docbook_xsl, libcap }:
stdenv.mkDerivation rec {
- name = "bubblewrap-${version}";
+ pname = "bubblewrap";
version = "0.3.3";
src = fetchurl {
- url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz";
+ url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "1zsd6rxryg97dkkhibr0fvq16x3s75qj84rvhdv8p42ag58mz966";
};
diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix
index a6d8a046907f..25c147120947 100644
--- a/pkgs/tools/admin/clair/default.nix
+++ b/pkgs/tools/admin/clair/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "clair";
- version = "2.0.8";
+ version = "2.0.9";
goPackagePath = "github.com/coreos/clair";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "coreos";
repo = pname;
rev = "v${version}";
- sha256 = "1gwn533fdz8daz1db7w7g7mhls7d5a4vndn47blkpbx2yxdwdh62";
+ sha256 = "1lcrqka4daqqjagx2mbfzg3z8wxg669mw1lb450nrlc33ji2iwdm";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix
index e6ce5d077984..8195207ef60a 100644
--- a/pkgs/tools/admin/cli53/default.nix
+++ b/pkgs/tools/admin/cli53/default.nix
@@ -1,8 +1,8 @@
# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
{ lib, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
- name = "cli53-${version}";
+buildGoPackage {
+ pname = "cli53";
version = "0.8.12";
goPackagePath = "github.com/barnybug/cli53";
diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix
index 699c86b5fe31..6cc69c2290d4 100644
--- a/pkgs/tools/admin/dehydrated/default.nix
+++ b/pkgs/tools/admin/dehydrated/default.nix
@@ -1,10 +1,7 @@
-{ stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:
-let
- pkgName = "dehydrated";
- version = "0.6.5";
-in
+{ stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub, installShellFiles }:
stdenv.mkDerivation rec {
- name = pkgName + "-" + version;
+ pname = "dehydrated";
+ version = "0.6.5";
src = fetchFromGitHub {
owner = "lukas2511";
@@ -13,9 +10,16 @@ stdenv.mkDerivation rec {
sha256 = "14k7ykry16zp09i0bqb5pqaclvnjcb6p3x8knm9v5q0bdvlplkjv";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper installShellFiles ];
installPhase = ''
+ installManPage docs/man/dehydrated.1
+
+ mkdir -p "$out/share/docs/dehydrated"
+ cp docs/*.md "$out/share/docs/dehydrated"
+ cp -r docs/examples "$out/share/docs/dehydrated"
+ cp {CHANGELOG,LICENSE,README.md} "$out/share/docs/dehydrated"
+
mkdir -p $out/bin
cp -a dehydrated $out/bin
wrapProgram "$out/bin/dehydrated" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}"
diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix
index 71bef3805441..a71958f8a099 100644
--- a/pkgs/tools/admin/docker-credential-gcr/default.nix
+++ b/pkgs/tools/admin/docker-credential-gcr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "docker-credential-gcr-${version}";
+ pname = "docker-credential-gcr";
version = "1.4.3";
goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr";
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index 4a4d738f04d1..253306586532 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
- version = "0.4.3";
+ version = "0.5.2";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "1h7fyxlwa9f9r08rpl05r62ap7h7viaqchldbnv7j3vs2j23k127";
+ sha256 = "1aw69kcb2wx832hdfbx0944wwvdn5jbpr164pv6z0bxqzc0yi2kv";
};
- modSha256 = "17bb1k18x1xfq9bi9qbm8pln6h6pkhaqzy07qdvnhinmspll1695";
+ modSha256 = "0c8hbb73w1922qh895lsk0m9i7lk9kzrvxjc4crwsfpn9pv0qgd3";
subPackages = [ "cmd/eksctl" ];
diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix
index 3dbc8eea87b1..afb044ad583a 100644
--- a/pkgs/tools/admin/fastlane/default.nix
+++ b/pkgs/tools/admin/fastlane/default.nix
@@ -1,14 +1,13 @@
{ stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "fastlane";
version = (import ./gemset.nix).fastlane.version;
nativeBuildInputs = [ makeWrapper ];
env = bundlerEnv {
- name = "${name}-gems";
+ name = "${pname}-${version}-gems";
inherit pname ruby;
gemdir = ./.;
};
diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix
index ab5aad6d68cd..bbec64c0aee9 100644
--- a/pkgs/tools/admin/gixy/default.nix
+++ b/pkgs/tools/admin/gixy/default.nix
@@ -25,6 +25,7 @@ python.pkgs.buildPythonApplication rec {
pyparsing
jinja2
nose
+ setuptools
six
];
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 91f233df81d2..7c81e861ddbc 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -29,15 +29,13 @@ let
}.${system};
in stdenv.mkDerivation rec {
- name = "google-cloud-sdk-${version}";
+ pname = "google-cloud-sdk";
version = "255.0.0";
- src = fetchurl (sources name stdenv.hostPlatform.system);
+ src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
buildInputs = [ python makeWrapper ];
- doBuild = false;
-
patches = [
./gcloud-path.patch
];
diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix
index d4ee4d612932..e09cd2f52853 100644
--- a/pkgs/tools/admin/iamy/default.nix
+++ b/pkgs/tools/admin/iamy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
- name = "iamy-${version}";
+ pname = "iamy";
version = "2.3.2";
goPackagePath = "github.com/99designs/iamy";
diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix
index 1225441392c4..f0945d7d778b 100644
--- a/pkgs/tools/admin/intecture/agent.nix
+++ b/pkgs/tools/admin/intecture/agent.nix
@@ -4,7 +4,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "intecture-agent-${version}";
+ pname = "intecture-agent";
version = "0.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix
index 577d439c805a..a3208bddabe9 100644
--- a/pkgs/tools/admin/intecture/auth.nix
+++ b/pkgs/tools/admin/intecture/auth.nix
@@ -4,7 +4,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "intecture-auth-${version}";
+ pname = "intecture-auth";
version = "0.1.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix
index b0bb63984f0d..90d65a3f2951 100644
--- a/pkgs/tools/admin/intecture/cli.nix
+++ b/pkgs/tools/admin/intecture/cli.nix
@@ -4,7 +4,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "intecture-cli-${version}";
+ pname = "intecture-cli";
version = "0.3.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix
index e49d39576591..a11906e80f04 100644
--- a/pkgs/tools/admin/oxidized/default.nix
+++ b/pkgs/tools/admin/oxidized/default.nix
@@ -1,6 +1,6 @@
{ lib, ruby, bundlerApp, bundlerUpdateScript }:
-bundlerApp rec {
+bundlerApp {
pname = "oxidized";
gemdir = ./.;
diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 7c1e743a06e2..85333ca78f87 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -4,16 +4,16 @@
rustPlatform.buildRustPackage rec {
pname = "procs";
- version = "0.8.5";
+ version = "0.8.9";
src = fetchFromGitHub {
owner = "dalance";
repo = pname;
rev = "v${version}";
- sha256 = "0ihww2sm9hnh748723lr1cxw9zyi9nfxbbiij5a465mypa2p7w0v";
+ sha256 = "0gqbdk4gaxkpval52fsravjgvqz6c9zh1ahry57a2p6kszw96n13";
};
- cargoSha256 = "1aq2nhspb9kp9mzj5550xph09qvd0ahlw246hcx2mqkr4frh64x0";
+ cargoSha256 = "1k0yl03rxbv009gb2jkc0f7mjq3pzc9bf8hppk2w9xicxpq6l55c";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index ebdf6b17ed66..de09931e7c10 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -8,19 +8,19 @@ let
# switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script
pulumiArchPackage = {
- "x86_64-linux" = {
+ x86_64-linux = {
url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz";
sha256 = "13ajgc8x5l3s93hmz6jg88if10bvd319jmkljy4n26zdp30vfqmw";
};
- "x86_64-darwin" = {
+ x86_64-darwin = {
url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz";
sha256 = "0chpbnz2s4icwgmfq6kl8blz5mg4lpdqg061w3nh0p04adpgrn48";
};
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit version;
- name = "pulumi-${version}";
+ pname = "pulumi";
src = fetchurl pulumiArchPackage.${stdenv.hostPlatform.system};
diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix
index b246c7712ec9..3365d87bba4a 100644
--- a/pkgs/tools/admin/scaleway-cli/default.nix
+++ b/pkgs/tools/admin/scaleway-cli/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec{
- name = "scaleway-cli-${version}";
+ pname = "scaleway-cli";
version = "1.17";
goPackagePath = "github.com/scaleway/scaleway-cli";
diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix
index f8e893078157..e6a83c397c57 100644
--- a/pkgs/tools/admin/ssl-cert-check/default.nix
+++ b/pkgs/tools/admin/ssl-cert-check/default.nix
@@ -13,7 +13,6 @@
stdenv.mkDerivation rec {
pname = "ssl-cert-check";
- name = "${pname}-${version}";
version = "3.31";
src = fetchFromGitHub {
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 37a0f47c7afe..5a964a7fe70d 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -12,7 +12,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "1.9.0";
- name = "tigervnc-${version}";
+ pname = "tigervnc";
src = fetchFromGitHub {
owner = "TigerVNC";
diff --git a/pkgs/tools/admin/vncdo/default.nix b/pkgs/tools/admin/vncdo/default.nix
index 0d983ad98ea1..a126a430e52c 100644
--- a/pkgs/tools/admin/vncdo/default.nix
+++ b/pkgs/tools/admin/vncdo/default.nix
@@ -1,10 +1,9 @@
{ stdenv, fetchFromGitHub
, pythonPackages
}:
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonPackage {
pname = "vncdo";
version = "0.11.2";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "sibson";
diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix
index 0014febf40e4..13da95a28b5d 100644
--- a/pkgs/tools/archivers/afio/default.nix
+++ b/pkgs/tools/archivers/afio/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "2.5.2";
- name = "afio-${version}";
+ pname = "afio";
src = fetchurl {
- url = "http://members.chello.nl/~k.holtman/${name}.tgz";
+ url = "http://members.chello.nl/~k.holtman/${pname}-${version}.tgz";
sha256 = "1fa29wlqv76hzf8bxp1qpza1r23pm2f3m7rcf0jpwm6z150s2k66";
};
diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix
index e305a1739f7c..64a606a4cb50 100644
--- a/pkgs/tools/archivers/atool/default.nix
+++ b/pkgs/tools/archivers/atool/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, perl, bash}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "atool-0.39.0";
src = fetchurl {
url = mirror://savannah/atool/atool-0.39.0.tar.gz;
diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix
index cb73233dcb46..3f958f7f958d 100644
--- a/pkgs/tools/archivers/fsarchiver/default.nix
+++ b/pkgs/tools/archivers/fsarchiver/default.nix
@@ -6,7 +6,8 @@ let
version = "0.8.5";
in stdenv.mkDerivation {
- name = "fsarchiver-${version}";
+ pname = "fsarchiver";
+ inherit version;
src = fetchFromGitHub {
owner = "fdupoux";
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index c2e7f75fc7fc..caf507670f4f 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, acl }:
stdenv.mkDerivation rec {
- name = "gnutar-${version}";
+ pname = "gnutar";
version = "1.32";
src = fetchurl {
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 3b212b186aac..465bc474a9e5 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "p7zip-${version}";
+ pname = "p7zip";
version = "16.02";
src = fetchurl {
diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/tools/archivers/pxattr/default.nix
index 7f813dd76c89..b507b60287c9 100644
--- a/pkgs/tools/archivers/pxattr/default.nix
+++ b/pkgs/tools/archivers/pxattr/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, gcc }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "pxattr-2.1.0";
src = fetchurl {
diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix
index 3c515b8c195d..59ff67e3eefb 100644
--- a/pkgs/tools/archivers/rpmextract/default.nix
+++ b/pkgs/tools/archivers/rpmextract/default.nix
@@ -1,6 +1,6 @@
{ stdenv, rpm, cpio, substituteAll }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "rpmextract";
buildCommand = ''
diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/tools/archivers/runzip/default.nix
index f99ee963dbe6..b9eaf3dba65e 100644
--- a/pkgs/tools/archivers/runzip/default.nix
+++ b/pkgs/tools/archivers/runzip/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.4";
- name = "runzip-${version}";
+ pname = "runzip";
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libzip ];
diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/tools/archivers/s-tar/default.nix
index d53499007569..48e5cc6c4361 100644
--- a/pkgs/tools/archivers/s-tar/default.nix
+++ b/pkgs/tools/archivers/s-tar/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "s-tar-${version}";
+ pname = "s-tar";
version = "1.6";
src = fetchurl {
url = "mirror://sourceforge/s-tar/star-${version}.tar.bz2";
diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix
index 217a8ab35a9e..61e60996e759 100644
--- a/pkgs/tools/archivers/unarj/default.nix
+++ b/pkgs/tools/archivers/unarj/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "unarj-${version}";
+ pname = "unarj";
version = "2.65";
src = fetchurl {
sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p";
- url = "https://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz";
+ url = "https://src.fedoraproject.org/repo/pkgs/unarj/${pname}-${version}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${pname}-${version}.tar.gz";
};
preInstall = ''
diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix
index 89bb816aa579..9d072c9bb192 100644
--- a/pkgs/tools/archivers/undmg/default.nix
+++ b/pkgs/tools/archivers/undmg/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.0.3";
- name = "undmg-${version}";
+ pname = "undmg";
src = fetchFromGitHub {
owner = "matthewbauer";
diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix
index b9c549d670bf..82e83a8c6a38 100644
--- a/pkgs/tools/archivers/unp/default.nix
+++ b/pkgs/tools/archivers/unp/default.nix
@@ -7,8 +7,8 @@
let
runtime_bins = [ file unzip gzip ] ++ extraBackends;
-in stdenv.mkDerivation rec {
- name = "unp-${version}";
+in stdenv.mkDerivation {
+ pname = "unp";
version = "2.0-pre7";
buildInputs = [ perl makeWrapper ];
diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 2a51e4d7bc90..07f62fa02ad4 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "unrar-${version}";
+ pname = "unrar";
version = "5.7.5";
src = fetchurl {
diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix
index 3febb557bf8b..cfab2443032b 100644
--- a/pkgs/tools/archivers/unshield/default.nix
+++ b/pkgs/tools/archivers/unshield/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, zlib, openssl }:
stdenv.mkDerivation rec {
- name = "unshield-${version}";
+ pname = "unshield";
version = "1.4.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix
index 3c52e1944d8f..9d58bf5c2f89 100644
--- a/pkgs/tools/archivers/wimlib/default.nix
+++ b/pkgs/tools/archivers/wimlib/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
version = "1.13.1";
- name = "wimlib-${version}";
+ pname = "wimlib";
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ openssl fuse libxml2 ntfs3g ];
src = fetchurl {
- url = "https://wimlib.net/downloads/${name}.tar.gz";
+ url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz";
sha256 = "0pxgrpr3dr81rcf2jh71aiiq3v4anc5sj1nld18f2vhvbijbrx27";
};
diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix
index 07e76ea7f62a..53da140b7fda 100644
--- a/pkgs/tools/archivers/xarchive/default.nix
+++ b/pkgs/tools/archivers/xarchive/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.2.8-6";
- name = "xarchive-${version}";
+ pname = "xarchive";
src = fetchurl {
- url = "mirror://sourceforge/xarchive/${name}.tar.gz";
+ url = "mirror://sourceforge/xarchive/${pname}-${version}.tar.gz";
sha256 = "0chfim7z27s00naf43a61zsngwhvim14mg1p3csbv5i3f6m50xx4";
};
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
meta = {
- description = "A GTK+ front-end for command line archiving tools";
+ description = "A GTK front-end for command line archiving tools";
maintainers = [ stdenv.lib.maintainers.domenkozar ];
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix
index 9860c2b34bd4..54bd9a1a08bb 100644
--- a/pkgs/tools/archivers/xarchiver/default.nix
+++ b/pkgs/tools/archivers/xarchiver/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "0.5.4.14";
- name = "xarchiver-${version}";
+ pname = "xarchiver";
src = fetchFromGitHub {
owner = "ib";
repo = "xarchiver";
- rev = "${version}";
+ rev = version;
sha256 = "1iklwgykgymrwcc5p1cdbh91v0ih1m58s3w9ndl5kyd44bwlb7px";
};
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk3 intltool libxslt hicolor-icon-theme ];
meta = {
- description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
+ description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
homepage = https://github.com/ib/xarchiver;
maintainers = [ stdenv.lib.maintainers.domenkozar ];
license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index c99221b36ba1..09c4e914bd88 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, perl, unzip }:
stdenv.mkDerivation rec {
- name = "zpaq-${version}";
+ pname = "zpaq";
version = "7.15";
src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index 6c587f5cc5c6..39ad4626f3eb 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, which, docutils, freetype, pango }:
stdenv.mkDerivation rec {
- name = "abcm2ps-${version}";
+ pname = "abcm2ps";
version = "8.14.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index 4bb9dd885743..773b09958ea7 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
- name = "abcMIDI-${version}";
+ pname = "abcMIDI";
version = "2019.08.11";
src = fetchzip {
- url = "https://ifdo.ca/~seymour/runabc/${name}.zip";
+ url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
sha256 = "0rkqmavg7iv9080jdqs0qz80nanhizv6jk0fg9d5xvq3gnmfvnj1";
};
diff --git a/pkgs/tools/audio/accuraterip-checksum/default.nix b/pkgs/tools/audio/accuraterip-checksum/default.nix
index 502859cd52d3..4590a0dfbc30 100644
--- a/pkgs/tools/audio/accuraterip-checksum/default.nix
+++ b/pkgs/tools/audio/accuraterip-checksum/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libsndfile }:
stdenv.mkDerivation rec {
- name = "accuraterip-checksum-${version}";
+ pname = "accuraterip-checksum";
version = "1.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
index 4c28c4f3458f..acd205a30de1 100644
--- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix
+++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }:
stdenv.mkDerivation rec {
- name = "acoustid-fingerprinter-${version}";
+ pname = "acoustid-fingerprinter";
version = "0.6";
src = fetchurl {
url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/"
- + "${name}.tar.gz";
+ + "${pname}-${version}.tar.gz";
sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0";
};
diff --git a/pkgs/tools/audio/aucdtect/default.nix b/pkgs/tools/audio/aucdtect/default.nix
index 825e1a0cc072..ad9d5fb86905 100644
--- a/pkgs/tools/audio/aucdtect/default.nix
+++ b/pkgs/tools/audio/aucdtect/default.nix
@@ -3,26 +3,29 @@
with lib;
stdenv.mkDerivation rec {
- name = "aucdtext-${version}";
+ pname = "aucdtect";
version = "0.8-2";
src = fetchurl {
- url = "http://www.true-audio.com/ftp/aucdtect-${version}.i586.rpm";
+ url = "http://www.true-audio.com/ftp/${pname}-${version}.i586.rpm";
sha256 = "1lp5f0rq5b5n5il0c64m00gcfskarvgqslpryms9443d200y6mmd";
};
unpackCmd = "${rpmextract}/bin/rpmextract $src";
installPhase = ''
- mkdir -p $out/bin
- install -m755 local/bin/auCDtect $out/bin/aucdtect
+ runHook preInstall
+
+ install -Dm755 local/bin/auCDtect $out/bin/aucdtect
+
+ runHook postInstall
'';
dontStrip = true;
meta = with stdenv.lib; {
description = "Verify authenticity of lossless audio files";
- homepage = http://tausoft.org;
+ homepage = "http://tausoft.org";
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix
index 38902f234a2b..75d8975ab32c 100644
--- a/pkgs/tools/audio/beets/alternatives-plugin.nix
+++ b/pkgs/tools/audio/beets/alternatives-plugin.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, beets, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "beets-alternatives-${version}";
+ pname = "beets-alternatives";
version = "0.9.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/pkgs/tools/audio/beets/copyartifacts-plugin.nix
index 3c9cc5639a8f..fac37962f3cf 100644
--- a/pkgs/tools/audio/beets/copyartifacts-plugin.nix
+++ b/pkgs/tools/audio/beets/copyartifacts-plugin.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, beets, pythonPackages, glibcLocales }:
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
name = "beets-copyartifacts";
src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix
index 3cfb9a05b2dc..c5f7bcd5a71d 100644
--- a/pkgs/tools/audio/darkice/default.nix
+++ b/pkgs/tools/audio/darkice/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "darkice-${version}";
+ pname = "darkice";
version = "1.3";
src = fetchurl {
diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix
index 169f419cd672..d6c988ef0bed 100644
--- a/pkgs/tools/audio/dir2opus/default.nix
+++ b/pkgs/tools/audio/dir2opus/default.nix
@@ -2,7 +2,8 @@
let version = "0.12.2"; in
stdenv.mkDerivation rec {
- name = "dir2opus-${version}";
+ pname = "dir2opus";
+ inherit version;
pythonPath = [ mutagen ];
buildInputs = [ wrapPython ];
@@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/ehmry/dir2opus/archive/${version}.tar.gz";
- name = "${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
sha256 = "0bl8fa9zhccihnj1v3lpz5jb737frf9za06xb7j5rsjws6xky80d";
};
diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/tools/audio/ezstream/default.nix
index 6524bedf9392..fbf90d2211c4 100644
--- a/pkgs/tools/audio/ezstream/default.nix
+++ b/pkgs/tools/audio/ezstream/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkgconfig }:
stdenv.mkDerivation rec {
- name = "ezstream-${version}";
+ pname = "ezstream";
version = "0.6.0";
src = fetchurl {
- url = "https://ftp.osuosl.org/pub/xiph/releases/ezstream/${name}.tar.gz";
+ url = "https://ftp.osuosl.org/pub/xiph/releases/ezstream/${pname}-${version}.tar.gz";
sha256 = "f86eb8163b470c3acbc182b42406f08313f85187bd9017afb8b79b02f03635c9";
};
diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix
index 23a33122c9fb..2acca1510400 100644
--- a/pkgs/tools/audio/glyr/default.nix
+++ b/pkgs/tools/audio/glyr/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
version = "1.0.10";
- name = "glyr-${version}";
+ pname = "glyr";
src = fetchFromGitHub {
owner = "sahib";
repo = "glyr";
- rev = "${version}";
+ rev = version;
sha256 = "1miwbqzkhg0v3zysrwh60pj9sv6ci4lzq2vq2hhc6pc6hdyh8xyr";
};
diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix
index fb3d0e51341c..35d1af1e7676 100644
--- a/pkgs/tools/audio/mididings/default.nix
+++ b/pkgs/tools/audio/mididings/default.nix
@@ -1,6 +1,6 @@
{ stdenv, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }:
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
version = "20151117";
pname = "mididings";
diff --git a/pkgs/tools/audio/mp3cat/default.nix b/pkgs/tools/audio/mp3cat/default.nix
index 19f670793ba2..acd11bc75e6f 100644
--- a/pkgs/tools/audio/mp3cat/default.nix
+++ b/pkgs/tools/audio/mp3cat/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
makeFlags = [
- "PREFIX=${placeholder ''out''}"
+ "PREFIX=${placeholder "out"}"
];
installTargets = [
diff --git a/pkgs/tools/audio/mpdas/default.nix b/pkgs/tools/audio/mpdas/default.nix
index 08bd864792bb..bfb4f81c8166 100644
--- a/pkgs/tools/audio/mpdas/default.nix
+++ b/pkgs/tools/audio/mpdas/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, mpd_clientlib, curl }:
stdenv.mkDerivation rec {
- name = "mpdas-${version}";
+ pname = "mpdas";
version = "0.4.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix
index 5b5a0d9c0e0a..a791a81db351 100644
--- a/pkgs/tools/audio/mpdcron/default.nix
+++ b/pkgs/tools/audio/mpdcron/default.nix
@@ -6,9 +6,9 @@ let
name = "mpdcron-bundle";
gemdir = ./.;
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
version = "20161228";
- name = "mpdcron-${version}";
+ pname = "mpdcron";
src = fetchFromGitHub {
owner = "alip";
diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix
index 4b72ed3bfd30..d13dfbe8f43d 100644
--- a/pkgs/tools/audio/mpdris2/default.nix
+++ b/pkgs/tools/audio/mpdris2/default.nix
@@ -4,7 +4,6 @@
stdenv.mkDerivation rec {
pname = "mpDris2";
- name = "${pname}-${version}";
version = "0.8";
src = fetchurl {
diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix
index 239e4b3fcca3..69e5976e6d5e 100644
--- a/pkgs/tools/audio/pa-applet/default.nix
+++ b/pkgs/tools/audio/pa-applet/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "pa-applet-2012-04-11";
src = fetchgit {
diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index c0f0aa1bf938..782ea314359d 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -4,13 +4,13 @@
}:
stdenv.mkDerivation rec {
- name = "pasystray-${version}";
+ pname = "pasystray";
version = "0.7.1";
src = fetchFromGitHub {
owner = "christophgysin";
repo = "pasystray";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk";
};
diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix
index cda89302abdd..8a8cd2581455 100644
--- a/pkgs/tools/audio/playerctl/default.nix
+++ b/pkgs/tools/audio/playerctl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gtk-doc, docbook_xsl, gobject-introspection }:
stdenv.mkDerivation rec {
- name = "playerctl-${version}";
+ pname = "playerctl";
version = "2.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix
index 9906fa449dda..5b27a00a9556 100644
--- a/pkgs/tools/audio/pnmixer/default.nix
+++ b/pkgs/tools/audio/pnmixer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }:
stdenv.mkDerivation rec {
- name = "pnmixer-${version}";
+ pname = "pnmixer";
version = "0.7.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix
index d86a0b09c269..bdc431bcb928 100644
--- a/pkgs/tools/audio/qastools/default.nix
+++ b/pkgs/tools/audio/qastools/default.nix
@@ -5,7 +5,8 @@ let
in
mkDerivation {
- name = "qastools-${version}";
+ pname = "qastools";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/project/qastools/${version}/qastools_${version}.tar.bz2";
diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix
index a4dd7197be0f..5d31193ee8d4 100644
--- a/pkgs/tools/audio/trx/default.nix
+++ b/pkgs/tools/audio/trx/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, alsaLib, libopus, ortp, bctoolbox }:
-stdenv.mkDerivation rec {
- name = "trx-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "trx-unstable";
version = "2018-01-23";
src = fetchgit {
diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix
index ed9558762502..3871bbd39a16 100644
--- a/pkgs/tools/audio/volumeicon/default.nix
+++ b/pkgs/tools/audio/volumeicon/default.nix
@@ -1,7 +1,7 @@
{ pkgs, fetchurl, stdenv, gtk3, pkgconfig, intltool, alsaLib }:
-stdenv.mkDerivation rec {
- name = "volumeicon-${version}";
+stdenv.mkDerivation {
+ pname = "volumeicon";
version = "0.5.1";
src = fetchurl {
diff --git a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
index 472b4a6508f2..3d219eed012c 100644
--- a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
+++ b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "amazon-glacier-cmd-interface-${version}";
+ pname = "amazon-glacier-cmd-interface";
version = "2016-09-01";
src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index ad0001f22e17..ce77ebe8c1ae 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -11,14 +11,14 @@ let
withGlusterfs = "\${with_glusterfs_directory}";
in
stdenv.mkDerivation rec {
- name = "bareos-${version}";
+ pname = "bareos";
version = "17.2.7";
src = fetchFromGitHub {
owner = "bareos";
repo = "bareos";
rev = "Release/${version}";
- name = "${name}-src";
+ name = "${pname}-${version}-src";
sha256 = "1awf5i4mw2nfd7z0dmqnywapnx9nz6xwqv8rxp0y2mnrhzdpbrbz";
};
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index 91809af415a3..963d7945b89d 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -2,11 +2,11 @@
, utillinux, asciidoc, asciidoctor, makeWrapper }:
stdenv.mkDerivation rec {
- name = "btrbk-${version}";
+ pname = "btrbk";
version = "0.28.3";
src = fetchurl {
- url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz";
+ url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz";
sha256 = "0s69pcjkjxg77cgyjahwyg2w81ckgzwz1ds4ifjw7z0zhjxy7miz";
};
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index bf10f556b6bb..3097756ddf8e 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -9,8 +9,9 @@ let version = "0.29.2"; in
with stdenv.lib;
-stdenv.mkDerivation rec {
- name = "bup-${version}";
+stdenv.mkDerivation {
+ pname = "bup";
+ inherit version;
src = fetchFromGitHub {
repo = "bup";
diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix
index 8aa2d015205e..5c0be4a2de7d 100644
--- a/pkgs/tools/backup/burp/default.nix
+++ b/pkgs/tools/backup/burp/default.nix
@@ -2,7 +2,7 @@
, acl, librsync, ncurses, openssl, zlib, uthash }:
stdenv.mkDerivation rec {
- name = "burp-${version}";
+ pname = "burp";
version = "2.2.18";
src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix
index 3ab1eba5b6f0..736a3122a6f0 100644
--- a/pkgs/tools/backup/chunksync/default.nix
+++ b/pkgs/tools/backup/chunksync/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.4";
- name = "chunksync-${version}";
+ pname = "chunksync";
src = fetchurl {
url = "https://chunksync.florz.de/chunksync_${version}.tar.gz";
diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index ac01dc6022b8..352f320dadf1 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -4,10 +4,10 @@ with stdenv.lib;
stdenv.mkDerivation rec {
version = "2.6.5";
- name = "dar-${version}";
+ pname = "dar";
src = fetchurl {
- url = "mirror://sourceforge/dar/${name}.tar.gz";
+ url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
sha256 = "1x2zr5nw3qq1vmbs4bva6mx1cx0180dri5i2971ynzcxybn75znd";
};
diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix
index 3a5ffc30f8f2..b2ef04dcffc7 100644
--- a/pkgs/tools/backup/diskrsync/default.nix
+++ b/pkgs/tools/backup/diskrsync/default.nix
@@ -1,16 +1,14 @@
{ buildGoPackage, fetchFromGitHub, stdenv, openssh, makeWrapper }:
buildGoPackage rec {
-
- name = "${pname}-${version}";
pname = "diskrsync";
- version = "unstable-2018-02-03";
+ version = "unstable-2019-01-02";
src = fetchFromGitHub {
owner = "dop251";
repo = pname;
- rev = "2f36bd6e5084ce16c12a2ee216ebb2939a7d5730";
- sha256 = "1rpfk7ds4lpff30aq4d8rw7g9j4bl2hd1bvcwd1pfxalp222zkxn";
+ rev = "e8598ef71038527a8a77d1a6cf2a73cfd96d9139";
+ sha256 = "1dqpmc4hp81knhdk3mrmwdr66xiibsvj5lagbm5ciajg9by45mcs";
};
goPackagePath = "github.com/dop251/diskrsync";
diff --git a/pkgs/tools/backup/diskrsync/deps.nix b/pkgs/tools/backup/diskrsync/deps.nix
index 684100968e88..8045737164b1 100644
--- a/pkgs/tools/backup/diskrsync/deps.nix
+++ b/pkgs/tools/backup/diskrsync/deps.nix
@@ -1,12 +1,12 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "github.com/dop251/spgz";
fetch = {
type = "git";
url = "https://github.com/dop251/spgz";
- rev = "d50e5e978e08044da0cf9babc6b42b55ec8fe0d5";
- sha256 = "11h8z6cwxw272rn5zc4y3w9d6py113iaimy681v6xxv26d30m8bx";
+ rev = "b86304a2b188";
+ sha256 = "1zss1z523qagk99plb0my8m8ng0danl372iyk1pr4i2skp2bf5z7";
};
}
{
@@ -14,8 +14,35 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
- rev = "1875d0a70c90e57f11972aefd42276df65e895b9";
- sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q";
+ rev = "9756ffdc2472";
+ sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "eb5bcb51f2a3";
+ sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "97732733099d";
+ sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "v0.3.0";
+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
]
diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix
index c774711b874c..be039fa47c09 100644
--- a/pkgs/tools/backup/duplicati/default.nix
+++ b/pkgs/tools/backup/duplicati/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, mono, sqlite, makeWrapper }:
stdenv.mkDerivation rec {
- name = "duplicati-${version}";
+ pname = "duplicati";
version = "2.0.4.5";
channel = "beta";
build_date = "2018-11-28";
@@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper ];
installPhase = ''
- mkdir -p $out/{bin,share/${name}}
- cp -r * $out/share/${name}
+ mkdir -p $out/{bin,share/${pname}-${version}}
+ cp -r * $out/share/${pname}-${version}
makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \
- --add-flags "$out/share/${name}/Duplicati.CommandLine.exe" \
+ --add-flags "$out/share/${pname}-${version}/Duplicati.CommandLine.exe" \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
sqlite ]}
makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \
- --add-flags "$out/share/${name}/Duplicati.Server.exe" \
+ --add-flags "$out/share/${pname}-${version}/Duplicati.Server.exe" \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
sqlite ]}
'';
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index b090da852638..1cf7a19014e4 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -5,11 +5,11 @@
, rsync, makeWrapper }:
python2Packages.buildPythonApplication rec {
- name = "duplicity-${version}";
+ pname = "duplicity";
version = "0.7.19";
src = fetchurl {
- url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz";
+ url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "0ag9dknslxlasslwfjhqgcqbkb1mvzzx93ry7lch2lfzcdd91am6";
};
patches = [
diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix
index d476b797f38e..3e4375cb76c6 100644
--- a/pkgs/tools/backup/duply/default.nix
+++ b/pkgs/tools/backup/duply/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "duply-${version}";
+ pname = "duply";
version = "2.2";
src = fetchurl {
diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/tools/backup/easysnap/default.nix
index ceb6feae3962..a56d1274f92e 100644
--- a/pkgs/tools/backup/easysnap/default.nix
+++ b/pkgs/tools/backup/easysnap/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, zfs }:
-stdenv.mkDerivation rec {
- name = "easysnap-${version}";
+stdenv.mkDerivation {
+ pname = "easysnap";
version = "unstable-2019-02-17";
src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix
index 224b8b12906e..8d71671f6fec 100644
--- a/pkgs/tools/backup/flockit/default.nix
+++ b/pkgs/tools/backup/flockit/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, runtimeShell }:
-stdenv.mkDerivation rec {
- name = "flockit-${version}";
+stdenv.mkDerivation {
+ pname = "flockit";
version = "2012-08-11";
src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix
index e30b0af45a52..c8093f4453e9 100644
--- a/pkgs/tools/backup/grab-site/default.nix
+++ b/pkgs/tools/backup/grab-site/default.nix
@@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec {
name = "grab-site-${version}";
src = fetchFromGitHub {
- rev = "${version}";
+ rev = version;
owner = "ArchiveTeam";
repo = "grab-site";
sha256 = "01n3mi9q593sd2bbmbbp5pn2c3pkwj7iqmy02zbh8ciqskraja4z";
diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix
index 6d761354b6af..6fe614195a4b 100644
--- a/pkgs/tools/backup/httrack/default.nix
+++ b/pkgs/tools/backup/httrack/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "3.49.2";
- name = "httrack-${version}";
+ pname = "httrack";
src = fetchurl {
url = "https://mirror.httrack.com/httrack-${version}.tar.gz";
diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix
index e29acc6f3c85..8cf3eb29462c 100644
--- a/pkgs/tools/backup/httrack/qt.nix
+++ b/pkgs/tools/backup/httrack/qt.nix
@@ -2,11 +2,11 @@
, httrack, qtbase, qtmultimedia }:
stdenv.mkDerivation rec {
- name = "httraqt-${version}";
+ pname = "httraqt";
version = "1.4.9";
src = fetchurl {
- url = "mirror://sourceforge/httraqt/${name}.tar.gz";
+ url = "mirror://sourceforge/httraqt/${pname}-${version}.tar.gz";
sha256 = "0pjxqnqchpbla4xiq4rklc06484n46cpahnjy03n9rghwwcad25b";
};
diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix
index 0ed70ade8295..814c02267ba9 100644
--- a/pkgs/tools/backup/lvmsync/default.nix
+++ b/pkgs/tools/backup/lvmsync/default.nix
@@ -3,7 +3,7 @@
let
pname = "lvmsync";
- version = (import ./gemset.nix)."${pname}".version;
+ version = (import ./gemset.nix).${pname}.version;
in stdenv.mkDerivation rec {
diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix
index e87878551254..5538b45c5f1b 100644
--- a/pkgs/tools/backup/mydumper/default.nix
+++ b/pkgs/tools/backup/mydumper/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "0.9.5";
- name = "mydumper-${version}";
+ pname = "mydumper";
src = fetchFromGitHub {
owner = "maxbube";
diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix
index 279652b0cd0b..30ee0041c7cc 100644
--- a/pkgs/tools/backup/ori/default.nix
+++ b/pkgs/tools/backup/ori/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, boost, pkgconfig, scons, utillinux, fuse, libevent, openssl, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.8.1";
- name = "ori-${version}";
+ pname = "ori";
src = fetchurl {
url = "https://bitbucket.org/orifs/ori/downloads/ori-0.8.1.tar.xz";
diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix
index 021f783e0fdd..fa4346c8cccc 100644
--- a/pkgs/tools/backup/partclone/default.nix
+++ b/pkgs/tools/backup/partclone/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "partclone-${version}";
+ pname = "partclone";
version = "0.3.11";
src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix
index 712d0af29a95..98eae9cc6702 100644
--- a/pkgs/tools/backup/percona-xtrabackup/default.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/default.nix
@@ -4,13 +4,13 @@
}:
stdenv.mkDerivation rec {
- name = "percona-xtrabackup-${version}";
+ pname = "percona-xtrabackup";
version = "2.4.12";
src = fetchFromGitHub {
owner = "percona";
repo = "percona-xtrabackup";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "1w17v2c677b3vfnm81bs63kjbfiin7f12wl9fbgp83hfpyx5msan";
};
diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix
index e0ac2c3f2328..bd5c10ea122c 100644
--- a/pkgs/tools/backup/rdedup/default.nix
+++ b/pkgs/tools/backup/rdedup/default.nix
@@ -3,7 +3,7 @@
, Security }:
rustPlatform.buildRustPackage rec {
- name = "rdedup-${version}";
+ pname = "rdedup";
version = "3.1.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/rdup/default.nix b/pkgs/tools/backup/rdup/default.nix
index 33e3c77db887..0df4ecda89ef 100644
--- a/pkgs/tools/backup/rdup/default.nix
+++ b/pkgs/tools/backup/rdup/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }:
-stdenv.mkDerivation rec {
- name = "rdup-${version}";
+stdenv.mkDerivation {
+ pname = "rdup";
version = "1.1.15";
src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index da44e389bdd5..b78fc9b61f74 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "restic-${version}";
+ pname = "restic";
version = "0.9.5";
goPackagePath = "github.com/restic/restic";
diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix
index d9f889897aa2..c7f12cb751b2 100644
--- a/pkgs/tools/backup/restic/rest-server.nix
+++ b/pkgs/tools/backup/restic/rest-server.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "restic-rest-server-${version}";
+ pname = "restic-rest-server";
version = "0.9.7";
goPackagePath = "github.com/restic/rest-server";
diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/tools/backup/rsbep/default.nix
index 96bbea4791e8..90a8c665cd43 100644
--- a/pkgs/tools/backup/rsbep/default.nix
+++ b/pkgs/tools/backup/rsbep/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, coreutils, gnused, gawk, fetchurl }:
-stdenv.mkDerivation rec {
- name = "rsbep-${version}";
+stdenv.mkDerivation {
+ pname = "rsbep";
version = "0.1.0";
src = fetchurl {
diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix
index 7324f75d95fa..a0f568b16b3e 100644
--- a/pkgs/tools/backup/store-backup/default.nix
+++ b/pkgs/tools/backup/store-backup/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
version = "3.5";
- name = "store-backup-${version}";
+ pname = "store-backup";
enableParallelBuilding = true;
diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index 3767a377cfcf..d24da778dcdb 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -7,7 +7,7 @@ let
};
in
stdenv.mkDerivation rec {
- name = "tarsnap-${version}";
+ pname = "tarsnap";
version = "1.0.39";
src = fetchurl {
diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix
index 42a3f51ee609..9c7cb0a83fd6 100644
--- a/pkgs/tools/backup/wal-e/default.nix
+++ b/pkgs/tools/backup/wal-e/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pythonPackages, lzop, postgresql, pv }:
pythonPackages.buildPythonApplication rec {
- name = "wal-e-${version}";
+ pname = "wal-e";
version = "0.6.10";
namePrefix = "";
diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix
index ce9237a7c6bc..70cc8a425c16 100644
--- a/pkgs/tools/backup/wal-g/default.nix
+++ b/pkgs/tools/backup/wal-g/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, brotli }:
buildGoPackage rec {
- name = "wal-g-${version}";
+ pname = "wal-g";
version = "0.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix
index c9fb1c547260..d7a160328ed1 100644
--- a/pkgs/tools/backup/zbackup/default.nix
+++ b/pkgs/tools/backup/zbackup/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } :
-stdenv.mkDerivation rec {
- name = "zbackup-${version}";
+stdenv.mkDerivation {
+ pname = "zbackup";
version = "1.4.4";
src = fetchurl {
url = "https://github.com/zbackup/zbackup/archive/1.4.4.tar.gz";
diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix
index 05792ecbb128..b44564efb827 100644
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/pkgs/tools/backup/znapzend/default.nix
@@ -23,8 +23,9 @@ let
version = "0.18.0";
checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd";
in
-stdenv.mkDerivation rec {
- name = "znapzend-${version}";
+stdenv.mkDerivation {
+ pname = "znapzend";
+ inherit version;
src = fetchFromGitHub {
owner = "oetiker";
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 84a2375302f7..8e393ac3f13e 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,19 +1,21 @@
{ config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3
-, obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp
-, hicolor-icon-theme, librsvg, wrapGAppsHook, gobject-introspection
+, obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute
+, gnome3, librsvg, wrapGAppsHook, gobject-introspection
+, withNetworkManager ?
+ config.networking.networkmanager.enable or false, networkmanager
, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
let
pythonPackages = python3Packages;
- binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ];
+ binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp iproute ];
in stdenv.mkDerivation rec {
- name = "blueman-${version}";
- version = "2.0.8";
+ pname = "blueman";
+ version = "2.1.1";
src = fetchurl {
- url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz";
- sha256 = "0kkh6jppqcn3yf70vnny1l015kxrz3dxw4g774gl02lh9ixx1bq4";
+ url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
+ sha256 = "1hyvc5x97j8b4kvwzh58zzlc454d0h0hk440zbg8f5as9qrv5spi";
};
nativeBuildInputs = [
@@ -21,19 +23,25 @@ in stdenv.mkDerivation rec {
pythonPackages.wrapPython wrapGAppsHook
];
- buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor-icon-theme ]
+ buildInputs = [ bluez gtk3 pythonPackages.python librsvg
+ gnome3.adwaita-icon-theme iproute libappindicator ]
++ pythonPath
- ++ lib.optional withPulseAudio libpulseaudio;
+ ++ lib.optional withPulseAudio libpulseaudio
+ ++ lib.optional withNetworkManager networkmanager;
postPatch = lib.optionalString withPulseAudio ''
sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py
'';
- pythonPath = with pythonPackages; [ dbus-python pygobject3 pycairo ];
+ pythonPath = with pythonPackages; [ pygobject3 pycairo ];
propagatedUserEnvPkgs = [ obex_data_server ];
- configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ];
+ configureFlags = [
+ "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+ "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
+ (lib.enableFeature withPulseAudio "pulseaudio")
+ ];
postFixup = ''
makeWrapperArgs="--prefix PATH ':' ${binPath}"
@@ -44,7 +52,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
homepage = https://github.com/blueman-project/blueman;
- description = "GTK+-based Bluetooth Manager";
+ description = "GTK-based Bluetooth Manager";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix
index f13db4572e08..097b7ae00d78 100644
--- a/pkgs/tools/bluetooth/bluez-alsa/default.nix
+++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix
@@ -12,7 +12,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "bluez-alsa-${version}";
+ pname = "bluez-alsa";
version = "1.4.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 0cdcd4c58df4..cf0ad78d1d7e 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -2,9 +2,9 @@
let
archids = {
- "x86_64-linux" = { hostarch = "x86_64"; efiPlatform = "x64"; };
- "i686-linux" = rec { hostarch = "ia32"; efiPlatform = hostarch; };
- "aarch64-linux" = rec { hostarch = "aarch64"; efiPlatform = "aa64"; };
+ x86_64-linux = { hostarch = "x86_64"; efiPlatform = "x64"; };
+ i686-linux = rec { hostarch = "ia32"; efiPlatform = hostarch; };
+ aarch64-linux = { hostarch = "aarch64"; efiPlatform = "aa64"; };
};
inherit
@@ -13,7 +13,7 @@ let
in
stdenv.mkDerivation rec {
- name = "refind-${version}";
+ pname = "refind";
version = "0.11.4";
srcName = "refind-src-${version}";
diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix
index 63a429e50de8..ccf632dfe5a5 100644
--- a/pkgs/tools/cd-dvd/bashburn/default.nix
+++ b/pkgs/tools/cd-dvd/bashburn/default.nix
@@ -3,13 +3,13 @@
, vorbis-tools, xorriso }:
stdenv.mkDerivation rec {
- name = "bashburn-${version}";
+ pname = "bashburn";
version = "3.1.0";
src = fetchurl {
sha256 = "0g5va5rjdrvacanmqr6pbxk2rl565ahkfbsvxsp1jvhvxvhmv3dp";
url = "http://bashburn.dose.se/index.php?s=file_download&id=25";
- name = "${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
};
nativeBuildInputs = [ utillinux ];
diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix
index aa47edcb96c4..b4f0d1039edc 100644
--- a/pkgs/tools/cd-dvd/bchunk/default.nix
+++ b/pkgs/tools/cd-dvd/bchunk/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "bchunk-${version}";
+ pname = "bchunk";
version = "1.2.2";
src = fetchurl {
- url = "http://he.fi/bchunk/${name}.tar.gz";
+ url = "http://he.fi/bchunk/${pname}-${version}.tar.gz";
sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7";
};
diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix
index 402073ff5241..a9f5b321d3d7 100644
--- a/pkgs/tools/cd-dvd/brasero/default.nix
+++ b/pkgs/tools/cd-dvd/brasero/default.nix
@@ -9,10 +9,10 @@ let
in stdenv.mkDerivation rec {
version = "${major}.${minor}";
- name = "brasero-${version}";
+ pname = "brasero";
src = fetchurl {
- url = "http://download.gnome.org/sources/brasero/${major}/${name}.tar.xz";
+ url = "http://download.gnome.org/sources/brasero/${major}/${pname}-${version}.tar.xz";
sha256 = "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8";
};
diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix
index a65f2d47d8f8..00a1864b0357 100644
--- a/pkgs/tools/cd-dvd/cdi2iso/default.nix
+++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "cdi2iso-${version}";
+ pname = "cdi2iso";
version = "0.1";
src = fetchurl {
- url = "mirror://sourceforge/cdi2iso.berlios/${name}-src.tar.gz";
+ url = "mirror://sourceforge/cdi2iso.berlios/${pname}-${version}-src.tar.gz";
sha256 = "0fj2fxhpr26z649m0ph71378c41ljflpyk89g87x8r1mc4rbq3kh";
};
diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/tools/cd-dvd/cdimgtools/default.nix
index 888711a85014..ece45944c5c0 100644
--- a/pkgs/tools/cd-dvd/cdimgtools/default.nix
+++ b/pkgs/tools/cd-dvd/cdimgtools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromRepoOrCz, autoreconfHook, makeWrapper, libdvdcss, libdvdread, perl, perlPackages, asciidoc, xmlto, sourceHighlight, docbook_xsl, docbook_xml_dtd_45 }:
-stdenv.mkDerivation rec {
- name = "cdimgtools-${version}";
+stdenv.mkDerivation {
+ pname = "cdimgtools";
version = "0.3";
src = fetchFromRepoOrCz {
diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/tools/cd-dvd/cue2pops/default.nix
index 6523c8a0cf3f..2ee69682a1d5 100644
--- a/pkgs/tools/cd-dvd/cue2pops/default.nix
+++ b/pkgs/tools/cd-dvd/cue2pops/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub }:
with stdenv.lib;
-stdenv.mkDerivation rec {
- name = "cue2pops-${version}";
+stdenv.mkDerivation {
+ pname = "cue2pops";
version = "git-2018-01-04";
src = fetchFromGitHub {
diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix
index 99908f06b101..2cb90129ed9a 100644
--- a/pkgs/tools/cd-dvd/dvd-vr/default.nix
+++ b/pkgs/tools/cd-dvd/dvd-vr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "dvd-vr-${version}";
+ pname = "dvd-vr";
version = "0.9.7";
src = fetchurl {
url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${version}.tar.gz";
diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index 82f1842e963e..6a4161ba1faa 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "dvdisaster-${version}";
+ pname = "dvdisaster";
version = "0.79.5";
src = fetchurl {
- url = "http://dvdisaster.net/downloads/${name}.tar.bz2";
+ url = "http://dvdisaster.net/downloads/${pname}-${version}.tar.bz2";
sha256 = "0f8gjnia2fxcbmhl8b3qkr5b7idl8m855dw7xw2fnmbqwvcm6k4w";
};
diff --git a/pkgs/tools/cd-dvd/ecm-tools/default.nix b/pkgs/tools/cd-dvd/ecm-tools/default.nix
index ec814d97bde0..922ab39063a0 100644
--- a/pkgs/tools/cd-dvd/ecm-tools/default.nix
+++ b/pkgs/tools/cd-dvd/ecm-tools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "ecm-tools-${version}";
+ pname = "ecm-tools";
version = "1.0.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix
index 56ec8e19f54e..09fbc8b38c87 100644
--- a/pkgs/tools/cd-dvd/lsdvd/default.nix
+++ b/pkgs/tools/cd-dvd/lsdvd/default.nix
@@ -4,7 +4,8 @@ let
version = "0.17";
in
stdenv.mkDerivation {
- name = "lsdvd-${version}";
+ pname = "lsdvd";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/lsdvd/lsdvd-${version}.tar.gz";
sha256 = "1274d54jgca1prx106iyir7200aflr70bnb1kawndlmcckcmnb3x";
diff --git a/pkgs/tools/cd-dvd/mdf2iso/default.nix b/pkgs/tools/cd-dvd/mdf2iso/default.nix
index f33ba31beee8..dbad9d362478 100644
--- a/pkgs/tools/cd-dvd/mdf2iso/default.nix
+++ b/pkgs/tools/cd-dvd/mdf2iso/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchgit}:
stdenv.mkDerivation rec {
- name = "mdf2iso-${version}";
+ pname = "mdf2iso";
version = "0.3.1";
src = fetchgit {
diff --git a/pkgs/tools/cd-dvd/mkcue/default.nix b/pkgs/tools/cd-dvd/mkcue/default.nix
index 0a9d61e9da8e..357992d72916 100644
--- a/pkgs/tools/cd-dvd/mkcue/default.nix
+++ b/pkgs/tools/cd-dvd/mkcue/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "mkcue-${version}";
+ pname = "mkcue";
version = "1";
src = fetchurl {
diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix
index 98853d1ba61a..43ed7ea7d389 100644
--- a/pkgs/tools/cd-dvd/nrg2iso/default.nix
+++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "nrg2iso-${version}";
+ pname = "nrg2iso";
version = "0.4";
src = fetchurl {
- url = "http://gregory.kokanosky.free.fr/v4/linux/${name}.tar.gz";
+ url = "http://gregory.kokanosky.free.fr/v4/linux/${pname}-${version}.tar.gz";
sha256 = "18sam7yy50rbfhjixwd7wx7kmfn1x1y5j80vwfxi5v408s39s115";
};
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index 502937dd565b..9495f8dac996 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -2,7 +2,7 @@
, p7zip, mtools, syslinux }:
stdenv.mkDerivation rec {
- name = "unetbootin-${version}";
+ pname = "unetbootin";
version = "661";
src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix
index 4f288b9e56f8..8bee8059fe27 100644
--- a/pkgs/tools/compression/advancecomp/default.nix
+++ b/pkgs/tools/compression/advancecomp/default.nix
@@ -2,7 +2,7 @@
, autoreconfHook, zlib }:
stdenv.mkDerivation rec {
- name = "advancecomp-${version}";
+ pname = "advancecomp";
version = "2.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index a3987085c8e3..33b6f12cd46c 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -3,7 +3,7 @@
# ?TODO: there's also python lib in there
stdenv.mkDerivation rec {
- name = "brotli-${version}";
+ pname = "brotli";
version = "1.0.7";
src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix
index 4c88e58e6c10..c1ddb242dad0 100644
--- a/pkgs/tools/compression/bsc/default.nix
+++ b/pkgs/tools/compression/bsc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, openmp ? null }:
stdenv.mkDerivation rec {
- name = "bsc-${version}";
+ pname = "bsc";
version = "3.1.0";
src = fetchurl {
diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix
index 617d86e7f1e3..a5b527d70b7f 100644
--- a/pkgs/tools/compression/bsdiff/default.nix
+++ b/pkgs/tools/compression/bsdiff/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, bzip2 }:
stdenv.mkDerivation rec {
- name = "bsdiff-${version}";
+ pname = "bsdiff";
version = "4.3";
src = fetchurl {
- url = "https://www.daemonology.net/bsdiff/${name}.tar.gz";
+ url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz";
sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq";
};
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index a0ec6c07055b..a440c08bd1bb 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- name = "bzip2-${version}";
+ pname = "bzip2";
version = "1.0.6.0.1";
/* We use versions patched to use autotools style properly,
saving lots of trouble. */
src = fetchurl {
urls = map
- (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${name}.tar.gz")
+ (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${pname}-${version}.tar.gz")
[
"http://ftp.uni-kl.de/pub/linux/suse"
"ftp://ftp.hs.uni-hamburg.de/pub/mirrors/suse"
diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index c9ec557ab1f4..19bc2fdc1769 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -12,7 +12,7 @@ let
++ [ bzip2 xz lzip ]);
in pythonPackages.buildPythonApplication rec {
- name = "dtrx-${version}";
+ pname = "dtrx";
version = "7.1";
src = fetchurl {
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index bd4d85e90e36..e6409f051227 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, xz }:
stdenv.mkDerivation rec {
- name = "gzip-${version}";
+ pname = "gzip";
version = "1.10";
src = fetchurl {
- url = "mirror://gnu/gzip/${name}.tar.xz";
+ url = "mirror://gnu/gzip/${pname}-${version}.tar.xz";
sha256 = "1h6p374d3j8d4cdfydzls021xa2yby8myc0h8d6m8bc7k6ncq9c4";
};
diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix
index 083a71f6a756..2c6765b2e837 100644
--- a/pkgs/tools/compression/lrzip/default.nix
+++ b/pkgs/tools/compression/lrzip/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.631";
- name = "lrzip-${version}";
+ pname = "lrzip";
src = fetchurl {
- url = "http://ck.kolivas.org/apps/lrzip/${name}.tar.bz2";
+ url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.bz2";
sha256 = "0mb449vmmwpkalq732jdyginvql57nxyd31sszb108yps1lf448d";
};
diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix
index 0bf155807980..0c54c3b452b6 100644
--- a/pkgs/tools/compression/lzfse/default.nix
+++ b/pkgs/tools/compression/lzfse/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "lzfse-${version}";
+stdenv.mkDerivation {
+ pname = "lzfse";
version = "2017-03-08";
src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/lzham/default.nix b/pkgs/tools/compression/lzham/default.nix
index cdc155474a78..0aa30ceb6632 100644
--- a/pkgs/tools/compression/lzham/default.nix
+++ b/pkgs/tools/compression/lzham/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake } :
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "lzham-1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index dfd91bf37d34..4ec40deab6c3 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, texinfo }:
stdenv.mkDerivation rec {
- name = "lzip-${version}";
+ pname = "lzip";
version = "1.21";
nativeBuildInputs = [ texinfo ];
src = fetchurl {
- url = "mirror://savannah/lzip/${name}.tar.gz";
+ url = "mirror://savannah/lzip/${pname}-${version}.tar.gz";
sha256 = "12qdcw5k1cx77brv9yxi1h4dzwibhfmdpigrj43nfk8nscwm12z4";
};
diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix
index 9b9de8d8302f..28c7c1d69f70 100644
--- a/pkgs/tools/compression/mozlz4a/default.nix
+++ b/pkgs/tools/compression/mozlz4a/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchurl, python3, runtimeShell }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "mozlz4a";
version = "2018-08-23";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix
index 1d5cd85a62e6..94ca5eb58b1f 100644
--- a/pkgs/tools/compression/pbzip2/default.nix
+++ b/pkgs/tools/compression/pbzip2/default.nix
@@ -4,10 +4,11 @@ let major = "1.1";
version = "${major}.13";
in
stdenv.mkDerivation rec {
- name = "pbzip2-${version}";
+ pname = "pbzip2";
+ inherit version;
src = fetchurl {
- url = "https://launchpad.net/pbzip2/${major}/${version}/+download/${name}.tar.gz";
+ url = "https://launchpad.net/pbzip2/${major}/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "1rnvgcdixjzbrmcr1nv9b6ccrjfrhryaj7jwz28yxxv6lam3xlcg";
};
diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/tools/compression/pbzx/default.nix
index bbba21f2b34d..13e5882788d1 100644
--- a/pkgs/tools/compression/pbzx/default.nix
+++ b/pkgs/tools/compression/pbzx/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "pbzx";
version = "1.0.2";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "NiklasRosenstein";
repo = "pbzx";
diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix
index 60023d028a9f..7f9c7cb77736 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, ucl, zlib, perl }:
stdenv.mkDerivation rec {
- name = "upx-${version}";
+ pname = "upx";
version = "3.95";
src = fetchurl {
- url = "https://github.com/upx/upx/releases/download/v${version}/${name}-src.tar.xz";
+ url = "https://github.com/upx/upx/releases/download/v${version}/${pname}-${version}-src.tar.xz";
sha256 = "14jmgy7hvx4zqra20w8260wrcxmjf2h6ba2yrw7pcp18im35a3rv";
};
diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix
index a794296bfd95..691f3a8ee5d8 100644
--- a/pkgs/tools/compression/xar/default.nix
+++ b/pkgs/tools/compression/xar/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.6.1";
- name = "xar-${version}";
+ pname = "xar";
src = fetchurl {
- url = "https://github.com/downloads/mackyle/xar/${name}.tar.gz";
+ url = "https://github.com/downloads/mackyle/xar/${pname}-${version}.tar.gz";
sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf";
};
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index 32de493ec77d..034cdb7d94ec 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -9,7 +9,7 @@ let
then "--with-${name}"
else "--without-${name}";
in stdenv.mkDerivation rec {
- name = "xdelta-${version}";
+ pname = "xdelta";
version = "3.0.11";
src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix
index c870e501209b..bf2601dd3738 100644
--- a/pkgs/tools/compression/xdelta/unstable.nix
+++ b/pkgs/tools/compression/xdelta/unstable.nix
@@ -9,7 +9,7 @@ let
then "--with-${name}"
else "--without-${name}";
in stdenv.mkDerivation rec {
- name = "xdelta-${version}";
+ pname = "xdelta";
version = "3.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix
index 06c7e6439a9f..accead9db0bc 100644
--- a/pkgs/tools/compression/zopfli/default.nix
+++ b/pkgs/tools/compression/zopfli/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake }:
stdenv.mkDerivation rec {
- name = "zopfli-${version}";
+ pname = "zopfli";
version = "1.0.2";
src = fetchFromGitHub {
owner = "google";
repo = "zopfli";
- rev = name;
- name = "${name}-src";
+ rev = "${pname}-${version}";
+ name = "${pname}-${version}-src";
sha256 = "1l551hx2p4qi0w9lk96qklbv6ll68gxbah07fhqx1ly28rv5wy9y";
};
diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix
index 2e34c9dd4857..b9c5c55a8e47 100644
--- a/pkgs/tools/filesystems/9pfs/default.nix
+++ b/pkgs/tools/filesystems/9pfs/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fuse }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "9pfs-20150918";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix
index 74ba47ceee1a..7f8a8c4f931f 100644
--- a/pkgs/tools/filesystems/afpfs-ng/default.nix
+++ b/pkgs/tools/filesystems/afpfs-ng/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fuse, readline, libgcrypt, gmp }:
-stdenv.mkDerivation rec {
- name = "afpfs-ng-${version}";
+stdenv.mkDerivation {
+ pname = "afpfs-ng";
version = "0.8.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix
index 9ee0b8133260..2c7b1c271569 100644
--- a/pkgs/tools/filesystems/apfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/apfs-fuse/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fuse3, bzip2, zlib, attr, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "apfs-fuse-unstable";
version = "2019-07-23";
diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix
index 35e26828176d..b66d67fbc9f2 100644
--- a/pkgs/tools/filesystems/avfs/default.nix
+++ b/pkgs/tools/filesystems/avfs/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, fuse, xz }:
stdenv.mkDerivation rec {
- name = "avfs-${version}";
+ pname = "avfs";
version = "1.1.1";
src = fetchurl {
- url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2";
+ url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2";
sha256 = "0fxzigpyi08ipqz30ihjcpqmmx8g7r1kqdqq1bnnznvnhrzyygn8";
};
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-library"
"--enable-fuse"
- "--disable-static"
];
meta = {
diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix
index cd0f3ea23229..d449bf1266a0 100644
--- a/pkgs/tools/filesystems/bashmount/default.nix
+++ b/pkgs/tools/filesystems/bashmount/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub}:
stdenv.mkDerivation rec {
- name = "bashmount-${version}";
+ pname = "bashmount";
version = "3.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
index efd48fb87fe7..d3e790a3cf13 100644
--- a/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, utillinux, bash }:
stdenv.mkDerivation rec {
- name = "bcache-tools-${version}";
+ pname = "bcache-tools";
version = "1.0.7";
src = fetchurl {
- name = "${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz";
sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4";
};
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index 95923f202cf4..98dab6278b01 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils
, liburcu, zlib, libaio, zstd, lz4 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "bcachefs-tools";
version = "2019-08-21";
diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix
index f12e8af84b88..94573bcd2010 100644
--- a/pkgs/tools/filesystems/bees/default.nix
+++ b/pkgs/tools/filesystems/bees/default.nix
@@ -5,8 +5,8 @@ let
version = "0.6.1";
sha256 = "0h7idclmhyp14mq6786x7f2237vqpn70gyi88ik4g70xl84yfgyh";
- bees = stdenv.mkDerivation rec {
- name = "bees-${version}";
+ bees = stdenv.mkDerivation {
+ pname = "bees";
inherit version;
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index 6a9d17772c88..a8849e6af22b 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.14.1";
- name = "bindfs-${version}";
+ pname = "bindfs";
src = fetchurl {
- url = "https://bindfs.org/downloads/${name}.tar.gz";
+ url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz";
sha256 = "111i4ba4px3idmrr5qhgq01926fas1rs2yx2shnwgdk3ziqcszxl";
};
diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix
index b5694535e946..6fc0e3a7f210 100644
--- a/pkgs/tools/filesystems/blobfuse/default.nix
+++ b/pkgs/tools/filesystems/blobfuse/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, curl, gnutls, libgcrypt, libuuid, fuse }:
stdenv.mkDerivation rec {
- name = "blobfuse-${version}";
+ pname = "blobfuse";
version = "1.0.2";
src = fetchFromGitHub {
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1qh04z1fsj1l6l12sz9yl2sy9hwlrnzac54hwrr7wvsgv90n9gbp";
};
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ];
+
buildInputs = [ curl gnutls libgcrypt libuuid fuse ];
nativeBuildInputs = [ cmake pkgconfig ];
@@ -20,4 +22,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ jbgi ];
platforms = platforms.linux;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix
index 9c9dbede83f4..3ddc95273972 100644
--- a/pkgs/tools/filesystems/boxfs/default.nix
+++ b/pkgs/tools/filesystems/boxfs/default.nix
@@ -21,8 +21,8 @@ let
owner = "vincenthz";
};
};
-in stdenv.mkDerivation rec {
- name = "boxfs-${version}";
+in stdenv.mkDerivation {
+ pname = "boxfs";
version = "2-20150109";
src = srcs.boxfs2;
diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
index ebab6c5b16ba..e2538387d450 100644
--- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix
+++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "btrfs-dedupe-${version}";
+ pname = "btrfs-dedupe";
version = "1.1.0";
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 2ef70ca78479..f5588cc51abc 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "btrfs-progs-${version}";
+ pname = "btrfs-progs";
version = "5.2.1";
src = fetchurl {
diff --git a/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch b/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch
new file mode 100644
index 000000000000..9604da87fb50
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch
@@ -0,0 +1,70 @@
+diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py
+index a8a3ec07c1..bcc9b86c37 100644
+--- a/src/pybind/mgr/dashboard/module.py
++++ b/src/pybind/mgr/dashboard/module.py
+@@ -25,40 +25,6 @@ except ImportError:
+
+ from .services.sso import load_sso_db
+
+-# The SSL code in CherryPy 3.5.0 is buggy. It was fixed long ago,
+-# but 3.5.0 is still shipping in major linux distributions
+-# (Fedora 27, Ubuntu Xenial), so we must monkey patch it to get SSL working.
+-if cherrypy is not None:
+- v = StrictVersion(cherrypy.__version__)
+- # It was fixed in 3.7.0. Exact lower bound version is probably earlier,
+- # but 3.5.0 is what this monkey patch is tested on.
+- if StrictVersion("3.5.0") <= v < StrictVersion("3.7.0"):
+- from cherrypy.wsgiserver.wsgiserver2 import HTTPConnection,\
+- CP_fileobject
+-
+- def fixed_init(hc_self, server, sock, makefile=CP_fileobject):
+- hc_self.server = server
+- hc_self.socket = sock
+- hc_self.rfile = makefile(sock, "rb", hc_self.rbufsize)
+- hc_self.wfile = makefile(sock, "wb", hc_self.wbufsize)
+- hc_self.requests_seen = 0
+-
+- HTTPConnection.__init__ = fixed_init
+-
+-# When the CherryPy server in 3.2.2 (and later) starts it attempts to verify
+-# that the ports its listening on are in fact bound. When using the any address
+-# "::" it tries both ipv4 and ipv6, and in some environments (e.g. kubernetes)
+-# ipv6 isn't yet configured / supported and CherryPy throws an uncaught
+-# exception.
+-if cherrypy is not None:
+- v = StrictVersion(cherrypy.__version__)
+- # the issue was fixed in 3.2.3. it's present in 3.2.2 (current version on
+- # centos:7) and back to at least 3.0.0.
+- if StrictVersion("3.1.2") <= v < StrictVersion("3.2.3"):
+- # https://github.com/cherrypy/cherrypy/issues/1100
+- from cherrypy.process import servers
+- servers.wait_for_occupied_port = lambda host, port: None
+-
+ if 'COVERAGE_ENABLED' in os.environ:
+ import coverage
+ __cov = coverage.Coverage(config_file="{}/.coveragerc".format(os.path.dirname(__file__)),
+diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py
+index b7fecf8d85..dfd4160591 100644
+--- a/src/pybind/mgr/prometheus/module.py
++++ b/src/pybind/mgr/prometheus/module.py
+@@ -18,20 +18,6 @@ from rbd import RBD
+ DEFAULT_ADDR = '::'
+ DEFAULT_PORT = 9283
+
+-# When the CherryPy server in 3.2.2 (and later) starts it attempts to verify
+-# that the ports its listening on are in fact bound. When using the any address
+-# "::" it tries both ipv4 and ipv6, and in some environments (e.g. kubernetes)
+-# ipv6 isn't yet configured / supported and CherryPy throws an uncaught
+-# exception.
+-if cherrypy is not None:
+- v = StrictVersion(cherrypy.__version__)
+- # the issue was fixed in 3.2.3. it's present in 3.2.2 (current version on
+- # centos:7) and back to at least 3.0.0.
+- if StrictVersion("3.1.2") <= v < StrictVersion("3.2.3"):
+- # https://github.com/cherrypy/cherrypy/issues/1100
+- from cherrypy.process import servers
+- servers.wait_for_occupied_port = lambda host, port: None
+-
+ # cherrypy likes to sys.exit on error. don't let it take us down too!
+ def os_exit_noop(*args, **kwargs):
+ pass
diff --git a/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch b/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch
new file mode 100644
index 000000000000..b04082537b53
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch
@@ -0,0 +1,11 @@
+--- a/cmake/modules/BuildSPDK.cmake 2018-08-09 09:22:34.950684960 +0200
++++ b/cmake/modules/BuildSPDK.cmake 2018-08-09 09:21:59.986964224 +0200
+@@ -16,7 +16,7 @@
+ # unset $CFLAGS, otherwise it will interfere with how SPDK sets
+ # its include directory.
+ # unset $LDFLAGS, otherwise SPDK will fail to mock some functions.
+- BUILD_COMMAND env -i PATH=$ENV{PATH} CC=${CMAKE_C_COMPILER} $(MAKE) EXTRA_CFLAGS="-fPIC"
++ BUILD_COMMAND env PATH=$ENV{PATH} CC=${CMAKE_C_COMPILER} $(MAKE) EXTRA_CFLAGS="-fPIC" C_OPT="-mssse3"
+ BUILD_IN_SOURCE 1
+ INSTALL_COMMAND "true")
+ ExternalProject_Get_Property(spdk-ext source_dir)
diff --git a/pkgs/tools/filesystems/ceph/0001-kv-RocksDBStore-API-break-additional.patch b/pkgs/tools/filesystems/ceph/0001-kv-RocksDBStore-API-break-additional.patch
deleted file mode 100644
index 0b6f1d30a4c9..000000000000
--- a/pkgs/tools/filesystems/ceph/0001-kv-RocksDBStore-API-break-additional.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Seulement dans ceph: ceph.old
-diff -ur ceph.old/src/kv/RocksDBStore.cc ceph/src/kv/RocksDBStore.cc
---- ceph.old/src/kv/RocksDBStore.cc 1980-01-02 00:00:00.000000000 +0100
-+++ ceph/src/kv/RocksDBStore.cc 2018-01-24 14:08:35.017553372 +0100
-@@ -505,7 +505,7 @@
- // considering performance overhead, default is disabled
- if (g_conf->rocksdb_perf) {
- rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex);
-- rocksdb::perf_context.Reset();
-+ rocksdb::get_perf_context()->Reset();
- }
-
- RocksDBTransactionImpl * _t =
-@@ -532,13 +532,13 @@
- utime_t write_wal_time;
- utime_t write_pre_and_post_process_time;
- write_wal_time.set_from_double(
-- static_cast(rocksdb::perf_context.write_wal_time)/1000000000);
-+ static_cast(rocksdb::get_perf_context()->write_wal_time)/1000000000);
- write_memtable_time.set_from_double(
-- static_cast(rocksdb::perf_context.write_memtable_time)/1000000000);
-+ static_cast(rocksdb::get_perf_context()->write_memtable_time)/1000000000);
- write_delay_time.set_from_double(
-- static_cast(rocksdb::perf_context.write_delay_time)/1000000000);
-+ static_cast(rocksdb::get_perf_context()->write_delay_time)/1000000000);
- write_pre_and_post_process_time.set_from_double(
-- static_cast(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000);
-+ static_cast(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000);
- logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time);
- logger->tinc(l_rocksdb_write_delay_time, write_delay_time);
- logger->tinc(l_rocksdb_write_wal_time, write_wal_time);
-@@ -558,7 +558,7 @@
- // considering performance overhead, default is disabled
- if (g_conf->rocksdb_perf) {
- rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex);
-- rocksdb::perf_context.Reset();
-+ rocksdb::get_perf_context()->Reset();
- }
-
- RocksDBTransactionImpl * _t =
-@@ -586,13 +586,13 @@
- utime_t write_wal_time;
- utime_t write_pre_and_post_process_time;
- write_wal_time.set_from_double(
-- static_cast(rocksdb::perf_context.write_wal_time)/1000000000);
-+ static_cast(rocksdb::get_perf_context()->write_wal_time)/1000000000);
- write_memtable_time.set_from_double(
-- static_cast(rocksdb::perf_context.write_memtable_time)/1000000000);
-+ static_cast(rocksdb::get_perf_context()->write_memtable_time)/1000000000);
- write_delay_time.set_from_double(
-- static_cast(rocksdb::perf_context.write_delay_time)/1000000000);
-+ static_cast(rocksdb::get_perf_context()->write_delay_time)/1000000000);
- write_pre_and_post_process_time.set_from_double(
-- static_cast(rocksdb::perf_context.write_pre_and_post_process_time)/1000000000);
-+ static_cast(rocksdb::get_perf_context()->write_pre_and_post_process_time)/1000000000);
- logger->tinc(l_rocksdb_write_memtable_time, write_memtable_time);
- logger->tinc(l_rocksdb_write_delay_time, write_delay_time);
- logger->tinc(l_rocksdb_write_wal_time, write_wal_time);
diff --git a/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch b/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch
deleted file mode 100644
index 01aa194dddf2..000000000000
--- a/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru ceph/src/key_value_store/kv_flat_btree_async.cc ceph-copy/src/key_value_store/kv_flat_btree_async.cc
---- ceph/src/key_value_store/kv_flat_btree_async.cc 1980-01-02 00:00:00.000000000 +0100
-+++ ceph-copy/src/key_value_store/kv_flat_btree_async.cc 2018-02-13 21:49:59.232860487 +0100
-@@ -15,13 +15,13 @@
- #include "key_value_store/kv_flat_btree_async.h"
- #include "key_value_store/kvs_arg_types.h"
- #include "include/rados/librados.hpp"
--#include "/usr/include/asm-generic/errno.h"
--#include "/usr/include/asm-generic/errno-base.h"
- #include "common/ceph_context.h"
- #include "common/Clock.h"
- #include "include/types.h"
-
-
-+#include
-+#include
- #include
- #include
- #include
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index ef3e36ff6275..1755ef625f5a 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -1,12 +1,199 @@
-{ callPackage, fetchgit, fetchpatch, ... } @ args:
+{ stdenv, runCommand, fetchurl
+, ensureNewerSourcesHook
+, cmake, pkgconfig
+, which, git
+, boost, python3Packages
+, libxml2, zlib, lz4
+, openldap, lttng-ust
+, babeltrace, gperf
+, cunit, snappy
+, rocksdb, makeWrapper
+, leveldb, oathToolkit, removeReferencesTo
-callPackage ./generic.nix (args // rec {
- version = "12.2.7";
+# Optional Dependencies
+, yasm ? null, fcgi ? null, expat ? null
+, curl ? null, fuse ? null
+, libedit ? null, libatomic_ops ? null
+, libs3 ? null
- src = fetchgit {
- url = "https://github.com/ceph/ceph.git";
- rev = "refs/tags/v${version}";
- sha256 = "031nfw2g2fdpxxx39g862phgmdx68hj9r54axazandghfhc1bzrl";
+# Mallocs
+, jemalloc ? null, gperftools ? null
+
+# Crypto Dependencies
+, cryptopp ? null
+, nss ? null, nspr ? null
+
+# Linux Only Dependencies
+, linuxHeaders, utillinux, libuuid, udev, keyutils, rdma-core, rabbitmq-c
+, libaio ? null, libxfs ? null, zfs ? null
+, ...
+}:
+
+# We must have one crypto library
+assert cryptopp != null || (nss != null && nspr != null);
+
+with stdenv; with stdenv.lib;
+let
+ shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
+
+ optYasm = shouldUsePkg yasm;
+ optFcgi = shouldUsePkg fcgi;
+ optExpat = shouldUsePkg expat;
+ optCurl = shouldUsePkg curl;
+ optFuse = shouldUsePkg fuse;
+ optLibedit = shouldUsePkg libedit;
+ optLibatomic_ops = shouldUsePkg libatomic_ops;
+ optLibs3 = shouldUsePkg libs3;
+
+ optJemalloc = shouldUsePkg jemalloc;
+ optGperftools = shouldUsePkg gperftools;
+
+ optCryptopp = shouldUsePkg cryptopp;
+ optNss = shouldUsePkg nss;
+ optNspr = shouldUsePkg nspr;
+
+ optLibaio = shouldUsePkg libaio;
+ optLibxfs = shouldUsePkg libxfs;
+ optZfs = shouldUsePkg zfs;
+
+ hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
+
+
+ # Malloc implementation (can be jemalloc, tcmalloc or null)
+ malloc = if optJemalloc != null then optJemalloc else optGperftools;
+
+ # We prefer nss over cryptopp
+ cryptoStr = if optNss != null && optNspr != null then "nss" else
+ if optCryptopp != null then "cryptopp" else "none";
+
+ cryptoLibsMap = {
+ nss = [ optNss optNspr ];
+ cryptopp = [ optCryptopp ];
+ none = [ ];
};
-})
+ ceph-python-env = python3Packages.python.withPackages (ps: [
+ ps.sphinx
+ ps.flask
+ ps.cython
+ ps.setuptools
+ ps.virtualenv
+ # Libraries needed by the python tools
+ ps.Mako
+ ps.cherrypy
+ ps.pecan
+ ps.prettytable
+ ps.pyjwt
+ ps.webob
+ ps.bcrypt
+ ps.six
+ ]);
+
+ version = "14.2.3";
+in rec {
+ ceph = stdenv.mkDerivation {
+ pname = "ceph";
+ inherit version;
+
+ src = fetchurl {
+ url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
+ sha256 = "1pa8czb205pz4vjfh82gsgickj3cdjrx51mcx7acsyqgp3dfvl33";
+ };
+
+ patches = [
+ ./0000-fix-SPDK-build-env.patch
+ ./0000-dont-check-cherrypy-version.patch
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ pkgconfig which git python3Packages.wrapPython makeWrapper
+ (ensureNewerSourcesHook { year = "1980"; })
+ ];
+
+ buildInputs = cryptoLibsMap.${cryptoStr} ++ [
+ boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3
+ malloc zlib openldap lttng-ust babeltrace gperf cunit
+ snappy rocksdb lz4 oathToolkit leveldb
+ removeReferencesTo
+ ] ++ optionals stdenv.isLinux [
+ linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs
+ # ceph 14
+ rdma-core rabbitmq-c
+ ] ++ optionals hasRadosgw [
+ optFcgi optExpat optCurl optFuse optLibedit
+ ];
+
+ preConfigure =''
+ substituteInPlace src/common/module.c --replace "/sbin/modinfo" "modinfo"
+ substituteInPlace src/common/module.c --replace "/sbin/modprobe" "modprobe"
+ # Since Boost 1.67 this seems to have changed
+ substituteInPlace CMakeLists.txt --replace "list(APPEND BOOST_COMPONENTS python)" "list(APPEND BOOST_COMPONENTS python37)"
+ substituteInPlace src/CMakeLists.txt --replace "Boost::python " "Boost::python37 "
+
+ # for pybind/rgw to find internal dep
+ export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH"
+ # install target needs to be in PYTHONPATH for "*.pth support" check to succeed
+ export PYTHONPATH=${ceph-python-env}/lib/python3.7/site-packages:$lib/lib/python3.7/site-packages/:$out/lib/python3.7/site-packages/
+
+ patchShebangs src/spdk
+ '';
+
+ cmakeFlags = [
+ "-DWITH_PYTHON3=ON"
+ "-DWITH_SYSTEM_ROCKSDB=OFF"
+
+ "-DWITH_SYSTEM_BOOST=ON"
+ "-DWITH_SYSTEMD=OFF"
+ "-DWITH_TESTS=OFF"
+ # TODO breaks with sandbox, tries to download stuff with npm
+ "-DWITH_MGR_DASHBOARD_FRONTEND=OFF"
+ ];
+
+ preFixup = ''
+ find $lib -type f -exec remove-references-to -t $out '{}' +
+ mv $out/share/ceph/mgr $lib/lib/ceph/
+ '';
+
+ postFixup = ''
+ export PYTHONPATH="${ceph-python-env}/lib/python3.7/site-packages:$lib/lib/ceph/mgr:$out/lib/python3.7/site-packages/"
+ wrapPythonPrograms
+ wrapProgram $out/bin/ceph-mgr --prefix PYTHONPATH ":" "${ceph-python-env}/lib/python3.7/site-packages:$lib/lib/ceph/mgr:$out/lib/python3.7/site-packages/"
+ wrapProgram $out/bin/ceph-volume --prefix PYTHONPATH ":" "${ceph-python-env}/lib/python3.7/site-packages:$lib/lib/ceph/mgr:$out/lib/python3.7/site-packages/"
+ '';
+
+ enableParallelBuilding = true;
+
+ outputs = [ "out" "lib" "dev" "doc" "man" ];
+
+ meta = {
+ homepage = https://ceph.com/;
+ description = "Distributed storage system";
+ license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ];
+ maintainers = with maintainers; [ adev ak krav johanot ];
+ platforms = platforms.unix;
+ };
+
+ passthru.version = version;
+ };
+
+ ceph-client = runCommand "ceph-client-${version}" {
+ meta = {
+ homepage = https://ceph.com/;
+ description = "Tools needed to mount Ceph's RADOS Block Devices";
+ license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ];
+ maintainers = with maintainers; [ adev ak johanot krav ];
+ platforms = platforms.unix;
+ };
+ } ''
+ mkdir -p $out/{bin,etc,lib/python3.7/site-packages}
+ cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin
+ cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin
+ cp -r ${ceph}/bin/rbd-replay* $out/bin
+ cp -r ${ceph}/lib/python3.7/site-packages $out/lib/python3.7/
+ cp -r ${ceph}/etc/bash_completion.d $out/etc
+ # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths
+ substituteInPlace $out/bin/ceph --replace ${ceph} $out
+ substituteInPlace $out/bin/.ceph-wrapped --replace ${ceph} $out
+ '';
+}
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
deleted file mode 100644
index 6ecc65149c49..000000000000
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ /dev/null
@@ -1,174 +0,0 @@
-{ stdenv, ensureNewerSourcesHook, cmake, pkgconfig
-, which, git
-, boost, python2Packages
-, libxml2, zlib
-, openldap, lttng-ust
-, babeltrace, gperf
-, cunit, snappy
-, rocksdb, makeWrapper
-
-# Optional Dependencies
-, yasm ? null, fcgi ? null, expat ? null
-, curl ? null, fuse ? null
-, libedit ? null, libatomic_ops ? null, kinetic-cpp-client ? null
-, libs3 ? null
-
-# Mallocs
-, jemalloc ? null, gperftools ? null
-
-# Crypto Dependencies
-, cryptopp ? null
-, nss ? null, nspr ? null
-
-# Linux Only Dependencies
-, linuxHeaders, libuuid, udev, keyutils, libaio ? null, libxfs ? null
-, zfs ? null
-
-# Version specific arguments
-, version, src ? [], buildInputs ? []
-, ...
-}:
-
-# We must have one crypto library
-assert cryptopp != null || (nss != null && nspr != null);
-
-with stdenv;
-with stdenv.lib;
-let
-
- shouldUsePkg = pkg_: let pkg = (builtins.tryEval pkg_).value;
- in if lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms
- then pkg else null;
-
- optYasm = shouldUsePkg yasm;
- optFcgi = shouldUsePkg fcgi;
- optExpat = shouldUsePkg expat;
- optCurl = shouldUsePkg curl;
- optFuse = shouldUsePkg fuse;
- optLibedit = shouldUsePkg libedit;
- optLibatomic_ops = shouldUsePkg libatomic_ops;
- optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client;
- optLibs3 = if versionAtLeast version "10.0.0" then null else shouldUsePkg libs3;
-
- optJemalloc = shouldUsePkg jemalloc;
- optGperftools = shouldUsePkg gperftools;
-
- optCryptopp = shouldUsePkg cryptopp;
- optNss = shouldUsePkg nss;
- optNspr = shouldUsePkg nspr;
-
- optLibaio = shouldUsePkg libaio;
- optLibxfs = shouldUsePkg libxfs;
- optZfs = shouldUsePkg zfs;
-
- hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
-
-
- # TODO: Reenable when kinetic support is fixed
- #hasKinetic = versionAtLeast version "9.0.0" && optKinetic-cpp-client != null;
- hasKinetic = false;
-
- # Malloc implementation (can be jemalloc, tcmalloc or null)
- malloc = if optJemalloc != null then optJemalloc else optGperftools;
-
- # We prefer nss over cryptopp
- cryptoStr = if optNss != null && optNspr != null then "nss" else
- if optCryptopp != null then "cryptopp" else "none";
- cryptoLibsMap = {
- nss = [ optNss optNspr ];
- cryptopp = [ optCryptopp ];
- none = [ ];
- };
-
- ceph-python-env = python2Packages.python.withPackages (ps: [
- ps.sphinx
- ps.flask
- ps.cython
- ps.setuptools
- ps.pip
- # Libraries needed by the python tools
- ps.Mako
- ps.pecan
- ps.prettytable
- ps.webob
- ps.cherrypy
- ]);
-
-in
-stdenv.mkDerivation {
- name="ceph-${version}";
-
- inherit src;
-
- patches = [
- # ./ceph-patch-cmake-path.patch
- ./0001-kv-RocksDBStore-API-break-additional.patch
- ] ++ optionals stdenv.isLinux [
- ./0002-fix-absolute-include-path.patch
- ];
-
- nativeBuildInputs = [
- cmake
- pkgconfig which git python2Packages.wrapPython makeWrapper
- (ensureNewerSourcesHook { year = "1980"; })
- ];
-
- buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
- boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3
- malloc zlib openldap lttng-ust babeltrace gperf cunit
- snappy rocksdb
- ] ++ optionals stdenv.isLinux [
- linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs
- ] ++ optionals hasRadosgw [
- optFcgi optExpat optCurl optFuse optLibedit
- ] ++ optionals hasKinetic [
- optKinetic-cpp-client
- ];
-
-
- preConfigure =''
- # rip off submodule that interfer with system libs
- rm -rf src/boost
- rm -rf src/rocksdb
-
- # require LD_LIBRARY_PATH for cython to find internal dep
- export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH"
-
- # requires setuptools due to embedded in-cmake setup.py usage
- export PYTHONPATH="${python2Packages.setuptools}/lib/python2.7/site-packages/:$PYTHONPATH"
- '';
-
- cmakeFlags = [
- "-DENABLE_GIT_VERSION=OFF"
- "-DWITH_SYSTEM_BOOST=ON"
- "-DWITH_SYSTEM_ROCKSDB=ON"
- "-DWITH_LEVELDB=OFF"
-
- # enforce shared lib
- "-DBUILD_SHARED_LIBS=ON"
-
- # disable cephfs, cmake build broken for now
- "-DWITH_CEPHFS=OFF"
- "-DWITH_LIBCEPHFS=OFF"
- ];
-
- postFixup = ''
- wrapPythonPrograms
- wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/${python2Packages.python.sitePackages}
- '';
-
- enableParallelBuilding = true;
-
- outputs = [ "dev" "lib" "out" "doc" ];
-
- meta = {
- homepage = https://ceph.com/;
- description = "Distributed storage system";
- license = licenses.lgpl21;
- maintainers = with maintainers; [ adev ak ];
- platforms = platforms.unix;
- broken = true;
- };
-
- passthru.version = version;
-}
diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix
index 47428e7f52e4..6c0a6c287031 100644
--- a/pkgs/tools/filesystems/chunkfs/default.nix
+++ b/pkgs/tools/filesystems/chunkfs/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.7";
- name = "chunkfs-${version}";
+ pname = "chunkfs";
src = fetchurl {
url = "https://chunkfs.florz.de/chunkfs_${version}.tar.gz";
diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix
index 8af745ed436e..00ef368ad3da 100644
--- a/pkgs/tools/filesystems/convoy/default.nix
+++ b/pkgs/tools/filesystems/convoy/default.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, lvm2 }:
buildGoPackage rec {
- name = "convoy-${version}";
+ pname = "convoy";
version = "0.5.0";
goPackagePath = "github.com/rancher/convoy";
diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix
index 71e27c94dbdb..7eee02e220af 100644
--- a/pkgs/tools/filesystems/cryfs/default.nix
+++ b/pkgs/tools/filesystems/cryfs/default.nix
@@ -4,13 +4,13 @@
}:
stdenv.mkDerivation rec {
- name = "cryfs-${version}";
+ pname = "cryfs";
version = "0.9.10";
src = fetchFromGitHub {
owner = "cryfs";
repo = "cryfs";
- rev = "${version}";
+ rev = version;
sha256 = "04yqpad8x0hiiwpykcn3swi0py6sg9xid6g15ny2qs4j3llin5ry";
};
diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix
index 4952036a860b..0890db67fe72 100644
--- a/pkgs/tools/filesystems/darling-dmg/default.nix
+++ b/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -1,24 +1,18 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
+{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
stdenv.mkDerivation rec {
- name = "darling-dmg-${version}";
- version = "1.0.4";
+ pname = "darling-dmg";
+ version = "1.0.4+git20180914";
src = fetchFromGitHub {
owner = "darlinghq";
repo = "darling-dmg";
- rev = "v${version}";
- sha256 = "0x285p16zfnp0p6injw1frc8krif748sfgxhdd7gb75kz0dfbkrk";
+ rev = "97a92a6930e43cdbc9dedaee62716e3223deb027";
+ sha256 = "1bngr4827qnl4s2f7z39wjp13nfm3zzzykjshb43wvjz536bnqdj";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/darlinghq/darling-dmg/commit/cbb0092264b5c5cf3e92d6c2de23f02d859ebf44.patch";
- sha256 = "05fhgn5c09f1rva6bvbq16nhlkblrhscbf69k04ajwdh7y98sw39";
- })
- ];
-
- buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ];
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ fuse openssl zlib bzip2 libxml2 icu ];
# compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix
index 2e4ea88df7f4..81faed5bfa8d 100644
--- a/pkgs/tools/filesystems/dislocker/default.nix
+++ b/pkgs/tools/filesystems/dislocker/default.nix
@@ -6,8 +6,9 @@ with stdenv.lib;
let
version = "0.7.1";
in
-stdenv.mkDerivation rec {
- name = "dislocker-${version}";
+stdenv.mkDerivation {
+ pname = "dislocker";
+ inherit version;
src = fetchFromGitHub {
owner = "aorimn";
diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix
index b8028741d57f..5137719790af 100644
--- a/pkgs/tools/filesystems/disorderfs/default.nix
+++ b/pkgs/tools/filesystems/disorderfs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, fuse, attr, asciidoc }:
stdenv.mkDerivation rec {
- name = "disorderfs-${version}";
+ pname = "disorderfs";
version = "0.5.6";
src = fetchurl {
diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix
index e8deeaf4b470..e3c8c2944fba 100644
--- a/pkgs/tools/filesystems/djmount/default.nix
+++ b/pkgs/tools/filesystems/djmount/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, fuse }:
stdenv.mkDerivation rec {
- name = "djmount-${version}";
+ pname = "djmount";
version = "0.71";
src = fetchurl {
- url = "mirror://sourceforge/djmount/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/djmount/${version}/${pname}-${version}.tar.gz";
sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa";
};
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index 82f64362fadf..369d2e74f301 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libiconv }:
stdenv.mkDerivation rec {
- name = "dosfstools-${version}";
+ pname = "dosfstools";
version = "4.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix
index e1b11a370553..3981521097a9 100644
--- a/pkgs/tools/filesystems/duff/default.nix
+++ b/pkgs/tools/filesystems/duff/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gettext }:
-stdenv.mkDerivation rec {
- name = "duff-${version}";
+stdenv.mkDerivation {
+ pname = "duff";
# The last release (0.5.2) is more than 2 years old and lacks features like -D,
# limiting its usefulness. Upstream appears comatose if not dead.
version = "2014-07-03";
diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix
index 208cbb83209c..0950445bd3ec 100644
--- a/pkgs/tools/filesystems/duperemove/default.nix
+++ b/pkgs/tools/filesystems/duperemove/default.nix
@@ -2,7 +2,7 @@
, pkgconfig, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }:
stdenv.mkDerivation rec {
- name = "duperemove-${version}";
+ pname = "duperemove";
version = "0.11.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index d8ddde24ade3..ee3cce37bc7c 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -26,6 +26,14 @@ stdenv.mkDerivation rec {
})
];
+ postPatch = ''
+ # Remove six failing tests
+ # https://github.com/NixOS/nixpkgs/issues/65471
+ for test in m_image_mmp m_mmp m_mmp_bad_csum m_mmp_bad_magic t_mmp_1on t_mmp_2off; do
+ rm -r "tests/$test"
+ done
+ '';
+
configureFlags =
if stdenv.isLinux then [
"--enable-elf-shlibs"
diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/tools/filesystems/e2tools/default.nix
index dcaad81a5a3f..14f6afa99f0c 100644
--- a/pkgs/tools/filesystems/e2tools/default.nix
+++ b/pkgs/tools/filesystems/e2tools/default.nix
@@ -3,10 +3,9 @@
stdenv.mkDerivation rec {
pname = "e2tools";
version = "0.0.16";
- name = "${pname}-${version}";
src = fetchurl {
- url = "http://home.earthlink.net/~k_sheff/sw/${pname}/${name}.tar.gz";
+ url = "http://home.earthlink.net/~k_sheff/sw/${pname}/${pname}-${version}.tar.gz";
sha256 = "16wlc54abqz06dpipjdkw58bncpkxlj5f55lkzy07k3cg0bqwg2f";
};
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index 1a9951a33fd7..19767b7013ae 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "encfs-${version}";
+ pname = "encfs";
version = "1.9.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix
index 97a96651a68e..24db663aee02 100644
--- a/pkgs/tools/filesystems/exfat/default.nix
+++ b/pkgs/tools/filesystems/exfat/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }:
stdenv.mkDerivation rec {
- name = "exfat-${version}";
+ pname = "exfat";
version = "1.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix
index 0211ab63b3e9..40159b5fb6e6 100644
--- a/pkgs/tools/filesystems/ext4magic/default.nix
+++ b/pkgs/tools/filesystems/ext4magic/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.3.2";
- name = "ext4magic-${version}";
+ pname = "ext4magic";
src = fetchurl {
- url = "mirror://sourceforge/ext4magic/${name}.tar.gz";
+ url = "mirror://sourceforge/ext4magic/${pname}-${version}.tar.gz";
sha256 = "8d9c6a594f212aecf4eb5410d277caeaea3adc03d35378257dfd017ef20ea115";
};
diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix
index e0c5ea3def4e..b84992e1acbb 100644
--- a/pkgs/tools/filesystems/extundelete/default.nix
+++ b/pkgs/tools/filesystems/extundelete/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, e2fsprogs }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.2.4";
- name = "extundelete-${version}";
+ pname = "extundelete";
src = fetchurl {
url = "mirror://sourceforge/extundelete/extundelete-0.2.4.tar.bz2";
diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
index 90bb443dfdd2..d7fa971c9878 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkgconfig }:
stdenv.mkDerivation rec {
- name = "f2fs-tools-${version}";
+ pname = "f2fs-tools";
version = "1.11.0";
src = fetchgit {
diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix
index 598263c8895e..d28875829388 100644
--- a/pkgs/tools/filesystems/f3/default.nix
+++ b/pkgs/tools/filesystems/f3/default.nix
@@ -3,7 +3,6 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "f3";
version = "7.2";
diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix
index 7bb5dd415a6a..a00104510bf2 100644
--- a/pkgs/tools/filesystems/fatresize/default.nix
+++ b/pkgs/tools/filesystems/fatresize/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "1.0.2";
- name = "fatresize-${version}";
+ pname = "fatresize";
src = fetchurl {
url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2";
diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix
index 18d9097dacbc..aee053ad1355 100644
--- a/pkgs/tools/filesystems/fatsort/default.nix
+++ b/pkgs/tools/filesystems/fatsort/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.5.0.456";
- name = "fatsort-${version}";
+ pname = "fatsort";
src = fetchurl {
- url = "mirror://sourceforge/fatsort/${name}.tar.xz";
+ url = "mirror://sourceforge/fatsort/${pname}-${version}.tar.xz";
sha256 = "15fy2m4p9s8cfvnzdcd5ynkc2js0zklkkf34sjxdac7x2iwb8dd8";
};
diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix
index 82e2b404b82a..a8eb1118f4d3 100644
--- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix
+++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, fuse, p7zip, autoconf, automake, pkgconfig, makeWrapper }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "fuse-7z-ng";
version = "git-2014-06-08";
diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix
index 8a417cfe397d..41c4cc84f966 100644
--- a/pkgs/tools/filesystems/fuseiso/default.nix
+++ b/pkgs/tools/filesystems/fuseiso/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, fuse, zlib, glib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "fuseiso-20070708";
src = fetchurl {
diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix
index ccc5f1f2d4a8..fe46fccf271a 100644
--- a/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/pkgs/tools/filesystems/gcsfuse/default.nix
@@ -2,7 +2,7 @@
{ lib, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "gcsfuse-${version}";
+ pname = "gcsfuse";
version = "0.23.0";
rev = "v${version}";
diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix
index 581970e34fa7..e905222ad45e 100644
--- a/pkgs/tools/filesystems/genimage/default.nix
+++ b/pkgs/tools/filesystems/genimage/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libconfuse, gettext }:
stdenv.mkDerivation rec {
- name = "genimage-${version}";
+ pname = "genimage";
version = "9";
src = fetchurl {
diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/tools/filesystems/genromfs/default.nix
index 6a3e280aae36..1e6c73f725a8 100644
--- a/pkgs/tools/filesystems/genromfs/default.nix
+++ b/pkgs/tools/filesystems/genromfs/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.5.2";
- name = "genromfs-${version}";
+ pname = "genromfs";
src = fetchurl {
- url = "mirror://sourceforge/romfs/genromfs/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/romfs/genromfs/${version}/${pname}-${version}.tar.gz";
sha256 = "0q6rpq7cmclmb4ayfyknvzbqysxs4fy8aiahlax1sb2p6k3pzwrh";
};
diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix
index ec734e52f733..614e323e6b29 100644
--- a/pkgs/tools/filesystems/gitfs/default.nix
+++ b/pkgs/tools/filesystems/gitfs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "gitfs-${version}";
+ pname = "gitfs";
version = "0.4.5.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 606e41e582ee..07ba47dda4d5 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -62,7 +62,7 @@ let
];
in
stdenv.mkDerivation
-rec {
+{
inherit (s) name version;
inherit buildInputs propagatedBuildInputs;
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix
index 72e43725ef59..605e341c4d77 100644
--- a/pkgs/tools/filesystems/go-mtpfs/default.nix
+++ b/pkgs/tools/filesystems/go-mtpfs/default.nix
@@ -1,7 +1,7 @@
{ pkgconfig, libusb1, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "go-mtpfs-${version}";
+ pname = "go-mtpfs";
version = "2018-02-09";
rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb";
diff --git a/pkgs/tools/filesystems/gpart/default.nix b/pkgs/tools/filesystems/gpart/default.nix
index ca2d0a627ab8..59b4785888b2 100644
--- a/pkgs/tools/filesystems/gpart/default.nix
+++ b/pkgs/tools/filesystems/gpart/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "gpart-${version}";
+ pname = "gpart";
version = "0.3";
# GitHub repository 'collating patches for gpart from all distributions':
diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix
index 4f7c2248a8ed..59ee358e028a 100644
--- a/pkgs/tools/filesystems/grive2/default.nix
+++ b/pkgs/tools/filesystems/grive2/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.5.0";
- name = "grive2-${version}";
+ pname = "grive2";
src = fetchFromGitHub {
owner = "vitalif";
diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix
index 25ec31ea698a..2032ca1c1e75 100644
--- a/pkgs/tools/filesystems/hfsprogs/default.nix
+++ b/pkgs/tools/filesystems/hfsprogs/default.nix
@@ -2,7 +2,7 @@
let version = "332.25";
package_name = "hfsprogs"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${package_name}-${version}";
srcs = [
(fetchurl {
diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix
index 4594aa9370ca..9b1c2b66e7aa 100644
--- a/pkgs/tools/filesystems/hubicfuse/default.nix
+++ b/pkgs/tools/filesystems/hubicfuse/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, curl, openssl, fuse, libxml2, json_c, file }:
stdenv.mkDerivation rec {
- name = "hubicfuse-${version}";
+ pname = "hubicfuse";
version = "3.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/tools/filesystems/ifuse/default.nix
index 083bae24d601..aef6087d3f28 100644
--- a/pkgs/tools/filesystems/ifuse/default.nix
+++ b/pkgs/tools/filesystems/ifuse/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
pname = "ifuse";
version = "2018-10-08";
- name = "${pname}-${version}";
-
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index 031c1440fcf9..14790ae70870 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -30,6 +30,12 @@ in rec {
# but we don't use /usr with nix, so remove only 2 items.
patches = [ ./irods_root_path.patch ];
+ NIX_CFLAGS_COMPILE = [
+ # fix build with recent llvm versions
+ "-Wno-deprecated-register"
+ "-Wno-deprecated-declarations"
+ ];
+
preConfigure = common.preConfigure + ''
patchShebangs ./test
substituteInPlace plugins/database/CMakeLists.txt --replace "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp"
diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix
index 6044806a34b7..58963753a51a 100644
--- a/pkgs/tools/filesystems/jmtpfs/default.nix
+++ b/pkgs/tools/filesystems/jmtpfs/default.nix
@@ -2,7 +2,8 @@
let version = "0.5"; in
stdenv.mkDerivation {
- name = "jmtpfs-${version}";
+ pname = "jmtpfs";
+ inherit version;
src = fetchFromGitHub {
sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1";
diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix
index f6637b621b8e..6a9d68291f2c 100644
--- a/pkgs/tools/filesystems/lizardfs/default.nix
+++ b/pkgs/tools/filesystems/lizardfs/default.nix
@@ -28,7 +28,7 @@ let
sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q";
};
in stdenv.mkDerivation rec {
- name = "lizardfs-${version}";
+ pname = "lizardfs";
version = "3.12.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix
index 15bb390e3648..4d90e189b950 100644
--- a/pkgs/tools/filesystems/mhddfs/default.nix
+++ b/pkgs/tools/filesystems/mhddfs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fuse, pkgconfig, attr, uthash }:
stdenv.mkDerivation rec {
- name = "mhddfs-${version}";
+ pname = "mhddfs";
version = "0.1.39";
src = fetchurl {
diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/tools/filesystems/mkspiffs/default.nix
index 48f13925ab08..6733b3df45ea 100644
--- a/pkgs/tools/filesystems/mkspiffs/default.nix
+++ b/pkgs/tools/filesystems/mkspiffs/default.nix
@@ -4,7 +4,7 @@
# overriding the same-named attributes. See ./presets.nix for examples.
stdenv.mkDerivation rec {
- name = "mkspiffs-${version}";
+ pname = "mkspiffs";
version = "0.2.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix
index cc8ca8411248..b453067eaef8 100644
--- a/pkgs/tools/filesystems/mp3fs/default.nix
+++ b/pkgs/tools/filesystems/mp3fs/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, flac, fuse, lame, libid3tag, pkgconfig }:
stdenv.mkDerivation rec {
- name = "mp3fs-${version}";
+ pname = "mp3fs";
version = "0.91";
src = fetchurl {
- url = "https://github.com/khenriks/mp3fs/releases/download/v${version}/${name}.tar.gz";
+ url = "https://github.com/khenriks/mp3fs/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "14ngiqg24p3a0s6hp33zjl4i46d8qn4v9id36psycq3n3csmwyx4";
};
diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix
index d0ceaf94a75f..049a61658743 100644
--- a/pkgs/tools/filesystems/mtdutils/default.nix
+++ b/pkgs/tools/filesystems/mtdutils/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libuuid, lzo, zlib, acl }:
-stdenv.mkDerivation rec {
- name = "mtd-utils-${version}";
+stdenv.mkDerivation {
+ pname = "mtd-utils";
version = "1.5.2";
src = fetchurl {
diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix
index ea321200fb98..dd8116ff4013 100644
--- a/pkgs/tools/filesystems/nilfs-utils/default.nix
+++ b/pkgs/tools/filesystems/nilfs-utils/default.nix
@@ -8,7 +8,7 @@ let
name = "${baseName}-${version}";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
src = fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.sha256;
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index 24aab7dc6dd4..48a72c5dd625 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -8,12 +8,12 @@
assert useNixUdev -> systemd != null;
buildPythonApplication rec {
- name = "blivet-${version}";
+ pname = "blivet";
version = "0.17-1";
src = fetchurl {
url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/"
- + "${name}.tar.bz2";
+ + "${pname}-${version}.tar.bz2";
sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci";
};
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
index 881301ed38e5..2abab9057376 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, python, lvm2, dmraid }:
stdenv.mkDerivation rec {
- name = "pyblock-${version}";
+ pname = "pyblock";
version = "0.53";
md5_path = "f6d33a8362dee358517d0a9e2ebdd044";
- src = fetchurl rec {
+ src = fetchurl {
url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/"
- + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2";
+ + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2";
sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815";
};
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
index ce1d0bf28a16..8a1fce780378 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
@@ -1,13 +1,13 @@
{ stdenv, python, buildPythonApplication, fetchurl, urlgrabber }:
buildPythonApplication rec {
- name = "pykickstart-${version}";
+ pname = "pykickstart";
version = "1.99.39";
md5_path = "d249f60aa89b1b4facd63f776925116d";
- src = fetchurl rec {
+ src = fetchurl {
url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/"
- + "${name}.tar.gz/${md5_path}/${name}.tar.gz";
+ + "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz";
sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a";
};
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
index fd6c5b913093..e0947b01f51b 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, python, buildPythonApplication, parted, e2fsprogs }:
buildPythonApplication rec {
- name = "pyparted-${version}";
+ pname = "pyparted";
version = "3.10";
src = fetchurl {
- url = "https://fedorahosted.org/releases/p/y/pyparted/${name}.tar.gz";
+ url = "https://fedorahosted.org/releases/p/y/pyparted/${pname}-${version}.tar.gz";
sha256 = "17wq4invmv1nfazaksf59ymqyvgv3i8h4q03ry2az0s9lldyg3dv";
};
diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
index ce00367c771c..8f59ff809a83 100644
--- a/pkgs/tools/filesystems/nixpart/default.nix
+++ b/pkgs/tools/filesystems/nixpart/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, buildPythonApplication, blivet }:
buildPythonApplication rec {
- name = "nixpart-${version}";
+ pname = "nixpart";
version = "1.0.0";
src = fetchurl {
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index c919bfade3ac..3660649553d5 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -4,7 +4,6 @@
stdenv.mkDerivation rec {
pname = "ntfs3g";
version = "2017.3.23";
- name = "${pname}-${version}";
outputs = [ "out" "dev" "man" "doc" ];
diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix
index 2457ac59a213..424f84ec34f9 100644
--- a/pkgs/tools/filesystems/rdfind/default.nix
+++ b/pkgs/tools/filesystems/rdfind/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, nettle }:
stdenv.mkDerivation rec {
- name = "rdfind-${version}";
+ pname = "rdfind";
version = "1.4.1";
src = fetchurl {
- url = "https://rdfind.pauldreik.se/${name}.tar.gz";
+ url = "https://rdfind.pauldreik.se/${pname}-${version}.tar.gz";
sha256 = "132y3wwgnbpdx6f90q0yahd3nkr4cjzcy815ilc8p97b4vn17iih";
};
diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix
index 967a8ee43bef..c9af30f873b4 100644
--- a/pkgs/tools/filesystems/reiser4progs/default.nix
+++ b/pkgs/tools/filesystems/reiser4progs/default.nix
@@ -2,10 +2,11 @@
let version = "1.2.1"; in
stdenv.mkDerivation rec {
- name = "reiser4progs-${version}";
+ pname = "reiser4progs";
+ inherit version;
src = fetchurl {
- url = "mirror://sourceforge/reiser4/reiser4-utils/${name}.tar.gz";
+ url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz";
sha256 = "03vdqvpyd48wxrpqpb9kg76giaffw9b8k334kr4wc0zxgybknhl7";
};
diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix
index 345974bed58d..a89ea0657500 100644
--- a/pkgs/tools/filesystems/reiserfsprogs/default.nix
+++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix
@@ -2,10 +2,11 @@
let version = "3.6.24"; in
stdenv.mkDerivation rec {
- name = "reiserfsprogs-${version}";
+ pname = "reiserfsprogs";
+ inherit version;
src = fetchurl {
- url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${name}.tar.xz";
+ url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${pname}-${version}.tar.xz";
sha256 = "0q07df9wxxih8714a3mdp61h5n347l7j2a0l351acs3xapzgwi3y";
};
diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix
index 04a15dfa22be..c99a95714c09 100644
--- a/pkgs/tools/filesystems/relfs/default.nix
+++ b/pkgs/tools/filesystems/relfs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchcvs, ocaml, fuse, postgresql, pcre
, libuuid, gnome_vfs, pkgconfig, GConf }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "relfs-2008.03.05";
src = fetchcvs {
diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/tools/filesystems/rmount/default.nix
index cdc90097653f..46be9e30f70f 100644
--- a/pkgs/tools/filesystems/rmount/default.nix
+++ b/pkgs/tools/filesystems/rmount/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
pname = "rmount";
version = "1.0.1";
- src = fetchFromGitHub rec {
+ src = fetchFromGitHub {
rev = "v${version}";
owner = "Luis-Hebendanz";
repo = "rmount";
diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix
index 8fb002b2d7fd..73f88964f2c8 100644
--- a/pkgs/tools/filesystems/s3backer/default.nix
+++ b/pkgs/tools/filesystems/s3backer/default.nix
@@ -3,7 +3,7 @@
, fuse, curl, expat }:
stdenv.mkDerivation rec {
- name = "s3backer-${version}";
+ pname = "s3backer";
version = "1.5.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index 816c09161dcf..3fc082dad462 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse }:
stdenv.mkDerivation rec {
- name = "s3fs-fuse-${version}";
+ pname = "s3fs-fuse";
version = "1.85";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix
index a21aacb7e6b8..c5a5af212d90 100644
--- a/pkgs/tools/filesystems/securefs/default.nix
+++ b/pkgs/tools/filesystems/securefs/default.nix
@@ -3,7 +3,7 @@
, fuse }:
stdenv.mkDerivation rec {
- name = "securefs-${version}";
+ pname = "securefs";
version = "0.8.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/simg2img/default.nix b/pkgs/tools/filesystems/simg2img/default.nix
index 94c45ec4689a..78f80ecfa87a 100644
--- a/pkgs/tools/filesystems/simg2img/default.nix
+++ b/pkgs/tools/filesystems/simg2img/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, zlib }:
stdenv.mkDerivation rec {
- name = "simg2img-${version}";
+ pname = "simg2img";
version = "1.1.3";
src = fetchFromGitHub {
owner = "anestisb";
repo = "android-simg2img";
- rev = "${version}";
+ rev = version;
sha256 = "119gl9i61g2wr07hzv6mi1ihql6yd6pwq94ki2pgcpfbamv8f6si";
};
diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix
index 26cef4ac90f2..be46abb2694d 100644
--- a/pkgs/tools/filesystems/smbnetfs/default.nix
+++ b/pkgs/tools/filesystems/smbnetfs/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, fuse, samba, pkgconfig, glib, autoconf, attr, libsecret }:
stdenv.mkDerivation rec {
- name = "smbnetfs-${version}";
+ pname = "smbnetfs";
version = "0.6.1";
src = fetchurl {
- url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${name}.tar.bz2";
+ url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${pname}-${version}.tar.bz2";
sha256 = "02iqjnm6pdwc1q38z56akiwdbp0xisr6qwrmxs1lrk5mq7j8x2w4";
};
diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix
index 725ff3e56dcd..b5ffdade98f8 100644
--- a/pkgs/tools/filesystems/snapraid/default.nix
+++ b/pkgs/tools/filesystems/snapraid/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "snapraid-${version}";
+ pname = "snapraid";
version = "11.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index 59a786116df6..5bd3b27eded1 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -6,8 +6,8 @@
assert lz4Support -> (lz4 != null);
-stdenv.mkDerivation rec {
- name = "squashfs-${version}";
+stdenv.mkDerivation {
+ pname = "squashfs";
version = "4.4dev_20180612";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix
index 40e350846c5f..e828698b0e97 100644
--- a/pkgs/tools/filesystems/squashfuse/default.nix
+++ b/pkgs/tools/filesystems/squashfuse/default.nix
@@ -7,7 +7,6 @@ stdenv.mkDerivation rec {
pname = "squashfuse";
version = "0.1.103";
- name = "${pname}-${version}";
meta = {
description = "FUSE filesystem to mount squashfs archives";
@@ -23,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "vasi";
- repo = "${pname}";
+ repo = pname;
rev = "540204955134eee44201d50132a5f66a246bcfaf";
sha256 = "062s77y32p80vc24a79z31g90b9wxzvws1xvicgx5fn1pd0xa0q6";
};
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 73b7f51fd364..4a1215397be6 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
version = "3.5.2";
- name = "sshfs-fuse-${version}";
+ pname = "sshfs-fuse";
src = fetchFromGitHub {
owner = "libfuse";
diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix
index fd557a7ff565..67e21ac4c2c4 100644
--- a/pkgs/tools/filesystems/tmsu/default.nix
+++ b/pkgs/tools/filesystems/tmsu/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, fetchFromGitHub, go, fuse }:
stdenv.mkDerivation rec {
- name = "tmsu-${version}";
+ pname = "tmsu";
version = "0.7.4";
go-sqlite3 = fetchgit {
diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/tools/filesystems/u3-tool/default.nix
index 65eafe76710d..62b4b9301397 100644
--- a/pkgs/tools/filesystems/u3-tool/default.nix
+++ b/pkgs/tools/filesystems/u3-tool/default.nix
@@ -3,12 +3,11 @@
stdenv.mkDerivation rec {
pname = "u3-tool";
version = "0.3";
- name = "${pname}-${version}";
enableParallelBuilding = true;
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+ url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1p9c9kibd1pdbdfa0nd0i3n7bvzi3xg0chm38jg3xfl8gsn0390f";
};
diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix
index f17f9e0d2de5..9efaf96182d7 100644
--- a/pkgs/tools/filesystems/udftools/default.nix
+++ b/pkgs/tools/filesystems/udftools/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "udftools-${version}";
+ pname = "udftools";
version = "2.0";
src = fetchFromGitHub {
owner = "pali";
repo = "udftools";
- rev = "${version}";
+ rev = version;
sha256 = "0mz04h3rki6ljwfs15z83gf4vv816w7xgz923waiqgmfj9xpvx87";
};
diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix
index cfe3ff421fe4..73272b83989e 100644
--- a/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, fuse }:
stdenv.mkDerivation rec {
- name = "unionfs-fuse-${version}";
+ pname = "unionfs-fuse";
version = "2.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix
index 6cc049a44092..c15a782fa3c6 100644
--- a/pkgs/tools/filesystems/vmfs-tools/default.nix
+++ b/pkgs/tools/filesystems/vmfs-tools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig
, asciidoc, docbook_xsl, fuse, libuuid, libxslt }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "vmfs-tools";
src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix
index 135373e09f42..50a50ad18f05 100644
--- a/pkgs/tools/filesystems/wdfs/default.nix
+++ b/pkgs/tools/filesystems/wdfs/default.nix
@@ -1,7 +1,6 @@
{stdenv, fetchurl, glib, neon, fuse, pkgconfig}:
-stdenv.mkDerivation rec
-{
+stdenv.mkDerivation {
name = "wdfs-fuse-1.4.2";
src = fetchurl {
url = "http://noedler.de/projekte/wdfs/wdfs-1.4.2.tar.gz";
diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index 98cc327bc29c..aa28ee625969 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -10,7 +10,7 @@ let
in
stdenv.mkDerivation rec {
- name = "xfsprogs-${version}";
+ pname = "xfsprogs";
version = "4.19.0";
src = fetchgit {
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index 4c0c2343dd2a..ea25b302e355 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python
, lib, valgrind, makeWrapper, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
src = fetchFromGitHub {
# using unstable release because stable (v1.5.1) has broken repl java plugin
rev = "7ddcb081aa125b0cfb008dc98addd260b8353ab3";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1hjmd32pla27zf98ghzz6r5ml8ry86m9dsryv1z01kxv5l95b3m0";
};
- name = "XtreemFS-${version}";
+ pname = "XtreemFS";
version = "1.5.1.81";
buildInputs = [ which attr makeWrapper python ];
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 61fd5f26e308..041d9a4e3f8b 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -14,11 +14,11 @@ let
in
stdenv.mkDerivation rec {
- name = "yandex-disk-${version}";
+ pname = "yandex-disk";
version = "0.1.5.1039";
src = fetchurl {
- url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm";
+ url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${pname}-${version}-1.fedora.${p.arch}.rpm";
sha256 = p.sha256;
};
diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix
index c311ac1af231..734c8df9b6ae 100644
--- a/pkgs/tools/filesystems/zerofree/default.nix
+++ b/pkgs/tools/filesystems/zerofree/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, e2fsprogs }:
stdenv.mkDerivation rec {
- name = "zerofree-${version}";
+ pname = "zerofree";
version = "1.1.1";
src = fetchurl {
- url = "https://frippery.org/uml/${name}.tgz";
+ url = "https://frippery.org/uml/${pname}-${version}.tgz";
sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm";
};
diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/tools/filesystems/zfstools/default.nix
index 518e92814a41..476d80653127 100644
--- a/pkgs/tools/filesystems/zfstools/default.nix
+++ b/pkgs/tools/filesystems/zfstools/default.nix
@@ -2,7 +2,8 @@
let version = "0.3.6"; in
stdenv.mkDerivation rec {
- name = "zfstools-${version}";
+ pname = "zfstools";
+ inherit version;
src = fetchFromGitHub {
sha256 = "16lvw3xbmxp2pr8nixqn7lf4504zaaxvbbdnjkv4dggwd4lsdjyg";
diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix
index 0e182d3bd2ea..89516d525af6 100644
--- a/pkgs/tools/filesystems/zkfuse/default.nix
+++ b/pkgs/tools/filesystems/zkfuse/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }:
-stdenv.mkDerivation rec {
- name = "zkfuse-${version}";
+stdenv.mkDerivation {
+ pname = "zkfuse";
inherit (zookeeper) version src;
sourceRoot = "${zookeeper.name}/src/contrib/zkfuse";
diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix
index 72f1a4188075..876861087201 100644
--- a/pkgs/tools/graphics/appleseed/default.nix
+++ b/pkgs/tools/graphics/appleseed/default.nix
@@ -9,7 +9,7 @@ let boost_static = boost165.override {
};
in stdenv.mkDerivation rec {
- name = "appleseed-${version}";
+ pname = "appleseed";
version = "2.0.5-beta";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index 23a1f26db976..160b77229b3c 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -5,7 +5,8 @@ let
version = "2.1.1";
in
stdenv.mkDerivation rec {
- name = "argyllcms-${version}";
+ pname = "argyllcms";
+ inherit version;
src = fetchzip {
# Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix
index de09c2b27804..179085e1fd6b 100644
--- a/pkgs/tools/graphics/barcode/default.nix
+++ b/pkgs/tools/graphics/barcode/default.nix
@@ -1,11 +1,10 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
version = "0.99";
pname = "barcode";
src = fetchurl {
- url = "mirror://gnu/${pname}/${name}.tar.xz";
+ url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
sha256 = "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8";
};
diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix
index ad72933cc771..b4f99a9192cd 100644
--- a/pkgs/tools/graphics/blockhash/default.nix
+++ b/pkgs/tools/graphics/blockhash/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python, pkgconfig, imagemagick, wafHook }:
stdenv.mkDerivation rec {
- name = "blockhash-${version}";
+ pname = "blockhash";
version = "0.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix
index 57a6c8c9673c..e57f80f738f3 100644
--- a/pkgs/tools/graphics/briss/default.nix
+++ b/pkgs/tools/graphics/briss/default.nix
@@ -8,7 +8,8 @@ let
sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9";
in stdenv.mkDerivation {
- name = "briss-${version}";
+ pname = "briss";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/briss/briss-${version}.tar.gz";
inherit sha256;
diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix
index c65d1302dcaf..2c96e872f4e6 100644
--- a/pkgs/tools/graphics/cfdg/default.nix
+++ b/pkgs/tools/graphics/cfdg/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libpng, bison, flex, ffmpeg }:
stdenv.mkDerivation rec {
- name = "cfdg-${version}";
+ pname = "cfdg";
version = "3.0.9";
src = fetchurl {
sha256 = "1jqpinz6ri4a2l04mf2z1ljalkdk1m07hj47lqkh8gbf2slfs0jl";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cp cfdg $out/bin/
- mkdir -p $out/share/doc/${name}
- cp *.txt $out/share/doc/${name}
+ mkdir -p $out/share/doc/${pname}-${version}
+ cp *.txt $out/share/doc/${pname}-${version}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/graphics/cfdg/src-for-default.nix b/pkgs/tools/graphics/cfdg/src-for-default.nix
index 179f0432dd10..6d98ea240de6 100644
--- a/pkgs/tools/graphics/cfdg/src-for-default.nix
+++ b/pkgs/tools/graphics/cfdg/src-for-default.nix
@@ -1,4 +1,4 @@
-rec {
+{
version="3.0.2";
name="cfdg-3.0.2";
hash="1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p";
diff --git a/pkgs/tools/graphics/convchain/default.nix b/pkgs/tools/graphics/convchain/default.nix
index 12fc6934531a..b1ce3082d25b 100644
--- a/pkgs/tools/graphics/convchain/default.nix
+++ b/pkgs/tools/graphics/convchain/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, mono}:
stdenv.mkDerivation rec {
- name = "convchain-${version}";
+ pname = "convchain";
version = "0.0pre20160901";
src = fetchFromGitHub {
owner = "mxgmn";
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index 9fcb7ba404d0..3d48b328934b 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, imagemagick }:
-stdenv.mkDerivation rec {
- name = "cuneiform-${version}";
+stdenv.mkDerivation {
+ pname = "cuneiform";
version = "1.1.0";
src = fetchurl {
diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix
index 33e948663372..f21b84c15218 100644
--- a/pkgs/tools/graphics/dpic/default.nix
+++ b/pkgs/tools/graphics/dpic/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "dpic-${version}";
+ pname = "dpic";
version = "2016.01.12";
src = fetchurl {
- url = "https://ece.uwaterloo.ca/~aplevich/dpic/${name}.tar.gz";
+ url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz";
sha256 = "0iwwf8shgm8n4drz8mndvk7jga93yy8plnyby3lgk8376g5ps6cz";
};
diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix
index 2ffe4eb7f809..79c905756537 100644
--- a/pkgs/tools/graphics/enblend-enfuse/default.nix
+++ b/pkgs/tools/graphics/enblend-enfuse/default.nix
@@ -3,11 +3,11 @@
, help2man, pkgconfig, perl, texlive }:
stdenv.mkDerivation rec {
- name = "enblend-enfuse-${version}";
+ pname = "enblend-enfuse";
version = "4.2";
src = fetchurl {
- url = "mirror://sourceforge/enblend/${name}.tar.gz";
+ url = "mirror://sourceforge/enblend/${pname}-${version}.tar.gz";
sha256 = "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7";
};
diff --git a/pkgs/tools/graphics/eplot/default.nix b/pkgs/tools/graphics/eplot/default.nix
index ad8d9ebc6a22..ff2091fc2998 100644
--- a/pkgs/tools/graphics/eplot/default.nix
+++ b/pkgs/tools/graphics/eplot/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, gnuplot, ruby }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "eplot-2.07";
# Upstream has been contacted (2015-03) regarding providing versioned
diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix
index 9735adca53dc..2ad52d2de437 100644
--- a/pkgs/tools/graphics/epstool/default.nix
+++ b/pkgs/tools/graphics/epstool/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "3.08";
- name = "epstool-${version}";
+ pname = "epstool";
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${version}+repack.orig.tar.gz";
diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix
index 02a3a70fe516..aab2e111e85f 100644
--- a/pkgs/tools/graphics/facedetect/default.nix
+++ b/pkgs/tools/graphics/facedetect/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages }:
stdenv.mkDerivation rec {
- name = "facedetect-${version}";
+ pname = "facedetect";
version = "0.1";
src = fetchFromGitHub {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
- install -v -m644 -D README.rst $out/share/doc/${name}/README.rst
+ install -v -m644 -D README.rst $out/share/doc/${pname}-${version}/README.rst
install -v -m755 -D facedetect $out/bin/facedetect
wrapPythonPrograms
'';
diff --git a/pkgs/tools/graphics/fast-neural-doodle/default.nix b/pkgs/tools/graphics/fast-neural-doodle/default.nix
index 5d42482b3091..17e1c710586b 100644
--- a/pkgs/tools/graphics/fast-neural-doodle/default.nix
+++ b/pkgs/tools/graphics/fast-neural-doodle/default.nix
@@ -2,7 +2,7 @@
, python, numpy, scipy, h5py, scikitlearn, pillow
}:
stdenv.mkDerivation rec {
- name = "fast-neural-doodle-${version}";
+ pname = "fast-neural-doodle";
version = "0.0pre2016-07-01";
buildInputs = [
torch torch-hdf5 python numpy h5py scikitlearn scipy pillow
diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix
index 7303f27fe111..296ba43a5ed7 100644
--- a/pkgs/tools/graphics/fim/default.nix
+++ b/pkgs/tools/graphics/fim/default.nix
@@ -10,11 +10,11 @@
}:
stdenv.mkDerivation rec {
- name = "fim-${version}";
+ pname = "fim";
version = "0.6";
src = fetchurl {
- url = "mirror://savannah/fbi-improved/${name}-trunk.tar.gz";
+ url = "mirror://savannah/fbi-improved/${pname}-${version}-trunk.tar.gz";
sha256 = "124b7c4flx5ygmy5sqq0gpvxqzafnknbcj6f45ddnbdxik9lazzp";
};
diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix
index e619a889219c..a6277f58cbdb 100644
--- a/pkgs/tools/graphics/flam3/default.nix
+++ b/pkgs/tools/graphics/flam3/default.nix
@@ -1,7 +1,6 @@
{stdenv, fetchFromGitHub, zlib, libpng, libxml2, libjpeg }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "flam3";
version = "3.1.1-${stdenv.lib.strings.substring 0 7 rev}";
rev = "e0801543538451234d7a8a240ba3b417cbda5b21";
@@ -9,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
inherit rev;
owner = "scottdraves";
- repo = "${pname}";
+ repo = pname;
sha256 = "18iyj16k0sn3fs52fj23lj31xi4avlddhbib6kk309576nlxp17w";
};
diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix
index 0ed1855a338c..de02865c36e2 100644
--- a/pkgs/tools/graphics/ggobi/default.nix
+++ b/pkgs/tools/graphics/ggobi/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.1.11";
- name = "ggobi-${version}";
+ pname = "ggobi";
src = fetchurl {
url = "http://www.ggobi.org/downloads/ggobi-${version}.tar.bz2";
diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix
index 7719406cb6bf..5875f64f7ef3 100644
--- a/pkgs/tools/graphics/gifski/default.nix
+++ b/pkgs/tools/graphics/gifski/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig }:
rustPlatform.buildRustPackage rec {
- name = "gifski-${version}";
+ pname = "gifski";
version = "0.8.7";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix
index 52f5a0997274..ae6291811a4a 100644
--- a/pkgs/tools/graphics/glee/default.nix
+++ b/pkgs/tools/graphics/glee/default.nix
@@ -1,7 +1,6 @@
{stdenv, fetchgit, cmake, libGLU_combined, xorg }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "glee";
rev = "f727ec7463d514b6279981d12833f2e11d62b33d";
version = "20170205-${stdenv.lib.strings.substring 0 7 rev}";
diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix
index 1331e38aef7e..5668e755d017 100644
--- a/pkgs/tools/graphics/glmark2/default.nix
+++ b/pkgs/tools/graphics/glmark2/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm,
python27, wayland, udev, mesa, wafHook }:
-stdenv.mkDerivation rec {
- name = "glmark2-${version}";
+stdenv.mkDerivation {
+ pname = "glmark2";
version = "2017-09-01";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index 1f8a98e0296b..0710f47cb571 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libGL, libX11 }:
stdenv.mkDerivation rec {
- name = "glxinfo-${version}";
+ pname = "glxinfo";
version = "8.4.0";
src = fetchurl {
diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
new file mode 100644
index 000000000000..cb0862c63736
--- /dev/null
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -0,0 +1,144 @@
+{ lib
+, mkDerivation
+, fetchurl
+, fetchpatch
+, variant ? "standalone"
+, fetchFromGitHub
+, fetchFromGitLab
+, cmake
+, pkgconfig
+, opencv
+, openexr
+, graphicsmagick
+, fftw
+, zlib
+, libjpeg
+, libtiff
+, libpng
+, curl
+, krita ? null
+, gimp ? null
+, qtbase
+, qttools
+}:
+
+let
+ variants = {
+ gimp = {
+ extraDeps = [
+ gimp
+ gimp.gtk
+ ];
+ description = "GIMP plugin for the G'MIC image processing framework";
+ };
+
+ krita = {
+ extraDeps = [
+ krita
+ ];
+ description = "Krita plugin for the G'MIC image processing framework";
+ };
+
+ standalone = {
+ description = "Versatile front-end to the image processing framework G'MIC";
+ };
+ };
+
+in
+
+assert lib.assertMsg (builtins.hasAttr variant variants) "gmic-qt variant “${variant}” is not supported. Please use one of ${lib.concatStringsSep ", " (builtins.attrNames variants)}.";
+
+assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps or []) "gmic-qt variant “${variant}” is missing one of its dependencies.";
+
+mkDerivation rec {
+ pname = "gmic-qt${lib.optionalString (variant != "standalone") ''-${variant}''}";
+ version = "2.7.1";
+
+ gmic-community = fetchFromGitHub {
+ owner = "dtschump";
+ repo = "gmic-community";
+ rev = "3fd528f20a2a7d651e96078c205ff21efb9cdd1a";
+ sha256 = "08d37b49qgh5d4rds7hvr5wjj4p1y8cnbidz1cyqsibq0555pwq2";
+ };
+
+ CImg = fetchFromGitLab {
+ domain = "framagit.org";
+ owner = "dtschump";
+ repo = "CImg";
+ rev = "v.${version}";
+ sha256 = "1mfkjvf5r3ppc1dd6yvqn7xlhgzfg9k1k5v2sq2k9m70g8p7rgpd";
+ };
+
+ gmic_stdlib = fetchurl {
+ name = "gmic_stdlib.h";
+ url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h";
+ sha256 = "0v12smknr1s44s6wq2gbnw0hb98xrwp6i3zg9wf49cl7s9qf76j3";
+ };
+
+ gmic = fetchFromGitHub {
+ owner = "dtschump";
+ repo = "gmic";
+ rev = "v.${version}";
+ sha256 = "0pa6kflr1gqgzh8rk7bylvkxs989r5jy0q7b62mnzx8895slwfb5";
+ };
+
+ gmic_qt = fetchFromGitHub {
+ owner = "c-koi";
+ repo = "gmic-qt";
+ rev = "v.${version}";
+ sha256 = "08a0660083wv5fb1w9qqhm4f8cfwbqq723qzqq647mid1n7sy959";
+ };
+
+ patches = [
+ # Install GIMP plug-in to a correct destination
+ # https://github.com/c-koi/gmic-qt/pull/78
+ ./fix-gimp-plugin-path.patch
+ ];
+
+ unpackPhase = ''
+ cp -r ${gmic} gmic
+ ln -s ${gmic-community} gmic-community
+ cp -r ${gmic_qt} gmic_qt
+ chmod -R +w gmic gmic_qt
+ ln -s ${CImg} CImg
+
+ cp ${gmic_stdlib} gmic/src/gmic_stdlib.h
+
+ cd gmic_qt
+ '';
+
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ ];
+
+ buildInputs = [
+ qtbase
+ qttools
+ fftw
+ zlib
+ libjpeg
+ libtiff
+ libpng
+ opencv
+ openexr
+ graphicsmagick
+ curl
+ ] ++ variants.${variant}.extraDeps or [];
+
+ cmakeFlags = [
+ "-DGMIC_QT_HOST=${if variant == "standalone" then "none" else variant}"
+ ];
+
+ postFixup = lib.optionalString (variant == "gimp") ''
+ echo "wrapping $out/${gimp.targetPluginDir}/gmic_gimp_qt"
+ wrapQtApp "$out/${gimp.targetPluginDir}/gmic_gimp_qt"
+ '';
+
+ meta = with lib; {
+ description = variants.${variant}.description;
+ homepage = http://gmic.eu/;
+ license = licenses.gpl3;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch b/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch
new file mode 100644
index 000000000000..ac0600fb76c3
--- /dev/null
+++ b/pkgs/tools/graphics/gmic-qt/fix-gimp-plugin-path.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1483056..26d2b9a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -473,6 +473,7 @@
+
+ execute_process(COMMAND gimptool-2.0 --libs-noui OUTPUT_VARIABLE GIMP2_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND gimptool-2.0 --cflags-noui OUTPUT_VARIABLE GIMP2_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
++ execute_process(COMMAND pkg-config gimp-2.0 --define-variable=prefix=${CMAKE_INSTALL_PREFIX} --variable gimplibdir OUTPUT_VARIABLE GIMP2_PKGLIBDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GIMP2_INCLUDE_DIRS}")
+
+ set (gmic_qt_SRCS ${gmic_qt_SRCS} src/Host/Gimp/host_gimp.cpp)
+@@ -484,7 +485,7 @@
+ ${GIMP2_LIBRARIES}
+ ${gmic_qt_LIBRARIES}
+ )
+- install(TARGETS gmic_gimp_qt RUNTIME DESTINATION bin)
++ install(TARGETS gmic_gimp_qt RUNTIME DESTINATION "${GIMP2_PKGLIBDIR}/plug-ins")
+
+ elseif (${GMIC_QT_HOST} STREQUAL "krita")
+
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 51212a3ea946..c6781310bdb5 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -1,45 +1,53 @@
-{ stdenv, fetchurl, cmake, ninja, pkgconfig
-, opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
-, withGimpPlugin ? true, gimp ? null}:
+{ stdenv
+, fetchurl
+, cmake
+, ninja
+, pkgconfig
+, opencv
+, openexr
+, graphicsmagick
+, fftw
+, zlib
+, libjpeg
+, libtiff
+, libpng
+}:
-assert withGimpPlugin -> gimp != null;
+stdenv.mkDerivation rec {
+ pname = "gmic";
+ version = "2.7.1";
-let
- version = "2.2.2";
-
- # CMakeLists.txt is missing from the tarball and Makefile is terrible
- CMakeLists = fetchurl {
- url = "https://github.com/dtschump/gmic/raw/v.${version}/CMakeLists.txt";
- sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg";
- };
-in stdenv.mkDerivation rec {
- name = "gmic-${version}";
-
- outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin";
+ outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
- sha256 = "0zqfj2ym5nn3ff93xh2wf9ayxqlznabbdi00xw4lm7vw3iwkzqnc";
+ sha256 = "1sxgmrxv1px07h5m7dcdg24c6x39ifjbc1fmz8p2ah91pm57h7n7";
};
- nativeBuildInputs = [ cmake ninja pkgconfig ];
+ nativeBuildInputs = [
+ cmake
+ ninja
+ pkgconfig
+ ];
buildInputs = [
- fftw zlib libjpeg libtiff libpng opencv openexr graphicsmagick
- ] ++ stdenv.lib.optionals withGimpPlugin [ gimp gimp.gtk ];
+ fftw
+ zlib
+ libjpeg
+ libtiff
+ libpng
+ opencv
+ openexr
+ graphicsmagick
+ ];
cmakeFlags = [
"-DBUILD_LIB_STATIC=OFF"
- "-DBUILD_PLUGIN=${if withGimpPlugin then "ON" else "OFF"}"
"-DENABLE_DYNAMIC_LINKING=ON"
- ] ++ stdenv.lib.optional withGimpPlugin "-DPLUGIN_INSTALL_PREFIX=${placeholder "gimpPlugin"}/${gimp.targetPluginDir}";
-
- postPatch = ''
- cp ${CMakeLists} CMakeLists.txt
- '';
+ ];
meta = with stdenv.lib; {
- description = "G'MIC is an open and full-featured framework for image processing";
+ description = "Open and full-featured framework for image processing";
homepage = http://gmic.eu/;
license = licenses.cecill20;
platforms = platforms.unix;
diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix
deleted file mode 100644
index 7ea73ab8db8d..000000000000
--- a/pkgs/tools/graphics/gmic_krita_qt/default.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig
-, opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
-, curl, krita, qtbase, qttools
-, fetchgit }:
-
-let
- version = "2.3.6";
-
-in stdenv.mkDerivation rec {
- name = "gmic_krita_qt-${version}";
-
- gmic-community = fetchFromGitHub {
- owner = "dtschump";
- repo = "gmic-community";
- rev = "3fd528f20a2a7d651e96078c205ff21efb9cdd1a";
- sha256 = "08d37b49qgh5d4rds7hvr5wjj4p1y8cnbidz1cyqsibq0555pwq2";
- };
-
- CImg = fetchgit {
- url = "https://framagit.org/dtschump/CImg";
- rev = "90f5657d8eab7b549ef945103ef680e747385805";
- sha256 = "1af3dwqq18dkw0lz2gvnlw8y0kc1cw01hnc72rf3pg2wyjcp0pvc";
- };
-
- gmic_stdlib = fetchurl {
- name = "gmic_stdlib.h";
- # Version should e in sync with gmic. Basically the version string without dots
- url = "http://gmic.eu/gmic_stdlib236.h";
- sha256 = "0q5g87dsn9byd2qqsa9xrsggfb9qv055s3l2gc0jrcvpx2qbza4q";
- };
-
- gmic = fetchFromGitHub {
- owner = "dtschump";
- repo = "gmic";
- rev = "v.${version}";
- sha256 = "1yg9ri3n07drv8gz4x0mn39ryi801ibl26jaza47m19ma893m8fi";
- };
-
- gmic_qt = fetchFromGitHub {
- owner = "c-koi";
- repo = "gmic-qt";
- rev = "v.${version}";
- sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3";
- };
-
- unpackPhase = ''
- cp -r ${gmic} gmic
- ln -s ${gmic-community} gmic-community
- cp -r ${gmic_qt} gmic_qt
- chmod -R +w gmic gmic_qt
- ln -s ${CImg} CImg
-
- cp ${gmic_stdlib} gmic/src/gmic_stdlib.h
-
- cd gmic_qt
- '';
-
- preConfigure = ''
- make -C ../gmic/src CImg.h gmic_stdlib.h
- '';
-
- nativeBuildInputs = [ cmake pkgconfig ];
-
- buildInputs = [
- qtbase qttools fftw zlib libjpeg libtiff libpng
- opencv openexr graphicsmagick curl krita
- ];
-
- cmakeFlags = [ "-DGMIC_QT_HOST=krita" ];
-
- installPhase = ''
- mkdir -p $out/bin;
- install -Dm755 gmic_krita_qt "$out/bin/gmic_krita_qt"
- '';
-
- meta = with stdenv.lib; {
- description = "Krita plugin for the G'MIC image processing framework";
- homepage = http://gmic.eu/;
- license = licenses.gpl3;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix
index db21df9b5d0d..cd2302efd165 100644
--- a/pkgs/tools/graphics/graphviz/base.nix
+++ b/pkgs/tools/graphics/graphviz/base.nix
@@ -24,8 +24,9 @@ let
};
in
-stdenv.mkDerivation rec {
- name = "graphviz-${version}";
+stdenv.mkDerivation {
+ pname = "graphviz";
+ inherit version;
src = fetchFromGitLab {
owner = "graphviz";
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 48b1b0764c51..7249a6cdaad7 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -1,5 +1,5 @@
import ./base.nix rec {
- rev = "stable_release_${version}";
+ rev = "67cd2e5121379a38e0801cc05cce5033f8a2a609";
version = "2.40.1";
sha256 = "1xjqq3g2n6jgwp5xzyvibgrxawlskkpam69fjjz9ksrrjas2qwzj";
}
diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix
index 1d3a8b26aae8..7465ebb78836 100644
--- a/pkgs/tools/graphics/gromit-mpx/default.nix
+++ b/pkgs/tools/graphics/gromit-mpx/default.nix
@@ -4,13 +4,13 @@
}:
stdenv.mkDerivation rec {
- name = "gromit-mpx-${version}";
+ pname = "gromit-mpx";
version = "1.3";
src = fetchFromGitHub {
owner = "bk138";
repo = "gromit-mpx";
- rev = "${version}";
+ rev = version;
sha256 = "1dkmp5rhzp56sz9cfxill2pkdz2anwb8kkxkypvk2xhqi64cvkrs";
};
diff --git a/pkgs/tools/graphics/ibniz/default.nix b/pkgs/tools/graphics/ibniz/default.nix
index 11fad25b85ae..564685c1ceaf 100644
--- a/pkgs/tools/graphics/ibniz/default.nix
+++ b/pkgs/tools/graphics/ibniz/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, SDL }:
stdenv.mkDerivation rec {
- name = "ibniz-${version}";
+ pname = "ibniz";
version = "1.18";
src = fetchurl {
- url = "http://www.pelulamu.net/ibniz/${name}.tar.gz";
+ url = "http://www.pelulamu.net/ibniz/${pname}-${version}.tar.gz";
sha256 = "10b4dka8zx7y84m1a58z9j2vly8mz9aw9wn8z9vx9av739j95wp2";
};
diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix
index 8db5b6c7dea7..1099b11176c8 100644
--- a/pkgs/tools/graphics/imgur-screenshot/default.nix
+++ b/pkgs/tools/graphics/imgur-screenshot/default.nix
@@ -3,7 +3,7 @@
let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ];
in stdenv.mkDerivation rec {
version = "1.7.4";
- name = "imgur-screenshot-${version}";
+ pname = "imgur-screenshot";
src = fetchFromGitHub {
owner = "jomo";
diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix
index e4405455097d..a2592d5522b9 100644
--- a/pkgs/tools/graphics/jhead/default.nix
+++ b/pkgs/tools/graphics/jhead/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libjpeg }:
stdenv.mkDerivation rec {
- name = "jhead-${version}";
+ pname = "jhead";
version = "3.03";
src = fetchurl {
- url = "http://www.sentex.net/~mwandel/jhead/${name}.tar.gz";
+ url = "http://www.sentex.net/~mwandel/jhead/${pname}-${version}.tar.gz";
sha256 = "1hn0yqcicq3qa20h1g313l1a671r8mccpb9gz0w1056r500lw6c2";
};
@@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
mkdir -p \
$out/bin \
$out/man/man1 \
- $out/share/doc/${name}
+ $out/share/doc/${pname}-${version}
cp -v jhead $out/bin
cp -v jhead.1 $out/man/man1
- cp -v *.txt $out/share/doc/${name}
+ cp -v *.txt $out/share/doc/${pname}-${version}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix
index fec092db0c52..0b6c12639423 100644
--- a/pkgs/tools/graphics/lepton/default.nix
+++ b/pkgs/tools/graphics/lepton/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, git, glibc }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.2.1";
- name = "lepton-${version}";
+ pname = "lepton";
src = fetchFromGitHub {
repo = "lepton";
diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix
index a3cefddeb413..1f1da8df3f2b 100644
--- a/pkgs/tools/graphics/logstalgia/default.nix
+++ b/pkgs/tools/graphics/logstalgia/default.nix
@@ -2,11 +2,11 @@
, libGLU_combined, boost, glm, freetype }:
stdenv.mkDerivation rec {
- name = "logstalgia-${version}";
+ pname = "logstalgia";
version = "1.1.2";
src = fetchurl {
- url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz";
+ url = "https://github.com/acaudwell/Logstalgia/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "1agwjlwzp1c86hqb1p7rmzqzhd3wpnyh8whsfq4sbx01wj0l0gzd";
};
diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix
index ffba2280e8a5..4826bd64984b 100644
--- a/pkgs/tools/graphics/luxcorerender/default.nix
+++ b/pkgs/tools/graphics/luxcorerender/default.nix
@@ -13,8 +13,8 @@ let boost_static = boost165.override {
enablePython = true;
};
-in stdenv.mkDerivation rec {
- name = "luxcorerender-${version}";
+in stdenv.mkDerivation {
+ pname = "luxcorerender";
version = "2.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index 360a233e139f..63758e23b150 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "maim-${version}";
+ pname = "maim";
version = "5.5.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix
index 666cdae131e2..832a48baab72 100644
--- a/pkgs/tools/graphics/mscgen/default.nix
+++ b/pkgs/tools/graphics/mscgen/default.nix
@@ -4,7 +4,8 @@ let
version = "0.20";
in
stdenv.mkDerivation {
- name = "mscgen-${version}";
+ pname = "mscgen";
+ inherit version;
src = fetchurl {
url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz";
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 534cefe9bf6c..9de7603c9730 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -2,7 +2,7 @@
, makeWrapper, libtiff
, enableX11 ? false, libX11 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
# Determine version and revision from:
# https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
name = "netpbm-10.82.01";
diff --git a/pkgs/tools/graphics/neural-style/default.nix b/pkgs/tools/graphics/neural-style/default.nix
index 99421cfde170..a4706e95ceef 100644
--- a/pkgs/tools/graphics/neural-style/default.nix
+++ b/pkgs/tools/graphics/neural-style/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, torch, loadcaffe, fetchurl, bash}:
stdenv.mkDerivation rec {
- name = "neural-style-${version}";
+ pname = "neural-style";
version = "0.0pre2016.08.15";
buildInputs = [torch loadcaffe];
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix
index 42da24e32399..0e545fbfab9f 100644
--- a/pkgs/tools/graphics/nifskope/default.nix
+++ b/pkgs/tools/graphics/nifskope/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook }:
-stdenv.mkDerivation rec {
- name = "nifskope-${version}";
+stdenv.mkDerivation {
+ pname = "nifskope";
version = "2.0.dev7";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix
index bc1419070757..b831e359e9cc 100644
--- a/pkgs/tools/graphics/optar/default.nix
+++ b/pkgs/tools/graphics/optar/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, imagemagick, libpng }:
-stdenv.mkDerivation rec {
- name = "optar-${version}";
+stdenv.mkDerivation {
+ pname = "optar";
version = "20150210";
src = fetchurl {
diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix
index 058900b8e237..46eb61d1cf75 100644
--- a/pkgs/tools/graphics/pdf2svg/default.nix
+++ b/pkgs/tools/graphics/pdf2svg/default.nix
@@ -2,7 +2,7 @@
, cairo, gtk2, poppler }:
stdenv.mkDerivation rec {
- name = "pdf2svg-${version}";
+ pname = "pdf2svg";
version = "0.2.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/tools/graphics/pdftag/default.nix
index 8428480ca037..7e0229363188 100644
--- a/pkgs/tools/graphics/pdftag/default.nix
+++ b/pkgs/tools/graphics/pdftag/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "pdftag";
- name = "${pname}-${version}";
version = "1.0.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/tools/graphics/perceptualdiff/default.nix
index d394a816a49d..dc5acc9433f6 100644
--- a/pkgs/tools/graphics/perceptualdiff/default.nix
+++ b/pkgs/tools/graphics/perceptualdiff/default.nix
@@ -2,7 +2,6 @@
stdenv.mkDerivation rec {
pname = "perceptualdiff";
- name = "${pname}-${version}";
version = "2.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix
index 77edcd345780..08c5f308f5c1 100644
--- a/pkgs/tools/graphics/pfstools/default.nix
+++ b/pkgs/tools/graphics/pfstools/default.nix
@@ -4,12 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "pfstools";
version = "2.1.0";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${version}/${name}.tgz";
+ url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tgz";
sha256 = "04rlb705gmdiphcybf9dyr0d5lla2cfs3c308zz37x0vwi445six";
};
diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix
index c91c18e3f0b6..6ae45cc85331 100644
--- a/pkgs/tools/graphics/pgf/default.nix
+++ b/pkgs/tools/graphics/pgf/default.nix
@@ -6,7 +6,8 @@ let
version = "6.14.12";
in
stdenv.mkDerivation {
- name = "pgf-${version}";
+ pname = "pgf";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz";
@@ -18,6 +19,7 @@ stdenv.mkDerivation {
patchPhase = ''
sed 1i'#include ' -i src/PGF.cpp
sed s/__int64/int64_t/g -i src/PGF.cpp
+ rm include/FreeImage.h include/FreeImagePlus.h
'';
preConfigure = "dos2unix configure.ac; sh autogen.sh";
diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix
index 4e7d1e361f91..51be6afd102e 100644
--- a/pkgs/tools/graphics/pngquant/default.nix
+++ b/pkgs/tools/graphics/pngquant/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }:
stdenv.mkDerivation rec {
- name = "pngquant-${version}";
- version = "2.12.1";
+ pname = "pngquant";
+ version = "2.12.5";
src = fetchFromGitHub {
owner = "pornel";
repo = "pngquant";
rev = version;
- sha256 = "0jdvry3kvmmxcgwf5a3zbfz0idl6yl3700ag7pf8sk4lg4qp0llp";
+ sha256 = "0sq398iv5cacblz6pb4j2hn16cnszsbkahikdpfq84rb9bj0ya40";
fetchSubmodules = true;
};
diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix
index e4163cd93a87..ed8fa5ee5192 100644
--- a/pkgs/tools/graphics/pngtoico/default.nix
+++ b/pkgs/tools/graphics/pngtoico/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libpng }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "pngtoico-1.0";
src = fetchurl {
diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix
index dc9d9630ae5a..d2042540d713 100644
--- a/pkgs/tools/graphics/povray/default.nix
+++ b/pkgs/tools/graphics/povray/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "povray-${version}";
+ pname = "povray";
version = "3.7.0.8";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix
index 44444e6148ab..909f0e397268 100644
--- a/pkgs/tools/graphics/qrcode/default.nix
+++ b/pkgs/tools/graphics/qrcode/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "qrcode-git-${version}";
+stdenv.mkDerivation {
+ pname = "qrcode-git";
version = "20160804";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix
index c27eacaec8a2..97c400fbc9e3 100644
--- a/pkgs/tools/graphics/rocket/default.nix
+++ b/pkgs/tools/graphics/rocket/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qmake, qtbase }:
-stdenv.mkDerivation rec {
- name = "rocket-${version}";
+stdenv.mkDerivation {
+ pname = "rocket";
version = "2018-06-09";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix
index fd538eec573d..e7d3b8151a44 100644
--- a/pkgs/tools/graphics/s2png/default.nix
+++ b/pkgs/tools/graphics/s2png/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }:
stdenv.mkDerivation rec {
- name = "s2png-${version}";
+ pname = "s2png";
version = "0.7.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix
index 5dbbd20cd827..fd26869d298b 100644
--- a/pkgs/tools/graphics/scanbd/default.nix
+++ b/pkgs/tools/graphics/scanbd/default.nix
@@ -2,12 +2,12 @@
, dbus, libconfuse, libjpeg, sane-backends, systemd }:
stdenv.mkDerivation rec {
- name = "scanbd-${version}";
+ pname = "scanbd";
version = "1.5.1";
src = fetchurl {
sha256 = "0pvy4qirfjdfm8aj6x5rkbgl7hk3jfa2s21qkk8ic5dqfjjab75n";
- url = "mirror://sourceforge/scanbd/${name}.tgz";
+ url = "mirror://sourceforge/scanbd/${pname}-${version}.tgz";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix
index 182ab5806d7b..c7d2f49406b7 100644
--- a/pkgs/tools/graphics/sng/default.nix
+++ b/pkgs/tools/graphics/sng/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libpng, netpbm }:
stdenv.mkDerivation rec {
- name = "sng-${version}";
+ pname = "sng";
version = "1.1.0";
src = fetchurl {
diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix
index c1e6c2afecce..2c586cd3b1f6 100644
--- a/pkgs/tools/graphics/structure-synth/default.nix
+++ b/pkgs/tools/graphics/structure-synth/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
- name = "structure-synth-${version}";
+ pname = "structure-synth";
version = "v1.5";
src = fetchurl {
diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix
index 6e455caf9066..50aeae78fce8 100644
--- a/pkgs/tools/graphics/svgcleaner/default.nix
+++ b/pkgs/tools/graphics/svgcleaner/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "svgcleaner-${version}";
+ pname = "svgcleaner";
version = "0.9.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/swfdec/default.nix b/pkgs/tools/graphics/swfdec/default.nix
index 1c3c0f3b4515..8a64e25d879a 100644
--- a/pkgs/tools/graphics/swfdec/default.nix
+++ b/pkgs/tools/graphics/swfdec/default.nix
@@ -4,7 +4,6 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "swfdec";
version = "0.8.4";
diff --git a/pkgs/tools/graphics/syntex/default.nix b/pkgs/tools/graphics/syntex/default.nix
index 0862293830d5..693f116a6e80 100644
--- a/pkgs/tools/graphics/syntex/default.nix
+++ b/pkgs/tools/graphics/syntex/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, mono}:
stdenv.mkDerivation rec {
- name = "syntex-${version}";
+ pname = "syntex";
version = "0.0pre20160915";
src = fetchFromGitHub {
owner = "mxgmn";
diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix
index ceee3b7674d9..db204113226e 100644
--- a/pkgs/tools/graphics/transfig/default.nix
+++ b/pkgs/tools/graphics/transfig/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "transfig-3.2.4";
src = fetchurl {
url = ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz;
diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix
index 3769860d469b..42a86187a72d 100644
--- a/pkgs/tools/graphics/twilight/default.nix
+++ b/pkgs/tools/graphics/twilight/default.nix
@@ -4,7 +4,8 @@
let
version = "2018-04-19";
in stdenv.mkDerivation rec {
- name = "twilight-${version}";
+ pname = "twilight";
+ inherit version;
src = fetchFromGitHub {
owner = "tweakoz";
diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix
index b58114a61a5d..44a86e961ec8 100644
--- a/pkgs/tools/graphics/unpaper/default.nix
+++ b/pkgs/tools/graphics/unpaper/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libav, libxslt }:
stdenv.mkDerivation rec {
- name = "unpaper-${version}";
+ pname = "unpaper";
version = "6.1";
src = fetchurl {
- url = "https://www.flameeyes.eu/files/${name}.tar.xz";
+ url = "https://www.flameeyes.eu/files/${pname}-${version}.tar.xz";
sha256 = "0c5rbkxbmy9k8vxjh4cv0bgnqd3wqc99yzw215vkyjslvbsq8z13";
};
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index db06c2a1588a..ad352c04ad91 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -9,7 +9,7 @@
}:
stdenv.mkDerivation rec {
- name = "vips-${version}";
+ pname = "vips";
version = "8.8.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
index 320b4eed14c3..5851e4a2d46a 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -2,14 +2,14 @@
glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
stdenv.mkDerivation rec {
- name = "vulkan-tools-${version}";
- version = "1.1.106.0";
+ pname = "vulkan-tools";
+ version = "1.1.114.0";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Tools";
rev = "sdk-${version}";
- sha256 = "0swqyk16mbkivyk79dpqbhpw05a7yrakqynywznr5zgqbc0z4gj8";
+ sha256 = "1d4fcy11gk21x7r7vywdcc1dy9j1d2j78hvd5vfh3vy9fnahx107";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix
index 56fd53502444..1b578628cafa 100644
--- a/pkgs/tools/graphics/wallutils/default.nix
+++ b/pkgs/tools/graphics/wallutils/default.nix
@@ -1,19 +1,19 @@
{ buildGoModule, fetchFromGitHub, lib
-, wayland, libX11, xbitmaps, libXcursor, libXmu
+, wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm
}:
buildGoModule rec {
- name = "wallutils-${version}";
- version = "5.8.1";
+ pname = "wallutils";
+ version = "5.8.2";
src = fetchFromGitHub {
owner = "xyproto";
repo = "wallutils";
rev = version;
- sha256 = "095pgvk4yp2l6xgl63qp61rr2dij51awndwrs5ha9vpdd1jqgvfi";
+ sha256 = "1ghvcxsy5prj8l38r4lg39imsqbwmvn1zmiv7004j6skmgpaaawh";
};
- modSha256 = "1kbggry1qrf0nkvysnaky2nl73l5f0bnc4wx0hfr6ifyagfjzy77";
+ modSha256 = "0siw1g3fsk1xjri9k1pb03filax8an5sfza5db52krh80g9xasah";
patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ];
@@ -22,7 +22,7 @@ buildGoModule rec {
sed -iE 's/VersionString = "[0-9].[0-9].[0-9]"/VersionString = "${version}"/' wallutils.go
'';
- buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu ];
+ buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm ];
meta = with lib; {
description = "Utilities for handling monitors, resolutions, and (timed) wallpapers";
diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/tools/graphics/wavefunctioncollapse/default.nix
index 20d07e52f6c7..65fe38937dfb 100644
--- a/pkgs/tools/graphics/wavefunctioncollapse/default.nix
+++ b/pkgs/tools/graphics/wavefunctioncollapse/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, mono}:
stdenv.mkDerivation rec {
- name = "wavefunctioncollapse-${version}";
+ pname = "wavefunctioncollapse";
version = "0.0pre20170130";
src = fetchFromGitHub {
owner = "mxgmn";
diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix
index 2882ae960de1..be4ba53319ae 100644
--- a/pkgs/tools/graphics/welkin/default.nix
+++ b/pkgs/tools/graphics/welkin/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchsvn, jre, makeWrapper }:
stdenv.mkDerivation rec {
- name = "welkin-${version}";
+ pname = "welkin";
version = "1.1";
src = fetchsvn {
diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix
index ebd8953853c9..2aa6abcccfc4 100644
--- a/pkgs/tools/graphics/wkhtmltopdf/default.nix
+++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix
@@ -4,7 +4,7 @@
mkDerivation rec {
version = "0.12.5";
- name = "wkhtmltopdf-${version}";
+ pname = "wkhtmltopdf";
src = fetchFromGitHub {
owner = "wkhtmltopdf";
diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix
index 7321128a6b5a..6dd0b2068784 100644
--- a/pkgs/tools/graphics/yafaray-core/default.nix
+++ b/pkgs/tools/graphics/yafaray-core/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
- name = "yafaray-core-${version}";
+ pname = "yafaray-core";
version = "3.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/tools/graphics/yaxg/default.nix
index 8fbc09a6d82b..094ec2d5bc49 100644
--- a/pkgs/tools/graphics/yaxg/default.nix
+++ b/pkgs/tools/graphics/yaxg/default.nix
@@ -2,7 +2,7 @@
maim, slop, ffmpeg, byzanz, libnotify, xdpyinfo }:
stdenv.mkDerivation rec {
- name = "yaxg-${version}";
+ pname = "yaxg";
version = "unstable-2018-05-03";
src = fetchFromGitHub {
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index 503461018abb..cb5ea25211cd 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -1,15 +1,28 @@
-{ stdenv, fetchFromGitHub, imagemagickBig, pkgconfig, python2Packages, perl
-, libX11, libv4l, qt5, gtk2, xmlto, docbook_xsl, autoreconfHook, dbus
-, enableVideo ? stdenv.isLinux, enableDbus ? stdenv.isLinux
+{ stdenv
+, lib
+, fetchFromGitHub
+, imagemagickBig
+, pkgconfig
+, libX11
+, libv4l
+, qtbase
+, qtx11extras
+, wrapQtAppsHook
+, gtk3
+, xmlto
+, docbook_xsl
+, autoreconfHook
+, dbus
+, enableVideo ? stdenv.isLinux
+, enableDbus ? stdenv.isLinux
}:
-with stdenv.lib;
-let
- inherit (python2Packages) pygtk python;
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "zbar";
version = "0.23";
+ outputs = [ "out" "lib" "dev" "doc" "man" ];
+
src = fetchFromGitHub {
owner = "mchehab";
repo = "zbar";
@@ -17,27 +30,49 @@ in stdenv.mkDerivation rec {
sha256 = "0hlxakpyjg4q9hp7yp3har1n78341b4knwyll28hn48vykg28pza";
};
- nativeBuildInputs = [ pkgconfig xmlto autoreconfHook docbook_xsl ];
+ nativeBuildInputs = [
+ pkgconfig
+ xmlto
+ autoreconfHook
+ docbook_xsl
+ wrapQtAppsHook
+ ];
buildInputs = [
- imagemagickBig python pygtk perl libX11
- ] ++ optional enableDbus dbus
- ++ optionals enableVideo [
- libv4l gtk2 qt5.qtbase qt5.qtx11extras
+ imagemagickBig
+ libX11
+ ] ++ lib.optionals enableDbus [
+ dbus
+ ] ++ lib.optionals enableVideo [
+ libv4l
+ gtk3
+ qtbase
+ qtx11extras
];
- configureFlags = (if enableDbus then [
- "--with-dbusconfdir=$out/etc/dbus-1/system.d"
- ] else [ "--without-dbus" ])
- ++ optionals (!enableVideo) [
- "--disable-video" "--without-gtk" "--without-qt"
- ];
+ configureFlags = [
+ "--without-python"
+ ] ++ (if enableDbus then [
+ "--with-dbusconfdir=${placeholder "out"}/etc"
+ ] else [
+ "--without-dbus"
+ ]) ++ (if enableVideo then [
+ "--with-gtk=gtk3"
+ ] else [
+ "--disable-video"
+ "--without-gtk"
+ "--without-qt"
+ ]);
- postInstall = optionalString enableDbus ''
- install -Dm644 dbus/org.linuxtv.Zbar.conf $out/etc/dbus-1/system.d/org.linuxtv.Zbar.conf
+ dontWrapQtApps = true;
+ dontWrapGApps = true;
+
+ postFixup = lib.optionalString enableVideo ''
+ wrapProgram "$out/bin/zbarcam-gtk" "''${gappsWrapperArgs[@]}"
+ wrapQtApp "$out/bin/zbarcam-qt"
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Bar code reader";
longDescription = ''
ZBar is an open source software suite for reading bar codes from various
diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix
index 3efb68e60d2b..97bbeb4d2d43 100644
--- a/pkgs/tools/graphics/zxing/default.nix
+++ b/pkgs/tools/graphics/zxing/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, jre }:
stdenv.mkDerivation rec {
- name = "zxing-${version}";
+ pname = "zxing";
version = "3.1.0";
# Maven builds are hard to get right
core_jar = fetchurl {
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
index a3f12d648d55..d1e7f85f75f3 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, fcitx, anthy, gettext, pkgconfig }:
stdenv.mkDerivation rec {
- name = "fcitx-anthy-${version}";
+ pname = "fcitx-anthy";
version = "0.2.3";
src = fetchurl {
- url = "http://download.fcitx-im.org/fcitx-anthy/${name}.tar.xz";
+ url = "http://download.fcitx-im.org/fcitx-anthy/${pname}-${version}.tar.xz";
sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd";
};
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
index e2d58c564989..d9b202f7ef15 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, fcitx, gettext, libchewing, pkgconfig }:
stdenv.mkDerivation rec {
- name = "fcitx-chewing-${version}";
+ pname = "fcitx-chewing";
version = "0.2.3";
src = fetchurl {
- url = "http://download.fcitx-im.org/fcitx-chewing/${name}.tar.xz";
+ url = "http://download.fcitx-im.org/fcitx-chewing/${pname}-${version}.tar.xz";
sha256 = "1w5smp5zvjx681cp1znjypyr9sw5x6v0wnsk8a7ncwxi9q9wf4xk";
};
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
index f7bb7126bef0..4c0a7f0b4109 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, curl }:
stdenv.mkDerivation rec {
- name = "fcitx-cloudpinyin-${version}";
+ pname = "fcitx-cloudpinyin";
version = "0.3.6";
src = fetchurl {
- url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${name}.tar.xz";
+ url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${pname}-${version}.tar.xz";
sha256 = "1f3ryx817bxb8g942l50ng4xg0gp50rb7pv2p6zf98r2z804dcvf";
};
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
index 32c9ecff9bd8..c9a40b84a6d9 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, fcitx, libhangul, gettext, pkgconfig }:
stdenv.mkDerivation rec {
- name = "fcitx-hangul-${version}";
+ pname = "fcitx-hangul";
version = "0.3.1";
src = fetchurl {
- url = "http://download.fcitx-im.org/fcitx-hangul/${name}.tar.xz";
+ url = "http://download.fcitx-im.org/fcitx-hangul/${pname}-${version}.tar.xz";
sha256 = "0ds4071ljq620w7vnprm2jl8zqqkw7qsxvzbjapqak4jarczvmbd";
};
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
index 5b55e0f04785..9e0ef551d82c 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }:
stdenv.mkDerivation rec {
- name = "fcitx-libpinyin-${version}";
+ pname = "fcitx-libpinyin";
version = "0.5.3";
src = fetchurl {
- url = "http://download.fcitx-im.org/fcitx-libpinyin/${name}.tar.xz";
+ url = "http://download.fcitx-im.org/fcitx-libpinyin/${pname}-${version}.tar.xz";
sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6";
};
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
index 292d2dbb57f5..8b25b2846ff5 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, fcitx, gettext, m17n_lib, m17n_db, pkgconfig }:
stdenv.mkDerivation rec {
- name = "fcitx-m17n-${version}";
+ pname = "fcitx-m17n";
version = "0.2.4";
src = fetchurl {
- url = "http://download.fcitx-im.org/fcitx-m17n/${name}.tar.xz";
+ url = "http://download.fcitx-im.org/fcitx-m17n/${pname}-${version}.tar.xz";
sha256 = "15s52h979xz967f8lm0r0qkplig2w3wjck1ymndbg9kvj25ib0ng";
};
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
index d74c7608bc90..9f062036438f 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
@@ -39,6 +39,11 @@ in clangStdenv.mkDerivation rec {
url = "https://download.fcitx-im.org/fcitx-mozc/${name}";
sha256 = "1f9m4310kz09v5qvnv75ka2vq63m7by023qrkpddgq4dv7gxx3ca";
})
+ # https://github.com/google/mozc/pull/444 - fix for gcc8 STL
+ (fetchpatch {
+ url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch";
+ sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla";
+ })
];
postPatch = ''
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
index 2bd4bf1c878c..095be7469cd8 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }:
stdenv.mkDerivation rec {
- name = "fcitx-rime-${version}";
+ pname = "fcitx-rime";
version = "0.3.2";
src = fetchurl {
- url = "https://download.fcitx-im.org/fcitx-rime/${name}.tar.xz";
+ url = "https://download.fcitx-im.org/fcitx-rime/${pname}-${version}.tar.xz";
sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr";
};
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
index c2e8837f5d13..187587fbfb49 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }:
-stdenv.mkDerivation rec {
- name = "fcitx-skk-${version}";
+stdenv.mkDerivation {
+ pname = "fcitx-skk";
version = "0.1.4";
src = fetchFromGitHub {
owner = "fcitx";
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
index 918edf0240a5..833e417ae913 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, fcitx, gettext }:
stdenv.mkDerivation rec {
- name = "fcitx-table-extra-${version}";
+ pname = "fcitx-table-extra";
version = "0.3.8";
src = fetchurl {
- url = "http://download.fcitx-im.org/fcitx-table-extra/${name}.tar.xz";
+ url = "http://download.fcitx-im.org/fcitx-table-extra/${pname}-${version}.tar.xz";
sha256 = "c91bb19c1a7b53c5339bf2f75ae83839020d337990f237a8b9bc0f4416c120ef";
};
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
index 929cdb30b919..ffee83875a17 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, fcitx, gettext }:
stdenv.mkDerivation rec {
- name = "fcitx-table-other-${version}";
+ pname = "fcitx-table-other";
version = "0.2.4";
src = fetchurl {
- url = "http://download.fcitx-im.org/fcitx-table-other/${name}.tar.xz";
+ url = "http://download.fcitx-im.org/fcitx-table-other/${pname}-${version}.tar.xz";
sha256 = "1di60lr6l5k2sdwi3yrc0hl89j2k0yipayrsn803vd040w1fgfhq";
};
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
index ddfa41dda318..1deff93e2016 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, fcitx, gettext, pkgconfig }:
stdenv.mkDerivation rec {
- name = "fcitx-unikey-${version}";
+ pname = "fcitx-unikey";
version = "0.2.5";
src = fetchurl {
- url = "http://download.fcitx-im.org/fcitx-unikey/${name}.tar.xz";
+ url = "http://download.fcitx-im.org/fcitx-unikey/${pname}-${version}.tar.xz";
sha256 = "063vc29v7ycaai98v3z4q319sv9sm91my17pmhblw1vifxnw02wf";
};
diff --git a/pkgs/tools/inputmethods/fcitx/find-enchant-lib.patch b/pkgs/tools/inputmethods/fcitx/find-enchant-lib.patch
new file mode 100644
index 000000000000..90c9c79aa73d
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx/find-enchant-lib.patch
@@ -0,0 +1,42 @@
+diff --git a/cmake/FindEnchant.cmake b/cmake/FindEnchant.cmake
+index 7c182e6a..5537595e 100644
+--- a/cmake/FindEnchant.cmake
++++ b/cmake/FindEnchant.cmake
+@@ -16,7 +16,7 @@ if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+ endif(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+
+ find_package(PkgConfig)
+-pkg_check_modules(PC_ENCHANT enchant)
++pkg_check_modules(PC_ENCHANT enchant-2)
+
+ find_path(ENCHANT_INCLUDE_DIR
+ NAMES enchant.h
+@@ -24,7 +24,7 @@ find_path(ENCHANT_INCLUDE_DIR
+ PATH_SUFFIXES "enchant")
+
+ find_library(ENCHANT_LIBRARIES
+- NAMES enchant
++ NAMES enchant-2
+ HINTS ${PC_ENCHANT_LIBRARY_DIRS})
+
+ if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+@@ -39,7 +39,7 @@ if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+ #include
+ #include
+ #include
+- #include
++ #include
+
+ EnchantBroker *enchant_broker_init();
+ char **enchant_dict_suggest(EnchantDict *dict, const char *str,
+@@ -78,6 +78,10 @@ if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BACKUP}")
+ endif()
+
++if(ENCHANT_API_COMPATIBLE)
++ set(ENCHANT_LIBRARY_FILENAME ${ENCHANT_LIBRARIES})
++endif(ENCHANT_API_COMPATIBLE)
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Enchant DEFAULT_MSG ENCHANT_LIBRARIES
+ ENCHANT_INCLUDE_DIR ENCHANT_API_COMPATIBLE)
diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
index b32368c93d3c..636cb518fd23 100644
--- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix
+++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, cmake, intltool, gettext
-, libxml2, enchant1, isocodes, icu, libpthreadstubs
+, libxml2, enchant2, isocodes, icu, libpthreadstubs
, pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon
, dbus, gtk2, gtk3, qt4, extra-cmake-modules
, xkeyboard_config, pcre, libuuid
@@ -36,7 +36,7 @@ let
};
in
stdenv.mkDerivation rec {
- name = "fcitx-${version}";
+ pname = "fcitx";
version = "4.2.9.6";
src = fetchFromGitLab {
@@ -59,6 +59,8 @@ stdenv.mkDerivation rec {
''
;
+ patches = [ ./find-enchant-lib.patch ];
+
postPatch = ''
substituteInPlace src/frontend/qt/CMakeLists.txt \
--replace $\{QT_PLUGINS_DIR} $out/lib/qt4/plugins
@@ -69,7 +71,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig pcre ];
buildInputs = [
- xkeyboard_config enchant1 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile
+ xkeyboard_config enchant2 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile
libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4 libuuid
];
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 77ec251ec881..d2f68fd5269e 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "ibus-anthy-${version}";
+ pname = "ibus-anthy";
version = "1.5.11";
meta = with stdenv.lib; {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
'';
src = fetchurl {
- url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz";
+ url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "1zwgswpibh67sgbza8kvg03v06maxc08ihkgm5hmh333sjq9d5c0";
};
}
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index daebceaf8876..0a38ccfa3bd8 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -1,28 +1,54 @@
-{ stdenv, fetchurl, intltool, pkgconfig
-, gtk3, ibus, libhangul, python3
+{ stdenv
+, fetchurl
+, substituteAll
+, intltool
+, pkgconfig
+, wrapGAppsHook
+, gtk3
+, ibus
+, libhangul
+, python3
}:
stdenv.mkDerivation rec {
- name = "ibus-hangul-${version}";
+ pname = "ibus-hangul";
version = "1.5.1";
src = fetchurl {
- url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz";
+ url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs";
};
- buildInputs = [ gtk3 ibus libhangul python3 ];
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ libhangul = "${libhangul}/lib/libhangul.so.1";
+ })
+ ];
- nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ];
+ nativeBuildInputs = [
+ intltool
+ pkgconfig
+ python3.pkgs.wrapPython
+ wrapGAppsHook
+ ];
- postFixup = "wrapPythonPrograms";
+ buildInputs = [
+ gtk3
+ ibus
+ libhangul
+ (python3.withPackages (pypkgs: with pypkgs; [
+ pygobject3
+ (toPythonModule ibus)
+ ]))
+ ];
meta = with stdenv.lib; {
isIbusEngine = true;
- description = "Ibus Hangul engine";
- homepage = https://github.com/choehwanjin/ibus-hangul;
- license = licenses.gpl2;
- platforms = platforms.linux;
- maintainers = with maintainers; [ ericsagnes ];
+ description = "Ibus Hangul engine";
+ homepage = https://github.com/choehwanjin/ibus-hangul;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ ericsagnes ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch
new file mode 100644
index 000000000000..7487d074d559
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/fix-paths.patch
@@ -0,0 +1,13 @@
+diff --git a/setup/main.py b/setup/main.py
+index 8d581cd..2ac47b9 100644
+--- a/setup/main.py
++++ b/setup/main.py
+@@ -37,7 +37,7 @@
+
+ def get_hangul_keyboard_list():
+ from ctypes import CDLL, c_int, c_char_p
+- libhangul = CDLL('libhangul.so.1')
++ libhangul = CDLL('@libhangul@')
+ libhangul.hangul_ic_get_n_keyboards.argtypes = []
+ libhangul.hangul_ic_get_n_keyboards.restype = c_int
+ libhangul.hangul_ic_get_keyboard_id.argtypes = [c_int]
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
index 19d862e03085..589ddd09144f 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
@@ -7,10 +7,9 @@
stdenv.mkDerivation rec {
pname = "ibus-kkc";
version = "1.5.22";
- name = "${pname}-${version}";
src = fetchurl {
- url = "${meta.homepage}/releases/download/v${version}/${name}.tar.gz";
+ url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "1kj74c9zy9yxkjx7pz96mzqc13cf10yfmlgprr8sfd4ay192bzi2";
};
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
index 3bdb69391cc4..fc4677e06b06 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "ibus-libpinyin-${version}";
+ pname = "ibus-libpinyin";
version = "1.10.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index a0d50cf94790..01b227f6f1b4 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "ibus-m17n-${version}";
+ pname = "ibus-m17n";
version = "1.4.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
index 5699a7931dbc..a33eb277926c 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
@@ -1,5 +1,5 @@
-{ clangStdenv, fetchFromGitHub, which, ninja, python, gyp, pkgconfig, protobuf
-, ibus, gtk2, zinnia, qt5, libxcb }:
+{ clangStdenv, fetchFromGitHub, fetchpatch, which, ninja, python, gyp, pkgconfig
+, protobuf, ibus, gtk2, zinnia, qt5, libxcb }:
let
japanese_usage_dictionary = fetchFromGitHub {
@@ -31,6 +31,14 @@ in clangStdenv.mkDerivation rec {
sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx";
};
+ patches = [
+ # https://github.com/google/mozc/pull/444 - fix for gcc8 STL
+ (fetchpatch {
+ url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch";
+ sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla";
+ })
+ ];
+
postUnpack = ''
rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/
ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
index 368de091777e..b77394f218b8 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
@@ -13,8 +13,8 @@ let
rev = "7d5297759aef4cd086bdfa30cf6d4b2ad9446992";
sha256 = "0mx9jvxpiva9v2ffaqlyny48iqr073h84yw8ln43z2avv11ipr7n";
};
-in stdenv.mkDerivation rec {
- name = "ibus-table-chinese-${version}";
+in stdenv.mkDerivation {
+ pname = "ibus-table-chinese";
version = "1.8.2";
srcs = [ src cmakeFedoraSrc ];
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
index ff01c8419260..5e839b354a34 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ibus, ibus-table, pkgconfig, python3 }:
stdenv.mkDerivation rec {
- name = "ibus-table-others-${version}";
+ pname = "ibus-table-others";
version = "1.3.9";
src = fetchurl {
- url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${name}.tar.gz";
+ url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "0270a9njyzb1f8nw5w9ghwxcl3m6f13d8p8a01fjm8rnjs04mcb3";
};
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
index e31d1ddfaa80..107c8c60271e 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "ibus-uniemoji-${version}";
+ pname = "ibus-uniemoji";
version = "0.6.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 07fa8d2beb56..a6c2404ef347 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -40,7 +40,7 @@ let
'';
};
cldrEmojiAnnotation = stdenv.mkDerivation rec {
- name = "cldr-emoji-annotation-${version}";
+ pname = "cldr-emoji-annotation";
version = "31.90.0_1";
src = fetchFromGitHub {
owner = "fujiwarat";
@@ -60,7 +60,7 @@ let
sha256 = "a1a3ca4381eb91f7b65afe7cb7df615cdcf67993fef4b486585f66b349993a10";
};
};
- ucd = stdenv.mkDerivation rec {
+ ucd = stdenv.mkDerivation {
name = "ucd-12.0.0";
dontUnpack = true;
installPhase = ''
@@ -80,7 +80,7 @@ let
in
stdenv.mkDerivation rec {
- name = "ibus-${version}";
+ pname = "ibus";
version = "1.5.20";
src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/pkgs/tools/inputmethods/ibus/ibus-qt.nix
index 8d02d4edde8e..85fccc46de08 100644
--- a/pkgs/tools/inputmethods/ibus/ibus-qt.nix
+++ b/pkgs/tools/inputmethods/ibus/ibus-qt.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ibus, cmake, pkgconfig, qt4, icu, doxygen }:
stdenv.mkDerivation rec {
- name = "ibus-qt-${version}";
+ pname = "ibus-qt";
version = "1.3.3";
src = fetchurl {
- url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${name}-Source.tar.gz";
+ url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${pname}-${version}-Source.tar.gz";
sha256 = "1q9g7qghpcf07valc2ni7yf994xqx2pmdffknj7scxfidav6p19g";
};
diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix
index bb179e18e078..a2f01c7367c8 100644
--- a/pkgs/tools/inputmethods/keyfuzz/default.nix
+++ b/pkgs/tools/inputmethods/keyfuzz/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
- name = "keyfuzz-${version}";
+stdenv.mkDerivation {
+ pname = "keyfuzz";
version = "0.2";
meta = with stdenv.lib; {
diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix
index 75670dfe9dfb..f4b2f7e94e74 100644
--- a/pkgs/tools/inputmethods/libinput-gestures/default.nix
+++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix
@@ -6,7 +6,6 @@
stdenv.mkDerivation rec {
pname = "libinput-gestures";
version = "2.39";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "bulletmark";
diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix
index 33de43b6f5e5..68889d45df04 100644
--- a/pkgs/tools/inputmethods/libkkc/default.nix
+++ b/pkgs/tools/inputmethods/libkkc/default.nix
@@ -7,10 +7,9 @@
stdenv.mkDerivation rec {
pname = "libkkc";
version = "0.3.5";
- name = "${pname}-${version}";
src = fetchurl {
- url = "${meta.homepage}/releases/download/v${version}/${name}.tar.gz";
+ url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "89b07b042dae5726d306aaa1296d1695cb75c4516f4b4879bc3781fe52f62aef";
};
diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
index cecacd4af954..2f8425bd8b54 100644
--- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
+++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
@@ -27,8 +27,8 @@ let
};
in
-stdenv.mkDerivation rec {
- name = "skk-dicts-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "skk-dicts-unstable";
version = "2017-10-26";
srcs = [ small medium large edict assoc ];
nativeBuildInputs = [ skktools ];
diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix
index 8661da66b92a..19d871bc77fc 100644
--- a/pkgs/tools/inputmethods/skk/skktools/default.nix
+++ b/pkgs/tools/inputmethods/skk/skktools/default.nix
@@ -8,8 +8,8 @@
# dependencies on a Ruby interpreter etc.
# - We for the moment do not package them to keep the dependencies slim.
# Probably, shall package the newer tools as skktools-extra in the future.
-stdenv.mkDerivation rec {
- name = "skktools-${version}";
+stdenv.mkDerivation {
+ pname = "skktools";
version = "1.3.3";
src = fetchFromGitHub {
owner = "skk-dev";
diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
index 55cf09455823..afacc302eda1 100644
--- a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
+++ b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip }:
-stdenv.mkDerivation rec {
- name = "tegaki-zinnia-japanese-${version}";
+stdenv.mkDerivation {
+ pname = "tegaki-zinnia-japanese";
version = "0.3";
src = fetchurl {
diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix
index 82dd387f536d..ff14a13da04f 100644
--- a/pkgs/tools/inputmethods/touchegg/default.nix
+++ b/pkgs/tools/inputmethods/touchegg/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, xorg, xorgserver, qt4, libGLU_combined, geis, qmake4Hook }:
stdenv.mkDerivation rec {
- name = "touchegg-${version}";
+ pname = "touchegg";
version = "1.1.1";
src = fetchurl {
- url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${name}.tar.gz";
+ url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${pname}-${version}.tar.gz";
sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038";
};
diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/tools/inputmethods/triggerhappy/default.nix
index ec8ac8845597..a9e106f2c720 100644
--- a/pkgs/tools/inputmethods/triggerhappy/default.nix
+++ b/pkgs/tools/inputmethods/triggerhappy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, perl, systemd }:
stdenv.mkDerivation rec {
- name = "triggerhappy-${version}";
+ pname = "triggerhappy";
version = "0.5.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 984eecf9e9d5..7fe00bd4dfce 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -39,7 +39,7 @@ assert withMisc -> libeb != null;
stdenv.mkDerivation rec {
version = "1.8.8";
- name = "uim-${version}";
+ pname = "uim";
src = fetchFromGitHub {
owner = "uim";
diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix
index 60f3a0feb55b..b23e0c369a62 100644
--- a/pkgs/tools/inputmethods/zinnia/default.nix
+++ b/pkgs/tools/inputmethods/zinnia/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "zinnia-${version}";
+stdenv.mkDerivation {
+ pname = "zinnia";
version = "2016-08-28";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix
index ad129503de33..d78846922c6e 100644
--- a/pkgs/tools/misc/0x0/default.nix
+++ b/pkgs/tools/misc/0x0/default.nix
@@ -1,7 +1,7 @@
{ stdenv, xsel, curl, fetchFromGitLab, makeWrapper}:
-stdenv.mkDerivation rec {
- name = "0x0-${version}";
+stdenv.mkDerivation {
+ pname = "0x0";
version = "2018-06-24";
src = fetchFromGitLab {
diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
index 3c529f31f66e..75d8d71b8952 100644
--- a/pkgs/tools/misc/aescrypt/default.nix
+++ b/pkgs/tools/misc/aescrypt/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "3.14";
- name = "aescrypt-${version}";
+ pname = "aescrypt";
src = fetchurl {
- url = "https://www.aescrypt.com/download/v3/linux/${name}.tgz";
+ url = "https://www.aescrypt.com/download/v3/linux/${pname}-${version}.tgz";
sha256 = "1iziymcbpc64d44djgqfifpblsly4sr5bxsp5g29jgxz552kjlah";
};
diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix
index 8ee363ed91dc..7b869d66d1c3 100644
--- a/pkgs/tools/misc/alarm-clock-applet/default.nix
+++ b/pkgs/tools/misc/alarm-clock-applet/default.nix
@@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
version = "0.3.4";
- name = "alarm-clock-applet-${version}";
+ pname = "alarm-clock-applet";
src = fetchFromGitHub {
owner = "joh";
diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix
index 62d46bba5b0d..ad86bdef80af 100644
--- a/pkgs/tools/misc/antimicro/default.nix
+++ b/pkgs/tools/misc/antimicro/default.nix
@@ -1,13 +1,13 @@
{ mkDerivation, lib, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }:
mkDerivation rec {
- name = "antimicro-${version}";
+ pname = "antimicro";
version = "2.23";
src = fetchFromGitHub {
owner = "AntiMicro";
repo = "antimicro";
- rev = "${version}";
+ rev = version;
sha256 = "1q40ayxwwyq85lc89cnj1cm2nar625h4vhh8dvmb2qcxczaggf4v";
};
diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
index 2dac9bd60c93..55cfa09aa24f 100644
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -22,7 +22,8 @@ let
in
buildGoPackage {
- name = "aptly-${version}";
+ pname = "aptly";
+ inherit version;
src = aptlySrc;
diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix
index 6b1512e854b0..c16e4aded0d0 100644
--- a/pkgs/tools/misc/argtable/default.nix
+++ b/pkgs/tools/misc/argtable/default.nix
@@ -1,8 +1,8 @@
{ stdenv
, fetchgit
}:
-stdenv.mkDerivation rec {
- name = "argtable-${version}";
+stdenv.mkDerivation {
+ pname = "argtable";
version = "3.0.1";
src = fetchgit {
diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix
index dc51d04e4b5e..4f50e0f556b6 100644
--- a/pkgs/tools/misc/arp-scan/default.nix
+++ b/pkgs/tools/misc/arp-scan/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, libpcap, makeWrapper, perlPackages }:
stdenv.mkDerivation rec {
- name = "arp-scan-${version}";
+ pname = "arp-scan";
version = "1.9.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix
index 859112d29bc2..b58f603ce594 100644
--- a/pkgs/tools/misc/aspcud/default.nix
+++ b/pkgs/tools/misc/aspcud/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "1.9.4";
- name = "aspcud-${version}";
+ pname = "aspcud";
src = fetchzip {
url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz";
diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix
index ca4dde7a450c..8294e92d13f3 100644
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/pkgs/tools/misc/autojump/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python, bash }:
stdenv.mkDerivation rec {
- name = "autojump-${version}";
+ pname = "autojump";
version = "22.5.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/tools/misc/automirror/default.nix
index 3fd520513570..3bfb2d656d90 100644
--- a/pkgs/tools/misc/automirror/default.nix
+++ b/pkgs/tools/misc/automirror/default.nix
@@ -1,7 +1,6 @@
{stdenv, fetchFromGitHub, git, ronn}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "automirror";
version = "49";
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index 3b3a96e8b6e1..25765589beec 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -9,7 +9,8 @@ let
version = "1.8.1";
in
stdenv.mkDerivation {
- name = "autorandr-${version}";
+ pname = "autorandr";
+ inherit version;
buildInputs = [ python ];
@@ -47,7 +48,7 @@ in
src = fetchFromGitHub {
owner = "phillipberndt";
repo = "autorandr";
- rev = "${version}";
+ rev = version;
sha256 = "1bp1cqkrpg77rjyh4lq1agc719fmxn92jkiicf6nbhfl8kf3l3vy";
};
diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix
index 75c7b258a449..ee07221b7559 100644
--- a/pkgs/tools/misc/autorevision/default.nix
+++ b/pkgs/tools/misc/autorevision/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "autorevision-${version}";
+ pname = "autorevision";
version = "1.21";
src = fetchurl {
diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix
index 5ead0e1020cb..6f2afc888e84 100644
--- a/pkgs/tools/misc/azure-vhd-utils/default.nix
+++ b/pkgs/tools/misc/azure-vhd-utils/default.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "azure-vhd-utils-${version}";
+ pname = "azure-vhd-utils";
version = "20160614-${stdenv.lib.strings.substring 0 7 rev}";
rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8";
diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
index 4f90c0f03e9a..3b5e72c89f7f 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/pkgs/tools/misc/bandwidth/default.nix
@@ -10,11 +10,11 @@ let
else throw "Unknown architecture";
in
stdenv.mkDerivation rec {
- name = "bandwidth-${version}";
+ pname = "bandwidth";
version = "1.5.1";
src = fetchurl {
- url = "https://zsmith.co/archives/${name}.tar.gz";
+ url = "https://zsmith.co/archives/${pname}-${version}.tar.gz";
sha256 = "1v9k1a2ilkbhc3viyacgq88c9if60kwsd1fy6rn84317qap4i7ib";
};
diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix
index 79f72746f905..14ab790d9c76 100644
--- a/pkgs/tools/misc/bashplotlib/default.nix
+++ b/pkgs/tools/misc/bashplotlib/default.nix
@@ -1,6 +1,6 @@
{ stdenv, python3Packages, fetchFromGitHub }:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "bashplotlib";
version = "2019-01-02";
diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 205bc196811b..449be0f017f6 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib
+{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig, zlib
, Security, libiconv
}:
rustPlatform.buildRustPackage rec {
pname = "bat";
- version = "0.11.0";
+ version = "0.12.1";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
- sha256 = "0yyvlplskjvxb2cspqsvfsnahd5m0s83psrp777ng0wc0kr1adbw";
+ sha256 = "1cpa8dal4c27pnbmmrar4vqzcl4h0zf8x1zx1dlf0riavdg9n56y";
fetchSubmodules = true;
};
- cargoSha256 = "078n31c0isvxvna0s1m12xv4bkh15rb2nixfyg4c501mlkalb517";
+ cargoSha256 = "0d7h0kn41w6wm4w63vjy2i7r19jkansfvfjn7vgh2gqh5m60kal2";
- nativeBuildInputs = [ cmake pkgconfig zlib ];
+ nativeBuildInputs = [ pkgconfig llvmPackages.libclang zlib ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];
+ LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
+
postInstall = ''
install -m 444 -Dt $out/share/man/man1 doc/bat.1
install -m 444 -Dt $out/share/fish/vendor_completions.d assets/completions/bat.fish
diff --git a/pkgs/tools/misc/bbe/default.nix b/pkgs/tools/misc/bbe/default.nix
index ecff2459ef26..b0af13160d21 100644
--- a/pkgs/tools/misc/bbe/default.nix
+++ b/pkgs/tools/misc/bbe/default.nix
@@ -1,6 +1,6 @@
{ stdenv , fetchurl, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "bbe-${version}";
+ pname = "bbe";
version = "0.2.2";
src = fetchurl {
diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix
index 1c681d4986d7..4a440e133feb 100644
--- a/pkgs/tools/misc/bcunit/default.nix
+++ b/pkgs/tools/misc/bcunit/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
buildInputs = [cmake];
src = fetchFromGitHub {
owner = "BelledonneCommunications";
- repo = "${baseName}";
- rev = "${version}";
+ repo = baseName;
+ rev = version;
sha256 = "063yl7kxkix76r49qrj0h1qpz2p538d1yw8aih0x4i47g35k00y7";
};
diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index af9ad77bddad..2f326a1d6ac7 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bdf2psf";
- version = "1.192";
+ version = "1.193";
src = fetchurl {
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
- sha256 = "0yjylbj88p2a7qi1wicicl1ivrhp52pnzy44mc1yg6l3n7zifcwn";
+ sha256 = "1mykng02fyxshm02kywrk16f27b1jhgn9zcaxcvxd255sn58w68k";
};
buildInputs = [ dpkg ];
diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix
index 89d684614314..c0339834b649 100644
--- a/pkgs/tools/misc/bibtex2html/default.nix
+++ b/pkgs/tools/misc/bibtex2html/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ocaml }:
-stdenv.mkDerivation rec {
- name = "bibtex2html-${version}";
+stdenv.mkDerivation {
+ pname = "bibtex2html";
version = "1.99";
src = fetchurl {
diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/tools/misc/bibtool/default.nix
index 5e8a8c56b0a7..7664b96563b2 100644
--- a/pkgs/tools/misc/bibtool/default.nix
+++ b/pkgs/tools/misc/bibtool/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
- name = "bibtool-${version}";
+ pname = "bibtool";
version = "2.67";
src = fetchurl {
diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix
index d7cca2a77bdc..d84c6ebaabc6 100644
--- a/pkgs/tools/misc/bibutils/default.nix
+++ b/pkgs/tools/misc/bibutils/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "bibutils-${version}";
+ pname = "bibutils";
version = "6.7";
src = fetchurl {
diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix
index 4248dd6bd93c..8d587e34af46 100644
--- a/pkgs/tools/misc/blink1-tool/default.nix
+++ b/pkgs/tools/misc/blink1-tool/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libusb1, pkgconfig, ... }:
stdenv.mkDerivation rec {
- name = "blink1-${version}";
+ pname = "blink1";
version = "1.98a";
src = fetchurl {
diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix
index 8e3e08fb5e55..23bd7ed172c4 100644
--- a/pkgs/tools/misc/blsd/default.nix
+++ b/pkgs/tools/misc/blsd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }:
-buildGoPackage rec {
- name = "blsd-${version}";
+buildGoPackage {
+ pname = "blsd";
version = "2017-07-27";
goPackagePath = "github.com/junegunn/blsd";
diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/tools/misc/bmap-tools/default.nix
index 7391c271cd17..6b7a51e08f51 100644
--- a/pkgs/tools/misc/bmap-tools/default.nix
+++ b/pkgs/tools/misc/bmap-tools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "bmap-tools-${version}";
+ pname = "bmap-tools";
version = "3.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix
index fc10538bbbbd..e4664e34b964 100644
--- a/pkgs/tools/misc/bmon/default.nix
+++ b/pkgs/tools/misc/bmon/default.nix
@@ -2,7 +2,7 @@
, libnl }:
stdenv.mkDerivation rec {
- name = "bmon-${version}";
+ pname = "bmon";
version = "4.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix
index 930d4dfaabac..a5e4a42ef3cd 100644
--- a/pkgs/tools/misc/bonfire/default.nix
+++ b/pkgs/tools/misc/bonfire/default.nix
@@ -11,7 +11,7 @@ buildPythonApplication rec {
# https://github.com/blue-yonder/bonfire/pull/18
src = fetchFromGitHub {
owner = "blue-yonder";
- repo = "${pname}";
+ repo = pname;
rev = "d0af9ca10394f366cfa3c60f0741f1f0918011c2";
sha256 = "193zcvzbhxwwkwbgmnlihhhazwkajycxf4r71jz1m12w301sjhq5";
};
diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix
index 2ba5499d7f77..c40ccad5e396 100644
--- a/pkgs/tools/misc/broadlink-cli/default.nix
+++ b/pkgs/tools/misc/broadlink-cli/default.nix
@@ -1,6 +1,6 @@
{ stdenv, python2Packages, fetchFromGitHub }:
-python2Packages.buildPythonApplication rec {
+python2Packages.buildPythonApplication {
pname = "broadlink-cli";
inherit (python2Packages.broadlink) version;
diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix
index 90fc68dcc5cc..b86bc38cb267 100644
--- a/pkgs/tools/misc/buildtorrent/default.nix
+++ b/pkgs/tools/misc/buildtorrent/default.nix
@@ -3,10 +3,11 @@
let version = "0.8"; in
stdenv.mkDerivation rec {
- name = "buildtorrent-${version}";
+ pname = "buildtorrent";
+ inherit version;
src = fetchurl {
- url = "https://mathr.co.uk/blog/code/${name}.tar.gz";
+ url = "https://mathr.co.uk/blog/code/${pname}-${version}.tar.gz";
sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0";
};
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index 61d0bf60a4d6..2c48f995ca2d 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -5,13 +5,12 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "calamares";
version = "3.2.11";
# release including submodule
src = fetchurl {
- url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz";
+ url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "1djrc8p6kll8szycyj86v02jphiw2xwfhn563siykphfqr0jknlw";
};
diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix
index a3b30423aa8f..e7134961c252 100644
--- a/pkgs/tools/misc/capture/default.nix
+++ b/pkgs/tools/misc/capture/default.nix
@@ -1,7 +1,7 @@
{ stdenv, slop, ffmpeg, fetchFromGitHub, makeWrapper}:
-stdenv.mkDerivation rec {
- name = "capture-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "capture-unstable";
version = "2019-03-10";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/cbmem/default.nix b/pkgs/tools/misc/cbmem/default.nix
deleted file mode 100644
index d2efea1c03a6..000000000000
--- a/pkgs/tools/misc/cbmem/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- pname = "cbmem";
- version = "4.9";
-
- src = fetchurl {
- url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
- sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij";
- };
-
- buildPhase = ''
- make -C util/cbmem
- '';
-
- installPhase = ''
- install -Dm755 util/cbmem/cbmem $out/bin/cbmem
- '';
-
- meta = with stdenv.lib; {
- description = "Read coreboot timestamps and console logs";
- homepage = "https://www.coreboot.org";
- license = licenses.gpl2;
- maintainers = [ maintainers.petabyteboy ];
- platforms = platforms.linux;
- };
-}
-
diff --git a/pkgs/tools/misc/chelf/default.nix b/pkgs/tools/misc/chelf/default.nix
index 4c54ab239d29..f9740f223754 100644
--- a/pkgs/tools/misc/chelf/default.nix
+++ b/pkgs/tools/misc/chelf/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "chelf-${version}";
+ pname = "chelf";
version = "0.2.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index 4eb6f302f1b0..b6fffddeb53d 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "chezmoi-${version}";
+ pname = "chezmoi";
version = "1.5.5";
goPackagePath = "github.com/twpayne/chezmoi";
diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix
index 48ce782536f2..4d33d957b4d1 100644
--- a/pkgs/tools/misc/cht.sh/default.nix
+++ b/pkgs/tools/misc/cht.sh/default.nix
@@ -7,8 +7,8 @@
, xsel
}:
-stdenv.mkDerivation rec {
- name = "cht.sh-${version}";
+stdenv.mkDerivation {
+ pname = "cht.sh";
version = "unstable-2019-08-06";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix
index e913d5176839..575cb686f9d4 100644
--- a/pkgs/tools/misc/ckb-next/default.nix
+++ b/pkgs/tools/misc/ckb-next/default.nix
@@ -3,7 +3,7 @@
mkDerivation rec {
version = "0.3.2";
- name = "ckb-next-${version}";
+ pname = "ckb-next";
src = fetchFromGitHub {
owner = "ckb-next";
diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix
index e4b3fab818b7..f71faf6ab749 100644
--- a/pkgs/tools/misc/clac/default.nix
+++ b/pkgs/tools/misc/clac/default.nix
@@ -1,6 +1,5 @@
{stdenv, fetchFromGitHub}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "clac";
version = "0.0.0.20170503";
diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix
index 135eda554b36..31c35af81186 100644
--- a/pkgs/tools/misc/clasp/default.nix
+++ b/pkgs/tools/misc/clasp/default.nix
@@ -5,7 +5,8 @@ let
in
stdenv.mkDerivation {
- name = "clasp-${version}";
+ pname = "clasp";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz";
diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix
index 54a6fac17a3c..d5fd4e97df10 100644
--- a/pkgs/tools/misc/clex/default.nix
+++ b/pkgs/tools/misc/clex/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "clex-${version}";
+ pname = "clex";
version = "4.6.patch9";
src = fetchurl {
sha256 = "1qj5yp8k90wag5sb3zrm2pn90qqx3zbrgf2gqpqpdqmlgffnv1jc";
- url = "${meta.homepage}/download/${name}.tar.gz";
+ url = "${meta.homepage}/download/${pname}-${version}.tar.gz";
};
buildInputs = [ ncurses ];
diff --git a/pkgs/tools/misc/clipnotify/default.nix b/pkgs/tools/misc/clipnotify/default.nix
index 6bd0f8be2fa6..91c428def280 100644
--- a/pkgs/tools/misc/clipnotify/default.nix
+++ b/pkgs/tools/misc/clipnotify/default.nix
@@ -1,6 +1,6 @@
{ libX11, libXfixes, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "clipnotify-${version}";
+ pname = "clipnotify";
version = "git-2018-02-20";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix
index ed0239256cdf..699285f26647 100644
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/pkgs/tools/misc/clipster/default.nix
@@ -2,13 +2,13 @@
gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "clipster-${version}";
+ pname = "clipster";
version = "2.0.2";
src = fetchFromGitHub {
owner = "mrichar1";
repo = "clipster";
- rev = "${version}";
+ rev = version;
sha256 = "0582r8840dk4k4jj1zq6kmyh7z9drcng099bj7f4wvr468nb9z1p";
};
diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index 38041f0b32da..987d694a0a41 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
stdenv.mkDerivation rec {
- name = "cloc-${version}";
+ pname = "cloc";
version = "1.82";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix
index b9046bf19ca5..bc23958b5815 100644
--- a/pkgs/tools/misc/cloud-sql-proxy/default.nix
+++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "cloud-sql-proxy-${version}";
+ pname = "cloud-sql-proxy";
version = "1.13";
goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy";
diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix
index bda8ebcf3b0e..5408c39920be 100644
--- a/pkgs/tools/misc/cloud-utils/default.nix
+++ b/pkgs/tools/misc/cloud-utils/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
# NOTICE: if you bump this, make sure to run
# $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops
# growpart is needed in initrd in nixos/system/boot/grow-partition.nix
- name = "cloud-utils-${version}";
+ pname = "cloud-utils";
version = "0.30";
src = fetchurl {
url = "https://launchpad.net/cloud-utils/trunk/0.3/+download/cloud-utils-${version}.tar.gz";
diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix
index 12821cf864c2..41c80146e68f 100644
--- a/pkgs/tools/misc/colord-kde/default.nix
+++ b/pkgs/tools/misc/colord-kde/default.nix
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
- name = "colord-kde-${version}";
+ pname = "colord-kde";
version = "0.5.0";
src = fetchurl {
- url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz";
+ url = "http://download.kde.org/stable/colord-kde/${version}/src/${pname}-${version}.tar.xz";
sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
};
diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix
index a7d230d8e898..f3d7fbd81273 100644
--- a/pkgs/tools/misc/contacts/default.nix
+++ b/pkgs/tools/misc/contacts/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, xcbuildHook, Foundation, AddressBook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.1a-3";
- name = "contacts-${version}";
+ pname = "contacts";
src = fetchurl {
url = "https://github.com/dhess/contacts/archive/4092a3c6615d7a22852a3bafc44e4aeeb698aa8f.tar.gz";
diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix
new file mode 100644
index 000000000000..3f6988f1f657
--- /dev/null
+++ b/pkgs/tools/misc/coreboot-utils/default.nix
@@ -0,0 +1,104 @@
+{ stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }:
+
+let
+ version = "4.10";
+
+ meta = with stdenv.lib; {
+ description = "Various coreboot-related tools";
+ homepage = "https://www.coreboot.org";
+ license = licenses.gpl2;
+ maintainers = [ maintainers.petabyteboy ];
+ platforms = platforms.linux;
+ };
+
+ generic = { pname, path ? "util/${pname}", ... }@args: stdenv.mkDerivation (rec {
+ inherit pname version meta;
+
+ src = fetchurl {
+ url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
+ sha256 = "1jsiz17afi2lqg1jv6lsl8s05w7vr7iwgg86y2qp369hcz6kcwfa";
+ };
+
+ enableParallelBuilding = true;
+
+ postPatch = ''
+ cd ${path}
+ '';
+
+ makeFlags = [
+ "INSTALL=install"
+ "PREFIX=${placeholder "out"}"
+ ];
+ } // args);
+
+ utils = {
+ msrtool = generic {
+ pname = "msrtool";
+ meta.description = "Dump chipset-specific MSR registers";
+ buildInputs = [ pciutils zlib ];
+ preConfigure = "export INSTALL=install";
+ };
+ cbmem = generic {
+ pname = "cbmem";
+ meta.description = "Coreboot console log reader";
+ };
+ ifdtool = generic {
+ pname = "ifdtool";
+ meta.description = "Extract and dump Intel Firmware Descriptor information";
+ };
+ intelmetool = generic {
+ pname = "intelmetool";
+ meta.description = "Dump interesting things about Management Engine";
+ buildInputs = [ pciutils zlib ];
+ };
+ cbfstool = generic {
+ pname = "cbfstool";
+ meta.description = "Management utility for CBFS formatted ROM images";
+ };
+ nvramtool = generic {
+ pname = "nvramtool";
+ meta.description = "Read and write coreboot parameters and display information from the coreboot table in CMOS/NVRAM";
+ };
+ superiotool = generic {
+ pname = "superiotool";
+ meta.description = "User-space utility to detect Super I/O of a mainboard and provide detailed information about the register contents of the Super I/O";
+ buildInputs = [ pciutils zlib ];
+ };
+ ectool = generic {
+ pname = "ectool";
+ meta.description = "Dump the RAM of a laptop's Embedded/Environmental Controller (EC)";
+ meta.platforms = [ "x86_64-linux" "i686-linux" ];
+ preInstall = "mkdir -p $out/sbin";
+ };
+ inteltool = generic {
+ pname = "inteltool";
+ meta.description = "Provides information about Intel CPU/chipset hardware configuration (register contents, MSRs, etc)";
+ buildInputs = [ pciutils zlib ];
+ };
+ amdfwtool = generic {
+ pname = "amdfwtool";
+ meta.description = "Create AMD firmware combination";
+ installPhase = "install -Dm755 amdfwtool $out/bin/amdfwtool";
+ };
+ acpidump-all = generic {
+ pname = "acpidump-all";
+ path = "util/acpi";
+ meta.description = "Walk through all ACPI tables with their addresses";
+ nativeBuildInputs = [ makeWrapper ];
+ dontBuild = true;
+ installPhase = "install -Dm755 acpidump-all $out/bin/acpidump-all";
+ postFixup = let
+ binPath = [ coreutils acpica-tools iasl gnugrep gnused file ];
+ in "wrapProgram $out/bin/acpidump-all --set PATH ${stdenv.lib.makeBinPath binPath}";
+ };
+ };
+
+in utils // {
+ coreboot-utils = (buildEnv {
+ name = "coreboot-utils-${version}";
+ paths = stdenv.lib.attrValues utils;
+ postBuild = "rm -rf $out/sbin";
+ }) // {
+ inherit meta version;
+ };
+}
diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix
index 6b5c9c513944..fb44b051b7ee 100644
--- a/pkgs/tools/misc/cowsay/default.nix
+++ b/pkgs/tools/misc/cowsay/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec{
version = "3.03+dfsg2";
- name = "cowsay-${version}";
+ pname = "cowsay";
src = fetchurl {
url = "http://http.debian.net/debian/pool/main/c/cowsay/cowsay_${version}.orig.tar.gz";
diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix
index 9a764c12941e..547e2a1f059f 100644
--- a/pkgs/tools/misc/cpulimit/default.nix
+++ b/pkgs/tools/misc/cpulimit/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "cpulimit-${version}";
+ pname = "cpulimit";
version = "2.6";
src = fetchurl {
- url = "mirror://sourceforge/limitcpu/${name}.tar.gz";
+ url = "mirror://sourceforge/limitcpu/${pname}-${version}.tar.gz";
sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g";
};
diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix
index f35da52081bc..5792fa4121b4 100644
--- a/pkgs/tools/misc/cpuminer-multi/default.nix
+++ b/pkgs/tools/misc/cpuminer-multi/default.nix
@@ -5,7 +5,7 @@ let
rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4";
date = "20160316";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}";
src = fetchgit {
diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix
index b4abb3097b98..db0ab75d9166 100644
--- a/pkgs/tools/misc/cpuminer/default.nix
+++ b/pkgs/tools/misc/cpuminer/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, curl, jansson, perl }:
stdenv.mkDerivation rec {
- name = "cpuminer-${version}";
+ pname = "cpuminer";
version = "2.5.0";
src = fetchurl {
- url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz";
+ url = "mirror://sourceforge/cpuminer/pooler-${pname}-${version}.tar.gz";
sha256 = "1xalrfrk5hvh1jh9kbqhib2an82ypd46vl9glaxhz3rbjld7c5pa";
};
diff --git a/pkgs/tools/misc/crex/default.nix b/pkgs/tools/misc/crex/default.nix
index 696fbe863832..a00f8d6654f5 100644
--- a/pkgs/tools/misc/crex/default.nix
+++ b/pkgs/tools/misc/crex/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "crex";
version = "0.2.5";
diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix
index 7ca103062c11..f5291d0789e6 100644
--- a/pkgs/tools/misc/crudini/default.nix
+++ b/pkgs/tools/misc/crudini/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages, help2man }:
python2Packages.buildPythonApplication rec {
- name = "crudini-${version}";
+ pname = "crudini";
version = "0.9";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix
index 6bbf049d2445..f1930c925ff4 100644
--- a/pkgs/tools/misc/cunit/default.nix
+++ b/pkgs/tools/misc/cunit/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}:
stdenv.mkDerivation rec {
- name = "CUnit-${version}";
+ pname = "CUnit";
version = "2.1-3";
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [autoconf automake libtool];
src = fetchurl {
- url = "mirror://sourceforge/cunit/CUnit/${version}/${name}.tar.bz2";
+ url = "mirror://sourceforge/cunit/CUnit/${version}/${pname}-${version}.tar.bz2";
sha256 = "057j82da9vv4li4z5ri3227ybd18nzyq81f6gsvhifs5z0vr3cpm";
};
diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix
index 94f36adcf9b0..83010477c50d 100644
--- a/pkgs/tools/misc/cutecom/default.nix
+++ b/pkgs/tools/misc/cutecom/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qtbase, qtserialport, cmake }:
stdenv.mkDerivation rec {
- name = "cutecom-${version}";
+ pname = "cutecom";
version = "0.50.0";
src = fetchFromGitHub {
owner = "neundorf";
diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix
index 5a82c7660890..f45889e78d85 100644
--- a/pkgs/tools/misc/dashing/default.nix
+++ b/pkgs/tools/misc/dashing/default.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "dashing-unstable-${version}";
+ pname = "dashing-unstable";
version = "2018-02-15";
rev = "0e0519d76ed6bbbe02b00ee1d1ac24697d349f49";
diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix
index 230a97da5e44..efeb760e560b 100644
--- a/pkgs/tools/misc/datamash/default.nix
+++ b/pkgs/tools/misc/datamash/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "datamash-${version}";
+ pname = "datamash";
version = "1.4";
src = fetchurl {
- url = "mirror://gnu/datamash/${name}.tar.gz";
+ url = "mirror://gnu/datamash/${pname}-${version}.tar.gz";
sha256 = "fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a";
};
diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
index 05a312bb8bca..b440808833fc 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/pkgs/tools/misc/dateutils/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.4.6";
- name = "dateutils-${version}";
+ pname = "dateutils";
src = fetchurl {
- url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz";
+ url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz";
sha256 = "1kaphw474lz7336awr9rzsgcsr1p9njsjsryd8i0ywg5g8qp3816";
};
diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix
index 8dcaecf9851c..72687f4bfa48 100644
--- a/pkgs/tools/misc/dbus-map/default.nix
+++ b/pkgs/tools/misc/dbus-map/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, glib, procps, libxml2 }:
-stdenv.mkDerivation rec {
- name = "dbus-map-${version}";
+stdenv.mkDerivation {
+ pname = "dbus-map";
version = "2015-05-28";
src = fetchFromGitHub {
owner = "taviso";
diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix
index 8453aa677477..0d5efb2ca22b 100644
--- a/pkgs/tools/misc/ddccontrol/default.nix
+++ b/pkgs/tools/misc/ddccontrol/default.nix
@@ -5,7 +5,8 @@
let version = "0.4.4"; in
stdenv.mkDerivation rec {
- name = "ddccontrol-${version}";
+ pname = "ddccontrol";
+ inherit version;
src = fetchFromGitHub {
owner = "ddccontrol";
diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix
index 3a607b4ec751..0ddceb76ffe8 100644
--- a/pkgs/tools/misc/ddcutil/default.nix
+++ b/pkgs/tools/misc/ddcutil/default.nix
@@ -2,7 +2,7 @@
, glib, i2c-tools, udev, libgudev, libusb, libdrm, xorg }:
stdenv.mkDerivation rec {
- name = "ddcutil-${version}";
+ pname = "ddcutil";
version = "0.9.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index 3ed284aa3e1f..35db9ef7db36 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -9,7 +9,7 @@ let
inherit (python3Packages) python setuptools;
in stdenv.mkDerivation rec {
version = "2.16.8";
- name = "debian-devscripts-${version}";
+ pname = "debian-devscripts";
src = fetchurl {
url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix
index 61c8a8370d7f..e99e9289b676 100644
--- a/pkgs/tools/misc/ding-libs/default.nix
+++ b/pkgs/tools/misc/ding-libs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, check }:
stdenv.mkDerivation rec {
- name = "ding-libs-${version}";
+ pname = "ding-libs";
version = "0.6.1";
src = fetchurl {
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index e71971ccb091..22c0721d79d8 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildGoPackage, bash }:
buildGoPackage rec {
- name = "direnv-${version}";
+ pname = "direnv";
version = "2.20.1";
goPackagePath = "github.com/direnv/direnv";
diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix
index 7b97e58fdf96..10406b8bf03b 100644
--- a/pkgs/tools/misc/diskscan/default.nix
+++ b/pkgs/tools/misc/diskscan/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, cmake, ncurses, zlib }:
stdenv.mkDerivation rec {
- name = "diskscan-${version}";
+ pname = "diskscan";
version = "0.20";
src = fetchFromGitHub {
owner = "baruch";
repo = "diskscan";
- rev = "${version}";
+ rev = version;
sha256 = "1s2df082yrnr3gqnapdsqz0yd0ld75bin37g0rms83ymzkh4ysgv";
};
diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix
index ef00c753d3aa..591cd5fe0408 100644
--- a/pkgs/tools/misc/diskus/default.nix
+++ b/pkgs/tools/misc/diskus/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
- name = "diskus-${version}";
+ pname = "diskus";
version = "0.5.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/tools/misc/docbook2mdoc/default.nix
index affcd310bea0..efe65683e07b 100644
--- a/pkgs/tools/misc/docbook2mdoc/default.nix
+++ b/pkgs/tools/misc/docbook2mdoc/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, expat }:
stdenv.mkDerivation rec {
- name = "docbook2mdoc-${version}";
+ pname = "docbook2mdoc";
version = "0.0.9";
src = fetchurl {
- url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/${name}.tgz";
+ url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/${pname}-${version}.tgz";
sha256 = "07il80sg89xf6ym4bry6hxdacfzqgbwkxzyf7bjaihmw5jj0lclk";
};
diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix
index f6bc091c14af..c1baf8e82f5f 100644
--- a/pkgs/tools/misc/docker-ls/default.nix
+++ b/pkgs/tools/misc/docker-ls/default.nix
@@ -1,7 +1,7 @@
{ buildGoPackage, fetchFromGitHub, stdenv, docker }:
buildGoPackage rec {
- name = "docker-ls-${version}";
+ pname = "docker-ls";
version = "0.3.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix
index 47abcf79869d..66c0cfc82b1b 100644
--- a/pkgs/tools/misc/docui/default.nix
+++ b/pkgs/tools/misc/docui/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
- name = "docui-${version}";
+ pname = "docui";
version = "2.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix
index c50e3adb6abb..7d85decbb84b 100644
--- a/pkgs/tools/misc/dtach/default.nix
+++ b/pkgs/tools/misc/dtach/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "dtach-${version}";
+ pname = "dtach";
version = "0.9";
src = fetchurl {
- url = "mirror://sourceforge/project/dtach/dtach/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/dtach/dtach/${version}/${pname}-${version}.tar.gz";
sha256 = "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j";
};
diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix
index 82b29bb67f66..c5ea2cd46a16 100644
--- a/pkgs/tools/misc/duc/default.nix
+++ b/pkgs/tools/misc/duc/default.nix
@@ -7,13 +7,13 @@
assert enableCairo -> cairo != null && pango != null;
stdenv.mkDerivation rec {
- name = "duc-${version}";
+ pname = "duc";
version = "1.4.4";
src = fetchFromGitHub {
owner = "zevv";
repo = "duc";
- rev = "${version}";
+ rev = version;
sha256 = "1i7ry25xzy027g6ysv6qlf09ax04q4vy0kikl8h0aq5jbxsl9q52";
};
diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix
index 892287fa2d70..1b9a6c9bbea2 100644
--- a/pkgs/tools/misc/dumptorrent/default.nix
+++ b/pkgs/tools/misc/dumptorrent/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "dumptorrent-${version}";
+ pname = "dumptorrent";
version = "1.2";
src = fetchurl {
diff --git a/pkgs/tools/misc/dupd/default.nix b/pkgs/tools/misc/dupd/default.nix
new file mode 100644
index 000000000000..06b9f3adac92
--- /dev/null
+++ b/pkgs/tools/misc/dupd/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, perl, which
+, openssl, sqlite }:
+
+# Instead of writing directly into $HOME, we change the default db location
+# from $HOME/.dupd_sqlite to $HOME/.cache/dupd.sqlite3
+
+stdenv.mkDerivation rec {
+ pname = "dupd";
+ version = "1.7";
+
+ src = fetchFromGitHub {
+ owner = "jvirkki";
+ repo = "dupd";
+ rev = version;
+ sha256 = "0vg4vbiwjc5p22cisj8970mym4y2r29fcm08ibik92786vsbxcqk";
+ };
+
+ postPatch = ''
+ patchShebangs tests
+
+ # tests need HOME to write the database
+ export HOME=$TMPDIR
+
+ mkdir -p $HOME/.cache
+
+ for f in man/dupd man/dupd.1 src/main.c tests/test.56 tests/test.57 ; do
+ substituteInPlace $f --replace .dupd_sqlite .cache/dupd.sqlite3
+ done
+ '';
+
+ buildInputs = [ openssl sqlite ];
+
+ nativeBuildInputs = [ perl which ];
+
+ makeFlags = [
+ "INSTALL_PREFIX=$(out)"
+ ];
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "CLI utility to find duplicate files";
+ homepage = http://www.virkki.com/dupd;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+}
diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix
index b9a66ba95d9f..4dffae557a4e 100644
--- a/pkgs/tools/misc/dust/default.nix
+++ b/pkgs/tools/misc/dust/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "dust-${version}";
+ pname = "dust";
version = "0.2.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/pkgs/tools/misc/dvtm/dvtm.nix
index 10fb4cd89bd9..df2e25c7ea33 100644
--- a/pkgs/tools/misc/dvtm/dvtm.nix
+++ b/pkgs/tools/misc/dvtm/dvtm.nix
@@ -1,5 +1,5 @@
{ stdenv, ncurses, customConfig ? null, name, src, patches ? [] }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit name src patches;
diff --git a/pkgs/tools/misc/dylibbundler/default.nix b/pkgs/tools/misc/dylibbundler/default.nix
index c88e29bb4553..6bb9924ddd09 100644
--- a/pkgs/tools/misc/dylibbundler/default.nix
+++ b/pkgs/tools/misc/dylibbundler/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dylibbundler";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix
index 5eb4055d5b96..11a46f620c0a 100644
--- a/pkgs/tools/misc/edid-decode/default.nix
+++ b/pkgs/tools/misc/edid-decode/default.nix
@@ -1,8 +1,9 @@
{ stdenv, fetchgit }:
let
version = "2018-12-06";
-in stdenv.mkDerivation rec {
- name = "edid-decode-unstable-${version}";
+in stdenv.mkDerivation {
+ pname = "edid-decode-unstable";
+ inherit version;
src = fetchgit {
url = "git://linuxtv.org/edid-decode.git";
diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix
index 6f491ac93496..6a5fcfb12174 100644
--- a/pkgs/tools/misc/emv/default.nix
+++ b/pkgs/tools/misc/emv/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
- name = "emv-${version}";
+stdenv.mkDerivation {
+ pname = "emv";
version = "1.95";
src = fetchurl {
diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix
index d4f69340d0ae..1c0401e2eadc 100644
--- a/pkgs/tools/misc/ent/default.nix
+++ b/pkgs/tools/misc/ent/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, unzip}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ent-1.1";
src = fetchurl {
diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index 19bcd77923b9..954b570c79da 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, coreutils, ncurses }:
stdenv.mkDerivation rec {
- name = "entr-${version}";
+ pname = "entr";
version = "4.2";
src = fetchurl {
- url = "http://entrproject.org/code/${name}.tar.gz";
+ url = "http://entrproject.org/code/${pname}-${version}.tar.gz";
sha256 = "0w2xkf77jikcjh15fp9g7661ss30pz3jbnh261vqpaqavwah4c17";
};
diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix
index ea08608da01c..db31df982cf8 100644
--- a/pkgs/tools/misc/envdir-go/default.nix
+++ b/pkgs/tools/misc/envdir-go/default.nix
@@ -3,7 +3,7 @@
buildGoPackage rec {
version = "1.0.0";
- name = "envdir-${version}";
+ pname = "envdir";
goPackagePath = "github.com/d10n/envdir";
diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix
index 86f78af25603..9b2153d17cb1 100644
--- a/pkgs/tools/misc/envsubst/default.nix
+++ b/pkgs/tools/misc/envsubst/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "envsubst-${version}";
+ pname = "envsubst";
version = "1.1.0";
goPackagePath = "github.com/a8m/envsubst";
diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix
index b9efead27988..8d65aee9e7a8 100644
--- a/pkgs/tools/misc/eot-utilities/default.nix
+++ b/pkgs/tools/misc/eot-utilities/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "eot_utilities";
version = "1.1";
- name = "${pname}-${version}";
src = fetchurl {
url = "https://www.w3.org/Tools/eot-utils/eot-utilities-${version}.tar.gz";
diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix
index 9d3b796c8796..52b56f10ea97 100644
--- a/pkgs/tools/misc/esptool-ck/default.nix
+++ b/pkgs/tools/misc/esptool-ck/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "esptool-ck-${version}";
+ pname = "esptool-ck";
version = "0.4.13";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index a6afa03a3f15..8fa1eccadf01 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ethtool-${version}";
+ pname = "ethtool";
version = "5.2";
src = fetchurl {
- url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
+ url = "mirror://kernel/software/network/ethtool/${pname}-${version}.tar.xz";
sha256 = "01bq2g7amycfp4syzcswz52pgphdgswklziqfjwnq3c6844dfpv6";
};
diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index 1447c70412b6..e05963b69027 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib
-, darwin, libiconv
+, darwin, libiconv, installShellFiles
}:
with rustPlatform;
buildRustPackage rec {
- name = "exa-${version}";
+ pname = "exa";
version = "0.9.0";
cargoSha256 = "1hgjp23rjd90wyf0nq6d5akjxdfjlaps54dv23zgwjvkhw24fidf";
@@ -17,24 +17,20 @@ buildRustPackage rec {
sha256 = "14qlm9zb9v22hxbbi833xaq2b7qsxnmh15s317200vz5f1305hhw";
};
- nativeBuildInputs = [ cmake pkgconfig perl ];
+ nativeBuildInputs = [ cmake pkgconfig perl installShellFiles ];
buildInputs = [ zlib ]
++ stdenv.lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.Security ]
;
+ outputs = [ "out" "man" ];
+
postInstall = ''
- mkdir -p $out/share/man/man1
- cp contrib/man/exa.1 $out/share/man/man1/
-
- mkdir -p $out/share/bash-completion/completions
- cp contrib/completions.bash $out/share/bash-completion/completions/exa
-
- mkdir -p $out/share/fish/vendor_completions.d
- cp contrib/completions.fish $out/share/fish/vendor_completions.d/exa.fish
-
- mkdir -p $out/share/zsh/site-functions
- cp contrib/completions.zsh $out/share/zsh/site-functions/_exa
+ installManPage contrib/man/exa.1
+ installShellCompletion \
+ --name exa contrib/completions.bash \
+ --name exa.fish contrib/completions.fish \
+ --name _exa contrib/completions.zsh
'';
# Some tests fail, but Travis ensures a proper build
diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index bb701f187fa8..fe18a5065608 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "5.45.4";
- name = "expect-${version}";
+ pname = "expect";
src = fetchurl {
url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz";
diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix
index b651caf5a5e7..6c2cbd257442 100644
--- a/pkgs/tools/misc/fasd/default.nix
+++ b/pkgs/tools/misc/fasd/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "clvv";
- repo = "${pname}";
+ repo = pname;
rev = "90b531a5daaa545c74c7d98974b54cbdb92659fc";
sha256 = "0i22qmhq3indpvwbxz7c472rdyp8grag55x7iyjz8gmyn8gxjc11";
};
diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 91c1b3b70719..7465cb67f61a 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "fd-${version}";
+ pname = "fd";
version = "7.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix
index 84b61f9aae92..25179c36c01f 100644
--- a/pkgs/tools/misc/fdupes/default.nix
+++ b/pkgs/tools/misc/fdupes/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "fdupes-${version}";
+ pname = "fdupes";
version = "1.6.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/fffuu/default.nix b/pkgs/tools/misc/fffuu/default.nix
index 7b275220c197..5d79b26f2308 100644
--- a/pkgs/tools/misc/fffuu/default.nix
+++ b/pkgs/tools/misc/fffuu/default.nix
@@ -1,6 +1,6 @@
{ mkDerivation, haskellPackages, fetchFromGitHub, lib }:
-mkDerivation rec {
+mkDerivation {
pname = "fffuu";
version = "unstable-2018-05-26";
diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix
index 90092c9b0c0c..316420008065 100644
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/pkgs/tools/misc/ffsend/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitLab, rustPlatform, cmake, pkgconfig, openssl
-, darwin
+, darwin, installShellFiles
, x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD
, xclip ? null, xsel ? null
@@ -27,7 +27,7 @@ buildRustPackage rec {
cargoSha256 = "1x4hxar60lwimldpsi0frdlssgsb72qahn3dmb980sj6cmbq3f0b";
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig installShellFiles ];
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ])
;
@@ -41,9 +41,7 @@ buildRustPackage rec {
);
postInstall = ''
- install -Dm644 contrib/completions/_ffsend "$out/share/zsh/site-functions/_ffsend"
- install -Dm644 contrib/completions/ffsend.bash "$out/share/bash-completion/completions/ffsend.bash"
- install -Dm644 contrib/completions/ffsend.fish "$out/share/fish/vendor_completions.d/ffsend.fish"
+ installShellCompletion contrib/completions/ffsend.{bash,fish} --zsh contrib/completions/_ffsend
'';
# There's also .elv and .ps1 completion files but I don't know where to install those
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 14858428ee99..b3ed85ca2282 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, file, zlib, libgnurx }:
stdenv.mkDerivation rec {
- name = "file-${version}";
+ pname = "file";
version = "5.37";
src = fetchurl {
urls = [
- "ftp://ftp.astron.com/pub/file/${name}.tar.gz"
- "https://distfiles.macports.org/file/${name}.tar.gz"
+ "ftp://ftp.astron.com/pub/file/${pname}-${version}.tar.gz"
+ "https://distfiles.macports.org/file/${pname}-${version}.tar.gz"
];
sha256 = "0zz0p9bqnswfx0c16j8k62ivjq1m16x10xqv4hy9lcyxyxkkkhg9";
};
diff --git a/pkgs/tools/misc/filebench/default.nix b/pkgs/tools/misc/filebench/default.nix
index e934da76e6e5..a16695cf7c32 100644
--- a/pkgs/tools/misc/filebench/default.nix
+++ b/pkgs/tools/misc/filebench/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, bison, flex }:
stdenv.mkDerivation rec {
- name = "filebench-${version}";
+ pname = "filebench";
version = "1.4.9.1";
src = fetchurl {
- url = "mirror://sourceforge/filebench/${name}.tar.gz";
+ url = "mirror://sourceforge/filebench/${pname}-${version}.tar.gz";
sha256 = "13hmx67lsz367sn8lrvz1780mfczlbiz8v80gig9kpkpf009yksc";
};
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 9db66480cb10..2df8ee420fae 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -3,20 +3,16 @@
}:
stdenv.mkDerivation rec {
- name = "findutils-4.6.0";
+ pname = "findutils";
+ version = "4.7.0";
src = fetchurl {
- url = "mirror://gnu/findutils/${name}.tar.gz";
- sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y";
+ url = "mirror://gnu/findutils/${pname}-${version}.tar.xz";
+ sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5";
};
patches = [
- ./memory-leak.patch
./no-install-statedir.patch
-
- # Prevent tests from failing on old kernels (2.6x)
- # getdtablesize reports incorrect values if getrlimit() fails
- ./disable-getdtablesize-test.patch
];
buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort
diff --git a/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch b/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch
deleted file mode 100644
index 611df364b687..000000000000
--- a/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/tests/test-dup2.c b/tests/test-dup2.c
---- a/tests/test-dup2.c
-+++ b/tests/test-dup2.c
-@@ -157,8 +157,6 @@ main (void)
- ASSERT (close (255) == 0);
- ASSERT (close (256) == 0);
- }
-- ASSERT (dup2 (fd, bad_fd - 1) == bad_fd - 1);
-- ASSERT (close (bad_fd - 1) == 0);
- errno = 0;
- ASSERT (dup2 (fd, bad_fd) == -1);
- ASSERT (errno == EBADF);
-diff --git a/tests/test-getdtablesize.c b/tests/test-getdtablesize.c
-index a0325af..a83f8ec 100644
---- a/tests/test-getdtablesize.c
-+++ b/tests/test-getdtablesize.c
-@@ -29,8 +29,6 @@ int
- main (int argc, char *argv[])
- {
- ASSERT (getdtablesize () >= 3);
-- ASSERT (dup2 (0, getdtablesize() - 1) == getdtablesize () - 1);
-- ASSERT (dup2 (0, getdtablesize()) == -1);
-
- return 0;
- }
diff --git a/pkgs/tools/misc/findutils/memory-leak.patch b/pkgs/tools/misc/findutils/memory-leak.patch
deleted file mode 100644
index 56f65f856224..000000000000
--- a/pkgs/tools/misc/findutils/memory-leak.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-http://git.savannah.gnu.org/cgit/findutils.git/patch/?id=c1556892a
-diff --git a/find/fstype.c b/find/fstype.c
-index 535f920..a0ac8bc 100644
---- a/find/fstype.c
-+++ b/find/fstype.c
-@@ -75,14 +75,7 @@ free_file_system_list (struct mount_entry *p)
- while (p)
- {
- struct mount_entry *pnext = p->me_next;
--
-- free (p->me_devname);
-- free (p->me_mountdir);
--
-- if (p->me_type_malloced)
-- free (p->me_type);
-- p->me_next = NULL;
-- free (p);
-+ free_mount_entry (p);
- p = pnext;
- }
- }
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index a7ca7700c71b..18914a304f34 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }:
stdenv.mkDerivation rec {
- name = "flashrom-${version}";
+ pname = "flashrom";
version = "1.1";
src = fetchurl {
diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix
index a72279b90b6e..8c2c5adfb5f4 100644
--- a/pkgs/tools/misc/fltrdr/default.nix
+++ b/pkgs/tools/misc/fltrdr/default.nix
@@ -5,13 +5,13 @@
}:
stdenv.mkDerivation rec {
- name = "fltrdr-${version}";
+ pname = "fltrdr";
version = "0.3.1";
src = fetchFromGitHub {
repo = "fltrdr";
owner = "octobanana";
- rev = "${version}";
+ rev = version;
sha256 = "1vpci7vqzcpdd21zgigyz38k77r9fc81dmiwsvfr8w7gad5sg6sj";
};
diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 6d24f3a44735..08d091cb3002 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "fluent-bit";
version = "1.0.6";
diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix
index e31da3bfd212..33efd2bd6143 100644
--- a/pkgs/tools/misc/fondu/default.nix
+++ b/pkgs/tools/misc/fondu/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "060102";
- name = "fondu-${version}";
+ pname = "fondu";
src = fetchurl {
url = "http://fondu.sourceforge.net/fondu_src-${version}.tgz";
diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix
index 45d27e7b7c82..74c21d21fcc3 100644
--- a/pkgs/tools/misc/fortune/default.nix
+++ b/pkgs/tools/misc/fortune/default.nix
@@ -1,36 +1,38 @@
{ stdenv, fetchurl, cmake, recode, perl }:
-let srcs = {
- fortune = fetchurl {
- url = "https://github.com/shlomif/fortune-mod/archive/fortune-mod-${version}.tar.gz";
- sha256 = "89223bb649ea62b030527f181539182d6a17a1a43b0cc499a52732b839f7b691";
- };
- shlomifCommon = fetchurl {
- url = https://bitbucket.org/shlomif/shlomif-cmake-modules/raw/default/shlomif-cmake-modules/Shlomif_Common.cmake;
- sha256 = "62f188a9f1b7ab0e757eb0bc6540d9c0026d75edc7acc1c3cdf7438871d0a94f";
- };
- };
- version = "2.6.2";
-in
-stdenv.mkDerivation {
- name = "fortune-mod-${version}";
+stdenv.mkDerivation rec {
+ pname = "fortune-mod";
+ version = "2.10.0";
- src = srcs.fortune;
-
- sourceRoot = "fortune-mod-fortune-mod-${version}/fortune-mod";
+ src = fetchurl {
+ url = "https://www.shlomifish.org/open-source/projects/fortune-mod/arcs/fortune-mod-${version}.tar.xz";
+ sha256 = "07g50hij87jb7m40pkvgd47qfvv4s805lwiz79jbqcxzd7zdyax7";
+ };
nativeBuildInputs = [ cmake perl ];
buildInputs = [ recode ];
- preConfigure = ''
- cp ${srcs.shlomifCommon} cmake/Shlomif_Common.cmake
- '';
+ cmakeFlags = [
+ "-DLOCALDIR=${placeholder "out"}/share/fortunes"
+ ];
- postInstall = ''
- mv $out/games/fortune $out/bin/fortune
- rm -r $out/games
- '';
+ patches = [ (builtins.toFile "not-a-game.patch" ''
+ diff --git a/CMakeLists.txt b/CMakeLists.txt
+ index 865e855..5a59370 100644
+ --- a/CMakeLists.txt
+ +++ b/CMakeLists.txt
+ @@ -154,7 +154,7 @@ ENDMACRO()
+ my_exe(
+ "fortune"
+ "fortune/fortune.c"
+ - "games"
+ + "bin"
+ )
+
+ my_exe(
+ --
+ '') ];
meta = with stdenv.lib; {
description = "A program that displays a pseudorandom message from a database of quotations";
diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/tools/misc/fpart/default.nix
index f75dfec5e562..563152cc10df 100644
--- a/pkgs/tools/misc/fpart/default.nix
+++ b/pkgs/tools/misc/fpart/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "fpart-${version}";
+ pname = "fpart";
version = "1.1.0";
src = fetchFromGitHub {
owner = "martymac";
repo = "fpart";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "0h3mqc1xj5j2z8s8g3pvvpbjs6x74dj8niyh3p2ymla35kbzskf4";
};
diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix
index 8b7c2b430882..ac731bcdbe86 100644
--- a/pkgs/tools/misc/fpp/default.nix
+++ b/pkgs/tools/misc/fpp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python3 }:
stdenv.mkDerivation rec {
- name = "fpp-${version}";
+ pname = "fpp";
version = "0.8.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/fsmark/default.nix b/pkgs/tools/misc/fsmark/default.nix
index 0e821ce7f1f5..ac56d948bdad 100644
--- a/pkgs/tools/misc/fsmark/default.nix
+++ b/pkgs/tools/misc/fsmark/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "fsmark-${version}";
+ pname = "fsmark";
version = "3.3";
src = fetchurl {
diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix
index f9e40b6b7867..c731094bdd6a 100644
--- a/pkgs/tools/misc/fsmon/default.nix
+++ b/pkgs/tools/misc/fsmon/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "fsmon-${version}";
+ pname = "fsmon";
version = "1.5";
src = fetchFromGitHub {
owner = "nowsecure";
repo = "fsmon";
- rev = "${version}";
+ rev = version;
sha256 = "1b99cd5k2zh30sagp3f55jvj1r48scxibv7aqqc2sp82sci59npg";
};
diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix
index e723db260eb5..4e7db2dc4847 100644
--- a/pkgs/tools/misc/fsql/default.nix
+++ b/pkgs/tools/misc/fsql/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "fsql-${version}";
+ pname = "fsql";
version = "0.3.1";
goPackagePath = "github.com/kshvmdn/fsql";
diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
index a5baf4de5b84..a189e8c1dba5 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -3,7 +3,7 @@
, libarchive, darwin, coreutils }:
stdenv.mkDerivation rec {
- name = "fwup-${version}";
+ pname = "fwup";
version = "1.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix
index 6a04213e21ae..5b05ce534d70 100644
--- a/pkgs/tools/misc/fzy/default.nix
+++ b/pkgs/tools/misc/fzy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "fzy-${version}";
+ pname = "fzy";
version = "1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix
index 011231692f3a..ba0b76026a58 100644
--- a/pkgs/tools/misc/gams/default.nix
+++ b/pkgs/tools/misc/gams/default.nix
@@ -4,7 +4,7 @@ assert licenseFile != null;
stdenv.mkDerivation rec {
version = "25.0.2";
- name = "gams-${version}";
+ pname = "gams";
src = fetchurl {
url = "https://d37drm4t2jghv5.cloudfront.net/distributions/${version}/linux/linux_x64_64_sfx.exe";
sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297";
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
index c187b09624ad..002853abc1d3 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -3,7 +3,7 @@
with builtins;
buildGoPackage rec {
- name = "gawp-${version}";
+ pname = "gawp";
version = "20160121-${stdenv.lib.strings.substring 0 7 rev}";
rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix
index 6307d012debd..9b41dba4e259 100644
--- a/pkgs/tools/misc/gbdfed/default.nix
+++ b/pkgs/tools/misc/gbdfed/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.6";
- name = "gbdfed-${version}";
+ pname = "gbdfed";
src = fetchurl {
- url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${name}.tar.bz2";
+ url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${pname}-${version}.tar.bz2";
sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx";
};
diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix
index d71227ae8f53..0f32d1e63b1e 100644
--- a/pkgs/tools/misc/geekbench/default.nix
+++ b/pkgs/tools/misc/geekbench/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper }:
stdenv.mkDerivation rec {
- name = "geekbench-${version}";
+ pname = "geekbench";
version = "4.4.1";
src = fetchurl {
diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix
index b95c7179141d..d6fbb6233312 100644
--- a/pkgs/tools/misc/geteltorito/default.nix
+++ b/pkgs/tools/misc/geteltorito/default.nix
@@ -1,7 +1,7 @@
{ stdenv, perl, ronn, fetchurl }:
stdenv.mkDerivation rec {
- name = "geteltorito-${version}";
+ pname = "geteltorito";
version = "0.6";
src = fetchurl {
diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix
index b79388c6f29d..e5c0997c8e3e 100644
--- a/pkgs/tools/misc/gh-ost/default.nix
+++ b/pkgs/tools/misc/gh-ost/default.nix
@@ -7,7 +7,8 @@ let
in
buildGoPackage ({
- name = "gh-ost-${version}";
+ pname = "gh-ost";
+ inherit version;
inherit goPackagePath;
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/tools/misc/gibo/default.nix
index 5c8bacac162c..a8e957ce4840 100644
--- a/pkgs/tools/misc/gibo/default.nix
+++ b/pkgs/tools/misc/gibo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, coreutils, findutils, git }:
stdenv.mkDerivation rec {
- name = "gibo-${version}";
+ pname = "gibo";
version = "1.0.6";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/tools/misc/gif-for-cli/default.nix
index b8b86e07abb0..771fc354da42 100644
--- a/pkgs/tools/misc/gif-for-cli/default.nix
+++ b/pkgs/tools/misc/gif-for-cli/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "gif-for-cli";
version = "unstable-2018-08-14";
diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix
index afcf9cf4c781..5438f71930da 100644
--- a/pkgs/tools/misc/git-town/default.nix
+++ b/pkgs/tools/misc/git-town/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "git-town-${version}";
+ pname = "git-town";
version = "7.2.0";
goPackagePath = "github.com/Originate/git-town";
diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix
index be4de738c1c3..581a1f84fc7f 100644
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/pkgs/tools/misc/gnokii/default.nix
@@ -2,12 +2,12 @@
, readline, pcsclite, libical, gtk2, glib, libXpm }:
stdenv.mkDerivation rec {
- name = "gnokii-${version}";
+ pname = "gnokii";
version = "0.6.31";
src = fetchurl {
sha256 = "0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8";
- url = "https://www.gnokii.org/download/gnokii/${name}.tar.gz";
+ url = "https://www.gnokii.org/download/gnokii/${pname}-${version}.tar.gz";
};
buildInputs = [
diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index 0430f010e97a..6fad9829d799 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.3";
- name = "goaccess-${version}";
+ pname = "goaccess";
src = fetchurl {
url = "https://tar.goaccess.io/goaccess-${version}.tar.gz";
diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix
index d7c10220f4b7..bd53529a5d25 100644
--- a/pkgs/tools/misc/gosu/default.nix
+++ b/pkgs/tools/misc/gosu/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "gosu-${version}";
+ pname = "gosu";
version = "2017-05-09";
rev = "e87cf95808a7b16208515c49012aa3410bc5bba8";
diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index 59ac70a8162f..0f448cc089c8 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, makeWrapper, jre_headless }:
stdenv.mkDerivation rec {
+ pname = "graylog";
version = "3.1.0";
- name = "graylog-${version}";
src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix
index 6c5bac11e738..705c1a7e1d6a 100644
--- a/pkgs/tools/misc/gringo/default.nix
+++ b/pkgs/tools/misc/gringo/default.nix
@@ -7,8 +7,9 @@ let
version = "4.5.4";
in
-stdenv.mkDerivation rec {
- name = "gringo-${version}";
+stdenv.mkDerivation {
+ pname = "gringo";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz";
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index ec1c5897ed79..3f5485718dc5 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -10,28 +10,28 @@
with stdenv.lib;
let
pcSystems = {
- "i686-linux".target = "i386";
- "x86_64-linux".target = "i386";
+ i686-linux.target = "i386";
+ x86_64-linux.target = "i386";
};
efiSystemsBuild = {
- "i686-linux".target = "i386";
- "x86_64-linux".target = "x86_64";
- "aarch64-linux".target = "aarch64";
+ i686-linux.target = "i386";
+ x86_64-linux.target = "x86_64";
+ aarch64-linux.target = "aarch64";
};
# For aarch64, we need to use '--target=aarch64-efi' when building,
# but '--target=arm64-efi' when installing. Insanity!
efiSystemsInstall = {
- "i686-linux".target = "i386";
- "x86_64-linux".target = "x86_64";
- "aarch64-linux".target = "arm64";
+ i686-linux.target = "i386";
+ x86_64-linux.target = "x86_64";
+ aarch64-linux.target = "arm64";
};
canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild);
inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems);
- version = "2.04-rc1";
+ version = "2.04";
in (
@@ -40,12 +40,13 @@ assert zfsSupport -> zfs != null;
assert !(efiSupport && xenSupport);
stdenv.mkDerivation rec {
- name = "grub-${version}";
+ pname = "grub";
+ inherit version;
src = fetchgit {
url = "git://git.savannah.gnu.org/grub.git";
- rev = name;
- sha256 = "0xkcfxs0hbzvi33kg4abkayl8b7gym9sv8ljbwlh2kpz8i4kmnk0";
+ rev = "${pname}-${version}";
+ sha256 = "02gly3xw88pj4zzqjniv1fxa1ilknbq1mdk30bj6qy8n44g90i8w";
};
patches = [
diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix
index 19d8afb18575..6b796dedb0ad 100644
--- a/pkgs/tools/misc/grub/pvgrub_image/default.nix
+++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix
@@ -3,9 +3,9 @@
with stdenv.lib;
let
efiSystemsBuild = {
- "i686-linux".target = "i386";
- "x86_64-linux".target = "x86_64";
- "aarch64-linux".target = "aarch64";
+ i686-linux.target = "i386";
+ x86_64-linux.target = "x86_64";
+ aarch64-linux.target = "aarch64";
};
in (
diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix
index ca4e477adce7..1033a489c767 100644
--- a/pkgs/tools/misc/grub/trusted.nix
+++ b/pkgs/tools/misc/grub/trusted.nix
@@ -6,8 +6,8 @@
with stdenv.lib;
let
pcSystems = {
- "i686-linux".target = "i386";
- "x86_64-linux".target = "i386";
+ i686-linux.target = "i386";
+ x86_64-linux.target = "i386";
};
inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems);
@@ -29,7 +29,8 @@ let
in
stdenv.mkDerivation rec {
- name = "trustedGRUB2-${version}";
+ pname = "trustedGRUB2";
+ inherit version;
src = if for_HP_laptop
then fetchgit {
diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix
index ec77f3965273..2dd8688232f8 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@@ -4,8 +4,8 @@ let arch =
if stdenv.isi686 then "i386"
else if stdenv.isx86_64 then "x86_64"
else throw "Unknown architecture";
-in stdenv.mkDerivation rec {
- name = "grub4dos-${version}";
+in stdenv.mkDerivation {
+ pname = "grub4dos";
version = "0.4.6a-2019-05-12";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix
index f7cdf5ca608b..78a678f0714d 100644
--- a/pkgs/tools/misc/gsmartcontrol/default.nix
+++ b/pkgs/tools/misc/gsmartcontrol/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version="1.1.3";
- name = "gsmartcontrol-${version}";
+ pname = "gsmartcontrol";
src = fetchurl {
url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";
diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix
index a66b32c789c2..bca481cade45 100644
--- a/pkgs/tools/misc/gti/default.nix
+++ b/pkgs/tools/misc/gti/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "gti-${version}";
+ pname = "gti";
version = "1.6.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/h5utils/default.nix b/pkgs/tools/misc/h5utils/default.nix
index db18cae77b1f..9fe267771102 100644
--- a/pkgs/tools/misc/h5utils/default.nix
+++ b/pkgs/tools/misc/h5utils/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
version = "1.13.1";
- name = "h5utils-${version}";
+ pname = "h5utils";
# fetchurl is used instead of fetchFromGitHub because the git repo version requires
# additional tools to build compared to the tarball release; see the README for details.
diff --git a/pkgs/tools/misc/hackertyper/default.nix b/pkgs/tools/misc/hackertyper/default.nix
index 8657e34e1608..4b5973e7eeca 100644
--- a/pkgs/tools/misc/hackertyper/default.nix
+++ b/pkgs/tools/misc/hackertyper/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "hackertyper";
version = "2.1";
diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix
index be5e1371cd45..8c2e7dc7451d 100644
--- a/pkgs/tools/misc/hakuneko/default.nix
+++ b/pkgs/tools/misc/hakuneko/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, wxGTK30, openssl, curl }:
stdenv.mkDerivation rec {
- name = "hakuneko-${version}";
+ pname = "hakuneko";
version = "1.4.2";
src = fetchurl {
diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/tools/misc/hdaps-gl/default.nix
index 8b19cd038951..af4d4228c2c6 100644
--- a/pkgs/tools/misc/hdaps-gl/default.nix
+++ b/pkgs/tools/misc/hdaps-gl/default.nix
@@ -2,7 +2,8 @@
let version = "0.0.5"; in
stdenv.mkDerivation {
- name = "hdaps-gl-${version}";
+ pname = "hdaps-gl";
+ inherit version;
src = fetchzip {
url = "mirror://sourceforge/project/hdaps/hdaps-gl/hdaps-gl-${version}/hdaps-gl-${version}.tar.gz";
sha256 = "16fk4k0lvr4c95vd6c7qdylcqa1h5yjp3xm4xwipdjbp0bvsgxq4";
diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix
index bd3bebc881ee..e765e9234745 100644
--- a/pkgs/tools/misc/hdf4/default.nix
+++ b/pkgs/tools/misc/hdf4/default.nix
@@ -8,7 +8,7 @@
}:
stdenv.mkDerivation rec {
- name = "hdf-${version}";
+ pname = "hdf";
version = "4.2.14";
src = fetchurl {
url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2";
diff --git a/pkgs/tools/misc/hdf5/1_8.nix b/pkgs/tools/misc/hdf5/1_8.nix
index 17b48ad8741a..d27f6fc01bce 100644
--- a/pkgs/tools/misc/hdf5/1_8.nix
+++ b/pkgs/tools/misc/hdf5/1_8.nix
@@ -24,9 +24,9 @@ let inherit (stdenv.lib) optional optionals; in
stdenv.mkDerivation rec {
version = "1.8.19";
- name = "hdf5-${version}";
+ pname = "hdf5";
src = fetchurl {
- url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${name}/src/${name}.tar.bz2";
+ url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${pname}-${version}/src/${pname}-${version}.tar.bz2";
sha256 = "0f3jfbqpaaq21ighi40qzs52nb52kc2d2yjk541rjmsx20b3ih2r" ;
};
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index e6402322d35a..336010718dda 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -17,9 +17,9 @@ let inherit (stdenv.lib) optional optionals; in
stdenv.mkDerivation rec {
version = "1.10.5";
- name = "hdf5-${version}";
+ pname = "hdf5";
src = fetchurl {
- url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2";
+ url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${pname}-${version}/src/${pname}-${version}.tar.bz2";
sha256 = "0i3g6v521vigzbx8wpd32ibsiiw92r65ca3qdbn0d8fj8f4fmmk8";
};
diff --git a/pkgs/tools/misc/hdfjava/default.nix b/pkgs/tools/misc/hdfjava/default.nix
index 0fe72425d79c..6087a76e6bd1 100644
--- a/pkgs/tools/misc/hdfjava/default.nix
+++ b/pkgs/tools/misc/hdfjava/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, javac }:
stdenv.mkDerivation rec {
- name = "hdf-java-${version}";
+ pname = "hdf-java";
version = "3.3.2";
src = fetchurl {
diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix
index 82801da322c6..fb6914c01d0a 100644
--- a/pkgs/tools/misc/hdfview/default.nix
+++ b/pkgs/tools/misc/hdfview/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ant, javac, hdf_java }:
stdenv.mkDerivation rec {
- name = "hdfview-${version}";
+ pname = "hdfview";
version = "2.14";
src = fetchurl {
- url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}.tar.gz";
+ url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${pname}-${version}.tar.gz";
sha256 = "0lv9djfm7hnp14mcyzbiax3xjb8vkbzhh7bdl6cvgy53pc08784p";
};
diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix
index 76795892e715..bf6740d7ee4a 100644
--- a/pkgs/tools/misc/heatseeker/default.nix
+++ b/pkgs/tools/misc/heatseeker/default.nix
@@ -3,7 +3,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "heatseeker-${version}";
+ pname = "heatseeker";
version = "1.5.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix
index 55542b4c7fc6..39678abeba43 100644
--- a/pkgs/tools/misc/hebcal/default.nix
+++ b/pkgs/tools/misc/hebcal/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "4.18";
- name = "hebcal-${version}";
+ pname = "hebcal";
src = fetchFromGitHub {
owner = "hebcal";
diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
index 9e21ab5e38ff..a8100e455f0b 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/pkgs/tools/misc/heimdall/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchFromGitHub, cmake
-, zlib, libusb1
-, enableGUI ? false, qtbase ? null }:
+{ stdenv, mkDerivation, fetchFromGitHub, cmake, zlib, libusb1
+, enableGUI ? false, qtbase ? null
+}:
-stdenv.mkDerivation rec {
+let version = "1.4.2"; in
+
+mkDerivation {
name = "heimdall-${if enableGUI then "gui-" else ""}${version}";
- version = "1.4.2";
src = fetchFromGitHub {
owner = "Benjamin-Dobell";
diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/tools/misc/hexd/default.nix
index b080e23b265a..eabb7838e8ac 100644
--- a/pkgs/tools/misc/hexd/default.nix
+++ b/pkgs/tools/misc/hexd/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "hexd-${version}";
+ pname = "hexd";
version = "1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/tools/misc/hhpc/default.nix
index b4ee1f2f5c0d..4b1b0d0c7623 100644
--- a/pkgs/tools/misc/hhpc/default.nix
+++ b/pkgs/tools/misc/hhpc/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, xorg, pkgconfig}:
stdenv.mkDerivation rec {
- name = "hhpc-${version}";
+ pname = "hhpc";
version = "0.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/hostsblock/default.nix b/pkgs/tools/misc/hostsblock/default.nix
index a0fcc6074dc0..a6ed7bf92ff9 100644
--- a/pkgs/tools/misc/hostsblock/default.nix
+++ b/pkgs/tools/misc/hostsblock/default.nix
@@ -19,8 +19,8 @@
".bp.blogspot.com"
] }:
-stdenv.mkDerivation rec {
- name = "hostsblock-${version}";
+stdenv.mkDerivation {
+ pname = "hostsblock";
version = "20161213";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/tools/misc/hpl/default.nix
index d9aaefb46d94..16bc0393f23c 100644
--- a/pkgs/tools/misc/hpl/default.nix
+++ b/pkgs/tools/misc/hpl/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openblasCompat, mpi } :
stdenv.mkDerivation rec {
- name = "hpl-${version}";
+ pname = "hpl";
version = "2.3";
src = fetchurl {
- url = "http://www.netlib.org/benchmark/hpl/${name}.tar.gz";
+ url = "http://www.netlib.org/benchmark/hpl/${pname}-${version}.tar.gz";
sha256 = "0c18c7fzlqxifz1bf3izil0bczv3a7nsv0dn6winy3ik49yw3i9j";
};
diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock
index 6b0d5d3387c2..be01c0118b3d 100644
--- a/pkgs/tools/misc/html-proofer/Gemfile.lock
+++ b/pkgs/tools/misc/html-proofer/Gemfile.lock
@@ -1,41 +1,28 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (5.2.3)
- concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (>= 0.7, < 2)
- minitest (~> 5.1)
- tzinfo (~> 1.1)
- addressable (2.6.0)
- public_suffix (>= 2.0.2, < 4.0)
- concurrent-ruby (1.1.5)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.11.1)
- html-proofer (3.11.1)
- activesupport (>= 4.2, < 6.0)
+ html-proofer (3.12.2)
addressable (~> 2.3)
- mercenary (~> 0.3.2)
- nokogiri (~> 1.9)
+ mercenary (~> 0.3)
+ nokogiri (~> 1.10)
parallel (~> 1.3)
rainbow (~> 3.0)
typhoeus (~> 1.3)
yell (~> 2.0)
- i18n (1.6.0)
- concurrent-ruby (~> 1.0)
mercenary (0.3.6)
mini_portile2 (2.4.0)
- minitest (5.11.3)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
parallel (1.17.0)
- public_suffix (3.1.1)
+ public_suffix (4.0.1)
rainbow (3.0.0)
- thread_safe (0.3.6)
typhoeus (1.3.1)
ethon (>= 0.9.0)
- tzinfo (1.2.5)
- thread_safe (~> 0.1)
yell (2.2.0)
PLATFORMS
diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix
index 256243f3d5d1..2deda655d995 100644
--- a/pkgs/tools/misc/html-proofer/gemset.nix
+++ b/pkgs/tools/misc/html-proofer/gemset.nix
@@ -1,35 +1,14 @@
{
- activesupport = {
- dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8";
- type = "gem";
- };
- version = "5.2.3";
- };
addressable = {
dependencies = ["public_suffix"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
+ sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
type = "gem";
};
- version = "2.6.0";
- };
- concurrent-ruby = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
- type = "gem";
- };
- version = "1.1.5";
+ version = "2.7.0";
};
ethon = {
dependencies = ["ffi"];
@@ -53,26 +32,15 @@
version = "1.11.1";
};
html-proofer = {
- dependencies = ["activesupport" "addressable" "mercenary" "nokogiri" "parallel" "rainbow" "typhoeus" "yell"];
+ dependencies = ["addressable" "mercenary" "nokogiri" "parallel" "rainbow" "typhoeus" "yell"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kpcz7p0yjr1y9fs8gila2bkgb8y6qkyqv5a8yymw0hkvddnqig4";
+ sha256 = "0xkcchgvlqkk3xgn11vw8n42bhavj6nn6vqsbycbx1rqxgiljlhy";
type = "gem";
};
- version = "3.11.1";
- };
- i18n = {
- dependencies = ["concurrent-ruby"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
- type = "gem";
- };
- version = "1.6.0";
+ version = "3.12.2";
};
mercenary = {
groups = ["default"];
@@ -94,16 +62,6 @@
};
version = "2.4.0";
};
- minitest = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
- type = "gem";
- };
- version = "5.11.3";
- };
nokogiri = {
dependencies = ["mini_portile2"];
groups = ["default"];
@@ -130,10 +88,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm";
+ sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
type = "gem";
};
- version = "3.1.1";
+ version = "4.0.1";
};
rainbow = {
groups = ["default"];
@@ -145,16 +103,6 @@
};
version = "3.0.0";
};
- thread_safe = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
- type = "gem";
- };
- version = "0.3.6";
- };
typhoeus = {
dependencies = ["ethon"];
groups = ["default"];
@@ -166,17 +114,6 @@
};
version = "1.3.1";
};
- tzinfo = {
- dependencies = ["thread_safe"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
- type = "gem";
- };
- version = "1.2.5";
- };
yell = {
groups = ["default"];
platforms = [];
diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix
index 7035f2ecedff..bc934c424f30 100644
--- a/pkgs/tools/misc/i3cat/default.nix
+++ b/pkgs/tools/misc/i3cat/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "i3cat-${version}";
+ pname = "i3cat";
version = "20150321-${stdenv.lib.strings.substring 0 7 rev}";
rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576";
diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix
index 898ecd9df4a8..372eebb59f61 100644
--- a/pkgs/tools/misc/i3minator/default.nix
+++ b/pkgs/tools/misc/i3minator/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages, glibcLocales }:
pythonPackages.buildPythonApplication rec {
- name = "i3minator-${version}";
+ pname = "i3minator";
version = "0.0.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix
index 141fc968a2d4..872de2c702b6 100644
--- a/pkgs/tools/misc/ical2org/default.nix
+++ b/pkgs/tools/misc/ical2org/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildGoPackage}:
buildGoPackage rec {
- name = "ical2org-${version}";
+ pname = "ical2org";
version="1.1.5";
goPackagePath = "github.com/rjhorniii/ical2org";
diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix
index 15af413a999d..98b039e3f8ae 100644
--- a/pkgs/tools/misc/ideviceinstaller/default.nix
+++ b/pkgs/tools/misc/ideviceinstaller/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
pname = "ideviceinstaller";
version = "2018-10-01";
- name = "${pname}-${version}";
-
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
diff --git a/pkgs/tools/misc/ifdtool/default.nix b/pkgs/tools/misc/ifdtool/default.nix
deleted file mode 100644
index 7d15825c27e8..000000000000
--- a/pkgs/tools/misc/ifdtool/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- name = "ifdtool-${version}";
- version = "4.9";
-
- src = fetchurl {
- url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
- sha256 = "0xkai65d3z9fivwscbkm7ndcw2p9g794xz8fwdv979w77n5qsdij";
- };
-
- buildPhase = ''
- make -C util/ifdtool
- '';
-
- installPhase = ''
- install -Dm755 util/ifdtool/ifdtool $out/bin/ifdtool
- '';
-
- meta = with stdenv.lib; {
- description = "Extract and dump Intel Firmware Descriptor information";
- homepage = https://www.coreboot.org;
- license = licenses.gpl2;
- maintainers = [ maintainers.petabyteboy ];
- platforms = platforms.linux;
- };
-}
-
diff --git a/pkgs/tools/misc/intelmetool/default.nix b/pkgs/tools/misc/intelmetool/default.nix
deleted file mode 100644
index 66378e457a26..000000000000
--- a/pkgs/tools/misc/intelmetool/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchgit, zlib, pciutils }:
-
-stdenv.mkDerivation rec {
- name = "intelmetool-${version}";
- version = "4.8.1";
-
- src = fetchgit {
- url = "https://review.coreboot.org/coreboot.git";
- rev = version;
- sha256 = "1gjisy9b7vgzjvy1fwaqhq3589yd59kkylv7apjmg5r2b3dv4zvr";
- fetchSubmodules = false;
- };
-
- buildInputs = [ zlib pciutils ];
-
- buildPhase = ''
- make -C util/intelmetool
- '';
-
- installPhase = ''
- mkdir -p $out/bin
- cp util/intelmetool/intelmetool $out/bin
- '';
-
- meta = with stdenv.lib; {
- description = "Dump interesting things about Management Engine";
- homepage = https://www.coreboot.org/Nvramtool;
- license = licenses.gpl2;
- maintainers = [ maintainers.gnidorah ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/tools/misc/ipad_charge/default.nix
index caefcb835a3f..981d9f2dc6cf 100644
--- a/pkgs/tools/misc/ipad_charge/default.nix
+++ b/pkgs/tools/misc/ipad_charge/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libusb1 }:
stdenv.mkDerivation rec {
- name = "ipad_charge-${version}";
+ pname = "ipad_charge";
version = "2015-02-03";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix
index a87d199d9bd4..3529324b30ad 100644
--- a/pkgs/tools/misc/ised/default.nix
+++ b/pkgs/tools/misc/ised/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ised-${version}";
+ pname = "ised";
version = "2.7.1";
src = fetchurl {
- url = "mirror://sourceforge/project/ised/${name}.tar.bz2";
+ url = "mirror://sourceforge/project/ised/${pname}-${version}.tar.bz2";
sha256 = "0fhha61whkkqranqdxg792g0f5kgp5m3m6z1iqcvjh2c34rczbmb";
};
diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/tools/misc/ix/default.nix
index fdbd7611dce5..cedaa13b74a0 100644
--- a/pkgs/tools/misc/ix/default.nix
+++ b/pkgs/tools/misc/ix/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, curl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ix";
version = "20190815";
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix
index 08fbba873e5b..b1d71a892d6f 100644
--- a/pkgs/tools/misc/jdiskreport/default.nix
+++ b/pkgs/tools/misc/jdiskreport/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip, jre }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "jdiskreport-1.4.1";
builder = ./builder.sh;
diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix
index d82347fef8f8..bf1501155d96 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/pkgs/tools/misc/jdupes/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "jdupes-${version}";
+ pname = "jdupes";
version = "1.13.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix
index 7e6b6124024a..56a1dc75a455 100644
--- a/pkgs/tools/misc/journaldriver/default.nix
+++ b/pkgs/tools/misc/journaldriver/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl, systemd }:
rustPlatform.buildRustPackage rec {
- name = "journaldriver-${version}";
+ pname = "journaldriver";
version = "1.1.0";
cargoSha256 = "0wmr0r54ar7gvhvhv76a49ap74lx8hl79bf73vc4f4xlj7hj303g";
diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix
index 822932dc5ac4..480c0abc728d 100644
--- a/pkgs/tools/misc/kargo/default.nix
+++ b/pkgs/tools/misc/kargo/default.nix
@@ -2,10 +2,10 @@
python2Packages.buildPythonApplication rec {
version = "0.4.6";
- name = "kargo-${version}";
+ pname = "kargo";
src = fetchurl {
- url = "mirror://pypi/k/kargo/${name}.tar.gz";
+ url = "mirror://pypi/k/kargo/${pname}-${version}.tar.gz";
sha256 = "1sm721c3d4scpc1gj2j3qwssr6jjvw6aq3p7ipvhbd9ywmm9dd7b";
};
diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix
index ce343c7cc394..0fd1c7c5cd73 100644
--- a/pkgs/tools/misc/kdecoration-viewer/default.nix
+++ b/pkgs/tools/misc/kdecoration-viewer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, mkDerivation
, cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }:
-mkDerivation rec {
+mkDerivation {
name = "kdecoration-viewer-2018-07-24";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix
index a021064a5ff9..9f739da0afa0 100644
--- a/pkgs/tools/misc/kermit/default.nix
+++ b/pkgs/tools/misc/kermit/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ncurses, glibc }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "kermit-9.0.302";
src = fetchurl {
diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix
index 208c04ff039b..e10b42273be8 100644
--- a/pkgs/tools/misc/keychain/default.nix
+++ b/pkgs/tools/misc/keychain/default.nix
@@ -2,13 +2,13 @@
, perl, procps, gnugrep, gawk, findutils, gnused }:
stdenv.mkDerivation rec {
- name = "keychain-${version}";
+ pname = "keychain";
version = "2.8.5";
src = fetchFromGitHub {
owner = "funtoo";
repo = "keychain";
- rev = "${version}";
+ rev = version;
sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj";
};
diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix
index b6b56e1df937..3667b483383b 100644
--- a/pkgs/tools/misc/kisslicer/default.nix
+++ b/pkgs/tools/misc/kisslicer/default.nix
@@ -17,7 +17,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "kisslicer-1.6.3";
src = fetchzip {
diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix
index 4e83c2479f1d..632001f6329a 100644
--- a/pkgs/tools/misc/kronometer/default.nix
+++ b/pkgs/tools/misc/kronometer/default.nix
@@ -4,15 +4,12 @@
kconfig, kcrash, kinit
}:
-let
+mkDerivation rec {
pname = "kronometer";
version = "2.2.3";
-in
-mkDerivation rec {
- name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+ url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
sha256 = "05hs8729a3aqjpwmn2xdf2sriacrll4sj4ax3lm4s1ravj09n9bm";
};
@@ -22,6 +19,6 @@ mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kconfig kcrash kinit ];
}
diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix
index be0ceda511c4..c272584e2c05 100644
--- a/pkgs/tools/misc/kt/default.nix
+++ b/pkgs/tools/misc/kt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "kt-${version}";
+ pname = "kt";
version = "12.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix
index b7963c3ed817..2ca99eb61e88 100644
--- a/pkgs/tools/misc/latex2html/default.nix
+++ b/pkgs/tools/misc/latex2html/default.nix
@@ -6,7 +6,7 @@
# https://github.com/Homebrew/homebrew-core/blob/21834573f690407d34b0bbf4250b82ec38dda4d6/Formula/latex2html.rb
stdenv.mkDerivation rec {
- name = "latex2html-${version}";
+ pname = "latex2html";
version = "2018";
src = fetchurl {
diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix
index a8ca200129a0..9ee494e1f868 100644
--- a/pkgs/tools/misc/lazydocker/default.nix
+++ b/pkgs/tools/misc/lazydocker/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lazydocker";
- version = "0.7";
+ version = "0.7.4";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = "lazydocker";
rev = "v${version}";
- sha256 = "0vai88g31yf55988paqzs7fqlxgi0ydrsgszzjig9ai3x9c52xim";
+ sha256 = "03l6gs4p9p8g0ai6wqg9024rp0pd13m0b9y3sy1ww5afwxb82br6";
};
- modSha256 = "1iin1m6s9xxdskvj6jy2jwlqrsrm432ld13cpa28hpx7pylx61ij";
+ modSha256 = "1hzrin8dfsfnxpc37szc1449s235w0dr24albswz06fjnl4bbs5y";
subPackages = [ "." ];
diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix
index e48d6354eb53..6624eb5102d3 100644
--- a/pkgs/tools/misc/lbdb/default.nix
+++ b/pkgs/tools/misc/lbdb/default.nix
@@ -12,7 +12,8 @@ in
with stdenv.lib;
with perlPackages;
stdenv.mkDerivation {
- name = "lbdb-${version}";
+ pname = "lbdb";
+ inherit version;
src = fetchurl {
url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz";
sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh";
diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix
index 72c9cecf5406..3d2b7c5b214c 100644
--- a/pkgs/tools/misc/ldapvi/default.nix
+++ b/pkgs/tools/misc/ldapvi/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }:
-stdenv.mkDerivation rec {
- name = "ldapvi-${version}";
+stdenv.mkDerivation {
+ pname = "ldapvi";
version = "0lz1sb5r0y9ypy8d7hm0l2wfa8l69f8ll0i5c78c0apz40nyjqkg";
# use latest git, it includes some important patches since 2007 release
diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix
index c6b544f9e0a1..b59c46a84779 100644
--- a/pkgs/tools/misc/ldmtool/default.nix
+++ b/pkgs/tools/misc/ldmtool/default.nix
@@ -2,7 +2,7 @@
libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl }:
stdenv.mkDerivation rec {
- name = "ldmtool-${version}";
+ pname = "ldmtool";
version = "0.2.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index 95f88654425f..61e115e71eb7 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -1,7 +1,7 @@
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
- name = "lf-${version}";
+ pname = "lf";
version = "13";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix
index 8c9db5b8a778..e31112a74d8a 100644
--- a/pkgs/tools/misc/libcpuid/default.nix
+++ b/pkgs/tools/misc/libcpuid/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "libcpuid-${version}";
+ pname = "libcpuid";
version = "0.4.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix
index d489a5188f14..9bc7c372d93c 100644
--- a/pkgs/tools/misc/linuxquota/default.nix
+++ b/pkgs/tools/misc/linuxquota/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "4.05";
- name = "quota-${version}";
+ pname = "quota";
src = fetchurl {
url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz";
diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix
deleted file mode 100644
index 7834bc96bef0..000000000000
--- a/pkgs/tools/misc/logstash/5.x.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, elk5Version, makeWrapper, jre }:
-
-stdenv.mkDerivation rec {
- version = elk5Version;
- name = "logstash-${version}";
-
- src = fetchurl {
- url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
- sha256 = "0sax9p2bwjdrcvkm1mgvljdjn2qkyjd5i8rzajdn3n98gqin1la0";
- };
-
- dontBuild = true;
- dontPatchELF = true;
- dontStrip = true;
- dontPatchShebangs = true;
-
- buildInputs = [
- makeWrapper jre
- ];
-
- installPhase = ''
- mkdir -p $out
- cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
-
- wrapProgram $out/bin/logstash \
- --set JAVA_HOME "${jre}"
-
- wrapProgram $out/bin/logstash-plugin \
- --set JAVA_HOME "${jre}"
- '';
-
- meta = with stdenv.lib; {
- description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems";
- homepage = https://www.elastic.co/products/logstash;
- license = licenses.asl20;
- platforms = platforms.unix;
- maintainers = [ maintainers.wjlroe maintainers.offline ];
- };
-}
diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix
index be26aee03b98..c926d220b05d 100644
--- a/pkgs/tools/misc/logstash/6.x.nix
+++ b/pkgs/tools/misc/logstash/6.x.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
sha256 =
if enableUnfree
- then "178shgxwc9kw9w9vwsvwxp8m8r6lssaw1i32vvmx9na01b4w5m4p"
- else "0gyq97qsg7fys9cc5yj4kpcf3xxvdd5qgzal368yg9swps37g5yj";
+ then "00pwi7clgdflzzg15bh3y30gzikvvy7p5fl88fww7xhhy47q8053"
+ else "0spxgqsyh72n0l0xh6rljp0lbqz46xmr02sqz25ybycr4qkxdhgk";
};
dontBuild = true;
diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix
index aa768e532b80..9eff84e67dc5 100644
--- a/pkgs/tools/misc/logstash/7.x.nix
+++ b/pkgs/tools/misc/logstash/7.x.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
sha256 =
if enableUnfree
- then "0ls7ia4ldyb7kslmjqhszb30bkammdm5nydc5y7r41zl1zjlhfgc"
- else "1mpmfnc57vpjk8x3vibamz8lgq163msf20m1bail4hbwhwsmms9i";
+ then "1mw053bx2zh5320p545ax8fnydzqj28r239l7a4m1d2shi89w6s8"
+ else "0d57ahak4chxmd0pmgkbmig2wacprv120pwmjlx63sxf5vw72yap";
};
dontBuild = true;
diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix
index dc33d2ece548..b580d559868b 100644
--- a/pkgs/tools/misc/logstash/contrib.nix
+++ b/pkgs/tools/misc/logstash/contrib.nix
@@ -4,7 +4,7 @@
# $path/logstash/{inputs,codecs,filters,outputs}/*.rb
stdenv.mkDerivation rec {
version = "1.4.2";
- name = "logstash-contrib-${version}";
+ pname = "logstash-contrib";
src = fetchzip {
url = "https://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz";
diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock
index f6aa88bbdea1..ed48cc5921b0 100644
--- a/pkgs/tools/misc/lolcat/Gemfile.lock
+++ b/pkgs/tools/misc/lolcat/Gemfile.lock
@@ -1,13 +1,13 @@
GEM
remote: https://rubygems.org/
specs:
- lolcat (99.9.99)
+ lolcat (100.0.0)
manpages (~> 0.6.1)
optimist (~> 3.0.0)
- paint (~> 2.0.0)
+ paint (~> 2.1.0)
manpages (0.6.1)
optimist (3.0.0)
- paint (2.0.3)
+ paint (2.1.1)
PLATFORMS
ruby
diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix
index f21e5637993d..2c2bc9cead10 100644
--- a/pkgs/tools/misc/lolcat/gemset.nix
+++ b/pkgs/tools/misc/lolcat/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0422869sf6hif1nrfzi8fwklnrdqj6hxxwg3403xvd9d50yndrn4";
+ sha256 = "0k1m2ihcprjq9jdmq2v3xlf27hqbpr2vjnnyfwp3z2zspzbl0nys";
type = "gem";
};
- version = "99.9.99";
+ version = "100.0.0";
};
manpages = {
groups = ["default"];
@@ -35,9 +35,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ldb269l3pzkihmsws19cr9h3l6naw8c2fqpav8ck3nllnyiv7r2";
+ sha256 = "0rrb2p2yk6ffhm0gz8ba431mf63kq7w27gwavxl7n8qd2splj4mh";
type = "gem";
};
- version = "2.0.3";
+ version = "2.1.1";
};
-}
+}
\ No newline at end of file
diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix
index cb594391e2a1..84a92ec77128 100644
--- a/pkgs/tools/misc/ltunify/default.nix
+++ b/pkgs/tools/misc/ltunify/default.nix
@@ -3,8 +3,8 @@
# Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of
# adding this to services.udev.packages on NixOS
-stdenv.mkDerivation rec {
- name = "ltunify-${version}";
+stdenv.mkDerivation {
+ pname = "ltunify";
version = "unstable-20180330";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index ced4a156137d..df1a2daddb91 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -1,33 +1,47 @@
{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }:
stdenv.mkDerivation rec {
- name = "man-db-2.7.5";
+ name = "man-db-2.8.6.1";
src = fetchurl {
url = "mirror://savannah/man-db/${name}.tar.xz";
- sha256 = "056a3il7agfazac12yggcg4gf412yq34k065im0cpfxbcw6xskaw";
+ sha256 = "0a1sh5gxa16k6irzf3q2lli8m204w9ik1xm62wjgf1mzknxs4xrc";
};
outputs = [ "out" "doc" ];
outputMan = "out"; # users will want `man man` to work
- nativeBuildInputs = [ pkgconfig makeWrapper groff ]
- ++ stdenv.lib.optionals doCheck checkInputs;
+ nativeBuildInputs = [ pkgconfig makeWrapper groff ];
buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input)
checkInputs = [ libiconv /* for 'iconv' binary */ ];
postPatch = ''
- substituteInPlace src/man_db.conf.in \
- --replace "/usr/local/share" "/run/current-system/sw/share" \
- --replace "/usr/share" "/run/current-system/sw/share"
+ # Remove all mandatory manpaths. Nixpkgs makes no requirements on
+ # these directories existing.
+ sed -i 's/^MANDATORY_MANPATH/# &/' src/man_db.conf.in
+
+ # Add Nixpkgs and NixOS-related manpaths
+ echo "MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man" >> src/man_db.conf.in
+ echo "MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man" >> src/man_db.conf.in
+ echo "MANPATH_MAP /nix/var/nix/profiles/default/bin /nix/var/nix/profiles/default/share/man" >> src/man_db.conf.in
+
+ # Add mandb locations for the above
+ echo "MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos" >> src/man_db.conf.in
+ echo "MANDB_MAP /nix/var/nix/profiles/default/share/man /var/cache/man/nixpkgs" >> src/man_db.conf.in
'';
configureFlags = [
"--disable-setuid"
+ "--disable-cache-owner"
"--localstatedir=/var"
# Don't try /etc/man_db.conf by default, so we avoid error messages.
- "--with-config-file=\${out}/etc/man_db.conf"
- "--with-systemdtmpfilesdir=\${out}/lib/tmpfiles.d"
+ "--with-config-file=${placeholder "out"}/etc/man_db.conf"
+ "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
+ "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+ ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin [
+ "ac_cv_func__set_invalid_parameter_handler=no"
+ "ac_cv_func_posix_fadvise=no"
+ "ac_cv_func_mempcpy=no"
];
preConfigure = ''
@@ -57,7 +71,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- doCheck = !stdenv.hostPlatform.isMusl; /* iconv binary */
+ doCheck = !stdenv.hostPlatform.isMusl /* iconv binary */ && !stdenv.hostPlatform.isDarwin;
meta = with stdenv.lib; {
homepage = http://man-db.nongnu.org;
diff --git a/pkgs/tools/misc/man/conf.patch b/pkgs/tools/misc/man/conf.patch
deleted file mode 100644
index 43e8642fb34a..000000000000
--- a/pkgs/tools/misc/man/conf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru -x '*~' man-1.6g-orig/src/man-config.c man-1.6g/src/man-config.c
---- man-1.6g-orig/src/man-config.c 2005-08-21 01:26:06.000000000 +0200
-+++ man-1.6g/src/man-config.c 2012-03-06 11:11:28.159050524 +0100
-@@ -214,8 +214,9 @@
- const char *configuration_file = "[no configuration file]";
-
- char *default_config_files[] = {
-+ "/etc/man.conf",
- CONFIG_FILE, /* compiled-in default */
-- "/etc/man.conf", "/etc/man.config",
-+ "/etc/man.config",
- "/usr/lib/man.conf", "/usr/lib/man.config",
- "/usr/share/misc/man.conf", "/usr/share/misc/man.config"
- };
diff --git a/pkgs/tools/misc/man/default.nix b/pkgs/tools/misc/man/default.nix
deleted file mode 100644
index 2f61a30714e2..000000000000
--- a/pkgs/tools/misc/man/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, fetchurl, groff, less }:
-
-stdenv.mkDerivation rec {
- name = "man-1.6g";
-
- src = fetchurl {
- url = "http://primates.ximian.com/~flucifredi/man/${name}.tar.gz";
- sha256 = "17wmp2ahkhl72cvfzshmck22dnq2lbjg0678swihj270yk1vip6c";
- };
-
- buildInputs = [ groff less ];
-
- preBuild = ''
- makeFlagsArray=(bindir=$out/bin sbindir=$out/sbin libdir=$out/lib mandir=$out/share/man)
- '';
-
- patches = [
- # Search in "share/man" relative to each path in $PATH (in addition to "man").
- ./share.patch
-
- # Prefer /etc/man.conf over $out/lib/man.conf. Man only reads the
- # first file that exists, so this is necessary to allow the
- # builtin config to be overriden.
- ./conf.patch
- ];
-
- preConfigure = ''
- sed 's/^PREPATH=.*/PREPATH=$PATH/' -i configure
- '';
-
- postInstall =
- ''
- # Use UTF-8 by default. Otherwise man won't know how to deal
- # with certain characters.
- substituteInPlace $out/lib/man.conf \
- --replace "nroff -Tlatin1" "nroff" \
- --replace "eqn -Tlatin1" "eqn -Tutf8"
-
- # Work around a bug in substituteInPlace. It loses the final
- # newline, and man requires every line in man.conf to be
- # terminated by a newline.
- echo >> $out/lib/man.conf
- '';
-
- meta = {
- homepage = http://primates.ximian.com/~flucifredi/man/;
- description = "Tool to read online Unix documentation";
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/tools/misc/man/share.patch b/pkgs/tools/misc/man/share.patch
deleted file mode 100644
index 837786e28eba..000000000000
--- a/pkgs/tools/misc/man/share.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -rc man-1.6f-orig/src/manpath.c man-1.6f/src/manpath.c
-*** man-1.6f-orig/src/manpath.c 2006-08-03 23:18:33.000000000 +0200
---- man-1.6f/src/manpath.c 2008-02-07 15:31:43.000000000 +0100
-***************
-*** 109,121 ****
- * or ../man or ../man1 or ../man8 subdirectories.
- */
- static char *
-! find_man_subdir (char *p) {
- int len;
- char *t, *sp;
-
- len = strlen (p);
-
-! t = my_malloc ((unsigned) len + 20);
-
- memcpy (t, p, len);
- strcpy (t + len, "/man");
---- 109,121 ----
- * or ../man or ../man1 or ../man8 subdirectories.
- */
- static char *
-! find_man_subdir (char *p, char * maybe_share) {
- int len;
- char *t, *sp;
-
- len = strlen (p);
-
-! t = my_malloc ((unsigned) len + 30);
-
- memcpy (t, p, len);
- strcpy (t + len, "/man");
-***************
-*** 139,159 ****
- }
-
- /* look for the situation with packagedir/bin and packagedir/man */
-! strcpy (t + len, "/man");
-
- if (is_directory (t) == 1)
- return t;
-
- /* look for the situation with pkg/bin and pkg/man1 or pkg/man8 */
- /* (looking for all man[1-9] would probably be a waste of stats) */
-! strcpy (t + len, "/man1");
-
- if (is_directory (t) == 1) {
- t[len] = 0;
- return t;
- }
-
-! strcpy (t + len, "/man8");
-
- if (is_directory (t) == 1) {
- t[len] = 0;
---- 139,159 ----
- }
-
- /* look for the situation with packagedir/bin and packagedir/man */
-! sprintf (t + len, "%s/man", maybe_share);
-
- if (is_directory (t) == 1)
- return t;
-
- /* look for the situation with pkg/bin and pkg/man1 or pkg/man8 */
- /* (looking for all man[1-9] would probably be a waste of stats) */
-! sprintf (t + len, "%s/man1", maybe_share);
-
- if (is_directory (t) == 1) {
- t[len] = 0;
- return t;
- }
-
-! sprintf (t + len, "%s/man8", maybe_share);
-
- if (is_directory (t) == 1) {
- t[len] = 0;
-***************
-*** 341,347 ****
- if (debug)
- gripe (IS_NOT_IN_CONFIG);
-
-! t = find_man_subdir (dir);
- if (t != NULL) {
- if (debug)
- gripe (MAN_NEARBY);
---- 341,347 ----
- if (debug)
- gripe (IS_NOT_IN_CONFIG);
-
-! t = find_man_subdir (dir, "");
- if (t != NULL) {
- if (debug)
- gripe (MAN_NEARBY);
-***************
-*** 352,357 ****
---- 352,370 ----
- if (debug)
- gripe (NO_MAN_NEARBY);
- }
-+
-+ t = find_man_subdir (dir, "/share");
-+ if (t != NULL) {
-+ if (debug)
-+ gripe (MAN_NEARBY);
-+
-+ add_to_mandirlist (t, perrs);
-+ free (t);
-+ } else {
-+ if (debug)
-+ gripe (NO_MAN_NEARBY);
-+ }
-+
- }
- }
-
diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix
index 9ddd92188016..828e23582363 100644
--- a/pkgs/tools/misc/mandoc/default.nix
+++ b/pkgs/tools/misc/mandoc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
- name = "mandoc-${version}";
+ pname = "mandoc";
version = "1.14.5";
src = fetchurl {
diff --git a/pkgs/tools/misc/marlin-calc/default.nix b/pkgs/tools/misc/marlin-calc/default.nix
index 34b10a550f6b..5c175053fc99 100644
--- a/pkgs/tools/misc/marlin-calc/default.nix
+++ b/pkgs/tools/misc/marlin-calc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "marlin-calc";
version = "2019-06-04";
diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix
index e2ff4868c9ea..6d198a35605d 100644
--- a/pkgs/tools/misc/massren/default.nix
+++ b/pkgs/tools/misc/massren/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "massren-${version}";
+ pname = "massren";
version = "1.5.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix
index 59ed474e9bc2..44b00adf5c17 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "20190725";
- name = "mbuffer-${version}";
+ pname = "mbuffer";
src = fetchurl {
url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index 7f0cdac1dbfa..b2711903ead1 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -2,11 +2,11 @@
, libX11, libICE, perl, zip, unzip, gettext, slang, libssh2, openssl}:
stdenv.mkDerivation rec {
- name = "mc-${version}";
+ pname = "mc";
version = "4.8.23";
src = fetchurl {
- url = "http://www.midnight-commander.org/downloads/${name}.tar.xz";
+ url = "http://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz";
sha256 = "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx";
};
diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix
index 334daef44817..db697bc9d511 100644
--- a/pkgs/tools/misc/mcfly/default.nix
+++ b/pkgs/tools/misc/mcfly/default.nix
@@ -1,9 +1,9 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
- name = "mcfly-${version}";
+ pname = "mcfly";
version = "v0.3.1";
- rev = "${version}";
+ rev = version;
src = fetchFromGitHub {
inherit rev;
diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix
index 52c96fda1973..bc520c57a338 100644
--- a/pkgs/tools/misc/mcrypt/default.nix
+++ b/pkgs/tools/misc/mcrypt/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "2.6.8";
- name = "mcrypt-${version}";
+ pname = "mcrypt";
src = fetchurl {
- url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${pname}-${version}.tar.gz";
sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098";
};
diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix
index 8a3842322f98..b365086c46d3 100644
--- a/pkgs/tools/misc/mdbtools/default.nix
+++ b/pkgs/tools/misc/mdbtools/default.nix
@@ -4,7 +4,8 @@
let version = "0.7.1";
in stdenv.mkDerivation {
- name = "mdbtools-${version}";
+ pname = "mdbtools";
+ inherit version;
src = fetchFromGitHub {
owner = "brianb";
diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix
index bbd78feaaf87..e202cc7ae469 100644
--- a/pkgs/tools/misc/megacli/default.nix
+++ b/pkgs/tools/misc/megacli/default.nix
@@ -1,15 +1,13 @@
-{ stdenv, rpmextract, ncurses5, patchelf, requireFile, unzip }:
+{ stdenv, rpmextract, ncurses5, patchelf, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "megacli-${version}";
+ pname = "megacli";
version = "8.07.14";
- src =
- requireFile {
- name = "${builtins.replaceStrings ["."] ["-"] version}_MegaCLI.zip";
- url = https://docs.broadcom.com/docs/12351587;
- sha256 = "1sdn58fbmd3fj4nzbajq3gcyw71ilgdh45r5p4sa6xmb7np55cfr";
- };
+ src = fetchurl {
+ url = "https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${builtins.replaceStrings ["."] ["-"] version}_MegaCLI.zip";
+ sha256 = "1sdn58fbmd3fj4nzbajq3gcyw71ilgdh45r5p4sa6xmb7np55cfr";
+ };
buildInputs = [rpmextract ncurses5 unzip];
libPath =
diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix
index b1d1971c75c7..48f048b3abf8 100644
--- a/pkgs/tools/misc/memtest86+/default.nix
+++ b/pkgs/tools/misc/memtest86+/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "memtest86+";
version = "5.01-coreboot-002";
diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix
index 4f6c4bad97c7..e382db0b92c3 100644
--- a/pkgs/tools/misc/mht2htm/default.nix
+++ b/pkgs/tools/misc/mht2htm/default.nix
@@ -4,7 +4,7 @@ let
date = "07.apr.2016";
in stdenv.mkDerivation rec {
- name = "mht2mht-${version}";
+ pname = "mht2mht";
version = "1.8.1.35";
src = fetchurl {
diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix
index 3c2ed1352257..168e1dac3a32 100644
--- a/pkgs/tools/misc/minicom/default.nix
+++ b/pkgs/tools/misc/minicom/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchgit, autoreconfHook, makeWrapper, pkgconfig
, lrzsz, ncurses, libiconv }:
-stdenv.mkDerivation rec {
- name = "minicom-${version}";
+stdenv.mkDerivation {
+ pname = "minicom";
version = "2.7.1";
# The repository isn't tagged properly, so we need to use commit refs
diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix
index 8e65d4d2a543..412726e276d6 100644
--- a/pkgs/tools/misc/miniserve/default.nix
+++ b/pkgs/tools/misc/miniserve/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib }:
rustPlatform.buildRustPackage rec {
- name = "miniserve-${version}";
+ pname = "miniserve";
version = "0.2.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ministat/default.nix b/pkgs/tools/misc/ministat/default.nix
index 7b9549a80fea..7b8b8a82b727 100644
--- a/pkgs/tools/misc/ministat/default.nix
+++ b/pkgs/tools/misc/ministat/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- name = "ministat-${version}";
+ pname = "ministat";
version = "20150715-1";
src = fetchgit {
diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix
index da1e8be7cf49..b2f7fdf2a906 100644
--- a/pkgs/tools/misc/mktorrent/default.nix
+++ b/pkgs/tools/misc/mktorrent/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, openssl}:
stdenv.mkDerivation rec {
- name = "mktorrent-${version}";
+ pname = "mktorrent";
version = "1.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix
index baf418ac9f04..f8fb253af471 100644
--- a/pkgs/tools/misc/mlocate/default.nix
+++ b/pkgs/tools/misc/mlocate/default.nix
@@ -3,11 +3,11 @@
let
dbfile = stdenv.lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config;
in stdenv.mkDerivation rec {
- name = "mlocate-${version}";
+ pname = "mlocate";
version = "0.26";
src = fetchurl {
- url = "https://releases.pagure.org/mlocate/${name}.tar.xz";
+ url = "https://releases.pagure.org/mlocate/${pname}-${version}.tar.xz";
sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh";
};
diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix
index 1d3a355dd950..a791cbe5d482 100644
--- a/pkgs/tools/misc/mmake/default.nix
+++ b/pkgs/tools/misc/mmake/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "mmake-${version}";
+ pname = "mmake";
version = "1.2.0";
goPackagePath = "github.com/tj/mmake";
diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix
index 602c9c26c787..6129f15c734f 100644
--- a/pkgs/tools/misc/mmv/default.nix
+++ b/pkgs/tools/misc/mmv/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "mmv-${version}";
+ pname = "mmv";
version = "1.01b";
src = fetchurl {
diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix
index 16762d243dbb..25d7eaba55ed 100644
--- a/pkgs/tools/misc/mongodb-compass/default.nix
+++ b/pkgs/tools/misc/mongodb-compass/default.nix
@@ -52,7 +52,8 @@ let
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
in stdenv.mkDerivation {
- name = "mongodb-compass-${version}";
+ pname = "mongodb-compass";
+ inherit version;
inherit src;
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix
index a728450d76e5..fd95faa40e15 100644
--- a/pkgs/tools/misc/mongodb-tools/default.nix
+++ b/pkgs/tools/misc/mongodb-tools/default.nix
@@ -1,27 +1,38 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, openssl_1_0_2, pkgconfig, libpcap }:
+{ stdenv
+, lib
+, buildGoPackage
+, fetchFromGitHub
+, openssl_1_0_2
+, pkgconfig
+, libpcap
+}:
let
tools = [
- "bsondump" "mongodump" "mongoexport" "mongofiles" "mongoimport"
- "mongoreplay" "mongorestore" "mongostat" "mongotop"
+ "bsondump"
+ "mongoimport"
+ "mongoexport"
+ "mongodump"
+ "mongorestore"
+ "mongostat"
+ "mongofiles"
+ "mongotop"
+ "mongoreplay"
];
-in
+ version = "4.2.0";
-with stdenv.lib;
-
-buildGoPackage rec {
- name = "mongo-tools-${version}";
- version = "3.7.2";
- rev = "r${version}";
+in buildGoPackage {
+ pname = "mongo-tools";
+ inherit version;
goPackagePath = "github.com/mongodb/mongo-tools";
- subPackages = map (t: t + "/main") tools;
+ subPackages = tools;
src = fetchFromGitHub {
- inherit rev;
+ rev = "r${version}";
owner = "mongodb";
repo = "mongo-tools";
- sha256 = "1y5hd4qw7422sqkj8vmy4agscvin3ck54r515bjrzn69iw73nhfl";
+ sha256 = "0mjwvx0cxvb6zam6jyr3753xjnwcygxcjzqhhlsq0b3xnwws9yh7";
};
nativeBuildInputs = [ pkgconfig ];
@@ -31,18 +42,18 @@ buildGoPackage rec {
# Let's work around this with our own installer
buildPhase = ''
# move vendored codes so nixpkgs go builder could find it
- mv go/src/github.com/mongodb/mongo-tools/vendor/src/* go/src/github.com/mongodb/mongo-tools/vendor/
-
runHook preBuild
+
${stdenv.lib.concatMapStrings (t: ''
go build -o "$bin/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main
'') tools}
+
runHook postBuild
'';
meta = {
homepage = https://github.com/mongodb/mongo-tools;
description = "Tools for the MongoDB";
- license = licenses.asl20;
+ license = lib.licenses.asl20;
};
}
diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index 00cbc8b46295..336d673f7ecd 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -2,7 +2,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "moreutils-${version}";
+ pname = "moreutils";
version = "0.63";
src = fetchgit {
diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix
index 6baaa38f1bb1..7adac5ee2ee6 100644
--- a/pkgs/tools/misc/most/default.nix
+++ b/pkgs/tools/misc/most/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "doc" ];
makeFlags = [
- "DOC_DIR=${placeholder ''doc''}/share/doc/most"
+ "DOC_DIR=${placeholder "doc"}/share/doc/most"
];
preConfigure = ''
diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix
index 5be323a6f4bc..df84084fc9c1 100644
--- a/pkgs/tools/misc/mpdscribble/default.nix
+++ b/pkgs/tools/misc/mpdscribble/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, mpd_clientlib, curl, glib, pkgconfig }:
stdenv.mkDerivation rec {
- name = "mpdscribble-${version}";
+ pname = "mpdscribble";
version = "0.22";
src = fetchurl {
diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix
index 778671f0b54e..363e90ab5f23 100644
--- a/pkgs/tools/misc/mprime/default.nix
+++ b/pkgs/tools/misc/mprime/default.nix
@@ -15,7 +15,7 @@ let
in
stdenv.mkDerivation rec {
- name = "mprime-${version}";
+ pname = "mprime";
version = "29.4b7";
src = fetchurl {
diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix
index 26fcea669c22..922592a256d0 100644
--- a/pkgs/tools/misc/mrtg/default.nix
+++ b/pkgs/tools/misc/mrtg/default.nix
@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
version = "2.17.7";
- name = "mrtg-${version}";
+ pname = "mrtg";
src = fetchurl {
- url = "https://oss.oetiker.ch/mrtg/pub/${name}.tar.gz";
+ url = "https://oss.oetiker.ch/mrtg/pub/${pname}-${version}.tar.gz";
sha256 = "1hrjqfi290i936nblwpfzjn6v8d8p69frcrvml206nxiiwkcp54v";
};
diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix
index 04271b610699..2607cf6f300a 100644
--- a/pkgs/tools/misc/ms-sys/default.nix
+++ b/pkgs/tools/misc/ms-sys/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gettext }:
stdenv.mkDerivation rec {
- name = "ms-sys-${version}";
+ pname = "ms-sys";
version = "2.6.0";
src = fetchurl {
- url = "mirror://sourceforge/ms-sys/${name}.tar.gz";
+ url = "mirror://sourceforge/ms-sys/${pname}-${version}.tar.gz";
sha256 = "06xqpm2s9cg8fj7a1822wmh3p4arii0sifssazg1gr6i7xg7kbjz";
};
diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix
index 07561d390cd0..3037b672498c 100644
--- a/pkgs/tools/misc/multitail/default.nix
+++ b/pkgs/tools/misc/multitail/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "6.4.2";
- name = "multitail-${version}";
+ pname = "multitail";
src = fetchurl {
- url = "https://www.vanheusden.com/multitail/${name}.tgz";
+ url = "https://www.vanheusden.com/multitail/${pname}-${version}.tgz";
sha256 = "1zd1r89xkxngl1pdrvsc877838nwkfqkbcgfqm3vglwalxc587dg";
};
diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix
index 9c483fe3b8f2..183871c39a7e 100644
--- a/pkgs/tools/misc/mysqltuner/default.nix
+++ b/pkgs/tools/misc/mysqltuner/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, perl }:
stdenv.mkDerivation rec {
- name = "mysqltuner-${version}";
+ pname = "mysqltuner";
version = "1.7.13";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix
index 57036acb58e8..525c16b6024b 100644
--- a/pkgs/tools/misc/nagstamon/default.nix
+++ b/pkgs/tools/misc/nagstamon/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "nagstamon-${version}";
+ pname = "nagstamon";
version = "3.2.1";
src = fetchurl {
diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix
index 2312ce236abd..a1a6347642b6 100644
--- a/pkgs/tools/misc/nbench/default.nix
+++ b/pkgs/tools/misc/nbench/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "nbench-byte-${version}";
+ pname = "nbench-byte";
version = "2.2.3";
src = fetchurl {
- url = "http://www.math.utah.edu/~mayer/linux/${name}.tar.gz";
+ url = "http://www.math.utah.edu/~mayer/linux/${pname}-${version}.tar.gz";
sha256 = "1b01j7nmm3wd92ngvsmn2sbw43sl9fpx4xxmkrink68fz1rx0gbj";
};
diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix
index 6b2e7d681706..d29626c99d18 100644
--- a/pkgs/tools/misc/ncdu/default.nix
+++ b/pkgs/tools/misc/ncdu/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "ncdu-${version}";
+ pname = "ncdu";
version = "1.14.1";
src = fetchurl {
- url = "https://dev.yorhel.nl/download/${name}.tar.gz";
+ url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz";
sha256 = "0gp1aszzrh8b6fhv8fspvkmr0qwc55z6z4w6l7r8j09sq7lf0cdy";
};
diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/pkgs/tools/misc/nginx-config-formatter/default.nix
index e19eac1c51e5..db60010490e5 100644
--- a/pkgs/tools/misc/nginx-config-formatter/default.nix
+++ b/pkgs/tools/misc/nginx-config-formatter/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, python3 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2019-02-13";
- name = "nginx-config-formatter-${version}";
+ pname = "nginx-config-formatter";
src = fetchFromGitHub {
owner = "1connect";
diff --git a/pkgs/tools/misc/nms/default.nix b/pkgs/tools/misc/nms/default.nix
index 3037262322f2..0005ffe824b0 100644
--- a/pkgs/tools/misc/nms/default.nix
+++ b/pkgs/tools/misc/nms/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "nms-${version}";
+ pname = "nms";
version = "0.3.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/tools/misc/noteshrink/default.nix
index 77c84ab45118..b197e9bc5d2e 100644
--- a/pkgs/tools/misc/noteshrink/default.nix
+++ b/pkgs/tools/misc/noteshrink/default.nix
@@ -3,7 +3,7 @@
with python3.pkgs;
buildPythonApplication rec {
- name = "noteshrink-${version}";
+ pname = "noteshrink";
version = "0.1.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix
index 93c0f5e346bf..61aa2c41c4fc 100644
--- a/pkgs/tools/misc/notify-desktop/default.nix
+++ b/pkgs/tools/misc/notify-desktop/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, dbus, pkgconfig }:
-stdenv.mkDerivation rec {
- name = "notify-desktop-${version}";
+stdenv.mkDerivation {
+ pname = "notify-desktop";
version = "0.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/nvramtool/default.nix b/pkgs/tools/misc/nvramtool/default.nix
deleted file mode 100644
index fdce7076661a..000000000000
--- a/pkgs/tools/misc/nvramtool/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchgit, iasl, flex, bison }:
-
-stdenv.mkDerivation rec {
- name = "nvramtool-${version}";
- version = "4.8.1";
-
- src = fetchgit {
- url = "http://review.coreboot.org/p/coreboot";
- rev = "refs/tags/${version}";
- sha256 = "0nrf840jg4fn38zcnz1r10w2yfpvrk1nvsrnbbgdbgkmpjxz0zw9";
- };
-
- nativeBuildInputs = [ flex bison ];
- buildInputs = [ iasl ];
-
- buildPhase = ''
- export LEX=${flex}/bin/flex
- make -C util/nvramtool
- '';
-
- installPhase = ''
- mkdir -p $out/bin
- cp util/nvramtool/nvramtool $out/bin
- '';
-
- meta = with stdenv.lib; {
- description = "utility for reading/writing coreboot parameters and displaying information from the coreboot table in CMOS/NVRAM";
- homepage = https://www.coreboot.org/Nvramtool;
- license = licenses.gpl2;
- maintainers = [ maintainers.cryptix ];
- platforms = platforms.linux;
- };
-}
-
diff --git a/pkgs/tools/misc/oci-image-tool/default.nix b/pkgs/tools/misc/oci-image-tool/default.nix
index 6d508a48901a..3b45b7b06442 100644
--- a/pkgs/tools/misc/oci-image-tool/default.nix
+++ b/pkgs/tools/misc/oci-image-tool/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "oci-image-tool-${version}";
+ pname = "oci-image-tool";
version = "1.0.0-rc1";
goPackagePath = "github.com/opencontainers/image-tools";
diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix
index 9ffb89aca6b1..4317c46190db 100644
--- a/pkgs/tools/misc/ocz-ssd-guru/default.nix
+++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix
@@ -4,7 +4,7 @@ let
system = if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else "linux32";
in
stdenv.mkDerivation rec {
- name = "ocz-ssd-guru-${version}";
+ pname = "ocz-ssd-guru";
version = "1.0.1170";
src = fetchurl {
diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix
index f6aea4a92ab9..2a0846dd5116 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/pkgs/tools/misc/opentsdb/default.nix
@@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "opentsdb-${version}";
+ pname = "opentsdb";
version = "2.3.1";
src = fetchurl {
- url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${name}.tar.gz";
+ url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "1lf1gynr11silla4bsrkwqv023dxirsb88ncs2qmc2ng35593fjd";
};
diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix
index 59a60e356b80..78426329975c 100644
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/pkgs/tools/misc/os-prober/default.nix
@@ -10,7 +10,7 @@ ntfs3g # ntfs3g
stdenv.mkDerivation rec {
version = "1.76";
- name = "os-prober-${version}";
+ pname = "os-prober";
src = fetchurl {
url = "https://salsa.debian.org/philh/os-prober/-/archive/${version}/os-prober-${version}.tar.bz2";
sha256 = "07rw3092pckh21vx6y4hzqcn3wn4cqmwxaaiq100lncnhmszg11g";
diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix
index f14fb5269970..370d19247113 100644
--- a/pkgs/tools/misc/osm2pgsql/default.nix
+++ b/pkgs/tools/misc/osm2pgsql/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}:
stdenv.mkDerivation rec {
- name = "osm2pgsql-${version}";
+ pname = "osm2pgsql";
version = "0.96.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix
index 96e5e6a1d94e..4b28a7c45e5d 100644
--- a/pkgs/tools/misc/otfcc/default.nix
+++ b/pkgs/tools/misc/otfcc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, premake5 }:
stdenv.mkDerivation rec {
- name = "otfcc-${version}";
+ pname = "otfcc";
version = "0.9.6";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/pkgs/tools/misc/parallel-rust/default.nix
index 37cbea46c813..c77ca56655ab 100644
--- a/pkgs/tools/misc/parallel-rust/default.nix
+++ b/pkgs/tools/misc/parallel-rust/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "parallel-rust-${version}";
+ pname = "parallel-rust";
version = "0.11.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix
index 1e747961499c..8dcaed706c13 100644
--- a/pkgs/tools/misc/parcellite/default.nix
+++ b/pkgs/tools/misc/parcellite/default.nix
@@ -3,7 +3,7 @@
, which, wrapGAppsHook, xdotool }:
stdenv.mkDerivation rec {
- name = "parcellite-${version}";
+ pname = "parcellite";
version = "1.2.1";
src = fetchFromGitHub {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Lightweight GTK+ clipboard manager";
+ description = "Lightweight GTK clipboard manager";
homepage = https://github.com/rickyrockrat/parcellite;
license = licenses.gpl3Plus;
platforms = platforms.linux;
diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix
index a5e45dc259b9..c2c8e2b85733 100644
--- a/pkgs/tools/misc/pastebinit/default.nix
+++ b/pkgs/tools/misc/pastebinit/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.5";
- name = "pastebinit-${version}";
+ pname = "pastebinit";
src = fetchurl {
- url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2";
+ url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${pname}-${version}.tar.bz2";
sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2";
};
diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/tools/misc/pb_cli/default.nix
index fe1d848ee502..858422b85328 100644
--- a/pkgs/tools/misc/pb_cli/default.nix
+++ b/pkgs/tools/misc/pb_cli/default.nix
@@ -6,7 +6,7 @@ assert video -> capture != null;
assert clipboard -> xclip != null;
stdenv.mkDerivation rec {
- name = "pb_cli-unstable-${version}";
+ pname = "pb_cli-unstable";
version = "2019-03-10";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
index 045c004fb6ac..80583ea19cfe 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -8,7 +8,7 @@ let
pname = "peruse";
version = "1.2.20180816";
-in mkDerivation rec {
+in mkDerivation {
name = "${pname}-${version}";
# The last formal release from 2016 uses kirigami1 which is deprecated
diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix
index c16106f4637b..6c1bc5fcf04d 100644
--- a/pkgs/tools/misc/phoronix-test-suite/default.nix
+++ b/pkgs/tools/misc/phoronix-test-suite/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc }:
stdenv.mkDerivation rec {
- name = "phoronix-test-suite-${version}";
+ pname = "phoronix-test-suite";
version = "8.8.1";
src = fetchurl {
- url = "https://phoronix-test-suite.com/releases/${name}.tar.gz";
+ url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
sha256 = "1l5wnj5d652dg02j7iy7n9ab7qrpclmgvyxnh1s6cdnnnspyxznn";
};
diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix
index 74d24db574ff..dd07fee34054 100644
--- a/pkgs/tools/misc/phraseapp-client/default.nix
+++ b/pkgs/tools/misc/phraseapp-client/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "phraseapp-client-${version}";
+ pname = "phraseapp-client";
version = "1.11.0";
goPackagePath = "github.com/phrase/phraseapp-client";
diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix
index 45b0da6f8db0..ceb2bace7db9 100644
--- a/pkgs/tools/misc/pick/default.nix
+++ b/pkgs/tools/misc/pick/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkgconfig }:
stdenv.mkDerivation rec {
- name = "pick-${version}";
+ pname = "pick";
version = "2.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix
index c49695fd9ad9..1ad219403687 100644
--- a/pkgs/tools/misc/picocom/default.nix
+++ b/pkgs/tools/misc/picocom/default.nix
@@ -5,7 +5,7 @@ assert stdenv.isDarwin -> IOKit != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "picocom-${version}";
+ pname = "picocom";
version = "3.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index abbd64cb62fd..5bd1e3470829 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
version = "0.2.8.2";
- name = "pipelight-${version}";
+ pname = "pipelight";
src = fetchurl {
url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz";
diff --git a/pkgs/tools/misc/pixd/default.nix b/pkgs/tools/misc/pixd/default.nix
index ececef398501..a16333f6e440 100644
--- a/pkgs/tools/misc/pixd/default.nix
+++ b/pkgs/tools/misc/pixd/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "pixd-${version}";
+ pname = "pixd";
version = "1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 1cf64362e6d6..eb2881b29f75 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.2019.8";
- name = "plantuml-${version}";
+ pname = "plantuml";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/tools/misc/plotinus/default.nix
index 41913f966534..58a6c7c4071d 100644
--- a/pkgs/tools/misc/plotinus/default.nix
+++ b/pkgs/tools/misc/plotinus/default.nix
@@ -10,7 +10,7 @@
, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "plotinus-${version}";
+ pname = "plotinus";
version = "0.2.0";
src = fetchFromGitHub {
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- description = "A searchable command palette in every modern GTK+ application";
+ description = "A searchable command palette in every modern GTK application";
homepage = https://github.com/p-e-w/plotinus;
maintainers = with maintainers; [ samdroid-apps ];
platforms = platforms.linux;
diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix
index 191f8980d832..1d3e8c6c33db 100644
--- a/pkgs/tools/misc/plowshare/default.nix
+++ b/pkgs/tools/misc/plowshare/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "plowshare-${version}";
+ pname = "plowshare";
version = "2.1.7";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/pkgs/tools/misc/pod2mdoc/default.nix
index 0bd61c0fcdf5..5712e02e8ea0 100644
--- a/pkgs/tools/misc/pod2mdoc/default.nix
+++ b/pkgs/tools/misc/pod2mdoc/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "pod2mdoc-${version}";
+ pname = "pod2mdoc";
version = "0.0.10";
src = fetchurl {
- url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/${name}.tgz";
+ url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/${pname}-${version}.tgz";
sha256 = "0nwa9zv9gmfi5ysz1wfm60kahc7nv0133n3dfc2vh2y3gj8mxr4f";
};
diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix
index e366a03a7f42..1aa7dbedd930 100644
--- a/pkgs/tools/misc/ponysay/default.nix
+++ b/pkgs/tools/misc/ponysay/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, python3, texinfo, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ponysay-3.0.3";
src = fetchurl {
diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix
index 2c9ed7be039e..5c1b1be2db3b 100644
--- a/pkgs/tools/misc/powerline-go/default.nix
+++ b/pkgs/tools/misc/powerline-go/default.nix
@@ -3,7 +3,6 @@
buildGoModule rec {
pname = "powerline-go";
version = "1.13.0";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "justjanne";
diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index 7acbbc210614..ff98bce39d8c 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -1,7 +1,6 @@
{ stdenv, lib, rustPlatform, fetchFromGitLab, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }:
rustPlatform.buildRustPackage rec {
pname = "powerline-rs";
- name = "${pname}-${version}";
version = "0.1.9";
src = fetchFromGitLab {
diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix
index 2a34224c1266..0c9d3a0ea799 100644
--- a/pkgs/tools/misc/profile-cleaner/default.nix
+++ b/pkgs/tools/misc/profile-cleaner/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.37";
- name = "profile-cleaner-${version}";
+ pname = "profile-cleaner";
src = fetchFromGitHub {
owner = "graysky2";
diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix
index ac98df58784f..989a2d3f22b9 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "6.34";
- name = "profile-sync-daemon-${version}";
+ pname = "profile-sync-daemon";
src = fetchurl {
url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz";
diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix
index b29d0eafcc9e..3edca413f3aa 100644
--- a/pkgs/tools/misc/progress/default.nix
+++ b/pkgs/tools/misc/progress/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, ncurses, which }:
stdenv.mkDerivation rec {
- name = "progress-${version}";
+ pname = "progress";
version = "0.14";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index 1aaed4feafe8..81d7591b7407 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline }:
stdenv.mkDerivation rec {
- name = "pspg-${version}";
+ pname = "pspg";
version = "1.6.8";
src = fetchFromGitHub {
owner = "okbob";
repo = "pspg";
- rev = "${version}";
+ rev = version;
sha256 = "1lwzyimn28a7q8k2c8z7and4qhrdil0za8lixh96z6x4lcb0rz5q";
};
diff --git a/pkgs/tools/misc/q-text-as-data/default.nix b/pkgs/tools/misc/q-text-as-data/default.nix
new file mode 100644
index 000000000000..dbd4a4c465ca
--- /dev/null
+++ b/pkgs/tools/misc/q-text-as-data/default.nix
@@ -0,0 +1,35 @@
+{ stdenvNoCC, fetchFromGitHub, python2 }:
+
+stdenvNoCC.mkDerivation rec {
+ pname = "q-text-as-data";
+ version = "1.7.1";
+
+ src = fetchFromGitHub {
+ owner = "harelba";
+ repo = "q";
+ rev = version;
+ sha256 = "021c2sd6qscz1ipwzzjf43pfd311dcay7yralksl25rs0r7h3li2";
+ };
+
+ buildInputs = [ python2 ];
+ dontBuild = true;
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp bin/q $out/bin
+ chmod +x $out/bin/q
+ '';
+
+ meta = with stdenvNoCC.lib; {
+ description = "Run SQL directly on CSV or TSV files";
+ longDescription = ''
+ q is a command line tool that allows direct execution of SQL-like queries on CSVs/TSVs (and any other tabular text files).
+
+ q treats ordinary files as database tables, and supports all SQL constructs, such as WHERE, GROUP BY, JOINs etc. It supports automatic column name and column type detection, and provides full support for multiple encodings.
+ '';
+ homepage = "http://harelba.github.io/q/";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.taneb ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
index 6af33691a07d..613ad263ed34 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "radeon-profile-${version}";
+ pname = "radeon-profile";
version = "20170714";
nativeBuildInputs = [ qmake ];
diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix
index 11ac0fc14199..3d97874df7de 100644
--- a/pkgs/tools/misc/rcm/default.nix
+++ b/pkgs/tools/misc/rcm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "rcm-${version}";
+ pname = "rcm";
version = "1.3.3";
src = fetchurl {
diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix
index 484bb765c0db..88aff4f3c084 100644
--- a/pkgs/tools/misc/recoverjpeg/default.nix
+++ b/pkgs/tools/misc/recoverjpeg/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, python2, exif, imagemagick }:
stdenv.mkDerivation rec {
- name = "recoverjpeg-${version}";
+ pname = "recoverjpeg";
version = "2.6.3";
src = fetchurl {
- url = "https://www.rfc1149.net/download/recoverjpeg/${name}.tar.gz";
+ url = "https://www.rfc1149.net/download/recoverjpeg/${pname}-${version}.tar.gz";
sha256 = "009jgxi8lvdp00dwfj0n4x5yqrf64x00xdkpxpwgl2v8wcqn56fv";
};
diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix
index cc842105d0ae..91d8e4721307 100644
--- a/pkgs/tools/misc/remind/default.nix
+++ b/pkgs/tools/misc/remind/default.nix
@@ -11,6 +11,9 @@ let
tclLibraries = stdenv.lib.optionals tkremind [ tcllib tk ];
tclLibPaths = stdenv.lib.concatStringsSep " "
(map (p: "${p}/lib/${p.libPrefix}") tclLibraries);
+ tkremindPatch = optionalString tkremind ''
+ substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish"
+ '';
in stdenv.mkDerivation {
name = "remind-3.1.16";
src = fetchurl {
@@ -21,8 +24,13 @@ in stdenv.mkDerivation {
nativeBuildInputs = optional tkremind makeWrapper;
propagatedBuildInputs = tclLibraries;
- postPatch = optionalString tkremind ''
- substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish"
+ postPatch = ''
+ substituteInPlace ./configure \
+ --replace "sleep 1" "true"
+ substituteInPlace ./src/init.c \
+ --replace "rkrphgvba(0);" "" \
+ --replace "rkrphgvba(1);" ""
+ ${tkremindPatch}
'';
postInstall = optionalString tkremind ''
@@ -34,6 +42,6 @@ in stdenv.mkDerivation {
description = "Sophisticated calendar and alarm program for the console";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [raskin kovirobi];
- platforms = with stdenv.lib.platforms; linux;
+ platforms = with stdenv.lib.platforms; unix;
};
}
diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/tools/misc/rename/default.nix
index a2087902c93b..770b229a3159 100644
--- a/pkgs/tools/misc/rename/default.nix
+++ b/pkgs/tools/misc/rename/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, perlPackages }:
-perlPackages.buildPerlPackage rec {
+perlPackages.buildPerlPackage {
pname = "rename";
version = "1.9";
outputs = [ "out" ];
diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix
index 69bf9cafa536..d52910b5a848 100644
--- a/pkgs/tools/misc/riemann-c-client/default.nix
+++ b/pkgs/tools/misc/riemann-c-client/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "algernon";
repo = "riemann-c-client";
- rev = "${name}";
+ rev = name;
sha256 = "01gzqxqm1xvki2vd78c7my2kgp4fyhkcf5j5fmy8z0l93lgj82rr";
};
diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/tools/misc/rig/default.nix
index ee7b2623b1dd..627758e9c5e7 100644
--- a/pkgs/tools/misc/rig/default.nix
+++ b/pkgs/tools/misc/rig/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.11";
- name = "rig-${version}";
+ pname = "rig";
src = fetchurl {
url = "https://ayera.dl.sourceforge.net/project/rig/rig/${version}/rig-${version}.tar.gz";
diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix
index bd60e786036f..af5bfedf2037 100644
--- a/pkgs/tools/misc/rlwrap/default.nix
+++ b/pkgs/tools/misc/rlwrap/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, readline }:
stdenv.mkDerivation rec {
- name = "rlwrap-${version}";
+ pname = "rlwrap";
version = "0.43";
src = fetchurl {
- url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${name}.tar.gz";
+ url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0bzb7ylk2770iv59v2d0gypb21y2xn87m299s9rqm6rdi2vx11lf";
};
diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index 320edd83021f..7b7fa9ce705e 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -4,7 +4,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "rmlint-${version}";
+ pname = "rmlint";
version = "2.8.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix
index 925bb199b279..232949b7dace 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -5,7 +5,7 @@
let inherit (stdenv.lib) getDev; in
stdenv.mkDerivation rec {
- name = "rockbox-utility-${version}";
+ pname = "rockbox-utility";
version = "1.4.0";
src = fetchurl {
diff --git a/pkgs/tools/misc/roundup/default.nix b/pkgs/tools/misc/roundup/default.nix
index e24b1fce06ef..7eebc1943009 100644
--- a/pkgs/tools/misc/roundup/default.nix
+++ b/pkgs/tools/misc/roundup/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ronn, shocco }:
stdenv.mkDerivation rec {
- name = "roundup-${version}";
+ pname = "roundup";
version = "0.0.6";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix
index 650ac9f660aa..d852818b3155 100644
--- a/pkgs/tools/misc/routino/default.nix
+++ b/pkgs/tools/misc/routino/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, zlib, bzip2 }:
stdenv.mkDerivation rec {
- name = "routino-${version}";
+ pname = "routino";
version = "3.2";
src = fetchurl {
- url = "https://routino.org/download/${name}.tgz";
+ url = "https://routino.org/download/${pname}-${version}.tgz";
sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972";
};
diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/tools/misc/rw/default.nix
index 345f26852dcb..b6e53e465360 100644
--- a/pkgs/tools/misc/rw/default.nix
+++ b/pkgs/tools/misc/rw/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "rw-${version}";
+ pname = "rw";
version = "1.0";
src = fetchurl {
diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix
index 2d1db4eb64c7..acab41e8ff54 100644
--- a/pkgs/tools/misc/sam-ba/default.nix
+++ b/pkgs/tools/misc/sam-ba/default.nix
@@ -11,7 +11,7 @@ let
in
stdenv.mkDerivation rec {
version = "2.16";
- name = "sam-ba-${version}";
+ pname = "sam-ba";
src = fetchzip {
url = "http://www.atmel.com/dyn/resources/prod_documents/sam-ba_${version}_linux.zip";
diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix
index bd760adecf75..65b7b47256a8 100644
--- a/pkgs/tools/misc/scanmem/default.nix
+++ b/pkgs/tools/misc/scanmem/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.17";
- name = "scanmem-${version}";
+ pname = "scanmem";
src = fetchFromGitHub {
owner = "scanmem";
diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix
index 1b7afdfbe9df..f66567798ffb 100644
--- a/pkgs/tools/misc/scfbuild/default.nix
+++ b/pkgs/tools/misc/scfbuild/default.nix
@@ -1,7 +1,7 @@
{ lib, buildPythonApplication, fetchFromGitHub, python, pyyaml, fonttools, fontforge }:
-buildPythonApplication rec {
- name = "scfbuild-${version}";
+buildPythonApplication {
+ pname = "scfbuild";
version = "1.0.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index df1fcd89ac78..beeeb84aac93 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }:
stdenv.mkDerivation rec {
- name = "screen-${version}";
+ pname = "screen";
version = "4.6.2";
src = fetchurl {
- url = "mirror://gnu/screen/${name}.tar.gz";
+ url = "mirror://gnu/screen/${pname}-${version}.tar.gz";
sha256 = "0fps0fsipfbh7c2cnp7rjw9n79j0ysq21mk8hzifa33a1r924s8v";
};
diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
index a9cd9d75de8e..883c2edd80a3 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -19,7 +19,7 @@ let
]));
in stdenv.mkDerivation rec {
- name = "screenFetch-${version}";
+ pname = "screenFetch";
version = "3.8.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/tools/misc/sdate/default.nix
index 23dccc0273d1..742b25601c08 100644
--- a/pkgs/tools/misc/sdate/default.nix
+++ b/pkgs/tools/misc/sdate/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "sdate-${version}";
+ pname = "sdate";
version = "0.5";
src = fetchurl {
url = "https://github.com/ChristophBerg/sdate/archive/${version}.tar.gz";
diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix
index 6a2ed3bcb911..0be5b8d13796 100644
--- a/pkgs/tools/misc/sdl-jstest/default.nix
+++ b/pkgs/tools/misc/sdl-jstest/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl, git }:
-stdenv.mkDerivation rec {
- name = "sdl-jstest-${version}";
+stdenv.mkDerivation {
+ pname = "sdl-jstest";
version = "2018-06-15";
# Submodules
diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix
index c0f877f4c414..4ef91f6c55a3 100644
--- a/pkgs/tools/misc/sl/default.nix
+++ b/pkgs/tools/misc/sl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ncurses }:
stdenv.mkDerivation rec {
- name = "sl-${version}";
+ pname = "sl";
version = "5.05";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix
index 6f7c9d3506b2..65031c2a1fe7 100644
--- a/pkgs/tools/misc/slop/default.nix
+++ b/pkgs/tools/misc/slop/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "slop-${version}";
+ pname = "slop";
version = "7.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix
index 0e84f738e80e..f442df399d90 100644
--- a/pkgs/tools/misc/smc/default.nix
+++ b/pkgs/tools/misc/smc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, jre, runtimeShell }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "smc-6.6.3";
src = fetchurl {
diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix
index f5e1fd7b1b4d..c6661ee62e46 100644
--- a/pkgs/tools/misc/smenu/default.nix
+++ b/pkgs/tools/misc/smenu/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.9.15";
- name = "smenu-${version}";
+ pname = "smenu";
src = fetchFromGitHub {
owner = "p-gen";
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index ac0b950a1da5..5eba12285ded 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -4,7 +4,7 @@
, lvm2, pam, python, utillinux }:
stdenv.mkDerivation rec {
- name = "snapper-${version}";
+ pname = "snapper";
version = "0.8.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/sonota/default.nix b/pkgs/tools/misc/sonota/default.nix
index de9366d1d0ff..d111e0b2b717 100644
--- a/pkgs/tools/misc/sonota/default.nix
+++ b/pkgs/tools/misc/sonota/default.nix
@@ -12,7 +12,7 @@ let
};
in buildPythonApplication rec {
- name = "sonota-unstable-${version}";
+ pname = "sonota-unstable";
version = "2018-10-07";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 487858e61872..c51bf998b322 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
- version = "0.13.1";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "starship";
repo = "starship";
rev = "v${version}";
- sha256 = "0y6ixl3i1brak226hh02da1zzlcv41f0kb648dqii6dzyhrwhrld";
+ sha256 = "164qxbzlzg53xicp2n5kg9qbmvlckc6rk78n69s82d2d09mbq1ks";
};
buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
nativeBuildInputs = [ pkgconfig ];
- cargoSha256 = "1xk4ngxhgww921fk40d4ziprnzgp927lhdwwzcifcb0hdyl0854p";
+ cargoSha256 = "192lq0wf8c2p3s4n6c0xr02hwyswypxypimbghi4m8f3fgj2l3ig";
checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index 794c06b8044e..e4e1adf20016 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -10,7 +10,7 @@ let
in
stdenv.mkDerivation rec {
version = "2.8.1";
- name = "staruml-${version}";
+ pname = "staruml";
src =
if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/tools/misc/subberthehut/default.nix
index e5cc5ad4198f..e54dc3b3f2b6 100644
--- a/pkgs/tools/misc/subberthehut/default.nix
+++ b/pkgs/tools/misc/subberthehut/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, xmlrpc_c, glib, zlib }:
stdenv.mkDerivation rec {
- name = "subberthehut-${version}";
+ pname = "subberthehut";
version = "20";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix
index c96ac41fb268..8d42d2d823f3 100644
--- a/pkgs/tools/misc/sutils/default.nix
+++ b/pkgs/tools/misc/sutils/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.2";
- name = "sutils-${version}";
+ pname = "sutils";
src = fetchFromGitHub {
owner = "baskerville";
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 15b8f1bf3b42..12ba89304c0e 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -4,7 +4,7 @@
let
inherit (python3Packages) python nose pycrypto pyyaml requests mock;
in stdenv.mkDerivation rec {
- name = "svtplay-dl-${version}";
+ pname = "svtplay-dl";
version = "2.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix
index fd0a766f54e9..0d1ebd70041f 100644
--- a/pkgs/tools/misc/sweep-visualizer/default.nix
+++ b/pkgs/tools/misc/sweep-visualizer/default.nix
@@ -6,7 +6,7 @@
libudev0-shim
}:
stdenv.mkDerivation rec {
- name = "sweep-visualizer-${version}";
+ pname = "sweep-visualizer";
version = "0.15.0";
src = fetchurl {
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 6750bbe8ae69..1b949108c54a 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -7,11 +7,11 @@
}:
stdenv.mkDerivation rec {
- name = "system-config-printer-${version}";
+ pname = "system-config-printer";
version = "1.5.11";
src = fetchurl {
- url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${name}.tar.xz";
+ url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q";
};
@@ -61,6 +61,9 @@ stdenv.mkDerivation rec {
# Manually expand literal "$(out)", which have failed to expand
sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \
-i "$out/etc/systemd/system/configure-printer@.service"
+
+ substituteInPlace $out/etc/udev/rules.d/70-printers.rules \
+ --replace "udev-configure-printer" "$out/etc/udev/udev-configure-printer"
'';
meta = {
diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix
index 73e144d93aa1..dd48156d4564 100644
--- a/pkgs/tools/misc/systrayhelper/default.nix
+++ b/pkgs/tools/misc/systrayhelper/default.nix
@@ -1,7 +1,7 @@
{ stdenv, pkgconfig, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "systrayhelper-${version}";
+ pname = "systrayhelper";
version = "0.0.4";
rev = "ded1f2ed4d30f6ca2c89a13db0bd3046c6d6d0f9";
diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix
index ce633ac4447a..85f90ed1692f 100644
--- a/pkgs/tools/misc/tealdeer/default.nix
+++ b/pkgs/tools/misc/tealdeer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, cacert, curl }:
rustPlatform.buildRustPackage rec {
- name = "tealdeer-${version}";
+ pname = "tealdeer";
version = "1.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/tools/misc/teamocil/default.nix
index 82aba6126992..a5e356edbf48 100644
--- a/pkgs/tools/misc/teamocil/default.nix
+++ b/pkgs/tools/misc/teamocil/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerEnv, ruby, bundlerUpdateScript }:
-bundlerEnv rec {
+bundlerEnv {
inherit ruby;
pname = "teamocil";
gemdir = ./.;
diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix
index 2d3eb91250a8..4cac9befe16a 100644
--- a/pkgs/tools/misc/teleconsole/default.nix
+++ b/pkgs/tools/misc/teleconsole/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "teleconsole-${version}";
+ pname = "teleconsole";
version = "0.4.0";
goPackagePath = "github.com/gravitational/teleconsole";
diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix
index 4f6a71135aa8..f9ccec87adc0 100644
--- a/pkgs/tools/misc/termplay/default.nix
+++ b/pkgs/tools/misc/termplay/default.nix
@@ -1,6 +1,6 @@
{ rustPlatform, fetchFromGitHub, lib, makeWrapper, gst_all_1, libsixel }:
rustPlatform.buildRustPackage rec {
- name = "termplay-${version}";
+ pname = "termplay";
version = "2.0.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix
index 2d713ae3821c..d875b098ab56 100644
--- a/pkgs/tools/misc/tewisay/default.nix
+++ b/pkgs/tools/misc/tewisay/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }:
buildGoPackage rec {
- name = "tewisay-unstable-${version}";
+ pname = "tewisay-unstable";
version = "2017-04-14";
goPackagePath = "github.com/lucy/tewisay";
diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/pkgs/tools/misc/texi2mdoc/default.nix
index 47216838476a..abc25db2fa7e 100644
--- a/pkgs/tools/misc/texi2mdoc/default.nix
+++ b/pkgs/tools/misc/texi2mdoc/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "texi2mdoc-${version}";
+ pname = "texi2mdoc";
version = "0.1.2";
src = fetchurl {
- url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/${name}.tgz";
+ url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/${pname}-${version}.tgz";
sha256 = "1zjb61ymwfkw6z5g0aqmsn6qpw895zdxv7fv3059gj3wqa3zsibs";
};
diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix
index 748a4e0ce6a5..4ac9b32b3556 100644
--- a/pkgs/tools/misc/thefuck/default.nix
+++ b/pkgs/tools/misc/thefuck/default.nix
@@ -9,7 +9,7 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "nvbn";
- repo = "${pname}";
+ repo = pname;
rev = version;
sha256 = "1qhxwjjgrzpqrqjv7l2847ywpln76lyd6j8bl9gz2r6kl0fx2fqs";
};
diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 8cbea666f123..0739435084d2 100644
--- a/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost }:
stdenv.mkDerivation rec {
- name = "thin-provisioning-tools-${version}";
+ pname = "thin-provisioning-tools";
version = "0.7.6";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix
index 8f297542a3ca..bb6276f70655 100644
--- a/pkgs/tools/misc/time/default.nix
+++ b/pkgs/tools/misc/time/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "time-${version}";
+ pname = "time";
version = "1.9";
src = fetchurl {
- url = "mirror://gnu/time/${name}.tar.gz";
+ url = "mirror://gnu/time/${pname}-${version}.tar.gz";
sha256 = "07jj7cz6lc13iqrpgn81ivqh8rkm73p4rnivwgrrshk23v4g1b7v";
};
diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix
index ed26895fba6f..3a8388280d65 100644
--- a/pkgs/tools/misc/tio/default.nix
+++ b/pkgs/tools/misc/tio/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "tio-${version}";
+ pname = "tio";
version = "1.32";
src = fetchzip {
diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix
index fcd556c55966..d4ff9d8c8442 100644
--- a/pkgs/tools/misc/tldr/default.nix
+++ b/pkgs/tools/misc/tldr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, curl, libzip, pkgconfig }:
stdenv.mkDerivation rec {
- name = "tldr-${version}";
+ pname = "tldr";
version = "1.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index 6e431fdc98ea..e5932d9e9462 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -14,7 +14,7 @@ let
);
in stdenv.mkDerivation rec {
- name = "tlp-${version}";
+ pname = "tlp";
version = "1.2.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix
index c87fe8bf446c..420692c070c7 100644
--- a/pkgs/tools/misc/tmate/default.nix
+++ b/pkgs/tools/misc/tmate/default.nix
@@ -2,7 +2,7 @@
, zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }:
stdenv.mkDerivation rec {
- name = "tmate-${version}";
+ pname = "tmate";
version = "2.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix
index d79e480327c2..59aa3861510c 100644
--- a/pkgs/tools/misc/tmpwatch/default.nix
+++ b/pkgs/tools/misc/tmpwatch/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, psmisc }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "tmpwatch-2.11";
src = fetchurl {
diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix
index 968ead6131be..e2d263817ee7 100644
--- a/pkgs/tools/misc/togglesg-download/default.nix
+++ b/pkgs/tools/misc/togglesg-download/default.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }:
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
- name = "togglesg-download-git-${version}";
+ pname = "togglesg-download-git";
version = "2017-12-07";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix
index 2729f6f88594..abc6933a777e 100644
--- a/pkgs/tools/misc/toilet/default.nix
+++ b/pkgs/tools/misc/toilet/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libcaca }:
stdenv.mkDerivation rec {
- name = "toilet-${version}";
+ pname = "toilet";
version = "0.3";
src = fetchurl {
- url = "http://caca.zoy.org/raw-attachment/wiki/toilet/${name}.tar.gz";
+ url = "http://caca.zoy.org/raw-attachment/wiki/toilet/${pname}-${version}.tar.gz";
sha256 = "1pl118qb7g0frpgl9ps43w4sd0psjirpmq54yg1kqcclqcqbbm49";
};
diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix
index 4591c5ac5b5a..be0c33fb6e54 100644
--- a/pkgs/tools/misc/toybox/default.nix
+++ b/pkgs/tools/misc/toybox/default.nix
@@ -6,7 +6,6 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "toybox";
version = "0.8.1";
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 1f5a6c4ea4c2..fd818ca6f9b0 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "andreafrancia";
repo = "trash-cli";
- rev = "${version}";
+ rev = version;
sha256 = "1bqazna223ibqjwbc1wfvfnspfyrvjy8347qlrgv4cpng72n7gfi";
};
diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix
index eed527da4168..bfb97c22b1d3 100644
--- a/pkgs/tools/misc/ttfautohint/default.nix
+++ b/pkgs/tools/misc/ttfautohint/default.nix
@@ -6,10 +6,10 @@
stdenv.mkDerivation rec {
version = "1.8.3";
- name = "ttfautohint-${version}";
+ pname = "ttfautohint";
src = fetchurl {
- url = "mirror://savannah/freetype/${name}.tar.gz";
+ url = "mirror://savannah/freetype/${pname}-${version}.tar.gz";
sha256 = "0zpqgihn3yh3v51ynxwr8asqrijvs4gv686clwv7bm8sawr4kfw7";
};
diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix
index 5663bcc35fdb..5a2d1aaa4279 100644
--- a/pkgs/tools/misc/ttwatch/default.nix
+++ b/pkgs/tools/misc/ttwatch/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, perl, openssl, curl, libusb1
, enableUnsafe ? false }:
-stdenv.mkDerivation rec {
- name = "ttwatch-${version}";
+stdenv.mkDerivation {
+ pname = "ttwatch";
version = "2018-12-04";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix
index 113359a8bcea..edaa9b662e76 100644
--- a/pkgs/tools/misc/tty-clock/default.nix
+++ b/pkgs/tools/misc/tty-clock/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ncurses, pkgconfig }:
stdenv.mkDerivation rec {
- name = "tty-clock-${version}";
+ pname = "tty-clock";
version = "2.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix
index fda9dc506e2f..70856fba7319 100644
--- a/pkgs/tools/misc/ttylog/default.nix
+++ b/pkgs/tools/misc/ttylog/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "ttylog-${version}";
+ pname = "ttylog";
version = "0.31";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix
index 78aeab00a50f..45aa9ea5c0b2 100644
--- a/pkgs/tools/misc/ttyplot/default.nix
+++ b/pkgs/tools/misc/ttyplot/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ncurses }:
stdenv.mkDerivation rec {
- name = "ttyplot-${version}";
+ pname = "ttyplot";
version = "1.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ttyrec/default.nix b/pkgs/tools/misc/ttyrec/default.nix
index ca6651718117..56ec9afea438 100644
--- a/pkgs/tools/misc/ttyrec/default.nix
+++ b/pkgs/tools/misc/ttyrec/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ttyrec-${version}";
+ pname = "ttyrec";
version = "1.0.8";
src = fetchurl {
- url = "http://0xcc.net/ttyrec/${name}.tar.gz";
+ url = "http://0xcc.net/ttyrec/${pname}-${version}.tar.gz";
sha256 = "ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec";
};
diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix
index f679131381f1..a71666b7acd5 100644
--- a/pkgs/tools/misc/txr/default.nix
+++ b/pkgs/tools/misc/txr/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "txr";
- version = "220";
+ version = "224";
src = fetchurl {
url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2";
- sha256 = "00jg1zhsqhi146xrh0bfb2czfgfw9i2xbpqwk3yh0n766wcm4ryd";
+ sha256 = "10xz140i4sam9r7r8rz5mz5jbwal7xvaimzrb7lmisqsvby2qcw7";
};
nativeBuildInputs = [ bison flex ];
diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix
index f37892a231a5..90f9559e6b7c 100644
--- a/pkgs/tools/misc/txt2man/default.nix
+++ b/pkgs/tools/misc/txt2man/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, coreutils, gawk }:
stdenv.mkDerivation rec {
- name = "txt2man-${version}";
+ pname = "txt2man";
version = "1.6.0";
src = fetchurl {
- url = "https://github.com/mvertes/txt2man/archive/${name}.tar.gz";
+ url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz";
sha256 = "168cj96974n2z0igin6j1ic1m45zyic7nm5ark7frq8j78rrx4zn";
};
diff --git a/pkgs/tools/misc/txtw/default.nix b/pkgs/tools/misc/txtw/default.nix
index 90a9e0fa66ff..ab8256842aed 100644
--- a/pkgs/tools/misc/txtw/default.nix
+++ b/pkgs/tools/misc/txtw/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "0.4";
- name = "txtw-${version}";
+ pname = "txtw";
src = fetchFromGitHub {
owner = "baskerville";
repo = "txtw";
- rev = "${version}";
+ rev = version;
sha256 = "17yjdgdd080fsf5r1wzgk6vvzwsa15gcwc9z64v7x588jm1ryy3k";
};
diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix
index 5c858944b3fe..f2c0f43cca95 100644
--- a/pkgs/tools/misc/uhubctl/default.nix
+++ b/pkgs/tools/misc/uhubctl/default.nix
@@ -3,7 +3,7 @@
, libusb
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "uhubctl";
version = "unstable-2019-07-31";
diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix
index 195a31b63e5b..d70fded5e3e4 100644
--- a/pkgs/tools/misc/ultrastar-creator/default.nix
+++ b/pkgs/tools/misc/ultrastar-creator/default.nix
@@ -6,8 +6,8 @@
# there’s a WIP branch here:
# https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed
-stdenv.mkDerivation rec {
- name = "ultrastar-creator-${version}";
+stdenv.mkDerivation {
+ pname = "ultrastar-creator";
version = "2019-04-23";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix
index 3ab404d02077..0a3bb19d14b9 100644
--- a/pkgs/tools/misc/ultrastar-manager/default.nix
+++ b/pkgs/tools/misc/ultrastar-manager/default.nix
@@ -83,7 +83,8 @@ let
};
in stdenv.mkDerivation {
- name = "ultrastar-manager-${version}";
+ pname = "ultrastar-manager";
+ inherit version;
src = patchedSrc;
postPatch = ''
diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix
index 9ac60ca8b13a..2b70848cbb81 100644
--- a/pkgs/tools/misc/umlet/default.nix
+++ b/pkgs/tools/misc/umlet/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
major = "14";
minor = "3";
version = "${major}.${minor}.0";
- name = "umlet-${version}";
+ pname = "umlet";
src = fetchurl {
url = "http://www.umlet.com/umlet_${major}_${minor}/umlet-standalone-${version}.zip";
diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix
index 374e1b9eaf63..8f66f566aa7d 100644
--- a/pkgs/tools/misc/units/default.nix
+++ b/pkgs/tools/misc/units/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, readline }:
stdenv.mkDerivation rec {
- name = "units-${version}";
+ pname = "units";
version = "2.19";
src = fetchurl {
- url = "mirror://gnu/units/${name}.tar.gz";
+ url = "mirror://gnu/units/${pname}-${version}.tar.gz";
sha256 = "0mk562g7dnidjgfgvkxxpvlba66fh1ykmfd9ylzvcln1vxmi6qj2";
};
diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix
index 01b62eed56c3..b3937175604d 100644
--- a/pkgs/tools/misc/up/default.nix
+++ b/pkgs/tools/misc/up/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
- name = "up-${version}";
+ pname = "up";
version = "0.3.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix
index 7751e03df193..607cb47ed4e8 100644
--- a/pkgs/tools/misc/upower-notify/default.nix
+++ b/pkgs/tools/misc/upower-notify/default.nix
@@ -7,7 +7,7 @@
# (sleep 3; exec ${pkgs.yeshup}/bin/yeshup ${pkgs.go-upower-notify}/bin/upower-notify) &
# '';
buildGoPackage rec {
- name = "upower-notify-${version}";
+ pname = "upower-notify";
version = "20160310-${stdenv.lib.strings.substring 0 7 rev}";
rev = "14c581e683a7e90ec9fa6d409413c16599a5323c";
diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix
index 545d7c554acc..865fd4f44f84 100644
--- a/pkgs/tools/misc/urjtag/default.nix
+++ b/pkgs/tools/misc/urjtag/default.nix
@@ -7,9 +7,9 @@
, jedecSupport ? true
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.10";
- name = "urjtag-${version}";
+ pname = "urjtag";
src = fetchsvn {
url = "svn://svn.code.sf.net/p/urjtag/svn/trunk/urjtag";
diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 8f79f5463e30..7ac9542c6b5f 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -38,11 +38,8 @@ python3Packages.buildPythonApplication rec {
checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ];
postPatch = ''
- # Invalid argument: 'perform_health_check' is not a valid setting
- substituteInPlace tests/conftest.py \
- --replace "perform_health_check=False" ""
- substituteInPlace tests/unit/test_repair.py \
- --replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' ""
+ # see https://github.com/pimutils/vdirsyncer/pull/805
+ substituteInPlace setup.cfg --replace --duration --durations
# for setuptools_scm:
echo 'Version: ${version}' >PKG-INFO
diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix
index a655aa9502e5..7f81774aebee 100644
--- a/pkgs/tools/misc/vimer/default.nix
+++ b/pkgs/tools/misc/vimer/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.2.0";
- name = "vimer-${version}";
+ pname = "vimer";
src = fetchFromGitHub {
owner = "susam";
diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix
index e9733c7ef799..69ec50bd5756 100644
--- a/pkgs/tools/misc/vimpager/build.nix
+++ b/pkgs/tools/misc/vimpager/build.nix
@@ -6,16 +6,16 @@
, sha256
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit version;
- name = "vimpager-${version}";
+ pname = "vimpager";
src = fetchFromGitHub {
inherit sha256;
owner = "rkitover";
repo = "vimpager";
- rev = "${version}";
+ rev = version;
};
buildInputs = [ coreutils sharutils ]; # for uuencode
diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix
index 856bda755cb4..4ffa250bdf53 100644
--- a/pkgs/tools/misc/vivid/default.nix
+++ b/pkgs/tools/misc/vivid/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "${pname}-${version}";
pname = "vivid";
version = "0.4.0";
diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix
index be8745802dad..ec19ae5bd18e 100644
--- a/pkgs/tools/misc/void/default.nix
+++ b/pkgs/tools/misc/void/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "void-${version}";
+ pname = "void";
version = "1.1.5";
src = fetchFromGitHub {
owner = "spacejam";
repo = "void";
- rev = "${version}";
+ rev = version;
sha256 = "08vazw4rszqscjz988k89z28skyj3grm81bm5iwknxxagmrb20fz";
};
diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index 4f1ca8f89ceb..06280b49fbf1 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -2,7 +2,7 @@
with python3Packages;
buildPythonApplication rec {
- name = "wakatime-${version}";
+ pname = "wakatime";
version = "10.8.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix
index a276b13a59ca..b994aecfc0e0 100644
--- a/pkgs/tools/misc/websocat/default.nix
+++ b/pkgs/tools/misc/websocat/default.nix
@@ -2,7 +2,7 @@
}:
rustPlatform.buildRustPackage rec {
- name = "websocat-${version}";
+ pname = "websocat";
version = "1.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/misc/wl-clipboard/default.nix
index 00e26d762a44..de3a19c3f51c 100644
--- a/pkgs/tools/misc/wl-clipboard/default.nix
+++ b/pkgs/tools/misc/wl-clipboard/default.nix
@@ -2,7 +2,7 @@
, wayland, wayland-protocols }:
stdenv.mkDerivation rec {
- name = "wl-clipboard-${version}";
+ pname = "wl-clipboard";
version = "1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix
index 12a97a2e8e46..f25034dd8cda 100644
--- a/pkgs/tools/misc/woeusb/default.nix
+++ b/pkgs/tools/misc/woeusb/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "3.3.0";
- name = "woeusb-${version}";
+ pname = "woeusb";
src = fetchFromGitHub {
owner = "slacka";
diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix
index 35da2e0a4e94..fa3ab747f64f 100644
--- a/pkgs/tools/misc/woof/default.nix
+++ b/pkgs/tools/misc/woof/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2012-05-31";
- name = "woof-${version}";
+ pname = "woof";
src = fetchurl {
url = "http://www.home.unix-ag.org/simon/woof-${version}.py";
diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix
index f19d448e5fc2..78affe34b58b 100644
--- a/pkgs/tools/misc/wv/default.nix
+++ b/pkgs/tools/misc/wv/default.nix
@@ -4,10 +4,9 @@
stdenv.mkDerivation rec {
pname = "wv";
version = "1.2.9";
- name = "${pname}-${version}";
src = fetchurl {
- url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
+ url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc";
};
diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix
index 1029dbb29d8c..ec516555273a 100644
--- a/pkgs/tools/misc/wyrd/default.nix
+++ b/pkgs/tools/misc/wyrd/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.4.6";
- name = "wyrd-${version}";
+ pname = "wyrd";
src = fetchurl {
url = "http://pessimization.com/software/wyrd/wyrd-${version}.tar.gz";
diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix
index aad5b35c79ff..62e2b31fa153 100644
--- a/pkgs/tools/misc/xburst-tools/default.nix
+++ b/pkgs/tools/misc/xburst-tools/default.nix
@@ -6,7 +6,8 @@ let
version = "2011-12-26";
in
stdenv.mkDerivation {
- name = "xburst-tools-${version}";
+ pname = "xburst-tools";
+ inherit version;
src = fetchgit {
url = git://projects.qi-hardware.com/xburst-tools.git;
diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix
index 79565af8e926..69009b86af8c 100644
--- a/pkgs/tools/misc/xclip/default.nix
+++ b/pkgs/tools/misc/xclip/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, libXmu }:
stdenv.mkDerivation rec {
- name = "xclip-${version}";
+ pname = "xclip";
version = "0.13";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index 8260d7921ecc..28268052826c 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11, xorgproto, libXt, libICE, libSM, libXext }:
stdenv.mkDerivation rec {
- name = "xdaliclock-${version}";
+ pname = "xdaliclock";
version = "2.44";
src = fetchurl {
- url="https://www.jwz.org/xdaliclock/${name}.tar.gz";
+ url="https://www.jwz.org/xdaliclock/${pname}-${version}.tar.gz";
sha256 = "1gsgnsm6ql0mcg9zpdkhws3g23r3a92bc3rpg4qbgbmd02nvj3c0";
};
diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix
index c33e01fa0e71..f042b9e209f7 100644
--- a/pkgs/tools/misc/xdo/default.nix
+++ b/pkgs/tools/misc/xdo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libxcb, xcbutil, xcbutilwm }:
stdenv.mkDerivation rec {
- name = "xdo-${version}";
+ pname = "xdo";
version = "0.5.7";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix
index 444b14c5a63f..b6801130a45d 100644
--- a/pkgs/tools/misc/xdxf2slob/default.nix
+++ b/pkgs/tools/misc/xdxf2slob/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3Packages }:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
name = "xdxf2slob-unstable-2015-06-30";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix
index d8959687945a..6a629af61ba2 100644
--- a/pkgs/tools/misc/xflux/gui.nix
+++ b/pkgs/tools/misc/xflux/gui.nix
@@ -1,39 +1,42 @@
-{ stdenv, fetchFromGitHub, pythonPackages
-, gnome_python
-, libappindicator-gtk2, xflux, librsvg, wrapGAppsHook
+{ stdenv, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook
+, xflux, librsvg, gtk3, gobject-introspection, pango, gdk-pixbuf, atk
+, pexpect, pyGtkGlade, pygobject3, pyxdg, libappindicator-gtk3
}:
-pythonPackages.buildPythonApplication rec {
- name = "xflux-gui-${version}";
- version = "1.1.10";
+buildPythonApplication rec {
+ pname = "xflux-gui";
+ version = "1.2.0";
src = fetchFromGitHub {
repo = "xflux-gui";
owner = "xflux-gui";
rev = "v${version}";
- sha256 = "1k67qg9y4c0n9ih0syx81ixbdl2x89gd4arwh71316cshskn0rc8";
+ sha256 = "09zphcd9821ink63636swql4g85hg6lpsazqg1mawlk9ikc8zbps";
};
- propagatedBuildInputs = with pythonPackages; [
- pexpect
- pyGtkGlade
- pygobject2
+ propagatedBuildInputs = [
pyxdg
- libappindicator-gtk2
- gnome_python
+ pexpect
+ pygobject3
];
- buildInputs = [ xflux librsvg ];
+ buildInputs = [
+ xflux gtk3
+ ];
- nativeBuildInputs = [ wrapGAppsHook ];
+ nativeBuildInputs = [
+ wrapGAppsHook gobject-introspection
+ pango gdk-pixbuf atk libappindicator-gtk3
+ ];
postPatch = ''
- substituteInPlace src/fluxgui/xfluxcontroller.py --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${xflux}/bin/xflux\""
+ substituteInPlace src/fluxgui/xfluxcontroller.py \
+ --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${xflux}/bin/xflux\""
'';
postFixup = ''
wrapGAppsHook
wrapPythonPrograms
- patchPythonScript $out/${pythonPackages.python.sitePackages}/fluxgui/fluxapp.py
+ patchPythonScript $out/${python3Packages.python.sitePackages}/fluxgui/fluxapp.py
'';
meta = {
diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix
index f51746e312e5..43a674069706 100644
--- a/pkgs/tools/misc/xiccd/default.nix
+++ b/pkgs/tools/misc/xiccd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libX11, libXrandr, glib, colord }:
stdenv.mkDerivation rec {
- name = "xiccd-${version}";
+ pname = "xiccd";
version = "0.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix
index 7a092e595621..ad5086f2f595 100644
--- a/pkgs/tools/misc/xmonad-log/default.nix
+++ b/pkgs/tools/misc/xmonad-log/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "xmonad-log-${version}";
+ pname = "xmonad-log";
version = "0.1.0";
goPackagePath = "github.com/xintron/xmonad-log";
diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix
index 0ec7d58598f8..3d2fb50371ee 100644
--- a/pkgs/tools/misc/xsel/default.nix
+++ b/pkgs/tools/misc/xsel/default.nix
@@ -1,7 +1,7 @@
{stdenv, lib, fetchFromGitHub, libX11, autoreconfHook }:
-stdenv.mkDerivation rec {
- name = "xsel-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "xsel-unstable";
version = "2018-01-10";
diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix
index fb4257b35e6b..84cf506fb631 100644
--- a/pkgs/tools/misc/xtitle/default.nix
+++ b/pkgs/tools/misc/xtitle/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "xtitle-0.4.4";
src = fetchurl {
diff --git a/pkgs/tools/misc/xv/default.nix b/pkgs/tools/misc/xv/default.nix
index 90a9610a7ce9..8d8c2fa55b28 100644
--- a/pkgs/tools/misc/xv/default.nix
+++ b/pkgs/tools/misc/xv/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "chrisvest";
repo = pname;
- rev = "${version}";
+ rev = version;
sha256 = "0x2yd21sr4wik3z22rknkx1fgb64j119ynjls919za8gd83zk81g";
};
diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index 303722aac0b8..d369bb4fed78 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages, ffmpeg }:
pythonPackages.buildPythonApplication rec {
- name = "yle-dl-${version}";
+ pname = "yle-dl";
version = "2.31";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 1fe58f945041..98449f8f554e 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2019.08.13";
+ version = "2019.09.12.1";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "0b94hrhbqa7jhn91pxsbphg2ylwkpkknb2y4v4sczp7rjvgmjgdj";
+ sha256 = "0h7v81kcxcpy82wq9b1aiz2zg6hg7rnlcfmzd13j6k8yhr7ah9yf";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix
index 939191b5c8f2..ee5556374742 100644
--- a/pkgs/tools/misc/yubikey-manager/default.nix
+++ b/pkgs/tools/misc/yubikey-manager/default.nix
@@ -3,11 +3,11 @@
python3Packages.buildPythonPackage rec {
pname = "yubikey-manager";
- version = "2.1.1";
+ version = "3.1.0";
srcs = fetchurl {
url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
- sha256 = "1jmczk6r6609kzbq4ixispkm4qpvw94wdyfps7q3r96x75si1p1s";
+ sha256 = "0nb3qzpggyp61lchvprnklby5mf5n0xpn9z8vlhh99pz1k9sqdq1";
};
propagatedBuildInputs =
diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix
index 8308d5eebcd0..c20fe68b7b22 100644
--- a/pkgs/tools/misc/yubikey-personalization/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libusb, libyubikey, json_c }:
stdenv.mkDerivation rec {
- name = "yubikey-personalization-${version}";
+ pname = "yubikey-personalization";
version = "1.20.0";
src = fetchurl {
diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix
index a8b621e32ac4..d21573885123 100644
--- a/pkgs/tools/misc/zabbix-cli/default.nix
+++ b/pkgs/tools/misc/zabbix-cli/default.nix
@@ -3,7 +3,7 @@ let
pythonPackages = python2Packages;
in pythonPackages.buildPythonApplication rec {
- name = "zabbix-cli-${version}";
+ pname = "zabbix-cli";
version = "2.1.1";
propagatedBuildInputs = with pythonPackages; [ ipaddr requests ];
diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix
index 61945266e13b..4b19331f3925 100644
--- a/pkgs/tools/misc/zsh-autoenv/default.nix
+++ b/pkgs/tools/misc/zsh-autoenv/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, runtimeShell }:
-stdenv.mkDerivation rec {
- name = "zsh-autoenv-${version}";
+stdenv.mkDerivation {
+ pname = "zsh-autoenv";
version = "2017-12-16";
src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix
index 108071edb64c..be64ff47e6be 100644
--- a/pkgs/tools/misc/zsh-navigation-tools/default.nix
+++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "zsh-navigation-tools-${version}";
+ pname = "zsh-navigation-tools";
version = "2.2.7";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix
index 1e10529082f5..60b3b6df69aa 100644
--- a/pkgs/tools/networking/acme-client/default.nix
+++ b/pkgs/tools/networking/acme-client/default.nix
@@ -11,7 +11,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "acme-client-${version}";
+ pname = "acme-client";
version = "0.1.16";
src = fetchurl {
diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix
index 8fe405e1b3e9..4377681e20d8 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/pkgs/tools/networking/airfield/node.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix
index a77fd56f6739..e9091086ed98 100644
--- a/pkgs/tools/networking/altermime/default.nix
+++ b/pkgs/tools/networking/altermime/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
"-Wno-error=format-truncation"
"-Wno-error=pointer-compare"
"-Wno-error=memset-elt-size"
+ "-Wno-error=restrict"
];
postPatch = ''
diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix
index dccab1796fbc..08db7b4f58d8 100644
--- a/pkgs/tools/networking/argus-clients/default.nix
+++ b/pkgs/tools/networking/argus-clients/default.nix
@@ -3,10 +3,9 @@
stdenv.mkDerivation rec {
pname = "argus-clients";
version = "3.0.8.2";
- name = "${pname}-${version}";
src = fetchurl {
- url = "http://qosient.com/argus/src/${name}.tar.gz";
+ url = "http://qosient.com/argus/src/${pname}-${version}.tar.gz";
sha256 = "1c9vj6ma00gqq9h92fg71sxcsjzz912166sdg90ahvnmvmh3l1rj";
};
diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix
index 8b9d1e3b704c..72c0a78a447b 100644
--- a/pkgs/tools/networking/argus/default.nix
+++ b/pkgs/tools/networking/argus/default.nix
@@ -4,10 +4,9 @@
stdenv.mkDerivation rec {
pname = "argus";
version = "3.0.8.2";
- name = "${pname}-${version}";
src = fetchurl {
- url = "http://qosient.com/argus/src/${name}.tar.gz";
+ url = "http://qosient.com/argus/src/${pname}-${version}.tar.gz";
sha256 = "1zzf688dbbcb5z2r9v1p28rddns6znzx35nc05ygza6lp7aknkna";
};
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 8d9ec9288114..e086105e19e9 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "aria2-${version}";
+ pname = "aria2";
version = "1.34.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix
index 7904ffb0d04e..bfb1abaeaf23 100644
--- a/pkgs/tools/networking/assh/default.nix
+++ b/pkgs/tools/networking/assh/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }:
buildGoPackage rec {
- name = "assh-${version}";
+ pname = "assh";
version = "2.7.0";
goPackagePath = "github.com/moul/advanced-ssh-config";
diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix
index de8bcc8e7ff6..4d069a7e6d7d 100644
--- a/pkgs/tools/networking/asynk/default.nix
+++ b/pkgs/tools/networking/asynk/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "2.0.0";
- name = "ASynK-${version}";
+ pname = "ASynK";
src = fetchurl {
- name = "${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
url = "https://github.com/skarra/ASynK/archive/v${version}.tar.gz";
sha256 = "1bp30437mnls0kzm0525p3bg5nw9alpqrqhw186f6zp9i4y5znp1";
};
diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix
index e6d5abc17618..7fcd677044fe 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/pkgs/tools/networking/atftp/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }:
stdenv.mkDerivation rec {
- name = "atftp-${version}";
+ pname = "atftp";
version = "0.7.2";
src = fetchurl {
- url = "mirror://sourceforge/atftp/${name}.tar.gz";
+ url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz";
sha256 = "0hah3fhzl6vfs381883vbvf4d13cdhsyf0x7ncbl55wz9rkq1l0s";
};
diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/tools/networking/bgpdump/default.nix
index 55b168a21aec..2f74ac713d7d 100644
--- a/pkgs/tools/networking/bgpdump/default.nix
+++ b/pkgs/tools/networking/bgpdump/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchzip, autoreconfHook, zlib, bzip2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "bgpdump-2017-09-29";
src = fetchzip {
diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix
index 93a98a10daad..7cd7254518ad 100644
--- a/pkgs/tools/networking/biosdevname/default.nix
+++ b/pkgs/tools/networking/biosdevname/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pciutils }:
stdenv.mkDerivation rec {
- name = "biosdevname-${version}";
+ pname = "biosdevname";
version = "0.7.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix
index dec74c72fbe7..482a949482ff 100644
--- a/pkgs/tools/networking/brook/default.nix
+++ b/pkgs/tools/networking/brook/default.nix
@@ -8,7 +8,7 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "txthinking";
- repo = "${pname}";
+ repo = pname;
rev = "v${version}";
sha256 = "04gx1p447wabw3d18s9sm8ynlvj2bp8ac9dsgs08kd1dyrsjlljk";
};
diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix
index 386642614bc9..a79cbdc8bbd8 100644
--- a/pkgs/tools/networking/bud/default.nix
+++ b/pkgs/tools/networking/bud/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchgit, python, gyp, utillinux }:
-stdenv.mkDerivation rec {
- name = "bud-${version}";
+stdenv.mkDerivation {
+ pname = "bud";
version = "0.34.1";
diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix
index 34b227d5a6d3..e83e72cbfb44 100644
--- a/pkgs/tools/networking/bukubrow/default.nix
+++ b/pkgs/tools/networking/bukubrow/default.nix
@@ -1,34 +1,46 @@
-{ stdenv, rustPlatform, fetchFromGitHub, sqlite }:
+{ stdenv, rustPlatform, fetchFromGitHub, sqlite }: let
-rustPlatform.buildRustPackage rec {
- name = "bukubrow-${version}";
- version = "2.4.0";
+manifest = {
+ description = "Bukubrow extension host application";
+ name = "com.samhh.bukubrow";
+ path = "@out@/bin/bukubrow";
+ type = "stdio";
+};
+
+in rustPlatform.buildRustPackage rec {
+ pname = "bukubrow-host";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "SamHH";
- repo = "bukubrow";
- rev = version;
- sha256 = "1wrwav7am73bmgbpwh1pi0b8k7vhydqvw91hmmhnvbjhrhbns7s5";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1a3gqxj6d1shv3w0v9m8x2xr0bvcynchy778yqalxkc3x4vr0nbn";
};
- sourceRoot = "source/binary";
- cargoSha256 = "0553awiba24a3a8xwjhlwf8yzbs44lnirjvcxnvsgah7dc44r0gj";
+ cargoSha256 = "06nh99cvg3y4f98fs0j5bkidzq6fg46wk47z5jfzz5lf72ha54lk";
buildInputs = [ sqlite ];
+ passAsFile = [ "firefoxManifest" "chromeManifest" ];
+ firefoxManifest = builtins.toJSON (manifest // {
+ allowed_extensions = [ "bukubrow@samhh.com" ];
+ });
+ chromeManifest = builtins.toJSON (manifest // {
+ allowed_origins = [ "chrome-extension://ghniladkapjacfajiooekgkfopkjblpn/" ];
+ });
+ postBuild = ''
+ substituteAll $firefoxManifestPath firefox.json
+ substituteAll $chromeManifestPath chrome.json
+ '';
postInstall = ''
- mkdir -p $out/etc $out/lib/mozilla/native-messaging-hosts
-
- host_file="$out/bin/bukubrow"
- sed -e "s!%%replace%%!$host_file!" browser-hosts/firefox.json > "$out/etc/firefox-host.json"
- sed -e "s!%%replace%%!$host_file!" browser-hosts/chrome.json > "$out/etc/chrome-host.json"
-
- ln -s $out/etc/firefox-host.json $out/lib/mozilla/native-messaging-hosts/com.samhh.bukubrow.json
+ install -Dm0644 firefox.json $out/lib/mozilla/native-messaging-hosts/com.samhh.bukubrow.json
+ install -Dm0644 chrome.json $out/etc/chromium/native-messaging-hosts/com.samhh.bukubrow.json
'';
meta = with stdenv.lib; {
description = "Bukubrow is a WebExtension for Buku, a command-line bookmark manager";
- homepage = https://github.com/SamHH/bukubrow;
+ homepage = https://github.com/SamHH/bukubrow-host;
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ infinisil ];
diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix
index 81dd294d786a..46bac3d5b5b2 100644
--- a/pkgs/tools/networking/bully/default.nix
+++ b/pkgs/tools/networking/bully/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "bully-${version}";
+ pname = "bully";
version = "1.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix
index 993e9ad74692..12885982d26d 100644
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/pkgs/tools/networking/burpsuite/default.nix
@@ -12,7 +12,8 @@ let
exec ${jre}/bin/java -jar ${jar} "$@"
'';
in stdenv.mkDerivation {
- name = "burpsuite-${version}";
+ pname = "burpsuite";
+ inherit version;
buildCommand = ''
mkdir -p $out/bin
echo "${launcher}" > $out/bin/burpsuite
diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix
index a06b409ca49b..4637a39e6e90 100644
--- a/pkgs/tools/networking/bwm-ng/default.nix
+++ b/pkgs/tools/networking/bwm-ng/default.nix
@@ -4,10 +4,11 @@ let
version = "0.6.1";
in
stdenv.mkDerivation rec {
- name = "bwm-ng-${version}";
+ pname = "bwm-ng";
+ inherit version;
src = fetchurl {
- url = "https://www.gropp.org/bwm-ng/${name}.tar.gz";
+ url = "https://www.gropp.org/bwm-ng/${pname}-${version}.tar.gz";
sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02";
};
diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix
index 7cc89bebf477..08014ed12269 100644
--- a/pkgs/tools/networking/carddav-util/default.nix
+++ b/pkgs/tools/networking/carddav-util/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, python, pythonPackages, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "carddav-0.1-2014-02-26";
diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix
index 6fac4a282d01..2c78b20138aa 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/pkgs/tools/networking/ccnet/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "6.1.8";
seafileVersion = "6.1.8";
- name = "ccnet-${version}";
+ pname = "ccnet";
src = fetchurl {
url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz";
diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index 127244a29927..69c4f897c93b 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -4,12 +4,11 @@
assert stdenv.isLinux -> libcap != null;
stdenv.mkDerivation rec {
- name = "chrony-${version}";
-
+ pname = "chrony";
version = "3.5";
src = fetchurl {
- url = "https://download.tuxfamily.org/chrony/${name}.tar.gz";
+ url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz";
sha256 = "1d9r2dhslll4kzdmxrj0qfgwq1b30d4l3s5cwr8yr93029dpj0jf";
};
@@ -32,7 +31,7 @@ stdenv.mkDerivation rec {
repositories.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git;
license = licenses.gpl2;
platforms = with platforms; linux ++ freebsd ++ openbsd;
- maintainers = with maintainers; [ fpletz ];
+ maintainers = with maintainers; [ fpletz thoughtpolice ];
longDescription = ''
Chronyd is a daemon which runs in background on the system. It obtains
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index ee561840da86..dcda354e4b42 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -7,7 +7,7 @@ mkDerivation rec {
src = fetchFromGitHub {
repo = "cmst";
owner = "andrew-bibb";
- rev = "cmst-${version}";
+ rev = "${pname}-${version}";
sha256 = "13739f0ddld34dcqlfhylzn1zqz5a7jbp4a4id7gj7pcxjx1lafh";
};
diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix
index 6267e3a7790d..9b8a1f0e7904 100644
--- a/pkgs/tools/networking/cntlm/default.nix
+++ b/pkgs/tools/networking/cntlm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, which}:
stdenv.mkDerivation rec {
- name = "cntlm-${version}";
+ pname = "cntlm";
version = "0.92.3";
src = fetchurl {
- url = "mirror://sourceforge/cntlm/${name}.tar.gz";
+ url = "mirror://sourceforge/cntlm/${pname}-${version}.tar.gz";
sha256 = "1632szz849wasvh5sm6rm1zbvbrkq35k7kcyvx474gyl4h4x2flw";
};
diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix
index 3d63340adb0b..17923081dfdf 100644
--- a/pkgs/tools/networking/connect/default.nix
+++ b/pkgs/tools/networking/connect/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "connect-${version}";
+ pname = "connect";
version ="1.105";
src = fetchurl {
diff --git a/pkgs/tools/networking/connman/connman-gtk/default.nix b/pkgs/tools/networking/connman/connman-gtk/default.nix
index d5688354a76d..a3c774a62b11 100644
--- a/pkgs/tools/networking/connman/connman-gtk/default.nix
+++ b/pkgs/tools/networking/connman/connman-gtk/default.nix
@@ -2,7 +2,7 @@
gtk3, connman, openconnect, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "connman-gtk-${version}";
+ pname = "connman-gtk";
version = "1.1.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/connman/connman-ncurses/default.nix b/pkgs/tools/networking/connman/connman-ncurses/default.nix
index 8c4d4fa84865..140105c24754 100644
--- a/pkgs/tools/networking/connman/connman-ncurses/default.nix
+++ b/pkgs/tools/networking/connman/connman-ncurses/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dbus, json_c, ncurses, connman }:
-stdenv.mkDerivation rec {
- name = "connman-ncurses-${version}";
+stdenv.mkDerivation {
+ pname = "connman-ncurses";
version = "2015-07-21";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix
index 42b0c37411c8..0cb32ca415f1 100644
--- a/pkgs/tools/networking/connman/connman-notify/default.nix
+++ b/pkgs/tools/networking/connman/connman-notify/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper }:
-stdenv.mkDerivation rec {
- name = "connman-notify-${version}";
+stdenv.mkDerivation {
+ pname = "connman-notify";
version = "2014-06-23";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/connman/connman_dmenu/default.nix b/pkgs/tools/networking/connman/connman_dmenu/default.nix
index c39c82df634c..7096b9b75861 100644
--- a/pkgs/tools/networking/connman/connman_dmenu/default.nix
+++ b/pkgs/tools/networking/connman/connman_dmenu/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, connman, dmenu }:
-stdenv.mkDerivation rec {
- name = "connman_dmenu-${version}";
+stdenv.mkDerivation {
+ pname = "connman_dmenu";
version = "git-29-9-2015";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/connman/connmanui/default.nix b/pkgs/tools/networking/connman/connmanui/default.nix
index 7c42cc965a00..17e8551fdda0 100644
--- a/pkgs/tools/networking/connman/connmanui/default.nix
+++ b/pkgs/tools/networking/connman/connmanui/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, autoconf, automake, libtool, glib, gtk3, dbus, pkgconfig, file, intltool, connman }:
stdenv.mkDerivation rec {
- name = "connmanui-${version}";
+ pname = "connmanui";
rev = "fce0af94e121bde77c7fa2ebd6a319f0180c5516";
version = "22062015-${rev}";
diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index a4e8c17a545e..56b0347e17f3 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -3,10 +3,10 @@
wpa_supplicant, readline6, pptp, ppp }:
stdenv.mkDerivation rec {
- name = "connman-${version}";
+ pname = "connman";
version = "1.37";
src = fetchurl {
- url = "mirror://kernel/linux/network/connman/${name}.tar.xz";
+ url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz";
sha256 = "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc";
};
diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix
index 4ec23862522e..6509c9c31060 100644
--- a/pkgs/tools/networking/darkstat/default.nix
+++ b/pkgs/tools/networking/darkstat/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "3.0.719";
- name = "darkstat-${version}";
+ pname = "darkstat";
src = fetchurl {
- url = "${meta.homepage}/${name}.tar.bz2";
+ url = "${meta.homepage}/${pname}-${version}.tar.bz2";
sha256 = "1mzddlim6dhd7jhr4smh0n2fa511nvyjhlx76b03vx7phnar1bxf";
};
diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix
index 4b16eb406e32..ff4d0d64c20f 100644
--- a/pkgs/tools/networking/davix/default.nix
+++ b/pkgs/tools/networking/davix/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.7.4";
- name = "davix-${version}";
+ pname = "davix";
nativeBuildInputs = [ cmake pkgconfig python3 ];
buildInputs = [ openssl libxml2 boost libuuid ];
diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix
index 02bdb3e2a460..98902e9809b9 100644
--- a/pkgs/tools/networking/dd-agent/5.nix
+++ b/pkgs/tools/networking/dd-agent/5.nix
@@ -40,7 +40,7 @@ let
in stdenv.mkDerivation rec {
version = "5.11.2";
- name = "dd-agent-${version}";
+ pname = "dd-agent";
src = fetchFromGitHub {
owner = "datadog";
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index d2ae24c8a710..a83274188c02 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -6,14 +6,14 @@ let
python = pythonPackages.python;
in buildGoPackage rec {
- name = "datadog-agent-${version}";
+ pname = "datadog-agent";
version = "6.11.2";
owner = "DataDog";
repo = "datadog-agent";
src = fetchFromGitHub {
inherit owner repo;
- rev = "${version}";
+ rev = version;
sha256 = "1dwdiaf357l9c6b2cps5mdyfma3c1mp96zzxg1826fvz3x8ix68z";
};
diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
index 25ce4bcd68eb..280619a5eca6 100644
--- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "datadog-process-agent-${version}";
+ pname = "datadog-process-agent";
version = "6.11.1";
owner = "DataDog";
repo = "datadog-process-agent";
src = fetchFromGitHub {
inherit owner repo;
- rev = "${version}";
+ rev = version;
sha256 = "0fc2flm0pa44mjxvn4fan0mkvg9yyg27w68xdgrnpdifj99kxxjf";
};
diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index 6987bc553a58..bcf0743b7b9e 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "dhcp-${version}";
+ pname = "dhcp";
version = "4.4.1";
src = fetchurl {
- url = "https://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz";
+ url = "https://ftp.isc.org/isc/dhcp/${version}/${pname}-${version}.tar.gz";
sha256 = "025nfqx4zwdgv4b3rkw26ihcj312vir08jk6yi57ndmb4a4m08ia";
};
@@ -39,7 +39,10 @@ stdenv.mkDerivation rec {
(lib.optional stdenv.isLinux "--with-randomdev=/dev/random")
] ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ];
- NIX_CFLAGS_COMPILE = [ "-Wno-error=pointer-compare" ];
+ NIX_CFLAGS_COMPILE = [
+ "-Wno-error=pointer-compare"
+ "-Wno-error=format-truncation"
+ ];
installFlags = [ "DESTDIR=\${out}" ];
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 6d14789e7f42..dfc56d440e62 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -3,11 +3,12 @@
stdenv.mkDerivation rec {
# when updating this to >=7, check, see previous reverts:
# nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix
- name = "dhcpcd-7.2.3";
+ pname = "dhcpcd";
+ version = "8.0.3";
src = fetchurl {
- url = "mirror://roy/dhcpcd/${name}.tar.xz";
- sha256 = "0vjnd27y6jm5q2v7fkyxmsn77dcpvpzyzb5bq9lfkas8flbkiavl";
+ url = "mirror://roy/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "07cg0sp8sk9b6ch2ajmvkbn6z08bgyx8xbd004s5mkasrlgrfx4n";
};
nativeBuildInputs = [ pkgconfig ];
@@ -27,14 +28,14 @@ stdenv.mkDerivation rec {
"--localstatedir=/var"
];
- makeFlags = "PREFIX=\${out}";
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
# Hack to make installation succeed. dhcpcd will still use /var/db
# at runtime.
- installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc";
+ installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ];
# Check that the udev plugin got built.
- postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]";
+ postInstall = stdenv.lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]";
meta = with stdenv.lib; {
description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix
index 8ed9d1d1d706..a7cc90c2b33a 100644
--- a/pkgs/tools/networking/dhcpdump/default.nix
+++ b/pkgs/tools/networking/dhcpdump/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libpcap, perl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dhcpdump-1.8";
src = fetchurl {
diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix
index d557c0ab9adb..a6cb05b3865b 100644
--- a/pkgs/tools/networking/dhcping/default.nix
+++ b/pkgs/tools/networking/dhcping/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "dhcping-${version}";
+ pname = "dhcping";
version = "1.2";
src = fetchurl {
diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/tools/networking/dibbler/default.nix
index fd306a0bcca3..43c9455712db 100644
--- a/pkgs/tools/networking/dibbler/default.nix
+++ b/pkgs/tools/networking/dibbler/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "dibbler-${version}";
+ pname = "dibbler";
version = "1.0.1";
src = fetchurl {
- url = "http://www.klub.com.pl/dhcpv6/dibbler/${name}.tar.gz";
+ url = "http://www.klub.com.pl/dhcpv6/dibbler/${pname}-${version}.tar.gz";
sha256 = "18bnwkvax02scjdg5z8gvrkvy1lhssfnlpsaqb5kkh30w1vri1i7";
};
diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix
index d4837d28c825..fe845f3cae87 100644
--- a/pkgs/tools/networking/dirb/default.nix
+++ b/pkgs/tools/networking/dirb/default.nix
@@ -4,7 +4,7 @@ let
major = "2";
minor = "22";
in stdenv.mkDerivation rec {
- name = "dirb-${version}";
+ pname = "dirb";
version = "${major}.${minor}";
src = fetchurl {
diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/tools/networking/djbdns/default.nix
index b8a7133e7bc7..974f8a1f346a 100644
--- a/pkgs/tools/networking/djbdns/default.nix
+++ b/pkgs/tools/networking/djbdns/default.nix
@@ -11,7 +11,8 @@ let
in
stdenv.mkDerivation {
- name = "djbdns-${version}";
+ pname = "djbdns";
+ inherit version;
src = fetchurl {
url = "https://cr.yp.to/djbdns/djbdns-${version}.tar.gz";
diff --git a/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix b/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
index c0b2c795a40b..fc4e40929c93 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "dnscrypt-proxy-${version}";
+ pname = "dnscrypt-proxy";
version = "1.9.5";
src = fetchurl {
- url = "https://launchpad.net/ubuntu/+archive/primary/+files/${name}.orig.tar.gz";
+ url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}-${version}.orig.tar.gz";
sha256 = "1dhvklr4dg2vlw108n11xbamacaryyg3dbrg629b76lp7685p7z8";
};
diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
index a43900ea4a52..94d52b953d49 100644
--- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix
+++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libsodium, libevent }:
stdenv.mkDerivation rec {
- name = "dnscrypt-wrapper-${version}";
+ pname = "dnscrypt-wrapper";
version = "0.4.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix
index ed46b49d8c7e..63e19e924fca 100644
--- a/pkgs/tools/networking/dnsperf/default.nix
+++ b/pkgs/tools/networking/dnsperf/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "dnsperf-${version}";
+ pname = "dnsperf";
version = "2.3.1";
# The same as the initial commit of the new GitHub repo (only readme changed).
diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix
index fd932617c936..a0f5b5b08420 100644
--- a/pkgs/tools/networking/driftnet/default.nix
+++ b/pkgs/tools/networking/driftnet/default.nix
@@ -4,8 +4,8 @@
with lib;
-stdenv.mkDerivation rec {
- name = "driftnet-${version}";
+stdenv.mkDerivation {
+ pname = "driftnet";
version = "1.1.5";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix
index 3c6c5f3d2992..9d6a1712e673 100644
--- a/pkgs/tools/networking/easyrsa/2.x.nix
+++ b/pkgs/tools/networking/easyrsa/2.x.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, makeWrapper
, gnugrep, openssl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "easyrsa-2.2.0";
src = fetchurl {
diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix
index d7ff19612eb1..4d374cece3d7 100644
--- a/pkgs/tools/networking/easyrsa/default.nix
+++ b/pkgs/tools/networking/easyrsa/default.nix
@@ -2,8 +2,9 @@
let
version = "3.0.0";
-in stdenv.mkDerivation rec {
- name = "easyrsa-${version}";
+in stdenv.mkDerivation {
+ pname = "easyrsa";
+ inherit version;
src = fetchFromGitHub {
owner = "OpenVPN";
diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix
index 12d9da87b39b..c490464c31ab 100644
--- a/pkgs/tools/networking/eggdrop/default.nix
+++ b/pkgs/tools/networking/eggdrop/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, tcl }:
-stdenv.mkDerivation rec {
- name = "eggdrop-${version}";
+stdenv.mkDerivation {
+ pname = "eggdrop";
version = "1.6.21-nix1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/envoy/default.nix b/pkgs/tools/networking/envoy/default.nix
index 83af542b8ad4..f35a90273530 100644
--- a/pkgs/tools/networking/envoy/default.nix
+++ b/pkgs/tools/networking/envoy/default.nix
@@ -127,7 +127,7 @@ let
# Generate the BUILD file.
buildFile =
let field = name: attrs:
- if attrs ? "${name}" then " ${name} = ${attrs.${name}},\n" else "";
+ if attrs ? ${name} then " ${name} = ${attrs.${name}},\n" else "";
in
''
licenses(["notice"]) # Apache 2
@@ -215,7 +215,7 @@ let
in
stdenv.mkDerivation rec {
- name = "envoy-${version}";
+ pname = "envoy";
version = "1.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index 607b11aaffb9..ffd7d25a0dce 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, ninja, gflags, libsodium, protobuf }:
stdenv.mkDerivation rec {
- name = "eternal-terminal-${version}";
+ pname = "eternal-terminal";
version = "5.1.10";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/tools/networking/fakeroute/default.nix
index 9737108e6acf..d5190331d33f 100644
--- a/pkgs/tools/networking/fakeroute/default.nix
+++ b/pkgs/tools/networking/fakeroute/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "fakeroute-${version}";
+ pname = "fakeroute";
version = "0.3";
src = fetchurl {
- url = "https://moxie.org/software/fakeroute/${name}.tar.gz";
+ url = "https://moxie.org/software/fakeroute/${pname}-${version}.tar.gz";
sha256 = "1sp342rxgm1gz4mvi5vvz1knz7kn9px9s39ii3jdjp4ks7lr5c8f";
};
diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix
index ef356935c56a..43efe2090f2c 100644
--- a/pkgs/tools/networking/fastd/default.nix
+++ b/pkgs/tools/networking/fastd/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "18";
- name = "fastd-${version}";
+ pname = "fastd";
src = fetchgit {
url = "git://git.universe-factory.net/fastd";
diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix
index 54e205390666..abb76e633ee7 100644
--- a/pkgs/tools/networking/fdm/default.nix
+++ b/pkgs/tools/networking/fdm/default.nix
@@ -7,7 +7,7 @@ let
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${baseName}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix
index a0b298f3f4ec..2cf111e8ccfc 100644
--- a/pkgs/tools/networking/ferm/default.nix
+++ b/pkgs/tools/networking/ferm/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.4.1";
- name = "ferm-${version}";
+ pname = "ferm";
src = fetchurl {
url = "http://ferm.foo-projects.org/download/2.4/ferm-${version}.tar.xz";
diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index 259225e0b7c8..f16fcc7048c8 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -3,7 +3,7 @@
with lib;
buildGoPackage rec {
- name = "flannel-${version}";
+ pname = "flannel";
version = "0.11.0";
rev = "v${version}";
diff --git a/pkgs/tools/networking/freebind/default.nix b/pkgs/tools/networking/freebind/default.nix
index 3f89323de36b..0c74f14e1744 100644
--- a/pkgs/tools/networking/freebind/default.nix
+++ b/pkgs/tools/networking/freebind/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libnetfilter_queue, libnfnetlink }:
-stdenv.mkDerivation rec {
- name = "freebind-${version}";
+stdenv.mkDerivation {
+ pname = "freebind";
version = "2017-12-27";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix
index 913cba54ae88..9559c444059f 100644
--- a/pkgs/tools/networking/gandi-cli/default.nix
+++ b/pkgs/tools/networking/gandi-cli/default.nix
@@ -21,6 +21,6 @@ buildPythonApplication rec {
description = "Command-line interface to the public Gandi.net API";
homepage = https://cli.gandi.net/;
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ ckampka ];
+ maintainers = with maintainers; [ kampka ];
};
}
diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix
index d8d4353f7820..9431216e2515 100644
--- a/pkgs/tools/networking/gftp/default.nix
+++ b/pkgs/tools/networking/gftp/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 readline ncurses gettext openssl ];
- meta = {
- description = "GTK+-based FTP client";
+ meta = {
+ description = "GTK-based FTP client";
homepage = http://www.gftp.org;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix
index 6fdcfaa70db0..be1ca9f265d4 100644
--- a/pkgs/tools/networking/gmrender-resurrect/default.nix
+++ b/pkgs/tools/networking/gmrender-resurrect/default.nix
@@ -4,12 +4,13 @@
let version = "4f221e6b85abf85957b547436e982d7a501a1718"; in
stdenv.mkDerivation {
- name = "gmrender-resurrect-${version}";
+ pname = "gmrender-resurrect";
+ inherit version;
src = fetchFromGitHub {
owner = "hzeller";
repo = "gmrender-resurrect";
- rev = "${version}";
+ rev = version;
sha256 = "1dmdhyz27bh74qmvncfd3kw7zqwnd05bhxcfjjav98z5qrxdygj4";
};
diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix
index e94c3e4330fb..aab5b77351c9 100644
--- a/pkgs/tools/networking/gmvault/default.nix
+++ b/pkgs/tools/networking/gmvault/default.nix
@@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
version = "1.9.1";
- name = "gmvault-${version}";
+ pname = "gmvault";
src = fetchurl {
url = "https://bitbucket.org/gaubert/gmvault-official-download/downloads/gmvault-v${version}-src.tar.gz";
- name = "${name}.tar.bz";
+ name = "${pname}-${version}.tar.bz";
sha256 = "0ffp8df3gdf6lf3pj75hzsmxmvmscppb6bjda58my1n4ppxp1rji";
};
diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix
index db63b16415b2..37d2eea825f0 100644
--- a/pkgs/tools/networking/gnirehtet/default.nix
+++ b/pkgs/tools/networking/gnirehtet/default.nix
@@ -2,7 +2,8 @@
let
version = "2.3";
apk = stdenv.mkDerivation {
- name = "gnirehtet.apk-${version}";
+ pname = "gnirehtet.apk";
+ inherit version;
src = fetchzip {
url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip";
sha256 = "08pgmpbz82cd8ndr2syiv25l5xk1gvh9gzji4pgva5gw269bjmpz";
@@ -13,8 +14,9 @@ apk = stdenv.mkDerivation {
'';
};
in
-rustPlatform.buildRustPackage rec {
- name = "gnirehtet-${version}";
+rustPlatform.buildRustPackage {
+ pname = "gnirehtet";
+ inherit version;
src = fetchFromGitHub {
owner = "Genymobile";
diff --git a/pkgs/tools/networking/goklp/default.nix b/pkgs/tools/networking/goklp/default.nix
index 88a6b74686c2..c260b47a6332 100644
--- a/pkgs/tools/networking/goklp/default.nix
+++ b/pkgs/tools/networking/goklp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "goklp-${version}";
+ pname = "goklp";
version = "1.6";
goPackagePath = "github.com/AppliedTrust/goklp";
diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix
index 10100b933d4d..12f285c2a60a 100644
--- a/pkgs/tools/networking/grpcurl/default.nix
+++ b/pkgs/tools/networking/grpcurl/default.nix
@@ -3,7 +3,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "grpcurl-${version}";
+ pname = "grpcurl";
version = "1.0.0";
rev = "v${version}";
diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix
index bcc68a2a19f7..ba59870a6b86 100644
--- a/pkgs/tools/networking/gvpe/default.nix
+++ b/pkgs/tools/networking/gvpe/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, openssl, gmp, zlib, iproute, nettools }:
stdenv.mkDerivation rec {
- name = "gvpe-${version}";
+ pname = "gvpe";
version = "3.0";
src = fetchurl {
diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix
index 6fd4ab361630..ccc598b0692f 100644
--- a/pkgs/tools/networking/hans/default.nix
+++ b/pkgs/tools/networking/hans/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, nettools }:
stdenv.mkDerivation rec {
- name = "hans-${version}";
+ pname = "hans";
version = "1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 62ac791252d8..d8711d516dc5 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -10,10 +10,9 @@ assert usePcre -> pcre != null;
stdenv.mkDerivation rec {
pname = "haproxy";
version = "1.9.8";
- name = "${pname}-${version}";
src = fetchurl {
- url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz";
+ url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
sha256 = "1via9k84ycrdr8qh4qchcbqgpv0gynm3ra23nwsvqwfqvc0376id";
};
diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix
index ba76c37a4bba..96fb342e27fc 100644
--- a/pkgs/tools/networking/horst/default.nix
+++ b/pkgs/tools/networking/horst/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, pkgconfig, ncurses, libnl }:
stdenv.mkDerivation rec {
- name = "horst-${version}";
+ pname = "horst";
version = "5.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix
index 3fdebbf49662..6e00a6e9afa8 100644
--- a/pkgs/tools/networking/hping/default.nix
+++ b/pkgs/tools/networking/hping/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libpcap, tcl }:
stdenv.mkDerivation rec {
- name = "hping-${version}";
+ pname = "hping";
version = "20051105";
src = fetchurl {
diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix
index a4c6e517a753..4a350d237d0f 100644
--- a/pkgs/tools/networking/htpdate/default.nix
+++ b/pkgs/tools/networking/htpdate/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.2.1";
- name = "htpdate-${version}";
+ pname = "htpdate";
src = fetchurl {
- url = "http://www.vervest.org/htp/archive/c/${name}.tar.xz";
+ url = "http://www.vervest.org/htp/archive/c/${pname}-${version}.tar.xz";
sha256 = "1gqw3lg4wwkn8snf4pf21s3qidhb4h791f2ci7i7i0d6kd86jv0q";
};
diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix
index cfd4658f63f8..bcaca9ef0ce5 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/pkgs/tools/networking/http-prompt/default.nix
@@ -3,7 +3,6 @@
pythonPackages.buildPythonApplication rec {
pname = "http-prompt";
version = "1.0.0";
- name = "${pname}-${version}";
src = fetchFromGitHub {
rev = "v${version}";
diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/tools/networking/httperf/default.nix
index fa8bbb91c5be..271be9c2352f 100644
--- a/pkgs/tools/networking/httperf/default.nix
+++ b/pkgs/tools/networking/httperf/default.nix
@@ -2,7 +2,6 @@
stdenv.mkDerivation rec {
pname = "httperf";
- name = "${pname}-${version}";
version = "0.9.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index 2a608bf809ac..6395fcf09eb5 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "httpie-1.0.2";
+ pname = "httpie";
+ version = "1.0.3";
- src = fetchurl {
- url = "mirror://pypi/h/httpie/${name}.tar.gz";
- sha256 = "1ax22jh5lpjywpj7lsl072wdhr1pxiqzmxhyph5diwxxzs2nqrzw";
+ src = pythonPackages.fetchPypi {
+ inherit pname version;
+ sha256 = "103fcigpxf4nqmrdqjnyz7d9n4n16906slwmmqqc0gkxv8hnw6vd";
};
propagatedBuildInputs = with pythonPackages; [ pygments requests ];
diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix
index 1a6aeb57ab87..e269a38f8218 100644
--- a/pkgs/tools/networking/httping/default.nix
+++ b/pkgs/tools/networking/httping/default.nix
@@ -2,11 +2,11 @@
, fftw ? null }:
stdenv.mkDerivation rec {
- name = "httping-${version}";
+ pname = "httping";
version = "2.5";
src = fetchurl {
- url = "https://vanheusden.com/httping/${name}.tgz";
+ url = "https://vanheusden.com/httping/${pname}-${version}.tgz";
sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y";
};
diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix
index 8ec0ce2847dd..a7b157d3ebc2 100644
--- a/pkgs/tools/networking/httplab/default.nix
+++ b/pkgs/tools/networking/httplab/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "httplab-${version}";
+ pname = "httplab";
version = "0.3.0";
rev = "v${version}";
diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix
index 5a29657bd5b1..b3700fb93389 100644
--- a/pkgs/tools/networking/httpstat/default.nix
+++ b/pkgs/tools/networking/httpstat/default.nix
@@ -1,13 +1,12 @@
{ stdenv, fetchFromGitHub, curl, pythonPackages, glibcLocales }:
pythonPackages.buildPythonApplication rec {
- name = "${pname}-${version}";
pname = "httpstat";
version = "1.2.1";
src = fetchFromGitHub {
owner = "reorx";
repo = pname;
- rev = "${version}";
+ rev = version;
sha256 = "1vriibcsq4j1hvm5yigbbmmv21dc40y5c9gvd31dg9qkaz26hml6";
};
doCheck = false; # No tests
diff --git a/pkgs/tools/networking/httptunnel/default.nix b/pkgs/tools/networking/httptunnel/default.nix
index c47dd03cb9d0..df62f90ad0bb 100644
--- a/pkgs/tools/networking/httptunnel/default.nix
+++ b/pkgs/tools/networking/httptunnel/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "3.3";
- name = "httptunnel-${version}";
+ pname = "httptunnel";
src = fetchurl {
- url = "http://www.nocrew.org/software/httptunnel/${name}.tar.gz";
+ url = "http://www.nocrew.org/software/httptunnel/${pname}-${version}.tar.gz";
sha256 = "0mn5s6p68n32xzadz6ds5i6bp44dyxzkq68r1yljlv470jr84bql";
};
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index 7d709df75b60..0b0860126b50 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -1,7 +1,7 @@
{ stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
let wrapper = stdenv.mkDerivation rec {
- name = "wrapper-${version}";
+ pname = "wrapper";
version = "3.5.35";
src = fetchurl {
url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 050f1c9cd4a5..97dbb1bdb8ff 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -8,8 +8,6 @@
assert upnpSupport -> miniupnpc != null;
stdenv.mkDerivation rec {
-
- name = pname + "-" + version;
pname = "i2pd";
version = "2.26.0";
diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/tools/networking/ifstat-legacy/default.nix
index 8b7f4e1c2a04..756e77f1157e 100644
--- a/pkgs/tools/networking/ifstat-legacy/default.nix
+++ b/pkgs/tools/networking/ifstat-legacy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, net_snmp }:
stdenv.mkDerivation rec {
- name = "ifstat-legacy-${version}";
+ pname = "ifstat-legacy";
version = "1.1";
src = fetchurl {
diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix
index 96723146ad41..bc6f657f3781 100644
--- a/pkgs/tools/networking/iftop/default.nix
+++ b/pkgs/tools/networking/iftop/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, ncurses, libpcap, automake}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "iftop-1.0pre4";
src = fetchurl {
diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix
index 5b54e4099f56..984b0a2f87ea 100644
--- a/pkgs/tools/networking/imapproxy/default.nix
+++ b/pkgs/tools/networking/imapproxy/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, openssl, ncurses}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "imapproxy-1.2.7";
src = fetchurl {
url = mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2;
diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 47352d21c4a2..20169121cd9a 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -2,7 +2,7 @@
, gnutls, libite, libconfuse }:
stdenv.mkDerivation rec {
- name = "inadyn-${version}";
+ pname = "inadyn";
version = "2.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/iouyap/default.nix b/pkgs/tools/networking/iouyap/default.nix
index c37b409cdfb5..b49b34d6dc7a 100644
--- a/pkgs/tools/networking/iouyap/default.nix
+++ b/pkgs/tools/networking/iouyap/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, bison, flex }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "iouyap";
version = "0.97";
diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix
index 3c2e7f53beeb..c3304c385e7b 100644
--- a/pkgs/tools/networking/ip2location/default.nix
+++ b/pkgs/tools/networking/ip2location/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ip2location-${version}";
+ pname = "ip2location";
version = "7.0.0";
src = fetchurl {
diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix
index 549461fe5d0b..ab09399cd8e3 100644
--- a/pkgs/tools/networking/ip2unix/default.nix
+++ b/pkgs/tools/networking/ip2unix/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "ip2unix-${version}";
+ pname = "ip2unix";
version = "2.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix
index 26c8d89b5d48..2727175f0412 100644
--- a/pkgs/tools/networking/ipcalc/default.nix
+++ b/pkgs/tools/networking/ipcalc/default.nix
@@ -1,9 +1,9 @@
{stdenv, fetchurl, perl}:
stdenv.mkDerivation rec {
- name = "ipcalc-${version}";
+ pname = "ipcalc";
version = "0.41";
src = fetchurl {
- url = "http://jodies.de/ipcalc-archive/${name}.tar.gz";
+ url = "http://jodies.de/ipcalc-archive/${pname}-${version}.tar.gz";
sha256 = "dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a";
};
buildInputs = [perl];
diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index 9b4edd763057..169fea6c4474 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -2,11 +2,11 @@
, geoip ? null, geolite-legacy ? null }:
stdenv.mkDerivation rec {
- name = "ipv6calc-${version}";
+ pname = "ipv6calc";
version = "1.1.0";
src = fetchurl {
- url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz";
+ url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz";
sha256 = "1q74ikg780v5hllbq08wdfvxr2lf0fc7i41hclqrh1ajc6dqybbq";
};
diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix
index 47aeb8574b68..083ec23af569 100644
--- a/pkgs/tools/networking/jnettop/default.nix
+++ b/pkgs/tools/networking/jnettop/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, fetchpatch, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "jnettop-0.13.0";
src = fetchurl {
diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix
index 7877200116d1..931cfa3a74d9 100644
--- a/pkgs/tools/networking/kail/default.nix
+++ b/pkgs/tools/networking/kail/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "kail-${version}";
+ pname = "kail";
version = "0.8.0";
goPackagePath = "github.com/boz/kail";
diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index 0d1bd462d3b4..bc35a25cfde8 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -2,12 +2,11 @@
, boost, python3, postgresql, mysql, gmp, bzip2 }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "kea";
version = "1.5.0-P1";
src = fetchurl {
- url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz";
+ url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "0bqxzp3f7cmraa5davj2az1hx1gbbchqzlz3ai26c802agzafyhz";
};
diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix
index 43d0944a4159..9ae981e03692 100644
--- a/pkgs/tools/networking/keepalived/default.nix
+++ b/pkgs/tools/networking/keepalived/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }:
stdenv.mkDerivation rec {
- name = "keepalived-${version}";
+ pname = "keepalived";
version = "1.4.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index b4886f58cbb1..13bdbe17ff8b 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn2, gmp, libiconv, libunistring, gettext }:
stdenv.mkDerivation rec {
- name = "lftp-${version}";
+ pname = "lftp";
version = "4.8.4";
src = fetchurl {
urls = [
- "https://lftp.tech/ftp/${name}.tar.xz"
- "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.xz"
- "https://lftp.yar.ru/ftp/${name}.tar.xz"
+ "https://lftp.tech/ftp/${pname}-${version}.tar.xz"
+ "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${pname}-${version}.tar.xz"
+ "https://lftp.yar.ru/ftp/${pname}-${version}.tar.xz"
];
sha256 = "0qks22357xv9y6ripmf5j2n5svh8j5z0yniphfk89sjwkqg2gg2f";
};
diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index a8e4f2dc83f5..b8ba1357f5f8 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "lldpd-${version}";
+ pname = "lldpd";
version = "1.0.4";
src = fetchurl {
- url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz";
+ url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";
sha256 = "0kvj49y6slnldi9dha81nzxvpwd7d8kq1qlibn6h1wdb5w1vq6ak";
};
diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix
index c5c7e18ba6d2..52b2a9a94dcb 100644
--- a/pkgs/tools/networking/logmein-hamachi/default.nix
+++ b/pkgs/tools/networking/logmein-hamachi/default.nix
@@ -15,11 +15,11 @@ let
libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
in stdenv.mkDerivation rec {
- name = "logmein-hamachi-${version}";
+ pname = "logmein-hamachi";
version = "2.1.0.198";
src = fetchurl {
- url = "https://www.vpn.net/installers/${name}-${arch}.tgz";
+ url = "https://www.vpn.net/installers/${pname}-${version}-${arch}.tgz";
inherit sha256;
};
diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix
index 134e9b6df76d..44c8b9a9c4d5 100644
--- a/pkgs/tools/networking/maildrop/default.nix
+++ b/pkgs/tools/networking/maildrop/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, pcre, perl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "maildrop-2.6.0";
src = fetchurl {
diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix
index a7648fd59c35..32f6b11d77c5 100644
--- a/pkgs/tools/networking/maxscale/default.nix
+++ b/pkgs/tools/networking/maxscale/default.nix
@@ -5,13 +5,13 @@
}:
stdenv.mkDerivation rec {
- name = "maxscale-${version}";
+ pname = "maxscale";
version = "2.1.17";
src = fetchFromGitHub {
owner = "mariadb-corporation";
repo = "MaxScale";
- rev = "${name}";
+ rev = "${pname}-${version}";
sha256 = "161kc6aqqj3z509q4qwvsd86h06hlyzdask4gawn2ij0h3ca58q6";
};
diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix
index 38b2aa531e67..e902f24ca0e5 100644
--- a/pkgs/tools/networking/mcrcon/default.nix
+++ b/pkgs/tools/networking/mcrcon/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "mcrcon-${version}";
+ pname = "mcrcon";
version = "0.6.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix
index c995eea7b14d..a8154f26a713 100644
--- a/pkgs/tools/networking/megatools/default.nix
+++ b/pkgs/tools/networking/megatools/default.nix
@@ -2,13 +2,13 @@
, asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "megatools-${version}";
+ pname = "megatools";
version = "1.10.2";
src = fetchFromGitHub {
owner = "megous";
repo = "megatools";
- rev = "${version}";
+ rev = version;
sha256 = "001hw8j36ld03wwaphq3xdaazf2dpl36h84k8xmk524x8vlia8lk";
};
diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix
index c3a076076f14..075696cfba1b 100644
--- a/pkgs/tools/networking/memtier-benchmark/default.nix
+++ b/pkgs/tools/networking/memtier-benchmark/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "memtier-benchmark-${version}";
+ pname = "memtier-benchmark";
version = "1.2.17";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix
index 56a101b31573..49cc5710e599 100644
--- a/pkgs/tools/networking/minidlna/default.nix
+++ b/pkgs/tools/networking/minidlna/default.nix
@@ -3,7 +3,8 @@
let version = "1.2.1"; in
stdenv.mkDerivation {
- name = "minidlna-${version}";
+ pname = "minidlna";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz";
diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 3a3ca03f18ae..3c8d15346849 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -1,8 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "minio-client-${version}";
-
+ pname = "minio-client";
version = "2019-01-30T19-57-22Z";
src = fetchFromGitHub {
@@ -14,9 +13,9 @@ buildGoPackage rec {
goPackagePath = "github.com/minio/mc";
- buildFlagsArray = [''-ldflags=
- -X github.com/minio/mc/cmd.Version=${version}
- ''];
+ preBuild = ''
+ buildFlagsArray+=("-ldflags=-X github.com/minio/mc/cmd.Version=${version}")
+ '';
meta = with stdenv.lib; {
homepage = https://github.com/minio/mc;
diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix
index 9809b330faba..1277a17f9bae 100644
--- a/pkgs/tools/networking/minissdpd/default.nix
+++ b/pkgs/tools/networking/minissdpd/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, libnfnetlink }:
stdenv.mkDerivation rec {
- name = "minissdpd-${version}";
+ pname = "minissdpd";
version = "1.5.20180223";
src = fetchurl {
sha256 = "1c47h1zil04jnbxiaaci2rm8jij47zp5156v48hb6m87nh4l5adv";
- url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
- name = "${name}.tar.gz";
+ url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
};
buildInputs = [ libnfnetlink ];
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index 84b31bd5d40c..dc0a4457dde4 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -3,10 +3,11 @@
let
generic = { version, sha256 }:
stdenv.mkDerivation rec {
- name = "miniupnpc-${version}";
+ pname = "miniupnpc";
+ inherit version;
src = fetchurl {
- name = "${name}.tar.gz";
- url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+ name = "${pname}-${version}.tar.gz";
+ url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz";
inherit sha256;
};
diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix
index babfcf1db216..26f6c2498e18 100644
--- a/pkgs/tools/networking/miredo/default.nix
+++ b/pkgs/tools/networking/miredo/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.2.6";
- name = "miredo-${version}";
+ pname = "miredo";
buildInputs = [ judy ];
diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix
index 6f0732b8cfdf..b2644d0c2a49 100644
--- a/pkgs/tools/networking/modem-manager/default.nix
+++ b/pkgs/tools/networking/modem-manager/default.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-polkit"
- "--with-udev-base-dir=${placeholder ''out''}/lib/udev"
- "--with-dbus-sys-dir=${placeholder ''out''}/etc/dbus-1/system.d"
- "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
+ "--with-udev-base-dir=${placeholder "out"}/lib/udev"
+ "--with-dbus-sys-dir=${placeholder "out"}/etc/dbus-1/system.d"
+ "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"--sysconfdir=/etc"
"--localstatedir=/var"
"--with-systemd-suspend-resume"
diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix
index 1acd513be31f..217f3b7d7cc8 100644
--- a/pkgs/tools/networking/mtr/default.nix
+++ b/pkgs/tools/networking/mtr/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig
, libcap, ncurses
, withGtk ? false, gtk2 ? null }:
assert withGtk -> gtk2 != null;
stdenv.mkDerivation rec {
- pname = "mtr";
+ pname = "mtr${lib.optionalString withGtk "-gui"}";
version = "0.93";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 75462659699c..bd035e8f03cb 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -4,7 +4,7 @@
, withMug ? false }:
stdenv.mkDerivation rec {
- name = "mu-${version}";
+ pname = "mu";
version = "1.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/tools/networking/nat-traverse/default.nix
index a352596eed05..a4dcfb4a40f2 100644
--- a/pkgs/tools/networking/nat-traverse/default.nix
+++ b/pkgs/tools/networking/nat-traverse/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
- name = "nat-traverse-${version}";
+ pname = "nat-traverse";
version = "0.7";
src = fetchurl {
diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix
index 90ac44aa375a..acd9a0e27f86 100644
--- a/pkgs/tools/networking/ncftp/default.nix
+++ b/pkgs/tools/networking/ncftp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ncurses, coreutils }:
stdenv.mkDerivation rec {
- name = "ncftp-${version}";
+ pname = "ncftp";
version = "3.2.6";
src = fetchurl {
diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix
index 255d430a3a5d..85de6d131837 100644
--- a/pkgs/tools/networking/ndjbdns/default.nix
+++ b/pkgs/tools/networking/ndjbdns/default.nix
@@ -2,9 +2,9 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.06";
- name = "ndjbdns-${version}";
+ pname = "ndjbdns";
src = fetchFromGitHub {
owner = "pjps";
diff --git a/pkgs/tools/networking/netalyzr/default.nix b/pkgs/tools/networking/netalyzr/default.nix
index 8f8cf929e9d4..969084582aee 100644
--- a/pkgs/tools/networking/netalyzr/default.nix
+++ b/pkgs/tools/networking/netalyzr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre, makeWrapper }:
-stdenv.mkDerivation rec {
- name = "netalyzr-${version}";
+stdenv.mkDerivation {
+ pname = "netalyzr";
version = "57861";
# unfortunately there is not a version specific download URL
diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix
index eac95a32008c..a85d4d7ad108 100644
--- a/pkgs/tools/networking/nethogs/default.nix
+++ b/pkgs/tools/networking/nethogs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ncurses, libpcap }:
stdenv.mkDerivation rec {
- name = "nethogs-${version}";
+ pname = "nethogs";
version = "0.8.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix
index e9704c4babe6..864838bdd390 100644
--- a/pkgs/tools/networking/netmask/default.nix
+++ b/pkgs/tools/networking/netmask/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, texinfo }:
stdenv.mkDerivation rec {
- name = "netmask-${version}";
+ pname = "netmask";
version = "2.4.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix
index d10125e09a65..dfd355237dc0 100644
--- a/pkgs/tools/networking/netrw/default.nix
+++ b/pkgs/tools/networking/netrw/default.nix
@@ -8,7 +8,7 @@ assert checksumType == "mhash" -> libmhash != null;
assert checksumType == "openssl" -> openssl != null;
stdenv.mkDerivation rec {
- name = "netrw-${version}";
+ pname = "netrw";
version = "1.3.2";
configureFlags = [
diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/tools/networking/netselect/default.nix
index 702fee86922e..c40f43c214fc 100644
--- a/pkgs/tools/networking/netselect/default.nix
+++ b/pkgs/tools/networking/netselect/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "netselect-${version}";
+ pname = "netselect";
version = "0.4";
src = fetchFromGitHub {
owner = "apenwarr";
repo = "netselect";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "1zncyvjzllrjbdvz7c50d1xjyhs9mwqfy92ndpfc5b3mxqslw4kx";
};
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 062d6e2d0a9c..8da36d72fda2 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "0.6.6";
# Upstream recommends and supports git
- src = fetchFromGitHub rec {
+ src = fetchFromGitHub {
repo = pname;
owner = pname;
rev = "v${version}";
diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/tools/networking/nettee/default.nix
index fdfa446907c1..d95171807dfa 100644
--- a/pkgs/tools/networking/nettee/default.nix
+++ b/pkgs/tools/networking/nettee/default.nix
@@ -5,7 +5,8 @@ let
sha256 = "00xbkp99x9v07r34w7m2p8gak5hdsdbka36n7a733rdrrkgf5z7r";
in stdenv.mkDerivation {
- name = "nettee-${version}";
+ pname = "nettee";
+ inherit version;
src = fetchurl {
url = "http://saf.bio.caltech.edu/pub/software/linux_or_unix_tools/beta-nettee-${version}.tar.gz";
diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/network-manager/0.9.8/default.nix
index c5613341aab1..131ec6751159 100644
--- a/pkgs/tools/networking/network-manager/0.9.8/default.nix
+++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix
@@ -3,7 +3,7 @@
, libgcrypt, perl, libgudev, avahi, ppp, kmod }:
stdenv.mkDerivation rec {
- name = "network-manager-${version}";
+ pname = "network-manager";
version = "0.9.8.10";
src = fetchurl {
diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix
index 0fb11e1b0ebb..1a6538ad1044 100644
--- a/pkgs/tools/networking/network-manager/applet.nix
+++ b/pkgs/tools/networking/network-manager/applet.nix
@@ -2,7 +2,7 @@
, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43
, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas
, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3
-, libappindicator-gtk3, withGnome ? false, gcr }:
+, libappindicator-gtk3, withGnome ? false, gcr, glib }:
let
pname = "network-manager-applet";
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
- substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS $lib/share/gsettings-schemas/${name}/glib-2.0/schemas
+ substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$lib" name}
'';
passthru = {
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 95d37e164788..5bc915caea65 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -7,14 +7,13 @@
, openconnect, curl, meson, ninja, libpsl }:
let
- pname = "NetworkManager";
pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
in stdenv.mkDerivation rec {
- name = "network-manager-${version}";
+ pname = "network-manager";
version = "1.18.2";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
sha256 = "1hx5dx5dgdqh3p8fq7q1pxy2bx2iymc74lj60ycrf7ydfjlprnad";
};
diff --git a/pkgs/tools/networking/network-manager/dmenu.nix b/pkgs/tools/networking/network-manager/dmenu.nix
index 665db4cc287b..93a169a3fb0f 100644
--- a/pkgs/tools/networking/network-manager/dmenu.nix
+++ b/pkgs/tools/networking/network-manager/dmenu.nix
@@ -3,7 +3,7 @@
let inherit (python3Packages) python pygobject3;
in stdenv.mkDerivation rec {
- name = "networkmanager_dmenu-${version}";
+ pname = "networkmanager_dmenu";
version = "1.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
index f4ffe620e744..7773548576b0 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
@@ -4,7 +4,7 @@ networkmanager, ppp, libsecret, withGnome ? true, gnome3 }:
let
pname = "NetworkManager-fortisslvpn";
version = "1.2.10";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix
index d3eb3f799336..27e091b6b602 100644
--- a/pkgs/tools/networking/network-manager/iodine/default.nix
+++ b/pkgs/tools/networking/network-manager/iodine/default.nix
@@ -4,7 +4,7 @@
let
pname = "NetworkManager-iodine";
version = "1.2.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix
index 5dffdb4ca3fb..e4ab74f08e35 100644
--- a/pkgs/tools/networking/network-manager/l2tp/default.nix
+++ b/pkgs/tools/networking/network-manager/l2tp/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "nm-l2tp";
repo = "network-manager-l2tp";
- rev = "${version}";
+ rev = version;
sha256 = "0cq07kvlm98s8a7l4a3zmqnif8x3307kv7n645zx3f1r7x72b8m4";
};
diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix
index 566179d85b36..1fb50686d0d0 100644
--- a/pkgs/tools/networking/network-manager/openconnect/default.nix
+++ b/pkgs/tools/networking/network-manager/openconnect/default.nix
@@ -4,7 +4,7 @@
let
pname = "NetworkManager-openconnect";
version = "1.2.4";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix
index fa764788e2c6..04ec49f7b9b1 100644
--- a/pkgs/tools/networking/network-manager/openvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/openvpn/default.nix
@@ -4,7 +4,7 @@
let
pname = "NetworkManager-openvpn";
version = "1.8.10";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix
index 6b69b97552a8..60c344e8eb4b 100644
--- a/pkgs/tools/networking/network-manager/strongswan.nix
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@@ -2,12 +2,11 @@
, gtk3, gnome3, libsecret }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "NetworkManager-strongswan";
version = "1.4.5";
src = fetchurl {
- url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2";
+ url = "https://download.strongswan.org/NetworkManager/${pname}-${version}.tar.bz2";
sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl";
};
diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix
index 3231c276be5b..1aa4cd5658bb 100644
--- a/pkgs/tools/networking/network-manager/vpnc/default.nix
+++ b/pkgs/tools/networking/network-manager/vpnc/default.nix
@@ -3,7 +3,7 @@
let
pname = "NetworkManager-vpnc";
version = "1.2.6";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix
index 977683f26ccb..0ae309cf94d9 100644
--- a/pkgs/tools/networking/nfdump/default.nix
+++ b/pkgs/tools/networking/nfdump/default.nix
@@ -5,7 +5,8 @@
let version = "1.6.18"; in
stdenv.mkDerivation {
- name = "nfdump-${version}";
+ pname = "nfdump";
+ inherit version;
src = fetchFromGitHub {
owner = "phaag";
diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix
index 9cddc5bbd877..ab8da6236cff 100644
--- a/pkgs/tools/networking/ngrep/default.nix
+++ b/pkgs/tools/networking/ngrep/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libpcap, pcre }:
stdenv.mkDerivation rec {
- name = "ngrep-${version}";
+ pname = "ngrep";
version = "1.47";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix
index d0aec7889efa..19ae72aaac0d 100644
--- a/pkgs/tools/networking/ngrok-1/default.nix
+++ b/pkgs/tools/networking/ngrok-1/default.nix
@@ -1,9 +1,9 @@
{ buildGoPackage, go-bindata, fetchFromGitHub }:
buildGoPackage rec {
- name = "ngrok-${version}";
+ pname = "ngrok";
version = "1.7.1";
- rev = "${version}";
+ rev = version;
goPackagePath = "ngrok";
diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix
index c74ceb055cea..e5650d5427cb 100644
--- a/pkgs/tools/networking/ngrok-2/default.nix
+++ b/pkgs/tools/networking/ngrok-2/default.nix
@@ -17,7 +17,7 @@ let versions = builtins.fromJSON (builtins.readFile ./versions.json);
in
stdenv.mkDerivation {
name = "ngrok-${version}";
- version = "${version}";
+ version = version;
# run ./update
src = fetchurl { inherit sha256 url; };
diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix
index c63d7ac057b1..0ef2ce508671 100644
--- a/pkgs/tools/networking/noip/default.nix
+++ b/pkgs/tools/networking/noip/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "noip-2.1.9-1";
src = fetchurl {
diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix
index b199d850f971..dc921dc495af 100644
--- a/pkgs/tools/networking/nss-pam-ldapd/default.nix
+++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "nss-pam-ldapd-${version}";
+ pname = "nss-pam-ldapd";
version = "0.9.10";
src = fetchurl {
- url = "https://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz";
+ url = "https://arthurdejong.org/nss-pam-ldapd/${pname}-${version}.tar.gz";
sha256 = "1cqamcr6qpgwxijlr6kg7jspjamjra8w0haan0qssn0yxn95d7c0";
};
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index a990cb1ee927..b890e07845e7 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
# very close to isc and bsd2
url = https://www.eecis.udel.edu/~mills/ntp/html/copyright.html;
};
- maintainers = [ maintainers.eelco ];
+ maintainers = with maintainers; [ eelco thoughtpolice ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix
index 2ed9c330181c..f01d5ccada19 100644
--- a/pkgs/tools/networking/nuttcp/default.nix
+++ b/pkgs/tools/networking/nuttcp/default.nix
@@ -1,20 +1,20 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "nuttcp-${version}";
+ pname = "nuttcp";
version = "8.1.4";
src = fetchurl {
urls = [
- "http://nuttcp.net/nuttcp/latest/${name}.c"
- "http://nuttcp.net/nuttcp/${name}/${name}.c"
- "http://nuttcp.net/nuttcp/beta/${name}.c"
+ "http://nuttcp.net/nuttcp/latest/${pname}-${version}.c"
+ "http://nuttcp.net/nuttcp/${pname}-${version}/${pname}-${version}.c"
+ "http://nuttcp.net/nuttcp/beta/${pname}-${version}.c"
];
sha256 = "1mygfhwxfi6xg0iycivx98ckak2abc3vwndq74278kpd8g0yyqyh";
};
man = fetchurl {
- url = "http://nuttcp.net/nuttcp/${name}/nuttcp.8";
+ url = "http://nuttcp.net/nuttcp/${pname}-${version}/nuttcp.8";
sha256 = "1yang94mcdqg362qbi85b63746hk6gczxrk619hyj91v5763n4vx";
};
diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix
index af7c4401daec..b3c77f5b797c 100644
--- a/pkgs/tools/networking/nzbget/default.nix
+++ b/pkgs/tools/networking/nzbget/default.nix
@@ -2,7 +2,7 @@
, gnutls, libgcrypt, zlib, openssl }:
stdenv.mkDerivation rec {
- name = "nzbget-${version}";
+ pname = "nzbget";
version = "21.0";
src = fetchurl {
diff --git a/pkgs/tools/networking/ocproxy/default.nix b/pkgs/tools/networking/ocproxy/default.nix
index c93e94e2f287..729f5b319980 100644
--- a/pkgs/tools/networking/ocproxy/default.nix
+++ b/pkgs/tools/networking/ocproxy/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.60";
- name = "ocproxy-${version}";
+ pname = "ocproxy";
src = fetchFromGitHub {
owner = "cernekee";
diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix
index 094bebe628f6..e695c4604229 100644
--- a/pkgs/tools/networking/ocserv/default.nix
+++ b/pkgs/tools/networking/ocserv/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "ocserv-${version}";
+ pname = "ocserv";
version = "0.12.4";
src = fetchFromGitLab {
diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix
index 21d1f9ee0675..27f4b9562b38 100644
--- a/pkgs/tools/networking/ofono/default.nix
+++ b/pkgs/tools/networking/ofono/default.nix
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
];
configureFlags = [
- "--with-dbusconfdir=${placeholder ''out''}/share"
- "--with-systemdunitdir=${placeholder ''out''}/lib/systemd/system"
+ "--with-dbusconfdir=${placeholder "out"}/share"
+ "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system"
"--enable-external-ell"
];
diff --git a/pkgs/tools/networking/olsrd/default.nix b/pkgs/tools/networking/olsrd/default.nix
index 8fa30a5c2211..cff4b7e97137 100644
--- a/pkgs/tools/networking/olsrd/default.nix
+++ b/pkgs/tools/networking/olsrd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, bison, flex }:
stdenv.mkDerivation rec {
- name = "olsrd-${version}";
+ pname = "olsrd";
version = "0.9.6.1";
src = fetchurl {
- url = "http://www.olsr.org/releases/0.9/${name}.tar.bz2";
+ url = "http://www.olsr.org/releases/0.9/${pname}-${version}.tar.bz2";
sha256 = "9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612";
};
diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix
index 154788b3c5d3..7e6146294848 100644
--- a/pkgs/tools/networking/openconnect/default.nix
+++ b/pkgs/tools/networking/openconnect/default.nix
@@ -4,13 +4,13 @@ assert (openssl != null) == (gnutls == null);
stdenv.mkDerivation rec {
pname = "openconnect";
- version = "8.03";
+ version = "8.04";
src = fetchurl {
urls = [
"ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz"
];
- sha256 = "1wlypi68kqqg2mdck8wvf6aanhrmf9i7z6lngyxvcrp23jdzz34h";
+ sha256 = "07zqcl2ykdc4mgix9sbv4jgpg7cybifxfgrycvf99ckq7xp9r5wq";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix
index d261e5717052..68d18bff777b 100644
--- a/pkgs/tools/networking/openconnect_pa/default.nix
+++ b/pkgs/tools/networking/openconnect_pa/default.nix
@@ -2,9 +2,9 @@
assert (openssl != null) == (gnutls == null);
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "unstable-2018-10-08";
- name = "openconnect_pa-${version}";
+ pname = "openconnect_pa";
outputs = [ "out" "dev" ];
diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix
index 019806fcd572..9cfb24ce95d4 100644
--- a/pkgs/tools/networking/openntpd/default.nix
+++ b/pkgs/tools/networking/openntpd/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "openntpd-${version}";
+ pname = "openntpd";
version = "6.2p3";
src = fetchurl {
- url = "mirror://openbsd/OpenNTPD/${name}.tar.gz";
+ url = "mirror://openbsd/OpenNTPD/${pname}-${version}.tar.gz";
sha256 = "0fn12i4kzsi0zkr4qp3dp9bycmirnfapajqvdfx02zhr4hanj0kv";
};
@@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
description = "OpenBSD NTP daemon (Debian port)";
platforms = platforms.all;
+ maintainers = with maintainers; [ thoughtpolice ];
};
}
diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix
index 302e08617afc..73cb98060a03 100644
--- a/pkgs/tools/networking/openresolv/default.nix
+++ b/pkgs/tools/networking/openresolv/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, coreutils }:
stdenv.mkDerivation rec {
- name = "openresolv-${version}";
+ pname = "openresolv";
version = "3.9.1";
src = fetchurl {
- url = "mirror://roy/openresolv/${name}.tar.xz";
+ url = "mirror://roy/openresolv/${pname}-${version}.tar.xz";
sha256 = "1wlzi88837rf4ygswmzpbcmgkbbjhn5n322n9q6ir6x367hygf1q";
};
diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix
index d52cc9d8defb..e0a0dcd56cbe 100644
--- a/pkgs/tools/networking/opensm/default.nix
+++ b/pkgs/tools/networking/opensm/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, flex, rdma-core }:
stdenv.mkDerivation rec {
- name = "opensm-${version}";
+ pname = "opensm";
version = "3.3.22";
src = fetchFromGitHub {
owner = "linux-rdma";
repo = "opensm";
- rev = "${version}";
+ rev = version;
sha256 = "1nb6zl93ffbgb8z8728j0dxrmvk3pm0i6a1sn7mpn8ki1vkf2y0j";
};
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 6ce574b9cdc4..bb51e3153e13 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -21,7 +21,7 @@ let
in
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "openssh-${version}";
+ pname = "openssh";
version = if hpnSupport then "7.8p1" else "7.9p1";
src = if hpnSupport then
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
}
else
fetchurl {
- url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
+ url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz";
sha256 = "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb";
};
@@ -50,6 +50,8 @@ stdenv.mkDerivation rec {
url = https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2.patch;
sha256 = "0q27i9ymr97yb628y44qi4m11hk5qikb1ji1vhvax8hp18lwskds";
})
+
+ ./ssh-keysign.patch
]
++ optional withGssapiPatches (assert withKerberos; gssapiPatch);
diff --git a/pkgs/tools/networking/openssh/ssh-keysign.patch b/pkgs/tools/networking/openssh/ssh-keysign.patch
new file mode 100644
index 000000000000..7258f4a4db15
--- /dev/null
+++ b/pkgs/tools/networking/openssh/ssh-keysign.patch
@@ -0,0 +1,29 @@
+diff --git a/pathnames.h b/pathnames.h
+index cb44caa4..354fdf05 100644
+--- a/pathnames.h
++++ b/pathnames.h
+@@ -124,7 +124,7 @@
+
+ /* Location of ssh-keysign for hostbased authentication */
+ #ifndef _PATH_SSH_KEY_SIGN
+-#define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign"
++#define _PATH_SSH_KEY_SIGN "ssh-keysign"
+ #endif
+
+ /* Location of ssh-pkcs11-helper to support keys in tokens */
+diff --git a/sshconnect2.c b/sshconnect2.c
+index dffee90b..e9a86e59 100644
+--- a/sshconnect2.c
++++ b/sshconnect2.c
+@@ -1879,7 +1879,7 @@ ssh_keysign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp,
+ closefrom(sock + 1);
+ debug3("%s: [child] pid=%ld, exec %s",
+ __func__, (long)getpid(), _PATH_SSH_KEY_SIGN);
+- execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL);
++ execlp(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL);
+ fatal("%s: exec(%s): %s", __func__, _PATH_SSH_KEY_SIGN,
+ strerror(errno));
+ }
+--
+2.22.0
+
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 732687ecfa15..c8aa2c1f5c57 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -18,11 +18,11 @@ let
};
in stdenv.mkDerivation rec {
- name = "openvpn-${version}";
+ pname = "openvpn";
version = "2.4.7";
src = fetchurl {
- url = "https://swupdate.openvpn.net/community/releases/${name}.tar.xz";
+ url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz";
sha256 = "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4";
};
diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
index 706f2434a955..d86934d079b1 100644
--- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
+++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, makeWrapper, coreutils, gawk, utillinux }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "openvpn-learnaddress-19b03c3";
src = fetchgit {
diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
index e96aa25feded..0f7e8f2c4450 100644
--- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix
+++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
@@ -3,7 +3,7 @@
let
binPath = lib.makeBinPath [ coreutils openresolv systemd ];
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "update-resolv-conf-2017-06-21";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
index fe9a5695a4b3..70e36cb7ec58 100644
--- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
+++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "A GTK+ Gnutella client, optimized for speed and scalability";
+ description = "A GTK Gnutella client, optimized for speed and scalability";
homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella
changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog";
license = licenses.gpl2Plus;
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index 8c043294143e..a5305acdf597 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -7,7 +7,7 @@
pythonPackages.buildPythonApplication rec {
version = "1.13.0";
- name = "tahoe-lafs-${version}";
+ pname = "tahoe-lafs";
namePrefix = "";
src = fetchurl {
@@ -65,8 +65,8 @@ pythonPackages.buildPythonApplication rec {
cd docs
make singlehtml
- mkdir -p "$doc/share/doc/${name}"
- cp -rv _build/singlehtml/* "$doc/share/doc/${name}"
+ mkdir -p "$doc/share/doc/${pname}-${version}"
+ cp -rv _build/singlehtml/* "$doc/share/doc/${pname}-${version}"
make info
mkdir -p "$info/share/info"
diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix
index d770a51dc820..2041d935c942 100644
--- a/pkgs/tools/networking/packetdrill/default.nix
+++ b/pkgs/tools/networking/packetdrill/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, bison, flex }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.0";
- name = "packetdrill-${version}";
+ pname = "packetdrill";
src = fetchFromGitHub {
owner = "google";
repo = "packetdrill";
diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix
index fbb17308f90c..211256ea72b8 100644
--- a/pkgs/tools/networking/pacparser/default.nix
+++ b/pkgs/tools/networking/pacparser/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "pacparser-${version}";
+ pname = "pacparser";
version = "1.3.7";
src = fetchurl {
- url = "https://github.com/manugarg/pacparser/releases/download/${version}/${name}.tar.gz";
+ url = "https://github.com/manugarg/pacparser/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "0jfjm8lqyhdy9ny8a8icyd4rhclhfn608cr1i15jml82q8pyqj7b";
};
diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix
index f2c92d689f35..9bc4c178665d 100644
--- a/pkgs/tools/networking/par2cmdline/default.nix
+++ b/pkgs/tools/networking/par2cmdline/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "par2cmdline-${version}";
+ pname = "par2cmdline";
version = "0.8.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix
index 71d1e6fa6d6e..663e04db4601 100644
--- a/pkgs/tools/networking/pcapc/default.nix
+++ b/pkgs/tools/networking/pcapc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libpcap, cmake }:
stdenv.mkDerivation rec {
- name = "pcapc-${version}";
+ pname = "pcapc";
version = "1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix
index 10c004ecd94f..f5d30fa32a8b 100644
--- a/pkgs/tools/networking/pdnsd/default.nix
+++ b/pkgs/tools/networking/pdnsd/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "pdnsd-1.2.9a-par";
src = fetchurl {
diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix
index 854ad617cd26..7412bc568a28 100644
--- a/pkgs/tools/networking/persepolis/default.nix
+++ b/pkgs/tools/networking/persepolis/default.nix
@@ -17,7 +17,7 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "persepolisdm";
repo = "persepolis";
- rev = "${version}";
+ rev = version;
sha256 = "0xngk8wgj5k27mh3bcrf2wwzqr8a3g0d4pc5i5vcavnnaj03j44m";
};
diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix
index 5dff64e27c5c..c8b441168468 100644
--- a/pkgs/tools/networking/philter/default.nix
+++ b/pkgs/tools/networking/philter/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation rec {
- name = "philter-${version}";
+ pname = "philter";
version = "1.1";
src = fetchurl {
- url = "mirror://sourceforge/philter/${name}.tar.gz";
+ url = "mirror://sourceforge/philter/${pname}-${version}.tar.gz";
sha256 = "177pqfflhdn2mw9lc1wv9ik32ji69rjqr6dw83hfndwlsva5151l";
};
diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix
index e585af81991e..320e7614c7c3 100644
--- a/pkgs/tools/networking/phodav/default.nix
+++ b/pkgs/tools/networking/phodav/default.nix
@@ -4,10 +4,11 @@
let
version = "2.2";
in stdenv.mkDerivation rec {
- name = "phodav-${version}";
+ pname = "phodav";
+ inherit version;
src = fetchurl {
- url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${name}.tar.xz";
+ url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz";
sha256 = "1hap0lncbcmivnflh0fbx7y58ry78p9wgj7z03r64ic0kvf0a0q8";
};
diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix
index 2d13515d83d7..d791f6b91d99 100644
--- a/pkgs/tools/networking/pingtcp/default.nix
+++ b/pkgs/tools/networking/pingtcp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "pingtcp-${version}";
+ pname = "pingtcp";
version = "0.0.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix
index b082a981ae74..8bbf589f3b3d 100644
--- a/pkgs/tools/networking/pixiewps/default.nix
+++ b/pkgs/tools/networking/pixiewps/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "pixiewps-${version}";
+ pname = "pixiewps";
version = "1.2.2";
src = fetchFromGitHub {
owner = "wiire";
diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix
index 2a70218f2879..cf963068d1c5 100644
--- a/pkgs/tools/networking/polysh/default.nix
+++ b/pkgs/tools/networking/polysh/default.nix
@@ -4,10 +4,10 @@ let
inherit (python2Packages) buildPythonApplication;
in
buildPythonApplication rec {
- name = "polysh-${version}";
+ pname = "polysh";
version = "0.4";
src = fetchurl {
- url = "http://guichaz.free.fr/polysh/files/${name}.tar.bz2";
+ url = "http://guichaz.free.fr/polysh/files/${pname}-${version}.tar.bz2";
sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4";
};
diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index 26dc71b7d619..b072ed21318c 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "2.4.7";
- name = "ppp-${version}";
+ pname = "ppp";
src = fetchurl {
- url = "mirror://samba/ppp/${name}.tar.gz";
+ url = "mirror://samba/ppp/${pname}-${version}.tar.gz";
sha256 = "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02";
};
diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/tools/networking/pptpd/default.nix
index 4c29cd949ee6..f373f594df80 100644
--- a/pkgs/tools/networking/pptpd/default.nix
+++ b/pkgs/tools/networking/pptpd/default.nix
@@ -1,12 +1,11 @@
{ stdenv, fetchurl, ppp }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "pptpd";
version = "1.4.0";
src = fetchurl {
- url = "mirror://sourceforge/poptop/${pname}/${name}/${name}.tar.gz";
+ url = "mirror://sourceforge/poptop/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "1h06gyxj51ba6kbbnf6hyivwjia0i6gsmjz8kyggaany8a58pkcg";
};
diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix
index 56bd46427d86..848a99f77718 100644
--- a/pkgs/tools/networking/privoxy/default.nix
+++ b/pkgs/tools/networking/privoxy/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec{
- name = "privoxy-${version}";
+ pname = "privoxy";
version = "3.0.28";
src = fetchurl {
- url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${name}-stable-src.tar.gz";
+ url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz";
sha256 = "0jl2yav1qzqnaqnnx8i6i53ayckkimcrs3l6ryvv7bda6v08rmxm";
};
diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix
index 36d0150a49b5..52ef43838c26 100644
--- a/pkgs/tools/networking/proxychains/default.nix
+++ b/pkgs/tools/networking/proxychains/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub } :
stdenv.mkDerivation rec {
- name = "proxychains-${version}";
+ pname = "proxychains";
version = "4.2.0";
src = fetchFromGitHub {
owner = "haad";
repo = "proxychains";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "015skh3z1jmm8kxbm3nkqv1w56kcvabdmcbmpwzywxr4xnh3x3pc";
};
diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix
index 22c359620507..43e465e05b6a 100644
--- a/pkgs/tools/networking/pssh/default.nix
+++ b/pkgs/tools/networking/pssh/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }:
pythonPackages.buildPythonApplication rec {
- name = "pssh-${version}";
+ pname = "pssh";
version = "2.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix
index 15ac5bceea33..fdfa0f808ecd 100644
--- a/pkgs/tools/networking/pykms/default.nix
+++ b/pkgs/tools/networking/pykms/default.nix
@@ -29,8 +29,8 @@ let
fi
'');
-in buildPythonApplication rec {
- name = "pykms-${version}";
+in buildPythonApplication {
+ pname = "pykms";
version = "20180208";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/qr-filetransfer/default.nix b/pkgs/tools/networking/qr-filetransfer/default.nix
index 581405f63c05..b95d0facda89 100644
--- a/pkgs/tools/networking/qr-filetransfer/default.nix
+++ b/pkgs/tools/networking/qr-filetransfer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
- name = "qr-filetransfer-unstable-${version}";
+buildGoPackage {
+ pname = "qr-filetransfer-unstable";
version = "2018-10-22";
goPackagePath = "github.com/claudiodangelis/qr-filetransfer";
diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix
index 3d7dc68e3578..87071e23a966 100644
--- a/pkgs/tools/networking/quicktun/default.nix
+++ b/pkgs/tools/networking/quicktun/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libsodium }:
-stdenv.mkDerivation rec {
- name = "quicktun-${version}";
+stdenv.mkDerivation {
+ pname = "quicktun";
version = "2.2.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix
index 98466a800a34..30e706d66737 100644
--- a/pkgs/tools/networking/radvd/default.nix
+++ b/pkgs/tools/networking/radvd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }:
stdenv.mkDerivation rec {
- name = "radvd-${version}";
+ pname = "radvd";
version = "2.18";
src = fetchurl {
- url = "http://www.litech.org/radvd/dist/${name}.tar.xz";
+ url = "http://www.litech.org/radvd/dist/${pname}-${version}.tar.xz";
sha256 = "1p2wlv3djvla0r84hdncc3wfa530xigs7z9ssc2v5r1pcpzgxgz1";
};
diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix
index 5e18ee80f99d..cf8c370c522a 100644
--- a/pkgs/tools/networking/ratools/default.nix
+++ b/pkgs/tools/networking/ratools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "ratools-${version}";
+ pname = "ratools";
version = "0.6.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix
index ed48feabb85a..864a7fb5e613 100644
--- a/pkgs/tools/networking/reaver-wps/default.nix
+++ b/pkgs/tools/networking/reaver-wps/default.nix
@@ -2,8 +2,8 @@
stdenv.mkDerivation rec {
version = "1.4";
- name = "reaver-wps-${version}";
- confdir = "/var/db/${name}"; # the sqlite database is at "${confdir}/reaver/reaver.db"
+ pname = "reaver-wps";
+ confdir = "/var/db/${pname}-${version}"; # the sqlite database is at "${confdir}/reaver/reaver.db"
src = fetchurl {
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/reaver-wps/reaver-${version}.tar.gz";
diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix
index a11bebe0dca1..1a6efb065e2e 100644
--- a/pkgs/tools/networking/redir/default.nix
+++ b/pkgs/tools/networking/redir/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "redir-${version}";
+ pname = "redir";
version = "3.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix
index 641513eaf472..32a30f48ec65 100644
--- a/pkgs/tools/networking/redsocks/default.nix
+++ b/pkgs/tools/networking/redsocks/default.nix
@@ -4,7 +4,7 @@ let
pkg = "redsocks";
version = "0.5";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pkg}-${version}";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix
index 37f542319dad..ae84d9662aa0 100644
--- a/pkgs/tools/networking/ripmime/default.nix
+++ b/pkgs/tools/networking/ripmime/default.nix
@@ -1,11 +1,10 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "ripmime";
version = "1.4.0.10";
src = fetchurl {
- url = "http://www.pldaniels.com/${pname}/${name}.tar.gz";
+ url = "http://www.pldaniels.com/${pname}/${pname}-${version}.tar.gz";
sha256 = "0sj06ibmlzy34n8v0mnlq2gwidy7n2aqcwgjh0xssz3vi941aqc9";
};
diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix
index 2beb8aec3893..bdb526c70543 100644
--- a/pkgs/tools/networking/rp-pppoe/default.nix
+++ b/pkgs/tools/networking/rp-pppoe/default.nix
@@ -2,7 +2,7 @@
let
version = "3.12";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "rp-pppoe-" + version;
src = fetchurl {
url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz";
diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix
index e74a3554dc29..31b111f2b83d 100644
--- a/pkgs/tools/networking/s3cmd/default.nix
+++ b/pkgs/tools/networking/s3cmd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages }:
python2Packages.buildPythonApplication rec {
- name = "s3cmd-${version}";
+ pname = "s3cmd";
version = "2.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix
index 3814af60112e..d53d60333baf 100644
--- a/pkgs/tools/networking/s3gof3r/default.nix
+++ b/pkgs/tools/networking/s3gof3r/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "s3gof3r-${version}";
+ pname = "s3gof3r";
version = "20151109-${stdenv.lib.strings.substring 0 7 rev}";
rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445";
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index b42b3ff5b739..8dfaae63ffaf 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -11,7 +11,7 @@ let
inherit (stdenv) lib;
sslSupportEnabled = sslSupport != false;
sslLibs = {
- "libressl" = libressl;
+ libressl = libressl;
};
in
diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix
index 5cb65b78ee8b..d8167b8a48fc 100644
--- a/pkgs/tools/networking/samplicator/default.nix
+++ b/pkgs/tools/networking/samplicator/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "samplicator-${version}";
+ pname = "samplicator";
version = "1.3.8rc1";
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/tools/networking/shncpd/default.nix b/pkgs/tools/networking/shncpd/default.nix
index be2bc6a75a17..be861654f658 100644
--- a/pkgs/tools/networking/shncpd/default.nix
+++ b/pkgs/tools/networking/shncpd/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "shncpd-${version}";
+stdenv.mkDerivation {
+ pname = "shncpd";
version = "2016-06-22";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/tools/networking/simpleproxy/default.nix
index 476e7dc229df..f94e177a8585 100644
--- a/pkgs/tools/networking/simpleproxy/default.nix
+++ b/pkgs/tools/networking/simpleproxy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "simpleproxy-${version}";
+ pname = "simpleproxy";
version = "3.5";
rev = "v.${version}";
diff --git a/pkgs/tools/networking/sipcalc/default.nix b/pkgs/tools/networking/sipcalc/default.nix
index 9400ccbb0724..dff929e9fa1c 100644
--- a/pkgs/tools/networking/sipcalc/default.nix
+++ b/pkgs/tools/networking/sipcalc/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "sipcalc-${version}";
+ pname = "sipcalc";
version = "1.1.6";
src = fetchurl {
- url = "http://www.routemeister.net/projects/sipcalc/files/${name}.tar.gz";
+ url = "http://www.routemeister.net/projects/sipcalc/files/${pname}-${version}.tar.gz";
sha256 = "cfd476c667f7a119e49eb5fe8adcfb9d2339bc2e0d4d01a1d64b7c229be56357";
};
diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix
index 908e4b05009f..c1a2451328df 100644
--- a/pkgs/tools/networking/sipsak/default.nix
+++ b/pkgs/tools/networking/sipsak/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, c-ares, openssl ? null }:
stdenv.mkDerivation rec {
- name = "sipsak-${version}";
+ pname = "sipsak";
version = "4.1.2.1";
buildInputs = [
diff --git a/pkgs/tools/networking/skydive/default.nix b/pkgs/tools/networking/skydive/default.nix
deleted file mode 100644
index e72147937445..000000000000
--- a/pkgs/tools/networking/skydive/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub, perl
-, go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }:
-
-buildGoPackage rec {
- name = "skydive-${version}";
- version = "0.17.0";
- goPackagePath = "github.com/skydive-project/skydive";
-
- src = fetchFromGitHub {
- owner = "skydive-project";
- repo = "skydive";
- rev = "v${version}";
- sha256 = "03y26imiib2v9icrgwlamzsrx3ph6vn582051vdk1x9ar80xp4dv";
- };
-
- patchPhase = ''
- substituteInPlace Makefile \
- --replace ".proto: builddep" ".proto: " \
- --replace ".bindata: builddep" ".bindata: "
- '';
-
- buildInputs = [ perl go-bindata go-protobuf libxml2 protobuf3_1 libpcap pkgconfig ];
- goDeps = ./deps.nix;
-
- preBuild = ''
- make -C go/src/github.com/skydive-project/skydive genlocalfiles VERSION=${version}
- '';
-
- preInstall = ''
- mkdir -p $out/share/skydive
- cp go/src/github.com/skydive-project/skydive/etc/skydive.yml.default $out/share/skydive/
- '';
-
- postInstall = ''
- rm $bin/bin/snort
- '';
-
- meta = {
- homepage = http://skydive.network;
- description = "A real-time network analyzer";
- license = lib.licenses.asl20;
- platforms = [ "x86_64-linux" ];
- maintainers = [ lib.maintainers.lewo ];
- };
-}
diff --git a/pkgs/tools/networking/skydive/deps.nix b/pkgs/tools/networking/skydive/deps.nix
deleted file mode 100644
index c573a7231bb6..000000000000
--- a/pkgs/tools/networking/skydive/deps.nix
+++ /dev/null
@@ -1,1335 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
-[
- {
- goPackagePath = "github.com/Microsoft/go-winio";
- fetch = {
- type = "git";
- url = "https://github.com/Microsoft/go-winio";
- rev = "fff283ad5116362ca252298cfc9b95828956d85d";
- sha256 = "0kfd6477rndcdl5c4dg9k64kxxp2667qqlbp4ccl7xk4qg9jckg9";
- };
- }
- {
- goPackagePath = "github.com/PuerkitoBio/purell";
- fetch = {
- type = "git";
- url = "https://github.com/PuerkitoBio/purell";
- rev = "fd18e053af8a4ff11039269006e8037ff374ce0e";
- sha256 = "1v62jhcq1zvnsj83z3dyqr7msndnp85rlm53l6iq78yryd54i115";
- };
- }
- {
- goPackagePath = "github.com/PuerkitoBio/urlesc";
- fetch = {
- type = "git";
- url = "https://github.com/PuerkitoBio/urlesc";
- rev = "de5bf2ad457846296e2031421a34e2568e304e35";
- sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw";
- };
- }
- {
- goPackagePath = "github.com/Sirupsen/logrus";
- fetch = {
- type = "git";
- url = "https://github.com/Sirupsen/logrus";
- rev = "4b6ea7319e214d98c938f12692336f7ca9348d6b";
- sha256 = "06wnl1dkkib2zpm31aavk5c4290s64h2ss68nl1vgcbxzsfbxjaq";
- };
- }
- {
- goPackagePath = "github.com/StackExchange/wmi";
- fetch = {
- type = "git";
- url = "https://github.com/StackExchange/wmi";
- rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338";
- sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk";
- };
- }
- {
- goPackagePath = "github.com/abbot/go-http-auth";
- fetch = {
- type = "git";
- url = "https://github.com/abbot/go-http-auth";
- rev = "ca62df34b58d26b6a064246c21c0a18f97813173";
- sha256 = "169i8549ai9ljjpvfgqjx4azclps7zjvislfszw5fndkw0qx7v1n";
- };
- }
- {
- goPackagePath = "github.com/araddon/gou";
- fetch = {
- type = "git";
- url = "https://github.com/araddon/gou";
- rev = "0c2ab7394d785afff14c983fedce4be70ccc431f";
- sha256 = "0pppl3hm6r7mf7nnncjsfjfb8l020chzzl6n3c9g3qi02fkp3b1d";
- };
- }
- {
- goPackagePath = "github.com/armon/consul-api";
- fetch = {
- type = "git";
- url = "https://github.com/armon/consul-api";
- rev = "dcfedd50ed5334f96adee43fc88518a4f095e15c";
- sha256 = "1k3yl34j4d8y6xxqdm70pjrbdcnp11dbf8i1mp60480xg0cwpb6d";
- };
- }
- {
- goPackagePath = "github.com/beorn7/perks";
- fetch = {
- type = "git";
- url = "https://github.com/beorn7/perks";
- rev = "b965b613227fddccbfffe13eae360ed3fa822f8d";
- sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk";
- };
- }
- {
- goPackagePath = "github.com/bitly/go-hostpool";
- fetch = {
- type = "git";
- url = "https://github.com/bitly/go-hostpool";
- rev = "d0e59c22a56e8dadfed24f74f452cea5a52722d2";
- sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g";
- };
- }
- {
- goPackagePath = "github.com/c-bata/go-prompt";
- fetch = {
- type = "git";
- url = "https://github.com/c-bata/go-prompt";
- rev = "e99fbc797b795e0a7a94affc8d44f6a0350d85f0";
- sha256 = "00i8wfi51hzla59qgkdlijnvad4h1p1si9jaaw3jzchm7g7ryrlj";
- };
- }
- {
- goPackagePath = "github.com/cenk/hub";
- fetch = {
- type = "git";
- url = "https://github.com/cenk/hub";
- rev = "11382a9960d39b0ecda16fd01c424c11ff765a34";
- sha256 = "02f0l563niy2i5zq5cq7mqab775zzywp062pl0r12ny3gs0l8ssm";
- };
- }
- {
- goPackagePath = "github.com/cenk/rpc2";
- fetch = {
- type = "git";
- url = "https://github.com/cenk/rpc2";
- rev = "7ab76d2e88c77ca1a715756036d8264b2886acd2";
- sha256 = "1yazkf6g370zy13fxnwjvn1n37zf7m7mcfws0jrrjflfw49fbpv8";
- };
- }
- {
- goPackagePath = "github.com/cnf/structhash";
- fetch = {
- type = "git";
- url = "https://github.com/cnf/structhash";
- rev = "7710f1f78fb9c581deeeab57ecfb7978901b36bc";
- sha256 = "07dlpnwmqdmhj9s7w558lc0wnzvngz3i7d42a5y9rfg9k079l3fp";
- };
- }
- {
- goPackagePath = "github.com/cockroachdb/cmux";
- fetch = {
- type = "git";
- url = "https://github.com/cockroachdb/cmux";
- rev = "30d10be492927e2dcae0089c374c455d42414fcb";
- sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx";
- };
- }
- {
- goPackagePath = "github.com/coreos/bbolt";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/bbolt";
- rev = "32c383e75ce054674c53b5a07e55de85332aee14";
- sha256 = "0qa4434g081ksil9g479v9yk3ylhl48c9k95zki5kjq49cb0c589";
- };
- }
- {
- goPackagePath = "github.com/coreos/etcd";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/etcd";
- rev = "b5abfe1858ddde05b83b96a810dc2b50cc5fcd94";
- sha256 = "0lkhc45irh2pvlnqs60s06q74q5mlym9wl8h7rk8kk4zcfxqaa8i";
- };
- }
- {
- goPackagePath = "github.com/coreos/go-semver";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/go-semver";
- rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6";
- sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
- };
- }
- {
- goPackagePath = "github.com/coreos/go-systemd";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/go-systemd";
- rev = "7b2428fec40033549c68f54e26e89e7ca9a9ce31";
- sha256 = "0kfbxvm9zsjgvgmiq2jl807y4s5z0rya65rm399llr5rr7vz1lxd";
- };
- }
- {
- goPackagePath = "github.com/coreos/pkg";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/pkg";
- rev = "66fe44ad037ccb80329115cb4db0dbe8e9beb03a";
- sha256 = "1pxcwx0c6aazqdypcjvibam6zw88v1gsfhnsn5bscy33yzqmjrd4";
- };
- }
- {
- goPackagePath = "github.com/davecgh/go-spew";
- fetch = {
- type = "git";
- url = "https://github.com/davecgh/go-spew";
- rev = "346938d642f2ec3594ed81d874461961cd0faa76";
- sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
- };
- }
- {
- goPackagePath = "github.com/dgrijalva/jwt-go";
- fetch = {
- type = "git";
- url = "https://github.com/dgrijalva/jwt-go";
- rev = "d2709f9f1f31ebcda9651b03077758c1f3a0018c";
- sha256 = "02zhyimshzfzp3by2lggm2z382j4pvbrbcxx9p1wqmmmwy5yz182";
- };
- }
- {
- goPackagePath = "github.com/docker/distribution";
- fetch = {
- type = "git";
- url = "https://github.com/docker/distribution";
- rev = "325b0804fef3a66309d962357aac3c2ce3f4d329";
- sha256 = "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6";
- };
- }
- {
- goPackagePath = "github.com/docker/docker";
- fetch = {
- type = "git";
- url = "https://github.com/docker/docker";
- rev = "c6d412e329c85f32a4b2269b49aaa0794affcf88";
- sha256 = "1h3hkg15c3isfgaqpkp3mr7ys5826cz24hn3f3wz07jmismq98q7";
- };
- }
- {
- goPackagePath = "github.com/docker/go-connections";
- fetch = {
- type = "git";
- url = "https://github.com/docker/go-connections";
- rev = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a";
- sha256 = "16lcf485a7gl0kzkc5n0qq9frjkfinxhcr3j4874qqkr8ghghwbb";
- };
- }
- {
- goPackagePath = "github.com/docker/go-units";
- fetch = {
- type = "git";
- url = "https://github.com/docker/go-units";
- rev = "5d2041e26a699eaca682e2ea41c8f891e1060444";
- sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i";
- };
- }
- {
- goPackagePath = "github.com/emicklei/go-restful";
- fetch = {
- type = "git";
- url = "https://github.com/emicklei/go-restful";
- rev = "68c9750c36bb8cb433f1b88c807b4b30df4acc40";
- sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67";
- };
- }
- {
- goPackagePath = "github.com/emicklei/go-restful-swagger12";
- fetch = {
- type = "git";
- url = "https://github.com/emicklei/go-restful-swagger12";
- rev = "7524189396c68dc4b04d53852f9edc00f816b123";
- sha256 = "1rqmrxpx55kin0059k7svmcbqx2jgybc200cjdc9ysaif3rhkd73";
- };
- }
- {
- goPackagePath = "github.com/fatih/structs";
- fetch = {
- type = "git";
- url = "https://github.com/fatih/structs";
- rev = "f5faa72e73092639913f5833b75e1ac1d6bc7a63";
- sha256 = "1kdwvygp2g9jc9ygkr7snmk6zk6wmy7xywrf1p6q6iiwwil4xghz";
- };
- }
- {
- goPackagePath = "github.com/fsnotify/fsnotify";
- fetch = {
- type = "git";
- url = "https://github.com/fsnotify/fsnotify";
- rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8";
- sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm";
- };
- }
- {
- goPackagePath = "github.com/ghodss/yaml";
- fetch = {
- type = "git";
- url = "https://github.com/ghodss/yaml";
- rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
- sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
- };
- }
- {
- goPackagePath = "github.com/gima/govalid";
- fetch = {
- type = "git";
- url = "https://github.com/gima/govalid";
- rev = "7b486932bea218beb6e85f7ed28650d283dd6ce6";
- sha256 = "1w3gbfjl283qdfk3xj9mavhwx5wyh1v4w26d85plcdx4kcjmn6hy";
- };
- }
- {
- goPackagePath = "github.com/go-ole/go-ole";
- fetch = {
- type = "git";
- url = "https://github.com/go-ole/go-ole";
- rev = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506";
- sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p";
- };
- }
- {
- goPackagePath = "github.com/go-openapi/jsonpointer";
- fetch = {
- type = "git";
- url = "https://github.com/go-openapi/jsonpointer";
- rev = "779f45308c19820f1a69e9a4cd965f496e0da10f";
- sha256 = "10vv0xsabkvv81xpqqq95fvxnlpf07x9zwzl41g8x2lx05ibxsnc";
- };
- }
- {
- goPackagePath = "github.com/go-openapi/jsonreference";
- fetch = {
- type = "git";
- url = "https://github.com/go-openapi/jsonreference";
- rev = "36d33bfe519efae5632669801b180bf1a245da3b";
- sha256 = "0d163wv3mj9cbhdqc9jqzw2kwi961lg4p30d8gcd6ddz0q752ykh";
- };
- }
- {
- goPackagePath = "github.com/go-openapi/spec";
- fetch = {
- type = "git";
- url = "https://github.com/go-openapi/spec";
- rev = "7abd5745472fff5eb3685386d5fb8bf38683154d";
- sha256 = "1z9hwfzxgwr59r1syy0s4hgybs27q87n9mm1bbxl0yl5yvzw67rl";
- };
- }
- {
- goPackagePath = "github.com/go-openapi/swag";
- fetch = {
- type = "git";
- url = "https://github.com/go-openapi/swag";
- rev = "f3f9494671f93fcff853e3c6e9e948b3eb71e590";
- sha256 = "13lqn4xqy9vma9aqsjb0fzfzi0q8l6dmg65sjxqdxf3q6gzkvmjy";
- };
- }
- {
- goPackagePath = "github.com/gobwas/httphead";
- fetch = {
- type = "git";
- url = "https://github.com/gobwas/httphead";
- rev = "01c9b01b368a438f615030bbbd5e4f9e0023e15c";
- sha256 = "0g1fig36plp3668wc3hm6w4sb7ki0ss24c311a59jpdgy9awfp56";
- };
- }
- {
- goPackagePath = "github.com/gobwas/pool";
- fetch = {
- type = "git";
- url = "https://github.com/gobwas/pool";
- rev = "32dbaa12caca20fad12253c30591227e04f62cdd";
- sha256 = "0iqqfi7zf6jrx1857xxk17hy4j1ln90j5w4jzyxd5x72v5jnmhxm";
- };
- }
- {
- goPackagePath = "github.com/gobwas/ws";
- fetch = {
- type = "git";
- url = "https://github.com/gobwas/ws";
- rev = "915eed3240022c5265584c55032ef1b8c8f84168";
- sha256 = "10r08qrssbmqkxhh26h1s7vvf1lpp7j5b5a4rn0cbr38gv4zwmx9";
- };
- }
- {
- goPackagePath = "github.com/gogo/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/gogo/protobuf";
- rev = "2adc21fd136931e0388e278825291678e1d98309";
- sha256 = "0z6lxahhq3d16w4ff3swrggly08yavzrjsjmmchfq7wcxxdrc9s6";
- };
- }
- {
- goPackagePath = "github.com/golang/glog";
- fetch = {
- type = "git";
- url = "https://github.com/golang/glog";
- rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
- sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "925541529c1fa6821df4e44ce2723319eb2be768";
- sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa";
- };
- }
- {
- goPackagePath = "github.com/google/btree";
- fetch = {
- type = "git";
- url = "https://github.com/google/btree";
- rev = "cc6329d4279e3f025a53a83c397d2339b5705c45";
- sha256 = "1aqvcqr0c7z3sgj272n5f9g8g6cy4361697a0f240amqdvj0ax9v";
- };
- }
- {
- goPackagePath = "github.com/google/gofuzz";
- fetch = {
- type = "git";
- url = "https://github.com/google/gofuzz";
- rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1";
- sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm";
- };
- }
- {
- goPackagePath = "github.com/google/gopacket";
- fetch = {
- type = "git";
- url = "https://github.com/google/gopacket";
- rev = "67a21c4470a0598531a769727aef40b870ffa128";
- sha256 = "1clxrcabrdrkrgwbal852w3cynvzdwbpl4gc0f5yyzncmaazxmhq";
- };
- }
- {
- goPackagePath = "github.com/googleapis/gnostic";
- fetch = {
- type = "git";
- url = "https://github.com/googleapis/gnostic";
- rev = "41d03372f44f2bc18a72c97615a669fb60e7452a";
- sha256 = "04l6384y7riya4wrc7s7ry7c8dil4sdyks1psqavw85bgy9q1iql";
- };
- }
- {
- goPackagePath = "github.com/gophercloud/gophercloud";
- fetch = {
- type = "git";
- url = "https://github.com/gophercloud/gophercloud";
- rev = "849a2e71dd64dbfa2bd4be110ace68881802414b";
- sha256 = "12xn9gph7hg6sfyqd5z9advsx1s776pm5ji9qnarnq1781k7gzh2";
- };
- }
- {
- goPackagePath = "github.com/gorilla/context";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/context";
- rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42";
- sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
- };
- }
- {
- goPackagePath = "github.com/gorilla/handlers";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/handlers";
- rev = "90663712d74cb411cbef281bc1e08c19d1a76145";
- sha256 = "03h5ygjcwama9kr9k7nbg0spv5c7hdlw2ydaclj969i820aq3dpz";
- };
- }
- {
- goPackagePath = "github.com/gorilla/mux";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/mux";
- rev = "5ab525f4fb1678e197ae59401e9050fa0b6cb5fd";
- sha256 = "0d8rbiz2ykn43knf75arnm545jfxgw0zf5yx8ncjmfm9iimzj20i";
- };
- }
- {
- goPackagePath = "github.com/gorilla/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/websocket";
- rev = "cdedf21e585dae942951e34d6defc3215b4280fa";
- sha256 = "1kb7phyvvyl67pdsnd80sgpq3a6gv8lkr8ylppb1i6xwi25yppiv";
- };
- }
- {
- goPackagePath = "github.com/gosuri/uitable";
- fetch = {
- type = "git";
- url = "https://github.com/gosuri/uitable";
- rev = "36ee7e946282a3fb1cfecd476ddc9b35d8847e42";
- sha256 = "1ff68fv9g1df91fwbrcq83ar429gb4fi2vsd22zjmhvmbqx2zkil";
- };
- }
- {
- goPackagePath = "github.com/gregjones/httpcache";
- fetch = {
- type = "git";
- url = "https://github.com/gregjones/httpcache";
- rev = "2bcd89a1743fd4b373f7370ce8ddc14dfbd18229";
- sha256 = "1qx04bqbd4cwkakzq8ahz1jq6pq8435h5zcapwn8k8a0f1bgfrnz";
- };
- }
- {
- goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus";
- fetch = {
- type = "git";
- url = "https://github.com/grpc-ecosystem/go-grpc-prometheus";
- rev = "6b7015e65d366bf3f19b2b2a000a831940f0f7e0";
- sha256 = "039l2c5jsqrhm0g9bngrd3kry89kkai9v97kbd4mayqb619jcdxs";
- };
- }
- {
- goPackagePath = "github.com/grpc-ecosystem/grpc-gateway";
- fetch = {
- type = "git";
- url = "https://github.com/grpc-ecosystem/grpc-gateway";
- rev = "8cc3a55af3bcf171a1c23a90c4df9cf591706104";
- sha256 = "1pfxxskhihz7ijdfj2vinadx05iljqim9h7g19jzgvrl34p8bhix";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/golang-lru";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/golang-lru";
- rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6";
- sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/hcl";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/hcl";
- rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
- sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
- };
- }
- {
- goPackagePath = "github.com/howeyc/gopass";
- fetch = {
- type = "git";
- url = "https://github.com/howeyc/gopass";
- rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8";
- sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45";
- };
- }
- {
- goPackagePath = "github.com/hydrogen18/stoppableListener";
- fetch = {
- type = "git";
- url = "https://github.com/hydrogen18/stoppableListener";
- rev = "dadc9ccc400c712e5a316107a5c462863919e579";
- sha256 = "0yf2a9641v5zscw8sj52aky21nm35cj5d946sbvhrjsr4vzzbbm7";
- };
- }
- {
- goPackagePath = "github.com/imdario/mergo";
- fetch = {
- type = "git";
- url = "https://github.com/imdario/mergo";
- rev = "e3000cb3d28c72b837601cac94debd91032d19fe";
- sha256 = "1bsz1aj0h266x7g08jj7f3nd3d5islbad0cygb5vh37hjgzirg4d";
- };
- }
- {
- goPackagePath = "github.com/inconshreveable/mousetrap";
- fetch = {
- type = "git";
- url = "https://github.com/inconshreveable/mousetrap";
- rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
- sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
- };
- }
- {
- goPackagePath = "github.com/intel-go/yanff";
- fetch = {
- type = "git";
- url = "https://github.com/intel-go/yanff";
- rev = "35804adce65005f76409327527e4e256569cacc6";
- sha256 = "0rank8ij0ky9ryfw23aqk4mk72lznycqqbs5wr7y71d0pl9ljrgh";
- };
- }
- {
- goPackagePath = "github.com/iovisor/gobpf";
- fetch = {
- type = "git";
- url = "https://github.com/iovisor/gobpf";
- rev = "dd767a9fd5f868874ed117811461410100cea403";
- sha256 = "0kj7g5iz81j9qmz57m5b2a9mfpapmwpp3ad9h5rz58r6wzm5anc3";
- };
- }
- {
- goPackagePath = "github.com/jbowtie/gokogiri";
- fetch = {
- type = "git";
- url = "https://github.com/jbowtie/gokogiri";
- rev = "e2644e49d5b4a4d2382d1a4b28dfbb313a4ffb0c";
- sha256 = "1skbfr0w438xip7p58dkv6806yvm22f1wixqppb2yszgxril0j29";
- };
- }
- {
- goPackagePath = "github.com/jonboulle/clockwork";
- fetch = {
- type = "git";
- url = "https://github.com/jonboulle/clockwork";
- rev = "ed104f61ea4877bea08af6f759805674861e968d";
- sha256 = "04ari17wr4pabjf607jcr7cf13r83dlxlspy8yvfh7hlr0xb16z2";
- };
- }
- {
- goPackagePath = "github.com/json-iterator/go";
- fetch = {
- type = "git";
- url = "https://github.com/json-iterator/go";
- rev = "ff2b70c1dbffdd98567bd8c2f9449d97c0d04c88";
- sha256 = "1flbh2qg16445md5vcsqvbq538icj5l25k5ygyjf86lxdfkh5kr0";
- };
- }
- {
- goPackagePath = "github.com/juju/loggo";
- fetch = {
- type = "git";
- url = "https://github.com/juju/loggo";
- rev = "8232ab8918d91c72af1a9fb94d3edbe31d88b790";
- sha256 = "11y5gk41g1i5q6aqn6jpgm06nsq2mf7fdmkzwqrqagnajgb0h1s1";
- };
- }
- {
- goPackagePath = "github.com/juju/ratelimit";
- fetch = {
- type = "git";
- url = "https://github.com/juju/ratelimit";
- rev = "5b9ff866471762aa2ab2dced63c9fb6f53921342";
- sha256 = "12fsx3wqg49wisigbybdzic7gc2p5a0fk55714mpv7zq8jr6i46k";
- };
- }
- {
- goPackagePath = "github.com/juju/webbrowser";
- fetch = {
- type = "git";
- url = "https://github.com/juju/webbrowser";
- rev = "54b8c57083b4afb7dc75da7f13e2967b2606a507";
- sha256 = "0ngj27f0kgpc4m6jr2hz04kigv6p9z8hviddijgpb9srjzkl7dhz";
- };
- }
- {
- goPackagePath = "github.com/julienschmidt/httprouter";
- fetch = {
- type = "git";
- url = "https://github.com/julienschmidt/httprouter";
- rev = "d1898390779332322e6b5ca5011da4bf249bb056";
- sha256 = "19r684s93b7pxqkpxa7p3pba9dw3xf547z05biykil39xk7rgyfa";
- };
- }
- {
- goPackagePath = "github.com/kardianos/osext";
- fetch = {
- type = "git";
- url = "https://github.com/kardianos/osext";
- rev = "c2c54e542fb797ad986b31721e1baedf214ca413";
- sha256 = "02vmjhkx90601l5fym7c3r4d44b88h3cign86nz4yy6j8qqxvz3h";
- };
- }
- {
- goPackagePath = "github.com/kr/fs";
- fetch = {
- type = "git";
- url = "https://github.com/kr/fs";
- rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b";
- sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly";
- };
- }
- {
- goPackagePath = "github.com/kr/pty";
- fetch = {
- type = "git";
- url = "https://github.com/kr/pty";
- rev = "95d05c1eef33a45bd58676b6ce28d105839b8d0b";
- sha256 = "0lyvs0g2pq0hdblfnpcgvp399j13xy4fzbr24l9zh5vbiw7d1lwc";
- };
- }
- {
- goPackagePath = "github.com/lxc/lxd";
- fetch = {
- type = "git";
- url = "https://github.com/lxc/lxd";
- rev = "9907f3a64b6b8ec9144e8be02d633b951439c0f6";
- sha256 = "0qn0v2facxvg0w5vnasa28nxhvfdy817vkmvsnfqzgcnh60k3z20";
- };
- }
- {
- goPackagePath = "github.com/magiconair/properties";
- fetch = {
- type = "git";
- url = "https://github.com/magiconair/properties";
- rev = "c81f9d71af8f8cba1466501d30326b99a4e56c19";
- sha256 = "1000zi161vzrk2fskjna31j9r9hd6m82i7r7wz76f88421i1xlx5";
- };
- }
- {
- goPackagePath = "github.com/mailru/easyjson";
- fetch = {
- type = "git";
- url = "https://github.com/mailru/easyjson";
- rev = "2a92e673c9a6302dd05c3a691ae1f24aef46457d";
- sha256 = "1k0c952c60zcbly9gzi48jyzwphgawnq9f70bgniciyp4jb8hfv3";
- };
- }
- {
- goPackagePath = "github.com/mattbaird/elastigo";
- fetch = {
- type = "git";
- url = "https://github.com/safchain/elastigo";
- rev = "441c1531dca50a19990385930149f6785f78fe59";
- sha256 = "0dmsswm5zkr0054zrvq8h3naddnx4mygsd76fnjqxs25zf88v7ir";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-colorable";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-colorable";
- rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
- sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-isatty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-isatty";
- rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
- sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-runewidth";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-runewidth";
- rev = "d6bea18f789704b5f83375793155289da36a3c7f";
- sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-tty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-tty";
- rev = "931426f7535ac39720c8909d70ece5a41a2502a6";
- sha256 = "00cb07v13xrfqm39m1j2h2zvj684gl9fzr51591i9a52a9m6xlj5";
- };
- }
- {
- goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
- fetch = {
- type = "git";
- url = "https://github.com/matttproud/golang_protobuf_extensions";
- rev = "d0c3fe89de86839aecf2e0579c40ba3bb336a453";
- sha256 = "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/go-homedir";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/go-homedir";
- rev = "756f7b183b7ab78acdbbee5c7f392838ed459dda";
- sha256 = "0yd3682x22lqrfq4h0q16c4swcfn3lmds05ijynm2fk1gcbnwiqn";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/hashstructure";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/hashstructure";
- rev = "ab25296c0f51f1022f01cd99dfb45f1775de8799";
- sha256 = "1k21xr0x7k03hbkh72xbdi8gz8fk3wdlcbfpy7l90rxvi21jzz0f";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/mapstructure";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/mapstructure";
- rev = "281073eb9eb092240d33ef253c404f1cca550309";
- sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh";
- };
- }
- {
- goPackagePath = "github.com/nlewo/contrail-introspect-cli";
- fetch = {
- type = "git";
- url = "https://github.com/nlewo/contrail-introspect-cli";
- rev = "e4df28ccf9801abbe32edd5ddaba31a7a62b61b6";
- sha256 = "0wf3s9gqy8pvv5gzngz30j9p7fa4mv5qyr9gnlf5ps85xpnlngbq";
- };
- }
- {
- goPackagePath = "github.com/nu7hatch/gouuid";
- fetch = {
- type = "git";
- url = "https://github.com/nu7hatch/gouuid";
- rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3";
- sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj";
- };
- }
- {
- goPackagePath = "github.com/op/go-logging";
- fetch = {
- type = "git";
- url = "https://github.com/op/go-logging";
- rev = "970db520ece77730c7e4724c61121037378659d9";
- sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/runc";
- fetch = {
- type = "git";
- url = "https://github.com/opencontainers/runc";
- rev = "8fa5343b0058459296399a89bc532aa5508de28d";
- sha256 = "15wbnj19fbprgsrf0k7hpmpxrkh2vzrm71qn3gya05p908k81v03";
- };
- }
- {
- goPackagePath = "github.com/pelletier/go-toml";
- fetch = {
- type = "git";
- url = "https://github.com/pelletier/go-toml";
- rev = "05bcc0fb0d3e60da4b8dd5bd7e0ea563eb4ca943";
- sha256 = "0ma7fwsyl0qflvhbb6qfc5h3yi81iy5lpc6wkdyd1sdafvrzpbb8";
- };
- }
- {
- goPackagePath = "github.com/petar/GoLLRB";
- fetch = {
- type = "git";
- url = "https://github.com/petar/GoLLRB";
- rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4";
- sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0";
- };
- }
- {
- goPackagePath = "github.com/peterbourgon/diskv";
- fetch = {
- type = "git";
- url = "https://github.com/peterbourgon/diskv";
- rev = "2973218375c3d13162e1d3afe1708aaee318ef3f";
- sha256 = "10jbkxyxilv5hixm4dww4qfn01cnb5fr8mgxvwigq5jcb85mrxig";
- };
- }
- {
- goPackagePath = "github.com/peterh/liner";
- fetch = {
- type = "git";
- url = "https://github.com/peterh/liner";
- rev = "8975875355a81d612fafb9f5a6037bdcc2d9b073";
- sha256 = "17l7p6lxhlnna1w1drgh7g8afxcxxd5j472givm2g7l9v8yg4f17";
- };
- }
- {
- goPackagePath = "github.com/pkg/errors";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/errors";
- rev = "ff09b135c25aae272398c51a07235b90a75aa4f0";
- sha256 = "0pwl6v3hmc22zp32gkyqykl4kg69xk1mlp0vmhgd1f44difd5fvz";
- };
- }
- {
- goPackagePath = "github.com/pkg/sftp";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/sftp";
- rev = "e84cc8c755ca39b7b64f510fe1fffc1b51f210a5";
- sha256 = "1gkmk60lskyrn5751rgb9pxn41wi7y29wsn8psrfb16bg4flcvrq";
- };
- }
- {
- goPackagePath = "github.com/pkg/term";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/term";
- rev = "cda20d4ac917ad418d86e151eff439648b06185b";
- sha256 = "08frhz411dwyli5spfxn32d3ni9mrgdav51lmg8a1wpdmw0r0wwp";
- };
- }
- {
- goPackagePath = "github.com/pmylund/go-cache";
- fetch = {
- type = "git";
- url = "https://github.com/pmylund/go-cache";
- rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0";
- sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_golang";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_golang";
- rev = "5cec1d0429b02e4323e042eb04dafdb079ddf568";
- sha256 = "1cgd5pcxf4zgcafq284yf2i711m3kddpb05prxy51li5p1l5cbq0";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_model";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_model";
- rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
- sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
- };
- }
- {
- goPackagePath = "github.com/prometheus/common";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/common";
- rev = "23070236b1ebff452f494ae831569545c2b61d26";
- sha256 = "111vqp3lqsdli7z5rnkrpcfv6yri0qjikyl70whwxzcvkqp9k42s";
- };
- }
- {
- goPackagePath = "github.com/prometheus/procfs";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/procfs";
- rev = "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8";
- sha256 = "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8";
- };
- }
- {
- goPackagePath = "github.com/robertkrimen/otto";
- fetch = {
- type = "git";
- url = "https://github.com/robertkrimen/otto";
- rev = "6c383dd335ef8dcccef05e651ce1eccfe4d0f011";
- sha256 = "1n6h7c8gi6wv4nklqd7ygzx2afvh7ddxbml9w9x0jxwcfb3bdy17";
- };
- }
- {
- goPackagePath = "github.com/rogpeppe/fastuuid";
- fetch = {
- type = "git";
- url = "https://github.com/rogpeppe/fastuuid";
- rev = "6724a57986aff9bff1a1770e9347036def7c89f6";
- sha256 = "12s65phfx6hxj4v0b5kj8akgrbf5mxpa101fyzw03h6hld1f70cz";
- };
- }
- {
- goPackagePath = "github.com/safchain/ethtool";
- fetch = {
- type = "git";
- url = "https://github.com/safchain/ethtool";
- rev = "e01512671ed4c2248daf0c5e974ecf88a4947335";
- sha256 = "11wk834aas1jj3bag3rwr0sb5alhd40si3fcqkvs0fsg6wjmwxyc";
- };
- }
- {
- goPackagePath = "github.com/shirou/gopsutil";
- fetch = {
- type = "git";
- url = "https://github.com/shirou/gopsutil";
- rev = "6a368fb7cd1221fa6ea90facc9447c9a2234c255";
- sha256 = "0vjf2jwkpb1fls997w3pvw5sg25yjygx0nv1i5pwcfrnpvnw9zxk";
- };
- }
- {
- goPackagePath = "github.com/skydive-project/dede";
- fetch = {
- type = "git";
- url = "https://github.com/skydive-project/dede";
- rev = "d95b69cd1f75137aab3bcc01d6facf2aa7a43b80";
- sha256 = "16qgpxb24zq2js7ril8xf71yz927ly7fsadys23is8jzkgsx56mf";
- };
- }
- {
- goPackagePath = "github.com/socketplane/libovsdb";
- fetch = {
- type = "git";
- url = "https://github.com/socketplane/libovsdb";
- rev = "5113f8fb4d9d374417ab4ce35424fbea1aad7272";
- sha256 = "1b4yz6jvsi2gz8ha9y42hy105q6ylf7516pd59wgg42r6n627w4g";
- };
- }
- {
- goPackagePath = "github.com/spf13/afero";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/afero";
- rev = "a80ea588265c05730645be8342eeafeaa72b2923";
- sha256 = "1i2z4l3a335jz0jg8xzwfdcp0dlf77h8rb6nd88mnd1nbmbd58w4";
- };
- }
- {
- goPackagePath = "github.com/spf13/cast";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cast";
- rev = "8965335b8c7107321228e3e3702cab9832751bac";
- sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
- };
- }
- {
- goPackagePath = "github.com/spf13/cobra";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cobra";
- rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744";
- sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3";
- };
- }
- {
- goPackagePath = "github.com/spf13/jwalterweatherman";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/jwalterweatherman";
- rev = "d00654080cddbd2b082acaa74007cb94a2b40866";
- sha256 = "06zv87v7m0zgx9zy3w283008fmlx0v41xyldkql7qmp7l5l4vcpw";
- };
- }
- {
- goPackagePath = "github.com/spf13/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/pflag";
- rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f";
- sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l";
- };
- }
- {
- goPackagePath = "github.com/spf13/viper";
- fetch = {
- type = "git";
- url = "https://github.com/lebauce/viper";
- rev = "54676d0dbb12f9b6febb2f8210e9590d81d4b5e3";
- sha256 = "1dm01151hn6mywv6hm0nbqsr8qgwp393l4xz9p9jrd8asynpdpsb";
- };
- }
- {
- goPackagePath = "github.com/tchap/zapext";
- fetch = {
- type = "git";
- url = "https://github.com/tchap/zapext";
- rev = "e61c0c8823393722ae09ce0faee42fa177088a4b";
- sha256 = "16xw01phxkndhsn8l9n587vdpmr0kh9xg0vxlk0l6ywkp31583cr";
- };
- }
- {
- goPackagePath = "github.com/tebeka/selenium";
- fetch = {
- type = "git";
- url = "https://github.com/tebeka/selenium";
- rev = "657e45ec600f26e76da253936c1f2adb6978ff72";
- sha256 = "1gqhmlqcq4y5pxw7inqd987xwyrnd5zsmj8blmb5vizhan7liw99";
- };
- }
- {
- goPackagePath = "github.com/ugorji/go";
- fetch = {
- type = "git";
- url = "https://github.com/ugorji/go";
- rev = "ded73eae5db7e7a0ef6f55aace87a2873c5d2b74";
- sha256 = "04iwqjj049q4dldf1wpqymf1y9kdppxp3y0ywsqzaw21bi8b3zcc";
- };
- }
- {
- goPackagePath = "github.com/vishvananda/netlink";
- fetch = {
- type = "git";
- url = "https://github.com/vishvananda/netlink";
- rev = "016ba6f67a12c03708643150afcfb1509be7747a";
- sha256 = "08z5g217nynq6nrdls8hj1761wwl9skhwfz2fad9di8ziy8mk7w4";
- };
- }
- {
- goPackagePath = "github.com/vishvananda/netns";
- fetch = {
- type = "git";
- url = "https://github.com/vishvananda/netns";
- rev = "604eaf189ee867d8c147fafc28def2394e878d25";
- sha256 = "0zii8dyy6qb2dh649syz3ablabw78k038w8a7fwnsk3x482p59s7";
- };
- }
- {
- goPackagePath = "github.com/weaveworks/tcptracer-bpf";
- fetch = {
- type = "git";
- url = "https://github.com/weaveworks/tcptracer-bpf";
- rev = "e080bd747dc6b62d4ed3ed2b7f0be4801bef8faf";
- sha256 = "1ijqpzj4nmymi8gh3pl9rnwjzm5q89d1585iwj1s190cxcp1ix81";
- };
- }
- {
- goPackagePath = "github.com/xeipuuv/gojsonpointer";
- fetch = {
- type = "git";
- url = "https://github.com/xeipuuv/gojsonpointer";
- rev = "6fe8760cad3569743d51ddbb243b26f8456742dc";
- sha256 = "1b1flqamhzfi5lc4lbh8iw4s3lix0vxyrq0adpx0znx7lkkxhjvz";
- };
- }
- {
- goPackagePath = "github.com/xeipuuv/gojsonreference";
- fetch = {
- type = "git";
- url = "https://github.com/xeipuuv/gojsonreference";
- rev = "e02fc20de94c78484cd5ffb007f8af96be030a45";
- sha256 = "195in5zr3bhb3r1iins2h610kz339naj284b3839xmrhc15wqxzq";
- };
- }
- {
- goPackagePath = "github.com/xeipuuv/gojsonschema";
- fetch = {
- type = "git";
- url = "https://github.com/xeipuuv/gojsonschema";
- rev = "702b404897d4364af44dc8dcabc9815947942325";
- sha256 = "1lby7iar87q2kjqvcbx2jql4p2ggjq9ml114x7hlb3966447ayfr";
- };
- }
- {
- goPackagePath = "github.com/xiang90/probing";
- fetch = {
- type = "git";
- url = "https://github.com/xiang90/probing";
- rev = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2";
- sha256 = "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2";
- };
- }
- {
- goPackagePath = "github.com/xordataexchange/crypt";
- fetch = {
- type = "git";
- url = "https://github.com/xordataexchange/crypt";
- rev = "b2862e3d0a775f18c7cfe02273500ae307b61218";
- sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y";
- };
- }
- {
- goPackagePath = "go.uber.org/atomic";
- fetch = {
- type = "git";
- url = "https://github.com/uber-go/atomic";
- rev = "0506d69f5564c56e25797bf7183c28921d4c6360";
- sha256 = "0b1b0iz6jwk5f77mwsggsvkywmxwwn1b4a6n63xd5czl23vi7a6q";
- };
- }
- {
- goPackagePath = "go.uber.org/multierr";
- fetch = {
- type = "git";
- url = "https://github.com/uber-go/multierr";
- rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a";
- sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
- };
- }
- {
- goPackagePath = "go.uber.org/zap";
- fetch = {
- type = "git";
- url = "https://github.com/uber-go/zap";
- rev = "35aad584952c3e7020db7b839f6b102de6271f89";
- sha256 = "0n79ir7jcr7s51j85swji7an0jgy1w5dxg1g68j722rmpbvsagwv";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "1f22c0103821b9390939b6776727195525381532";
- sha256 = "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "a6577fac2d73be281a500b310739095313165611";
- sha256 = "00wks377dp0ws47dvc9f6y4sin1mwdk649v5jfz047ik1jh1nq5h";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "810d7000345868fc619eb81f46307107118f4ae1";
- sha256 = "07lm9h86l29dd45ca3vjsi06xpwg36899hf1ns7qwabflzgm0nxy";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "1cbadb444a806fd9430d14ad08967ed91da4fa0a";
- sha256 = "0ih9ysagh4ylj08393497sscf3yziybc6acg4mrh0wa7mld75j56";
- };
- }
- {
- goPackagePath = "google.golang.org/genproto";
- fetch = {
- type = "git";
- url = "https://github.com/google/go-genproto";
- rev = "2b5a72b8730b0b16380010cfe5286c42108d88e7";
- sha256 = "0i69x08kg5yqwaz5grxbfhg2hjdkdhaqbc1v4x4l91232kw5nd38";
- };
- }
- {
- goPackagePath = "google.golang.org/grpc";
- fetch = {
- type = "git";
- url = "https://github.com/grpc/grpc-go";
- rev = "5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e";
- sha256 = "1sf3fvphz16pf7jbm86n07rip9m5fh40wjcc2j2d5zpka36xvjw4";
- };
- }
- {
- goPackagePath = "gopkg.in/errgo.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/errgo.v1";
- rev = "442357a80af5c6bf9b6d51ae791a39c3421004f3";
- sha256 = "0gg7vqkfh2bpn2z9xfdahrxdkvn365mdb63zs8s5v5cbm2glfq56";
- };
- }
- {
- goPackagePath = "gopkg.in/fsnotify/fsnotify.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/fsnotify/fsnotify.v1";
- rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- };
- }
- {
- goPackagePath = "gopkg.in/httprequest.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/httprequest.v1";
- rev = "93f8fee4081f01ea23d258bdbbcdd319f668d718";
- sha256 = "1lgicrb355m2vb31ly4ly997ral1zvqk9fy89x4qkxals1zfqi3q";
- };
- }
- {
- goPackagePath = "gopkg.in/inf.v0";
- fetch = {
- type = "git";
- url = "https://gopkg.in/inf.v0";
- rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4";
- sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82";
- };
- }
- {
- goPackagePath = "gopkg.in/macaroon-bakery.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/macaroon-bakery.v2";
- rev = "22c04a94d902625448265ef041bb53e715452a40";
- sha256 = "1iaisvljir95m7jh02k98jv2j68bs38fdlis4pnjbpj8mbarllw4";
- };
- }
- {
- goPackagePath = "gopkg.in/macaroon.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/macaroon.v2";
- rev = "bed2a428da6e56d950bed5b41fcbae3141e5b0d0";
- sha256 = "199dcdl38vjj078aq56kpfzni0sm7j3062nxd8yyj1bd67x0xmsi";
- };
- }
- {
- goPackagePath = "gopkg.in/sourcemap.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/sourcemap.v1";
- rev = "eef8f47ab679652a7d3a4ee34c34314d255d2536";
- sha256 = "0ahmw49lswks636vz49vb33r4rq0g3rrkqwsh8fn0kmhp94c9w40";
- };
- }
- {
- goPackagePath = "gopkg.in/urfave/cli.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/urfave/cli.v2";
- rev = "b2bf3c5abeb90da407891aecd1df2c5a1f6170c1";
- sha256 = "1x90qcnjcicq1d933bd9mdyjkwd0h9hdxgva45z85gqr7lavs5h3";
- };
- }
- {
- goPackagePath = "gopkg.in/validator.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/validator.v2";
- rev = "3e4f037f12a1221a0864cf0dd2e81c452ab22448";
- sha256 = "1294nz3wi4avn1nwyr8cdcx8jqjvlzadlnswarpwrq41mhlmhjfs";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "bef53efd0c76e49e6de55ead051f886bea7e9420";
- sha256 = "0df5gr2qyflh1vmb1i2jbkc46dc3mqmdbc53vbyrzw0ilzhzh0si";
- };
- }
- {
- goPackagePath = "k8s.io/api";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/api";
- rev = "4df58c811fe2e65feb879227b2b245e4dc26e7ad";
- sha256 = "14pxzm1gqh4pa1179c8hfcbi5rqy9fx2cvpns8pwlyqz807rg2vl";
- };
- }
- {
- goPackagePath = "k8s.io/apimachinery";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/apimachinery";
- rev = "019ae5ada31de202164b118aee88ee2d14075c31";
- sha256 = "1l1przxkbid3sfn80n60w2z883yad99cl89k4zwb9i7wcydk85w1";
- };
- }
- {
- goPackagePath = "k8s.io/client-go";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/client-go";
- rev = "35ccd4336052e7d73018b1382413534936f34eee";
- sha256 = "1sp0v60xpy6lsdzsqq7lzcqkmqds100ziqzj2fip68svcysgqg9g";
- };
- }
- {
- goPackagePath = "k8s.io/kube-openapi";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/kube-openapi";
- rev = "39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1";
- sha256 = "08b5yx07saj5vzzic50hlzw68p2fd7xc118x1liq4wqrikxmv8wa";
- };
- }
-]
diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix
index 91b868a017f5..bdd650494b15 100644
--- a/pkgs/tools/networking/slack-cli/default.nix
+++ b/pkgs/tools/networking/slack-cli/default.nix
@@ -8,7 +8,7 @@
{ stdenv, lib, fetchFromGitHub, curl, jq, runtimeShell }:
stdenv.mkDerivation rec {
- name = "slack-cli-${version}";
+ pname = "slack-cli";
version = "0.18.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix
index 0f7c035b4c05..b64cf5cdd9b2 100644
--- a/pkgs/tools/networking/slirp4netns/default.nix
+++ b/pkgs/tools/networking/slirp4netns/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }:
stdenv.mkDerivation rec {
- name = "slirp4netns-${version}";
+ pname = "slirp4netns";
version = "0.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix
index 08b5e6a211b8..0c9079240d0c 100644
--- a/pkgs/tools/networking/smokeping/default.nix
+++ b/pkgs/tools/networking/smokeping/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fping, rrdtool, perlPackages }:
stdenv.mkDerivation rec {
- name = "smokeping-${version}";
+ pname = "smokeping";
version = "2.6.11";
src = fetchurl {
url = "https://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz";
diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix
index cdf14f5af33f..ba05ee8e8b51 100644
--- a/pkgs/tools/networking/snabb/default.nix
+++ b/pkgs/tools/networking/snabb/default.nix
@@ -5,7 +5,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "snabb-${version}";
+ pname = "snabb";
version = "2018.01.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix
index ad2d88e4a982..9cc3370c0a1f 100644
--- a/pkgs/tools/networking/spiped/default.nix
+++ b/pkgs/tools/networking/spiped/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, coreutils }:
stdenv.mkDerivation rec {
- name = "spiped-${version}";
+ pname = "spiped";
version = "1.5.0";
src = fetchurl {
- url = "https://www.tarsnap.com/spiped/${name}.tgz";
+ url = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz";
sha256 = "1mxcbxifr3bnj6ga8lz88y4bhff016i6kjdzwbb3gzb2zcs4pxxj";
};
diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix
index faeec8523aa4..2b5aa2b7cbf7 100644
--- a/pkgs/tools/networking/spoofer/default.nix
+++ b/pkgs/tools/networking/spoofer/default.nix
@@ -7,10 +7,9 @@ in
stdenv.mkDerivation rec {
pname = "spoofer";
version = "1.4.5";
- name = "${pname}-${version}";
src = fetchurl {
- url = "https://www.caida.org/projects/spoofer/downloads/${name}.tar.gz";
+ url = "https://www.caida.org/projects/spoofer/downloads/${pname}-${version}.tar.gz";
sha256 = "0pnim3xyfsmv6alsvhwjs4v9lp39wwiyj63rxsqyz4wx4vkmn12z";
};
diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix
index 7d3f773b1930..b55860a20c17 100644
--- a/pkgs/tools/networking/srelay/default.nix
+++ b/pkgs/tools/networking/srelay/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "srelay-0.4.8";
src = fetchurl {
diff --git a/pkgs/tools/networking/ssh-agents/default.nix b/pkgs/tools/networking/ssh-agents/default.nix
index 84e7558713c9..b01d373088b7 100644
--- a/pkgs/tools/networking/ssh-agents/default.nix
+++ b/pkgs/tools/networking/ssh-agents/default.nix
@@ -4,7 +4,7 @@
}:
stdenvNoCC.mkDerivation rec {
- name = "ssh-agents-${version}";
+ pname = "ssh-agents";
version = "1.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/tools/networking/ssh-ident/default.nix
index 01903171e9c2..cb07d73a6319 100644
--- a/pkgs/tools/networking/ssh-ident/default.nix
+++ b/pkgs/tools/networking/ssh-ident/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, python }:
-stdenv.mkDerivation rec {
- name = "ssh-ident-${version}";
+stdenv.mkDerivation {
+ pname = "ssh-ident";
version = "2016-04-21";
src = fetchFromGitHub {
owner = "ccontavalli";
diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix
index 94221a359c1d..3765e6aa08f7 100644
--- a/pkgs/tools/networking/sshpass/default.nix
+++ b/pkgs/tools/networking/sshpass/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "sshpass-${version}";
+ pname = "sshpass";
version = "1.06";
src = fetchurl {
diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix
index adda38c184d9..0081e7d1ddb9 100644
--- a/pkgs/tools/networking/ssldump/default.nix
+++ b/pkgs/tools/networking/ssldump/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, openssl, libpcap }:
-stdenv.mkDerivation rec {
- name = "ssldump-${version}";
+stdenv.mkDerivation {
+ pname = "ssldump";
version = "0.9b3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix
index 7bbc872c98e1..de65298d6481 100644
--- a/pkgs/tools/networking/sstp/default.nix
+++ b/pkgs/tools/networking/sstp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, ppp, libevent, openssl }:
stdenv.mkDerivation rec {
- name = "sstp-client-${version}";
+ pname = "sstp-client";
version = "1.0.12";
src = fetchurl {
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 1bd864d859c5..869e568d3696 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -16,11 +16,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "strongswan-${version}";
+ pname = "strongswan";
version = "5.8.0"; # Make sure to also update when upgrading!
src = fetchurl {
- url = "https://download.strongswan.org/${name}.tar.bz2";
+ url = "https://download.strongswan.org/${pname}-${version}.tar.bz2";
sha256 = "0cq9m86ydd2i0awxkv4a256f4926p2f9pzlisyskl9fngl6f3c8m";
};
diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix
index 89af381d0d6d..9b1ee7a9f799 100644
--- a/pkgs/tools/networking/stubby/default.nix
+++ b/pkgs/tools/networking/stubby/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "stubby";
- name = "${pname}-${version}";
version = "0.2.6";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix
index 7ba4a0d89362..9960e6f00304 100644
--- a/pkgs/tools/networking/stun/default.nix
+++ b/pkgs/tools/networking/stun/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "stun";
version = "0.97";
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 66a6c28d92a8..792e6f68294d 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation rec {
- name = "stunnel-${version}";
+ pname = "stunnel";
version = "5.55";
src = fetchurl {
- url = "https://www.stunnel.org/downloads/${name}.tar.gz";
+ url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz";
sha256 = "0qjc0wkjf6bqz29fvwwsn9hnjhm6alsm10jcwx4jad2q3ks6kplh";
# please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
# not the output of `nix-prefetch-url`
diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix
index 2a4cf3506df8..65b88a34fb09 100644
--- a/pkgs/tools/networking/subfinder/default.nix
+++ b/pkgs/tools/networking/subfinder/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
- name = "subfinder-git-${version}";
+buildGoPackage {
+ pname = "subfinder-git";
version = "2018-07-15";
goPackagePath = "github.com/subfinder/subfinder";
diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix
index 80daf6447efa..d69221d9d50f 100644
--- a/pkgs/tools/networking/surfraw/default.nix
+++ b/pkgs/tools/networking/surfraw/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, perl}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "surfraw-2.3.0";
src = fetchurl {
diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix
index 4fc456523f7d..91f155739140 100644
--- a/pkgs/tools/networking/swagger-codegen/default.nix
+++ b/pkgs/tools/networking/swagger-codegen/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
version = "2.3.1";
pname = "swagger-codegen";
- name = "${pname}-${version}";
jarfilename = "${pname}-cli-${version}.jar";
diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix
index a9b0d04360ef..9d776752c827 100644
--- a/pkgs/tools/networking/swaks/default.nix
+++ b/pkgs/tools/networking/swaks/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, perlPackages, makeWrapper }:
stdenv.mkDerivation rec {
- name = "swaks-${version}";
+ pname = "swaks";
version = "20181104.0";
src = fetchurl {
- url = "https://www.jetmore.org/john/code/swaks/files/${name}.tar.gz";
+ url = "https://www.jetmore.org/john/code/swaks/files/${pname}-${version}.tar.gz";
sha256 = "0n1yd27xcyb1ylp5gln3yv5gzi9r377hjy1j32367kgb3247ygq2";
};
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index e0a9a7e76ae3..9cebc267260b 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libpcap, perl }:
-stdenv.mkDerivation rec {
- name = "tcpdump-${version}";
+stdenv.mkDerivation {
+ pname = "tcpdump";
version = "4.9.2";
# leaked embargoed security update
diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix
index 53af27b4deba..032adbff74fb 100644
--- a/pkgs/tools/networking/tcpreplay/default.nix
+++ b/pkgs/tools/networking/tcpreplay/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libpcap, tcpdump }:
stdenv.mkDerivation rec {
- name = "tcpreplay-${version}";
+ pname = "tcpreplay";
version = "4.3.2";
src = fetchurl {
diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix
index bc97d5d8d6e4..edd2abdd13e3 100644
--- a/pkgs/tools/networking/tftp-hpa/default.nix
+++ b/pkgs/tools/networking/tftp-hpa/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "tftp-hpa-${version}";
+ pname = "tftp-hpa";
version="5.2";
src = fetchurl {
- url = "mirror://kernel/software/network/tftp/tftp-hpa/${name}.tar.xz";
+ url = "mirror://kernel/software/network/tftp/tftp-hpa/${pname}-${version}.tar.xz";
sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg";
};
diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix
index a17f382557ac..e331916626e3 100644
--- a/pkgs/tools/networking/tinc/default.nix
+++ b/pkgs/tools/networking/tinc/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl, lzo, openssl, zlib}:
stdenv.mkDerivation rec {
- version = "1.0.35";
- name = "tinc-${version}";
+ version = "1.0.36";
+ pname = "tinc";
src = fetchurl {
url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
- sha256 = "0pl92sdwrkiwgll78x0ww06hfljd07mkwm62g8x17qn3gha3pj0q";
+ sha256 = "021i2sl2mjscbm8g59d7vs74iw3gf0m48wg7w3zhwj6czarkpxs0";
};
buildInputs = [ lzo openssl zlib ];
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index df9eb9bdad25..85cdd19702fa 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
stdenv.mkDerivation rec {
- name = "tinc-${version}";
+ pname = "tinc";
version = "1.1pre17";
src = fetchgit {
diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix
index c9a6599708c6..f3e6f2f156f6 100644
--- a/pkgs/tools/networking/tinyproxy/default.nix
+++ b/pkgs/tools/networking/tinyproxy/default.nix
@@ -2,12 +2,12 @@
libxslt, docbook_xsl }:
stdenv.mkDerivation rec{
- name = "tinyproxy-${version}";
+ pname = "tinyproxy";
version = "1.10.0";
src = fetchFromGitHub {
sha256 = "0gzapnllzyc005l3rs6iarjk1p5fc8mf9ysbck1mbzbd8xg6w35s";
- rev = "${version}";
+ rev = version;
repo = "tinyproxy";
owner = "tinyproxy";
};
diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix
index b992fef2253f..df199869e605 100644
--- a/pkgs/tools/networking/tlspool/default.nix
+++ b/pkgs/tools/networking/tlspool/default.nix
@@ -9,7 +9,7 @@ let
version = "20180227";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "arpa2";
diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix
index f72d004c291b..f47ccab45ea4 100644
--- a/pkgs/tools/networking/tox-node/default.nix
+++ b/pkgs/tools/networking/tox-node/default.nix
@@ -6,7 +6,7 @@
with rustPlatform;
buildRustPackage rec {
- name = "tox-node-${version}";
+ pname = "tox-node";
version = "0.0.8";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix
index ccb9f3bc0d6b..e4faa5e30f4a 100644
--- a/pkgs/tools/networking/toxvpn/default.nix
+++ b/pkgs/tools/networking/toxvpn/default.nix
@@ -4,14 +4,14 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
- name = "toxvpn-2018-04-17";
+stdenv.mkDerivation {
+ name = "toxvpn-2019-09-09";
src = fetchFromGitHub {
owner = "cleverca22";
repo = "toxvpn";
- rev = "dc766f98888f500ea51f002f59007eac3f3a0a06";
- sha256 = "19br3fmrdm45fvymj9kvwikkn8m657yd5fkhx6grv35ckrj83mxz";
+ rev = "45083dec172ce167f7ed84d571ec2822ebe4d51a";
+ sha256 = "193crarrx6q0zd2p6dn67pzv8kngwi440zm1y54njgcz0v3fpxmb";
};
buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ]
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "A powerful tool that allows one to make tunneled point to point connections over Tox";
homepage = https://github.com/cleverca22/toxvpn;
license = licenses.gpl3;
- maintainers = with maintainers; [ cleverca22 obadz ];
+ maintainers = with maintainers; [ cleverca22 obadz toonn ];
platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix
index c3abdd49e138..4062fc0fd585 100644
--- a/pkgs/tools/networking/tracebox/default.nix
+++ b/pkgs/tools/networking/tracebox/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, autoreconfHook, libcrafter, libpcap, lua }:
stdenv.mkDerivation rec {
- name = "tracebox-${version}";
+ pname = "tracebox";
version = "0.2";
src = fetchzip {
diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix
index 3d3be5d4532c..af8f5cafb894 100644
--- a/pkgs/tools/networking/traceroute/default.nix
+++ b/pkgs/tools/networking/traceroute/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "traceroute-${version}";
+ pname = "traceroute";
version = "2.1.0";
src = fetchurl {
- url = "mirror://sourceforge/traceroute/${name}.tar.gz";
+ url = "mirror://sourceforge/traceroute/${pname}-${version}.tar.gz";
sha256 = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6";
};
diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix
index 6170718b6184..fe75b35eea2b 100644
--- a/pkgs/tools/networking/twa/default.nix
+++ b/pkgs/tools/networking/twa/default.nix
@@ -11,7 +11,7 @@
}:
stdenv.mkDerivation rec {
- name = "twa-${version}";
+ pname = "twa";
version = "1.8.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix
index 0cb8ad5a4376..ddd0bab5d615 100644
--- a/pkgs/tools/networking/ua/default.nix
+++ b/pkgs/tools/networking/ua/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "ua-unstable-${version}";
+ pname = "ua-unstable";
version = "2017-02-24";
rev = "325dab92c60e0f028e55060f0c288aa70905fb17";
diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix
index f6afddaba381..42839a8ba2f2 100644
--- a/pkgs/tools/networking/ubridge/default.nix
+++ b/pkgs/tools/networking/ubridge/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "ubridge-${version}";
+ pname = "ubridge";
version = "0.9.16";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix
index cc93da7f2533..68f457c2a638 100644
--- a/pkgs/tools/networking/uget-integrator/default.nix
+++ b/pkgs/tools/networking/uget-integrator/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, uget, python3Packages }:
stdenv.mkDerivation rec {
- name = "uget-integrator-${version}";
+ pname = "uget-integrator";
version = "1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix
index b35c3e8c883e..78dcb00eb78a 100644
--- a/pkgs/tools/networking/uget/default.nix
+++ b/pkgs/tools/networking/uget/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "uget-${version}";
+ pname = "uget";
version = "2.2.2";
src = fetchurl {
- url = "mirror://sourceforge/urlget/${name}.tar.gz";
+ url = "mirror://sourceforge/urlget/${pname}-${version}.tar.gz";
sha256 = "1hmzk907blgzc1z6wv4zbzqrwad06zfm1rqc3svh5garxw8z7xsw";
};
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
''gappsWrapperArgs+=(--suffix PATH : "${aria2}/bin")'';
meta = with stdenv.lib; {
- description = "Download manager using gtk+ and libcurl";
+ description = "Download manager using GTK and libcurl";
longDescription = ''
uGet is a VERY Powerful download manager application with a large
inventory of features but is still very light-weight and low on
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 5702483b88bb..8a4b6e6650e6 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, openssl, nettle, expat, libevent, dns-root-data }:
stdenv.mkDerivation rec {
- name = "unbound-${version}";
- version = "1.9.2";
+ pname = "unbound";
+ version = "1.9.3";
src = fetchurl {
- url = "https://unbound.net/downloads/${name}.tar.gz";
- sha256 = "15bbrczibap30db8a1pmqhvjbmkxms39hwiivby7f4j5rz2wwykg";
+ url = "https://unbound.net/downloads/${pname}-${version}.tar.gz";
+ sha256 = "1ykdy62sgzv33ggkmzwx2h0ifm7hyyxyfkb4zckv7gz4f28xsm8v";
};
outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix
index f41aa35df90e..fdd110e14b3c 100644
--- a/pkgs/tools/networking/unbound/python.nix
+++ b/pkgs/tools/networking/unbound/python.nix
@@ -4,12 +4,11 @@ let
inherit (pythonPackages) python;
in stdenv.mkDerivation rec {
pname = "pyunbound";
- name = "${pname}-${version}";
- version = "1.9.0";
+ version = "1.9.3";
src = fetchurl {
url = "http://unbound.net/downloads/unbound-${version}.tar.gz";
- sha256 = "0bb0p8nbda77ghx20yfl7hqxm9x709223q35465v99i8v4ay27f1";
+ sha256 = "1ykdy62sgzv33ggkmzwx2h0ifm7hyyxyfkb4zckv7gz4f28xsm8v";
};
buildInputs = [ openssl expat libevent swig python ];
diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix
index 1684da45ccc3..7a6a37c91128 100644
--- a/pkgs/tools/networking/vlan/default.nix
+++ b/pkgs/tools/networking/vlan/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "vlan-1.9";
src = fetchurl {
diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index 6a23c81569f0..424355e41df8 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "vpnc-0.5.3-post-r550";
src = fetchsvn {
url = "https://svn.unix-ag.uni-kl.de/vpnc";
diff --git a/pkgs/tools/networking/wbox/default.nix b/pkgs/tools/networking/wbox/default.nix
index 0c97f20ee65f..b1fb6ae8d909 100644
--- a/pkgs/tools/networking/wbox/default.nix
+++ b/pkgs/tools/networking/wbox/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "wbox-${version}";
+ pname = "wbox";
version = "5";
installPhase = ''
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
'';
src = fetchurl {
- url = "http://www.hping.org/wbox/${name}.tar.gz";
+ url = "http://www.hping.org/wbox/${pname}-${version}.tar.gz";
sha256 = "06daxwbysppvbh1mwprw8fgsp6mbd3kqj7a978w7ivn8hdgdi28m";
};
diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix
index e9b9452c7563..bd80eae2bebc 100644
--- a/pkgs/tools/networking/webalizer/default.nix
+++ b/pkgs/tools/networking/webalizer/default.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation {
configureFlags = [
"--enable-dns"
"--enable-geoip"
- "--disable-static"
"--enable-shared"
];
diff --git a/pkgs/tools/networking/weighttp/default.nix b/pkgs/tools/networking/weighttp/default.nix
index 1e93948be68b..5615c249de90 100644
--- a/pkgs/tools/networking/weighttp/default.nix
+++ b/pkgs/tools/networking/weighttp/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, python, libev, wafHook }:
stdenv.mkDerivation rec {
- name = "weighttp-${version}";
+ pname = "weighttp";
version = "0.4";
src = fetchgit {
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 38a24eddc288..b7486ded4c8a 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -5,11 +5,11 @@
, openssl ? null }:
stdenv.mkDerivation rec {
- name = "wget-${version}";
+ pname = "wget";
version = "1.20.3";
src = fetchurl {
- url = "mirror://gnu/wget/${name}.tar.lz";
+ url = "mirror://gnu/wget/${pname}-${version}.tar.lz";
sha256 = "1frajd86ds8vz2hprq30wq8ya89z9dcxnwm8nwk12bbc47l7qq39";
};
diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index ee72cf4d2d89..b6c03c08cffe 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "5.5.1";
- name = "whois-${version}";
+ pname = "whois";
src = fetchFromGitHub {
owner = "rfc1036";
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 9f67dd4e2c30..2f95876c2f30 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -5,11 +5,11 @@
let
inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo;
in stdenv.mkDerivation rec {
- name = "wicd-${version}";
+ pname = "wicd";
version = "1.7.2.4";
src = fetchurl {
- url = "https://launchpad.net/wicd/1.7/${version}/+download/${name}.tar.gz";
+ url = "https://launchpad.net/wicd/1.7/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw";
};
diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index a537e4dfb266..dfda88cb8678 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchzip }:
buildGoPackage rec {
- name = "wireguard-go-${version}";
+ pname = "wireguard-go";
version = "0.0.20190517";
goPackagePath = "git.zx2c4.com/wireguard-go";
diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/tools/networking/wolfebin/default.nix
index 05bf8d5dd11c..7eded00db858 100644
--- a/pkgs/tools/networking/wolfebin/default.nix
+++ b/pkgs/tools/networking/wolfebin/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "5.4";
- name = "wolfebin-${version}";
+ pname = "wolfebin";
src = fetchFromGitHub {
owner = "thejoshwolfe";
repo = "wolfebin";
- rev = "${version}";
+ rev = version;
sha256 = "16xj6zz30sn9q05p211bmmsl0i6fknfxf8dssn6knm6nkiym8088";
};
diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix
index 5dd2f3b74fdc..9c8f46bef07b 100644
--- a/pkgs/tools/networking/wrk/default.nix
+++ b/pkgs/tools/networking/wrk/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, luajit, openssl, perl }:
stdenv.mkDerivation rec {
- name = "wrk-${version}";
+ pname = "wrk";
version = "4.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix
index e2e638ad485b..7908143bdab3 100644
--- a/pkgs/tools/networking/wrk2/default.nix
+++ b/pkgs/tools/networking/wrk2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, luajit, openssl, zlib }:
stdenv.mkDerivation rec {
- name = "wrk2-${version}";
+ pname = "wrk2";
version = "4.0.0-${builtins.substring 0 7 src.rev}";
src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix
index b13e5dee18c7..e84a97525f12 100644
--- a/pkgs/tools/networking/wuzz/default.nix
+++ b/pkgs/tools/networking/wuzz/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "wuzz-${version}";
+ pname = "wuzz";
version = "0.2.0";
rev = "v${version}";
diff --git a/pkgs/tools/networking/yrd/default.nix b/pkgs/tools/networking/yrd/default.nix
index e5d260ef7d42..a259d892cc15 100644
--- a/pkgs/tools/networking/yrd/default.nix
+++ b/pkgs/tools/networking/yrd/default.nix
@@ -10,7 +10,7 @@ in pythonPackages.buildPythonApplication {
src = fetchFromGitHub {
owner = "kpcyrd";
- repo = "${pname}";
+ repo = pname;
rev = "v${version}";
inherit sha256;
};
diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix
index 7cac5a455700..3acd207df95d 100644
--- a/pkgs/tools/networking/zap/default.nix
+++ b/pkgs/tools/networking/zap/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, jdk, ant, runtimeShell }:
stdenv.mkDerivation rec {
- name = "zap-${version}";
+ pname = "zap";
version = "2.7.0";
src = fetchFromGitHub {
owner = "zaproxy";
repo = "zaproxy";
- rev ="${version}";
+ rev =version;
sha256 = "1bz4pgq66v6kxmgj99llacm1d85vj8z78jlgc2z9hv0ha5i57y32";
};
diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix
index ac64e135c2fe..b2016fe9452c 100644
--- a/pkgs/tools/networking/zssh/default.nix
+++ b/pkgs/tools/networking/zssh/default.nix
@@ -3,10 +3,11 @@
let
version = "1.5c";
in stdenv.mkDerivation rec {
- name = "zssh-${version}";
+ pname = "zssh";
+ inherit version;
src = fetchurl {
- url = "mirror://sourceforge/zssh/${name}.tgz";
+ url = "mirror://sourceforge/zssh/${pname}-${version}.tgz";
sha256 = "06z73iq59lz8ibjrgs7d3xl39vh9yld1988yx8khssch4pw41s52";
};
diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix
index 3742d22c0212..d69b5943123c 100644
--- a/pkgs/tools/nix/nix-script/default.nix
+++ b/pkgs/tools/nix/nix-script/default.nix
@@ -1,7 +1,7 @@
{ stdenv, haskellPackages, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "nix-script-${version}";
+stdenv.mkDerivation {
+ pname = "nix-script";
version = "2015-09-22";
src = fetchFromGitHub {
diff --git a/pkgs/tools/nix/nix-store-gcs-proxy/default.nix b/pkgs/tools/nix/nix-store-gcs-proxy/default.nix
new file mode 100644
index 000000000000..c782607da854
--- /dev/null
+++ b/pkgs/tools/nix/nix-store-gcs-proxy/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+buildGoPackage rec {
+ pname = "nix-store-gcs-proxy";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "tweag";
+ repo = "nix-store-gcs-proxy";
+ rev = "v${version}";
+ sha256 = "0804p65px4wd7gzxggpdxsazkd1hbz1p15zzaxf9ygc6sh26ncln";
+ };
+
+ goPackagePath = "github.com/tweag/nix-store-gcs-proxy";
+
+ goDeps = ./deps.nix;
+
+ meta = {
+ description = "A HTTP nix store that proxies requests to Google Storage";
+ homepage = "https://github.com/tweag/nix-store-gcs-proxy";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ zimbatm ];
+ };
+}
+
diff --git a/pkgs/tools/nix/nix-store-gcs-proxy/deps.nix b/pkgs/tools/nix/nix-store-gcs-proxy/deps.nix
new file mode 100644
index 000000000000..b5ae542876d7
--- /dev/null
+++ b/pkgs/tools/nix/nix-store-gcs-proxy/deps.nix
@@ -0,0 +1,813 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+ {
+ goPackagePath = "cloud.google.com/go";
+ fetch = {
+ type = "git";
+ url = "https://code.googlesource.com/gocloud";
+ rev = "v0.37.2";
+ sha256 = "1w6crdxy9vzd8vm672hng22spwld6d60z58kbr28dkiiz694wqvs";
+ };
+ }
+ {
+ goPackagePath = "github.com/BurntSushi/toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/toml";
+ rev = "v0.3.1";
+ sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
+ };
+ }
+ {
+ goPackagePath = "github.com/Shopify/sarama";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Shopify/sarama";
+ rev = "v1.19.0";
+ sha256 = "0q1z3pvcd011yprwzws2s293v4cjvsszhai6vnfrahjcbsz79q0z";
+ };
+ }
+ {
+ goPackagePath = "github.com/Shopify/toxiproxy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Shopify/toxiproxy";
+ rev = "v2.1.4";
+ sha256 = "07yhsvscdv1qjfc2fyyh9qsrrdwrrw04wadk5gaq4qddcway7vig";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/template";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/template";
+ rev = "a0175ee3bccc";
+ sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/units";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/units";
+ rev = "2efee857e7cf";
+ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+ };
+ }
+ {
+ goPackagePath = "github.com/anmitsu/go-shlex";
+ fetch = {
+ type = "git";
+ url = "https://github.com/anmitsu/go-shlex";
+ rev = "648efa622239";
+ sha256 = "10rgdp5d106iisgz25ic8k6f44s9adh4sjh6fyxq9ccm21gw49b7";
+ };
+ }
+ {
+ goPackagePath = "github.com/apache/thrift";
+ fetch = {
+ type = "git";
+ url = "https://github.com/apache/thrift";
+ rev = "v0.12.0";
+ sha256 = "0g2g61rs189nimg3631wxfwdx12dsdz70qvncczlyvn34pcj7yby";
+ };
+ }
+ {
+ goPackagePath = "github.com/beorn7/perks";
+ fetch = {
+ type = "git";
+ url = "https://github.com/beorn7/perks";
+ rev = "3a771d992973";
+ sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
+ };
+ }
+ {
+ goPackagePath = "github.com/bradfitz/go-smtpd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/bradfitz/go-smtpd";
+ rev = "deb6d6237625";
+ sha256 = "1i33brqd44h0a9hbdnclka0hfg0f6qi5xy23f0ap9yixkhj4k9p6";
+ };
+ }
+ {
+ goPackagePath = "github.com/client9/misspell";
+ fetch = {
+ type = "git";
+ url = "https://github.com/client9/misspell";
+ rev = "v0.3.4";
+ sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
+ };
+ }
+ {
+ goPackagePath = "github.com/coreos/go-systemd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/coreos/go-systemd";
+ rev = "c6f51f82210d";
+ sha256 = "1vnccmnkjl6n539l4cliz6sznpqn6igf5v7mbmsgahb838742clb";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "v1.1.1";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+ };
+ }
+ {
+ goPackagePath = "github.com/eapache/go-resiliency";
+ fetch = {
+ type = "git";
+ url = "https://github.com/eapache/go-resiliency";
+ rev = "v1.1.0";
+ sha256 = "1zmgw3c4w5r6m2r340n4jc5l5ll3m3nbszqrmrgbqc2xixxyk2gx";
+ };
+ }
+ {
+ goPackagePath = "github.com/eapache/go-xerial-snappy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/eapache/go-xerial-snappy";
+ rev = "776d5712da21";
+ sha256 = "0ncc41dv7xwb1znyzmzh7cvs6j5fzz0f1n8h1v3grl9ma6s1si9d";
+ };
+ }
+ {
+ goPackagePath = "github.com/eapache/queue";
+ fetch = {
+ type = "git";
+ url = "https://github.com/eapache/queue";
+ rev = "v1.1.0";
+ sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg";
+ };
+ }
+ {
+ goPackagePath = "github.com/flynn/go-shlex";
+ fetch = {
+ type = "git";
+ url = "https://github.com/flynn/go-shlex";
+ rev = "3f9db97f8568";
+ sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia";
+ };
+ }
+ {
+ goPackagePath = "github.com/fsnotify/fsnotify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fsnotify/fsnotify";
+ rev = "v1.4.7";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "github.com/gliderlabs/ssh";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gliderlabs/ssh";
+ rev = "v0.1.1";
+ sha256 = "0bylkc7yg8bxxffhchikcnzwli5n95cfmbji6v2a4mn1h5n36mdm";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-kit/kit";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-kit/kit";
+ rev = "v0.8.0";
+ sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-logfmt/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-logfmt/logfmt";
+ rev = "v0.3.0";
+ sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-stack/stack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-stack/stack";
+ rev = "v1.8.0";
+ sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
+ };
+ }
+ {
+ goPackagePath = "github.com/gogo/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gogo/protobuf";
+ rev = "v1.2.0";
+ sha256 = "1c3y5m08mvrgvlw0kb9pldh3kkqcj99pa8gqmk1g3hp8ih3b2dv0";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/glog";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/glog";
+ rev = "23def4e6c14b";
+ sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/mock";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/mock";
+ rev = "v1.2.0";
+ sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "v1.2.0";
+ sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/snappy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/snappy";
+ rev = "2e65f85255db";
+ sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/btree";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/btree";
+ rev = "4030bb1f1f0c";
+ sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-cmp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-cmp";
+ rev = "v0.2.0";
+ sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-github";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-github";
+ rev = "v17.0.0";
+ sha256 = "1kvw95l77a5n5rgal9n1xjh58zxb3a40ij1j722b1h4z8yg9jhg4";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-querystring";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-querystring";
+ rev = "v1.0.0";
+ sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/martian";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/martian";
+ rev = "v2.1.0";
+ sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/pprof";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/pprof";
+ rev = "3ea8567a2e57";
+ sha256 = "09rhjn3ms0a72dw0yzbp237p7yhqma772zspddn6mgkh3gi3kn4c";
+ };
+ }
+ {
+ goPackagePath = "github.com/googleapis/gax-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/googleapis/gax-go";
+ rev = "v2.0.4";
+ sha256 = "1iwnm6ky1x53lgs44mw3hpdkjzrm5qd0kfs50m0qcq2ml5m1cwdm";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/context";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/context";
+ rev = "v1.1.1";
+ sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/mux";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/mux";
+ rev = "v1.6.2";
+ sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
+ };
+ }
+ {
+ goPackagePath = "github.com/gregjones/httpcache";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gregjones/httpcache";
+ rev = "9cad4c3443a7";
+ sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/golang-lru";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/golang-lru";
+ rev = "v0.5.0";
+ sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
+ };
+ }
+ {
+ goPackagePath = "github.com/hpcloud/tail";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hpcloud/tail";
+ rev = "v1.0.0";
+ sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
+ };
+ }
+ {
+ goPackagePath = "github.com/jellevandenhooff/dkim";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jellevandenhooff/dkim";
+ rev = "f50fe3d243e1";
+ sha256 = "0qf5pypxfpciivj0v728i24rfjwhnwm07945mj6p3cw4gdphqhm0";
+ };
+ }
+ {
+ goPackagePath = "github.com/jstemmer/go-junit-report";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jstemmer/go-junit-report";
+ rev = "af01ea7f8024";
+ sha256 = "1lp3n94ris12hac02wi31f3whs88lcrzwgdg43a5j6cafg9p1d0s";
+ };
+ }
+ {
+ goPackagePath = "github.com/julienschmidt/httprouter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/julienschmidt/httprouter";
+ rev = "v1.2.0";
+ sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
+ };
+ }
+ {
+ goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+ fetch = {
+ type = "git";
+ url = "https://github.com/konsorten/go-windows-terminal-sequences";
+ rev = "v1.0.1";
+ sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/logfmt";
+ rev = "b84e30acd515";
+ sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pty";
+ rev = "v1.1.3";
+ sha256 = "0knzlvndfgjm2k23vhp2xj1cv3fm31vbg5b20gdl1vnxk7rh549h";
+ };
+ }
+ {
+ goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/matttproud/golang_protobuf_extensions";
+ rev = "v1.0.1";
+ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+ };
+ }
+ {
+ goPackagePath = "github.com/mwitkow/go-conntrack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mwitkow/go-conntrack";
+ rev = "cc309e4a2223";
+ sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
+ };
+ }
+ {
+ goPackagePath = "github.com/onsi/ginkgo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/onsi/ginkgo";
+ rev = "v1.7.0";
+ sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg";
+ };
+ }
+ {
+ goPackagePath = "github.com/onsi/gomega";
+ fetch = {
+ type = "git";
+ url = "https://github.com/onsi/gomega";
+ rev = "v1.4.3";
+ sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
+ };
+ }
+ {
+ goPackagePath = "github.com/openzipkin/zipkin-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/openzipkin/zipkin-go";
+ rev = "v0.1.6";
+ sha256 = "0fyf69w66khj3dxdpqydwjdhhhyhlh3caxa5ybnd1h2f6b5gbvvv";
+ };
+ }
+ {
+ goPackagePath = "github.com/pierrec/lz4";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pierrec/lz4";
+ rev = "v2.0.5";
+ sha256 = "0y5rh7z01zycd59nnjpkqq0ydyjmcg9j1xw15q1i600l9j9g617p";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "v0.8.0";
+ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+ };
+ }
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "v1.0.0";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_golang";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_golang";
+ rev = "3c4408c8b829";
+ sha256 = "06d9cxxxkglks8fpfg3spxscyrq4lw7fckm4p6f0wshq65am2lxw";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_model";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_model";
+ rev = "56726106282f";
+ sha256 = "19y4qs9mkxiiab5sh3b7cccjpl3xbp6sy8812ig9f1zg8vzkzj7j";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/common";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/common";
+ rev = "v0.2.0";
+ sha256 = "02kym6lcfnlq23qbv277jr0q1n7jj0r14gqg93c7wn7gc44jv3vp";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/procfs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/procfs";
+ rev = "bf6a532e95b1";
+ sha256 = "0k65i2ikf3jp6863mpc1raf928i78r8jd7zn9djx6f4izls6l6j1";
+ };
+ }
+ {
+ goPackagePath = "github.com/rcrowley/go-metrics";
+ fetch = {
+ type = "git";
+ url = "https://github.com/rcrowley/go-metrics";
+ rev = "3113b8401b8a";
+ sha256 = "1m5q5dsvkqz809aag6dyan74wdrp69g2mb9killbv7z4ls2mlfr3";
+ };
+ }
+ {
+ goPackagePath = "github.com/sirupsen/logrus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sirupsen/logrus";
+ rev = "v1.2.0";
+ sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/objx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/objx";
+ rev = "v0.1.1";
+ sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "v1.2.2";
+ sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+ };
+ }
+ {
+ goPackagePath = "github.com/tarm/serial";
+ fetch = {
+ type = "git";
+ url = "https://github.com/tarm/serial";
+ rev = "98f6abe2eb07";
+ sha256 = "1yj4jiv2f3x3iawxdflrlmdan0k9xsbnccgc9yz658rmif1ag3pb";
+ };
+ }
+ {
+ goPackagePath = "github.com/urfave/cli";
+ fetch = {
+ type = "git";
+ url = "https://github.com/urfave/cli";
+ rev = "v1.20.0";
+ sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
+ };
+ }
+ {
+ goPackagePath = "github.com/urfave/negroni";
+ fetch = {
+ type = "git";
+ url = "https://github.com/urfave/negroni";
+ rev = "v1.0.0";
+ sha256 = "1gp6j74adi1cn8fq5v3wzlzhwl4zg43n2746m4fzdcdimihk3ccp";
+ };
+ }
+ {
+ goPackagePath = "go.opencensus.io";
+ fetch = {
+ type = "git";
+ url = "https://github.com/census-instrumentation/opencensus-go";
+ rev = "v0.19.2";
+ sha256 = "1vlik5xwwrhcyy9yx2yc3y02y6hp9q80591hbhncv9c8wwfg9gjc";
+ };
+ }
+ {
+ goPackagePath = "go4.org";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go4org/go4";
+ rev = "417644f6feb5";
+ sha256 = "013cvdg4fj15l9xg84br0vkb2d99j04s5b4g7zssqhng8dkwgr37";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/build";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/build";
+ rev = "5284462c4bec";
+ sha256 = "0w649zbs4n64b6rjx92hy7vc1y9sv4khhk5igbz8w7sxvz8778ij";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "c2843e01d9a2";
+ sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/exp";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/exp";
+ rev = "509febef88a4";
+ sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/lint";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/lint";
+ rev = "5614ed5bae6f";
+ sha256 = "0fzn0zjv0x92xvfdq3a0v9w5sgkhr7hxkfy9zaqi8i57807z8bnx";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "d8887717615a";
+ sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/oauth2";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/oauth2";
+ rev = "e64efc72b421";
+ sha256 = "0djvwz2avx7knsjbl434vw1wqbrg53xp1kh599gfixn5icrggz4m";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/perf";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/perf";
+ rev = "6e6d33e29852";
+ sha256 = "1cyiy459bkjqnzgk051lsksz46hdkjc34q33zf946kiv3hilp1v2";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "e225da77a7e6";
+ sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "d0b11bdaac8a";
+ sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "17ff2d5776d2";
+ sha256 = "1rrh2mnmyxr45nsvy42zq3w3ly6gw6rl993knwvf1w71kyv0jjnj";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/time";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/time";
+ rev = "85acf8d2951c";
+ sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/tools";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/tools";
+ rev = "e65039ee4138";
+ sha256 = "0c094599cf70wdrms49a3879qkq122pqlp2av444gs2pvc8apdcx";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/api";
+ fetch = {
+ type = "git";
+ url = "https://code.googlesource.com/google-api-go-client";
+ rev = "v0.3.0";
+ sha256 = "1vvrhiq2zs677iz2j6s9iv4q3j3nhxz5ci9y4zrak248lrdln0zk";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/appengine";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/appengine";
+ rev = "v1.4.0";
+ sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/genproto";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-genproto";
+ rev = "5fe7a883aa19";
+ sha256 = "0qjkwig0r42q0j2qv57s4ahsgmmp41dz3ih3rnaqg0619n5w7lbs";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/grpc";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc/grpc-go";
+ rev = "v1.19.0";
+ sha256 = "1znqwpj7ix3dpzx4zch0q70sdl3z5lvbb7v3q4i8sf8kas3yv71v";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/alecthomas/kingpin.v2";
+ rev = "v2.2.6";
+ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/check.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/check.v1";
+ rev = "788fd7840127";
+ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/fsnotify.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/fsnotify.v1";
+ rev = "v1.4.7";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/inf.v0";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/inf.v0";
+ rev = "v0.9.1";
+ sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/tomb.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/tomb.v1";
+ rev = "dd632973f1e7";
+ sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "v2.2.2";
+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
+ };
+ }
+ {
+ goPackagePath = "grpc.go4.org";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go4org/grpc";
+ rev = "11d0a25b4919";
+ sha256 = "1d6akp2b3aa2viwbikc3jndhiljgjj87r4z7mg5b03f97f2wmz4f";
+ };
+ }
+ {
+ goPackagePath = "honnef.co/go/tools";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dominikh/go-tools";
+ rev = "3f1c8253044a";
+ sha256 = "0d3vgh0fgfj1z7i648g1s6x2pwxd07sxfjwg1xn3yagr9h06jh3h";
+ };
+ }
+]
diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix
index 69f4fc435c91..13b7ffd2af71 100644
--- a/pkgs/tools/nix/nixdoc/default.nix
+++ b/pkgs/tools/nix/nixdoc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, darwin }:
rustPlatform.buildRustPackage rec {
- name = "nixdoc-${version}";
+ pname = "nixdoc";
version = "1.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix
new file mode 100644
index 000000000000..4e51b9b46dd3
--- /dev/null
+++ b/pkgs/tools/nix/nixos-generators/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils, jq, findutils, nix }:
+
+stdenv.mkDerivation rec {
+ pname = "nixos-generators";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "nix-community";
+ repo = "nixos-generators";
+ rev = version;
+ sha256 = "10xncifdfhilxclxyf72h7dcfn8yn1h34qbkvdq9l76ghv5qjniq";
+ };
+ nativeBuildInputs = [ makeWrapper ];
+ installFlags = [ "PREFIX=$(out)" ];
+ postFixup = ''
+ wrapProgram $out/bin/nixos-generate \
+ --prefix PATH : ${lib.makeBinPath [ jq coreutils findutils nix ] }
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Collection of image builders";
+ homepage = "https://github.com/nix-community/nixos-generators";
+ license = licenses.mit;
+ maintainers = with maintainers; [ lassulus ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix
index 51e4e22bc5b6..7ac73fac39e5 100644
--- a/pkgs/tools/nix/nixpkgs-fmt/default.nix
+++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix
@@ -1,16 +1,16 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "nixpkgs-fmt";
- version = "0.3.1";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = "v${version}";
- sha256 = "0nz4njmrwacizz9z89ligxr2gyggk65vq9cmd6s4hn133gajf2n1";
+ sha256 = "07hnyx616dk03md00pmgpb5c2sp9w0n5l94s82arair0kpi0ncy0";
};
- cargoSha256 = "0p3qa1asdvw2npav4281lzndjczrzac6fr8z4y61m7rbn363s8sa";
+ cargoSha256 = "0wfx7shsdqrwbnzr2a0fnly1kd93mxbm96zjq5pzrq94lphkhqhz";
meta = with lib; {
description = "Nix code formatter for nixpkgs";
diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix
index bcf96a50d36a..f161591c8f1d 100644
--- a/pkgs/tools/package-management/apt-dater/default.nix
+++ b/pkgs/tools/package-management/apt-dater/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "apt-dater-${version}";
+ pname = "apt-dater";
version = "1.0.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix
index 46da85d97488..cbb4ad4591e9 100644
--- a/pkgs/tools/package-management/apt/default.nix
+++ b/pkgs/tools/package-management/apt/default.nix
@@ -14,7 +14,7 @@
}:
stdenv.mkDerivation rec {
- name = "apt-${version}";
+ pname = "apt";
version = "1.4.6";
diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix
index 0f45084f3c05..938a762ba303 100644
--- a/pkgs/tools/package-management/bunny/default.nix
+++ b/pkgs/tools/package-management/bunny/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab }:
stdenv.mkDerivation rec {
- name = "bunny-${version}";
+ pname = "bunny";
version = "1.3";
src = fetchFromGitLab {
diff --git a/pkgs/tools/package-management/cargo-download/crates-io.nix b/pkgs/tools/package-management/cargo-download/crates-io.nix
index d120a05e00d7..e0c0abf4dc6e 100644
--- a/pkgs/tools/package-management/cargo-download/crates-io.nix
+++ b/pkgs/tools/package-management/cargo-download/crates-io.nix
@@ -14,7 +14,7 @@ rec {
authors = [ "Remi Rampin " ];
sha256 = "1974q3nysai026zhz24df506cxwi09jdzqksll4h7ibpb5n9g1d4";
};
- features_.adler32."1.0.2" = deps: f: updateFeatures f (rec {
+ features_.adler32."1.0.2" = deps: f: updateFeatures f ({
adler32."1.0.2".default = (f.adler32."1.0.2".default or true);
}) [];
@@ -35,7 +35,7 @@ rec {
(crates."memchr"."${deps."aho_corasick"."0.5.3"."memchr"}" deps)
]);
};
- features_.aho_corasick."0.5.3" = deps: f: updateFeatures f (rec {
+ features_.aho_corasick."0.5.3" = deps: f: updateFeatures f ({
aho_corasick."0.5.3".default = (f.aho_corasick."0.5.3".default or true);
memchr."${deps.aho_corasick."0.5.3".memchr}".default = true;
}) [
@@ -53,7 +53,7 @@ rec {
authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ];
sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij";
};
- features_.ansi_term."0.9.0" = deps: f: updateFeatures f (rec {
+ features_.ansi_term."0.9.0" = deps: f: updateFeatures f ({
ansi_term."0.9.0".default = (f.ansi_term."0.9.0".default or true);
}) [];
@@ -110,7 +110,7 @@ rec {
(crates."winapi"."${deps."atty"."0.2.3"."winapi"}" deps)
]) else []);
};
- features_.atty."0.2.3" = deps: f: updateFeatures f (rec {
+ features_.atty."0.2.3" = deps: f: updateFeatures f ({
atty."0.2.3".default = (f.atty."0.2.3".default or true);
kernel32_sys."${deps.atty."0.2.3".kernel32_sys}".default = true;
libc."${deps.atty."0.2.3".libc}".default = (f.libc."${deps.atty."0.2.3".libc}".default or false);
@@ -138,7 +138,7 @@ rec {
(crates."safemem"."${deps."base64"."0.9.3"."safemem"}" deps)
]);
};
- features_.base64."0.9.3" = deps: f: updateFeatures f (rec {
+ features_.base64."0.9.3" = deps: f: updateFeatures f ({
base64."0.9.3".default = (f.base64."0.9.3".default or true);
byteorder."${deps.base64."0.9.3".byteorder}".default = true;
safemem."${deps.base64."0.9.3".safemem}".default = true;
@@ -158,7 +158,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
};
- features_.bitflags."0.7.0" = deps: f: updateFeatures f (rec {
+ features_.bitflags."0.7.0" = deps: f: updateFeatures f ({
bitflags."0.7.0".default = (f.bitflags."0.7.0".default or true);
}) [];
@@ -196,7 +196,7 @@ rec {
sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08";
features = mkFeatures (features."bitflags"."1.0.4" or {});
};
- features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec {
+ features_.bitflags."1.0.4" = deps: f: updateFeatures f ({
bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true);
}) [];
@@ -288,7 +288,7 @@ rec {
(crates."time"."${deps."cargo_download"."0.1.2"."time"}" deps)
]);
};
- features_.cargo_download."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.cargo_download."0.1.2" = deps: f: updateFeatures f ({
ansi_term."${deps.cargo_download."0.1.2".ansi_term}".default = true;
cargo_download."0.1.2".default = (f.cargo_download."0.1.2".default or true);
clap."${deps.cargo_download."0.1.2".clap}".default = true;
@@ -344,7 +344,7 @@ rec {
authors = [ "Skyler Lipthay " ];
sha256 = "06i1x3wqv30rkvlgj134qf9vzxhzz28bz41mm0rgki0i0f7gf96n";
};
- features_.case."0.1.0" = deps: f: updateFeatures f (rec {
+ features_.case."0.1.0" = deps: f: updateFeatures f ({
case."0.1.0".default = (f.case."0.1.0".default or true);
}) [];
@@ -383,7 +383,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi";
};
- features_.cfg_if."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.cfg_if."0.1.2" = deps: f: updateFeatures f ({
cfg_if."0.1.2".default = (f.cfg_if."0.1.2".default or true);
}) [];
@@ -402,7 +402,7 @@ rec {
(crates."time"."${deps."chrono"."0.2.25"."time"}" deps)
]);
};
- features_.chrono."0.2.25" = deps: f: updateFeatures f (rec {
+ features_.chrono."0.2.25" = deps: f: updateFeatures f ({
chrono."0.2.25".default = (f.chrono."0.2.25".default or true);
num."${deps.chrono."0.2.25".num}".default = (f.num."${deps.chrono."0.2.25".num}".default or false);
time."${deps.chrono."0.2.25".time}".default = true;
@@ -542,7 +542,7 @@ rec {
(crates."custom_derive"."${deps."conv"."0.3.3"."custom_derive"}" deps)
]);
};
- features_.conv."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.conv."0.3.3" = deps: f: updateFeatures f ({
conv."0.3.3".default = (f.conv."0.3.3".default or true);
custom_derive."${deps.conv."0.3.3".custom_derive}".default = true;
}) [
@@ -610,7 +610,7 @@ rec {
]);
features = mkFeatures (features."core_foundation_sys"."0.5.1" or {});
};
- features_.core_foundation_sys."0.5.1" = deps: f: updateFeatures f (rec {
+ features_.core_foundation_sys."0.5.1" = deps: f: updateFeatures f ({
core_foundation_sys."0.5.1".default = (f.core_foundation_sys."0.5.1".default or true);
libc."${deps.core_foundation_sys."0.5.1".libc}".default = true;
}) [
@@ -628,7 +628,7 @@ rec {
authors = [ "Sam Rijs " "Alex Crichton " ];
sha256 = "1rwvhb98w41mk5phr84mryally58f68h0v933772gdxqvqbcayqy";
};
- features_.crc32fast."1.1.1" = deps: f: updateFeatures f (rec {
+ features_.crc32fast."1.1.1" = deps: f: updateFeatures f ({
crc32fast."1.1.1".default = (f.crc32fast."1.1.1".default or true);
}) [];
@@ -644,7 +644,7 @@ rec {
sha256 = "1k1a4q5gy7zakiw39hdzrblnw3kk4nsqmkdp1dpzh8h558140rhq";
features = mkFeatures (features."crossbeam"."0.2.10" or {});
};
- features_.crossbeam."0.2.10" = deps: f: updateFeatures f (rec {
+ features_.crossbeam."0.2.10" = deps: f: updateFeatures f ({
crossbeam."0.2.10".default = (f.crossbeam."0.2.10".default or true);
}) [];
@@ -663,7 +663,7 @@ rec {
(crates."crossbeam_utils"."${deps."crossbeam_deque"."0.6.2"."crossbeam_utils"}" deps)
]);
};
- features_.crossbeam_deque."0.6.2" = deps: f: updateFeatures f (rec {
+ features_.crossbeam_deque."0.6.2" = deps: f: updateFeatures f ({
crossbeam_deque."0.6.2".default = (f.crossbeam_deque."0.6.2".default or true);
crossbeam_epoch."${deps.crossbeam_deque."0.6.2".crossbeam_epoch}".default = true;
crossbeam_utils."${deps.crossbeam_deque."0.6.2".crossbeam_utils}".default = true;
@@ -798,7 +798,7 @@ rec {
(crates."syn"."${deps."derive_error"."0.0.3"."syn"}" deps)
]);
};
- features_.derive_error."0.0.3" = deps: f: updateFeatures f (rec {
+ features_.derive_error."0.0.3" = deps: f: updateFeatures f ({
case."${deps.derive_error."0.0.3".case}".default = true;
derive_error."0.0.3".default = (f.derive_error."0.0.3".default or true);
quote."${deps.derive_error."0.0.3".quote}".default = true;
@@ -820,7 +820,7 @@ rec {
authors = [ "David Tolnay " ];
sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw";
};
- features_.dtoa."0.4.2" = deps: f: updateFeatures f (rec {
+ features_.dtoa."0.4.2" = deps: f: updateFeatures f ({
dtoa."0.4.2".default = (f.dtoa."0.4.2".default or true);
}) [];
@@ -907,7 +907,7 @@ rec {
authors = [ "Ben Wilber " ];
sha256 = "1cw9p4vzbscvyrbzv7z68gv2cairrns2d4wcb4nkahkcjk25phip";
};
- features_.exitcode."1.1.2" = deps: f: updateFeatures f (rec {
+ features_.exitcode."1.1.2" = deps: f: updateFeatures f ({
exitcode."1.1.2".default = (f.exitcode."1.1.2".default or true);
}) [];
@@ -931,7 +931,7 @@ rec {
(crates."libc"."${deps."filetime"."0.1.14"."libc"}" deps)
]) else []);
};
- features_.filetime."0.1.14" = deps: f: updateFeatures f (rec {
+ features_.filetime."0.1.14" = deps: f: updateFeatures f ({
cfg_if."${deps.filetime."0.1.14".cfg_if}".default = true;
filetime."0.1.14".default = (f.filetime."0.1.14".default or true);
libc."${deps.filetime."0.1.14".libc}".default = true;
@@ -997,7 +997,7 @@ rec {
sha256 = "128mlh23y3gg6ag5h8iiqlcbl59smisdzraqy88ldrf75kbw27ip";
libPath = "lib.rs";
};
- features_.fnv."1.0.6" = deps: f: updateFeatures f (rec {
+ features_.fnv."1.0.6" = deps: f: updateFeatures f ({
fnv."1.0.6".default = (f.fnv."1.0.6".default or true);
}) [];
@@ -1015,7 +1015,7 @@ rec {
(crates."foreign_types_shared"."${deps."foreign_types"."0.3.2"."foreign_types_shared"}" deps)
]);
};
- features_.foreign_types."0.3.2" = deps: f: updateFeatures f (rec {
+ features_.foreign_types."0.3.2" = deps: f: updateFeatures f ({
foreign_types."0.3.2".default = (f.foreign_types."0.3.2".default or true);
foreign_types_shared."${deps.foreign_types."0.3.2".foreign_types_shared}".default = true;
}) [
@@ -1033,7 +1033,7 @@ rec {
authors = [ "Steven Fackler " ];
sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5";
};
- features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f ({
foreign_types_shared."0.1.1".default = (f.foreign_types_shared."0.1.1".default or true);
}) [];
@@ -1051,7 +1051,7 @@ rec {
(crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.2.1"."fuchsia_zircon_sys"}" deps)
]);
};
- features_.fuchsia_zircon."0.2.1" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon."0.2.1" = deps: f: updateFeatures f ({
fuchsia_zircon."0.2.1".default = (f.fuchsia_zircon."0.2.1".default or true);
fuchsia_zircon_sys."${deps.fuchsia_zircon."0.2.1".fuchsia_zircon_sys}".default = true;
}) [
@@ -1073,7 +1073,7 @@ rec {
(crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps)
]);
};
- features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f ({
bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true;
fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true);
fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true;
@@ -1096,7 +1096,7 @@ rec {
(crates."bitflags"."${deps."fuchsia_zircon_sys"."0.2.0"."bitflags"}" deps)
]);
};
- features_.fuchsia_zircon_sys."0.2.0" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon_sys."0.2.0" = deps: f: updateFeatures f ({
bitflags."${deps.fuchsia_zircon_sys."0.2.0".bitflags}".default = true;
fuchsia_zircon_sys."0.2.0".default = (f.fuchsia_zircon_sys."0.2.0".default or true);
}) [
@@ -1114,7 +1114,7 @@ rec {
authors = [ "Raph Levien " ];
sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
};
- features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec {
+ features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({
fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true);
}) [];
@@ -1206,7 +1206,7 @@ rec {
]);
features = mkFeatures (features."h2"."0.1.13" or {});
};
- features_.h2."0.1.13" = deps: f: updateFeatures f (rec {
+ features_.h2."0.1.13" = deps: f: updateFeatures f ({
byteorder."${deps.h2."0.1.13".byteorder}".default = true;
bytes."${deps.h2."0.1.13".bytes}".default = true;
fnv."${deps.h2."0.1.13".fnv}".default = true;
@@ -1247,7 +1247,7 @@ rec {
(crates."itoa"."${deps."http"."0.1.14"."itoa"}" deps)
]);
};
- features_.http."0.1.14" = deps: f: updateFeatures f (rec {
+ features_.http."0.1.14" = deps: f: updateFeatures f ({
bytes."${deps.http."0.1.14".bytes}".default = true;
fnv."${deps.http."0.1.14".fnv}".default = true;
http."0.1.14".default = (f.http."0.1.14".default or true);
@@ -1454,7 +1454,7 @@ rec {
(crates."unicode_normalization"."${deps."idna"."0.1.4"."unicode_normalization"}" deps)
]);
};
- features_.idna."0.1.4" = deps: f: updateFeatures f (rec {
+ features_.idna."0.1.4" = deps: f: updateFeatures f ({
idna."0.1.4".default = (f.idna."0.1.4".default or true);
matches."${deps.idna."0.1.4".matches}".default = true;
unicode_bidi."${deps.idna."0.1.4".unicode_bidi}".default = true;
@@ -1506,7 +1506,7 @@ rec {
(crates."winapi"."${deps."iovec"."0.1.1"."winapi"}" deps)
]) else []);
};
- features_.iovec."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.iovec."0.1.1" = deps: f: updateFeatures f ({
iovec."0.1.1".default = (f.iovec."0.1.1".default or true);
libc."${deps.iovec."0.1.1".libc}".default = true;
winapi."${deps.iovec."0.1.1".winapi}".default = true;
@@ -1533,7 +1533,7 @@ rec {
(crates."winapi"."${deps."isatty"."0.1.5"."winapi"}" deps)
]) else []);
};
- features_.isatty."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.isatty."0.1.5" = deps: f: updateFeatures f ({
isatty."0.1.5".default = (f.isatty."0.1.5".default or true);
kernel32_sys."${deps.isatty."0.1.5".kernel32_sys}".default = true;
libc."${deps.isatty."0.1.5".libc}".default = true;
@@ -1558,7 +1558,7 @@ rec {
(crates."either"."${deps."itertools"."0.6.5"."either"}" deps)
]);
};
- features_.itertools."0.6.5" = deps: f: updateFeatures f (rec {
+ features_.itertools."0.6.5" = deps: f: updateFeatures f ({
either."${deps.itertools."0.6.5".either}".default = (f.either."${deps.itertools."0.6.5".either}".default or false);
itertools."0.6.5".default = (f.itertools."0.6.5".default or true);
}) [
@@ -1577,7 +1577,7 @@ rec {
sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9";
features = mkFeatures (features."itoa"."0.3.4" or {});
};
- features_.itoa."0.3.4" = deps: f: updateFeatures f (rec {
+ features_.itoa."0.3.4" = deps: f: updateFeatures f ({
itoa."0.3.4".default = (f.itoa."0.3.4".default or true);
}) [];
@@ -1623,7 +1623,7 @@ rec {
(crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps)
]);
};
- features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec {
+ features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({
kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true);
winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true;
winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true;
@@ -1765,7 +1765,7 @@ rec {
(crates."crc32fast"."${deps."libflate"."0.1.19"."crc32fast"}" deps)
]);
};
- features_.libflate."0.1.19" = deps: f: updateFeatures f (rec {
+ features_.libflate."0.1.19" = deps: f: updateFeatures f ({
adler32."${deps.libflate."0.1.19".adler32}".default = true;
byteorder."${deps.libflate."0.1.19".byteorder}".default = true;
crc32fast."${deps.libflate."0.1.19".crc32fast}".default = true;
@@ -1792,7 +1792,7 @@ rec {
++ (if features.lock_api."0.1.5".owning_ref or false then [ (crates.owning_ref."${deps."lock_api"."0.1.5".owning_ref}" deps) ] else []));
features = mkFeatures (features."lock_api"."0.1.5" or {});
};
- features_.lock_api."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.lock_api."0.1.5" = deps: f: updateFeatures f ({
lock_api."0.1.5".default = (f.lock_api."0.1.5".default or true);
owning_ref."${deps.lock_api."0.1.5".owning_ref}".default = true;
scopeguard."${deps.lock_api."0.1.5".scopeguard}".default = (f.scopeguard."${deps.lock_api."0.1.5".scopeguard}".default or false);
@@ -1838,7 +1838,7 @@ rec {
]);
features = mkFeatures (features."log"."0.4.6" or {});
};
- features_.log."0.4.6" = deps: f: updateFeatures f (rec {
+ features_.log."0.4.6" = deps: f: updateFeatures f ({
cfg_if."${deps.log."0.4.6".cfg_if}".default = true;
log."0.4.6".default = (f.log."0.4.6".default or true);
}) [
@@ -1856,7 +1856,7 @@ rec {
authors = [ "bluss" ];
sha256 = "1f8kf5v7xra8ssvh5c10qlacbk4l0z2817pkscflx5s5q6y7925h";
};
- features_.maplit."0.1.6" = deps: f: updateFeatures f (rec {
+ features_.maplit."0.1.6" = deps: f: updateFeatures f ({
maplit."0.1.6".default = (f.maplit."0.1.6".default or true);
}) [];
@@ -1872,7 +1872,7 @@ rec {
sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan";
libPath = "lib.rs";
};
- features_.matches."0.1.6" = deps: f: updateFeatures f (rec {
+ features_.matches."0.1.6" = deps: f: updateFeatures f ({
matches."0.1.6".default = (f.matches."0.1.6".default or true);
}) [];
@@ -1890,7 +1890,7 @@ rec {
(crates."libc"."${deps."memchr"."0.1.11"."libc"}" deps)
]);
};
- features_.memchr."0.1.11" = deps: f: updateFeatures f (rec {
+ features_.memchr."0.1.11" = deps: f: updateFeatures f ({
libc."${deps.memchr."0.1.11".libc}".default = true;
memchr."0.1.11".default = (f.memchr."0.1.11".default or true);
}) [
@@ -1908,7 +1908,7 @@ rec {
authors = [ "Gilad Naaman " ];
sha256 = "00vym01jk9slibq2nsiilgffp7n6k52a4q3n4dqp0xf5kzxvffcf";
};
- features_.memoffset."0.2.1" = deps: f: updateFeatures f (rec {
+ features_.memoffset."0.2.1" = deps: f: updateFeatures f ({
memoffset."0.2.1".default = (f.memoffset."0.2.1".default or true);
}) [];
@@ -1926,7 +1926,7 @@ rec {
(crates."unicase"."${deps."mime"."0.3.12"."unicase"}" deps)
]);
};
- features_.mime."0.3.12" = deps: f: updateFeatures f (rec {
+ features_.mime."0.3.12" = deps: f: updateFeatures f ({
mime."0.3.12".default = (f.mime."0.3.12".default or true);
unicase."${deps.mime."0.3.12".unicase}".default = true;
}) [
@@ -1955,7 +1955,7 @@ rec {
]);
features = mkFeatures (features."mime_guess"."2.0.0-alpha.6" or {});
};
- features_.mime_guess."2.0.0-alpha.6" = deps: f: updateFeatures f (rec {
+ features_.mime_guess."2.0.0-alpha.6" = deps: f: updateFeatures f ({
mime."${deps.mime_guess."2.0.0-alpha.6".mime}".default = true;
mime_guess."2.0.0-alpha.6".default = (f.mime_guess."2.0.0-alpha.6".default or true);
phf = fold recursiveUpdate {} [
@@ -1993,7 +1993,7 @@ rec {
(crates."cc"."${deps."miniz_sys"."0.1.10"."cc"}" deps)
]);
};
- features_.miniz_sys."0.1.10" = deps: f: updateFeatures f (rec {
+ features_.miniz_sys."0.1.10" = deps: f: updateFeatures f ({
cc."${deps.miniz_sys."0.1.10".cc}".default = true;
libc."${deps.miniz_sys."0.1.10".libc}".default = true;
miniz_sys."0.1.10".default = (f.miniz_sys."0.1.10".default or true);
@@ -2083,7 +2083,7 @@ rec {
(crates."ws2_32_sys"."${deps."miow"."0.2.1"."ws2_32_sys"}" deps)
]);
};
- features_.miow."0.2.1" = deps: f: updateFeatures f (rec {
+ features_.miow."0.2.1" = deps: f: updateFeatures f ({
kernel32_sys."${deps.miow."0.2.1".kernel32_sys}".default = true;
miow."0.2.1".default = (f.miow."0.2.1".default or true);
net2."${deps.miow."0.2.1".net2}".default = (f.net2."${deps.miow."0.2.1".net2}".default or false);
@@ -2126,7 +2126,7 @@ rec {
]) else []);
features = mkFeatures (features."native_tls"."0.2.2" or {});
};
- features_.native_tls."0.2.2" = deps: f: updateFeatures f (rec {
+ features_.native_tls."0.2.2" = deps: f: updateFeatures f ({
lazy_static."${deps.native_tls."0.2.2".lazy_static}".default = true;
libc."${deps.native_tls."0.2.2".libc}".default = true;
log."${deps.native_tls."0.2.2".log}".default = true;
@@ -2296,7 +2296,7 @@ rec {
(crates."num_traits"."${deps."num_integer"."0.1.35"."num_traits"}" deps)
]);
};
- features_.num_integer."0.1.35" = deps: f: updateFeatures f (rec {
+ features_.num_integer."0.1.35" = deps: f: updateFeatures f ({
num_integer."0.1.35".default = (f.num_integer."0.1.35".default or true);
num_traits."${deps.num_integer."0.1.35".num_traits}".default = true;
}) [
@@ -2318,7 +2318,7 @@ rec {
(crates."num_traits"."${deps."num_iter"."0.1.34"."num_traits"}" deps)
]);
};
- features_.num_iter."0.1.34" = deps: f: updateFeatures f (rec {
+ features_.num_iter."0.1.34" = deps: f: updateFeatures f ({
num_integer."${deps.num_iter."0.1.34".num_integer}".default = true;
num_iter."0.1.34".default = (f.num_iter."0.1.34".default or true);
num_traits."${deps.num_iter."0.1.34".num_traits}".default = true;
@@ -2338,7 +2338,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw";
};
- features_.num_traits."0.1.40" = deps: f: updateFeatures f (rec {
+ features_.num_traits."0.1.40" = deps: f: updateFeatures f ({
num_traits."0.1.40".default = (f.num_traits."0.1.40".default or true);
}) [];
@@ -2356,7 +2356,7 @@ rec {
(crates."libc"."${deps."num_cpus"."1.8.0"."libc"}" deps)
]);
};
- features_.num_cpus."1.8.0" = deps: f: updateFeatures f (rec {
+ features_.num_cpus."1.8.0" = deps: f: updateFeatures f ({
libc."${deps.num_cpus."1.8.0".libc}".default = true;
num_cpus."1.8.0".default = (f.num_cpus."1.8.0".default or true);
}) [
@@ -2417,7 +2417,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "1a89fznx26vvaxyrxdvgf6iwai5xvs6xjvpjin68fgvrslv6n15a";
};
- features_.openssl_probe."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.openssl_probe."0.1.2" = deps: f: updateFeatures f ({
openssl_probe."0.1.2".default = (f.openssl_probe."0.1.2".default or true);
}) [];
@@ -2475,7 +2475,7 @@ rec {
(crates."stable_deref_trait"."${deps."owning_ref"."0.4.0"."stable_deref_trait"}" deps)
]);
};
- features_.owning_ref."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.owning_ref."0.4.0" = deps: f: updateFeatures f ({
owning_ref."0.4.0".default = (f.owning_ref."0.4.0".default or true);
stable_deref_trait."${deps.owning_ref."0.4.0".stable_deref_trait}".default = true;
}) [
@@ -2609,7 +2609,7 @@ rec {
sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i";
libPath = "lib.rs";
};
- features_.percent_encoding."1.0.1" = deps: f: updateFeatures f (rec {
+ features_.percent_encoding."1.0.1" = deps: f: updateFeatures f ({
percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true);
}) [];
@@ -2661,7 +2661,7 @@ rec {
(crates."phf_shared"."${deps."phf_codegen"."0.7.21"."phf_shared"}" deps)
]);
};
- features_.phf_codegen."0.7.21" = deps: f: updateFeatures f (rec {
+ features_.phf_codegen."0.7.21" = deps: f: updateFeatures f ({
phf_codegen."0.7.21".default = (f.phf_codegen."0.7.21".default or true);
phf_generator."${deps.phf_codegen."0.7.21".phf_generator}".default = true;
phf_shared."${deps.phf_codegen."0.7.21".phf_shared}".default = true;
@@ -2685,7 +2685,7 @@ rec {
(crates."rand"."${deps."phf_generator"."0.7.21"."rand"}" deps)
]);
};
- features_.phf_generator."0.7.21" = deps: f: updateFeatures f (rec {
+ features_.phf_generator."0.7.21" = deps: f: updateFeatures f ({
phf_generator."0.7.21".default = (f.phf_generator."0.7.21".default or true);
phf_shared."${deps.phf_generator."0.7.21".phf_shared}".default = true;
rand."${deps.phf_generator."0.7.21".rand}".default = true;
@@ -2711,7 +2711,7 @@ rec {
++ (if features.phf_shared."0.7.21".unicase or false then [ (crates.unicase."${deps."phf_shared"."0.7.21".unicase}" deps) ] else []));
features = mkFeatures (features."phf_shared"."0.7.21" or {});
};
- features_.phf_shared."0.7.21" = deps: f: updateFeatures f (rec {
+ features_.phf_shared."0.7.21" = deps: f: updateFeatures f ({
phf_shared."0.7.21".default = (f.phf_shared."0.7.21".default or true);
siphasher."${deps.phf_shared."0.7.21".siphasher}".default = true;
unicase."${deps.phf_shared."0.7.21".unicase}".default = true;
@@ -2731,7 +2731,7 @@ rec {
authors = [ "Alex Crichton " ];
sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146";
};
- features_.pkg_config."0.3.9" = deps: f: updateFeatures f (rec {
+ features_.pkg_config."0.3.9" = deps: f: updateFeatures f ({
pkg_config."0.3.9".default = (f.pkg_config."0.3.9".default or true);
}) [];
@@ -2746,7 +2746,7 @@ rec {
authors = [ "David Tolnay " ];
sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg";
};
- features_.quote."0.3.15" = deps: f: updateFeatures f (rec {
+ features_.quote."0.3.15" = deps: f: updateFeatures f ({
quote."0.3.15".default = (f.quote."0.3.15".default or true);
}) [];
@@ -3036,7 +3036,7 @@ rec {
(crates."rustc_version"."${deps."rand_chacha"."0.1.0"."rustc_version"}" deps)
]);
};
- features_.rand_chacha."0.1.0" = deps: f: updateFeatures f (rec {
+ features_.rand_chacha."0.1.0" = deps: f: updateFeatures f ({
rand_chacha."0.1.0".default = (f.rand_chacha."0.1.0".default or true);
rand_core."${deps.rand_chacha."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_chacha."0.1.0".rand_core}".default or false);
rustc_version."${deps.rand_chacha."0.1.0".rustc_version}".default = true;
@@ -3131,7 +3131,7 @@ rec {
(crates."rand_core"."${deps."rand_hc"."0.1.0"."rand_core"}" deps)
]);
};
- features_.rand_hc."0.1.0" = deps: f: updateFeatures f (rec {
+ features_.rand_hc."0.1.0" = deps: f: updateFeatures f ({
rand_core."${deps.rand_hc."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_hc."0.1.0".rand_core}".default or false);
rand_hc."0.1.0".default = (f.rand_hc."0.1.0".default or true);
}) [
@@ -3259,7 +3259,7 @@ rec {
sha256 = "0kipd9qslzin4fgj4jrxv6yz5l3l71gnbd7fq1jhk2j7f2sq33j4";
libName = "syscall";
};
- features_.redox_syscall."0.1.31" = deps: f: updateFeatures f (rec {
+ features_.redox_syscall."0.1.31" = deps: f: updateFeatures f ({
redox_syscall."0.1.31".default = (f.redox_syscall."0.1.31".default or true);
}) [];
@@ -3278,7 +3278,7 @@ rec {
(crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps)
]);
};
- features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.redox_termios."0.1.1" = deps: f: updateFeatures f ({
redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true;
redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true);
}) [
@@ -3336,7 +3336,7 @@ rec {
authors = [ "The Rust Project Developers" ];
sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m";
};
- features_.regex_syntax."0.3.9" = deps: f: updateFeatures f (rec {
+ features_.regex_syntax."0.3.9" = deps: f: updateFeatures f ({
regex_syntax."0.3.9".default = (f.regex_syntax."0.3.9".default or true);
}) [];
@@ -3354,7 +3354,7 @@ rec {
(crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps)
]) else []);
};
- features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f (rec {
+ features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f ({
remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true);
winapi = fold recursiveUpdate {} [
{ "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; }
@@ -3479,7 +3479,7 @@ rec {
(crates."semver"."${deps."rustc_version"."0.2.3"."semver"}" deps)
]);
};
- features_.rustc_version."0.2.3" = deps: f: updateFeatures f (rec {
+ features_.rustc_version."0.2.3" = deps: f: updateFeatures f ({
rustc_version."0.2.3".default = (f.rustc_version."0.2.3".default or true);
semver."${deps.rustc_version."0.2.3".semver}".default = true;
}) [
@@ -3523,7 +3523,7 @@ rec {
(crates."winapi"."${deps."schannel"."0.1.14"."winapi"}" deps)
]);
};
- features_.schannel."0.1.14" = deps: f: updateFeatures f (rec {
+ features_.schannel."0.1.14" = deps: f: updateFeatures f ({
lazy_static."${deps.schannel."0.1.14".lazy_static}".default = true;
schannel."0.1.14".default = (f.schannel."0.1.14".default or true);
winapi = fold recursiveUpdate {} [
@@ -3706,7 +3706,7 @@ rec {
authors = [ "Steve Klabnik " ];
sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h";
};
- features_.semver_parser."0.7.0" = deps: f: updateFeatures f (rec {
+ features_.semver_parser."0.7.0" = deps: f: updateFeatures f ({
semver_parser."0.7.0".default = (f.semver_parser."0.7.0".default or true);
}) [];
@@ -3798,7 +3798,7 @@ rec {
(crates."url"."${deps."serde_urlencoded"."0.5.1"."url"}" deps)
]);
};
- features_.serde_urlencoded."0.5.1" = deps: f: updateFeatures f (rec {
+ features_.serde_urlencoded."0.5.1" = deps: f: updateFeatures f ({
dtoa."${deps.serde_urlencoded."0.5.1".dtoa}".default = true;
itoa."${deps.serde_urlencoded."0.5.1".itoa}".default = true;
serde."${deps.serde_urlencoded."0.5.1".serde}".default = true;
@@ -3824,7 +3824,7 @@ rec {
dependencies = mapFeatures features ([
]);
};
- features_.siphasher."0.2.2" = deps: f: updateFeatures f (rec {
+ features_.siphasher."0.2.2" = deps: f: updateFeatures f ({
siphasher."0.2.2".default = (f.siphasher."0.2.2".default or true);
}) [];
@@ -3839,7 +3839,7 @@ rec {
authors = [ "Carl Lerche " ];
sha256 = "1qy2vkgwqgj5z4ygdkh040n9yh1vz80v5flxb1xrvw3i4wxs7yx0";
};
- features_.slab."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.slab."0.4.0" = deps: f: updateFeatures f ({
slab."0.4.0".default = (f.slab."0.4.0".default or true);
}) [];
@@ -3884,7 +3884,7 @@ rec {
(crates."slog_term"."${deps."slog_envlogger"."0.5.0"."slog_term"}" deps)
]);
};
- features_.slog_envlogger."0.5.0" = deps: f: updateFeatures f (rec {
+ features_.slog_envlogger."0.5.0" = deps: f: updateFeatures f ({
log."${deps.slog_envlogger."0.5.0".log}".default = true;
regex."${deps.slog_envlogger."0.5.0".regex}".default = true;
slog."${deps.slog_envlogger."0.5.0".slog}".default = true;
@@ -3915,7 +3915,7 @@ rec {
(crates."thread_local"."${deps."slog_extra"."0.1.2"."thread_local"}" deps)
]);
};
- features_.slog_extra."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.slog_extra."0.1.2" = deps: f: updateFeatures f ({
slog."${deps.slog_extra."0.1.2".slog}".default = true;
slog_extra."0.1.2".default = (f.slog_extra."0.1.2".default or true);
thread_local."${deps.slog_extra."0.1.2".thread_local}".default = true;
@@ -3943,7 +3943,7 @@ rec {
(crates."slog_term"."${deps."slog_stdlog"."1.1.0"."slog_term"}" deps)
]);
};
- features_.slog_stdlog."1.1.0" = deps: f: updateFeatures f (rec {
+ features_.slog_stdlog."1.1.0" = deps: f: updateFeatures f ({
crossbeam."${deps.slog_stdlog."1.1.0".crossbeam}".default = true;
lazy_static."${deps.slog_stdlog."1.1.0".lazy_static}".default = true;
log."${deps.slog_stdlog."1.1.0".log}".default = true;
@@ -3975,7 +3975,7 @@ rec {
(crates."thread_local"."${deps."slog_stream"."1.2.1"."thread_local"}" deps)
]);
};
- features_.slog_stream."1.2.1" = deps: f: updateFeatures f (rec {
+ features_.slog_stream."1.2.1" = deps: f: updateFeatures f ({
slog."${deps.slog_stream."1.2.1".slog}".default = true;
slog_extra."${deps.slog_stream."1.2.1".slog_extra}".default = true;
slog_stream."1.2.1".default = (f.slog_stream."1.2.1".default or true);
@@ -4005,7 +4005,7 @@ rec {
(crates."thread_local"."${deps."slog_term"."1.5.0"."thread_local"}" deps)
]);
};
- features_.slog_term."1.5.0" = deps: f: updateFeatures f (rec {
+ features_.slog_term."1.5.0" = deps: f: updateFeatures f ({
chrono."${deps.slog_term."1.5.0".chrono}".default = true;
isatty."${deps.slog_term."1.5.0".isatty}".default = true;
slog."${deps.slog_term."1.5.0".slog}".default = true;
@@ -4082,7 +4082,7 @@ rec {
authors = [ "Carl Lerche " ];
sha256 = "1120qvf02aydqj0k3kpr8d7zybq0y5arnmgmfsdw75r8qwz75wc6";
};
- features_.string."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.string."0.1.2" = deps: f: updateFeatures f ({
string."0.1.2".default = (f.string."0.1.2".default or true);
}) [];
@@ -4097,7 +4097,7 @@ rec {
authors = [ "Danny Guo " ];
sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd";
};
- features_.strsim."0.6.0" = deps: f: updateFeatures f (rec {
+ features_.strsim."0.6.0" = deps: f: updateFeatures f ({
strsim."0.6.0".default = (f.strsim."0.6.0".default or true);
}) [];
@@ -4165,7 +4165,7 @@ rec {
(crates."unicode_xid"."${deps."synom"."0.11.3"."unicode_xid"}" deps)
]);
};
- features_.synom."0.11.3" = deps: f: updateFeatures f (rec {
+ features_.synom."0.11.3" = deps: f: updateFeatures f ({
synom."0.11.3".default = (f.synom."0.11.3".default or true);
unicode_xid."${deps.synom."0.11.3".unicode_xid}".default = true;
}) [
@@ -4233,7 +4233,7 @@ rec {
(crates."winapi"."${deps."tempfile"."3.0.5"."winapi"}" deps)
]) else []);
};
- features_.tempfile."3.0.5" = deps: f: updateFeatures f (rec {
+ features_.tempfile."3.0.5" = deps: f: updateFeatures f ({
cfg_if."${deps.tempfile."3.0.5".cfg_if}".default = true;
libc."${deps.tempfile."3.0.5".libc}".default = true;
rand."${deps.tempfile."3.0.5".rand}".default = true;
@@ -4273,7 +4273,7 @@ rec {
(crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps)
]) else []);
};
- features_.termion."1.5.1" = deps: f: updateFeatures f (rec {
+ features_.termion."1.5.1" = deps: f: updateFeatures f ({
libc."${deps.termion."1.5.1".libc}".default = true;
redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true;
redox_termios."${deps.termion."1.5.1".redox_termios}".default = true;
@@ -4298,7 +4298,7 @@ rec {
(crates."unicode_width"."${deps."textwrap"."0.9.0"."unicode_width"}" deps)
]);
};
- features_.textwrap."0.9.0" = deps: f: updateFeatures f (rec {
+ features_.textwrap."0.9.0" = deps: f: updateFeatures f ({
textwrap."0.9.0".default = (f.textwrap."0.9.0".default or true);
unicode_width."${deps.textwrap."0.9.0".unicode_width}".default = true;
}) [
@@ -4320,7 +4320,7 @@ rec {
(crates."libc"."${deps."thread_id"."2.0.0"."libc"}" deps)
]);
};
- features_.thread_id."2.0.0" = deps: f: updateFeatures f (rec {
+ features_.thread_id."2.0.0" = deps: f: updateFeatures f ({
kernel32_sys."${deps.thread_id."2.0.0".kernel32_sys}".default = true;
libc."${deps.thread_id."2.0.0".libc}".default = true;
thread_id."2.0.0".default = (f.thread_id."2.0.0".default or true);
@@ -4343,7 +4343,7 @@ rec {
(crates."thread_id"."${deps."thread_local"."0.2.7"."thread_id"}" deps)
]);
};
- features_.thread_local."0.2.7" = deps: f: updateFeatures f (rec {
+ features_.thread_local."0.2.7" = deps: f: updateFeatures f ({
thread_id."${deps.thread_local."0.2.7".thread_id}".default = true;
thread_local."0.2.7".default = (f.thread_local."0.2.7".default or true);
}) [
@@ -4365,7 +4365,7 @@ rec {
(crates."unreachable"."${deps."thread_local"."0.3.4"."unreachable"}" deps)
]);
};
- features_.thread_local."0.3.4" = deps: f: updateFeatures f (rec {
+ features_.thread_local."0.3.4" = deps: f: updateFeatures f ({
lazy_static."${deps.thread_local."0.3.4".lazy_static}".default = true;
thread_local."0.3.4".default = (f.thread_local."0.3.4".default or true);
unreachable."${deps.thread_local."0.3.4".unreachable}".default = true;
@@ -4395,7 +4395,7 @@ rec {
(crates."winapi"."${deps."time"."0.1.38"."winapi"}" deps)
]) else []);
};
- features_.time."0.1.38" = deps: f: updateFeatures f (rec {
+ features_.time."0.1.38" = deps: f: updateFeatures f ({
kernel32_sys."${deps.time."0.1.38".kernel32_sys}".default = true;
libc."${deps.time."0.1.38".libc}".default = true;
redox_syscall."${deps.time."0.1.38".redox_syscall}".default = true;
@@ -4431,7 +4431,7 @@ rec {
(crates."tokio_udp"."${deps."tokio"."0.1.7"."tokio_udp"}" deps)
]);
};
- features_.tokio."0.1.7" = deps: f: updateFeatures f (rec {
+ features_.tokio."0.1.7" = deps: f: updateFeatures f ({
futures."${deps.tokio."0.1.7".futures}".default = true;
mio."${deps.tokio."0.1.7".mio}".default = true;
tokio."0.1.7".default = (f.tokio."0.1.7".default or true);
@@ -4472,7 +4472,7 @@ rec {
(crates."tokio_io"."${deps."tokio_codec"."0.1.1"."tokio_io"}" deps)
]);
};
- features_.tokio_codec."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.tokio_codec."0.1.1" = deps: f: updateFeatures f ({
bytes."${deps.tokio_codec."0.1.1".bytes}".default = true;
futures."${deps.tokio_codec."0.1.1".futures}".default = true;
tokio_codec."0.1.1".default = (f.tokio_codec."0.1.1".default or true);
@@ -4497,7 +4497,7 @@ rec {
(crates."futures"."${deps."tokio_executor"."0.1.5"."futures"}" deps)
]);
};
- features_.tokio_executor."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.tokio_executor."0.1.5" = deps: f: updateFeatures f ({
futures."${deps.tokio_executor."0.1.5".futures}".default = true;
tokio_executor."0.1.5".default = (f.tokio_executor."0.1.5".default or true);
}) [
@@ -4520,7 +4520,7 @@ rec {
(crates."tokio_threadpool"."${deps."tokio_fs"."0.1.4"."tokio_threadpool"}" deps)
]);
};
- features_.tokio_fs."0.1.4" = deps: f: updateFeatures f (rec {
+ features_.tokio_fs."0.1.4" = deps: f: updateFeatures f ({
futures."${deps.tokio_fs."0.1.4".futures}".default = true;
tokio_fs."0.1.4".default = (f.tokio_fs."0.1.4".default or true);
tokio_io."${deps.tokio_fs."0.1.4".tokio_io}".default = true;
@@ -4547,7 +4547,7 @@ rec {
(crates."log"."${deps."tokio_io"."0.1.10"."log"}" deps)
]);
};
- features_.tokio_io."0.1.10" = deps: f: updateFeatures f (rec {
+ features_.tokio_io."0.1.10" = deps: f: updateFeatures f ({
bytes."${deps.tokio_io."0.1.10".bytes}".default = true;
futures."${deps.tokio_io."0.1.10".futures}".default = true;
log."${deps.tokio_io."0.1.10".log}".default = true;
@@ -4581,7 +4581,7 @@ rec {
(crates."tokio_io"."${deps."tokio_reactor"."0.1.7"."tokio_io"}" deps)
]);
};
- features_.tokio_reactor."0.1.7" = deps: f: updateFeatures f (rec {
+ features_.tokio_reactor."0.1.7" = deps: f: updateFeatures f ({
crossbeam_utils."${deps.tokio_reactor."0.1.7".crossbeam_utils}".default = true;
futures."${deps.tokio_reactor."0.1.7".futures}".default = true;
lazy_static."${deps.tokio_reactor."0.1.7".lazy_static}".default = true;
@@ -4625,7 +4625,7 @@ rec {
(crates."tokio_reactor"."${deps."tokio_tcp"."0.1.2"."tokio_reactor"}" deps)
]);
};
- features_.tokio_tcp."0.1.2" = deps: f: updateFeatures f (rec {
+ features_.tokio_tcp."0.1.2" = deps: f: updateFeatures f ({
bytes."${deps.tokio_tcp."0.1.2".bytes}".default = true;
futures."${deps.tokio_tcp."0.1.2".futures}".default = true;
iovec."${deps.tokio_tcp."0.1.2".iovec}".default = true;
@@ -4662,7 +4662,7 @@ rec {
(crates."tokio_executor"."${deps."tokio_threadpool"."0.1.9"."tokio_executor"}" deps)
]);
};
- features_.tokio_threadpool."0.1.9" = deps: f: updateFeatures f (rec {
+ features_.tokio_threadpool."0.1.9" = deps: f: updateFeatures f ({
crossbeam_deque."${deps.tokio_threadpool."0.1.9".crossbeam_deque}".default = true;
crossbeam_utils."${deps.tokio_threadpool."0.1.9".crossbeam_utils}".default = true;
futures."${deps.tokio_threadpool."0.1.9".futures}".default = true;
@@ -4696,7 +4696,7 @@ rec {
(crates."tokio_executor"."${deps."tokio_timer"."0.2.5"."tokio_executor"}" deps)
]);
};
- features_.tokio_timer."0.2.5" = deps: f: updateFeatures f (rec {
+ features_.tokio_timer."0.2.5" = deps: f: updateFeatures f ({
futures."${deps.tokio_timer."0.2.5".futures}".default = true;
tokio_executor."${deps.tokio_timer."0.2.5".tokio_executor}".default = true;
tokio_timer."0.2.5".default = (f.tokio_timer."0.2.5".default or true);
@@ -4725,7 +4725,7 @@ rec {
(crates."tokio_reactor"."${deps."tokio_udp"."0.1.3"."tokio_reactor"}" deps)
]);
};
- features_.tokio_udp."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.tokio_udp."0.1.3" = deps: f: updateFeatures f ({
bytes."${deps.tokio_udp."0.1.3".bytes}".default = true;
futures."${deps.tokio_udp."0.1.3".futures}".default = true;
log."${deps.tokio_udp."0.1.3".log}".default = true;
@@ -4755,7 +4755,7 @@ rec {
authors = [ "Sean McArthur " ];
sha256 = "1k8xc0jpbrmzp0fwghdh6pwzjb9xx2p8yy0xxnnb8065smc5fsrv";
};
- features_.try_lock."0.2.2" = deps: f: updateFeatures f (rec {
+ features_.try_lock."0.2.2" = deps: f: updateFeatures f ({
try_lock."0.2.2".default = (f.try_lock."0.2.2".default or true);
}) [];
@@ -4812,7 +4812,7 @@ rec {
]);
features = mkFeatures (features."unicase"."2.1.0" or {});
};
- features_.unicase."2.1.0" = deps: f: updateFeatures f (rec {
+ features_.unicase."2.1.0" = deps: f: updateFeatures f ({
unicase."2.1.0".default = (f.unicase."2.1.0".default or true);
version_check."${deps.unicase."2.1.0".version_check}".default = true;
}) [
@@ -4867,7 +4867,7 @@ rec {
authors = [ "kwantam " ];
sha256 = "0hg29g86fca7b65mwk4sm5s838js6bqrl0gabadbazvbsgjam0j5";
};
- features_.unicode_normalization."0.1.5" = deps: f: updateFeatures f (rec {
+ features_.unicode_normalization."0.1.5" = deps: f: updateFeatures f ({
unicode_normalization."0.1.5".default = (f.unicode_normalization."0.1.5".default or true);
}) [];
@@ -4883,7 +4883,7 @@ rec {
sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl";
features = mkFeatures (features."unicode_width"."0.1.4" or {});
};
- features_.unicode_width."0.1.4" = deps: f: updateFeatures f (rec {
+ features_.unicode_width."0.1.4" = deps: f: updateFeatures f ({
unicode_width."0.1.4".default = (f.unicode_width."0.1.4".default or true);
}) [];
@@ -4899,7 +4899,7 @@ rec {
sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v";
features = mkFeatures (features."unicode_xid"."0.0.4" or {});
};
- features_.unicode_xid."0.0.4" = deps: f: updateFeatures f (rec {
+ features_.unicode_xid."0.0.4" = deps: f: updateFeatures f ({
unicode_xid."0.0.4".default = (f.unicode_xid."0.0.4".default or true);
}) [];
@@ -4917,7 +4917,7 @@ rec {
(crates."void"."${deps."unreachable"."1.0.0"."void"}" deps)
]);
};
- features_.unreachable."1.0.0" = deps: f: updateFeatures f (rec {
+ features_.unreachable."1.0.0" = deps: f: updateFeatures f ({
unreachable."1.0.0".default = (f.unreachable."1.0.0".default or true);
void."${deps.unreachable."1.0.0".void}".default = (f.void."${deps.unreachable."1.0.0".void}".default or false);
}) [
@@ -4973,7 +4973,7 @@ rec {
authors = [ "Andrew Gallant " ];
sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp";
};
- features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f ({
utf8_ranges."0.1.3".default = (f.utf8_ranges."0.1.3".default or true);
}) [];
@@ -5040,7 +5040,7 @@ rec {
authors = [ "Jim McGrath " ];
sha256 = "1fl5j0ksnwrnsrf1b1a9lqbjgnajdipq0030vsbhx81mb7d9478a";
};
- features_.vcpkg."0.2.2" = deps: f: updateFeatures f (rec {
+ features_.vcpkg."0.2.2" = deps: f: updateFeatures f ({
vcpkg."0.2.2".default = (f.vcpkg."0.2.2".default or true);
}) [];
@@ -5083,7 +5083,7 @@ rec {
authors = [ "Sergio Benitez " ];
sha256 = "0z635wdclv9bvafj11fpgndn7y79ibpsnc364pm61i1m4wwg8msg";
};
- features_.version_check."0.1.3" = deps: f: updateFeatures f (rec {
+ features_.version_check."0.1.3" = deps: f: updateFeatures f ({
version_check."0.1.3".default = (f.version_check."0.1.3".default or true);
}) [];
@@ -5125,7 +5125,7 @@ rec {
(crates."try_lock"."${deps."want"."0.0.6"."try_lock"}" deps)
]);
};
- features_.want."0.0.6" = deps: f: updateFeatures f (rec {
+ features_.want."0.0.6" = deps: f: updateFeatures f ({
futures."${deps.want."0.0.6".futures}".default = true;
log."${deps.want."0.0.6".log}".default = true;
try_lock."${deps.want."0.0.6".try_lock}".default = true;
@@ -5147,7 +5147,7 @@ rec {
authors = [ "Peter Atashian " ];
sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
};
- features_.winapi."0.2.8" = deps: f: updateFeatures f (rec {
+ features_.winapi."0.2.8" = deps: f: updateFeatures f ({
winapi."0.2.8".default = (f.winapi."0.2.8".default or true);
}) [];
@@ -5170,7 +5170,7 @@ rec {
]) else []);
features = mkFeatures (features."winapi"."0.3.6" or {});
};
- features_.winapi."0.3.6" = deps: f: updateFeatures f (rec {
+ features_.winapi."0.3.6" = deps: f: updateFeatures f ({
winapi."0.3.6".default = (f.winapi."0.3.6".default or true);
winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true;
winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true;
@@ -5191,7 +5191,7 @@ rec {
sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
libName = "build";
};
- features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec {
+ features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({
winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true);
}) [];
@@ -5207,7 +5207,7 @@ rec {
sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
build = "build.rs";
};
- features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({
winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true);
}) [];
@@ -5223,7 +5223,7 @@ rec {
sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
build = "build.rs";
};
- features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+ features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({
winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true);
}) [];
@@ -5247,7 +5247,7 @@ rec {
(crates."winapi_build"."${deps."ws2_32_sys"."0.2.1"."winapi_build"}" deps)
]);
};
- features_.ws2_32_sys."0.2.1" = deps: f: updateFeatures f (rec {
+ features_.ws2_32_sys."0.2.1" = deps: f: updateFeatures f ({
winapi."${deps.ws2_32_sys."0.2.1".winapi}".default = true;
winapi_build."${deps.ws2_32_sys."0.2.1".winapi_build}".default = true;
ws2_32_sys."0.2.1".default = (f.ws2_32_sys."0.2.1".default or true);
diff --git a/pkgs/tools/package-management/cargo-graph/default.nix b/pkgs/tools/package-management/cargo-graph/default.nix
index 5e635f0fc26f..2fe89ccfa986 100644
--- a/pkgs/tools/package-management/cargo-graph/default.nix
+++ b/pkgs/tools/package-management/cargo-graph/default.nix
@@ -1,6 +1,6 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
- name = "cargo-graph-${version}";
+ pname = "cargo-graph";
version = "0.2.0-d895af1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/cargo-license/default.nix b/pkgs/tools/package-management/cargo-license/default.nix
index 619fbb115976..c8a43bda64a4 100644
--- a/pkgs/tools/package-management/cargo-license/default.nix
+++ b/pkgs/tools/package-management/cargo-license/default.nix
@@ -1,6 +1,6 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
- name = "cargo-license-${version}";
+ pname = "cargo-license";
version = "0.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index 2521a2ceebf6..0251e6acf81a 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -1,13 +1,13 @@
{ stdenv, rustPlatform, fetchFromGitHub, Security }:
rustPlatform.buildRustPackage rec {
- name = "cargo-release-${version}";
+ pname = "cargo-release";
version = "0.10.5";
src = fetchFromGitHub {
owner = "sunng87";
repo = "cargo-release";
- rev = "${version}";
+ rev = version;
sha256 = "14l5znr1nl69v2v3mdrlas85krq9jn280ssflmd0dz7i4fxiaflc";
};
diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix
index 8b654188c51a..8c3035ae79aa 100644
--- a/pkgs/tools/package-management/cargo-tree/default.nix
+++ b/pkgs/tools/package-management/cargo-tree/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }:
rustPlatform.buildRustPackage rec {
- name = "cargo-tree-${version}";
+ pname = "cargo-tree";
version = "0.26.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/cargo-update/cargo-update.nix b/pkgs/tools/package-management/cargo-update/cargo-update.nix
index 1bd8aadf4982..9b8cf24605a5 100644
--- a/pkgs/tools/package-management/cargo-update/cargo-update.nix
+++ b/pkgs/tools/package-management/cargo-update/cargo-update.nix
@@ -520,7 +520,7 @@ rec {
dependencies = mapFeatures features ([ winapi_0_2_8 ]);
buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
};
- advapi32_sys_0_2_0_features = f: updateFeatures f (rec {
+ advapi32_sys_0_2_0_features = f: updateFeatures f ({
advapi32_sys_0_2_0.default = (f.advapi32_sys_0_2_0.default or true);
winapi_0_2_8.default = true;
winapi_build_0_1_1.default = true;
@@ -528,14 +528,14 @@ rec {
aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ {
dependencies = mapFeatures features ([ memchr_2_0_1 ]);
};
- aho_corasick_0_6_4_features = f: updateFeatures f (rec {
+ aho_corasick_0_6_4_features = f: updateFeatures f ({
aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true);
memchr_2_0_1.default = true;
}) [ memchr_2_0_1_features ];
ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ {
dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
};
- ansi_term_0_11_0_features = f: updateFeatures f (rec {
+ ansi_term_0_11_0_features = f: updateFeatures f ({
ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true);
winapi_0_3_4.consoleapi = true;
winapi_0_3_4.default = true;
@@ -543,7 +543,7 @@ rec {
winapi_0_3_4.processenv = true;
}) [ winapi_0_3_4_features ];
array_tool_1_0_3 = { features?(array_tool_1_0_3_features {}) }: array_tool_1_0_3_ {};
- array_tool_1_0_3_features = f: updateFeatures f (rec {
+ array_tool_1_0_3_features = f: updateFeatures f ({
array_tool_1_0_3.default = (f.array_tool_1_0_3.default or true);
}) [];
atty_0_2_10 = { features?(atty_0_2_10_features {}) }: atty_0_2_10_ {
@@ -551,7 +551,7 @@ rec {
++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else [])
++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
};
- atty_0_2_10_features = f: updateFeatures f (rec {
+ atty_0_2_10_features = f: updateFeatures f ({
atty_0_2_10.default = (f.atty_0_2_10.default or true);
libc_0_2_40.default = (f.libc_0_2_40.default or false);
termion_1_5_1.default = true;
@@ -575,14 +575,14 @@ rec {
bitflags_1_0_3 = { features?(bitflags_1_0_3_features {}) }: bitflags_1_0_3_ {
features = mkFeatures (features.bitflags_1_0_3 or {});
};
- bitflags_1_0_3_features = f: updateFeatures f (rec {
+ bitflags_1_0_3_features = f: updateFeatures f ({
bitflags_1_0_3.default = (f.bitflags_1_0_3.default or true);
}) [];
cargo_update_1_5_2 = { features?(cargo_update_1_5_2_features {}) }: cargo_update_1_5_2_ {
dependencies = mapFeatures features ([ array_tool_1_0_3 clap_2_31_2 git2_0_6_11 json_0_11_13 lazy_static_1_0_0 lazysort_0_2_0 regex_0_2_11 semver_0_9_0 serde_1_0_55 serde_derive_1_0_55 tabwriter_1_0_4 toml_0_4_6 url_1_7_0 ]);
buildDependencies = mapFeatures features ([ embed_resource_1_1_4 ]);
};
- cargo_update_1_5_2_features = f: updateFeatures f (rec {
+ cargo_update_1_5_2_features = f: updateFeatures f ({
array_tool_1_0_3.default = true;
cargo_update_1_5_2.default = (f.cargo_update_1_5_2.default or true);
clap_2_31_2.default = true;
@@ -677,7 +677,7 @@ rec {
cmake_0_1_31 = { features?(cmake_0_1_31_features {}) }: cmake_0_1_31_ {
dependencies = mapFeatures features ([ cc_1_0_15 ]);
};
- cmake_0_1_31_features = f: updateFeatures f (rec {
+ cmake_0_1_31_features = f: updateFeatures f ({
cc_1_0_15.default = true;
cmake_0_1_31.default = (f.cmake_0_1_31.default or true);
}) [ cc_1_0_15_features ];
@@ -688,7 +688,7 @@ rec {
++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]);
};
- curl_sys_0_4_5_features = f: updateFeatures f (rec {
+ curl_sys_0_4_5_features = f: updateFeatures f ({
cc_1_0_15.default = true;
curl_sys_0_4_5.default = (f.curl_sys_0_4_5.default or true);
libc_0_2_40.default = true;
@@ -702,20 +702,20 @@ rec {
embed_resource_1_1_4 = { features?(embed_resource_1_1_4_features {}) }: embed_resource_1_1_4_ {
dependencies = (if kernel == "windows" && abi == "msvc" then mapFeatures features ([ winreg_0_4_0 ]) else []);
};
- embed_resource_1_1_4_features = f: updateFeatures f (rec {
+ embed_resource_1_1_4_features = f: updateFeatures f ({
embed_resource_1_1_4.default = (f.embed_resource_1_1_4.default or true);
winreg_0_4_0.default = (f.winreg_0_4_0.default or false);
}) [ winreg_0_4_0_features ];
fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ {
dependencies = mapFeatures features ([ bitflags_1_0_3 fuchsia_zircon_sys_0_3_3 ]);
};
- fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec {
+ fuchsia_zircon_0_3_3_features = f: updateFeatures f ({
bitflags_1_0_3.default = true;
fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true);
fuchsia_zircon_sys_0_3_3.default = true;
}) [ bitflags_1_0_3_features fuchsia_zircon_sys_0_3_3_features ];
fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {};
- fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec {
+ fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f ({
fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true);
}) [];
git2_0_6_11 = { features?(git2_0_6_11_features {}) }: git2_0_6_11_ {
@@ -769,21 +769,21 @@ rec {
idna_0_1_4 = { features?(idna_0_1_4_features {}) }: idna_0_1_4_ {
dependencies = mapFeatures features ([ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_7 ]);
};
- idna_0_1_4_features = f: updateFeatures f (rec {
+ idna_0_1_4_features = f: updateFeatures f ({
idna_0_1_4.default = (f.idna_0_1_4.default or true);
matches_0_1_6.default = true;
unicode_bidi_0_3_4.default = true;
unicode_normalization_0_1_7.default = true;
}) [ matches_0_1_6_features unicode_bidi_0_3_4_features unicode_normalization_0_1_7_features ];
json_0_11_13 = { features?(json_0_11_13_features {}) }: json_0_11_13_ {};
- json_0_11_13_features = f: updateFeatures f (rec {
+ json_0_11_13_features = f: updateFeatures f ({
json_0_11_13.default = (f.json_0_11_13.default or true);
}) [];
kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ {
dependencies = mapFeatures features ([ winapi_0_2_8 ]);
buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
};
- kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
+ kernel32_sys_0_2_2_features = f: updateFeatures f ({
kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
winapi_0_2_8.default = true;
winapi_build_0_1_1.default = true;
@@ -811,7 +811,7 @@ rec {
dependencies = mapFeatures features ([ rand_0_3_22 ]);
features = mkFeatures (features.lazysort_0_2_0 or {});
};
- lazysort_0_2_0_features = f: updateFeatures f (rec {
+ lazysort_0_2_0_features = f: updateFeatures f ({
lazysort_0_2_0.default = (f.lazysort_0_2_0.default or true);
rand_0_3_22.default = true;
}) [ rand_0_3_22_features ];
@@ -863,7 +863,7 @@ rec {
++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ openssl_sys_0_9_30 ]) else []);
buildDependencies = mapFeatures features ([ cmake_0_1_31 pkg_config_0_3_11 ]);
};
- libssh2_sys_0_2_7_features = f: updateFeatures f (rec {
+ libssh2_sys_0_2_7_features = f: updateFeatures f ({
cmake_0_1_31.default = true;
libc_0_2_40.default = true;
libssh2_sys_0_2_7.default = (f.libssh2_sys_0_2_7.default or true);
@@ -876,14 +876,14 @@ rec {
++ (if abi == "msvc" then mapFeatures features ([]) else []);
buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]);
};
- libz_sys_1_0_18_features = f: updateFeatures f (rec {
+ libz_sys_1_0_18_features = f: updateFeatures f ({
cc_1_0_15.default = true;
libc_0_2_40.default = true;
libz_sys_1_0_18.default = (f.libz_sys_1_0_18.default or true);
pkg_config_0_3_11.default = true;
}) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ];
matches_0_1_6 = { features?(matches_0_1_6_features {}) }: matches_0_1_6_ {};
- matches_0_1_6_features = f: updateFeatures f (rec {
+ matches_0_1_6_features = f: updateFeatures f ({
matches_0_1_6.default = (f.matches_0_1_6.default or true);
}) [];
memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ {
@@ -910,7 +910,7 @@ rec {
(memchr_2_0_1.default or false);
}) [ libc_0_2_40_features ];
openssl_probe_0_1_2 = { features?(openssl_probe_0_1_2_features {}) }: openssl_probe_0_1_2_ {};
- openssl_probe_0_1_2_features = f: updateFeatures f (rec {
+ openssl_probe_0_1_2_features = f: updateFeatures f ({
openssl_probe_0_1_2.default = (f.openssl_probe_0_1_2.default or true);
}) [];
openssl_sys_0_9_30 = { features?(openssl_sys_0_9_30_features {}) }: openssl_sys_0_9_30_ {
@@ -918,18 +918,18 @@ rec {
++ (if abi == "msvc" then mapFeatures features ([]) else []);
buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]);
};
- openssl_sys_0_9_30_features = f: updateFeatures f (rec {
+ openssl_sys_0_9_30_features = f: updateFeatures f ({
cc_1_0_15.default = true;
libc_0_2_40.default = true;
openssl_sys_0_9_30.default = (f.openssl_sys_0_9_30.default or true);
pkg_config_0_3_11.default = true;
}) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ];
percent_encoding_1_0_1 = { features?(percent_encoding_1_0_1_features {}) }: percent_encoding_1_0_1_ {};
- percent_encoding_1_0_1_features = f: updateFeatures f (rec {
+ percent_encoding_1_0_1_features = f: updateFeatures f ({
percent_encoding_1_0_1.default = (f.percent_encoding_1_0_1.default or true);
}) [];
pkg_config_0_3_11 = { features?(pkg_config_0_3_11_features {}) }: pkg_config_0_3_11_ {};
- pkg_config_0_3_11_features = f: updateFeatures f (rec {
+ pkg_config_0_3_11_features = f: updateFeatures f ({
pkg_config_0_3_11.default = (f.pkg_config_0_3_11.default or true);
}) [];
proc_macro2_0_3_8 = { features?(proc_macro2_0_3_8_features {}) }: proc_macro2_0_3_8_ {
@@ -1007,13 +1007,13 @@ rec {
winapi_0_3_4.winnt = true;
}) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ];
redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {};
- redox_syscall_0_1_37_features = f: updateFeatures f (rec {
+ redox_syscall_0_1_37_features = f: updateFeatures f ({
redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true);
}) [];
redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ {
dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]);
};
- redox_termios_0_1_1_features = f: updateFeatures f (rec {
+ redox_termios_0_1_1_features = f: updateFeatures f ({
redox_syscall_0_1_37.default = true;
redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true);
}) [ redox_syscall_0_1_37_features ];
@@ -1036,7 +1036,7 @@ rec {
regex_syntax_0_5_6 = { features?(regex_syntax_0_5_6_features {}) }: regex_syntax_0_5_6_ {
dependencies = mapFeatures features ([ ucd_util_0_1_1 ]);
};
- regex_syntax_0_5_6_features = f: updateFeatures f (rec {
+ regex_syntax_0_5_6_features = f: updateFeatures f ({
regex_syntax_0_5_6.default = (f.regex_syntax_0_5_6.default or true);
ucd_util_0_1_1.default = true;
}) [ ucd_util_0_1_1_features ];
@@ -1055,7 +1055,7 @@ rec {
serde_1_0_55.default = true;
}) [ semver_parser_0_7_0_features serde_1_0_55_features ];
semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {};
- semver_parser_0_7_0_features = f: updateFeatures f (rec {
+ semver_parser_0_7_0_features = f: updateFeatures f ({
semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true);
}) [];
serde_1_0_55 = { features?(serde_1_0_55_features {}) }: serde_1_0_55_ {
@@ -1081,7 +1081,7 @@ rec {
dependencies = mapFeatures features ([ proc_macro2_0_3_8 quote_0_5_2 syn_0_13_10 ]);
features = mkFeatures (features.serde_derive_1_0_55 or {});
};
- serde_derive_1_0_55_features = f: updateFeatures f (rec {
+ serde_derive_1_0_55_features = f: updateFeatures f ({
proc_macro2_0_3_8.default = true;
quote_0_5_2.default = true;
serde_derive_1_0_55.default = (f.serde_derive_1_0_55.default or true);
@@ -1089,7 +1089,7 @@ rec {
syn_0_13_10.visit = true;
}) [ proc_macro2_0_3_8_features quote_0_5_2_features syn_0_13_10_features ];
strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {};
- strsim_0_7_0_features = f: updateFeatures f (rec {
+ strsim_0_7_0_features = f: updateFeatures f ({
strsim_0_7_0.default = (f.strsim_0_7_0.default or true);
}) [];
syn_0_13_10 = { features?(syn_0_13_10_features {}) }: syn_0_13_10_ {
@@ -1155,7 +1155,7 @@ rec {
dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else [])
++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []);
};
- termion_1_5_1_features = f: updateFeatures f (rec {
+ termion_1_5_1_features = f: updateFeatures f ({
libc_0_2_40.default = true;
redox_syscall_0_1_37.default = true;
redox_termios_0_1_1.default = true;
@@ -1164,14 +1164,14 @@ rec {
textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ {
dependencies = mapFeatures features ([ unicode_width_0_1_4 ]);
};
- textwrap_0_9_0_features = f: updateFeatures f (rec {
+ textwrap_0_9_0_features = f: updateFeatures f ({
textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true);
unicode_width_0_1_4.default = true;
}) [ unicode_width_0_1_4_features ];
thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ {
dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]);
};
- thread_local_0_3_5_features = f: updateFeatures f (rec {
+ thread_local_0_3_5_features = f: updateFeatures f ({
lazy_static_1_0_0.default = true;
thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true);
unreachable_1_0_0.default = true;
@@ -1179,12 +1179,12 @@ rec {
toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ {
dependencies = mapFeatures features ([ serde_1_0_55 ]);
};
- toml_0_4_6_features = f: updateFeatures f (rec {
+ toml_0_4_6_features = f: updateFeatures f ({
serde_1_0_55.default = true;
toml_0_4_6.default = (f.toml_0_4_6.default or true);
}) [ serde_1_0_55_features ];
ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {};
- ucd_util_0_1_1_features = f: updateFeatures f (rec {
+ ucd_util_0_1_1_features = f: updateFeatures f ({
ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true);
}) [];
unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ {
@@ -1208,25 +1208,25 @@ rec {
(unicode_bidi_0_3_4.with_serde or false);
}) [ matches_0_1_6_features ];
unicode_normalization_0_1_7 = { features?(unicode_normalization_0_1_7_features {}) }: unicode_normalization_0_1_7_ {};
- unicode_normalization_0_1_7_features = f: updateFeatures f (rec {
+ unicode_normalization_0_1_7_features = f: updateFeatures f ({
unicode_normalization_0_1_7.default = (f.unicode_normalization_0_1_7.default or true);
}) [];
unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
features = mkFeatures (features.unicode_width_0_1_4 or {});
};
- unicode_width_0_1_4_features = f: updateFeatures f (rec {
+ unicode_width_0_1_4_features = f: updateFeatures f ({
unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
}) [];
unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ {
features = mkFeatures (features.unicode_xid_0_1_0 or {});
};
- unicode_xid_0_1_0_features = f: updateFeatures f (rec {
+ unicode_xid_0_1_0_features = f: updateFeatures f ({
unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true);
}) [];
unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ {
dependencies = mapFeatures features ([ void_1_0_2 ]);
};
- unreachable_1_0_0_features = f: updateFeatures f (rec {
+ unreachable_1_0_0_features = f: updateFeatures f ({
unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true);
void_1_0_2.default = (f.void_1_0_2.default or false);
}) [ void_1_0_2_features ];
@@ -1249,11 +1249,11 @@ rec {
(url_1_7_0.heap_size or false);
}) [ idna_0_1_4_features matches_0_1_6_features percent_encoding_1_0_1_features ];
utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {};
- utf8_ranges_1_0_0_features = f: updateFeatures f (rec {
+ utf8_ranges_1_0_0_features = f: updateFeatures f ({
utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true);
}) [];
vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {};
- vcpkg_0_2_3_features = f: updateFeatures f (rec {
+ vcpkg_0_2_3_features = f: updateFeatures f ({
vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true);
}) [];
vec_map_0_8_1 = { features?(vec_map_0_8_1_features {}) }: vec_map_0_8_1_ {
@@ -1278,7 +1278,7 @@ rec {
(void_1_0_2.default or false);
}) [];
winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
- winapi_0_2_8_features = f: updateFeatures f (rec {
+ winapi_0_2_8_features = f: updateFeatures f ({
winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
}) [];
winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ {
@@ -1286,21 +1286,21 @@ rec {
++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []);
features = mkFeatures (features.winapi_0_3_4 or {});
};
- winapi_0_3_4_features = f: updateFeatures f (rec {
+ winapi_0_3_4_features = f: updateFeatures f ({
winapi_0_3_4.default = (f.winapi_0_3_4.default or true);
winapi_i686_pc_windows_gnu_0_4_0.default = true;
winapi_x86_64_pc_windows_gnu_0_4_0.default = true;
}) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ];
winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
- winapi_build_0_1_1_features = f: updateFeatures f (rec {
+ winapi_build_0_1_1_features = f: updateFeatures f ({
winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
}) [];
winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {};
- winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
+ winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({
winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true);
}) [];
winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {};
- winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
+ winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({
winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true);
}) [];
winreg_0_4_0 = { features?(winreg_0_4_0_features {}) }: winreg_0_4_0_ {
diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix
index e45906688ada..5354fbb5e5ed 100644
--- a/pkgs/tools/package-management/cde/default.nix
+++ b/pkgs/tools/package-management/cde/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "cde-${version}";
+ pname = "cde";
version = "0.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix
index 158db426c615..60c77db44d82 100644
--- a/pkgs/tools/package-management/clib/default.nix
+++ b/pkgs/tools/package-management/clib/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.8.1";
- name = "clib-${version}";
+ pname = "clib";
src = fetchFromGitHub {
rev = version;
diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix
index 0a0cae32dcf5..15a64ffd25e6 100644
--- a/pkgs/tools/package-management/createrepo_c/default.nix
+++ b/pkgs/tools/package-management/createrepo_c/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }:
stdenv.mkDerivation rec {
- name = "createrepo_c-${version}";
+ pname = "createrepo_c";
version = "0.11.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index 3299ab8b63b6..dd64241fd372 100644
--- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
+++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
@@ -1,23 +1,16 @@
-{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java, fetchpatch }:
+{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }:
stdenv.mkDerivation {
- name = "DisnixWebService-0.8";
+ name = "DisnixWebService-0.9";
src = fetchurl {
- url = https://github.com/svanderburg/DisnixWebService/files/1756703/DisnixWebService-0.8.tar.gz;
- sha256 = "05hmyz17rmqlph0i321kmhabnpw84kqz32lgc5cd4shxyzsal9hz";
+ url = https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.9/DisnixWebService-0.9.tar.gz;
+ sha256 = "1z7w44bf023c0aqchjfi4mla3qbhsh87mdzx7pqn0sy74cjfgqvl";
};
buildInputs = [ apacheAnt jdk ];
PREFIX = ''''${env.out}'';
AXIS2_LIB = "${axis2}/lib";
AXIS2_WEBAPP = "${axis2}/webapps/axis2";
DBUS_JAVA_LIB = "${dbus_java}/share/java";
- patches = [
- # Safe to remove once https://github.com/svanderburg/DisnixWebService/pull/1 is merged
- (fetchpatch {
- url = "https://github.com/mmahut/DisnixWebService/commit/cf07918b8c81b4ce01e0b489c1b5a3ef9c9a1cd6.patch";
- sha256 = "15zi1l69wzgwvvqx4492s7l444gfvc9vcm7ckgif4b6cvp837brn";
- })
- ];
prePatch = ''
sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \
-e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index a55fd33f8991..50e071be29c5 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintl, libiconv }:
stdenv.mkDerivation {
- name = "disnix-0.8";
+ name = "disnix-0.9";
src = fetchurl {
- url = https://github.com/svanderburg/disnix/files/1756701/disnix-0.8.tar.gz;
- sha256 = "02cmj1jqk5i90szjsn5csr7qb7n42v04rvl9syx0zi9sx9ldnb0w";
+ url = https://github.com/svanderburg/disnix/releases/download/disnix-0.9/disnix-0.9.tar.gz;
+ sha256 = "1kc4520zjc1z72mknylfvrsyda9rbmm5c9mw8w13zhdwg3zbna06";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 7a58ec04e64d..319716c0f3ea 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }:
stdenv.mkDerivation {
- name = "disnixos-0.7.1";
+ name = "disnixos-0.8";
src = fetchurl {
- url = https://github.com/svanderburg/disnixos/files/2281312/disnixos-0.7.1.tar.gz;
- sha256 = "00d7mcj77lwbj67vnh81bw6k6pg2asimky4zkq32mh8dslnhpnz6";
+ url = https://github.com/svanderburg/disnixos/releases/download/disnixos-0.8/disnixos-0.8.tar.gz;
+ sha256 = "186blirfx89i8hdp4a0djy4q9qr9wcl0ilwr66hlil0wxqj1sr91";
};
-
+
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ socat dysnomia disnix getopt ];
-
+
meta = {
description = "Provides complementary NixOS infrastructure deployment to Disnix";
license = stdenv.lib.licenses.lgpl21Plus;
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index 14c07df6ffa8..7b5d99bef9e7 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
-, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null
+, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null
, enableApacheWebApplication ? false
, enableAxis2WebService ? false
, enableEjabberdDump ? false
@@ -8,6 +8,7 @@
, enableSubversionRepository ? false
, enableTomcatWebApplication ? false
, enableMongoDatabase ? false
+, enableInfluxDatabase ? false
, catalinaBaseDir ? "/var/tomcat"
, jobTemplate ? "systemd"
, getopt
@@ -18,12 +19,13 @@ assert enablePostgreSQLDatabase -> postgresql != null;
assert enableSubversionRepository -> subversion != null;
assert enableEjabberdDump -> ejabberd != null;
assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null);
+assert enableInfluxDatabase -> influxdb != null;
stdenv.mkDerivation {
- name = "dysnomia-0.8";
+ name = "dysnomia-0.9";
src = fetchurl {
- url = https://github.com/svanderburg/dysnomia/files/1756700/dysnomia-0.8.tar.gz;
- sha256 = "0pc4zwmmlsz02a6a4srpwdwhqrfvn3wkn22sz3fg7lwxbdbd5k0z";
+ url = https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.9/dysnomia-0.9.tar.gz;
+ sha256 = "09pk2l3pss48kvm5wvskh842vakbzmjzxzfzyw1nkqnvni130ikl";
};
preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
@@ -37,6 +39,7 @@ stdenv.mkDerivation {
(if enableSubversionRepository then "--with-subversion" else "--without-subversion")
(if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat")
(if enableMongoDatabase then "--with-mongodb" else "--without-mongodb")
+ (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb")
"--with-job-template=${jobTemplate}"
];
@@ -46,7 +49,8 @@ stdenv.mkDerivation {
++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
++ stdenv.lib.optional enableSubversionRepository subversion
++ stdenv.lib.optional enableMongoDatabase mongodb
- ++ stdenv.lib.optional enableMongoDatabase mongodb-tools;
+ ++ stdenv.lib.optional enableMongoDatabase mongodb-tools
+ ++ stdenv.lib.optional enableInfluxDatabase influxdb;
meta = {
description = "Automated deployment of mutable components and services for Disnix";
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index f13256d33bfb..11672e6d456d 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }:
stdenv.mkDerivation rec {
- name = "dpkg-${version}";
+ pname = "dpkg";
version = "1.19.7";
src = fetchurl {
diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix
index 4c03fc35dea4..8e8d30e4fccf 100644
--- a/pkgs/tools/package-management/gx/default.nix
+++ b/pkgs/tools/package-management/gx/default.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "gx-${version}";
+ pname = "gx";
version = "0.14.1";
rev = "refs/tags/v${version}";
diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix
index 0ae0b8a19835..0a0793130d14 100644
--- a/pkgs/tools/package-management/gx/go/default.nix
+++ b/pkgs/tools/package-management/gx/go/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "gx-go-${version}";
+ pname = "gx-go";
version = "1.9.0";
rev = "refs/tags/v${version}";
diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix
index ffa9f427dc2f..e1ae6bc88b8e 100644
--- a/pkgs/tools/package-management/home-manager/default.nix
+++ b/pkgs/tools/package-management/home-manager/default.nix
@@ -5,14 +5,14 @@
stdenv.mkDerivation rec {
- name = "home-manager-${version}";
- version = "2019-06-25";
+ pname = "home-manager";
+ version = "2019-09-04";
src = fetchFromGitHub {
owner = "rycee";
repo = "home-manager";
- rev = "95d55b8da152f1efffb7713c82ead83a3fcf476d";
- sha256 = "1zbx051rc0b880wjl832m9sliwrhrm1dbdxw8734gvc0pfz6qwn1";
+ rev = "1923ac3358cbd2d75352c2db2178314eb4623818";
+ sha256 = "1xdsz62sjh8j3p8jfz449gv9vl01adk3qdyjvbpgi7y5c09ymwg7";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix
index c35550597a34..0c53c1bbbc91 100644
--- a/pkgs/tools/package-management/librepo/default.nix
+++ b/pkgs/tools/package-management/librepo/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.9.2";
- name = "librepo-${version}";
+ pname = "librepo";
src = fetchFromGitHub {
owner = "rpm-software-management";
diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix
index 51a963497fa2..9462cbec9c43 100644
--- a/pkgs/tools/package-management/morph/default.nix
+++ b/pkgs/tools/package-management/morph/default.nix
@@ -1,14 +1,14 @@
{ buildGoPackage, fetchFromGitHub, go-bindata, lib }:
buildGoPackage rec {
- name = "morph-${version}";
- version = "1.2.0";
+ pname = "morph";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "dbcdk";
repo = "morph";
rev = "v${version}";
- sha256 = "0jhypvj45yjg4cn4rvb2j9091pl6z5j541vcfaln5sb3ds14fkwf";
+ sha256 = "0nwl9n5b0lnil96573wa3hyr3vyvfiwvmpkla3pmwkpmriac4xrg";
};
goPackagePath = "github.com/dbcdk/morph";
diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix
index 41471b2c8a7a..3f307d38f029 100644
--- a/pkgs/tools/package-management/mynewt-newt/default.nix
+++ b/pkgs/tools/package-management/mynewt-newt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "mynewt-newt-${version}";
+ pname = "mynewt-newt";
version = "1.3.0";
goPackagePath = "mynewt.apache.org/newt";
diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix
index 5cbb207ec4f4..b1f3c553bf10 100644
--- a/pkgs/tools/package-management/nfpm/default.nix
+++ b/pkgs/tools/package-management/nfpm/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nfpm";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "090mxkmbfzi3mby18zhrr34fr6vzc7j0r2ss3rjr5lyfgilw1qwr";
+ sha256 = "0hfzk4hpk35j070hhpsjjpxhcrrddi6f1z070iypajcw96qz6lli";
};
modSha256 = "02nkqmljb528ppsr2dw2r3rc83j3qmys3a8v0a1z2b4sq2sv1v7w";
diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix
index 7c02d2d9a638..cd90e50d70eb 100644
--- a/pkgs/tools/package-management/nix-bundle/default.nix
+++ b/pkgs/tools/package-management/nix-bundle/default.nix
@@ -2,7 +2,6 @@
stdenv.mkDerivation rec {
pname = "nix-bundle";
- name = "${pname}-${version}";
version = "0.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix
index 9b666dbfa642..17d023f6daf3 100644
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/pkgs/tools/package-management/nix-du/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }:
rustPlatform.buildRustPackage rec {
- name = "nix-du-${version}";
+ pname = "nix-du";
version = "0.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index 62e0bc81afaf..1d025581b614 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -3,7 +3,7 @@
}:
rustPlatform.buildRustPackage rec {
- name = "nix-index-${version}";
+ pname = "nix-index";
version = "0.1.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix
index efedb8b67da9..f5dfacf319bc 100644
--- a/pkgs/tools/package-management/nix-pin/default.nix
+++ b/pkgs/tools/package-management/nix-pin/default.nix
@@ -1,7 +1,7 @@
{ lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper
, runtimeShell }:
let self = stdenv.mkDerivation rec {
- name = "nix-pin-${version}";
+ pname = "nix-pin";
version = "0.4.0";
src = fetchFromGitHub {
owner = "timbertson";
diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix
index 96a283a8ea8a..f88820ffad9e 100644
--- a/pkgs/tools/package-management/nix-prefetch/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch/default.nix
@@ -5,7 +5,6 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "nix-prefetch";
version = "0.1.0";
diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix
index 43e261b106bf..bffe04e78d96 100644
--- a/pkgs/tools/package-management/nix-review/default.nix
+++ b/pkgs/tools/package-management/nix-review/default.nix
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
};
makeWrapperArgs = [
- "--prefix" "PATH" ":" "${lib.makeBinPath [ nix git ]}"
+ "--prefix" "PATH" ":" (lib.makeBinPath [ nix git ])
];
meta = with stdenv.lib; {
diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index 660dce347a5b..b191d1c32111 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -9,7 +9,7 @@ let
sha256 = "1wm24p6pkxl1d7hrvf4ph6mwzawvqi22c60z9xzndn5xfyr4v0yr";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "nix-serve-0.2-${substring 0 7 rev}";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix
index cd3a8507be14..1d2cad2e39e4 100644
--- a/pkgs/tools/package-management/nix-top/default.nix
+++ b/pkgs/tools/package-management/nix-top/default.nix
@@ -15,7 +15,7 @@ let
additionalPath = lib.makeBinPath [ getent ncurses binutils-unwrapped coreutils findutils ];
in
stdenv.mkDerivation rec {
- name = "nix-top-${version}";
+ pname = "nix-top";
version = "0.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 574f95f82bb0..69489e271cba 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -129,7 +129,8 @@ common =
inherit fromGit;
perl-bindings = if includesPerl then nix else stdenv.mkDerivation {
- name = "nix-perl-${version}";
+ pname = "nix-perl";
+ inherit version;
inherit src;
@@ -173,10 +174,10 @@ in rec {
};
nixStable = callPackage common (rec {
- name = "nix-2.2.2";
+ name = "nix-2.3";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
- sha256 = "f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c";
+ sha256 = "b1d1b4d87390941fc64b19776f1ed9e3871231d38f5a1f295dd13925acd3a98d";
};
inherit storeDir stateDir confDir boehmgc;
diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix
index ce31de9f65d3..f63fe868e011 100644
--- a/pkgs/tools/package-management/nixops/nixops-dns.nix
+++ b/pkgs/tools/package-management/nixops/nixops-dns.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub }:
buildGoPackage rec {
- name = "nixops-dns-${version}";
+ pname = "nixops-dns";
version = "1.0";
goDeps = ./deps.nix;
diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix
index 804bbbdf8d71..131a3bb5fddc 100644
--- a/pkgs/tools/package-management/nixui/default.nix
+++ b/pkgs/tools/package-management/nixui/default.nix
@@ -24,8 +24,8 @@ let
genericName = "NixUI";
};
in
-stdenv.mkDerivation rec {
- name = "nixui-${version}";
+stdenv.mkDerivation {
+ pname = "nixui";
inherit version src;
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
index 8fe405e1b3e9..4377681e20d8 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/pkgs/tools/package-management/nixui/nixui.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/package-management/opkg-utils/default.nix b/pkgs/tools/package-management/opkg-utils/default.nix
index 8575f126e624..1c97757ff8a6 100644
--- a/pkgs/tools/package-management/opkg-utils/default.nix
+++ b/pkgs/tools/package-management/opkg-utils/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "opkg-utils-20141030";
# No releases, only a git tree
diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix
index e02c0a2c66ff..05f43cf29b1b 100644
--- a/pkgs/tools/package-management/opkg/default.nix
+++ b/pkgs/tools/package-management/opkg/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "0.4.1";
- name = "opkg-${version}";
+ pname = "opkg";
src = fetchurl {
url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz";
sha256 = "0hqa4lqxs3w9fmn9idzfscjkm23jw5asby43v0szcxrqgl1ixb25";
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 2e9f93177e45..a82f44008910 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -8,7 +8,7 @@
, enableSystemd ? stdenv.isLinux, systemd }:
stdenv.mkDerivation rec {
- name = "packagekit-${version}";
+ pname = "packagekit";
version = "1.1.12";
outputs = [ "out" "dev" ];
diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix
index f0f05a4c858e..987c834f505d 100644
--- a/pkgs/tools/package-management/packagekit/qt.nix
+++ b/pkgs/tools/package-management/packagekit/qt.nix
@@ -2,7 +2,7 @@
, qttools, packagekit }:
stdenv.mkDerivation rec {
- name = "packagekit-qt-${version}";
+ pname = "packagekit-qt";
version = "1.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix
index d756b679bf3d..81e8152769b7 100644
--- a/pkgs/tools/package-management/pacman/default.nix
+++ b/pkgs/tools/package-management/pacman/default.nix
@@ -2,7 +2,7 @@
zlib, bzip2, lzma }:
stdenv.mkDerivation rec {
- name = "pacman-${version}";
+ pname = "pacman";
version = "5.1.3";
src = fetchurl {
diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix
index 1a7c24e2c38a..675ec61f4db9 100644
--- a/pkgs/tools/package-management/python2nix/default.nix
+++ b/pkgs/tools/package-management/python2nix/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
name = "python2nix-20140927";
src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 55171e6d38f7..ae0259e65fcd 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "rpm-${version}";
+ pname = "rpm";
version = "4.14.2.1";
src = fetchurl {
diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix
index 5954ca4959b6..f83a1498825b 100644
--- a/pkgs/tools/package-management/xbps/default.nix
+++ b/pkgs/tools/package-management/xbps/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "xbps";
- version = "0.56";
+ version = "0.57";
src = fetchFromGitHub {
owner = "void-linux";
repo = "xbps";
rev = version;
- sha256 = "0hqvq6fq62l5sgm4fy3zb0ks889d21mqz4f4my3iifs6c9f50na2";
+ sha256 = "1aaa0h265lx85hmcvg7zpg7iiq6dzzlyxqazn1s387ss709i5gxn";
};
nativeBuildInputs = [ pkgconfig which ];
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
patches = [ ./cert-paths.patch ];
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" ];
+
postPatch = ''
# fix unprefixed ranlib (needed on cross)
substituteInPlace lib/Makefile \
diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix
index 68b9194015b1..c4ba7b67dc71 100644
--- a/pkgs/tools/security/2fa/default.nix
+++ b/pkgs/tools/security/2fa/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
version = "1.1.0";
- name = "2fa-${version}";
+ pname = "2fa";
goPackagePath = "rsc.io/2fa";
diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix
index 246a2c5d9917..5a771917311f 100644
--- a/pkgs/tools/security/acsccid/default.nix
+++ b/pkgs/tools/security/acsccid/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.1.6";
- name = "acsccid-${version}";
+ pname = "acsccid";
src = fetchFromGitHub {
owner = "acshk";
diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix
index c67c758b933d..22fb8848eb91 100644
--- a/pkgs/tools/security/aespipe/default.nix
+++ b/pkgs/tools/security/aespipe/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "aespipe-${version}";
+ pname = "aespipe";
version = "2.4e";
src = fetchurl {
diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 2ee0c478212c..05866792af68 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -8,11 +8,11 @@ let
else if stdenv.hostPlatform.system == "i686-linux" then "qemu-i386"
else throw "afl: no support for ${stdenv.hostPlatform.system}!";
afl = stdenv.mkDerivation rec {
- name = "afl-${version}";
+ pname = "afl";
version = "2.52b";
src = fetchurl {
- url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
+ url = "http://lcamtuf.coredump.cx/afl/releases/${pname}-${version}.tgz";
sha256 = "0ig0ij4n1pwry5dw1hk4q88801jzzy2cric6y2gd6560j55lnqa3";
};
enableParallelBuilding = true;
diff --git a/pkgs/tools/security/afl/libdislocator.nix b/pkgs/tools/security/afl/libdislocator.nix
index c5844702ef38..47e74573b81f 100644
--- a/pkgs/tools/security/afl/libdislocator.nix
+++ b/pkgs/tools/security/afl/libdislocator.nix
@@ -1,8 +1,8 @@
{ stdenv, afl}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = (builtins.parseDrvName afl.name).version;
- name = "libdislocator-${version}";
+ pname = "libdislocator";
src = afl.src;
sourceRoot = "${afl.name}/libdislocator";
diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix
index 9e0f19361fb0..d80d301351f4 100644
--- a/pkgs/tools/security/afl/qemu.nix
+++ b/pkgs/tools/security/afl/qemu.nix
@@ -11,7 +11,7 @@ let
else if stdenv.hostPlatform.system == "i686-linux" then "i386-linux-user"
else throw "afl: no support for ${stdenv.hostPlatform.system}!";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "afl-${qemuName}";
srcs = [
diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix
index 1513ae58a0b6..ea14d89c45c6 100644
--- a/pkgs/tools/security/aide/default.nix
+++ b/pkgs/tools/security/aide/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, flex, bison, libmhash, zlib, acl, attr, libselinux, pcre }:
stdenv.mkDerivation rec {
- name = "aide-${version}";
+ pname = "aide";
version = "0.16.2";
src = fetchurl {
- url = "https://github.com/aide/aide/releases/download/v${version}/${name}.tar.gz";
+ url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "15xp47sz7kk1ciffw3f5xw2jg2mb2lqrbr3q6p4bkbz5dap9iy8p";
};
diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
index ca2ea67e7881..580cf7585c92 100644
--- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
+++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
@@ -4,8 +4,8 @@
assert testQR -> zbar != false;
-stdenv.mkDerivation rec {
- name = "asc-key-to-qr-code-gif-${version}";
+stdenv.mkDerivation {
+ pname = "asc-key-to-qr-code-gif";
version = "20180613";
src = fetchFromGitHub {
@@ -15,15 +15,20 @@ stdenv.mkDerivation rec {
sha256 = "0yrc302a2fhbzryb10718ky4fymfcps3lk67ivis1qab5kbp6z8r";
};
- buildInputs = [ imagemagick qrencode ] ++ stdenv.lib.optional testQR zbar;
dontBuild = true;
dontStrip = true;
dontPatchELF = true;
- preInstall = ''
- substituteInPlace asc-to-gif.sh \
- --replace "convert" "${imagemagick}/bin/convert" \
- --replace "qrencode" "${qrencode.bin}/bin/qrencode"
+ preInstall = let
+ substitutions = [
+ ''--replace "convert" "${imagemagick}/bin/convert"''
+ ''--replace "qrencode" "${qrencode.bin}/bin/qrencode"''
+ ] ++ stdenv.lib.optional testQR [
+ ''--replace "hash zbarimg" "true"'' # hash does not work on NixOS
+ ''--replace "$(zbarimg --raw" "$(${zbar.out}/bin/zbarimg --raw"''
+ ];
+ in ''
+ substituteInPlace asc-to-gif.sh ${stdenv.lib.concatStringsSep " " substitutions}
'';
installPhase = ''
diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix
index 36b6a5767a1e..9067e6a4dbf8 100644
--- a/pkgs/tools/security/aws-okta/default.nix
+++ b/pkgs/tools/security/aws-okta/default.nix
@@ -1,7 +1,7 @@
{ buildGoPackage, fetchFromGitHub, libusb1, pkgconfig, stdenv }:
buildGoPackage rec {
- name = "aws-okta-${version}";
+ pname = "aws-okta";
version = "0.20.1";
goPackagePath = "github.com/segmentio/aws-okta";
diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix
index 16811d8f8897..fdd4f2c73fd4 100644
--- a/pkgs/tools/security/b2sum/default.nix
+++ b/pkgs/tools/security/b2sum/default.nix
@@ -2,8 +2,8 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
- name = "b2sum-${version}";
+stdenv.mkDerivation {
+ pname = "b2sum";
version = "unstable-2018-06-11";
src = fetchzip {
diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix
index 59be6ed0ec26..b745a2c872e7 100644
--- a/pkgs/tools/security/bash-supergenpass/default.nix
+++ b/pkgs/tools/security/bash-supergenpass/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, openssl, coreutils, gnugrep }:
-stdenv.mkDerivation rec {
- name = "bash-supergenpass-unstable-${version}";
+stdenv.mkDerivation {
+ pname = "bash-supergenpass-unstable";
version = "2018-04-18";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/bitwarden-cli/node-packages.nix b/pkgs/tools/security/bitwarden-cli/node-packages.nix
index 41e23864c44d..66560873b4c5 100644
--- a/pkgs/tools/security/bitwarden-cli/node-packages.nix
+++ b/pkgs/tools/security/bitwarden-cli/node-packages.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix
index e6874d085d29..c67cc4474310 100644
--- a/pkgs/tools/security/bitwarden/default.nix
+++ b/pkgs/tools/security/bitwarden/default.nix
@@ -16,11 +16,11 @@ let
pname = "bitwarden";
version = {
- "x86_64-linux" = "1.15.2";
+ x86_64-linux = "1.15.2";
}.${system} or "";
sha256 = {
- "x86_64-linux" = "0yz4hkqqwq2zrdjfxk5kybhs90n80k6bkn0625m47b09lwl2di4f";
+ x86_64-linux = "0yz4hkqqwq2zrdjfxk5kybhs90n80k6bkn0625m47b09lwl2di4f";
}.${system} or "";
meta = with stdenv.lib; {
@@ -51,7 +51,7 @@ let
dontBuild = true;
dontConfigure = true;
- dontPatchElf = true;
+ dontPatchELF = true;
dontWrapGApps = true;
buildInputs = [ libsecret ] ++ atomEnv.packages;
diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix
index 9faedf0c7ef9..47851fbfa053 100644
--- a/pkgs/tools/security/bmrsa/11.nix
+++ b/pkgs/tools/security/bmrsa/11.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "bmrsa-${version}";
+ pname = "bmrsa";
version = "11";
src = fetchurl {
diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/tools/security/bruteforce-luks/default.nix
index 69444d1612e8..0c650781bdaa 100644
--- a/pkgs/tools/security/bruteforce-luks/default.nix
+++ b/pkgs/tools/security/bruteforce-luks/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, cryptsetup }:
stdenv.mkDerivation rec {
- name = "bruteforce-luks-${version}";
+ pname = "bruteforce-luks";
version = "1.3.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index 654d2dd6a7ac..8d0b3a89a348 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
stdenv.mkDerivation rec {
+ pname = "ccid";
version = "1.4.31";
- name = "ccid-${version}";
src = fetchurl {
- url = "https://ccid.apdu.fr/files/${name}.tar.bz2";
+ url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2";
sha256 = "1xz8ikr6vk73w3xnwb931yq8lqc1zrj8c3v34n6h63irwjvdfj3b";
};
diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix
index a025c69b7381..4f48522e613f 100644
--- a/pkgs/tools/security/certmgr/default.nix
+++ b/pkgs/tools/security/certmgr/default.nix
@@ -4,7 +4,7 @@ let
generic = { patches ? [] }:
buildGoPackage rec {
version = "1.6.4";
- name = "certmgr-${version}";
+ pname = "certmgr";
goPackagePath = "github.com/cloudflare/certmgr/";
diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix
index e0935f0f7606..fb3c00e48f91 100644
--- a/pkgs/tools/security/certstrap/default.nix
+++ b/pkgs/tools/security/certstrap/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "certstrap-${version}";
+ pname = "certstrap";
version = "1.1.1";
goPackagePath = "github.com/square/certstrap";
diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
index 750539b3ace8..8d8497f6cb94 100644
--- a/pkgs/tools/security/cfssl/default.nix
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
buildGoPackage rec {
- name = "cfssl-${version}";
+ pname = "cfssl";
version = "1.3.2";
goPackagePath = "github.com/cloudflare/cfssl";
diff --git a/pkgs/tools/security/chaps/default.nix b/pkgs/tools/security/chaps/default.nix
index 1270423e9285..e81567c3ed87 100644
--- a/pkgs/tools/security/chaps/default.nix
+++ b/pkgs/tools/security/chaps/default.nix
@@ -31,8 +31,12 @@ stdenv.mkDerivation rec {
sha256 = "0chk6pnn365d5kcz6vfqx1d0383ksk97icc0lzg0vvb0kvyj0ff1";
};
- # readdir_r(3) is deprecated in glibc >= 2.24
- NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+ NIX_CFLAGS_COMPILE = [
+ # readdir_r(3) is deprecated in glibc >= 2.24
+ "-Wno-error=deprecated-declarations"
+ # gcc8 catching polymorphic type error
+ "-Wno-error=catch-value"
+ ];
patches = [ ./fix_absolute_path.patch ./fix_environment_variables.patch ./fix_scons.patch ./insert_prefetches.patch ];
diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix
index a32752f8b231..f403aaaf687a 100644
--- a/pkgs/tools/security/chipsec/default.nix
+++ b/pkgs/tools/security/chipsec/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, lib, fetchFromGitHub, python27Packages, nasm, libelf
+{ stdenv, lib, fetchFromGitHub, pythonPackages, nasm, libelf
, kernel ? null, withDriver ? false }:
-python27Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
name = "chipsec-${version}";
- version = "1.3.7";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "chipsec";
repo = "chipsec";
rev = version;
- sha256 = "00hwhi5f24y429zazhm77l1pp31q7fmx7ks3sfm6d16v89zbcp9a";
+ sha256 = "09ipr0vls1l2wln4z3dc9vx0zp63ps3dxkwlpm9rqqbpg7qq6lrp";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix
index 602c0d60a5f1..5a037090801a 100644
--- a/pkgs/tools/security/chntpw/default.nix
+++ b/pkgs/tools/security/chntpw/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "chntpw-${version}";
+ pname = "chntpw";
version = "140201";
diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix
index 2dc9336bb329..5e304f86b4ef 100644
--- a/pkgs/tools/security/chrome-token-signing/default.nix
+++ b/pkgs/tools/security/chrome-token-signing/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }:
stdenv.mkDerivation rec {
- name = "chrome-token-signing-${version}";
+ pname = "chrome-token-signing";
version = "1.0.7";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix
index a4afa772d10e..eae5a5256dff 100644
--- a/pkgs/tools/security/cipherscan/default.nix
+++ b/pkgs/tools/security/cipherscan/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python, coreutils }:
stdenv.mkDerivation rec {
- name = "cipherscan-${version}";
+ pname = "cipherscan";
version = "2016-08-16";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index b96fc49886a4..54932e1200bf 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "clamav-${version}";
+ pname = "clamav";
version = "0.101.4";
src = fetchurl {
- url = "https://www.clamav.net/downloads/production/${name}.tar.gz";
+ url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
sha256 = "1kdw0b49hbvja6xn589v4f0q334wav16pmi1hibql5cxj7q99w0b";
};
diff --git a/pkgs/tools/security/cowpatty/default.nix b/pkgs/tools/security/cowpatty/default.nix
index c5ace5d2e8c4..0fb9ed58997f 100644
--- a/pkgs/tools/security/cowpatty/default.nix
+++ b/pkgs/tools/security/cowpatty/default.nix
@@ -4,13 +4,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "cowpatty-${version}";
+ pname = "cowpatty";
version = "4.6";
buildInputs = [ openssl libpcap ];
src = fetchurl {
- url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${name}.tgz";
+ url = "http://www.willhackforsushi.com/code/cowpatty/${version}/${pname}-${version}.tgz";
sha256 = "1hivh3bq2maxvqzwfw06fr7h8bbpvxzah6mpibh3wb85wl9w2gyd";
};
diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix
index 2a88e4462b6d..04b7b5695b55 100644
--- a/pkgs/tools/security/crackxls/default.nix
+++ b/pkgs/tools/security/crackxls/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "crackxls-${version}";
+ pname = "crackxls";
version = "0.4";
src = fetchgit {
diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/tools/security/crunch/default.nix
index 3e94d52fc5fc..57943a314064 100644
--- a/pkgs/tools/security/crunch/default.nix
+++ b/pkgs/tools/security/crunch/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, which }:
stdenv.mkDerivation rec {
- name = "crunch-${version}";
+ pname = "crunch";
version = "3.6";
src = fetchurl {
- url = "mirror://sourceforge/crunch-wordlist/${name}.tgz";
+ url = "mirror://sourceforge/crunch-wordlist/${pname}-${version}.tgz";
sha256 = "0mgy6ghjvzr26yrhj1bn73qzw6v9qsniskc5wqq1kk0hfhy6r3va";
};
diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/tools/security/ctmg/default.nix
index 1e0618412210..104a615542bd 100644
--- a/pkgs/tools/security/ctmg/default.nix
+++ b/pkgs/tools/security/ctmg/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
- name = "ctmg-${version}";
+ pname = "ctmg";
version = "1.2";
src = fetchzip {
diff --git a/pkgs/tools/security/default.nix b/pkgs/tools/security/default.nix
index c5987d37889c..0e57a5bab884 100644
--- a/pkgs/tools/security/default.nix
+++ b/pkgs/tools/security/default.nix
@@ -1,8 +1,8 @@
{ stdenv, pkgs }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.0.1";
- name = "ecdsatool-${version}";
+ pname = "ecdsatool";
src = pkgs.fetchFromGitHub {
owner = "kaniini";
diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix
index 55335927b36a..ce8b5825647c 100644
--- a/pkgs/tools/security/doas/default.nix
+++ b/pkgs/tools/security/doas/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, bison, pam }:
stdenv.mkDerivation rec {
- name = "doas-${version}";
+ pname = "doas";
version = "6.0";
diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix
index 10e2138494e5..49ceacadcb7d 100644
--- a/pkgs/tools/security/duo-unix/default.nix
+++ b/pkgs/tools/security/duo-unix/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pam, openssl, zlib }:
stdenv.mkDerivation rec {
- name = "duo-unix-${version}";
+ pname = "duo-unix";
version = "1.11.2";
src = fetchurl {
diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix
index 48a713287b8b..13280e3226d9 100644
--- a/pkgs/tools/security/ecdsautils/default.nix
+++ b/pkgs/tools/security/ecdsautils/default.nix
@@ -1,8 +1,8 @@
{ stdenv, pkgs }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.4.0";
- name = "ecdsautils-${version}";
+ pname = "ecdsautils";
src = pkgs.fetchFromGitHub {
owner = "freifunk-gluon";
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix
index d0d01761c246..9fd8c3ac7a22 100644
--- a/pkgs/tools/security/ecryptfs/default.nix
+++ b/pkgs/tools/security/ecryptfs/default.nix
@@ -2,7 +2,7 @@
, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }:
stdenv.mkDerivation rec {
- name = "ecryptfs-${version}";
+ pname = "ecryptfs";
version = "111";
src = fetchurl {
diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix
index 40a728f6cb1a..fcb8d091d933 100644
--- a/pkgs/tools/security/ecryptfs/helper.nix
+++ b/pkgs/tools/security/ecryptfs/helper.nix
@@ -4,8 +4,7 @@
, python2
}:
-stdenv.mkDerivation rec {
- name = pname + "-" + version;
+stdenv.mkDerivation {
pname = "ecryptfs-helper";
version = "20160722";
diff --git a/pkgs/tools/security/efitools/default.nix b/pkgs/tools/security/efitools/default.nix
index 1d983cb8599a..8a64a019fef0 100644
--- a/pkgs/tools/security/efitools/default.nix
+++ b/pkgs/tools/security/efitools/default.nix
@@ -1,7 +1,7 @@
{ stdenv, gnu-efi, openssl, sbsigntool, perl, perlPackages,
help2man, fetchgit }:
stdenv.mkDerivation rec {
- name = "efitools-${version}";
+ pname = "efitools";
version = "1.9.2";
buildInputs = [
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 155c63c87e13..13ab56aaa9a2 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -7,7 +7,7 @@
, substituteAll }:
stdenv.mkDerivation rec {
- name = "eid-mw-${version}";
+ pname = "eid-mw";
version = "4.4.16";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/enchive/default.nix b/pkgs/tools/security/enchive/default.nix
index 8d4cc6ec3ca6..baada40a6cb1 100644
--- a/pkgs/tools/security/enchive/default.nix
+++ b/pkgs/tools/security/enchive/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "enchive-${version}";
+ pname = "enchive";
version = "3.4";
src = fetchFromGitHub {
owner = "skeeto";
diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix
index 6f79be83be55..01855ee3e5b4 100644
--- a/pkgs/tools/security/encryptr/default.nix
+++ b/pkgs/tools/security/encryptr/default.nix
@@ -14,7 +14,7 @@ let
else throw "Encryptr for ${stdenv.hostPlatform.system} not supported!";
in stdenv.mkDerivation rec {
- name = "encryptr-${version}";
+ pname = "encryptr";
version = "2.0.0";
src = fetchurl {
diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix
index c33e433448f5..89e09a47858d 100644
--- a/pkgs/tools/security/enpass/default.nix
+++ b/pkgs/tools/security/enpass/default.nix
@@ -39,10 +39,10 @@ let
libuuid
cups
]);
- package = stdenv.mkDerivation rec {
+ package = stdenv.mkDerivation {
inherit (data) version;
- name = "enpass-${version}";
+ pname = "enpass";
src = fetchurl {
inherit (data) sha256;
@@ -80,7 +80,7 @@ let
'';
};
updater = {
- update = stdenv.mkDerivation rec {
+ update = stdenv.mkDerivation {
name = "enpass-update-script";
SCRIPT =./update_script.py;
diff --git a/pkgs/tools/security/eschalot/default.nix b/pkgs/tools/security/eschalot/default.nix
index d628a28023a4..28df3a284427 100644
--- a/pkgs/tools/security/eschalot/default.nix
+++ b/pkgs/tools/security/eschalot/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "eschalot";
version = "2018-01-19";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "ReclaimYourPrivacy";
diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index 296080cbd8e7..324ac46b0841 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -3,7 +3,8 @@
let version = "0.10.4"; in
pythonPackages.buildPythonApplication {
- name = "fail2ban-${version}";
+ pname = "fail2ban";
+ inherit version;
src = fetchFromGitHub {
owner = "fail2ban";
diff --git a/pkgs/tools/security/fcrackzip/default.nix b/pkgs/tools/security/fcrackzip/default.nix
index 5d2e515c3277..d923e81ae826 100644
--- a/pkgs/tools/security/fcrackzip/default.nix
+++ b/pkgs/tools/security/fcrackzip/default.nix
@@ -1,10 +1,10 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "fcrackzip-${version}";
+ pname = "fcrackzip";
version = "1.0";
src = fetchurl {
- url = "http://oldhome.schmorp.de/marc/data/${name}.tar.gz";
+ url = "http://oldhome.schmorp.de/marc/data/${pname}-${version}.tar.gz";
sha256 = "0l1qsk949vnz18k4vjf3ppq8p497966x4c7f2yx18x8pk35whn2a";
};
diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix
index 66a50e268a53..b6669358f7f9 100644
--- a/pkgs/tools/security/fpm2/default.nix
+++ b/pkgs/tools/security/fpm2/default.nix
@@ -5,7 +5,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "fpm2-${version}";
+ pname = "fpm2";
version = "0.79";
src = fetchurl {
diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix
index 14a4c985d502..3fff99a6ce10 100644
--- a/pkgs/tools/security/fprot/default.nix
+++ b/pkgs/tools/security/fprot/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
- name = "f-prot-${version}";
+ pname = "f-prot";
version = "6.2.1";
src = fetchurl {
diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix
index 812c032230c1..4579136add26 100644
--- a/pkgs/tools/security/fwknop/default.nix
+++ b/pkgs/tools/security/fwknop/default.nix
@@ -7,7 +7,6 @@
, buildClient ? true }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "fwknop";
version = "2.6.10";
diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix
index ca7793281ef9..89900d27bd27 100644
--- a/pkgs/tools/security/gen-oath-safe/default.nix
+++ b/pkgs/tools/security/gen-oath-safe/default.nix
@@ -1,7 +1,7 @@
{ coreutils, fetchFromGitHub, libcaca, makeWrapper, python, openssl, qrencode, stdenv, yubikey-manager }:
stdenv.mkDerivation rec {
- name = "gen-oath-safe-${version}";
+ pname = "gen-oath-safe";
version = "0.11.0";
src = fetchFromGitHub {
owner = "mcepl";
diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index 27bdc51c7688..63d1bab89d7f 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "1.8.19";
- name = "gnome-encfs-manager-${version}";
+ pname = "gnome-encfs-manager";
src = fetchurl {
url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz";
diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix
new file mode 100644
index 000000000000..04fa923ce2cc
--- /dev/null
+++ b/pkgs/tools/security/gnome-keysign/default.nix
@@ -0,0 +1,73 @@
+{ stdenv
+, fetchFromGitLab
+, python3
+, wrapGAppsHook
+, gobject-introspection
+, gtk3
+, glib
+, gnome3
+, gst_all_1
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "gnome-keysign";
+ version = "1.0.1";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "GNOME";
+ repo = pname;
+ rev = version;
+ sha256 = "0iy70dskd7wly37lpb2ypd9phhyml5j3c7rzajii4f2s7zgb3abg";
+ };
+
+ nativeBuildInputs = [
+ wrapGAppsHook
+ gobject-introspection
+ ] ++ (with python3.pkgs; [
+ Babel
+ lxml
+ ]);
+
+ buildInputs = [
+ # TODO: add avahi support
+ gtk3
+ glib
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base
+ (gst_all_1.gst-plugins-good.override { gtkSupport = true; })
+ gst_all_1.gst-plugins-bad # for zbar plug-in
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ dbus-python
+ future
+ gpgme
+ magic-wormhole
+ pygobject3
+ pybluez
+ qrcode
+ requests
+ twisted
+ ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
+ # https://github.com/NixOS/nixpkgs/issues/56943
+ strictDeps = false;
+
+ # bunch of linting
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "GTK/GNOME application to use GnuPG for signing other peoples’ keys";
+ homepage = https://wiki.gnome.org/Apps/Keysign;
+ license = licenses.gpl3Plus;
+ maintainers = gnome3.maintainers;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix
index 2139b7c84afc..940a5b9a0535 100644
--- a/pkgs/tools/security/gnu-pw-mgr/default.nix
+++ b/pkgs/tools/security/gnu-pw-mgr/default.nix
@@ -1,10 +1,10 @@
{ stdenv, lib, fetchurl, gnulib }:
stdenv.mkDerivation rec {
- name = "gnu-pw-mgr-${version}";
+ pname = "gnu-pw-mgr";
version = "2.4.2";
src = fetchurl {
- url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${name}.tar.xz";
+ url = "https://ftp.gnu.org/gnu/gnu-pw-mgr/${pname}-${version}.tar.xz";
sha256 = "1yvdzc5w37qrjrkby5699ygj9bhkvgi3zk9k9jcjry1j6b7wdl17";
};
diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 6ae2bbc436ed..6336d319997f 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
assert guiSupport -> pinentry != null;
stdenv.mkDerivation rec {
- name = "gnupg-${version}";
+ pname = "gnupg";
version = "2.0.30";
src = fetchurl {
- url = "mirror://gnupg/gnupg/${name}.tar.bz2";
+ url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2";
sha256 = "0wax4cy14hh0h7kg9hj0hjn9424b71z8lrrc5kbsasrn9xd7hag3";
};
diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index 7a8fb5a32443..90bd55f55a23 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -14,12 +14,12 @@ with stdenv.lib;
assert guiSupport -> pinentry != null;
stdenv.mkDerivation rec {
- name = "gnupg-${version}";
+ pname = "gnupg";
version = "2.2.17";
src = fetchurl {
- url = "mirror://gnupg/gnupg/${name}.tar.bz2";
+ url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2";
sha256 = "056mgy09lvsi03531a437qj58la1j2x1y1scvfi53diris3658mg";
};
diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix
index 152ff40e7a22..1ba650f5af75 100644
--- a/pkgs/tools/security/gorilla-bin/default.nix
+++ b/pkgs/tools/security/gorilla-bin/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, makeWrapper, patchelf, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }:
stdenv.mkDerivation rec {
- name = "gorilla-bin-${version}";
+ pname = "gorilla-bin";
version = "1.5.3.7";
src = fetchurl {
diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix
index c095b77129cc..34e8c7bd6796 100644
--- a/pkgs/tools/security/gpgstats/default.nix
+++ b/pkgs/tools/security/gpgstats/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses, gpgme }:
stdenv.mkDerivation rec {
- name = "gpgstats-${version}";
+ pname = "gpgstats";
version = "0.5";
src = fetchurl {
- url = "https://www.vanheusden.com/gpgstats/${name}.tgz";
+ url = "https://www.vanheusden.com/gpgstats/${pname}-${version}.tgz";
sha256 = "1n3njqhjwgfllcxs0xmk89dzgirrpfpfzkj71kqyvq97gc1wbcxy";
};
diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix
index 2b1708c9243c..bd7d356c1a0e 100644
--- a/pkgs/tools/security/haka/default.nix
+++ b/pkgs/tools/security/haka/default.nix
@@ -2,8 +2,9 @@
let version = "0.3.0"; in
-stdenv.mkDerivation rec {
- name = "haka-${version}";
+stdenv.mkDerivation {
+ pname = "haka";
+ inherit version;
src = fetchurl {
name = "haka_${version}_source.tar.gz";
diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix
index 385a201d88b0..4fa0499f1dde 100644
--- a/pkgs/tools/security/hash-slinger/default.nix
+++ b/pkgs/tools/security/hash-slinger/default.nix
@@ -4,13 +4,12 @@ let
inherit (pythonPackages) python;
in stdenv.mkDerivation rec {
pname = "hash-slinger";
- name = "${pname}-${version}";
version = "2.7";
src = fetchFromGitHub {
owner = "letoams";
- repo = "${pname}";
- rev = "${version}";
+ repo = pname;
+ rev = version;
sha256 = "05wn744ydclpnpyah6yfjqlfjlasrrhzj48lqmm5a91nyps5yqyn";
};
diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/tools/security/hash_extender/default.nix
index 0c5691a1e106..30ba2fb30872 100644
--- a/pkgs/tools/security/hash_extender/default.nix
+++ b/pkgs/tools/security/hash_extender/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, openssl }:
-stdenv.mkDerivation rec {
- name = "hash_extender-${version}";
+stdenv.mkDerivation {
+ pname = "hash_extender";
version = "2017-04-10";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix
index 81f627179a25..c47331f1bcb9 100644
--- a/pkgs/tools/security/haveged/default.nix
+++ b/pkgs/tools/security/haveged/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "haveged-${version}";
+ pname = "haveged";
version = "1.9.2";
src = fetchurl {
diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/tools/security/ifdnfc/default.nix
index 5731f3ef8bb6..5ec66a5b98cc 100644
--- a/pkgs/tools/security/ifdnfc/default.nix
+++ b/pkgs/tools/security/ifdnfc/default.nix
@@ -4,8 +4,8 @@
, libnfc
}:
-stdenv.mkDerivation rec {
- name = "ifdnfc-${version}";
+stdenv.mkDerivation {
+ pname = "ifdnfc";
version = "2016-03-01";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix
index 2eda19088376..213f7c30051a 100644
--- a/pkgs/tools/security/jd-gui/default.nix
+++ b/pkgs/tools/security/jd-gui/default.nix
@@ -63,7 +63,7 @@ let
categories = "Development;Debugger;";
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
inherit name version src;
nativeBuildInputs = [ gradle_2_5 perl makeWrapper ];
diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index d4db02cc9ed1..dd3a93be9950 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "john-${version}";
+ pname = "john";
version = "1.9.0-jumbo-1";
src = fetchurl {
- url = "http://www.openwall.com/john/k/${name}.tar.xz";
+ url = "http://www.openwall.com/john/k/${pname}-${version}.tar.xz";
sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm";
};
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 6fac3b66cbc6..1a2b06ea41f9 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -4,7 +4,7 @@
}:
buildGoPackage rec {
- name = "keybase-${version}";
+ pname = "keybase";
version = "4.3.1";
goPackagePath = "github.com/keybase/client";
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 02d8625aa762..944e73dd46c5 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -8,7 +8,7 @@ let
in
stdenv.mkDerivation rec {
- name = "keybase-gui-${version}";
+ pname = "keybase-gui";
version = "4.3.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
src = fetchurl {
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
dontConfigure = true;
- dontPatchElf = true;
+ dontPatchELF = true;
unpackPhase = ''
ar xf $src
diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix
index 302e996213dd..9448182a65a7 100644
--- a/pkgs/tools/security/keybase/kbfs.nix
+++ b/pkgs/tools/security/keybase/kbfs.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub, keybase }:
-buildGoPackage rec {
+buildGoPackage {
pname = "kbfs";
inherit (keybase) src version;
diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix
index e7c09e0b2d5e..9d4c590efa1e 100644
--- a/pkgs/tools/security/kpcli/default.nix
+++ b/pkgs/tools/security/kpcli/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "3.3";
- name = "kpcli-${version}";
+ pname = "kpcli";
src = fetchurl {
- url = "mirror://sourceforge/kpcli/${name}.pl";
+ url = "mirror://sourceforge/kpcli/${pname}-${version}.pl";
sha256 = "1z6dy70d3ag16vgzzafcnxb8gap3wahfmy4vd22fpgbrdd6riph4";
};
diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/tools/security/lesspass-cli/default.nix
index afcdf0c0a07a..76732170079c 100644
--- a/pkgs/tools/security/lesspass-cli/default.nix
+++ b/pkgs/tools/security/lesspass-cli/default.nix
@@ -2,14 +2,15 @@
let
inherit (python3.pkgs) buildPythonApplication pytest mock pexpect;
+ repo = "lesspass";
in
buildPythonApplication rec {
pname = "lesspass-cli";
version = "9.0.0";
src = fetchFromGitHub {
- owner = pname;
- repo = pname;
+ owner = repo;
+ repo = repo;
rev = version;
sha256 = "1mdv0c0fn4d72iigy8hz4s7kf7q3pg4gjjadxwxyjwsalapnsapk";
};
diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix
index d858ed3fd6d3..248fbe008fc7 100644
--- a/pkgs/tools/security/libacr38u/default.nix
+++ b/pkgs/tools/security/libacr38u/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, pkgconfig, pcsclite , libusb }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "1.7.11";
- name = "libacr38u-${version}";
+ pname = "libacr38u";
src = fetchurl {
url = "http://http.debian.net/debian/pool/main/a/acr38/acr38_1.7.11.orig.tar.bz2";
diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix
index b3dc1270fb9c..17861ac2da60 100644
--- a/pkgs/tools/security/libmodsecurity/default.nix
+++ b/pkgs/tools/security/libmodsecurity/default.nix
@@ -3,7 +3,7 @@
, curl, geoip, libxml2, lmdb, lua, pcre, yajl }:
stdenv.mkDerivation rec {
- name = "libmodsecurity-${version}";
+ pname = "libmodsecurity";
version = "3.0.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix
index 8a73d056b1ed..f06ce2f246a4 100644
--- a/pkgs/tools/security/logkeys/default.nix
+++ b/pkgs/tools/security/logkeys/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoconf, automake, which, procps, kbd }:
-stdenv.mkDerivation rec {
- name = "logkeys-${version}";
+stdenv.mkDerivation {
+ pname = "logkeys";
version = "2018-01-22";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index 7579636cfbf5..bbed166d7598 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -3,12 +3,11 @@
stdenv.mkDerivation rec {
pname = "lynis";
version = "2.7.5";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "CISOfy";
- repo = "${pname}";
- rev = "${version}";
+ repo = pname;
+ rev = version;
sha256 = "1lkkbvxm0rgrrlx0szaxmf8ghc3d26wal96sgqk84m37mvs1f7p0";
};
diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix
index e33681c45e0e..f6f9e0df655a 100644
--- a/pkgs/tools/security/masscan/default.nix
+++ b/pkgs/tools/security/masscan/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, makeWrapper, libpcap }:
stdenv.mkDerivation rec {
- name = "masscan-${version}";
+ pname = "masscan";
version = "1.0.5";
src = fetchFromGitHub {
owner = "robertdavidgraham";
repo = "masscan";
- rev = "${version}";
+ rev = version;
sha256 = "0q0c7bsf0pbl8napry1qyg0gl4pd8wn872h4mz9b56dx4rx90vqg";
};
diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 99d7556db2db..2aae6fc49d96 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/4.16.1"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.45"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index a84e3d08f438..931ea65f54a7 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,17 +1,24 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
- revision: dbec1c2d2ae4bd77276cbfb3c6ee2902048b9453
- ref: refs/tags/4.16.1
+ revision: 2b9e74c7a8a4423ea195e75abca1f56c354e5541
+ ref: refs/tags/5.0.45
specs:
- metasploit-framework (4.16.1)
+ metasploit-framework (5.0.45)
actionpack (~> 4.2.6)
activerecord (~> 4.2.6)
activesupport (~> 4.2.6)
+ aws-sdk-ec2
+ aws-sdk-iam
+ aws-sdk-s3
backports
- bcrypt
+ bcrypt (= 3.1.12)
bcrypt_pbkdf
bit-struct
+ concurrent-ruby (= 1.0.5)
dnsruby
+ ed25519
+ em-http-request
+ faker
filesize
jsobfu
json
@@ -19,9 +26,10 @@ GIT
metasploit-concern
metasploit-credential
metasploit-model
- metasploit-payloads (= 1.3.1)
- metasploit_data_models
- metasploit_payloads-mettle (= 0.2.0)
+ metasploit-payloads (= 1.3.70)
+ metasploit_data_models (= 3.0.10)
+ metasploit_payloads-mettle (= 0.5.16)
+ mqtt
msgpack
nessus_rest
net-ssh
@@ -35,11 +43,9 @@ GIT
patch_finder
pcaprub
pdf-reader
- pg (= 0.20.0)
+ pg (~> 0.20)
railties
rb-readline
- rbnacl (< 5.0.0)
- rbnacl-libsodium
recog
redcarpet
rex-arch
@@ -51,23 +57,26 @@ GIT
rex-mime
rex-nop
rex-ole
- rex-powershell (< 0.1.73)
+ rex-powershell
rex-random_identifier
rex-registry
rex-rop_builder
- rex-socket
+ rex-socket (= 0.1.17)
rex-sslscan
rex-struct2
rex-text
rex-zip
- robots
+ ruby-macho
ruby_smb
rubyntlm
rubyzip
+ sinatra
sqlite3
sshkey
+ thin
tzinfo
tzinfo-data
+ warden
windows_error
xdr
xmlrpc
@@ -75,66 +84,109 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- Ascii85 (1.0.2)
- actionpack (4.2.9)
- actionview (= 4.2.9)
- activesupport (= 4.2.9)
+ Ascii85 (1.0.3)
+ actionpack (4.2.11.1)
+ actionview (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (4.2.9)
- activesupport (= 4.2.9)
+ actionview (4.2.11.1)
+ activesupport (= 4.2.11.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activemodel (4.2.9)
- activesupport (= 4.2.9)
+ activemodel (4.2.11.1)
+ activesupport (= 4.2.11.1)
builder (~> 3.1)
- activerecord (4.2.9)
- activemodel (= 4.2.9)
- activesupport (= 4.2.9)
+ activerecord (4.2.11.1)
+ activemodel (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
arel (~> 6.0)
- activesupport (4.2.9)
+ activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- addressable (2.5.1)
- public_suffix (~> 2.0, >= 2.0.2)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
afm (0.2.2)
arel (6.0.4)
- arel-helpers (2.4.0)
- activerecord (>= 3.1.0, < 6)
- backports (3.8.0)
- bcrypt (3.1.11)
- bcrypt_pbkdf (1.0.0)
- bindata (2.4.0)
+ arel-helpers (2.10.0)
+ activerecord (>= 3.1.0, < 7)
+ aws-eventstream (1.0.3)
+ aws-partitions (1.208.0)
+ aws-sdk-core (3.66.0)
+ aws-eventstream (~> 1.0, >= 1.0.2)
+ aws-partitions (~> 1.0)
+ aws-sigv4 (~> 1.1)
+ jmespath (~> 1.0)
+ aws-sdk-ec2 (1.106.0)
+ aws-sdk-core (~> 3, >= 3.61.1)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-iam (1.29.0)
+ aws-sdk-core (~> 3, >= 3.61.1)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-kms (1.24.0)
+ aws-sdk-core (~> 3, >= 3.61.1)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-s3 (1.48.0)
+ aws-sdk-core (~> 3, >= 3.61.1)
+ aws-sdk-kms (~> 1)
+ aws-sigv4 (~> 1.1)
+ aws-sigv4 (1.1.0)
+ aws-eventstream (~> 1.0, >= 1.0.2)
+ backports (3.15.0)
+ bcrypt (3.1.12)
+ bcrypt_pbkdf (1.0.1)
+ bindata (2.4.4)
bit-struct (0.16)
builder (3.2.3)
- dnsruby (1.60.2)
+ concurrent-ruby (1.0.5)
+ cookiejar (0.3.3)
+ crass (1.0.4)
+ daemons (1.3.1)
+ dnsruby (1.61.3)
+ addressable (~> 2.5)
+ ed25519 (1.2.4)
+ em-http-request (1.1.5)
+ addressable (>= 2.3.4)
+ cookiejar (!= 0.3.1)
+ em-socksify (>= 0.3)
+ eventmachine (>= 1.0.3)
+ http_parser.rb (>= 0.6.0)
+ em-socksify (0.3.2)
+ eventmachine (>= 1.0.0.beta.4)
erubis (2.7.0)
- faraday (0.13.1)
+ eventmachine (1.2.7)
+ faker (2.2.1)
+ i18n (>= 0.8)
+ faraday (0.15.4)
multipart-post (>= 1.2, < 3)
- ffi (1.9.18)
- filesize (0.1.1)
+ filesize (0.2.0)
hashery (2.1.2)
- i18n (0.8.6)
+ http_parser.rb (0.6.0)
+ i18n (0.9.5)
+ concurrent-ruby (~> 1.0)
+ jmespath (1.4.0)
jsobfu (0.4.2)
rkelly-remix
- json (2.1.0)
- loofah (2.0.3)
+ json (2.2.0)
+ loofah (2.2.3)
+ crass (~> 1.0.2)
nokogiri (>= 1.5.9)
- metasm (1.0.3)
+ metasm (1.0.4)
metasploit-concern (2.0.5)
activemodel (~> 4.2.6)
activesupport (~> 4.2.6)
railties (~> 4.2.6)
- metasploit-credential (2.0.12)
+ metasploit-credential (3.0.3)
metasploit-concern
metasploit-model
- metasploit_data_models
+ metasploit_data_models (>= 3.0.0)
+ net-ssh
pg
railties
rex-socket
@@ -144,8 +196,8 @@ GEM
activemodel (~> 4.2.6)
activesupport (~> 4.2.6)
railties (~> 4.2.6)
- metasploit-payloads (1.3.1)
- metasploit_data_models (2.0.15)
+ metasploit-payloads (1.3.70)
+ metasploit_data_models (3.0.10)
activerecord (~> 4.2.6)
activesupport (~> 4.2.6)
arel-helpers
@@ -155,77 +207,76 @@ GEM
postgres_ext
railties (~> 4.2.6)
recog (~> 2.0)
- metasploit_payloads-mettle (0.2.0)
- mini_portile2 (2.2.0)
- minitest (5.10.3)
- msgpack (1.1.0)
- multipart-post (2.0.0)
+ metasploit_payloads-mettle (0.5.16)
+ mini_portile2 (2.4.0)
+ minitest (5.11.3)
+ mqtt (0.5.0)
+ msgpack (1.3.1)
+ multipart-post (2.1.1)
nessus_rest (0.1.6)
- net-ssh (4.1.0)
- network_interface (0.0.1)
- nexpose (6.1.1)
- nokogiri (1.8.0)
- mini_portile2 (~> 2.2.0)
- octokit (4.7.0)
+ net-ssh (5.2.0)
+ network_interface (0.0.2)
+ nexpose (7.2.1)
+ nokogiri (1.10.4)
+ mini_portile2 (~> 2.4.0)
+ octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
- openssl-ccm (1.2.1)
+ openssl-ccm (1.2.2)
openvas-omp (0.0.4)
packetfu (1.1.13)
pcaprub
patch_finder (1.0.2)
- pcaprub (0.12.4)
- pdf-reader (2.0.0)
+ pcaprub (0.13.0)
+ pdf-reader (2.2.1)
Ascii85 (~> 1.0.0)
afm (~> 0.2.1)
hashery (~> 2.0)
ruby-rc4
ttfunk
- pg (0.20.0)
+ pg (0.21.0)
pg_array_parser (0.0.9)
- postgres_ext (3.0.0)
- activerecord (>= 4.0.0)
+ postgres_ext (3.0.1)
+ activerecord (~> 4.0)
arel (>= 4.0.1)
pg_array_parser (~> 0.0.9)
- public_suffix (2.0.5)
+ public_suffix (4.0.1)
rack (1.6.11)
+ rack-protection (1.5.5)
+ rack
rack-test (0.6.3)
rack (>= 1.0)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
- rails-dom-testing (1.0.8)
- activesupport (>= 4.2.0.beta, < 5.0)
+ rails-dom-testing (1.0.9)
+ activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
- rails-html-sanitizer (1.0.3)
- loofah (~> 2.0)
- railties (4.2.9)
- actionpack (= 4.2.9)
- activesupport (= 4.2.9)
+ rails-html-sanitizer (1.2.0)
+ loofah (~> 2.2, >= 2.2.2)
+ railties (4.2.11.1)
+ actionpack (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (12.0.0)
+ rake (12.3.3)
rb-readline (0.5.5)
- rbnacl (4.0.2)
- ffi
- rbnacl-libsodium (1.0.13)
- rbnacl (>= 3.0.1)
- recog (2.1.12)
+ recog (2.3.2)
nokogiri
- redcarpet (3.4.0)
- rex-arch (0.1.11)
+ redcarpet (3.5.0)
+ rex-arch (0.1.13)
rex-text
- rex-bin_tools (0.1.4)
+ rex-bin_tools (0.1.6)
metasm
rex-arch
rex-core
rex-struct2
rex-text
- rex-core (0.1.12)
+ rex-core (0.1.13)
rex-encoder (0.1.4)
metasm
rex-arch
rex-text
- rex-exploitation (0.1.14)
+ rex-exploitation (0.1.21)
jsobfu
metasm
rex-arch
@@ -238,47 +289,58 @@ GEM
rex-arch
rex-ole (0.1.6)
rex-text
- rex-powershell (0.1.72)
+ rex-powershell (0.1.82)
rex-random_identifier
rex-text
- rex-random_identifier (0.1.2)
+ rex-random_identifier (0.1.4)
rex-text
rex-registry (0.1.3)
rex-rop_builder (0.1.3)
metasm
rex-core
rex-text
- rex-socket (0.1.8)
+ rex-socket (0.1.17)
rex-core
rex-sslscan (0.1.5)
rex-core
rex-socket
rex-text
rex-struct2 (0.1.2)
- rex-text (0.2.15)
+ rex-text (0.2.23)
rex-zip (0.1.3)
rex-text
rkelly-remix (0.0.7)
- robots (0.10.1)
+ ruby-macho (2.2.0)
ruby-rc4 (0.1.5)
- ruby_smb (0.0.18)
+ ruby_smb (1.1.0)
bindata
rubyntlm
windows_error
rubyntlm (0.6.2)
- rubyzip (1.2.1)
- sawyer (0.8.1)
- addressable (>= 2.3.5, < 2.6)
- faraday (~> 0.8, < 1.0)
- sqlite3 (1.3.13)
- sshkey (1.9.0)
- thor (0.20.0)
+ rubyzip (1.2.3)
+ sawyer (0.8.2)
+ addressable (>= 2.3.5)
+ faraday (> 0.8, < 2.0)
+ sinatra (1.4.8)
+ rack (~> 1.5)
+ rack-protection (~> 1.4)
+ tilt (>= 1.3, < 3)
+ sqlite3 (1.4.1)
+ sshkey (2.0.0)
+ thin (1.7.2)
+ daemons (~> 1.0, >= 1.0.9)
+ eventmachine (~> 1.0, >= 1.0.4)
+ rack (>= 1, < 3)
+ thor (0.20.3)
thread_safe (0.3.6)
+ tilt (2.0.9)
ttfunk (1.5.1)
- tzinfo (1.2.3)
+ tzinfo (1.2.5)
thread_safe (~> 0.1)
- tzinfo-data (1.2017.2)
+ tzinfo-data (1.2019.2)
tzinfo (>= 1.0.0)
+ warden (1.2.7)
+ rack (>= 1.0)
windows_error (0.1.2)
xdr (2.0.0)
activemodel (>= 4.2.7)
@@ -292,4 +354,4 @@ DEPENDENCIES
metasploit-framework!
BUNDLED WITH
- 1.16.4
+ 1.17.2
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 37796fef1747..8486f10bab05 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -16,19 +16,19 @@ let
gemdir = ./.;
};
in stdenv.mkDerivation rec {
- name = "metasploit-framework-${version}";
- version = "4.16.1";
+ pname = "metasploit-framework";
+ version = "5.0.45";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
- sha256 = "1vilyy0dqzp8kbbpvs2zrv2ac7s39w2vv7mrbzgcjgh2bj7c6bg1";
+ sha256 = "16jl3fkfbwl4wwbj2zrq9yr8y8brkhj9641hplc8idv8gaqkgmm5";
};
buildInputs = [ makeWrapper ];
- dontPatchelf = true; # stay away from exploit executables
+ dontPatchELF = true; # stay away from exploit executables
installPhase = ''
mkdir -p $out/{bin,share/msf}
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index 938817cb64f6..28cc83b240f2 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -1,59 +1,73 @@
{
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1kgrq74gp2czzxr0f2sqrc98llz03lgq498300z2z5n4khgznwc4";
+ sha256 = "0rmldsk3a4lwxk0lrp6x1nz1v1r2xmbm3300l4ghgfygv3grdwjh";
type = "gem";
};
- version = "4.2.9";
+ version = "4.2.11.1";
};
actionview = {
dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04kgp4gmahw31miz8xdq1pns14qmvvzd14fgfv7fg9klkw3bxyyp";
+ sha256 = "0x7vjn8q6blzyf7j3kwg0ciy7vnfh28bjdkd1mp9k4ghp9jn0g9p";
type = "gem";
};
- version = "4.2.9";
+ version = "4.2.11.1";
};
activemodel = {
dependencies = ["activesupport" "builder"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qxmivny0ka5s3iyap08sn9bp2bd9wrhqp2njfw26hr9wsjk5kfv";
+ sha256 = "1c1x0rd6wnk1f0gsmxs6x3gx7yf6fs9qqkdv7r4hlbcdd849in33";
type = "gem";
};
- version = "4.2.9";
+ version = "4.2.11.1";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18i790dfhi4ndypd1pj9pv08knpxr2sayvvwfq7axj5jfwgpmrqb";
+ sha256 = "07ixiwi0zzs9skqarvpfamsnay7npfswymrn28ngxaf8hi279q5p";
type = "gem";
};
- version = "4.2.9";
+ version = "4.2.11.1";
};
activesupport = {
dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d0a362p3m2m2kljichar2pwq0qm4vblc3njy1rdzm09ckzd45sp";
+ sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6";
type = "gem";
};
- version = "4.2.9";
+ version = "4.2.11.1";
};
addressable = {
dependencies = ["public_suffix"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh";
+ sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
type = "gem";
};
- version = "2.5.1";
+ version = "2.7.0";
};
afm = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06kj9hgd0z8pj27bxp2diwqh6fv7qhwwm17z64rhdc4sfn76jgn8";
@@ -62,6 +76,8 @@
version = "0.2.2";
};
arel = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nfcrdiys6q6ylxiblky9jyssrw2xj96fmxmal7f4f0jj3417vj4";
@@ -71,54 +87,154 @@
};
arel-helpers = {
dependencies = ["activerecord"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1sx4qbzhld3a99175p2krz3hv1npc42rv3sd8x4awzkgplg3zy9c";
+ sha256 = "0lb52rd20ix7khh70vrwd85qivir9sis62s055k3zr5h9iy3lyqi";
type = "gem";
};
- version = "2.4.0";
+ version = "2.10.0";
};
Ascii85 = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j95sbxd18kc8rhcnvl1w37kflqpax1r12h1x47gh4xxn3mz4m7q";
+ sha256 = "0658m37jjjn6drzqg1gk4p6c205mgp7g1jh2d00n4ngghgmz5qvs";
type = "gem";
};
- version = "1.0.2";
+ version = "1.0.3";
+ };
+ aws-eventstream = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
+ aws-partitions = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0vkjw8cxssfwplrcl593gp4jxxiajihb8gqmpgzyac8i3xigpacb";
+ type = "gem";
+ };
+ version = "1.208.0";
+ };
+ aws-sdk-core = {
+ dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18h35j7wp7n6zc5r6dpixjcyjshqmpkhwph9qgpv2g0db37zlxyk";
+ type = "gem";
+ };
+ version = "3.66.0";
+ };
+ aws-sdk-ec2 = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1sb04blmc0lgdgq909cj8cm63zl2idgc5mcysj6cg4rvm8699ahp";
+ type = "gem";
+ };
+ version = "1.106.0";
+ };
+ aws-sdk-iam = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ypv1cmmrc496myllqd8dqz422qm1i0bhskkvqb9b2lbagmzr3l9";
+ type = "gem";
+ };
+ version = "1.29.0";
+ };
+ aws-sdk-kms = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14blvvfz67rhffi4ahby50jiip5f0hm85mcxlx6y93g0cfrnxh3m";
+ type = "gem";
+ };
+ version = "1.24.0";
+ };
+ aws-sdk-s3 = {
+ dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14iv2wqvvbiz0gdms21i9n6rh8390r1yg4zcf8pzzfplbqfwqw4w";
+ type = "gem";
+ };
+ version = "1.48.0";
+ };
+ aws-sigv4 = {
+ dependencies = ["aws-eventstream"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs";
+ type = "gem";
+ };
+ version = "1.1.0";
};
backports = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17pcz0z6jms5jydr1r95kf1bpk3ms618hgr26c62h34icy9i1dpm";
+ sha256 = "0cczfi1yp7a68bg7ipzi4lvrmi4xsi36n9a19krr4yb3nfwd8fn2";
type = "gem";
};
- version = "3.8.0";
+ version = "3.15.0";
};
bcrypt = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d254sdhdj6mzak3fb5x3jam8b94pvl1srladvs53j05a89j5z50";
+ sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy";
type = "gem";
};
- version = "3.1.11";
+ version = "3.1.12";
};
bcrypt_pbkdf = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cj4k13c7qvvck7y25i3xarvyqq8d27vl61jddifkc7llnnap1hv";
+ sha256 = "02vssr285m7kpsr47jdmzbar1h1d0mnkmyrpr1zg828isfmwii35";
type = "gem";
};
- version = "1.0.0";
+ version = "1.0.1";
};
bindata = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10sii2chgnkp2jw830sbr2wb20p8p1wcwrl9jhadkw94f505qcyg";
+ sha256 = "0kz42nvxnk1j9cj0i8lcnhprcgdqsqska92g6l19ziadydfk2gqy";
type = "gem";
};
- version = "2.4.0";
+ version = "2.4.4";
};
bit-struct = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w7x1fh4a6inpb46imhdf4xrq0z4d6zdpg7sdf8n98pif2hx50sx";
@@ -127,6 +243,8 @@
version = "0.16";
};
builder = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
@@ -134,15 +252,92 @@
};
version = "3.2.3";
};
- dnsruby = {
+ concurrent-ruby = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qfvpkka69f8vnmda3zhkr54fjpf7pwgmbx0gcsxg3jd6c7sjs1d";
+ sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
type = "gem";
};
- version = "1.60.2";
+ version = "1.0.5";
+ };
+ cookiejar = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0q0kmbks9l3hl0wdq744hzy97ssq9dvlzywyqv9k9y1p3qc9va2a";
+ type = "gem";
+ };
+ version = "0.3.3";
+ };
+ crass = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
+ type = "gem";
+ };
+ version = "1.0.4";
+ };
+ daemons = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w";
+ type = "gem";
+ };
+ version = "1.3.1";
+ };
+ dnsruby = {
+ dependencies = ["addressable"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "139cbl2k934q7d50g7hi8r4im69ca3iv16y9plq9yc6mgjq1cgfk";
+ type = "gem";
+ };
+ version = "1.61.3";
+ };
+ ed25519 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw";
+ type = "gem";
+ };
+ version = "1.2.4";
+ };
+ em-http-request = {
+ dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13rxmbi0fv91n4sg300v3i9iiwd0jxv0i6xd0sp81dx3jlx7kasx";
+ type = "gem";
+ };
+ version = "1.1.5";
+ };
+ em-socksify = {
+ dependencies = ["eventmachine"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rk43ywaanfrd8180d98287xv2pxyl7llj291cwy87g1s735d5nk";
+ type = "gem";
+ };
+ version = "0.3.2";
};
erubis = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
@@ -150,32 +345,51 @@
};
version = "2.7.0";
};
+ eventmachine = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
+ type = "gem";
+ };
+ version = "1.2.7";
+ };
+ faker = {
+ dependencies = ["i18n"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1wpzpqzpqd9jjzm3ap8182sfbnhdahcxpbg0dssbwq13qdf1s5xs";
+ type = "gem";
+ };
+ version = "2.2.1";
+ };
faraday = {
dependencies = ["multipart-post"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gyqsj7vlqynwvivf9485zwmcj04v1z7gq362z0b8zw2zf4ag0hw";
+ sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0";
type = "gem";
};
- version = "0.13.1";
- };
- ffi = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
- type = "gem";
- };
- version = "1.9.18";
+ version = "0.15.4";
};
filesize = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "061qmg82mm9xnmnq3b7gbi24g28xk62w0b0nw86gybd07m1jn989";
+ sha256 = "17p7rf1x7h3ivaznb4n4kmxnnzj25zaviryqgn2n12v2kmibhp8g";
type = "gem";
};
- version = "0.1.1";
+ version = "0.2.0";
};
hashery = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qj8815bf7q6q7llm5rzdz279gzmpqmqqicxnzv066a020iwqffj";
@@ -183,16 +397,41 @@
};
version = "2.1.2";
};
- i18n = {
+ "http_parser.rb" = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i3aqvzfsj786kwjj70jsjpxm6ffw5pwhalzr2abjfv2bdc7k9kw";
+ sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
type = "gem";
};
- version = "0.8.6";
+ version = "0.6.0";
+ };
+ i18n = {
+ dependencies = ["concurrent-ruby"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3";
+ type = "gem";
+ };
+ version = "0.9.5";
+ };
+ jmespath = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
+ type = "gem";
+ };
+ version = "1.4.0";
};
jsobfu = {
dependencies = ["rkelly-remix"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hchns89cfj0gggm2zbr7ghb630imxm2x2d21ffx2jlasn9xbkyk";
@@ -201,32 +440,40 @@
version = "0.4.2";
};
json = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+ sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.0";
};
loofah = {
- dependencies = ["nokogiri"];
+ dependencies = ["crass" "nokogiri"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8";
+ sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg";
type = "gem";
};
- version = "2.0.3";
+ version = "2.2.3";
};
metasm = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gss57q4lv6l0jkih77zffrpjjzgkdcsy7b9nvvawyzknis9w4s5";
+ sha256 = "0mbmpc8vsi574s78f23bhiqk07sr6yrrrmk702lfv61ql4ah5l89";
type = "gem";
};
- version = "1.0.3";
+ version = "1.0.4";
};
metasploit-concern = {
dependencies = ["activemodel" "activesupport" "railties"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0v9lm225fhzhnbjcc0vwb38ybikxwzlv8116rrrkndzs8qy79297";
@@ -235,27 +482,33 @@
version = "2.0.5";
};
metasploit-credential = {
- dependencies = ["metasploit-concern" "metasploit-model" "metasploit_data_models" "pg" "railties" "rex-socket" "rubyntlm" "rubyzip"];
+ dependencies = ["metasploit-concern" "metasploit-model" "metasploit_data_models" "net-ssh" "pg" "railties" "rex-socket" "rubyntlm" "rubyzip"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1flahrcl5hf4bncqs40mry6pkffvmir85kqzkad22x3dh6crw50i";
+ sha256 = "0m6j149x502p00y2jzra65281dhhw3m8a41pwfn1sk9wv7aiclvl";
type = "gem";
};
- version = "2.0.12";
+ version = "3.0.3";
};
metasploit-framework = {
- dependencies = ["actionpack" "activerecord" "activesupport" "backports" "bcrypt" "bcrypt_pbkdf" "bit-struct" "dnsruby" "filesize" "jsobfu" "json" "metasm" "metasploit-concern" "metasploit-credential" "metasploit-model" "metasploit-payloads" "metasploit_data_models" "metasploit_payloads-mettle" "msgpack" "nessus_rest" "net-ssh" "network_interface" "nexpose" "nokogiri" "octokit" "openssl-ccm" "openvas-omp" "packetfu" "patch_finder" "pcaprub" "pdf-reader" "pg" "railties" "rb-readline" "rbnacl" "rbnacl-libsodium" "recog" "redcarpet" "rex-arch" "rex-bin_tools" "rex-core" "rex-encoder" "rex-exploitation" "rex-java" "rex-mime" "rex-nop" "rex-ole" "rex-powershell" "rex-random_identifier" "rex-registry" "rex-rop_builder" "rex-socket" "rex-sslscan" "rex-struct2" "rex-text" "rex-zip" "robots" "ruby_smb" "rubyntlm" "rubyzip" "sqlite3" "sshkey" "tzinfo" "tzinfo-data" "windows_error" "xdr" "xmlrpc"];
+ dependencies = ["actionpack" "activerecord" "activesupport" "aws-sdk-ec2" "aws-sdk-iam" "aws-sdk-s3" "backports" "bcrypt" "bcrypt_pbkdf" "bit-struct" "concurrent-ruby" "dnsruby" "ed25519" "em-http-request" "faker" "filesize" "jsobfu" "json" "metasm" "metasploit-concern" "metasploit-credential" "metasploit-model" "metasploit-payloads" "metasploit_data_models" "metasploit_payloads-mettle" "mqtt" "msgpack" "nessus_rest" "net-ssh" "network_interface" "nexpose" "nokogiri" "octokit" "openssl-ccm" "openvas-omp" "packetfu" "patch_finder" "pcaprub" "pdf-reader" "pg" "railties" "rb-readline" "recog" "redcarpet" "rex-arch" "rex-bin_tools" "rex-core" "rex-encoder" "rex-exploitation" "rex-java" "rex-mime" "rex-nop" "rex-ole" "rex-powershell" "rex-random_identifier" "rex-registry" "rex-rop_builder" "rex-socket" "rex-sslscan" "rex-struct2" "rex-text" "rex-zip" "ruby-macho" "ruby_smb" "rubyntlm" "rubyzip" "sinatra" "sqlite3" "sshkey" "thin" "tzinfo" "tzinfo-data" "warden" "windows_error" "xdr" "xmlrpc"];
+ groups = ["default"];
+ platforms = [];
source = {
fetchSubmodules = false;
- rev = "dbec1c2d2ae4bd77276cbfb3c6ee2902048b9453";
- sha256 = "06a2dc64wl8w02zimf44hch4cap7ckw42kg1x01lmcwaa8d5q09w";
+ rev = "2b9e74c7a8a4423ea195e75abca1f56c354e5541";
+ sha256 = "16jl3fkfbwl4wwbj2zrq9yr8y8brkhj9641hplc8idv8gaqkgmm5";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
- version = "4.16.1";
+ version = "5.0.45";
};
metasploit-model = {
dependencies = ["activemodel" "activesupport" "railties"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05pnai1cv00xw87rrz38dz4s3ss45s90290d0knsy1mq6rp8yvmw";
@@ -264,63 +517,89 @@
version = "2.0.4";
};
metasploit-payloads = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0icha08z4c5rnyp66xcyn9c8lbv43gx7hgs9rsm3539gj8c40znx";
+ sha256 = "01s3xmgw4fp2ic0wql8lswa86q3lgr3z687idx3xkfii3dskjpp3";
+ type = "gem";
+ };
+ version = "1.3.70";
+ };
+ metasploit_data_models = {
+ dependencies = ["activerecord" "activesupport" "arel-helpers" "metasploit-concern" "metasploit-model" "pg" "postgres_ext" "railties" "recog"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1h59lblfrx8gsnqr10wk958zp6rsjy3qib3hb87s3nm6m1zhm2bc";
+ type = "gem";
+ };
+ version = "3.0.10";
+ };
+ metasploit_payloads-mettle = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1x2rgs2r16m8z87j5z78vp49xvr2sr4dxjgbi6d0nxrlr52pd8yf";
+ type = "gem";
+ };
+ version = "0.5.16";
+ };
+ mini_portile2 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
+ type = "gem";
+ };
+ version = "2.4.0";
+ };
+ minitest = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+ type = "gem";
+ };
+ version = "5.11.3";
+ };
+ mqtt = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0d1khsry5mf63y03r6v91f4vrbn88277ksv7d69z3xmqs9sgpri9";
+ type = "gem";
+ };
+ version = "0.5.0";
+ };
+ msgpack = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1";
type = "gem";
};
version = "1.3.1";
};
- metasploit_data_models = {
- dependencies = ["activerecord" "activesupport" "arel-helpers" "metasploit-concern" "metasploit-model" "pg" "postgres_ext" "railties" "recog"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0j3ijxn6n3ack9572a74cwknijymy41c8rx34njyhg25lx4hbvah";
- type = "gem";
- };
- version = "2.0.15";
- };
- metasploit_payloads-mettle = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1y2nfzgs17pq3xvlw14jgjcksr4h8p4miypxk9a87l1h7xv7dcgn";
- type = "gem";
- };
- version = "0.2.0";
- };
- mini_portile2 = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm";
- type = "gem";
- };
- version = "2.2.0";
- };
- minitest = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "05521clw19lrksqgvg2kmm025pvdhdaniix52vmbychrn2jm7kz2";
- type = "gem";
- };
- version = "5.10.3";
- };
- msgpack = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0ck7w17d6b4jbb8inh1q57bghi9cjkiaxql1d3glmj1yavbpmlh7";
- type = "gem";
- };
- version = "1.1.0";
- };
multipart-post = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+ sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
type = "gem";
};
- version = "2.0.0";
+ version = "2.1.1";
};
nessus_rest = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1allyrd4rll333zbmsi3hcyg6cw1dhc4bg347ibsw191nswnp8ci";
@@ -329,56 +608,70 @@
version = "0.1.6";
};
net-ssh = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q";
+ sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40";
type = "gem";
};
- version = "4.1.0";
+ version = "5.2.0";
};
network_interface = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ir4c1vbz1y0gxyih024262i7ig1nji1lkylcrn9pjzx3798p97a";
+ sha256 = "1xh4knfq77ii4pjzsd2z1p3nd6nrcdjhb2vi5gw36jqj43ffw0zp";
type = "gem";
};
- version = "0.0.1";
+ version = "0.0.2";
};
nexpose = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jnyvj09z8r3chhj930fdnashbfcfv0vw2drjvsrcnm7firdhdzb";
+ sha256 = "0i108glkklwgjxhfhnlqf4b16plqf9b84qpfz0pnl2pbnal5af8m";
type = "gem";
};
- version = "6.1.1";
+ version = "7.2.1";
};
nokogiri = {
dependencies = ["mini_portile2"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn";
+ sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
type = "gem";
};
- version = "1.8.0";
+ version = "1.10.4";
};
octokit = {
dependencies = ["sawyer"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h6cm7bi0y7ysjgwws3paaipqdld6c0m0niazrjahhpz88qqq1g4";
+ sha256 = "1w7agbfg39jzqk81yad9xhscg31869277ysr2iwdvpjafl5lj4ha";
type = "gem";
};
- version = "4.7.0";
+ version = "4.14.0";
};
openssl-ccm = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18h5lxv0zh4j2f0wnhdmfz63x02vbzbq2k1clz6kzr0q83h8kj9c";
+ sha256 = "0gxwxk657jya2s5m8cpckvgy5m7qx0hzfp8xvc0hg2wf1lg5gwp0";
type = "gem";
};
- version = "1.2.1";
+ version = "1.2.2";
};
openvas-omp = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14xf614vd76qjdjxjv14mmjar6s64fwp4cwb7bv5g1wc29srg28x";
@@ -388,6 +681,8 @@
};
packetfu = {
dependencies = ["pcaprub"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16ppq9wfxq4x2hss61l5brs3s6fmi8gb50mnp1nnnzb1asq4g8ll";
@@ -396,6 +691,8 @@
version = "1.1.13";
};
patch_finder = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1md9scls55n1riw26vw1ak0ajq38dfygr36l0h00wqhv51cq745m";
@@ -404,31 +701,39 @@
version = "1.0.2";
};
pcaprub = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pl4lqy7308185pfv0197n8b4v20fhd0zb3wlpz284rk8ssclkvz";
+ sha256 = "0h4iarqdych6v4jm5s0ywkc01qspadz8sf6qn7pkqmszq4iqv67q";
type = "gem";
};
- version = "0.12.4";
+ version = "0.13.0";
};
pdf-reader = {
dependencies = ["Ascii85" "afm" "hashery" "ruby-rc4" "ttfunk"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nlammdpjy3padmzxhsql7mw31jyqp88n6bdffiarv5kzl4s3y7p";
+ sha256 = "14lqdbiwn2qwgbvnnzxg7haqiy026d8x37hp45c3m9jb9rym92ps";
type = "gem";
};
- version = "2.0.0";
+ version = "2.2.1";
};
pg = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03xcgwjs6faxis81jxf2plnlalg55dhhafqv3kvjxfr8ic7plpw5";
+ sha256 = "00vhasqwc4f98qb4wxqn2h07fjwzhp5lwyi41j2gndi2g02wrdqh";
type = "gem";
};
- version = "0.20.0";
+ version = "0.21.0";
};
pg_array_parser = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1034dhg8h53j48sfm373js54skg4vpndjga6hzn2zylflikrrf3s";
@@ -438,22 +743,28 @@
};
postgres_ext = {
dependencies = ["activerecord" "arel" "pg_array_parser"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lbp1qf5s1addhznm7d4bzks9adh7jpilgcsr8k7mbd0a1ailcgc";
+ sha256 = "0ni1ajzxvc17ba4rgl27cd3645ddbpqpfckv7m08sfgk015hh7dq";
type = "gem";
};
- version = "3.0.0";
+ version = "3.0.1";
};
public_suffix = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
+ sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
type = "gem";
};
- version = "2.0.5";
+ version = "4.0.1";
};
rack = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
@@ -461,8 +772,21 @@
};
version = "1.6.11";
};
+ rack-protection = {
+ dependencies = ["rack"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss";
+ type = "gem";
+ };
+ version = "1.5.5";
+ };
rack-test = {
dependencies = ["rack"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
@@ -472,6 +796,8 @@
};
rails-deprecated_sanitizer = {
dependencies = ["activesupport"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj";
@@ -481,40 +807,50 @@
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ny7mbjxhq20rzg4pivvyvk14irmc7cn20kxfk3vc0z2r2c49p8r";
+ sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6";
type = "gem";
};
- version = "1.0.8";
+ version = "1.0.9";
};
rails-html-sanitizer = {
dependencies = ["loofah"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7";
+ sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq";
type = "gem";
};
- version = "1.0.3";
+ version = "1.2.0";
};
railties = {
dependencies = ["actionpack" "activesupport" "rake" "thor"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1g5jnk1zllm2fr06lixq7gv8l2cwqc99akv7886gz6lshijpfyxd";
+ sha256 = "1bjf21z9maiiazc1if56nnh9xmgbkcqlpznv34f40a1hsvgk1d1m";
type = "gem";
};
- version = "4.2.9";
+ version = "4.2.11.1";
};
rake = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
+ sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp";
type = "gem";
};
- version = "12.0.0";
+ version = "12.3.3";
};
rb-readline = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14w79a121czmvk1s953qfzww30mqjb2zc0k9qhi0ivxxk3hxg6wy";
@@ -522,69 +858,63 @@
};
version = "0.5.5";
};
- rbnacl = {
- dependencies = ["ffi"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "08dkigw8wdx53hviw1zqrs7rcrzqcwh9jd3dvwr72013z9fmyp48";
- type = "gem";
- };
- version = "4.0.2";
- };
- rbnacl-libsodium = {
- dependencies = ["rbnacl"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1323fli41m01af13xz5xvabsjnz09si1b9l4qd2p802kq0dr61gd";
- type = "gem";
- };
- version = "1.0.13";
- };
recog = {
dependencies = ["nokogiri"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h023ykrrra74bpbibkyg083kafaswvraw4naw9p1ghcjzn9ggj3";
+ sha256 = "0kbv0j82zf90sc9hhwna2bkb5zv0nxagk22gxyfy82kjmcz71c6k";
type = "gem";
};
- version = "2.1.12";
+ version = "2.3.2";
};
redcarpet = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
+ sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k";
type = "gem";
};
- version = "3.4.0";
+ version = "3.5.0";
};
rex-arch = {
dependencies = ["rex-text"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1izzalmjwdyib8y0xlgys8qb60di6xyjk485ylgh14p47wkyc6yp";
+ sha256 = "0cvdy2ysiphdig258lkicbxqq2y47bkl69kgj4kkj8w338rb5kwa";
type = "gem";
};
- version = "0.1.11";
+ version = "0.1.13";
};
rex-bin_tools = {
dependencies = ["metasm" "rex-arch" "rex-core" "rex-struct2" "rex-text"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01hi1cjr68adp47nxbjfprvn0r3b72r4ib82x9j33bf2pny6nvaw";
+ sha256 = "19q4cj7cis29k3zx9j2gp4h3ib0zig2fa4rs56c1gjr32f192zzk";
type = "gem";
};
- version = "0.1.4";
+ version = "0.1.6";
};
rex-core = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "16dwf4pw7bpx8xvlv241imxvwhvjfv0cw9kl7ipsv40yazy5lzpk";
+ sha256 = "1b9pf7f8m2zjck65dpp8h8v4n0a05kfas6cn9adv0w8d9z58aqvv";
type = "gem";
};
- version = "0.1.12";
+ version = "0.1.13";
};
rex-encoder = {
dependencies = ["metasm" "rex-arch" "rex-text"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zm5jdxgyyp8pkfqwin34izpxdrmglx6vmk20ifnvcsm55c9m70z";
@@ -594,14 +924,18 @@
};
rex-exploitation = {
dependencies = ["jsobfu" "metasm" "rex-arch" "rex-encoder" "rex-text"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gbj28jqaaldpk4qzysgcl6m0wcqx3gcldarqdk55p5z9zasrk19";
+ sha256 = "0b2jg7mccwc34j9mfpndh7b387723qas38qsd906bs4s8b6hf05c";
type = "gem";
};
- version = "0.1.14";
+ version = "0.1.21";
};
rex-java = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j58k02p5g9snkpak64sb4aymkrvrh9xpqh8wsnya4w7b86w2y6i";
@@ -611,6 +945,8 @@
};
rex-mime = {
dependencies = ["rex-text"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15a14kz429h7pn81ysa6av3qijxjmxagjff6dyss5v394fxzxf4a";
@@ -620,6 +956,8 @@
};
rex-nop = {
dependencies = ["rex-arch"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0aigf9qsqsmiraa6zvfy1a7cyvf7zc3iyhzxi6fjv5sb8f64d6ny";
@@ -629,6 +967,8 @@
};
rex-ole = {
dependencies = ["rex-text"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pnzbqfnvbs0vc0z0ryszk3fxhgxrjd6gzwqa937rhlphwp5jpww";
@@ -638,23 +978,29 @@
};
rex-powershell = {
dependencies = ["rex-random_identifier" "rex-text"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nl60fdd1rlckk95d3s3y873w84vb0sgwvwxdzv414qxz8icpjnm";
+ sha256 = "1fcyiz8cgcv6pcn5w969ac4wwhr1cz6jk6kf6p8gyw5rjrlwfz0j";
type = "gem";
};
- version = "0.1.72";
+ version = "0.1.82";
};
rex-random_identifier = {
dependencies = ["rex-text"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cksrljaw61mdjvbmj9vqqhd8nra7jv466w5nim47n73rj72jc19";
+ sha256 = "0fg94sczff5c2rlvqqgw2dndlqyzjil5rjk3p9f46ss2hc8zxlbk";
type = "gem";
};
- version = "0.1.2";
+ version = "0.1.4";
};
rex-registry = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wv812ghnz143vx10ixmv32ypj1xrzr4rh4kgam8d8wwjwxsgw1q";
@@ -664,6 +1010,8 @@
};
rex-rop_builder = {
dependencies = ["metasm" "rex-core" "rex-text"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xjd3d6wnbq4ym0d0m268md8fb16f2hbwrahvxnl14q63fj9i3wy";
@@ -673,15 +1021,19 @@
};
rex-socket = {
dependencies = ["rex-core"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bkr64qrfy2mcv6cpp2z2rn9npgn9s0yyagzjh7kawbm80ldwf2h";
+ sha256 = "136szyv31fcdzmcgs44vg009k3ssyawkqppkhm3xyv2ivpp1mlgv";
type = "gem";
};
- version = "0.1.8";
+ version = "0.1.17";
};
rex-sslscan = {
dependencies = ["rex-core" "rex-socket" "rex-text"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06gbx45q653ajcx099p0yxdqqxazfznbrqshd4nwiwg1p498lmyx";
@@ -690,6 +1042,8 @@
version = "0.1.5";
};
rex-struct2 = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nbdn53264a20cr2m2nq2v4mg0n33dvrd1jj1sixl37qjzw2k452";
@@ -698,15 +1052,19 @@
version = "0.1.2";
};
rex-text = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "024miva867h4wv4y1lnxxrw2d7p51va32ismxqf3fsz4s9cqc88m";
+ sha256 = "0cmfwzd3r6xzhaw5l2grgiivql1yynh620drg8h39q8hiixya6xz";
type = "gem";
};
- version = "0.2.15";
+ version = "0.2.23";
};
rex-zip = {
dependencies = ["rex-text"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mbfryyhcw47i7jb8cs8vilbyqgyiyjkfl1ngl6wdbf7d87dwdw7";
@@ -715,6 +1073,8 @@
version = "0.1.3";
};
rkelly-remix = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g7hjl9nx7f953y7lncmfgp0xgxfxvgfm367q6da9niik6rp1y3j";
@@ -722,15 +1082,19 @@
};
version = "0.0.7";
};
- robots = {
+ ruby-macho = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "141gvihcr2c0dpzl3dqyh8kqc9121prfdql2iamaaw0mf9qs3njs";
+ sha256 = "1k5vvk9d13pixhbram6fs74ibgmr2dngv7bks13npcjb42q275if";
type = "gem";
};
- version = "0.10.1";
+ version = "2.2.0";
};
ruby-rc4 = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00vci475258mmbvsdqkmqadlwn6gj9m01sp7b5a3zd90knil1k00";
@@ -740,14 +1104,18 @@
};
ruby_smb = {
dependencies = ["bindata" "rubyntlm" "windows_error"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jby5wlppxhc2jlqldic05aqd5l57171lsxqv86702grk665n612";
+ sha256 = "125pimmaskp13nkk5j138nfk1kd8n91sfdlx4dhj2j9zk342wsf4";
type = "gem";
};
- version = "0.0.18";
+ version = "1.1.0";
};
rubyntlm = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy";
@@ -756,47 +1124,81 @@
version = "0.6.2";
};
rubyzip = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz";
+ sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
type = "gem";
};
- version = "1.2.1";
+ version = "1.2.3";
};
sawyer = {
dependencies = ["addressable" "faraday"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd";
+ sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz";
type = "gem";
};
- version = "0.8.1";
+ version = "0.8.2";
+ };
+ sinatra = {
+ dependencies = ["rack" "rack-protection" "tilt"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
+ type = "gem";
+ };
+ version = "1.4.8";
};
sqlite3 = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i";
+ sha256 = "1v903nbcws3ifm6jnxrdfcpgl1qg2x3lbif16mhlbyfn0npzb494";
type = "gem";
};
- version = "1.3.13";
+ version = "1.4.1";
};
sshkey = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h";
+ sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp";
type = "gem";
};
- version = "1.9.0";
+ version = "2.0.0";
+ };
+ thin = {
+ dependencies = ["daemons" "eventmachine" "rack"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f";
+ type = "gem";
+ };
+ version = "1.7.2";
};
thor = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl";
+ sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
type = "gem";
};
- version = "0.20.0";
+ version = "0.20.3";
};
thread_safe = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
@@ -804,7 +1206,19 @@
};
version = "0.3.6";
};
+ tilt = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
+ type = "gem";
+ };
+ version = "2.0.9";
+ };
ttfunk = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mgrnqla5n51v4ivn844albsajkck7k6lviphfqa8470r46c58cd";
@@ -814,23 +1228,40 @@
};
tzinfo = {
dependencies = ["thread_safe"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05r81lk7q7275rdq7xipfm0yxgqyd2ggh73xpc98ypngcclqcscl";
+ sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
type = "gem";
};
- version = "1.2.3";
+ version = "1.2.5";
};
tzinfo-data = {
dependencies = ["tzinfo"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n83rmy476d4qmzq74qx0j7lbcpskbvrj1bmy3np4d5pydyw2yky";
+ sha256 = "1m507in0d7vlfgasxpkz3y1a44zp532k9qlqcaz90ay939sz9h5q";
type = "gem";
};
- version = "1.2017.2";
+ version = "1.2019.2";
+ };
+ warden = {
+ dependencies = ["rack"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0va966lhpylcwbqb9n151kkihx30agh0a57mwjwdxyanll4s1q12";
+ type = "gem";
+ };
+ version = "1.2.7";
};
windows_error = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kbcv9j5sc7pvjzf1dkp6h69i6lmj205zyy2arxcfgqg11bsz2kp";
@@ -840,6 +1271,8 @@
};
xdr = {
dependencies = ["activemodel" "activesupport"];
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c5cp1k4ij3xq1q6fb0f6xv5b65wy18y7bhwvsdx8wd0zyg3x96m";
@@ -848,6 +1281,8 @@
version = "2.0.0";
};
xmlrpc = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1s744iwblw262gj357pky3d9fcx9hisvla7rnw29ysn5zsb6i683";
diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix
index 3d4bdd2edf17..a23e29175615 100644
--- a/pkgs/tools/security/mfcuk/default.nix
+++ b/pkgs/tools/security/mfcuk/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libnfc }:
-stdenv.mkDerivation rec {
- name = "mfcuk-${version}";
+stdenv.mkDerivation {
+ pname = "mfcuk";
version = "0.3.8";
src = fetchurl {
diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix
index f5bc7a60839e..15ee2446922b 100644
--- a/pkgs/tools/security/minisign/default.nix
+++ b/pkgs/tools/security/minisign/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, libsodium }:
stdenv.mkDerivation rec {
- name = "minisign-${version}";
+ pname = "minisign";
version = "0.8";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/tools/security/mkp224o/default.nix
index 0c927b7501b6..a4aae480ae16 100644
--- a/pkgs/tools/security/mkp224o/default.nix
+++ b/pkgs/tools/security/mkp224o/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, libsodium }:
stdenv.mkDerivation rec {
- name = "mkp224o-${version}";
+ pname = "mkp224o";
version = "1.3.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/mkrand/default.nix b/pkgs/tools/security/mkrand/default.nix
index 5d1cfdd40232..bb9c932d19e3 100644
--- a/pkgs/tools/security/mkrand/default.nix
+++ b/pkgs/tools/security/mkrand/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "mkrand-0.1.0";
src = fetchurl {
diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix
index 6ec90cd15a85..2a9e41ac0fa9 100644
--- a/pkgs/tools/security/modsecurity/default.nix
+++ b/pkgs/tools/security/modsecurity/default.nix
@@ -10,11 +10,11 @@ let luaValue = if luaSupport then lua5 else "no";
in
stdenv.mkDerivation rec {
- name = "modsecurity-${version}";
+ pname = "modsecurity";
version = "2.9.3";
src = fetchurl {
- url = "https://www.modsecurity.org/tarball/${version}/${name}.tar.gz";
+ url = "https://www.modsecurity.org/tarball/${version}/${pname}-${version}.tar.gz";
sha256 = "0611nskd2y6yagrciqafxdn4rxbdk2v4swf45kc1sgwx2sfh34j1";
};
diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix
index e1a134ec5d18..b4d5ddb267dc 100644
--- a/pkgs/tools/security/monkeysphere/default.nix
+++ b/pkgs/tools/security/monkeysphere/default.nix
@@ -13,7 +13,7 @@ let
patches = oldAttrs.patches ++ [ ./openssh-nixos-sandbox.patch ];
});
in stdenv.mkDerivation rec {
- name = "monkeysphere-${version}";
+ pname = "monkeysphere";
version = "0.44";
# The patched OpenSSH binary MUST NOT be used (except in the check phase):
diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix
index 2e83c691dc7f..2d758aa2aecd 100644
--- a/pkgs/tools/security/munge/default.nix
+++ b/pkgs/tools/security/munge/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "dun";
repo = "munge";
- rev = "${name}";
+ rev = name;
sha256 = "1c4ff3d8ad3inbliszr4slym3b4cn19bn6mxm13mzy20jyi2rm70";
};
diff --git a/pkgs/tools/security/nasty/default.nix b/pkgs/tools/security/nasty/default.nix
index 84b738a21092..d45861cf50e1 100644
--- a/pkgs/tools/security/nasty/default.nix
+++ b/pkgs/tools/security/nasty/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gpgme }:
stdenv.mkDerivation rec {
- name = "nasty-${version}";
+ pname = "nasty";
version = "0.6";
src = fetchurl {
- url = "https://www.vanheusden.com/nasty/${name}.tgz";
+ url = "https://www.vanheusden.com/nasty/${pname}-${version}.tgz";
sha256 = "1dznlxr728k1pgy1kwmlm7ivyl3j3rlvkmq34qpwbwbj8rnja1vn";
};
diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix
index 88494e8dbdf7..5e26bcf6759d 100644
--- a/pkgs/tools/security/neopg/default.nix
+++ b/pkgs/tools/security/neopg/default.nix
@@ -11,7 +11,7 @@
, gnutls }:
stdenv.mkDerivation rec {
- name = "neopg-${version}";
+ pname = "neopg";
version = "0.0.6";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
index 1b18f0e1e11a..33a873f73dae 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -2,7 +2,7 @@
, qtbase, qttranslations, qtsvg, wrapQtAppsHook }:
stdenv.mkDerivation rec {
- name = "nitrokey-app-${version}";
+ pname = "nitrokey-app";
version = "1.3.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/tools/security/nmap/qt.nix
index c0b7a72d18e0..f873c475bbfe 100644
--- a/pkgs/tools/security/nmap/qt.nix
+++ b/pkgs/tools/security/nmap/qt.nix
@@ -3,7 +3,7 @@
, qtbase, qtscript, qtwebengine }:
stdenv.mkDerivation rec {
- name = "nmapsi4-${version}";
+ pname = "nmapsi4";
version = "0.4.80-20180430";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix
index 221817b004df..f1a61adabbb6 100644
--- a/pkgs/tools/security/notary/default.nix
+++ b/pkgs/tools/security/notary/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildGoPackage, libtool }:
buildGoPackage rec {
- name = "notary-${version}";
+ pname = "notary";
version = "0.6.1";
gitcommit = "d6e1431f";
@@ -18,7 +18,7 @@ buildGoPackage rec {
buildPhase = ''
runHook preBuild
cd go/src/github.com/theupdateframework/notary
- make client GITCOMMIT=${gitcommit}
+ SKIPENVCHECK=1 make client GITCOMMIT=${gitcommit}
runHook postBuild
'';
diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix
index f88156285ca7..3f04d2764891 100644
--- a/pkgs/tools/security/nsjail/default.nix
+++ b/pkgs/tools/security/nsjail/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "nsjail-${version}";
+ pname = "nsjail";
version = "2.8";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix
index a27ed7bad1a5..caaa5eba86a9 100644
--- a/pkgs/tools/security/nwipe/default.nix
+++ b/pkgs/tools/security/nwipe/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.25";
- name = "nwipe-${version}";
+ pname = "nwipe";
src = fetchFromGitHub {
owner = "martijnvanbrummelen";
repo = "nwipe";
diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix
index 9e154c19a9c0..e31d62dc8b7a 100644
--- a/pkgs/tools/security/oath-toolkit/default.nix
+++ b/pkgs/tools/security/oath-toolkit/default.nix
@@ -5,7 +5,7 @@ let
if stdenv.isDarwin then xmlsec
else pam;
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
name = "oath-toolkit-2.6.2";
src = fetchFromGitLab {
diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix
index 91df7f3fbb0a..baea02402d9f 100644
--- a/pkgs/tools/security/omapd/default.nix
+++ b/pkgs/tools/security/omapd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, qt4, gdb, zlib }:
stdenv.mkDerivation rec {
- name = "omapd-${version}";
+ pname = "omapd";
version = "0.9.2";
src = fetchurl {
- url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${name}.tgz";
+ url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${pname}-${version}.tgz";
sha256 = "0d7lgv957jhbsav60j50jhdy3rpcqgql74qsniwnnpm3yqj9p0xc";
};
diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix
index 898bfb599a31..5a9f10127481 100644
--- a/pkgs/tools/security/onioncircuits/default.nix
+++ b/pkgs/tools/security/onioncircuits/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, gnome3 }:
pythonPackages.buildPythonApplication rec {
- name = "onioncircuits-${version}";
+ pname = "onioncircuits";
version = "0.5";
src = fetchgit {
diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix
index eff2211a71c5..1d506928a52a 100644
--- a/pkgs/tools/security/opencryptoki/default.nix
+++ b/pkgs/tools/security/opencryptoki/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, openssl, trousers, autoreconfHook, libtool, bison, flex }:
stdenv.mkDerivation rec {
- name = "opencryptoki-${version}";
+ pname = "opencryptoki";
version = "3.8.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
index 769b87fa8d31..e5611f8b2671 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/pkgs/tools/security/opensc/default.nix
@@ -6,7 +6,7 @@
}:
stdenv.mkDerivation rec {
- name = "opensc-${version}";
+ pname = "opensc";
version = "0.19.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix
index 11e1f14baf9a..1e618cdce1ad 100644
--- a/pkgs/tools/security/p0f/default.nix
+++ b/pkgs/tools/security/p0f/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libpcap, bash }:
stdenv.mkDerivation rec {
- name = "p0f-${version}";
+ pname = "p0f";
version = "3.09b";
src = fetchurl {
- url = "http://lcamtuf.coredump.cx/p0f3/releases/${name}.tgz";
+ url = "http://lcamtuf.coredump.cx/p0f3/releases/${pname}-${version}.tgz";
sha256 = "0zqfq3gdnha29ckvlqmyp36c0jhj7f69bhqqx31yb6vkirinhfsl";
};
diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix
index d7d1f1c40d47..dc3582b7369f 100644
--- a/pkgs/tools/security/paperkey/default.nix
+++ b/pkgs/tools/security/paperkey/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
- name = "paperkey-${version}";
+ pname = "paperkey";
version = "1.6";
src = fetchurl {
- url = "https://www.jabberwocky.com/software/paperkey/${name}.tar.gz";
+ url = "https://www.jabberwocky.com/software/paperkey/${pname}-${version}.tar.gz";
sha256 = "1xq5gni6gksjkd5avg0zpd73vsr97appksfx0gx2m38s4w9zsid2";
};
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 94f517d2e92d..aeb838c05765 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -30,10 +30,10 @@ let
generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec {
version = "1.7.3";
- name = "password-store-${version}";
+ pname = "password-store";
src = fetchurl {
- url = "https://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
+ url = "https://git.zx2c4.com/password-store/snapshot/${pname}-${version}.tar.xz";
sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b";
};
diff --git a/pkgs/tools/security/pass/extensions/audit.nix b/pkgs/tools/security/pass/extensions/audit.nix
index 79dd1fadb01c..ca5ca855337f 100644
--- a/pkgs/tools/security/pass/extensions/audit.nix
+++ b/pkgs/tools/security/pass/extensions/audit.nix
@@ -4,7 +4,7 @@ let
pythonEnv = pythonPackages.python.withPackages (p: [ p.requests ]);
in stdenv.mkDerivation rec {
- name = "pass-audit-${version}";
+ pname = "pass-audit";
version = "0.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix
index ba3f821e88c6..c031c59e3f63 100644
--- a/pkgs/tools/security/pass/extensions/genphrase.nix
+++ b/pkgs/tools/security/pass/extensions/genphrase.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "pass-genphrase-${version}";
+ pname = "pass-genphrase";
version = "0.1";
src = fetchFromGitHub {
owner = "congma";
repo = "pass-genphrase";
- rev = "${version}";
+ rev = version;
sha256 = "0vcg3b79n1r949qfn8ns85bq2mfsmbf4jw2dlzif8425n8ppfsgd";
};
diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix
index 0ee775bfbe8b..9d9d36fd0d90 100644
--- a/pkgs/tools/security/pass/extensions/import.nix
+++ b/pkgs/tools/security/pass/extensions/import.nix
@@ -4,7 +4,7 @@ let
pythonEnv = pythonPackages.python.withPackages (p: [ p.defusedxml ]);
in stdenv.mkDerivation rec {
- name = "pass-import-${version}";
+ pname = "pass-import";
version = "2.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/extensions/otp.nix b/pkgs/tools/security/pass/extensions/otp.nix
index c951a5e37ef6..4b15c3d68035 100644
--- a/pkgs/tools/security/pass/extensions/otp.nix
+++ b/pkgs/tools/security/pass/extensions/otp.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, oathToolkit }:
stdenv.mkDerivation rec {
- name = "pass-otp-${version}";
+ pname = "pass-otp";
version = "1.2.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix
index b9f458cd4e12..ccb558c9b853 100644
--- a/pkgs/tools/security/pass/extensions/tomb.nix
+++ b/pkgs/tools/security/pass/extensions/tomb.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, tomb }:
stdenv.mkDerivation rec {
- name = "pass-tomb-${version}";
+ pname = "pass-tomb";
version = "1.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix
index dd145b069720..b712557ab3eb 100644
--- a/pkgs/tools/security/pass/extensions/update.nix
+++ b/pkgs/tools/security/pass/extensions/update.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "pass-update-${version}";
+ pname = "pass-update";
version = "2.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix
index 6140159dcb50..b188b411517b 100644
--- a/pkgs/tools/security/pass/rofi-pass.nix
+++ b/pkgs/tools/security/pass/rofi-pass.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "rofi-pass-${version}";
+ pname = "rofi-pass";
version = "2.0.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix
index 23a744f8e23d..8aadb685aa8b 100644
--- a/pkgs/tools/security/pcsc-cyberjack/default.nix
+++ b/pkgs/tools/security/pcsc-cyberjack/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libusb, pcsclite }:
stdenv.mkDerivation rec {
- name = "pcsc-cyberjack-${version}";
+ pname = "pcsc-cyberjack";
version = "3.99.5_SP12";
src = with stdenv.lib; let
diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix
index 88ca8a3d1b1a..0302fc6fc674 100644
--- a/pkgs/tools/security/pcsc-scm-scl011/default.nix
+++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix
@@ -6,7 +6,7 @@ let
else throw "Unsupported system: ${stdenv.hostPlatform.system}";
in
stdenv.mkDerivation rec {
- name = "pcsc-scm-scl-${version}";
+ pname = "pcsc-scm-scl";
version = "2.09";
src = fetchurl {
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 5c40ccdef584..eed462ef0d04 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -2,7 +2,7 @@
, IOKit ? null }:
stdenv.mkDerivation rec {
- name = "pcsclite-${version}";
+ pname = "pcsclite";
version = "1.8.25";
outputs = [ "bin" "out" "dev" "doc" "man" ];
diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix
index 55d2505ed1cb..c235c98b9719 100644
--- a/pkgs/tools/security/pdfcrack/default.nix
+++ b/pkgs/tools/security/pdfcrack/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
- name = "pdfcrack-${version}";
+ pname = "pdfcrack";
version = "0.17";
src = fetchurl {
diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix
index 9c8f47cd2756..8bf440d2b07f 100644
--- a/pkgs/tools/security/pgpdump/default.nix
+++ b/pkgs/tools/security/pgpdump/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "pgpdump-${version}";
+ pname = "pgpdump";
version = "0.33";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index ac6a50960ad2..25e018de6276 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -60,7 +60,7 @@ mkDerivation rec {
license = licenses.gpl2Plus;
platforms = platforms.all;
longDescription = ''
- Pinentry provides a console and (optional) GTK+ and Qt GUIs allowing users
+ Pinentry provides a console and (optional) GTK and Qt GUIs allowing users
to enter a passphrase when `gpg' or `gpg2' is run and needs it.
'';
maintainers = [ maintainers.ttuegel ];
diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix
index 1fbb52985fb1..25fa180c48b9 100644
--- a/pkgs/tools/security/pinentry/mac.nix
+++ b/pkgs/tools/security/pinentry/mac.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "pinentry-mac-0.9.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix
index b24af50ee7c2..2c03183fa96e 100644
--- a/pkgs/tools/security/prey/default.nix
+++ b/pkgs/tools/security/prey/default.nix
@@ -13,7 +13,7 @@ let
sha256 = "9cb1ad813d052a0a3e3bbdd329a8711ae3272e340379489511f7dd578d911e30";
};
in stdenv.mkDerivation rec {
- name = "prey-bash-client-${version}";
+ pname = "prey-bash-client";
version = "0.6.0";
src = fetchurl {
diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix
index 17bbf982255b..7fc6ed209663 100644
--- a/pkgs/tools/security/qdigidoc/default.nix
+++ b/pkgs/tools/security/qdigidoc/default.nix
@@ -2,7 +2,7 @@
, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }:
stdenv.mkDerivation rec {
- name = "qdigidoc-${version}";
+ pname = "qdigidoc";
version = "4.1.0";
src = fetchgit {
diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix
index f8b110ce2213..fac855f232a6 100644
--- a/pkgs/tools/security/qesteidutil/default.nix
+++ b/pkgs/tools/security/qesteidutil/default.nix
@@ -3,9 +3,9 @@
, pkgconfig, pcsclite, hicolor-icon-theme
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "2018-08-21";
- name = "qesteidutil-${version}";
+ pname = "qesteidutil";
src = fetchFromGitHub {
owner = "open-eid";
diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix
index 3491feccc45c..65158b3c5fe3 100644
--- a/pkgs/tools/security/rarcrack/default.nix
+++ b/pkgs/tools/security/rarcrack/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub, libxml2, file, p7zip, unrar, unzip}:
-stdenv.mkDerivation rec {
- name = "rarcrack-${version}";
+stdenv.mkDerivation {
+ pname = "rarcrack";
version = "0.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix
index 5e622cf68f35..ad606af95621 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/pkgs/tools/security/rhash/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.3.8";
- name = "rhash-${version}";
+ pname = "rhash";
src = fetchFromGitHub {
owner = "rhash";
diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix
index 1091b366781d..e0e2896f6ffc 100644
--- a/pkgs/tools/security/sbsigntool/default.nix
+++ b/pkgs/tools/security/sbsigntool/default.nix
@@ -3,8 +3,8 @@
, openssl, libuuid, gnu-efi, libbfd
}:
-stdenv.mkDerivation rec {
- name = "sbsigntool-${version}";
+stdenv.mkDerivation {
+ pname = "sbsigntool";
version = "0.9.1";
src = fetchgit {
diff --git a/pkgs/tools/security/scallion/default.nix b/pkgs/tools/security/scallion/default.nix
index 75ea92a786c5..e419232641b6 100644
--- a/pkgs/tools/security/scallion/default.nix
+++ b/pkgs/tools/security/scallion/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.1";
- name = "scallion-${version}";
+ pname = "scallion";
src = fetchFromGitHub {
owner = "lachesis";
diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix
index 352a81b2727a..2ca4c1df18c4 100644
--- a/pkgs/tools/security/scrypt/default.nix
+++ b/pkgs/tools/security/scrypt/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation rec {
- name = "scrypt-${version}";
+ pname = "scrypt";
version = "1.2.1";
src = fetchurl {
- url = "https://www.tarsnap.com/scrypt/${name}.tgz";
+ url = "https://www.tarsnap.com/scrypt/${pname}-${version}.tgz";
sha256 = "0xy5yhrwwv13skv9im9vm76rybh9f29j2dh4hlh2x01gvbkza8a6";
};
diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/tools/security/seccure/default.nix
index a2ec48d4d270..686ef36f863c 100644
--- a/pkgs/tools/security/seccure/default.nix
+++ b/pkgs/tools/security/seccure/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libgcrypt }:
stdenv.mkDerivation rec {
- name = "seccure-${version}";
+ pname = "seccure";
version = "0.5";
src = fetchurl {
- url = "http://point-at-infinity.org/seccure/${name}.tar.gz";
+ url = "http://point-at-infinity.org/seccure/${pname}-${version}.tar.gz";
sha256 = "0nwnk3hfhgvf5xr0xipbh6smfnya22wphc5rj0vgi5d0zr5cwrk5";
};
diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix
index fd03e6bebabc..7189032454d6 100644
--- a/pkgs/tools/security/secp256k1/default.nix
+++ b/pkgs/tools/security/secp256k1/default.nix
@@ -15,8 +15,8 @@
let inherit (stdenv.lib) optionals; in
-stdenv.mkDerivation rec {
- name = "secp256k1-${version}";
+stdenv.mkDerivation {
+ pname = "secp256k1";
# I can't find any version numbers, so we're just using the date of the
# last commit.
diff --git a/pkgs/tools/security/sedutil/default.nix b/pkgs/tools/security/sedutil/default.nix
index 343992a6322f..9edd9745326e 100644
--- a/pkgs/tools/security/sedutil/default.nix
+++ b/pkgs/tools/security/sedutil/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "sedutil-${version}";
+ pname = "sedutil";
version = "1.15.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix
index 5d9ffca69375..9d6928abf86f 100644
--- a/pkgs/tools/security/sequoia/default.nix
+++ b/pkgs/tools/security/sequoia/default.nix
@@ -9,16 +9,16 @@ assert pythonSupport -> pythonPackages != null;
rustPlatform.buildRustPackage rec {
pname = "sequoia";
- version = "0.9.0";
+ version = "0.10.0";
src = fetchFromGitLab {
owner = "sequoia-pgp";
repo = pname;
rev = "v${version}";
- sha256 = "13dzwdzz33dy2lgnznsv8wqnw2501f2ggrkfwpqy5x6d1kgms8rj";
+ sha256 = "0gvczghyik56jlnb8cz7jg2l3nbm519gf19g7l5blxci3009v23d";
};
- cargoSha256 = "1zcnkpzcar3a2fk2rn3i3nb70b59ds9fpfa44f15r3aaxajsdhdi";
+ cargoSha256 = "0dk9sjcbmygbdpwqnah5krli1p9j5hahgiqrca9c0kfpfiwgx62q";
nativeBuildInputs = [
pkgconfig
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
;
makeFlags = [
- "PREFIX=${placeholder ''out''}"
+ "PREFIX=${placeholder "out"}"
];
buildFlags = [
diff --git a/pkgs/tools/security/sha1collisiondetection/default.nix b/pkgs/tools/security/sha1collisiondetection/default.nix
index 38da14484147..8c6a026a6124 100644
--- a/pkgs/tools/security/sha1collisiondetection/default.nix
+++ b/pkgs/tools/security/sha1collisiondetection/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libtool, which }:
stdenv.mkDerivation rec {
- name = "sha1collisiondetection-${version}";
+ pname = "sha1collisiondetection";
version = "1.0.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix
index 3d3bd4eef849..18814eb7fa8f 100644
--- a/pkgs/tools/security/shc/default.nix
+++ b/pkgs/tools/security/shc/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "shc-${version}";
+ pname = "shc";
version = "4.0.3";
- rev = "${version}";
+ rev = version;
src = fetchFromGitHub {
inherit rev;
diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix
index a642a12b0bd0..22604a3f70ba 100644
--- a/pkgs/tools/security/signify/default.nix
+++ b/pkgs/tools/security/signify/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libbsd, pkgconfig }:
stdenv.mkDerivation rec {
- name = "signify-${version}";
+ pname = "signify";
version = "25";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix
index 8148692327ef..ea487fed2a1d 100644
--- a/pkgs/tools/security/signing-party/default.nix
+++ b/pkgs/tools/security/signing-party/default.nix
@@ -14,7 +14,6 @@ let
in stdenv.mkDerivation rec {
pname = "signing-party";
version = "2.10";
- name = "${pname}-${version}";
src = fetchFromGitLab {
domain = "salsa.debian.org";
diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/tools/security/simple-tpm-pk11/default.nix
index 96565ec84b52..16056f9a59e0 100644
--- a/pkgs/tools/security/simple-tpm-pk11/default.nix
+++ b/pkgs/tools/security/simple-tpm-pk11/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, trousers, openssl, opencryptoki, autoreconfHook, libtool }:
stdenv.mkDerivation rec {
- name = "simple-tpm-pk11-${version}";
+ pname = "simple-tpm-pk11";
version = "0.06";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix
index ec5eea52a6f8..94642700c336 100644
--- a/pkgs/tools/security/softhsm/default.nix
+++ b/pkgs/tools/security/softhsm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
- name = "softhsm-${version}";
+ pname = "softhsm";
version = "2.5.0";
src = fetchurl {
- url = "https://dist.opendnssec.org/source/${name}.tar.gz";
+ url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz";
sha256 = "1cijq78jr3mzg7jj11r0krawijp99p253f4qdqr94n728p7mdalj";
};
diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix
index a1844668af65..3ece05926ccc 100644
--- a/pkgs/tools/security/spectre-meltdown-checker/default.nix
+++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, coreutils, binutils-unwrapped }:
stdenv.mkDerivation rec {
- name = "spectre-meltdown-checker-${version}";
+ pname = "spectre-meltdown-checker";
version = "0.42";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix
index 1ff9c73d8b58..33ab4c373bca 100644
--- a/pkgs/tools/security/ssdeep/default.nix
+++ b/pkgs/tools/security/ssdeep/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "ssdeep-${version}";
+ pname = "ssdeep";
version = "2.14.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix
index 18f010ee1ecb..a196fe9ca47a 100644
--- a/pkgs/tools/security/sshguard/default.nix
+++ b/pkgs/tools/security/sshguard/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "2.4.0";
- name = "sshguard-${version}";
+ pname = "sshguard";
src = fetchurl {
- url = "mirror://sourceforge/sshguard/${name}.tar.gz";
+ url = "mirror://sourceforge/sshguard/${pname}-${version}.tar.gz";
sha256 = "1h6n2xyh58bshplbdqlr9rbnf3lz7nydnq5m2hkq15is3c4s8p06";
};
diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix
index d3a8f35d9148..15ac376d72a7 100644
--- a/pkgs/tools/security/sslscan/default.nix
+++ b/pkgs/tools/security/sslscan/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, openssl }:
stdenv.mkDerivation rec {
- name = "sslscan-${version}";
+ pname = "sslscan";
version = "1.11.13";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix
index 3bbcdafcdcdd..157e007c534a 100644
--- a/pkgs/tools/security/ssss/default.nix
+++ b/pkgs/tools/security/ssss/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, gmp }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "ssss-0.5";
src = fetchurl {
diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix
index c8be366066be..7a759c3c3336 100644
--- a/pkgs/tools/security/steghide/default.nix
+++ b/pkgs/tools/security/steghide/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ];
version = "0.5.1";
- name = "steghide-${version}";
+ pname = "steghide";
src = fetchurl {
url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ;
diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix
index d28260ffb8b9..38fc884de487 100644
--- a/pkgs/tools/security/stoken/default.nix
+++ b/pkgs/tools/security/stoken/default.nix
@@ -5,7 +5,6 @@
stdenv.mkDerivation rec {
pname = "stoken";
version = "0.92";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "cernekee";
repo = pname;
diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix
index ecc34ede556b..28c462cbb0a2 100644
--- a/pkgs/tools/security/stricat/default.nix
+++ b/pkgs/tools/security/stricat/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "stricat-${version}";
+ pname = "stricat";
version = "20140609100300";
src = fetchurl {
- url = "http://www.stribob.com/dist/${name}.tgz";
+ url = "http://www.stribob.com/dist/${pname}-${version}.tgz";
sha256 = "1axg8r4g5n5kdqj5013pgck80nni3z172xkg506vz4zx1zcmrm4r";
};
diff --git a/pkgs/tools/security/su-exec/default.nix b/pkgs/tools/security/su-exec/default.nix
index 56e40d514bb1..8ff33ee1ec91 100644
--- a/pkgs/tools/security/su-exec/default.nix
+++ b/pkgs/tools/security/su-exec/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "su-exec-${version}";
+ pname = "su-exec";
version = "0.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix
index 15f767415890..97db4a28c458 100644
--- a/pkgs/tools/security/sudolikeaboss/default.nix
+++ b/pkgs/tools/security/sudolikeaboss/default.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, fixDarwinDylibNames, darwin }:
buildGoPackage rec {
- name = "sudolikeaboss-unstable-${version}";
+ pname = "sudolikeaboss-unstable";
version = "20161127-${stdenv.lib.strings.substring 0 7 rev}";
rev = "2d9afe19f872c9f433d476e57ee86169781b164c";
diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix
index f159dd27c42a..f5184b985622 100644
--- a/pkgs/tools/security/tboot/default.nix
+++ b/pkgs/tools/security/tboot/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, trousers, openssl, zlib }:
stdenv.mkDerivation rec {
- name = "tboot-${version}";
+ pname = "tboot";
version = "1.9.8";
src = fetchurl {
- url = "mirror://sourceforge/tboot/${name}.tar.gz";
+ url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz";
sha256 = "06f0ggl6vrb5ghklblvh2ixgmmjv31rkp1vfj9qm497iqwq9ac00";
};
diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix
index 4d0feef72c9f..86a65a060280 100644
--- a/pkgs/tools/security/tcpcrypt/default.nix
+++ b/pkgs/tools/security/tcpcrypt/default.nix
@@ -6,7 +6,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "tcpcrypt-${version}";
+ pname = "tcpcrypt";
version = "0.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index 9a7a245b8134..252d73b479b6 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -5,7 +5,7 @@ let
makeDirs = output: subDir: pkgs: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) pkgs);
in stdenv.mkDerivation rec {
- name = "thc-hydra-${version}";
+ pname = "thc-hydra";
version = "8.5";
src = fetchurl {
diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix
index 170d5c4ff7a4..896ab50562d8 100644
--- a/pkgs/tools/security/tor/tor-arm.nix
+++ b/pkgs/tools/security/tor/tor-arm.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "tor-arm-${version}";
+ pname = "tor-arm";
version = "1.4.5.0";
src = fetchurl {
diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix
index 686d03b7c3fa..8681d80c2ed3 100644
--- a/pkgs/tools/security/tor/torsocks.nix
+++ b/pkgs/tools/security/tor/torsocks.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, autoreconfHook, libcap }:
stdenv.mkDerivation rec {
- name = "torsocks-${version}";
+ pname = "torsocks";
version = "2.3.0";
src = fetchgit {
diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix
index e7a82f6089e7..94d833ca7462 100644
--- a/pkgs/tools/security/tpm-luks/default.nix
+++ b/pkgs/tools/security/tpm-luks/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, autoreconfHook, gawk, trousers, cryptsetup, openssl }:
-stdenv.mkDerivation rec {
- name = "tpm-luks-${version}";
+stdenv.mkDerivation {
+ pname = "tpm-luks";
version = "git-2015-07-11";
src = fetchgit {
diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix
index 1541575aed74..5d54758cc7c2 100644
--- a/pkgs/tools/security/tpm-quote-tools/default.nix
+++ b/pkgs/tools/security/tpm-quote-tools/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, trousers, openssl }:
stdenv.mkDerivation rec {
- name = "tpm-quote-tools-${version}";
+ pname = "tpm-quote-tools";
version = "1.0.4";
src = fetchurl {
- url = "mirror://sourceforge/project/tpmquotetools/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/tpmquotetools/${version}/${pname}-${version}.tar.gz";
sha256 = "1qjs83xb4np4yn1bhbjfhvkiika410v8icwnjix5ad96w2nlxp0h";
};
diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix
index 5a2dc6652ddc..e546cc5a10fb 100644
--- a/pkgs/tools/security/tpm-tools/default.nix
+++ b/pkgs/tools/security/tpm-tools/default.nix
@@ -4,10 +4,11 @@ let
version = "1.3.9.1";
in
stdenv.mkDerivation rec {
- name = "tpm-tools-${version}";
+ pname = "tpm-tools";
+ inherit version;
src = fetchurl {
- url = "mirror://sourceforge/trousers/tpm-tools/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/trousers/tpm-tools/${version}/${pname}-${version}.tar.gz";
sha256 = "0s7srgghykxnlb1g4izabzf2gfb1knxc0nzn6bly49h8cpi19dww";
};
diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix
index 8309390d013b..6f7fed20c89d 100644
--- a/pkgs/tools/security/trousers/default.nix
+++ b/pkgs/tools/security/trousers/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, pkgconfig }:
stdenv.mkDerivation rec {
- name = "trousers-${version}";
+ pname = "trousers";
version = "0.3.13";
src = fetchurl {
- url = "mirror://sourceforge/trousers/trousers/${version}/${name}.tar.gz";
+ url = "mirror://sourceforge/trousers/trousers/${version}/${pname}-${version}.tar.gz";
sha256 = "1lvnla1c1ig2w3xvvrqg2w9qm7a1ygzy1j2gg8j7p8c87i58x45v";
};
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index dcded0652763..c0fa221c9691 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
- name = "vault-${version}";
+ pname = "vault";
version = "1.2.2";
src = fetchFromGitHub {
diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix
index b58e41d850d8..87f2e922ff74 100644
--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@@ -6,32 +6,33 @@ let
sources = let
base = "https://releases.hashicorp.com/vault/${version}";
in {
- "x86_64-linux" = fetchurl {
+ x86_64-linux = fetchurl {
url = "${base}/vault_${version}_linux_amd64.zip";
sha256 = "293b88f4d31f6bcdcc8b508eccb7b856a0423270adebfa0f52f04144c5a22ae0";
};
- "i686-linux" = fetchurl {
+ i686-linux = fetchurl {
url = "${base}/vault_${version}_linux_386.zip";
sha256 = "9f2fb99e08fa3d25af1497516d08b5d2d8a73bcacd5354ddec024e9628795867";
};
- "x86_64-darwin" = fetchurl {
+ x86_64-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_amd64.zip";
sha256 = "a0a7a242f8299ac4a00af8aa10ccedaf63013c8a068f56eadfb9d730b87155ea";
};
- "i686-darwin" = fetchurl {
+ i686-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_386.zip";
sha256 = "50542cfb37abb06e8bb6b8ba41f5ca7d72a4d6a4396d4e3f4a8391bed14f63be";
};
- "aarch64-linux" = fetchurl {
+ aarch64-linux = fetchurl {
url = "${base}/vault_${version}_linux_arm64.zip";
sha256 = "c243dce14b2e48e3667c2aa5b7fb37009dd7043b56032d6ebe50dd456715fd3f";
};
};
in stdenv.mkDerivation {
- name = "vault-bin-${version}";
+ pname = "vault-bin";
+ inherit version;
- src = sources."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+ src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix
index e3b7fb643a26..bc8f1ce52c1d 100644
--- a/pkgs/tools/security/volatility/default.nix
+++ b/pkgs/tools/security/volatility/default.nix
@@ -2,10 +2,10 @@
pythonPackages.buildPythonApplication rec {
version = "2.6";
- name = "volatility-${version}";
+ pname = "volatility";
src = fetchurl {
- url = "https://downloads.volatilityfoundation.org/releases/${version}/${name}.zip";
+ url = "https://downloads.volatilityfoundation.org/releases/${version}/${pname}-${version}.zip";
sha256 = "15cjrx31nnqa3bpjkv0x05j7f2sb7pq46a72zh7qg55zf86hawsv";
};
diff --git a/pkgs/tools/security/wipe/default.nix b/pkgs/tools/security/wipe/default.nix
index a7c337dc1222..25c7921d34c8 100644
--- a/pkgs/tools/security/wipe/default.nix
+++ b/pkgs/tools/security/wipe/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "wipe-${version}";
+ pname = "wipe";
version = "2.3.1";
src = fetchurl {
- url = "mirror://sourceforge/wipe/${version}/${name}.tar.bz2";
+ url = "mirror://sourceforge/wipe/${version}/${pname}-${version}.tar.bz2";
sha256 = "180snqvh6k6il6prb19fncflf2jcvkihlb4w84sbndcv1wvicfa6";
};
diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix
index 7fcb9fc10bd1..ccebb2dbab42 100644
--- a/pkgs/tools/security/yara/default.nix
+++ b/pkgs/tools/security/yara/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
version = "3.10.0";
- name = "yara-${version}";
+ pname = "yara";
src = fetchFromGitHub {
owner = "VirusTotal";
diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix
index a31fdd08c60d..7e92fc06b2d7 100644
--- a/pkgs/tools/system/amtterm/default.nix
+++ b/pkgs/tools/system/amtterm/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
- name = "amtterm-${version}";
+ pname = "amtterm";
version = "1.6-1";
buildInputs = with perlPackages; [ perl SOAPLite ];
nativeBuildInputs = [ makeWrapper ];
src = fetchurl {
- url = "https://www.kraxel.org/cgit/amtterm/snapshot/${name}.tar.gz";
+ url = "https://www.kraxel.org/cgit/amtterm/snapshot/${pname}-${version}.tar.gz";
sha256 = "1jxcsqkag2bxmrnr4m6g88sln1j2d9liqlna57fj8kkc85316vlc";
};
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index 142d33d359dc..fded1da861d4 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "at-${version}";
+ pname = "at";
version = "3.1.23";
src = fetchurl {
diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix
index a8fca06c3618..a99df36beb6d 100644
--- a/pkgs/tools/system/augeas/default.nix
+++ b/pkgs/tools/system/augeas/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, readline, libxml2 }:
stdenv.mkDerivation rec {
- name = "augeas-${version}";
+ pname = "augeas";
version = "1.12.0";
src = fetchurl {
- url = "http://download.augeas.net/${name}.tar.gz";
+ url = "http://download.augeas.net/${pname}-${version}.tar.gz";
sha256 = "11ybhb13wkkilsn7b416a1dn61m1xrq0lbdpkhp5w61jrk4l469j";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/tools/system/bar/default.nix
index cd4770bf609a..a295da844af2 100644
--- a/pkgs/tools/system/bar/default.nix
+++ b/pkgs/tools/system/bar/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "bar-1.11.1";
src = fetchurl {
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 9c6f21009ee3..8443314cf71b 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, libcap, acl }:
stdenv.mkDerivation rec {
- name = "bfs-${version}";
+ pname = "bfs";
version = "1.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix
index 9842bd85783a..d3f692b70e7e 100644
--- a/pkgs/tools/system/bootchart/default.nix
+++ b/pkgs/tools/system/bootchart/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.14.8";
- name = "bootchart-${version}";
+ pname = "bootchart";
src = fetchFromGitHub {
owner = "mmeeks";
diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix
index 6dcaeed325ae..6c48d3341ecc 100644
--- a/pkgs/tools/system/chase/default.nix
+++ b/pkgs/tools/system/chase/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl ,pkgconfig, libatomic_ops , boehmgc }:
stdenv.mkDerivation rec {
- name = "chase-${version}";
+ pname = "chase";
version = "0.5.2";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix
index cc59aa5121c6..5653c70d4317 100644
--- a/pkgs/tools/system/clinfo/default.nix
+++ b/pkgs/tools/system/clinfo/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "Oblomov";
repo = "clinfo";
- rev = "${version}";
+ rev = version;
sha256 = "0y2q0lz5yzxy970b7w7340vp4fl25vndahsyvvrywcrn51ipgplx";
};
diff --git a/pkgs/tools/system/collectd/data.nix b/pkgs/tools/system/collectd/data.nix
index cb8c4cc7d029..378eb62d6cc5 100644
--- a/pkgs/tools/system/collectd/data.nix
+++ b/pkgs/tools/system/collectd/data.nix
@@ -1,9 +1,9 @@
{ stdenv, collectd }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit (collectd) meta version;
- name = "collectd-data-${version}";
+ pname = "collectd-data";
phases = [ "installPhase" ];
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index d71fa0c4e584..1df73e08d1e3 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -42,10 +42,10 @@
}:
stdenv.mkDerivation rec {
version = "5.8.1";
- name = "collectd-${version}";
+ pname = "collectd";
src = fetchurl {
- url = "https://collectd.org/files/${name}.tar.bz2";
+ url = "https://collectd.org/files/${pname}-${version}.tar.bz2";
sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7";
};
diff --git a/pkgs/tools/system/colorls/default.nix b/pkgs/tools/system/colorls/default.nix
index 62670fa11a08..1631b9f72180 100644
--- a/pkgs/tools/system/colorls/default.nix
+++ b/pkgs/tools/system/colorls/default.nix
@@ -1,6 +1,6 @@
{ lib, bundlerApp, ruby, bundlerUpdateScript }:
-bundlerApp rec {
+bundlerApp {
pname = "colorls";
gemdir = ./.;
diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix
index 3dc2a5caeb91..e7a5dc86578a 100644
--- a/pkgs/tools/system/confd/default.nix
+++ b/pkgs/tools/system/confd/default.nix
@@ -1,7 +1,7 @@
{ buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "confd-${version}";
+ pname = "confd";
version = "0.9.0";
rev = "v${version}";
diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix
index 35c57dd8ea91..ad120dd6481e 100644
--- a/pkgs/tools/system/consul-template/default.nix
+++ b/pkgs/tools/system/consul-template/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "consul-template-${version}";
+ pname = "consul-template";
version = "0.19.4";
rev = "v${version}";
diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/tools/system/daemonize/default.nix
index 1067e524788b..205b693dd924 100644
--- a/pkgs/tools/system/daemonize/default.nix
+++ b/pkgs/tools/system/daemonize/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "daemonize-${version}";
+ pname = "daemonize";
version = "1.7.8";
src = fetchurl {
diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix
index bcea40b1193f..29767c879ffb 100644
--- a/pkgs/tools/system/das_watchdog/default.nix
+++ b/pkgs/tools/system/das_watchdog/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, libgtop, xmessage, which, pkgconfig }:
-stdenv.mkDerivation rec {
- name = "das_watchdog-${version}";
+stdenv.mkDerivation {
+ pname = "das_watchdog";
version = "git-2015-09-12";
src = fetchgit {
diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix
index ca389a8e1b48..6927c64bf483 100644
--- a/pkgs/tools/system/datefudge/default.nix
+++ b/pkgs/tools/system/datefudge/default.nix
@@ -1,9 +1,8 @@
{ stdenv, fetchgit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "datefudge";
version = "1.22";
- name = "${pname}-${version}";
src = fetchgit {
url = "https://salsa.debian.org/debian/datefudge.git";
diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix
index e0d11769fd9f..9962337de078 100644
--- a/pkgs/tools/system/dd_rescue/default.nix
+++ b/pkgs/tools/system/dd_rescue/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
version = "1.99.8";
- name = "dd_rescue-${version}";
+ pname = "dd_rescue";
src = fetchurl {
sha256 = "1gbxm8gr9sx5g1q9dycs21hkxikcy97q09lp1lvs59pnd9qpdnwh";
- url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2";
+ url="http://www.garloff.de/kurt/linux/ddrescue/${pname}-${version}.tar.bz2";
};
dd_rhelp_src = fetchurl {
diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/tools/system/ddrutility/default.nix
index f8a6dac81976..54bf6fbaf42b 100644
--- a/pkgs/tools/system/ddrutility/default.nix
+++ b/pkgs/tools/system/ddrutility/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ddrutility-${version}";
+ pname = "ddrutility";
version = "2.8";
src = fetchurl {
- url = "mirror://sourceforge/ddrutility/${name}.tar.gz";
+ url = "mirror://sourceforge/ddrutility/${pname}-${version}.tar.gz";
sha256 = "023g7f2sfv5cqk3iyss4awrw3b913sy5423mn5zvlyrri5hi2cac";
};
diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix
index 9a255c1b0ea6..8575d971898a 100644
--- a/pkgs/tools/system/dfc/default.nix
+++ b/pkgs/tools/system/dfc/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, cmake, gettext}:
stdenv.mkDerivation rec {
- name = "dfc-${version}";
+ pname = "dfc";
version = "3.1.1";
src = fetchurl {
- url = "https://projects.gw-computing.net/attachments/download/615/${name}.tar.gz";
+ url = "https://projects.gw-computing.net/attachments/download/615/${pname}-${version}.tar.gz";
sha256 = "0m1fd7l85ckb7bq4c5c3g257bkjglm8gq7x42pkmpp87fkknc94n";
};
diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix
index 7d366dc9bd7f..9d56b8488e5e 100644
--- a/pkgs/tools/system/di/default.nix
+++ b/pkgs/tools/system/di/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "di-${version}";
+ pname = "di";
version = "4.47.1";
src = fetchurl {
- url = "http://gentoo.com/di/${name}.tar.gz";
+ url = "http://gentoo.com/di/${pname}-${version}.tar.gz";
sha256 = "1bdbl9k3gqf4h6g21difqc0w17pjid6r587y19wi37vx36aava7f";
};
diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix
index 25f2673c0ac7..8bb84c562b64 100644
--- a/pkgs/tools/system/dog/default.nix
+++ b/pkgs/tools/system/dog/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dog-1.7";
src = fetchurl {
diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix
index 638b018fd415..272809e486c1 100644
--- a/pkgs/tools/system/efibootmgr/default.nix
+++ b/pkgs/tools/system/efibootmgr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, efivar, popt }:
stdenv.mkDerivation rec {
- name = "efibootmgr-${version}";
+ pname = "efibootmgr";
version = "17";
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index 5c9b0292e5c0..365cfeab0581 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildPackages, fetchFromGitHub, fetchurl, pkgconfig, popt }:
stdenv.mkDerivation rec {
- name = "efivar-${version}";
+ pname = "efivar";
version = "37";
outputs = [ "bin" "out" "dev" "man" ];
diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix
index 5f013157e32b..c2f5556cec67 100644
--- a/pkgs/tools/system/envconsul/default.nix
+++ b/pkgs/tools/system/envconsul/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "envconsul-${version}";
+ pname = "envconsul";
version = "0.7.3";
rev = "v${version}";
diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix
index 5a902914b37b..1ba2b78e8609 100644
--- a/pkgs/tools/system/evemu/default.nix
+++ b/pkgs/tools/system/evemu/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "evemu-${version}";
+ pname = "evemu";
version = "2.6.0";
# We could have downloaded a release tarball from cgit, but it changes hash
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 38ca06a6f322..ee9cdf361294 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, utillinux }:
stdenv.mkDerivation rec {
- name = "facter-${version}";
+ pname = "facter";
version = "3.13.2";
src = fetchFromGitHub {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "puppetlabs";
};
- CXXFLAGS = "-fpermissive";
+ CXXFLAGS = "-fpermissive -Wno-error=catch-value";
NIX_LDFLAGS = "-lblkid";
cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ];
diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix
index 1a16a8a34c7f..c31e7337dd59 100644
--- a/pkgs/tools/system/fakeroot/default.nix
+++ b/pkgs/tools/system/fakeroot/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.23";
- name = "fakeroot-${version}";
+ pname = "fakeroot";
src = fetchurl {
url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.xz";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
;
postUnpack = ''
- sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${name}/scripts/fakeroot.in
+ sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${pname}-${version}/scripts/fakeroot.in
'';
meta = {
diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix
index 2bcab1c36b27..6ef39a647f72 100644
--- a/pkgs/tools/system/fcron/default.nix
+++ b/pkgs/tools/system/fcron/default.nix
@@ -4,11 +4,11 @@
{ stdenv, fetchurl, perl, busybox, vim }:
stdenv.mkDerivation rec {
- name = "fcron-${version}";
+ pname = "fcron";
version = "3.3.0";
src = fetchurl {
- url = "http://fcron.free.fr/archives/${name}.src.tar.gz";
+ url = "http://fcron.free.fr/archives/${pname}-${version}.src.tar.gz";
sha256 = "0q5b1fdq1rpsd4lj7v717x47pmn62hhm13394g0yxqi614xd7sls";
};
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 694a71d8ec11..5a690b288450 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -3,7 +3,7 @@
, withGnuplot ? false, gnuplot ? null }:
stdenv.mkDerivation rec {
- name = "fio-${version}";
+ pname = "fio";
version = "3.15";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix
index b3048f2fcb7f..be33f45ca9dc 100644
--- a/pkgs/tools/system/foremost/default.nix
+++ b/pkgs/tools/system/foremost/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "foremost-${version}";
+ pname = "foremost";
version = "1.5.7";
src = fetchurl {
sha256 = "0d2zxw0ijg8cd3ksgm8cf8jg128zr5x7z779jar90g9f47pm882h";
- url = "http://foremost.sourceforge.net/pkg/${name}.tar.gz";
+ url = "http://foremost.sourceforge.net/pkg/${pname}-${version}.tar.gz";
};
patches = [ ./makefile.patch ];
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index b8cd85c0abca..b057c80c74ec 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "1.6.4";
- name = "freeipmi-${version}";
+ pname = "freeipmi";
src = fetchurl {
- url = "mirror://gnu/freeipmi/${name}.tar.gz";
+ url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz";
sha256 = "0g0s4iwx0ng4rv7hp5cc3kkx4drahsc89981gwjblf04lfavppv5";
};
diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix
index 9eef3b064a0c..c0dd2c89d2f1 100644
--- a/pkgs/tools/system/gohai/default.nix
+++ b/pkgs/tools/system/gohai/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "gohai-${version}";
+ pname = "gohai";
version = "2018-05-23";
rev = "60e13eaed98afa238ad6dfc98224c04fbb7b19b1";
diff --git a/pkgs/tools/system/goreman/default.nix b/pkgs/tools/system/goreman/default.nix
index d58d19fd6ed1..22918f14145c 100644
--- a/pkgs/tools/system/goreman/default.nix
+++ b/pkgs/tools/system/goreman/default.nix
@@ -1,6 +1,6 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "goreman-${version}";
+ pname = "goreman";
version = "0.2.1";
goPackagePath = "github.com/mattn/goreman";
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index 25d60ffca5dc..71f82bfc3864 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -1,13 +1,13 @@
{ fetchurl, stdenv, libuuid, popt, icu, ncurses }:
stdenv.mkDerivation rec {
- name = "gptfdisk-${version}";
+ pname = "gptfdisk";
version = "1.0.4";
src = fetchurl {
# https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home
# page clearly implies a preference for using SourceForge's bandwidth:
- url = "mirror://sourceforge/gptfdisk/${name}.tar.gz";
+ url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz";
sha256 = "13d7gff4prl1nsdknjigmb7bbqhn79165n01v4y9mwbnd0d3jqxn";
};
diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix
index 63a72aac79f2..a2e342f85b74 100644
--- a/pkgs/tools/system/hardinfo/default.nix
+++ b/pkgs/tools/system/hardinfo/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "hardinfo-${version}";
+ pname = "hardinfo";
version = "0.5.1";
src = fetchurl {
diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix
index c9a21db71010..d1d2b7a3e769 100644
--- a/pkgs/tools/system/hardlink/default.nix
+++ b/pkgs/tools/system/hardlink/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, pcre2 }:
-stdenv.mkDerivation rec {
- name = "hardlink-${version}";
+stdenv.mkDerivation {
+ pname = "hardlink";
version = "1.3-4";
src = fetchurl {
diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
index 68c6ef3c3ef5..12e54b1b22ed 100644
--- a/pkgs/tools/system/htop/default.nix
+++ b/pkgs/tools/system/htop/default.nix
@@ -2,11 +2,11 @@
IOKit, python }:
stdenv.mkDerivation rec {
- name = "htop-${version}";
+ pname = "htop";
version = "2.2.0";
src = fetchurl {
- url = "https://hisham.hm/htop/releases/${version}/${name}.tar.gz";
+ url = "https://hisham.hm/htop/releases/${version}/${pname}-${version}.tar.gz";
sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr";
};
diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index eba8c8f41b49..18b452b3ca7f 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, libx86emu, flex, perl, libuuid }:
stdenv.mkDerivation rec {
- name = "hwinfo-${version}";
+ pname = "hwinfo";
version = "21.67";
src = fetchFromGitHub {
owner = "opensuse";
repo = "hwinfo";
- rev = "${version}";
+ rev = version;
sha256 = "1fvlrqx1wgl79a9j3xhhhdihj4lkpbrchfsc27il0p52fynn4dji";
};
diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix
index 03373300a948..767fccbd3882 100644
--- a/pkgs/tools/system/illum/default.nix
+++ b/pkgs/tools/system/illum/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchgit, pkgconfig, ninja, libevdev, libev }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.4";
- name = "illum-${version}";
+ pname = "illum";
src = fetchgit {
url = "https://github.com/jmesmon/illum.git";
diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix
index ee9554cc09f9..3c1e3e798623 100644
--- a/pkgs/tools/system/inxi/default.nix
+++ b/pkgs/tools/system/inxi/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, perl }:
stdenv.mkDerivation rec {
- name = "inxi-${version}";
+ pname = "inxi";
version = "3.0.36-1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix
index 22dd9289bfd4..274e65bb41dc 100644
--- a/pkgs/tools/system/ioping/default.nix
+++ b/pkgs/tools/system/ioping/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "ioping-${version}";
+ pname = "ioping";
version = "1.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix
index d7c1f89a7862..7e6854afe627 100644
--- a/pkgs/tools/system/iops/default.nix
+++ b/pkgs/tools/system/iops/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "iops-${version}";
+ pname = "iops";
version = "0.1";
src = fetchurl {
- url = "https://www.vanheusden.com/iops/${name}.tgz";
+ url = "https://www.vanheusden.com/iops/${pname}-${version}.tgz";
sha256 = "1knih6dwwiicycp5ml09bj3k8j7air9bng070sfnxwfv786y90bz";
};
diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix
index ad7715f0fe69..6217f601121c 100644
--- a/pkgs/tools/system/ior/default.nix
+++ b/pkgs/tools/system/ior/default.nix
@@ -5,8 +5,9 @@ let
sha256 = "039rh4z3lsj4vqjsqgakk0b7dkrdrkkzj0p1cjikpc9gn36zpghc";
in
-stdenv.mkDerivation rec {
- name = "ior-${version}";
+stdenv.mkDerivation {
+ pname = "ior";
+ inherit version;
src = fetchurl {
url = "https://github.com/LLNL/ior/archive/${version}.tar.gz";
diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix
deleted file mode 100644
index 35a006505434..000000000000
--- a/pkgs/tools/system/journalbeat/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, systemd, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
- name = "journalbeat-${version}";
- version = "5.6.8";
-
- src = fetchFromGitHub {
- owner = "mheese";
- repo = "journalbeat";
- rev = "v${version}";
- sha256 = "1vgpwnwqjc93nvdpcd52748bwl3r371jb55l17bsgdzrmlcyfm8a";
- };
-
- goPackagePath = "github.com/mheese/journalbeat";
-
- buildInputs = [ systemd.dev ];
-
- postFixup = let libPath = lib.makeLibraryPath [ systemd.lib ]; in ''
- patchelf --set-rpath ${libPath} "$bin/bin/journalbeat"
- '';
-
- meta = with lib; {
- homepage = https://github.com/mheese/journalbeat;
- description = "Journalbeat is a log shipper from systemd/journald to Logstash/Elasticsearch";
- license = licenses.asl20;
- maintainers = with maintainers; [ mbrgm ];
- };
-}
diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix
index 4ec34a68122c..064071a5ca45 100644
--- a/pkgs/tools/system/logcheck/default.nix
+++ b/pkgs/tools/system/logcheck/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, lockfileProgs, perlPackages }:
stdenv.mkDerivation rec {
- name = "logcheck-${version}";
+ pname = "logcheck";
version = "1.3.20";
_name = "logcheck_${version}";
diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix
index e01636f2944f..cee092f755f8 100644
--- a/pkgs/tools/system/logrotate/default.nix
+++ b/pkgs/tools/system/logrotate/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "logrotate-${version}";
+ pname = "logrotate";
version = "3.15.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix
index 39cd429e1f93..74bc177023fb 100644
--- a/pkgs/tools/system/lr/default.nix
+++ b/pkgs/tools/system/lr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "lr-${version}";
+ pname = "lr";
version = "1.4.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix
index cfc0c8f87ad7..65c905f28c65 100644
--- a/pkgs/tools/system/lshw/default.nix
+++ b/pkgs/tools/system/lshw/default.nix
@@ -6,7 +6,7 @@ let numVersion = "02.18"; # :(
in
stdenv.mkDerivation rec {
name = "lshw-${numVersion}b";
- version = "${numVersion}";
+ version = numVersion;
src = fetchurl {
url = "https://ezix.org/software/files/lshw-B.${version}.tar.gz";
diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/tools/system/memtester/default.nix
index d34fb939822d..ff6ccb534fb9 100644
--- a/pkgs/tools/system/memtester/default.nix
+++ b/pkgs/tools/system/memtester/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "memtester-${version}";
+ pname = "memtester";
version = "4.3.0";
preConfigure = ''
diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix
index 078cc614bb42..930bf8382c64 100644
--- a/pkgs/tools/system/mq-cli/default.nix
+++ b/pkgs/tools/system/mq-cli/default.nix
@@ -1,7 +1,7 @@
{ fetchFromGitHub, lib, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "mq-cli-${version}";
+ pname = "mq-cli";
version = "1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 5455728a10c2..30ebd4969dc5 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -12,12 +12,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "1.16.0";
- name = "netdata-${version}";
+ version = "1.17.0";
+ pname = "netdata";
src = fetchurl {
url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz";
- sha256 = "0kwbrkv7g9m7l580myd2r8bpxqn6fxmx5vd6xh7x94wygfffhann";
+ sha256 = "099xvndf5lql4ipwqhm38lpc65yicmpmkk3a7c2j4m48l3vqw9y6";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix
index 5044e5c9a96a..1d8eeff209ed 100644
--- a/pkgs/tools/system/nq/default.nix
+++ b/pkgs/tools/system/nq/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "nq-${version}";
+ pname = "nq";
version = "0.3.1";
src = fetchFromGitHub {
owner = "chneukirchen";
diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix
index 19581c82c78f..0e7a5d4a3111 100644
--- a/pkgs/tools/system/nvtop/default.nix
+++ b/pkgs/tools/system/nvtop/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, nvidia_x11, cudatoolkit, ncurses }:
stdenv.mkDerivation rec {
- name = "nvtop-${version}";
+ pname = "nvtop";
version = "1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix
index b673c0f929a6..5a1bad1092db 100644
--- a/pkgs/tools/system/pcstat/default.nix
+++ b/pkgs/tools/system/pcstat/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
- name = "pcstat-unstable-${version}";
+buildGoPackage {
+ pname = "pcstat-unstable";
version = "2017-05-28";
goPackagePath = "github.com/tobert/pcstat";
diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index c0d7134bcc59..77f6632ff533 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -3,11 +3,40 @@ source $stdenv/setup
export PLAN9=$out/plan9
export PLAN9_TARGET=$PLAN9
+plan9portLinkFlags()
+{
+ local -a linkFlags=()
+ eval set -- "$NIX_LDFLAGS"
+ while (( $# > 0 )); do
+ if [[ $1 = -rpath ]]; then
+ linkFlags+=( "-Wl,-rpath,$2" )
+ shift 2
+ else
+ linkFlags+=( "$1" )
+ shift
+ fi
+ done
+ echo "${linkFlags[*]}"
+}
+
configurePhase()
{
- echo CFLAGS=\"-I${fontconfig_dev}/include -I${xorgproto_exp}/include -I${libX11_dev}/include -I${libXt_dev}/include -I${libXext_dev}/include -I${freetype_dev}/include -I${zlib_dev}/include\" > LOCAL.config
- echo LDFLAGS=\"-L${fontconfig_lib}/lib -L${xorgproto_exp}/lib -L${libX11_exp}/lib -L${libXt_exp}/lib -L${libXext_exp}/lib -L${freetype_exp}/lib -L${zlib_exp}/lib\" >> LOCAL.config
- echo X11=\"${libXt_dev}/include\" >> LOCAL.config
+ (
+ echo CC9=\"$(which $CC)\"
+ echo CFLAGS=\"$NIX_CFLAGS_COMPILE\"
+ echo LDFLAGS=\"$(plan9portLinkFlags)\"
+ echo X11=\"${libXt_dev}/include\"
+ case "$system" in
+ x86_64-*) echo OBJTYPE=x86_64;;
+ i?86-*) echo OBJTYPE=386;;
+ *power*) echo OBJTYPE=power;;
+ *sparc*) echo OBJTYPE=sparc;;
+ *) exit 12
+ esac
+ if [[ $system =~ .*linux.* ]]; then
+ echo SYSVERSION=2.6.x
+ fi
+ ) >config
for f in `grep -l -r /usr/local/plan9`; do
sed "s,/usr/local/plan9,${PLAN9},g" -i $f
@@ -17,15 +46,29 @@ configurePhase()
buildPhase()
{
mkdir -p $PLAN9
- ./INSTALL -b
+
+ # Copy sources, some necessary bin scripts
+ cp -R * $PLAN9
+
+ local originalPath="$PATH"
+ export PATH="$PLAN9/bin:$PATH"
+ export NPROC=$NIX_BUILD_CORES
+ pushd src
+ ../dist/buildmk
+ mk clean
+ mk libs-nuke
+ mk all
+ mk -k install
+ if [[ -f $PLAN9/bin/quote1 ]]; then
+ cp $PLAN9/bin/quote1 $PLAN9/bin/'"'
+ cp $PLAN9/bin/quote2 $PLAN9/bin/'""'
+ fi
+ popd
+ export PATH="$originalPath"
}
installPhase()
{
- ./INSTALL -c
- # Copy sources
- cp -R * $PLAN9
-
# Copy the `9' utility. This way you can use
# $ 9 awk
# to use the plan 9 awk
diff --git a/pkgs/tools/system/plan9port/darwin-cfframework.patch b/pkgs/tools/system/plan9port/darwin-cfframework.patch
new file mode 100644
index 000000000000..01541af92e37
--- /dev/null
+++ b/pkgs/tools/system/plan9port/darwin-cfframework.patch
@@ -0,0 +1,24 @@
+From d1f0bd3de7d3d54523aeefd9731ea850d20eaab4 Mon Sep 17 00:00:00 2001
+From: Jason Felice
+Date: Tue, 2 Jul 2019 13:19:23 -0400
+Subject: [PATCH] Need CoreFoundation
+
+---
+ src/cmd/devdraw/cocoa-screen.m | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/cmd/devdraw/cocoa-screen.m b/src/cmd/devdraw/cocoa-screen.m
+index 97128da2..0e380dd3 100644
+--- a/src/cmd/devdraw/cocoa-screen.m
++++ b/src/cmd/devdraw/cocoa-screen.m
+@@ -56,6 +56,7 @@
+ #endif
+
+ AUTOFRAMEWORK(Cocoa)
++AUTOFRAMEWORK(CoreFoundation)
+
+ #define LOG if(0)NSLog
+ #define panic sysfatal
+--
+2.21.0
+
diff --git a/pkgs/tools/system/plan9port/darwin-sw_vers.patch b/pkgs/tools/system/plan9port/darwin-sw_vers.patch
new file mode 100644
index 000000000000..3e61c83e5403
--- /dev/null
+++ b/pkgs/tools/system/plan9port/darwin-sw_vers.patch
@@ -0,0 +1,47 @@
+From d21d082275f04f88eabcc8ecdb03ee932c71ebf1 Mon Sep 17 00:00:00 2001
+From: Jason Felice
+Date: Mon, 1 Jul 2019 15:23:19 -0400
+Subject: [PATCH 2/3] Build for 10.12
+
+---
+ bin/osxvers | 3 +--
+ src/cmd/devdraw/mkwsysrules.sh | 4 ++--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/bin/osxvers b/bin/osxvers
+index 4af44da2..3be7e6e9 100755
+--- a/bin/osxvers
++++ b/bin/osxvers
+@@ -2,6 +2,5 @@
+
+ u=`uname`
+ case "$u" in
+-Darwin)
+- sw_vers | awk '$1 == "ProductVersion:" {print $2}' | awk -F. '{printf("CFLAGS=$CFLAGS -DOSX_VERSION=%d%02d%02d\n", $1, $2, $3)}'
++Darwin) printf 'CFLAGS=$CFLAGS -DOSX_VERSION=101200\n';;
+ esac
+diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh
+index e94afbd3..40e632db 100644
+--- a/src/cmd/devdraw/mkwsysrules.sh
++++ b/src/cmd/devdraw/mkwsysrules.sh
+@@ -22,7 +22,7 @@ fi
+
+ if [ "x$WSYSTYPE" = "x" ]; then
+ if [ "x`uname`" = "xDarwin" ]; then
+- if sw_vers | grep 'ProductVersion: 10\.[0-5]\.' >/dev/null; then
++ if false; then
+ echo 1>&2 'OS X 10.5 and older are not supported'
+ exit 1
+ else
+@@ -54,7 +54,7 @@ if [ $WSYSTYPE = x11 ]; then
+ XO=`ls x11-*.c 2>/dev/null | sed 's/\.c$/.o/'`
+ echo 'WSYSOFILES=$WSYSOFILES '$XO
+ elif [ $WSYSTYPE = osx-cocoa ]; then
+- if sw_vers|awk '/ProductVersion/{split($2,a,".");exit(a[2]<14)}' >/dev/null; then # 0 is true in sh.
++ if false; then
+ echo 'OBJCFLAGS=$OBJCFLAGS -fobjc-arc'
+ echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen-metal-objc.o cocoa-srv.o cocoa-thread.o'
+ else
+--
+2.21.0
+
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index b3909a79d942..9776960327e1 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchFromGitHub, which, libX11, libXt, fontconfig, freetype
+{ stdenv, fetchFromGitHub, which
+, darwin ? null
, xorgproto ? null
+, libX11
, libXext ? null
-, zlib ? null
+, libXt ? null
+, fontconfig ? null
+, freetype ? null
, perl ? null # For building web manuals
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "plan9port";
version = "2019-02-25";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "9fans";
@@ -17,14 +20,24 @@ stdenv.mkDerivation rec {
sha256 = "1lp17948q7vpl8rc2bf5a45bc8jqyj0s3zffmks9r25ai42vgb43";
};
+ patches = [
+ ./tmpdir.patch
+ ./darwin-sw_vers.patch
+ ./darwin-cfframework.patch
+ ];
+
postPatch = ''
#hardcoded path
substituteInPlace src/cmd/acme/acme.c \
--replace /lib/font/bit $out/plan9/font
+
#deprecated flags
find . -type f \
-exec sed -i -e 's/_SVID_SOURCE/_DEFAULT_SOURCE/g' {} \; \
-exec sed -i -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' {} \;
+
+ substituteInPlace bin/9c \
+ --replace 'which uniq' '${which}/bin/which uniq'
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
#add missing ctrl+c\z\x\v keybind for non-Darwin
substituteInPlace src/cmd/acme/text.c \
@@ -35,30 +48,16 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
- which perl libX11 fontconfig xorgproto libXt libXext
+ perl
+ ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+ xorgproto libX11 libXext libXt fontconfig
freetype # fontsrv wants ft2build.h provides system fonts for acme and sam.
- ];
+ ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ darwin.cf-private Carbon Cocoa IOKit Metal QuartzCore
+ ]);
builder = ./builder.sh;
-
- libX11_dev = libX11.dev;
libXt_dev = libXt.dev;
- libXext_dev = libXext.dev;
- fontconfig_dev = fontconfig.dev;
- freetype_dev = freetype.dev;
- zlib_dev = zlib.dev;
-
- xorgproto_exp = xorgproto;
- libX11_exp = libX11;
- libXt_exp = libXt;
- libXext_exp = libXext;
- freetype_exp = freetype;
- zlib_exp = zlib;
-
- fontconfig_lib = fontconfig.lib;
-
- NIX_LDFLAGS="-lgcc_s";
- enableParallelBuilding = true;
doInstallCheck = true;
installCheckPhase = ''
diff --git a/pkgs/tools/system/plan9port/tmpdir.patch b/pkgs/tools/system/plan9port/tmpdir.patch
new file mode 100644
index 000000000000..e8200a177a27
--- /dev/null
+++ b/pkgs/tools/system/plan9port/tmpdir.patch
@@ -0,0 +1,41 @@
+From c762625549ff367b54bcd8281d1ce248a69b4401 Mon Sep 17 00:00:00 2001
+From: Jason Felice
+Date: Mon, 1 Jul 2019 15:01:21 -0400
+Subject: [PATCH] Use $TMPDIR if available
+
+NixOS sandboxed builds (at least on Mac) don't have access to /tmp,
+and this should be better POSIX.
+---
+ bin/9c | 2 +-
+ bin/9l | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bin/9c b/bin/9c
+index 3ffb716c..88c47887 100755
+--- a/bin/9c
++++ b/bin/9c
+@@ -133,7 +133,7 @@ case "$tag" in
+ esac
+
+ # N.B. Must use temp file to avoid pipe; pipe loses status.
+-xtmp=/tmp/9c.$$.$USER.out
++xtmp=${TMPDIR-/tmp}/9c.$$.$USER.out
+ $cc -DPLAN9PORT -I$PLAN9/include $cflags "$@" 2>$xtmp
+ status=$?
+ quiet $xtmp
+diff --git a/bin/9l b/bin/9l
+index 6195815f..717a540a 100755
+--- a/bin/9l
++++ b/bin/9l
+@@ -346,7 +346,7 @@ then
+ echo $ld -L$PLAN9/lib "$@" $libsl $extralibs $frameworks
+ fi
+
+-xtmp=/tmp/9l.$$.$USER.out
++xtmp="${TMPDIR-/tmp}/9l.$$.$USER.out"
+ xxout() {
+ sed 's/.*: In function `[^:]*: *//' $xtmp | egrep . |
+ egrep -v 'is (often|almost always) misused|is dangerous, better use|text-based stub'
+--
+2.21.0
+
diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix
index 79b86f1383c0..0764844dbfc9 100644
--- a/pkgs/tools/system/proot/default.nix
+++ b/pkgs/tools/system/proot/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub
, talloc, docutils, swig, python, coreutils, enablePython ? true }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "proot";
version = "20190510";
diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix
index 3e7bb301a6b9..ad256e366566 100644
--- a/pkgs/tools/system/ps_mem/default.nix
+++ b/pkgs/tools/system/ps_mem/default.nix
@@ -3,12 +3,12 @@
let
version = "3.12";
pname = "ps_mem";
-in pythonPackages.buildPythonApplication rec {
+in pythonPackages.buildPythonApplication {
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "pixelb";
- repo = "${pname}";
+ repo = pname;
rev = "v${version}";
sha256 = "0kcxlmfisbwf24p2k72njfyfp22fjr9p9zalg9b4w0yhnlzk24ph";
};
diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix
index 234aacbbfdee..83d281642bd3 100644
--- a/pkgs/tools/system/psensor/default.nix
+++ b/pkgs/tools/system/psensor/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "psensor-${version}";
+ pname = "psensor";
version = "1.2.0";
diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/tools/system/psstop/default.nix
index 178e08938fea..4d413e60c77f 100644
--- a/pkgs/tools/system/psstop/default.nix
+++ b/pkgs/tools/system/psstop/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }:
stdenv.mkDerivation rec {
- name = "psstop-${version}";
+ pname = "psstop";
version = "1.3";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/tools/system/rofi-systemd/default.nix
index ee7626d27126..73c1b4881559 100644
--- a/pkgs/tools/system/rofi-systemd/default.nix
+++ b/pkgs/tools/system/rofi-systemd/default.nix
@@ -2,7 +2,7 @@
}:
stdenv.mkDerivation rec {
- name = "rofi-systemd-${version}";
+ pname = "rofi-systemd";
version = "0.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix
index 131ba53f5847..78306907079e 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/pkgs/tools/system/runit/default.nix
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "runit-${version}";
+ pname = "runit";
version = "2.1.2";
src = fetchurl {
- url = "http://smarden.org/runit/${name}.tar.gz";
+ url = "http://smarden.org/runit/${pname}-${version}.tar.gz";
sha256 = "065s8w62r6chjjs6m9hapcagy33m75nlnxb69vg0f4ngn061dl3g";
};
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" ];
- sourceRoot = "admin/${name}";
+ sourceRoot = "admin/${pname}-${version}";
doCheck = true;
diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix
index 5d4ed355ba9d..063a338f6e8d 100644
--- a/pkgs/tools/system/s-tui/default.nix
+++ b/pkgs/tools/system/s-tui/default.nix
@@ -1,7 +1,6 @@
{ stdenv, pythonPackages }:
pythonPackages.buildPythonPackage rec {
- name = "${pname}-${version}";
pname = "s-tui";
version = "0.8.3";
diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix
index ed4fe7a68482..571f70e0756c 100644
--- a/pkgs/tools/system/safe-rm/default.nix
+++ b/pkgs/tools/system/safe-rm/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchgit, perl, coreutils }:
stdenv.mkDerivation rec {
- name = "safe-rm-${version}";
+ pname = "safe-rm";
version = "0.12";
src = fetchgit {
url = "https://gitorious.org/safe-rm/mainline.git";
- rev = "refs/tags/${name}";
+ rev = "refs/tags/${pname}-${version}";
sha256 = "0zkmwxyl1870ar6jr9h537vmqgkckqs9jd1yv6m4qqzdsmg5gdbq";
};
diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix
index d6e8f4f1bb9f..036e3a83cf28 100644
--- a/pkgs/tools/system/setserial/default.nix
+++ b/pkgs/tools/system/setserial/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, groff }:
stdenv.mkDerivation rec {
- name = "setserial-${version}";
+ pname = "setserial";
version = "2.17";
src = fetchurl {
- url = "mirror://sourceforge/setserial/${name}.tar.gz";
+ url = "mirror://sourceforge/setserial/${pname}-${version}.tar.gz";
sha256 = "0jkrnn3i8gbsl48k3civjmvxyv9rbm1qjha2cf2macdc439qfi3y";
};
diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix
index d35f56e25197..7c90d41da18e 100644
--- a/pkgs/tools/system/sleuthkit/default.nix
+++ b/pkgs/tools/system/sleuthkit/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "4.6.5";
- name = "sleuthkit-${version}";
+ pname = "sleuthkit";
src = fetchFromGitHub {
owner = "sleuthkit";
repo = "sleuthkit";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "1q1cdixnfv9v4qlzza8xwdsyvq1vdw6gjgkd41yc1d57ldp1qm0c";
};
diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 05d96afded14..2da76cce0cdd 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -13,10 +13,11 @@ let
};
in stdenv.mkDerivation rec {
- name = "smartmontools-${version}";
+ pname = "smartmontools";
+ inherit version;
src = fetchurl {
- url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
+ url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz";
sha256 = "077nx2rn9szrg6isdh0938zbp7vr3dsyxl4jdyyzv1xwhqksrqg5";
};
diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix
index 15a18a453f00..9f2cc2257472 100644
--- a/pkgs/tools/system/socklog/default.nix
+++ b/pkgs/tools/system/socklog/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "socklog-${version}";
+ pname = "socklog";
version = "2.1.0";
src = fetchurl {
diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index ab7fdf7c4bf8..9a9879d55641 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "stress-ng";
- version = "0.10.01";
+ version = "0.10.02";
src = fetchurl {
url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0gcgm96prkzysszgq34cpx30y0bx9b5zll7943zwg3941fkg4x2a";
+ sha256 = "100daxz0j80jhmpfnqa78mvfwq1qj7zb67y7w9f747a0f1havvim";
};
# All platforms inputs then Linux-only ones
diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix
index f407be7c5854..9697748e056d 100644
--- a/pkgs/tools/system/suid-chroot/default.nix
+++ b/pkgs/tools/system/suid-chroot/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "suid-chroot-${version}";
+ pname = "suid-chroot";
version = "1.0.2";
src = fetchurl {
sha256 = "1a9xqhck0ikn8kfjk338h9v1yjn113gd83q0c50k78xa68xrnxjx";
- url = "http://myweb.tiscali.co.uk/scottrix/linux/download/${name}.tar.bz2";
+ url = "http://myweb.tiscali.co.uk/scottrix/linux/download/${pname}-${version}.tar.bz2";
};
postPatch = ''
diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix
index 81e3a2b8792b..3834b3762f03 100644
--- a/pkgs/tools/system/supervise/default.nix
+++ b/pkgs/tools/system/supervise/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "supervise-${version}";
+ pname = "supervise";
version = "1.4.0";
src = fetchzip {
diff --git a/pkgs/tools/system/symlinks/default.nix b/pkgs/tools/system/symlinks/default.nix
index 240ad9de19d1..93a6bbf0c75b 100644
--- a/pkgs/tools/system/symlinks/default.nix
+++ b/pkgs/tools/system/symlinks/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
- name = "symlinks-${version}";
+ pname = "symlinks";
version = "1.4.3";
src = fetchurl {
diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix
index 1f444ca5cd81..881fda241ed7 100644
--- a/pkgs/tools/system/syslog-ng-incubator/default.nix
+++ b/pkgs/tools/system/syslog-ng-incubator/default.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
- name = "syslog-ng-incubator-${version}";
+ pname = "syslog-ng-incubator";
version = "0.6.2";
src = fetchFromGitHub {
owner = "balabit";
repo = "syslog-ng-incubator";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "17y85cqcyfbp882gaii731cvz5bg1s8rgda271jh6kgnrz5rbd4s";
};
diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix
index 4c4ad91e7279..0a2b7ab4f3bc 100644
--- a/pkgs/tools/system/systemd-journal2gelf/default.nix
+++ b/pkgs/tools/system/systemd-journal2gelf/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
-buildGoModule rec {
+buildGoModule {
pname = "SystemdJournal2Gelf-unstable";
version = "20190702";
diff --git a/pkgs/tools/system/testdisk-photorec/default.nix b/pkgs/tools/system/testdisk-photorec/default.nix
index 5342cf857acc..06f6751213b2 100644
--- a/pkgs/tools/system/testdisk-photorec/default.nix
+++ b/pkgs/tools/system/testdisk-photorec/default.nix
@@ -9,7 +9,7 @@
}:
stdenv.mkDerivation rec {
- name = "testdisk-photorec-${version}";
+ pname = "testdisk-photorec";
version = "7.0";
src = fetchurl {
url = "https://www.cgsecurity.org/testdisk-${version}.tar.bz2";
diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index 2a98a2f889e8..3429419052fe 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -2,7 +2,7 @@
, pkgconfig, dbus, dbus-glib, libxml2 }:
stdenv.mkDerivation rec {
- name = "thermald-${version}";
+ pname = "thermald";
version = "1.9";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index dc63b97056a7..8c8034005844 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -2,7 +2,7 @@
, smartSupport ? false, libatasmart }:
stdenv.mkDerivation rec {
- name = "thinkfan-${version}";
+ pname = "thinkfan";
version = "0.9.3";
src = fetchurl {
diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
index a69a527f68fd..0163d5502173 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/pkgs/tools/system/tree/default.nix
@@ -24,7 +24,8 @@ let
""; # use linux flags by default
in
stdenv.mkDerivation {
- name = "tree-${version}";
+ pname = "tree";
+ inherit version;
src = fetchurl {
url = "http://mama.indstate.edu/users/ice/tree/src/tree-${version}.tgz";
diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix
index 849baa7159ae..71a5726759c7 100644
--- a/pkgs/tools/system/uptimed/default.nix
+++ b/pkgs/tools/system/uptimed/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "uptimed-${version}";
+ pname = "uptimed";
version = "0.4.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix
index 32cf56a1d74e..06ae28626624 100644
--- a/pkgs/tools/system/vbetool/default.nix
+++ b/pkgs/tools/system/vbetool/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pciutils, libx86, zlib }:
stdenv.mkDerivation rec {
- name = "vbetool-${version}";
+ pname = "vbetool";
version = "1.1";
src = fetchurl {
- url = "https://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz";
+ url = "https://www.codon.org.uk/~mjg59/vbetool/download/${pname}-${version}.tar.gz";
sha256 = "0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd";
};
diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix
index b252b74a0bdd..b2b94e1d9d9e 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
version = "20180311";
checkout = "4c84e077858c809ee80a9a6f9b38185cf7dcded7";
- name = "vboot_reference-${version}";
+ pname = "vboot_reference";
src = fetchgit {
url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference;
- rev = "${checkout}";
+ rev = checkout;
sha256 = "1zja4ma6flch08h5j2l1hqnxmw2xwylidnddxxd5y2x05dai9ddj";
};
diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix
index ca35dae5827c..da502946781b 100644
--- a/pkgs/tools/system/wsmancli/default.nix
+++ b/pkgs/tools/system/wsmancli/default.nix
@@ -2,7 +2,7 @@
, openssl, openwsman }:
stdenv.mkDerivation rec {
- name = "wsmancli-${version}";
+ pname = "wsmancli";
version = "2.6.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix
index 519cae03c5a5..02d904724404 100644
--- a/pkgs/tools/system/xe/default.nix
+++ b/pkgs/tools/system/xe/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "xe-${version}";
+ pname = "xe";
version = "0.11";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix
index 10d3a47cc85e..902067b3d535 100644
--- a/pkgs/tools/text/agrep/default.nix
+++ b/pkgs/tools/text/agrep/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "agrep-${version}";
+stdenv.mkDerivation {
+ pname = "agrep";
version = "3.41.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix
index f53a649cd771..7dc07664fcef 100644
--- a/pkgs/tools/text/aha/default.nix
+++ b/pkgs/tools/text/aha/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "aha-${version}";
+ pname = "aha";
version = "0.5";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix
index 2ad91a3071ed..b9a4f6782076 100644
--- a/pkgs/tools/text/ansifilter/default.nix
+++ b/pkgs/tools/text/ansifilter/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, boost, lua }:
stdenv.mkDerivation rec {
- name = "ansifilter-${version}";
+ pname = "ansifilter";
version = "2.14";
src = fetchurl {
diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix
index 20777f990e26..b01ce7773e30 100644
--- a/pkgs/tools/text/ascii/default.nix
+++ b/pkgs/tools/text/ascii/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ascii-${version}";
+ pname = "ascii";
version = "3.18";
src = fetchurl {
- url = "http://www.catb.org/~esr/ascii/${name}.tar.gz";
+ url = "http://www.catb.org/~esr/ascii/${pname}-${version}.tar.gz";
sha256 = "0b87vy06s8s3a8q70pqavsbk4m4ff034sdml2xxa6qfsykaj513j";
};
diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix
index 8a8eb3117f03..16d5b9995c24 100644
--- a/pkgs/tools/text/catdoc/default.nix
+++ b/pkgs/tools/text/catdoc/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
- name = "catdoc-${version}";
+ pname = "catdoc";
version = "0.95";
src = fetchurl {
- url = "http://ftp.wagner.pp.ru/pub/catdoc/${name}.tar.gz";
+ url = "http://ftp.wagner.pp.ru/pub/catdoc/${pname}-${version}.tar.gz";
sha256 = "514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796";
};
diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/tools/text/cconv/default.nix
index 9f6b7a7f1227..3b80af365f65 100644
--- a/pkgs/tools/text/cconv/default.nix
+++ b/pkgs/tools/text/cconv/default.nix
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, autoreconfHook }:
let version = "0.6.3"; in
stdenv.mkDerivation {
- name = "cconv-${version}";
+ pname = "cconv";
+ inherit version;
src = fetchurl {
url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz";
diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix
index 56a8133bd3a8..521b4c5b284f 100644
--- a/pkgs/tools/text/codesearch/default.nix
+++ b/pkgs/tools/text/codesearch/default.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "codesearch-${version}";
+ pname = "codesearch";
version = "20150717-${stdenv.lib.strings.substring 0 7 rev}";
rev = "a45d81b686e85d01f2838439deaf72126ccd5a96";
diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix
index 49db5e13d721..212f071f2769 100644
--- a/pkgs/tools/text/coloursum/default.nix
+++ b/pkgs/tools/text/coloursum/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "coloursum-${version}";
+ pname = "coloursum";
version = "0.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/copyright-update/default.nix b/pkgs/tools/text/copyright-update/default.nix
index 604097fbe778..9a405674dc7a 100644
--- a/pkgs/tools/text/copyright-update/default.nix
+++ b/pkgs/tools/text/copyright-update/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, perl }:
stdenv.mkDerivation rec {
- name = "copyright-update-${version}";
+ pname = "copyright-update";
version = "2016.1018";
src = fetchFromGitHub {
- name = "${name}-src";
+ name = "${pname}-${version}-src";
owner = "jaalto";
repo = "project--copyright-update";
rev = "release/${version}";
diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix
index 7404c887a46b..5f6b0a8a6058 100644
--- a/pkgs/tools/text/dadadodo/default.nix
+++ b/pkgs/tools/text/dadadodo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "dadadodo-${version}";
+ pname = "dadadodo";
version = "1.04";
src = fetchurl {
- url = "https://www.jwz.org/dadadodo/${name}.tar.gz";
+ url = "https://www.jwz.org/dadadodo/${pname}-${version}.tar.gz";
sha256 = "1pzwp3mim58afjrc92yx65mmgr1c834s1v6z4f4gyihwjn8bn3if";
};
diff --git a/pkgs/tools/text/diction/default.nix b/pkgs/tools/text/diction/default.nix
index cfb627d70428..f43cd94a83e7 100644
--- a/pkgs/tools/text/diction/default.nix
+++ b/pkgs/tools/text/diction/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "diction-${version}";
+ pname = "diction";
version = "1.13";
src = fetchurl {
- url = "http://www.moria.de/~michael/diction/${name}.tar.gz";
+ url = "http://www.moria.de/~michael/diction/${pname}-${version}.tar.gz";
sha256 = "08fi971b8qa4xycxbgb42i6b5ms3qx9zpp5hwpbxy2vypfs0wph9";
};
diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix
index dd0d1bbc9410..bd72ec947143 100644
--- a/pkgs/tools/text/dos2unix/default.nix
+++ b/pkgs/tools/text/dos2unix/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, perl, gettext }:
stdenv.mkDerivation rec {
- name = "dos2unix-${version}";
+ pname = "dos2unix";
version = "7.4.0";
src = fetchurl {
- url = "https://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz";
+ url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz";
sha256 = "12h4c61g376bhq03y5g2xszkrkrj5hwd928rly3xsp6rvfmnbixs";
};
diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix
index 098eee7cf720..6cfb4721066c 100644
--- a/pkgs/tools/text/enca/default.nix
+++ b/pkgs/tools/text/enca/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libiconv, recode }:
stdenv.mkDerivation rec {
- name = "enca-${version}";
+ pname = "enca";
version = "1.19";
src = fetchurl {
- url = "https://dl.cihar.com/enca/${name}.tar.xz";
+ url = "https://dl.cihar.com/enca/${pname}-${version}.tar.xz";
sha256 = "1f78jmrggv3jymql8imm5m9yc8nqjw5l99mpwki2245l8357wj1s";
};
diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/tools/text/esh/default.nix
index b4418e04f03b..231a16bdc1b3 100644
--- a/pkgs/tools/text/esh/default.nix
+++ b/pkgs/tools/text/esh/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, asciidoctor, gawk, gnused, runtimeShell }:
stdenv.mkDerivation rec {
- name = "esh-${version}";
+ pname = "esh";
version = "0.1.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index f0947004b4b1..7a5f6c8dd818 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -19,11 +19,11 @@ let
inherit (stdenv.lib) optional;
in
stdenv.mkDerivation rec {
- name = "gawk-4.2.1";
+ name = "gawk-5.0.1";
src = fetchurl {
url = "mirror://gnu/gawk/${name}.tar.xz";
- sha256 = "0lam2zf3n7ak4pig8w46lhx9hzx50kj2v2yj1616mm26wy2rf4fi";
+ sha256 = "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf";
};
# When we do build separate interactive version, it makes sense to always include man.
diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix
index d61a7d184ea4..6e9ff5170f2b 100644
--- a/pkgs/tools/text/glogg/default.nix
+++ b/pkgs/tools/text/glogg/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
- name = "glogg-${version}";
+ pname = "glogg";
version = "1.1.4";
src = fetchurl {
- url = "https://glogg.bonnefon.org/files/${name}.tar.gz";
+ url = "https://glogg.bonnefon.org/files/${pname}-${version}.tar.gz";
sha256 = "0nwnfk9bcz2k7rf08w2cb6qipzdhwmxznik44jxmn9gwxdrdq78c";
};
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index 702d1b4d89fa..87c8fdfd8903 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -3,7 +3,8 @@
let version = "3.3"; in
stdenv.mkDerivation {
- name = "gnugrep-${version}";
+ pname = "gnugrep";
+ inherit version;
src = fetchurl {
url = "mirror://gnu/grep/grep-${version}.tar.xz";
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 8a44e434d4c1..3d73bfba6576 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
- name = "gnused-${version}";
+ pname = "gnused";
version = "4.7";
src = fetchurl {
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index 082c61635ba9..a3df96175675 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
- name = "groff-${version}";
+ pname = "groff";
version = "1.22.3";
src = fetchurl {
- url = "mirror://gnu/groff/${name}.tar.gz";
+ url = "mirror://gnu/groff/${pname}-${version}.tar.gz";
sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s";
};
diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix
index a04a2c65e7c3..58f1768bfa1f 100644
--- a/pkgs/tools/text/gucci/default.nix
+++ b/pkgs/tools/text/gucci/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "gucci-${version}";
+ pname = "gucci";
version = "0.1.0";
goPackagePath = "github.com/noqcks/gucci";
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 46fe9ab1cd72..eb86bc79d5c1 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "highlight-${version}";
+ pname = "highlight";
version = "3.53";
src = fetchFromGitLab {
diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix
index 1974c0aa4f36..e31db4378507 100644
--- a/pkgs/tools/text/html-tidy/default.nix
+++ b/pkgs/tools/text/html-tidy/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, libxslt }:
stdenv.mkDerivation rec {
- name = "html-tidy-${version}";
+ pname = "html-tidy";
version = "5.6.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix
index aec238cb4ccc..dfbe6e7b6dc1 100644
--- a/pkgs/tools/text/icdiff/default.nix
+++ b/pkgs/tools/text/icdiff/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "icdiff-${version}";
+ pname = "icdiff";
version = "1.9.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix
index 646efbab5bf3..0e2e4cedfc22 100644
--- a/pkgs/tools/text/invoice2data/default.nix
+++ b/pkgs/tools/text/invoice2data/default.nix
@@ -9,7 +9,7 @@ python3Packages.buildPythonPackage rec {
sha256 = "1phz0a8jxg074k0im7shrrdfvdps7bn1fa4zwcf8q3sa2iig26l4";
};
- makeWrapperArgs = ["--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ imagemagick xpdf tesseract ]}" ];
+ makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ imagemagick xpdf tesseract ]) ];
propagatedBuildInputs = with python3Packages; [ unidecode dateparser pyyaml pillow chardet pdfminer ];
diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix
index dbec8d353d94..2f61536ed2c0 100644
--- a/pkgs/tools/text/ispell/default.nix
+++ b/pkgs/tools/text/ispell/default.nix
@@ -1,14 +1,17 @@
{ stdenv, fetchurl, bison, ncurses }:
stdenv.mkDerivation rec {
- name = "ispell-3.3.02";
+ pname = "ispell";
+ version = "3.4.00";
+
src = fetchurl {
- url = "http://fmg-www.cs.ucla.edu/geoff/tars/${name}.tar.gz";
+ url = "http://fmg-www.cs.ucla.edu/geoff/tars/${pname}-${version}.tar.gz";
sha256 = "1d7c2fqrdjckp91ajpkn5nnmpci2qrxqn8b6cyl0zn1afb9amxbz";
};
+
buildInputs = [ bison ncurses ];
+
patches = [
- ./patches/0005-Do-not-reorder-words.patch
./patches/0007-Use-termios.patch
./patches/0008-Tex-backslash.patch
./patches/0009-Fix-FTBFS-on-glibc.patch
@@ -21,6 +24,7 @@ stdenv.mkDerivation rec {
./patches/0025-Languages.patch
./patches/0030-Display-whole-multibyte-character.patch
];
+
postPatch = ''
cat >> local.h <
-Date: Thu, 3 Nov 2005 14:14:15 -0800
-Subject: 0005 Do not reorder words
-
-ispell reorders words in personal dictionary without good reason.
-
-The correct approach is to build the internal data structure with variant
-spellings stored in the same order as they appear in the personal dictionary.
-Fortunately, this is easy, though the patch is to a different file. This one
-has been tested (That's what I get for trying to rush out a fix before a
-meeting!).
----
- makedent.c | 18 +++++++++++-------
- 1 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/makedent.c b/makedent.c
-index 0453d11..d121345 100644
---- a/makedent.c
-+++ b/makedent.c
-@@ -447,9 +447,10 @@ int combinecaps (hdrp, newp)
- if (retval == 0)
- {
- /*
-- ** Couldn't combine the two entries. Add a new variant. For
-- ** ease, we'll stick it right behind the header, rather than
-- ** at the end of the list.
-+ ** Couldn't combine the two entries. Add a new variant. We
-+ ** stick it at the end of the variant list because it's
-+ ** important to maintain order; this causes the personal
-+ ** dictionary to have a stable ordering.
- */
- forcevheader (hdrp, oldp, newp);
- tdent = (struct dent *) mymalloc (sizeof (struct dent));
-@@ -460,10 +461,13 @@ int combinecaps (hdrp, newp)
- return -1;
- }
- *tdent = *newp;
-- tdent->next = hdrp->next;
-- hdrp->next = tdent;
-- tdent->flagfield |= (hdrp->flagfield & MOREVARIANTS);
-- hdrp->flagfield |= MOREVARIANTS;
-+ for (oldp = hdrp;
-+ oldp->next != NULL && oldp->flagfield & MOREVARIANTS;
-+ oldp = oldp->next)
-+ ;
-+ tdent->next = oldp->next;
-+ oldp->next = tdent;
-+ oldp->flagfield |= MOREVARIANTS;
- combineaffixes (hdrp, newp);
- hdrp->flagfield |= (newp->flagfield & KEEP);
- if (captype (newp->flagfield) == FOLLOWCASE)
---
diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix
index 46d290b79ffb..c7f4002e2d3a 100644
--- a/pkgs/tools/text/jsawk/default.nix
+++ b/pkgs/tools/text/jsawk/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, spidermonkey }:
-stdenv.mkDerivation rec {
- name = "jsawk-${version}";
+stdenv.mkDerivation {
+ pname = "jsawk";
version = "1.5-pre";
src = fetchFromGitHub {
owner = "micha";
diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix
index 5eea33d13a47..6be7106f2b95 100644
--- a/pkgs/tools/text/jumanpp/default.nix
+++ b/pkgs/tools/text/jumanpp/default.nix
@@ -1,11 +1,10 @@
{ stdenv, fetchurl, cmake, protobuf }:
stdenv.mkDerivation rec {
pname = "jumanpp";
- name = "${pname}-${version}";
version = "2.0.0-rc2";
src = fetchurl {
- url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${name}.tar.xz";
+ url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp";
};
buildInputs = [ cmake protobuf ];
diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix
index 7254660cb1ae..600907311ef2 100644
--- a/pkgs/tools/text/kytea/default.nix
+++ b/pkgs/tools/text/kytea/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
- name = "kytea-${version}";
+ pname = "kytea";
version = "0.4.7";
src = fetchurl {
- url = "http://www.phontron.com/kytea/download/${name}.tar.gz";
+ url = "http://www.phontron.com/kytea/download/${pname}-${version}.tar.gz";
sha256 = "0ilzzwn5vpvm65bnbyb9f5rxyxy3jmbafw9w0lgl5iad1ka36jjk";
};
diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 1ccba80cb3e6..f75099e630db 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchzip, jre, makeWrapper }:
stdenv.mkDerivation rec {
- name = "LanguageTool-${version}";
+ pname = "LanguageTool";
version = "4.6";
src = fetchzip {
- url = "https://www.languagetool.org/download/${name}.zip";
+ url = "https://www.languagetool.org/download/${pname}-${version}.zip";
sha256 = "1z3i6kz1dz7dw2ykyk1yamrv8h5h330sfyl037hhyy9hw6p30rhg";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix
index 32aeed7499f3..bca0a5e38579 100644
--- a/pkgs/tools/text/link-grammar/default.nix
+++ b/pkgs/tools/text/link-grammar/default.nix
@@ -1,14 +1,13 @@
{ stdenv, fetchurl, pkgconfig, python3, sqlite, libedit, zlib }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
version = "5.6.2";
pname = "link-grammar";
outputs = [ "bin" "out" "dev" "man" ];
src = fetchurl {
- url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
+ url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "1jc6j5kxdv3y4mm82q0rrjvlak8p26fqh92dzw5bkwxnvjmjjg1k";
};
diff --git a/pkgs/tools/text/mb2md/default.nix b/pkgs/tools/text/mb2md/default.nix
index ddc7f96ec26e..91c958cf0675 100644
--- a/pkgs/tools/text/mb2md/default.nix
+++ b/pkgs/tools/text/mb2md/default.nix
@@ -5,7 +5,7 @@ let
in
stdenv.mkDerivation rec {
version = "3.20";
- name = "mb2md-${version}";
+ pname = "mb2md";
src = fetchurl {
url = "http://batleth.sapienti-sat.org/projects/mb2md/mb2md-${version}.pl.gz";
diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix
index de395f183d18..3123d31a7b54 100644
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/pkgs/tools/text/mdbook/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, CoreServices, darwin }:
rustPlatform.buildRustPackage rec {
- name = "mdbook-${version}";
+ pname = "mdbook";
version = "0.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/mecab/base.nix b/pkgs/tools/text/mecab/base.nix
index 7509f3e9c483..e97980ef3d2d 100644
--- a/pkgs/tools/text/mecab/base.nix
+++ b/pkgs/tools/text/mecab/base.nix
@@ -1,6 +1,6 @@
{ fetchurl }:
-rec {
+{
version = "0.996";
src = fetchurl {
diff --git a/pkgs/tools/text/mecab/ipadic.nix b/pkgs/tools/text/mecab/ipadic.nix
index 9896b365a6a2..3b011787c7cb 100644
--- a/pkgs/tools/text/mecab/ipadic.nix
+++ b/pkgs/tools/text/mecab/ipadic.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, mecab-nodic }:
-stdenv.mkDerivation rec {
- name = "mecab-ipadic-${version}";
+stdenv.mkDerivation {
+ pname = "mecab-ipadic";
version = "2.7.0-20070801";
src = fetchurl {
diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix
index 3e0bee3b9b98..d271490ca1c1 100644
--- a/pkgs/tools/text/miller/default.nix
+++ b/pkgs/tools/text/miller/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, autoreconfHook, flex, libtool }:
stdenv.mkDerivation rec {
- name = "miller-${version}";
+ pname = "miller";
- version = "5.4.0";
+ version = "5.5.0";
src = fetchFromGitHub {
owner = "johnkerl";
repo = "miller";
- rev = "${version}";
- sha256 = "0158by642frh9x6rrgqxwmk4766wb36kp0rrjg5swdbs9w3is3xg";
+ rev = "v${version}";
+ sha256 = "1zkh87vq0gqcx6z6yzf1rq30jmdgdpp0rx5f0vvl0zcn0hc2smpz";
};
nativeBuildInputs = [ autoreconfHook flex libtool ];
diff --git a/pkgs/tools/text/mir-qualia/default.nix b/pkgs/tools/text/mir-qualia/default.nix
index 4e3be9e17e0c..0a9b3777783b 100644
--- a/pkgs/tools/text/mir-qualia/default.nix
+++ b/pkgs/tools/text/mir-qualia/default.nix
@@ -1,7 +1,7 @@
{ lib, pythonPackages, fetchurl }:
pythonPackages.buildPythonApplication rec {
- name = "mir.qualia-${version}";
+ pname = "mir.qualia";
version = "2.0.0";
doCheck = false; # 2.0.0-released pytests are broken
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
index 1320f824fdf3..415ff0b31b75 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/pkgs/tools/text/numdiff/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
- name = "numdiff-${version}";
+ pname = "numdiff";
version = "5.9.0";
src = fetchurl {
diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix
index 48abee018306..69277d0412df 100644
--- a/pkgs/tools/text/odt2txt/default.nix
+++ b/pkgs/tools/text/odt2txt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, zlib, libiconv }:
stdenv.mkDerivation rec {
- name = "odt2txt-${version}";
+ pname = "odt2txt";
version = "0.5";
src = fetchurl {
diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix
index 05213ff1a870..be85511a92b8 100644
--- a/pkgs/tools/text/papertrail/default.nix
+++ b/pkgs/tools/text/papertrail/default.nix
@@ -1,7 +1,7 @@
{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }:
let
- papertrail-env = bundlerEnv rec {
+ papertrail-env = bundlerEnv {
name = "papertrail-env";
inherit ruby;
gemfile = ./Gemfile;
diff --git a/pkgs/tools/text/patchutils/0.3.3.nix b/pkgs/tools/text/patchutils/0.3.3.nix
index b324137be6aa..f50354199c3f 100644
--- a/pkgs/tools/text/patchutils/0.3.3.nix
+++ b/pkgs/tools/text/patchutils/0.3.3.nix
@@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "0.3.3";
sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i";
patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one
diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix
index eab0e98f95c7..902773f40fa4 100644
--- a/pkgs/tools/text/patchutils/default.nix
+++ b/pkgs/tools/text/patchutils/default.nix
@@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
version = "0.3.4";
sha256 = "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg";
})
diff --git a/pkgs/tools/text/patchutils/generic.nix b/pkgs/tools/text/patchutils/generic.nix
index 87d925e333f6..9d7ac4b53f05 100644
--- a/pkgs/tools/text/patchutils/generic.nix
+++ b/pkgs/tools/text/patchutils/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, perl
, version, sha256, patches ? []
, ...
}:
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
inherit sha256;
};
+ buildInputs = [ perl ];
hardeningDisable = [ "format" ];
doCheck = false; # fails
diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix
index b51f811644d1..9407e68ed165 100644
--- a/pkgs/tools/text/peco/default.nix
+++ b/pkgs/tools/text/peco/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "peco-${version}";
+ pname = "peco";
version = "0.5.3";
goPackagePath = "github.com/peco/peco";
diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix
index 4b30387f7ac5..342377b85aea 100644
--- a/pkgs/tools/text/platinum-searcher/default.nix
+++ b/pkgs/tools/text/platinum-searcher/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "the_platinum_searcher-${version}";
+ pname = "the_platinum_searcher";
version = "2.1.5";
rev = "v${version}";
diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix
index ccfeabaa73bd..a71ef2f06bd0 100644
--- a/pkgs/tools/text/podiff/default.nix
+++ b/pkgs/tools/text/podiff/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
- name = "podiff-${version}";
+stdenv.mkDerivation {
+ pname = "podiff";
version = "1.1";
src = fetchurl {
diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix
index a5864fbc051c..e1ac2248d224 100644
--- a/pkgs/tools/text/poedit/default.nix
+++ b/pkgs/tools/text/poedit/default.nix
@@ -3,7 +3,7 @@
nlohmann_json, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "poedit-${version}";
+ pname = "poedit";
version = "2.2.1";
src = fetchurl {
diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix
index c536cbbaaad4..27e9c80bc7d5 100644
--- a/pkgs/tools/text/proselint/default.nix
+++ b/pkgs/tools/text/proselint/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, buildPythonApplication, click, future, six }:
buildPythonApplication rec {
- name = "proselint-${version}";
+ pname = "proselint";
version = "0.10.2";
doCheck = false; # fails to pass because it tries to run in home directory
src = fetchurl {
- url = "mirror://pypi/p/proselint/${name}.tar.gz";
+ url = "mirror://pypi/p/proselint/${pname}-${version}.tar.gz";
sha256 = "017risn0j1bjy9ygzfgphjnyjl4gk7wbrr4qv1vvrlan60wyp1rs";
};
diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix
index e3970c059027..9cf9349badb2 100644
--- a/pkgs/tools/text/qshowdiff/default.nix
+++ b/pkgs/tools/text/qshowdiff/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, qt4, perl, pkgconfig }:
stdenv.mkDerivation rec {
- name = "qshowdiff-${version}";
+ pname = "qshowdiff";
version = "1.2";
src = fetchurl {
diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix
index 9e3e4d5b41d5..25e9c07f351e 100644
--- a/pkgs/tools/text/reckon/default.nix
+++ b/pkgs/tools/text/reckon/default.nix
@@ -1,11 +1,11 @@
{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper }:
stdenv.mkDerivation rec {
- name = "reckon-${version}";
+ pname = "reckon";
version = (import ./gemset.nix).reckon.version;
env = bundlerEnv {
- name = "${name}-gems";
+ name = "${pname}-${version}-gems";
gemdir = ./.;
};
diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix
index 9edbaff99295..3437400269c3 100644
--- a/pkgs/tools/text/recode/default.nix
+++ b/pkgs/tools/text/recode/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook
, texinfo, libiconv, libintl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "recode-3.7-2fd838565";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/rpl/default.nix b/pkgs/tools/text/rpl/default.nix
index bdbc97124433..7ac3790f8a98 100644
--- a/pkgs/tools/text/rpl/default.nix
+++ b/pkgs/tools/text/rpl/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "${pname}-${version}";
pname = "rpl";
version = "1.5.7";
diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix
index 8aadbb0b8062..83ac2d4d766d 100644
--- a/pkgs/tools/text/rst2html5/default.nix
+++ b/pkgs/tools/text/rst2html5/default.nix
@@ -1,13 +1,11 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonPackage rec {
-
- name = "${pname}-${version}";
pname = "rst2html5";
version = "1.9.4";
src = fetchurl {
- url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
sha256 = "d044589d30eeaf7336986078b7bd175510fd649a212b01a457d7806b279e6c73";
};
diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/tools/text/schema2ldif/default.nix
index 2df6cbb27a2d..5df4e90ff1aa 100644
--- a/pkgs/tools/text/schema2ldif/default.nix
+++ b/pkgs/tools/text/schema2ldif/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, perlPackages }: stdenv.mkDerivation rec {
- name = "schema2ldif-${version}";
+ pname = "schema2ldif";
version = "1.3";
src = fetchurl {
diff --git a/pkgs/tools/text/shab/default.nix b/pkgs/tools/text/shab/default.nix
index 73323c784fd7..02d2d545122a 100644
--- a/pkgs/tools/text/shab/default.nix
+++ b/pkgs/tools/text/shab/default.nix
@@ -19,7 +19,6 @@ let
done
'';
- doBuild = false;
doCheck = true;
doInstallCheck = true;
diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 12b57cb82dfd..6f29cbc18f23 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "shfmt-${version}";
+ pname = "shfmt";
version = "2.6.4";
goPackagePath = "mvdan.cc/sh";
diff --git a/pkgs/tools/text/shocco/default.nix b/pkgs/tools/text/shocco/default.nix
index 97c677a7f701..f657df5b780b 100644
--- a/pkgs/tools/text/shocco/default.nix
+++ b/pkgs/tools/text/shocco/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, perlPackages, pythonPackages }:
stdenv.mkDerivation rec {
- name = "shocco-${version}";
+ pname = "shocco";
version = "1.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix
index 421715f7c33c..c2a4cf22ea6d 100644
--- a/pkgs/tools/text/sift/default.nix
+++ b/pkgs/tools/text/sift/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "sift-${version}";
+ pname = "sift";
version = "0.9.0";
rev = "v${version}";
diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index 72dfa684160b..2c28f9ea5a56 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -1,13 +1,13 @@
{stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcre, zlib, lzma}:
stdenv.mkDerivation rec {
- name = "silver-searcher-${version}";
+ pname = "silver-searcher";
version = "2.2.0";
src = fetchFromGitHub {
owner = "ggreer";
repo = "the_silver_searcher";
- rev = "${version}";
+ rev = version;
sha256 = "0cyazh7a66pgcabijd27xnk1alhsccywivv6yihw378dqxb22i1p";
};
diff --git a/pkgs/tools/text/staccato/default.nix b/pkgs/tools/text/staccato/default.nix
index f88ac6951bfc..a68d2266b431 100644
--- a/pkgs/tools/text/staccato/default.nix
+++ b/pkgs/tools/text/staccato/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
- name = "staccato-${version}";
+ pname = "staccato";
version = "0.1.6";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix
index 592f9b8f1885..100124043ed7 100644
--- a/pkgs/tools/text/txt2tags/default.nix
+++ b/pkgs/tools/text/txt2tags/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.6";
- name = "txt2tags-${version}";
+ pname = "txt2tags";
dontBuild = true;
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
'';
src = fetchurl {
- url = "http://txt2tags.googlecode.com/files/${name}.tgz";
+ url = "http://txt2tags.googlecode.com/files/${pname}-${version}.tgz";
sha256 = "0p5hql559pk8v5dlzgm75yrcxwvz4z30f1q590yzng0ghvbnf530";
};
diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix
index 361b6782526b..93611ec5531d 100644
--- a/pkgs/tools/text/unrtf/default.nix
+++ b/pkgs/tools/text/unrtf/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, autoconf, automake, libiconv }:
stdenv.mkDerivation rec {
- name = "unrtf-${version}";
+ pname = "unrtf";
version = "0.21.9";
src = fetchurl {
- url = "https://www.gnu.org/software/unrtf/${name}.tar.gz";
+ url = "https://www.gnu.org/software/unrtf/${pname}-${version}.tar.gz";
sha256 = "1pcdzf2h1prn393dkvg93v80vh38q0v817xnbwrlwxbdz4k7i8r2";
};
diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/tools/text/untex/default.nix
index b1671ad38b53..923adf8571d1 100644
--- a/pkgs/tools/text/untex/default.nix
+++ b/pkgs/tools/text/untex/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "untex-${version}";
+ pname = "untex";
version = "1.3";
src = fetchurl {
- url = "ftp://ftp.thp.uni-duisburg.de/pub/source/${name}.tar.gz";
+ url = "ftp://ftp.thp.uni-duisburg.de/pub/source/${pname}-${version}.tar.gz";
sha256 = "1jww43pl9qvg6kwh4h8imp966fzd62dk99pb4s93786lmp3kgdjv";
};
diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
index 20cd5066e808..7b08cffe42db 100644
--- a/pkgs/tools/text/wgetpaste/default.nix
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "2.29";
- name = "wgetpaste-${version}";
+ pname = "wgetpaste";
src = fetchurl {
- url = "http://wgetpaste.zlin.dk/${name}.tar.bz2";
+ url = "http://wgetpaste.zlin.dk/${pname}-${version}.tar.bz2";
sha256 = "1rp0wxr3zy7y2xp3azaadfghrx7g0m138f9qg6icjxkkz4vj9r22";
};
# currently zsh-autocompletion support is not installed
diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix
index 66dfa1c6b348..92ad2e005884 100644
--- a/pkgs/tools/text/xidel/default.nix
+++ b/pkgs/tools/text/xidel/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, dpkg }:
stdenv.mkDerivation rec {
- name = "xidel-${version}";
+ pname = "xidel";
version = "0.9.6";
## Source archive lacks file (manageUtils.sh), using pre-built package for now.
diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix
index 0650270bb6a0..704ccede799b 100644
--- a/pkgs/tools/text/xml/basex/default.nix
+++ b/pkgs/tools/text/xml/basex/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }:
stdenv.mkDerivation rec {
- name = "basex-${version}";
+ pname = "basex";
version = "8.6.6";
src = fetchurl {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
desktopItem = makeDesktopItem {
name = "basex";
exec = "basexgui %f";
- icon = "${./basex.svg}"; # icon copied from Ubuntu basex package
+ icon = ./basex.svg; # icon copied from Ubuntu basex package
comment = "Visually query and analyse your XML data";
desktopName = "BaseX XML Database";
genericName = "XML database tool";
diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix
index 8851b8a2725c..ed19e1144691 100644
--- a/pkgs/tools/text/xml/html-xml-utils/default.nix
+++ b/pkgs/tools/text/xml/html-xml-utils/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, curl, libiconv }:
stdenv.mkDerivation rec {
- name = "html-xml-utils-${version}";
+ pname = "html-xml-utils";
version = "7.7";
src = fetchurl {
- url = "https://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz";
+ url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz";
sha256 = "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr";
};
diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix
index f764a2fac07d..b38c2b3e34de 100644
--- a/pkgs/tools/text/xml/jing-trang/default.nix
+++ b/pkgs/tools/text/xml/jing-trang/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }:
-stdenv.mkDerivation rec {
- name = "jing-trang-${version}";
+stdenv.mkDerivation {
+ pname = "jing-trang";
version = "20151127";
src = fetchFromGitHub {
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
buildInputs = [ jdk ant saxon ];
+ CLASSPATH = "lib/saxon.jar";
+
preBuild = "ant";
installPhase = ''
diff --git a/pkgs/tools/text/xml/rnv/default.nix b/pkgs/tools/text/xml/rnv/default.nix
index fef8b9db2ffd..21869cef4ee4 100644
--- a/pkgs/tools/text/xml/rnv/default.nix
+++ b/pkgs/tools/text/xml/rnv/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, expat }:
stdenv.mkDerivation rec {
- name = "rnv-${version}";
+ pname = "rnv";
version = "1.7.11";
src = fetchurl {
diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix
index fc11e210c3cc..093f1b0aec7f 100644
--- a/pkgs/tools/text/xml/rxp/default.nix
+++ b/pkgs/tools/text/xml/rxp/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl} :
stdenv.mkDerivation rec {
- name = "rxp-${version}";
+ pname = "rxp";
version = "1.5.0";
src = fetchurl {
diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix
index 40013c7f46d5..3be952358b65 100644
--- a/pkgs/tools/text/xml/xml2/default.nix
+++ b/pkgs/tools/text/xml/xml2/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libxml2 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "xml2-0.5";
src = fetchurl {
diff --git a/pkgs/tools/text/xml/xmlformat/default.nix b/pkgs/tools/text/xml/xmlformat/default.nix
index 5982aa3828ef..8dfec26e8116 100644
--- a/pkgs/tools/text/xml/xmlformat/default.nix
+++ b/pkgs/tools/text/xml/xmlformat/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
- name = "xmlformat-${version}";
+ pname = "xmlformat";
version = "1.04";
src = fetchurl {
diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix
index 479085be0e1d..cf44782432c4 100644
--- a/pkgs/tools/text/xsv/default.nix
+++ b/pkgs/tools/text/xsv/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
- name = "xsv-${version}";
+ pname = "xsv";
version = "0.13.0";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix
index 55619b416320..6e66090d88f0 100644
--- a/pkgs/tools/text/xurls/default.nix
+++ b/pkgs/tools/text/xurls/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
version = "2.0.0";
- name = "xurls-${version}";
+ pname = "xurls";
src = fetchFromGitHub {
owner = "mvdan";
diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/tools/text/yaml-merge/default.nix
index 00673341cfc6..95a94cee7c4b 100644
--- a/pkgs/tools/text/yaml-merge/default.nix
+++ b/pkgs/tools/text/yaml-merge/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name= "yaml-merge-2016-02-16";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix
index fbd9bc3fa20a..15e5ddf2f199 100644
--- a/pkgs/tools/text/zimreader/default.nix
+++ b/pkgs/tools/text/zimreader/default.nix
@@ -2,7 +2,7 @@
, zimlib, cxxtools, tntnet
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "zimreader-0.92";
src = fetchFromGitHub {
diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix
index c9a6b7b3d795..27334bf09b4c 100644
--- a/pkgs/tools/text/zimwriterfs/default.nix
+++ b/pkgs/tools/text/zimwriterfs/default.nix
@@ -16,13 +16,13 @@
}:
stdenv.mkDerivation rec {
- name = "zimwriterfs-${version}";
+ pname = "zimwriterfs";
version = "1.0";
src = fetchFromGitHub {
owner = "wikimedia";
repo = "openzim";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "1vkrrq929a8s3m5rri1lg0l2vd0mc9n2fsb2z1g88k4n4j2l6f19";
};
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index d18a5e2c7442..83aa667f58fd 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -111,7 +111,7 @@ let
};
# there are no archives or tags, using latest commit in master branch as per 2013-09-22
- matplotlibFilterSrc = let commit = "75f0d009629f93f33fab04b83faca20cc35dd358"; in fetchurl rec {
+ matplotlibFilterSrc = let commit = "75f0d009629f93f33fab04b83faca20cc35dd358"; in fetchurl {
name = "mplw-${commit}.tar.gz";
url = "https://api.github.com/repos/lvv/mplw/tarball/${commit}";
sha256 = "0yfhkm2dr8gnp0fcg25x89hwiymkri2m5cyqzmzragzwj0hbmcf1";
diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix
index 6d26129f2c12..55349641ab62 100644
--- a/pkgs/tools/typesetting/biber/default.nix
+++ b/pkgs/tools/typesetting/biber/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, perlPackages, shortenPerlShebang, texlive }:
+{ stdenv, fetchpatch, perlPackages, shortenPerlShebang, texlive }:
let
biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs);
@@ -10,6 +10,20 @@ perlPackages.buildPerlModule {
src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz";
+ patches = stdenv.lib.optionals (stdenv.lib.versionAtLeast perlPackages.perl.version "5.30") [
+ (fetchpatch {
+ name = "biber-fix-tests.patch";
+ url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/biber-fix-tests.patch?h=5d0fffd493550e28b2fb81ad114d62a7c9403812";
+ sha256 = "1ninf46bxf4hm0p5arqbxqyv8r98xdwab34vvp467q1v23kfbhya";
+ })
+
+ (fetchpatch {
+ name = "biber-fix-tests-2.patch";
+ url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/biber-fix-tests-2.patch?h=5d0fffd493550e28b2fb81ad114d62a7c9403812";
+ sha256 = "1l8pk454kkm0szxrv9rv9m2a0llw1jm7ffhgpyg4zfiw246n62x0";
+ })
+ ];
+
buildInputs = with perlPackages; [
autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K
diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix
index fd2cf133c0ac..cb667e6b1218 100644
--- a/pkgs/tools/typesetting/djvu2pdf/default.nix
+++ b/pkgs/tools/typesetting/djvu2pdf/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.9.2";
- name = "djvu2pdf-${version}";
+ pname = "djvu2pdf";
src = fetchurl {
url = "http://0x2a.at/site/projects/djvu2pdf/djvu2pdf-${version}.tar.gz";
diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix
index 9240926ab5b4..a72ca6980774 100644
--- a/pkgs/tools/typesetting/fop/default.nix
+++ b/pkgs/tools/typesetting/fop/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, ant, jdk, runtimeShell }:
stdenv.mkDerivation rec {
- name = "fop-${version}";
+ pname = "fop";
version = "2.1";
src = fetchurl {
- url = "mirror://apache/xmlgraphics/fop/source/${name}-src.tar.gz";
+ url = "mirror://apache/xmlgraphics/fop/source/${pname}-${version}-src.tar.gz";
sha256 = "165rx13q47l6qc29ppr7sg1z26vw830s3rkklj5ap7wgvy0ivbz5";
};
diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix
index a255779c08a3..c214bd3cac7e 100644
--- a/pkgs/tools/typesetting/git-latexdiff/default.nix
+++ b/pkgs/tools/typesetting/git-latexdiff/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.3.0";
- name = "git-latexdiff-${version}";
+ pname = "git-latexdiff";
src = fetchFromGitLab {
sha256 = "05fnhr1pqvj8l25vi9hdccwfk4mv2f0pfhn05whbdvf66gyl4fs9";
diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix
index d6c4fedc1434..7fca57ab9d26 100644
--- a/pkgs/tools/typesetting/htmldoc/default.nix
+++ b/pkgs/tools/typesetting/htmldoc/default.nix
@@ -8,7 +8,7 @@ assert stdenv.isDarwin -> SystemConfiguration != null
stdenv.mkDerivation rec {
version = "1.8.29";
- name = "htmldoc-${version}";
+ pname = "htmldoc";
src = fetchurl {
url = "https://github.com/michaelrsweet/htmldoc/releases/download"
+ "/release-${version}/htmldoc-${version}-source.tar.gz";
diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix
index fc43ed0abe27..ff63ece34173 100644
--- a/pkgs/tools/typesetting/kindlegen/default.nix
+++ b/pkgs/tools/typesetting/kindlegen/default.nix
@@ -5,25 +5,26 @@ let
fileVersion = builtins.replaceStrings [ "." ] [ "_" ] version;
sha256 = {
- "x86_64-linux" = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q";
- "i686-linux" = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q";
- "x86_64-darwin" = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs";
- "i686-darwin" = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs";
- "x86_64-cygwin" = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h";
- "i686-cygwin" = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h";
- }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported");
+ x86_64-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q";
+ i686-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q";
+ x86_64-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs";
+ i686-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs";
+ x86_64-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h";
+ i686-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h";
+ }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported");
url = {
- "x86_64-linux" = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz";
- "i686-linux" = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz";
- "x86_64-darwin" = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip";
- "i686-darwin" = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip";
- "x86_64-cygwin" = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip";
- "i686-cygwin" = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip";
- }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported");
+ x86_64-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz";
+ i686-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz";
+ x86_64-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip";
+ i686-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip";
+ x86_64-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip";
+ i686-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip";
+ }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported");
-in stdenv.mkDerivation rec {
- name = "kindlegen-${version}";
+in stdenv.mkDerivation {
+ pname = "kindlegen";
+ inherit version;
src = fetchurl {
inherit url;
diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix
index 2b7a6f3ffb44..064e75ecbdc1 100644
--- a/pkgs/tools/typesetting/mmark/default.nix
+++ b/pkgs/tools/typesetting/mmark/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "mmark-${version}";
+ pname = "mmark";
version = "1.3.6";
rev = "v${version}";
diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix
index 3a7d7be006a1..4cdbac7d6381 100644
--- a/pkgs/tools/typesetting/multimarkdown/default.nix
+++ b/pkgs/tools/typesetting/multimarkdown/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, perl }:
-stdenv.mkDerivation rec {
- name = "multimarkdown-${version}";
+stdenv.mkDerivation {
+ pname = "multimarkdown";
version = "4.7.1";
src = fetchgit {
diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix
index c53e8573c90f..9f62671a4fac 100644
--- a/pkgs/tools/typesetting/odpdown/default.nix
+++ b/pkgs/tools/typesetting/odpdown/default.nix
@@ -2,7 +2,7 @@
pythonPackages.buildPythonApplication rec {
- name = "odpdown-${version}";
+ pname = "odpdown";
version = "0.4.1";
src = fetchurl {
diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
index 42f984b8cc60..a6f38ad0bc2c 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.9.13";
- name = "pdf2djvu-${version}";
+ pname = "pdf2djvu";
src = fetchurl {
- url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz";
+ url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "0qscmfii1pvnb8g7kbl1rdiqyic6ybfiw4kwvy35qqi967c1daz0";
};
diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
index ad9684910c0b..dee6ec3c6fff 100644
--- a/pkgs/tools/typesetting/pdf2htmlEX/default.nix
+++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
@@ -3,7 +3,7 @@
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "pdf2htmlEX-0.14.6";
src = fetchFromGitHub {
diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix
index 3e40c9caf28e..c8e27fb5a6e7 100644
--- a/pkgs/tools/typesetting/pdf2odt/default.nix
+++ b/pkgs/tools/typesetting/pdf2odt/default.nix
@@ -14,7 +14,7 @@ let
];
in stdenv.mkDerivation rec {
- name = "pdf2odt-${version}";
+ pname = "pdf2odt";
version = "20170207";
src = fetchFromGitHub {
diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix
index 38382689edce..20da90961dda 100644
--- a/pkgs/tools/typesetting/pdfgrep/default.nix
+++ b/pkgs/tools/typesetting/pdfgrep/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, poppler, libgcrypt, pcre, asciidoc }:
stdenv.mkDerivation rec {
- name = "pdfgrep-${version}";
+ pname = "pdfgrep";
version = "2.1.2";
src = fetchurl {
- url = "https://pdfgrep.org/download/${name}.tar.gz";
+ url = "https://pdfgrep.org/download/${pname}-${version}.tar.gz";
sha256 = "1fia10djcxxl7n9jw2prargw4yzbykk6izig2443ycj9syhxrwqf";
};
diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix
index 31184e11399b..f8b17be01ddc 100644
--- a/pkgs/tools/typesetting/pdfsandwich/default.nix
+++ b/pkgs/tools/typesetting/pdfsandwich/default.nix
@@ -1,6 +1,6 @@
{ stdenv, ocaml, makeWrapper, fetchsvn, ghostscript, imagemagick, perl, poppler_utils, tesseract, unpaper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "0.1.7";
pname = "pdfsandwich";
diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/tools/typesetting/psutils/default.nix
index 25f12838be08..39beab751a7a 100644
--- a/pkgs/tools/typesetting/psutils/default.nix
+++ b/pkgs/tools/typesetting/psutils/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, perl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "psutils-17";
src = fetchurl {
diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix
index 0a0f593eaa3b..6a2ebb089d21 100644
--- a/pkgs/tools/typesetting/satysfi/default.nix
+++ b/pkgs/tools/typesetting/satysfi/default.nix
@@ -29,7 +29,7 @@ let
});
in
stdenv.mkDerivation rec {
- name = "satysfi-${version}";
+ pname = "satysfi";
version = "0.0.3";
src = fetchFromGitHub {
owner = "gfngfn";
diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix
index 3145d580dc62..011a8f24ece9 100644
--- a/pkgs/tools/typesetting/scdoc/default.nix
+++ b/pkgs/tools/typesetting/scdoc/default.nix
@@ -1,20 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "scdoc-${version}";
- version = "1.9.7";
+ pname = "scdoc";
+ version = "1.10.0";
src = fetchurl {
url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz";
- sha256 = "0y9p03dzdaszx02jbkdf3vcs52fqml591cmic5jdch5yznrg03ky";
+ sha256 = "0lk8wpz95ld1fnpnc3xkhvnd58px1vbhvlpkr8labi2ck65y10il";
};
postPatch = ''
substituteInPlace Makefile \
--replace "-static" "" \
--replace "/usr/local" "$out"
- # It happens from time to time that the version wasn't updated:
- sed -iE 's/VERSION=[0-9]\.[0-9]\.[0-9]/VERSION=${version}/' Makefile
'';
doCheck = true;
diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index 966d657ae7d0..3b6ec809869d 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
- name = "sile-${version}";
+ pname = "sile";
version = "0.9.5.1";
src = fetchurl {
- url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2";
+ url = "https://github.com/simoncozens/sile/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "0fh0jbpsyqyq0hzq4midn7yw2z11hqdgqb9mmgz766cp152wrkb0";
};
diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix
index 355d7a055e8f..b06b2e25fcc2 100644
--- a/pkgs/tools/typesetting/skribilo/default.nix
+++ b/pkgs/tools/typesetting/skribilo/default.nix
@@ -10,11 +10,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "skribilo-${version}";
+ pname = "skribilo";
version = "0.9.4";
src = fetchurl {
- url = "http://download.savannah.nongnu.org/releases/skribilo/${name}.tar.gz";
+ url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz";
sha256 = "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf";
};
diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix
index 1cb7b9ce9759..be218cda535a 100644
--- a/pkgs/tools/typesetting/sshlatex/default.nix
+++ b/pkgs/tools/typesetting/sshlatex/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, inotify-tools, openssh, perl, gnutar, bash, makeWrapper }:
stdenv.mkDerivation rec {
- name = "sshlatex-${version}";
+ pname = "sshlatex";
version = "0.8";
src = fetchFromGitHub {
owner = "iblech";
repo = "sshlatex";
- rev = "${version}";
+ rev = version;
sha256 = "0kaah8is74zba9373xccmsxmnnn6kh0isr4qpg21x3qhdzhlxl7q";
};
diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
index a7886f317c15..98c80da5b2c1 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -2,7 +2,7 @@
, darwin, fontconfig, harfbuzz, openssl, pkgconfig }:
rustPlatform.buildRustPackage rec {
- name = "tectonic-${version}";
+ pname = "tectonic";
version = "0.1.11";
src = fetchFromGitHub {
diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix
index b60cbcf22ad0..a03432b729ad 100644
--- a/pkgs/tools/typesetting/ted/default.nix
+++ b/pkgs/tools/typesetting/ted/default.nix
@@ -1,12 +1,11 @@
{ stdenv, fetchurl, pkgconfig, zlib, pcre, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "ted";
version = "2.23";
src = fetchurl {
- url = "http://ftp.nluug.nl/pub/editors/${pname}/${name}.src.tar.gz";
+ url = "http://ftp.nluug.nl/pub/editors/${pname}/${pname}-${version}.src.tar.gz";
sha256 = "0v1ipynyjklb3chd1vq26a21sjjg66sir57gi2kkrbwnpk195a9z";
};
diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix
index 5444914f7a4e..2513d48796e1 100644
--- a/pkgs/tools/typesetting/tex/auctex/default.nix
+++ b/pkgs/tools/typesetting/tex/auctex/default.nix
@@ -2,7 +2,6 @@
let auctex = stdenv.mkDerivation ( rec {
version = "12.1";
- name = "${pname}-${version}";
# Make this a valid tex(live-new) package;
# the pkgs attribute is provided with a hack below.
@@ -13,7 +12,7 @@ let auctex = stdenv.mkDerivation ( rec {
outputs = [ "out" "tex" ];
src = fetchurl {
- url = "mirror://gnu/${pname}/${name}.tar.gz";
+ url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "1d2x59jw42hr81fma195bniqyhvp5ig5q0xmywbkcy59f16wlp69";
};
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 57347a120214..f250dfb69dec 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -17,7 +17,7 @@ let
year = "2018";
version = year; # keep names simple for now
- common = rec {
+ common = {
src = fetchurl {
urls = [
"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0414-source.tar.xz"
@@ -91,7 +91,8 @@ texliveYear = year;
core = stdenv.mkDerivation rec {
- name = "texlive-bin-${version}";
+ pname = "texlive-bin";
+ inherit version;
inherit (common) src patches postPatch preAutoreconf postAutoreconf;
@@ -183,7 +184,8 @@ core = stdenv.mkDerivation rec {
inherit (core-big) metafont metapost luatex xetex;
core-big = stdenv.mkDerivation { #TODO: upmendex
- name = "texlive-core-big.bin-${version}";
+ pname = "texlive-core-big.bin";
+ inherit version;
inherit (common) src patches postPatch preAutoreconf postAutoreconf;
@@ -246,7 +248,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
dvisvgm = stdenv.mkDerivation {
- name = "texlive-dvisvgm.bin-${version}";
+ pname = "texlive-dvisvgm.bin";
+ inherit version;
inherit (common) src;
@@ -263,7 +266,8 @@ dvisvgm = stdenv.mkDerivation {
dvipng = stdenv.mkDerivation {
- name = "texlive-dvipng.bin-${version}";
+ pname = "texlive-dvipng.bin";
+ inherit version;
inherit (common) src;
@@ -318,7 +322,8 @@ latexindent = perlPackages.buildPerlPackage rec {
inherit biber;
bibtexu = bibtex8;
bibtex8 = stdenv.mkDerivation {
- name = "texlive-bibtex-x.bin-${version}";
+ pname = "texlive-bibtex-x.bin";
+ inherit version;
inherit (common) src;
@@ -335,7 +340,8 @@ bibtex8 = stdenv.mkDerivation {
xdvi = stdenv.mkDerivation {
- name = "texlive-xdvi.bin-${version}";
+ pname = "texlive-xdvi.bin";
+ inherit version;
inherit (common) src;
@@ -363,7 +369,8 @@ xdvi = stdenv.mkDerivation {
{
xindy = stdenv.mkDerivation {
- name = "texlive-xindy.bin-${version}";
+ pname = "texlive-xindy.bin";
+ inherit version;
inherit (common) src;
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index a3b58e7274de..651ff88b6f2e 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -84,8 +84,8 @@ let
# the fake derivations are used for filtering of hyphenation patterns
else { inherit pname version; tlType = "run"; }
)]
- ++ lib.optional (attrs.sha512 ? "doc") (mkPkgV "doc")
- ++ lib.optional (attrs.sha512 ? "source") (mkPkgV "source")
+ ++ lib.optional (attrs.sha512 ? doc) (mkPkgV "doc")
+ ++ lib.optional (attrs.sha512 ? source) (mkPkgV "source")
++ lib.optional (bin ? ${pname})
( bin.${pname} // { inherit pname; tlType = "bin"; } )
++ combinePkgs (attrs.deps or {});
diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix
index 906d9be0f1ec..5ee1adda483b 100644
--- a/pkgs/tools/typesetting/tikzit/default.nix
+++ b/pkgs/tools/typesetting/tikzit/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qmake, qttools, qtbase, libsForQt5, flex, bison }:
-stdenv.mkDerivation rec {
- name = "tikzit-${version}";
+stdenv.mkDerivation {
+ pname = "tikzit";
version = "2.1.4";
src = fetchFromGitHub {
diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix
index 523a34c0b569..eb026e5557eb 100644
--- a/pkgs/tools/typesetting/xmlroff/default.nix
+++ b/pkgs/tools/typesetting/xmlroff/default.nix
@@ -1,49 +1,55 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt, perl
-, glib, pango, pangoxsl, gtk2, libtool, autoconf, automake }:
+{ stdenv, fetchFromGitHub
+, autoreconfHook
+, gtk2
+, libxml2
+, libxslt
+, pango
+, pangoxsl
+, perl
+, pkgconfig
+, popt
+}:
stdenv.mkDerivation rec {
- name = "xmlroff-${version}";
- version = "0.6.2";
+ pname = "xmlroff";
+ version = "0.6.3";
- src = fetchurl {
- url = "https://github.com/xmlroff/xmlroff/archive/v${version}.tar.gz";
- sha256 = "1sczn6xjczsfdxlbjqv4xqlki2a95y2s8ih2nl9v1vhqfk17fiww";
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0dgp72094lx9i9gvg21pp8ak7bg39707rdf6wz011p9s6n6lrq5g";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [
- autoconf
- automake
libxml2
libxslt
- libtool
- glib
pango
pangoxsl
gtk2
popt
];
+ sourceRoot = "source/xmlroff/";
+
+ enableParallelBuilding = true;
+
configureScript = "./autogen.sh";
configureFlags = [
- "--disable-pangoxsl"
"--disable-gp"
];
- hardeningDisable = [ "format" ];
-
preBuild = ''
substituteInPlace tools/insert-file-as-string.pl --replace "/usr/bin/perl" "${perl}/bin/perl"
- substituteInPlace Makefile --replace "docs" ""
+ substituteInPlace Makefile --replace "docs" "" # docs target wants to download from network
'';
- sourceRoot = "${name}/xmlroff/";
-
- patches = [./xmlroff.patch];
-
- meta = {
- platforms = stdenv.lib.platforms.unix;
- license = stdenv.lib.licenses.bsd3;
+ meta = with stdenv.lib; {
+ description = "XSL Formatter";
+ homepage = "http://xmlroff.org/";
+ platforms = platforms.unix;
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/tools/typesetting/xmlroff/xmlroff.patch b/pkgs/tools/typesetting/xmlroff/xmlroff.patch
deleted file mode 100644
index 6f0246e96796..000000000000
--- a/pkgs/tools/typesetting/xmlroff/xmlroff.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xmlroff-0.6.2.orig/libfo/fo-libfo-basic.h
-+++ xmlroff-0.6.2/libfo/fo-libfo-basic.h
-@@ -11,8 +11,7 @@
- #define __FO_LIBFO_BASIC_H__
-
- #include
--#include
--#include
-+#include
-
- G_BEGIN_DECLS
diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix
index 711a3c00a122..a4089636b951 100644
--- a/pkgs/tools/video/atomicparsley/default.nix
+++ b/pkgs/tools/video/atomicparsley/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchhg, autoreconfHook, zlib, Cocoa }:
-stdenv.mkDerivation rec {
- name = "atomicparsley-${version}";
+stdenv.mkDerivation {
+ pname = "atomicparsley";
version = "0.9.6";
src = fetchhg {
diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix
index 4f5a348b144e..5594143bfbce 100644
--- a/pkgs/tools/video/bento4/default.nix
+++ b/pkgs/tools/video/bento4/default.nix
@@ -2,7 +2,7 @@
, cmake
}:
stdenv.mkDerivation rec {
- name = "bento4-${version}";
+ pname = "bento4";
version = "1.5.1-628";
src = fetchFromGitHub {
diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix
index 752a6f314325..8fe2a70dcb44 100644
--- a/pkgs/tools/video/dvgrab/default.nix
+++ b/pkgs/tools/video/dvgrab/default.nix
@@ -1,7 +1,7 @@
{ fetchFromGitHub, stdenv, libunwind, libraw1394, libjpeg, libiec61883, libdv
, libavc1394, pkgconfig, autoreconfHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "dvgrab-2016-05-16";
src = fetchFromGitHub {
diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index 8be028730377..06c035552e54 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, zlib
+{ stdenv, fetchgit, fetchpatch, zlib
, gnutlsSupport ? false, gnutls ? null, nettle ? null
, opensslSupport ? true, openssl ? null
}:
@@ -9,17 +9,25 @@ assert gnutlsSupport -> gnutlsSupport != null && nettle != null && !opensslSuppo
assert opensslSupport -> openssl != null && !gnutlsSupport;
with stdenv.lib;
-stdenv.mkDerivation rec {
- name = "rtmpdump-${version}";
- version = "2015-12-30";
+stdenv.mkDerivation {
+ pname = "rtmpdump";
+ version = "2019-03-30";
src = fetchgit {
- url = git://git.ffmpeg.org/rtmpdump;
+ url = "git://git.ffmpeg.org/rtmpdump";
# Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4')
- rev = "fa8646daeb19dfd12c181f7d19de708d623704c0";
- sha256 = "17m9rmnnqyyzsnnxcdl8258hjmw16nxbj1n1lr7fj3kmcs189iig";
+ rev = "c5f04a58fc2aeea6296ca7c44ee4734c18401aa3";
+ sha256 = "07ias612jgmxpam9h418kvlag32da914jsnjsfyafklpnh8gdzjb";
};
+ patches = [
+ # Fix build with OpenSSL 1.1
+ (fetchpatch {
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-video/rtmpdump/files/rtmpdump-openssl-1.1.patch?id=1e7bef484f96e7647f5f0911d3c8caa48131c33b";
+ sha256 = "1wds98pk8qr7shkfl8k49iirxiwd972h18w84bamiqln29wv6ql1";
+ })
+ ];
+
makeFlags = [ ''prefix=$(out)'' ]
++ optional gnutlsSupport "CRYPTO=GNUTLS"
++ optional opensslSupport "CRYPTO=OPENSSL"
@@ -32,9 +40,11 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
+ separateDebugInfo = true;
+
meta = {
description = "Toolkit for RTMP streams";
- homepage = http://rtmpdump.mplayerhq.hu/;
+ homepage = "http://rtmpdump.mplayerhq.hu/";
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ codyopel ];
diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix
index a50c7539fe05..d75405ab309f 100644
--- a/pkgs/tools/video/swftools/default.nix
+++ b/pkgs/tools/video/swftools/default.nix
@@ -2,11 +2,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "swftools-${version}";
+ pname = "swftools";
version = "0.9.2";
src = fetchurl {
- url = "http://www.swftools.org/${name}.tar.gz";
+ url = "http://www.swftools.org/${pname}-${version}.tar.gz";
sha256 = "1w81dyi81019a6jmnm5z7fzarswng27lg1d4k4d5llxzqszr2s5z";
};
diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix
index c51c23d62f02..c7b76e0cb6ea 100644
--- a/pkgs/tools/video/untrunc/default.nix
+++ b/pkgs/tools/video/untrunc/default.nix
@@ -1,7 +1,7 @@
{ stdenv, gcc, libav_12, fetchFromGitHub }:
-stdenv.mkDerivation rec {
- name = "untrunc-${version}";
+stdenv.mkDerivation {
+ pname = "untrunc";
version = "2018.01.13";
src = fetchFromGitHub {
diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix
index 411409495934..c09da3dd2316 100644
--- a/pkgs/tools/video/vncrec/default.nix
+++ b/pkgs/tools/video/vncrec/default.nix
@@ -2,7 +2,7 @@
, libXaw, libXext, libSM, libICE, libXpm, libXp
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "vncrec-0.2"; # version taken from Arch AUR
src = fetchurl {
diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/tools/video/yamdi/default.nix
index e995f9e3a4f6..8fca318529ff 100644
--- a/pkgs/tools/video/yamdi/default.nix
+++ b/pkgs/tools/video/yamdi/default.nix
@@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
- name = "yamdi-${version}";
+ pname = "yamdi";
version = "1.9";
# Source repo is also available here:
diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
index 6ed545deb677..e7c391806aa9 100644
--- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
+++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "amazon-ecs-cli-${version}";
+ pname = "amazon-ecs-cli";
version = "1.15.1";
src = fetchurl {
diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix
index 37c3248b83e5..57a68b868096 100644
--- a/pkgs/tools/virtualization/awless/default.nix
+++ b/pkgs/tools/virtualization/awless/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "awless-${version}";
+ pname = "awless";
version = "0.1.11";
goPackagePath = "github.com/wallix/awless";
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix
index 178720436a6f..580c2f9a01f3 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@@ -2,8 +2,9 @@
let version = "0.7.9";
-in pythonPackages.buildPythonApplication rec {
- name = "cloud-init-${version}";
+in pythonPackages.buildPythonApplication {
+ pname = "cloud-init";
+ inherit version;
namePrefix = "";
src = fetchurl {
diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix
index 577426712113..1c7613b4893f 100644
--- a/pkgs/tools/virtualization/cloudmonkey/default.nix
+++ b/pkgs/tools/virtualization/cloudmonkey/default.nix
@@ -3,8 +3,6 @@
with python2Packages;
buildPythonApplication rec {
-
- name = "${pname}-${version}";
pname = "cloudmonkey";
version = "5.3.3";
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix
index c79c2e7cb353..a781f3a44249 100644
--- a/pkgs/tools/virtualization/distrobuilder/default.nix
+++ b/pkgs/tools/virtualization/distrobuilder/default.nix
@@ -7,7 +7,7 @@ let binPath = stdenv.lib.makeBinPath [
];
in
buildGoPackage rec {
- name = "distrobuilder-${version}";
+ pname = "distrobuilder";
version = "2019_10_07";
rev = "d686c88c21838f5505c3ec14711b2413604d7f5c";
diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
index 674673f260ce..e8172066800d 100644
--- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
stdenv.mkDerivation rec {
- name = "ec2-ami-tools-${version}";
+ pname = "ec2-ami-tools";
version = "1.5.7";
buildInputs = [ unzip makeWrapper ];
src = fetchurl {
- url = "https://s3.amazonaws.com/ec2-downloads/${name}.zip";
+ url = "https://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip";
sha256 = "17xj7xmdbcwdbzalhfs6yyiwa64978mk3li39l949qfjjgrxjias";
};
diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix
index 5b310992afb6..cb31a66ea72d 100644
--- a/pkgs/tools/virtualization/euca2ools/default.nix
+++ b/pkgs/tools/virtualization/euca2ools/default.nix
@@ -2,7 +2,7 @@
let
inherit (python2Packages) buildPythonApplication boto m2crypto;
-in buildPythonApplication rec {
+in buildPythonApplication {
name = "euca2ools-2.1.4";
namePrefix = "";
diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
index 7251b418d4e0..0daa01f85bb3 100644
--- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
@@ -6,7 +6,7 @@
}:
stdenv.mkDerivation rec {
- name = "google-compute-engine-oslogin-${version}";
+ pname = "google-compute-engine-oslogin";
version = "1.5.3";
# from packages/google-compute-engine-oslogin/packaging/debian/changelog
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index 0db43ccfcfdd..48255ca68a73 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -11,7 +11,7 @@
}:
buildPythonApplication rec {
- name = "google-compute-engine-${version}";
+ pname = "google-compute-engine";
version = "20190124";
namePrefix = "";
@@ -22,13 +22,16 @@ buildPythonApplication rec {
sha256 = "08cy0jd463kng6hwbd3nfldsp4dpd2lknlvdm88cq795wy0kh4wp";
};
+ buildInputs = [ bash ];
+ propagatedBuildInputs = [ boto setuptools distro ];
+
+
postPatch = ''
for file in $(find google_compute_engine -type f); do
substituteInPlace "$file" \
- --replace /bin/systemctl "${systemd}/bin/systemctl" \
+ --replace /bin/systemctl "/run/current-system/sw/bin/systemctl" \
--replace /bin/bash "${bashInteractive}/bin/bash" \
--replace /sbin/hwclock "${utillinux}/bin/hwclock"
-
# SELinux tool ??? /sbin/restorecon
done
@@ -42,9 +45,13 @@ buildPythonApplication rec {
# allows to install the package in `services.udev.packages` in NixOS
mkdir -p $out/lib/udev/rules.d
cp -r google_config/udev/*.rules $out/lib/udev/rules.d
- '';
- propagatedBuildInputs = [ boto setuptools distro ];
+ # sysctl snippets will be used by google-compute-config.nix
+ mkdir -p $out/sysctl.d
+ cp google_config/sysctl/*.conf $out/sysctl.d
+
+ patchShebangs $out/bin/*
+ '';
doCheck = false;
diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix
index f2fdbcc670d9..b53c211d379f 100644
--- a/pkgs/tools/virtualization/govc/default.nix
+++ b/pkgs/tools/virtualization/govc/default.nix
@@ -1,8 +1,8 @@
{ lib, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
- name = "govc-${version}";
- version = "0.20.0";
+ pname = "govc";
+ version = "0.21.0";
goPackagePath = "github.com/vmware/govmomi";
@@ -12,7 +12,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "vmware";
repo = "govmomi";
- sha256 = "16pgjhlps21vk3cb5h2y0b6skq095rd8kl0618rwrz84chdnzahk";
+ sha256 = "0mig8w0szxqcii3gihrsm8n8hzziq9l6axc5z32nw9kiy9bi4130";
};
meta = {
diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix
index 66618e59122a..10103be26308 100644
--- a/pkgs/tools/virtualization/marathonctl/default.nix
+++ b/pkgs/tools/virtualization/marathonctl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
- name = "marathonctl-unstable-${version}";
+buildGoPackage {
+ pname = "marathonctl-unstable";
version = "2017-03-06";
goPackagePath = "github.com/shoenig/marathonctl";
diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix
index 2699a7a1f36b..79dd4e4551ad 100644
--- a/pkgs/tools/virtualization/rootlesskit/default.nix
+++ b/pkgs/tools/virtualization/rootlesskit/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "rootlesskit-${version}";
+ pname = "rootlesskit";
version = "0.3.0-alpha.2";
goPackagePath = "github.com/rootless-containers/rootlesskit";
diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix
index 7d06b59b013c..5f4d982d86d9 100644
--- a/pkgs/tools/virtualization/udocker/default.nix
+++ b/pkgs/tools/virtualization/udocker/default.nix
@@ -5,7 +5,7 @@ buildPythonApplication rec {
version = "1.1.3";
pname = "udocker";
- src = fetchFromGitHub rec {
+ src = fetchFromGitHub {
owner = "indigo-dc";
repo = "udocker" ;
rev = "v${version}";
diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix
index dfb1467b54d5..4a81e8fe48b1 100644
--- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix
+++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix
@@ -2,7 +2,6 @@
stdenv.mkDerivation (rec {
pname = "xe-guest-utilities";
- name = "${pname}-${version}";
version = "6.2.0";
meta = {
description = "Citrix XenServer Tools";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 202590f626f4..ac88446242e1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -56,6 +56,7 @@ mapAliases ({
bundler_HEAD = bundler; # added 2015-11-15
cantarell_fonts = cantarell-fonts; # added 2018-03-03
checkbashism = checkbashisms; # added 2016-08-16
+ cide = throw "deprecated in 2019-09-11: abandoned by upstream";
cifs_utils = cifs-utils; # added 2016-08
ckb = ckb-next; # added 2018-10-21
clangAnalyzer = clang-analyzer; # added 2015-02-20
@@ -114,6 +115,7 @@ mapAliases ({
git-hub = gitAndTools.git-hub; # added 2016-04-29
glib_networking = glib-networking; # added 2018-02-25
gnome-mpv = celluloid; # added 2019-08-22
+ gmic_krita_qt = gmic-qt-krita; # added 2019-09-07
gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
gnome_doc_utils = gnome-doc-utils; # added 2018-02-25
gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
@@ -265,7 +267,6 @@ mapAliases ({
plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22
pmtools = acpica-tools; # added 2018-11-01
poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
- postgresql94 = postgresql_9_4;
postgresql95 = postgresql_9_5;
postgresql96 = postgresql_9_6;
postgresql100 = throw "deprecated 2018-10-21: use postgresql_10 instead";
@@ -303,8 +304,9 @@ mapAliases ({
rssglx = rss-glx; #added 2015-03-25
ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby";
ruby_2_1_0 = throw "deprecated 2018-0213: use a newer version of ruby";
- ruby_2_2_9 = throw "deprecated 2018-0213: use ruby_2_2 instead";
- ruby_2_3_6 = throw "deprecated 2018-0213: use ruby_2_3 instead";
+ ruby_2_2_9 = throw "deprecated 2018-0213: use a newer version of ruby";
+ ruby_2_3_6 = throw "deprecated 2018-0213: use a newer version of ruby";
+ ruby_2_3 = throw "deprecated 2019-09-06: use a newer version of ruby";
ruby_2_4_3 = throw "deprecated 2018-0213: use ruby_2_4 instead";
ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead";
rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
@@ -325,6 +327,7 @@ mapAliases ({
shared_mime_info = shared-mime-info; # added 2018-02-25
skrooge2 = skrooge; # added 2017-02-18
skype = skypeforlinux; # added 2017-07-27
+ skydive = throw "skydive has been removed from nixpkgs (2019-09-10)";
slic3r-prusa3d = prusa-slicer; # added 2019-05-21
slurm-llnl = slurm; # renamed July 2017
slurm-llnl-full = slurm-full; # renamed July 2017
@@ -341,6 +344,7 @@ mapAliases ({
sshfsFuse = sshfs-fuse; # added 2016-09
suil-qt5 = suil; # added 2018-05-01
surf-webkit2 = surf; # added 2017-04-02
+ sup = throw "deprecated in 2019-09-10: abandoned by upstream";
system_config_printer = system-config-printer; # added 2016-01-03
systool = sysfsutils; # added 2018-04-25
tahoelafs = tahoe-lafs; # added 2018-03-26
@@ -373,13 +377,13 @@ mapAliases ({
ucsFonts = ucs-fonts; # added 2016-07-15
ultrastardx-beta = ultrastardx; # added 2017-08-12
usb_modeswitch = usb-modeswitch; # added 2016-05-10
+ usbguard-nox = usbguard; # added 2019-09-04
v4l_utils = v4l-utils; # added 2019-08-07
vimbWrapper = vimb; # added 2015-01
vimprobable2Wrapper = vimprobable2; # added 2015-01
virtviewer = virt-viewer; # added 2015-12-24
vorbisTools = vorbis-tools; # added 2016-01-26
webkit = webkitgtk; # added 2019-03-05
- weechat-xmpp = weechatScripts.weechat-xmpp; # added 2018-09-06
weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
wineStaging = wine-staging; # added 2018-01-08
winusb = woeusb; # added 2017-12-22
@@ -435,6 +439,9 @@ mapAliases ({
# added 2019-08-01
mumble_git = pkgs.mumble_rc;
murmur_git = pkgs.murmur_rc;
+
+ # added 2019-09-06
+ zeroc_ice = pkgs.zeroc-ice;
} // (with ocaml-ng; { # added 2016-09-14
ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml;
ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d87259effc5..2e8b13c687e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -293,6 +293,14 @@ in
perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
openssl = buildPackages.openssl.override {
fetchurl = stdenv.fetchurlBoot;
+ coreutils = buildPackages.coreutils.override {
+ fetchurl = stdenv.fetchurlBoot;
+ inherit perl;
+ xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; };
+ gmp = null;
+ aclSupport = false;
+ attrSupport = false;
+ };
inherit perl;
buildPackages = { inherit perl; };
};
@@ -352,6 +360,8 @@ in
inherit url;
};
+ installShellFiles = callPackage ../build-support/install-shell-files {};
+
lazydocker = callPackage ../tools/misc/lazydocker { };
ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; }
@@ -381,6 +391,8 @@ in
nix-gitignore = callPackage ../build-support/nix-gitignore { };
+ ociTools = callPackage ../build-support/oci-tools { };
+
pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; }
@@ -596,7 +608,7 @@ in
arandr = callPackage ../tools/X11/arandr { };
- inherit (callPackages ../servers/nosql/arangodb { }) arangodb_3_2 arangodb_3_3 arangodb_3_4 arangodb_3_5;
+ inherit (callPackages ../servers/nosql/arangodb { }) arangodb_3_3 arangodb_3_4 arangodb_3_5;
arangodb = arangodb_3_4;
arcanist = callPackage ../development/tools/misc/arcanist {};
@@ -818,6 +830,8 @@ in
ezstream = callPackage ../tools/audio/ezstream { };
+ libfx2 = with python3Packages; toPythonApplication fx2;
+
fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
genymotion = callPackage ../development/mobile/genymotion { };
@@ -842,6 +856,8 @@ in
gitter = callPackage ../applications/networking/instant-messengers/gitter { };
+ glasgow = with python3Packages; toPythonApplication glasgow;
+
gucci = callPackage ../tools/text/gucci { };
grc = callPackage ../tools/misc/grc { };
@@ -1050,34 +1066,14 @@ in
bchunk = callPackage ../tools/cd-dvd/bchunk { };
- inherit (callPackages ../misc/logging/beats/5.x.nix {
- # XXX: this is failing with Go 1.12. Error is related to cgo, an
- # update to this package might fix it.
- buildGoPackage = buildGo111Package;
- })
- filebeat5
- heartbeat5
- metricbeat5
- packetbeat5;
-
- journalbeat5 = callPackage ../tools/system/journalbeat { };
-
- inherit (callPackages ../misc/logging/beats/6.x.nix {
- # XXX: this is failing with Go 1.12. Error is related to cgo, an
- # update to this package might fix it.
- buildGoPackage = buildGo111Package;
- })
+ inherit (callPackages ../misc/logging/beats/6.x.nix { })
filebeat6
heartbeat6
metricbeat6
packetbeat6
journalbeat6;
- inherit (callPackages ../misc/logging/beats/7.x.nix {
- # XXX: this is failing with Go 1.12. Error is related to cgo, an
- # update to this package might fix it.
- buildGoPackage = buildGo111Package;
- })
+ inherit (callPackages ../misc/logging/beats/7.x.nix { })
filebeat7
heartbeat7
metricbeat7
@@ -1382,6 +1378,20 @@ in
corebird = callPackage ../applications/networking/corebird { };
+ inherit (callPackage ../tools/misc/coreboot-utils { })
+ msrtool
+ cbmem
+ ifdtool
+ intelmetool
+ cbfstool
+ nvramtool
+ superiotool
+ ectool
+ inteltool
+ amdfwtool
+ acpidump-all
+ coreboot-utils;
+
corosync = callPackage ../servers/corosync { };
cowsay = callPackage ../tools/misc/cowsay { };
@@ -1483,6 +1493,10 @@ in
dibbler = callPackage ../tools/networking/dibbler { };
+ diesel-cli = callPackage ../development/tools/diesel-cli {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
ding = callPackage ../applications/misc/ding {
aspellDicts_de = aspellDicts.de;
aspellDicts_en = aspellDicts.en;
@@ -1680,12 +1694,14 @@ in
gmic = callPackage ../tools/graphics/gmic { };
- gmic_krita_qt = libsForQt5.callPackage ../tools/graphics/gmic_krita_qt { };
+ gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { };
- goa = callPackage ../development/tools/goa {
- buildGoPackage = buildGo110Package;
+ gmic-qt-krita = gmic-qt.override {
+ variant = "krita";
};
+ goa = callPackage ../development/tools/goa { };
+
gohai = callPackage ../tools/system/gohai { };
gorilla-bin = callPackage ../tools/security/gorilla-bin { };
@@ -1977,11 +1993,7 @@ in
mongodb-compass = callPackage ../tools/misc/mongodb-compass { };
- mongodb-tools = callPackage ../tools/misc/mongodb-tools {
- # XXX: this is failing with Go 1.12. Error is related to cgo, an
- # update to this package might fix it.
- buildGoPackage = buildGo111Package;
- };
+ mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
moosefs = callPackage ../tools/filesystems/moosefs { };
@@ -2163,9 +2175,11 @@ in
nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { };
libceph = ceph.lib;
- ceph = callPackage ../tools/filesystems/ceph {
- boost = boost166.override { enablePython = true; };
- };
+ inherit (callPackages ../tools/filesystems/ceph {
+ boost = boost167.override { enablePython = true; python = python37; };
+ })
+ ceph
+ ceph-client;
ceph-dev = ceph;
inherit (callPackages ../tools/security/certmgr { })
@@ -2355,7 +2369,7 @@ in
m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
- mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec {
+ mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
python = python2;
inherit (python2Packages) gyp;
protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
@@ -2503,7 +2517,7 @@ in
curl = callPackage ../tools/networking/curl { };
- curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { };
+ curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { };
curlie = callPackage ../tools/networking/curlie { };
@@ -2588,17 +2602,13 @@ in
dev86 = callPackage ../development/compilers/dev86 { };
- diskrsync = callPackage ../tools/backup/diskrsync {
- buildGoPackage = buildGo110Package;
- };
+ diskrsync = callPackage ../tools/backup/diskrsync { };
djbdns = callPackage ../tools/networking/djbdns { };
dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy/1.x { };
- dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x {
- buildGoPackage = buildGo110Package;
- };
+ dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x { };
dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { };
@@ -2791,6 +2801,8 @@ in
sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { };
+ strawberry = libsForQt5.callPackage ../applications/audio/strawberry { };
+
tealdeer = callPackage ../tools/misc/tealdeer { };
teamocil = callPackage ../tools/misc/teamocil { };
@@ -2853,13 +2865,9 @@ in
evemu = callPackage ../tools/system/evemu { };
# The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
- elk5Version = "5.6.16";
- elk6Version = "6.7.2";
- elk7Version = "7.0.1";
+ elk6Version = "6.8.3";
+ elk7Version = "7.3.1";
- elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix {
- utillinux = utillinuxMinimal;
- };
elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
utillinux = utillinuxMinimal;
};
@@ -2882,9 +2890,6 @@ in
elasticsearch = elasticsearch-oss;
}
);
- elasticsearch5Plugins = elasticsearchPlugins.override {
- elasticsearch = elasticsearch5;
- };
elasticsearch6Plugins = elasticsearchPlugins.override {
elasticsearch = elasticsearch6-oss;
};
@@ -2901,13 +2906,7 @@ in
sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b";
};
});
- pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
- version = "3.12";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "1aqjl8dk9amd4zr99n8v2qxzgmr2hdvqfma4zh7a41rj6336c9sr";
- };
- });
+ pyyaml = super.pyyaml_3;
};
}).pkgs; toPythonApplication elasticsearch-curator;
@@ -3030,10 +3029,10 @@ in
m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { };
- mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec {
+ mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc {
python = python2;
inherit (python2Packages) gyp;
- protobuf = pkgs.protobuf3_6.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
+ protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
};
table-extra = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-extra { };
@@ -3430,6 +3429,8 @@ in
gnome-builder = callPackage ../applications/editors/gnome-builder { };
+ gnome-keysign = callPackage ../tools/security/gnome-keysign { };
+
gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { };
gnome-photos = callPackage ../applications/graphics/gnome-photos {
@@ -3759,6 +3760,7 @@ in
};
hdf5 = callPackage ../tools/misc/hdf5 {
+ stdenv = gcc7Stdenv;
gfortran = null;
szip = null;
mpi = null;
@@ -3823,8 +3825,6 @@ in
highlight = callPackage ../tools/text/highlight ({
lua = lua5;
- } // lib.optionalAttrs stdenv.isDarwin {
- inherit (llvmPackages_38) stdenv;
});
holochain-go = callPackage ../servers/holochain-go { };
@@ -3912,8 +3912,8 @@ in
idevicerestore = callPackage ../tools/misc/idevicerestore { };
inherit (callPackages ../tools/filesystems/irods rec {
- stdenv = llvmPackages_38.libcxxStdenv;
- libcxx = llvmPackages_38.libcxx;
+ stdenv = llvmPackages.libcxxStdenv;
+ libcxx = llvmPackages.libcxx;
boost = boost160.override { inherit stdenv; };
avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; };
})
@@ -4000,13 +4000,16 @@ in
iperf3 = callPackage ../tools/networking/iperf/3.nix { };
iperf = iperf3;
- ipfs = callPackage ../applications/networking/ipfs { };
+ ipfs = callPackage ../applications/networking/ipfs {
+ # Version 0.4.22 fails to build with go 1.13 due to version validation:
+ # go: github.com/go-critic/go-critic@v0.0.0-20181204210945-ee9bf5809ead: invalid pseudo-version: does not match version-control timestamp (2019-02-10T22:04:43Z)
+ # This is fixed in master, but release containing the fix does not exist yet.
+ buildGoModule = buildGo112Module;
+ };
ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { };
- ipget = callPackage ../applications/networking/ipget {
- buildGoPackage = buildGo110Package;
- };
+ ipget = callPackage ../applications/networking/ipget { };
ipmitool = callPackage ../tools/system/ipmitool {
openssl = openssl_1_0_2;
@@ -4142,7 +4145,7 @@ in
kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { };
wrapKakoune = callPackage ../applications/editors/kakoune/wrapper.nix { };
- kakounePlugins = callPackage ../applications/editors/kakoune/plugins.nix { };
+ kakounePlugins = callPackage ../applications/editors/kakoune/plugins { };
kakoune-unwrapped = callPackage ../applications/editors/kakoune { };
kakoune = wrapKakoune kakoune-unwrapped { };
@@ -4177,7 +4180,6 @@ in
keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };
- kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { };
kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { };
kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix {
enableUnfree = false;
@@ -4279,7 +4281,6 @@ in
lockfileProgs = callPackage ../tools/misc/lockfile-progs { };
- logstash5 = callPackage ../tools/misc/logstash/5.x.nix { };
logstash6 = callPackage ../tools/misc/logstash/6.x.nix { };
logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix {
enableUnfree = false;
@@ -4332,6 +4333,8 @@ in
memtester = callPackage ../tools/system/memtester { };
+ mhonarc = perlPackages.MHonArc;
+
minergate = callPackage ../applications/misc/minergate { };
minergate-cli = callPackage ../applications/misc/minergate-cli { };
@@ -4680,12 +4683,7 @@ in
makefile2graph = callPackage ../development/tools/analysis/makefile2graph { };
- # See https://github.com/NixOS/nixpkgs/issues/15849. I'm switching on isLinux because
- # it looks like gnulib is broken on non-linux, so it seems likely that this would cause
- # trouble on bsd and/or cygwin as well.
- man = if stdenv.isLinux then man-db else man-old;
-
- man-old = callPackage ../tools/misc/man { };
+ man = man-db;
man-db = callPackage ../tools/misc/man-db { };
@@ -4773,9 +4771,7 @@ in
minetime = callPackage ../applications/office/minetime { };
- minio-client = callPackage ../tools/networking/minio-client {
- buildGoPackage = buildGo110Package;
- };
+ minio-client = callPackage ../tools/networking/minio-client { };
minissdpd = callPackage ../tools/networking/minissdpd { };
@@ -4798,11 +4794,7 @@ in
miredo = callPackage ../tools/networking/miredo { };
- mirrorbits = callPackage ../servers/mirrorbits {
- # XXX: this is failing with Go 1.12. Error is related to cgo, an
- # update to this package might fix it.
- buildGoPackage = buildGo111Package;
- };
+ mirrorbits = callPackage ../servers/mirrorbits { };
mitmproxy = callPackage ../tools/networking/mitmproxy { };
@@ -4868,11 +4860,13 @@ in
mtr = callPackage ../tools/networking/mtr {};
+ mtr-gui = callPackage ../tools/networking/mtr { withGtk = true; };
+
mtx = callPackage ../tools/backup/mtx {};
mt-st = callPackage ../tools/backup/mt-st {};
- multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in rec {
+ multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in {
multitrandata = callPackage ../tools/text/multitran/data { };
libbtree = callPackage ../tools/text/multitran/libbtree { };
@@ -4924,6 +4918,8 @@ in
ndppd = callPackage ../applications/networking/ndppd { };
+ nemiver = callPackage ../development/tools/nemiver { };
+
neofetch = callPackage ../tools/misc/neofetch { };
nerdfonts = callPackage ../data/fonts/nerdfonts { };
@@ -5083,9 +5079,7 @@ in
nnn = callPackage ../applications/misc/nnn { };
- notary = callPackage ../tools/security/notary {
- buildGoPackage = buildGo110Package;
- };
+ notary = callPackage ../tools/security/notary { };
notify-osd = callPackage ../applications/misc/notify-osd { };
@@ -5693,7 +5687,7 @@ in
openmodelica = callPackage ../applications/science/misc/openmodelica { };
- qarte = callPackage ../applications/video/qarte { };
+ qarte = libsForQt5.callPackage ../applications/video/qarte { };
qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
@@ -5701,6 +5695,8 @@ in
ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { };
+ q-text-as-data = callPackage ../tools/misc/q-text-as-data { };
+
qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { };
qastools = libsForQt5.callPackage ../tools/audio/qastools { };
@@ -5792,9 +5788,7 @@ in
rt = callPackage ../servers/rt { };
- rtmpdump = callPackage ../tools/video/rtmpdump {
- openssl = openssl_1_0_2;
- };
+ rtmpdump = callPackage ../tools/video/rtmpdump { };
rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; };
reaverwps = callPackage ../tools/networking/reaver-wps {};
@@ -6509,9 +6503,7 @@ in
tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { });
- tmsu = callPackage ../tools/filesystems/tmsu {
- go = go_1_10;
- };
+ tmsu = callPackage ../tools/filesystems/tmsu { };
toilet = callPackage ../tools/misc/toilet { };
@@ -7106,9 +7098,7 @@ in
xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { };
xflux = callPackage ../tools/misc/xflux { };
- xflux-gui = callPackage ../tools/misc/xflux/gui.nix {
- gnome_python = gnome2.gnome_python;
- };
+ xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { };
xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
libxfs = xfsprogs.dev;
@@ -7194,7 +7184,7 @@ in
zbackup = callPackage ../tools/backup/zbackup {};
- zbar = callPackage ../tools/graphics/zbar { };
+ zbar = libsForQt5.callPackage ../tools/graphics/zbar { };
zdelta = callPackage ../tools/compression/zdelta { };
@@ -7344,6 +7334,24 @@ in
then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}
else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {};
+ adoptopenjdk-bin-8-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix;
+ adoptopenjdk-bin-8-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix;
+
+ adoptopenjdk-hotspot-bin-8 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-8-packages-linux.jdk-hotspot {}
+ else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-hotspot {};
+ adoptopenjdk-jre-hotspot-bin-8 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-8-packages-linux.jre-hotspot {}
+ else callPackage adoptopenjdk-bin-8-packages-darwin.jre-hotspot {};
+
+ adoptopenjdk-openj9-bin-8 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-8-packages-linux.jdk-openj9 {}
+ else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-openj9 {};
+
+ adoptopenjdk-jre-openj9-bin-8 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-8-packages-linux.jre-openj9 {}
+ else callPackage adoptopenjdk-bin-8-packages-darwin.jre-openj9 {};
+
adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11;
adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11;
@@ -7420,7 +7428,6 @@ in
clang_5 = llvmPackages_5.clang;
clang_4 = llvmPackages_4.clang;
clang_39 = llvmPackages_39.clang;
- clang_38 = llvmPackages_38.clang;
clang_35 = wrapCC llvmPackages_35.clang;
clang-tools = callPackage ../development/tools/clang-tools {
@@ -7463,7 +7470,9 @@ in
crystal
crystal2nix;
- icr = callPackage ../development/tools/icr {};
+ icr = callPackage ../development/tools/icr {
+ openssl = openssl_1_0_2;
+ };
scry = callPackage ../development/tools/scry {};
@@ -7502,8 +7511,8 @@ in
gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; };
gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; };
- gccFun = callPackage ../development/compilers/gcc/7;
- gcc = gcc7;
+ gccFun = callPackage ../development/compilers/gcc/8;
+ gcc = if stdenv.isDarwin then gcc7 else gcc8;
gcc-unwrapped = gcc.cc;
gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override {
@@ -7738,6 +7747,14 @@ in
profiledCompiler = false;
});
+ gfortran8 = wrapCC (gcc8.cc.override {
+ name = "gfortran";
+ langFortran = true;
+ langCC = false;
+ langC = false;
+ profiledCompiler = false;
+ });
+
gcj = gcj6;
gcj6 = wrapCC (gcc6.cc.override {
name = "gcj";
@@ -7823,6 +7840,8 @@ in
psc-package = haskell.lib.justStaticExecutables
(haskellPackages.callPackage ../development/compilers/purescript/psc-package { });
+ tacacsplus = callPackage ../servers/tacacsplus { };
+
tamarin-prover =
(haskellPackages.callPackage ../applications/science/logic/tamarin-prover {
# NOTE: do not use the haskell packages 'graphviz' and 'maude'
@@ -7856,16 +7875,16 @@ in
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
- rev = "117a1fd11f11e9bef9faa563c3d5156cc6ab529c";
- sha256 = "1w5hb6sgy71g279wsghixxc75r7rsm7wki011mpz039q66827sym";
+ rev = "26c1b8878315a7a5c188df45e0bc236bb222b698";
+ sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b";
};
});
- spirv-headers = spirv-tools.overrideAttrs (_: {
+ spirv-headers = spirv-headers.overrideAttrs (_: {
src = fetchFromGitHub {
owner = "KhronosGroup";
- repo = "SPIRV-Tools";
- rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f";
- sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj";
+ repo = "SPIRV-Headers";
+ rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f";
+ sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm";
};
});
};
@@ -7883,14 +7902,6 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
- go_1_10 = callPackage ../development/compilers/go/1.10.nix {
- inherit (darwin.apple_sdk.frameworks) Security Foundation;
- };
-
- go_1_11 = callPackage ../development/compilers/go/1.11.nix {
- inherit (darwin.apple_sdk.frameworks) Security Foundation;
- };
-
go_1_12 = callPackage ../development/compilers/go/1.12.nix {
inherit (darwin.apple_sdk.frameworks) Security Foundation;
};
@@ -7929,15 +7940,15 @@ in
hugs = callPackage ../development/interpreters/hugs { };
- bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; };
+ openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { };
- openjfx11 =
- if stdenv.isDarwin then
- null
+ openjfx12 = callPackage ../development/compilers/openjdk/openjfx/12.nix { };
+
+ openjdk8-bootstrap =
+ if adoptopenjdk-hotspot-bin-8.meta.available then
+ adoptopenjdk-hotspot-bin-8
else
- callPackage ../development/compilers/openjdk/openjfx/11.nix {
- openjdk = openjdk11;
- };
+ callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
/* legacy jdk for use as needed by older apps */
openjdk8 =
@@ -7945,10 +7956,21 @@ in
callPackage ../development/compilers/openjdk/darwin/8.nix { }
else
callPackage ../development/compilers/openjdk/8.nix {
- bootjdk = bootjdk.override { version = "8"; };
inherit (gnome2) GConf gnome_vfs;
};
+ openjdk8_headless =
+ if stdenv.isDarwin || stdenv.isAarch64 then
+ openjdk8
+ else
+ openjdk8.override { headless = true; };
+
+ openjdk11-bootstrap =
+ if adoptopenjdk-hotspot-bin-11.meta.available then
+ adoptopenjdk-hotspot-bin-11
+ else
+ callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; };
+
/* currently maintained LTS JDK */
openjdk11 =
if stdenv.isDarwin then
@@ -7959,62 +7981,43 @@ in
inherit (gnome2) GConf gnome_vfs;
};
- openjfx12 =
+ openjdk11_headless =
if stdenv.isDarwin then
- null
+ openjdk11
else
- callPackage ../development/compilers/openjdk/openjfx/12.nix {
- openjdk = openjdk12;
- bootjdk = openjdk11;
- };
+ openjdk11.override { headless = true; };
/* current JDK */
openjdk12 =
if stdenv.isDarwin then
- callPackage ../development/compilers/openjdk/darwin/default.nix { }
+ callPackage ../development/compilers/openjdk/darwin { }
else
- callPackage ../development/compilers/openjdk/default.nix {
+ callPackage ../development/compilers/openjdk {
openjfx = openjfx12;
inherit (gnome2) GConf gnome_vfs;
- bootjdk = openjdk11;
};
+ openjdk12_headless =
+ if stdenv.isDarwin then
+ openjdk12
+ else
+ openjdk12.override { headless = true; };
+
openjdk = openjdk8;
+ openjdk_headless = openjdk8_headless;
- jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; };
- jre8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
- (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
- (openjdk8.jre // { outputs = [ "jre" ]; }));
- jre8_headless =
- if stdenv.isAarch32 || stdenv.isAarch64 then
- oraclejre8
- else if stdenv.isDarwin then
- jre8
- else
- lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}-headless"
- (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
- ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
+ jdk8 = openjdk8;
+ jre8 = openjdk8.jre;
+ jre8_headless = openjdk8_headless.jre;
- jdk11 = openjdk11 // { outputs = [ "out" ]; };
- jdk11_headless =
- if stdenv.isDarwin then
- jdk11
- else
- lib.setName "openjdk-${lib.getVersion pkgs.openjdk11}-headless"
- (lib.addMetaAttrs {}
- ((openjdk11.override { minimal = true; }) // {}));
+ jdk11 = openjdk11;
+ jdk11_headless = openjdk11_headless;
- jdk12 = openjdk12 // { outputs = [ "out" ]; };
- jdk12_headless =
- if stdenv.isDarwin then
- jdk12
- else
- lib.setName "openjdk-${lib.getVersion pkgs.openjdk12}-headless"
- (lib.addMetaAttrs {}
- ((openjdk12.override { minimal = true; }) // {}));
+ jdk12 = openjdk12;
+ jdk12_headless = openjdk12_headless;
jdk = jdk8;
- jre = if stdenv.isAarch32 || stdenv.isAarch64 then adoptopenjdk-jre-bin else jre8;
+ jre = jre8;
jre_headless = jre8_headless;
inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8;
@@ -8117,7 +8120,6 @@ in
llvm_5 = llvmPackages_5.llvm;
llvm_4 = llvmPackages_4.llvm;
llvm_39 = llvmPackages_39.llvm;
- llvm_38 = llvmPackages_38.llvm;
llvm_35 = llvmPackages_35.llvm;
llvmPackages = recurseIntoAttrs llvmPackages_7;
@@ -8128,14 +8130,6 @@ in
stdenv = gcc6Stdenv;
});
- llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({
- inherit (stdenvAdapters) overrideCC;
- buildLlvmTools = buildPackages.llvmPackages_38.tools;
- targetLlvmLibraries = targetPackages.llvmPackages_38.libraries;
- } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
- stdenv = gcc6Stdenv;
- });
-
llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_39.tools;
@@ -8165,7 +8159,9 @@ in
buildLlvmTools = buildPackages.llvmPackages_6.tools;
targetLlvmLibraries = targetPackages.llvmPackages_6.libraries;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
- stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
+ # with gcc-7 on i686: undefined reference to `__divmoddi4'
+ # Failing tests with gcc8.
+ stdenv = overrideCC stdenv (if stdenv.hostPlatform.isi686 then gcc6 else gcc7);
});
llvmPackages_7 = callPackage ../development/compilers/llvm/7 ({
@@ -8249,7 +8245,9 @@ in
neko = callPackage ../development/compilers/neko { };
- nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { };
+ nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr {
+ inherit (darwin.apple_sdk.frameworks) OpenGL;
+ };
nasm = callPackage ../development/compilers/nasm { };
@@ -8359,6 +8357,9 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { };
+ cargo-watch = callPackage ../development/tools/rust/cargo-watch {
+ inherit (darwin.apple_sdk.frameworks) CoreServices;
+ };
cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { };
cargo-generate = callPackage ../development/tools/rust/cargo-generate {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -8935,12 +8936,15 @@ in
inherit (darwin) libiconv libobjc libunwind;
inherit (darwin.apple_sdk.frameworks) Foundation;
})
- ruby_2_3
ruby_2_4
ruby_2_5
ruby_2_6;
- ruby = ruby_2_5;
+ ruby = ruby_2_6;
+
+ rubyPackages_2_4 = recurseIntoAttrs ruby_2_4.gems;
+ rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems;
+ rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems;
mruby = callPackage ../development/compilers/mruby { };
@@ -9069,6 +9073,8 @@ in
mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { };
+ rappel = callPackage ../development/misc/rappel/default.nix { };
+
pharo-vms = callPackage ../development/pharo/vm { };
pharo = pharo-vms.multi-vm-wrapper;
pharo-cog32 = pharo-vms.cog32;
@@ -9303,12 +9309,12 @@ in
chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome2.GConf; };
+ chromium-xorg-conf = callPackage ../os-specific/linux/chromium-xorg-conf { };
+
chrpath = callPackage ../development/tools/misc/chrpath { };
chruby = callPackage ../development/tools/misc/chruby { rubies = null; };
- cide = callPackage ../development/tools/continuous-integration/cide { };
-
cl-launch = callPackage ../development/tools/misc/cl-launch {};
cloud-nuke = callPackage ../development/tools/cloud-nuke { };
@@ -9581,6 +9587,8 @@ in
gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { };
+ gnome-multi-writer = callPackage ../applications/misc/gnome-multi-writer {};
+
gnome-online-accounts = callPackage ../development/libraries/gnome-online-accounts { };
gnome-video-effects = callPackage ../development/libraries/gnome-video-effects { };
@@ -10115,6 +10123,8 @@ in
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
};
+ udis86 = callPackage ../development/tools/udis86 { };
+
uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { };
uhd = callPackage ../applications/radio/uhd { };
@@ -10182,10 +10192,9 @@ in
xpwn = callPackage ../development/mobile/xpwn {};
- xxdiff = callPackage ../development/tools/misc/xxdiff {
- bison = bison2;
- };
- xxdiff-tip = libsForQt5.callPackage ../development/tools/misc/xxdiff/tip.nix { };
+ xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { };
+
+ xxdiff-tip = xxdiff;
yaml2json = callPackage ../development/tools/yaml2json { };
@@ -10447,6 +10456,8 @@ in
clearsilver = callPackage ../development/libraries/clearsilver { };
+ clipp = callPackage ../development/libraries/clipp { };
+
clipper = callPackage ../development/libraries/clipper { };
cln = callPackage ../development/libraries/cln { };
@@ -10954,6 +10965,7 @@ in
else if name == "libSystem" then targetPackages.darwin.xcode
else if name == "nblibc" then targetPackages.netbsdCross.libc
else if name == "wasilibc" then targetPackages.wasilibc or wasilibc
+ else if stdenv.targetPlatform.isGhcjs then null
else throw "Unknown libc ${name}";
libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc;
@@ -11173,7 +11185,7 @@ in
elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { };
- gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
+ gtk2 = callPackage ../development/libraries/gtk/2.x.nix {
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};
@@ -11183,7 +11195,7 @@ in
gdktarget = "x11";
};
- gtk3 = callPackage ../development/libraries/gtk+/3.x.nix {
+ gtk3 = callPackage ../development/libraries/gtk/3.x.nix {
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};
@@ -11243,9 +11255,7 @@ in
gumbo = callPackage ../development/libraries/gumbo { };
- gvfs = callPackage ../development/libraries/gvfs {
- gnome = res.gnome3;
- };
+ gvfs = callPackage ../development/libraries/gvfs { };
gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { };
@@ -11353,8 +11363,6 @@ in
ilmbase = callPackage ../development/libraries/ilmbase { };
- intelmetool = callPackage ../tools/misc/intelmetool { };
-
imlib = callPackage ../development/libraries/imlib {
libpng = libpng12;
};
@@ -11404,6 +11412,8 @@ in
isso = callPackage ../servers/isso { };
+ itk4 = callPackage ../development/libraries/itk/4.x.nix { };
+
itk = callPackage ../development/libraries/itk { };
jasper = callPackage ../development/libraries/jasper { };
@@ -12115,6 +12125,8 @@ in
libisoburn = callPackage ../development/libraries/libisoburn { };
+ libipt = callPackage ../development/libraries/libipt { };
+
libiptcdata = callPackage ../development/libraries/libiptcdata { };
libjpeg_original = callPackage ../development/libraries/libjpeg { };
@@ -12542,7 +12554,7 @@ in
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };
- libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: rec {
+ libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: {
src = pkgs.fetchurl {
url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz";
sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db";
@@ -12677,7 +12689,7 @@ in
withGUI = false;
};
- mlt = callPackage ../development/libraries/mlt {};
+ mlt = callPackage ../development/libraries/mlt { ffmpeg = ffmpeg_4; };
mono-addins = callPackage ../development/libraries/mono-addins { };
@@ -13156,7 +13168,7 @@ in
qt511 = recurseIntoAttrs (makeOverridable
(import ../development/libraries/qt-5/5.11) {
inherit newScope;
- inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper;
+ inherit stdenv fetchurl fetchFromGitHub fetchpatch makeSetupHook makeWrapper;
bison = bison2; # error: too few arguments to function 'int yylex(...
inherit cups;
harfbuzz = harfbuzzFull;
@@ -13176,7 +13188,7 @@ in
inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper;
bison = bison2; # error: too few arguments to function 'int yylex(...
inherit cups;
- harfbuzz = harfbuzzFull;
+ inherit harfbuzz;
inherit libGL;
inherit perl;
inherit gtk3;
@@ -13187,7 +13199,8 @@ in
libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5);
- qt5 = qt512;
+ # TODO bump to 5.12 on darwin once it's not broken
+ qt5 = if stdenv.isDarwin then qt511 else qt512;
libsForQt5 = if stdenv.isDarwin then libsForQt511 else libsForQt512;
qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };
@@ -13260,7 +13273,7 @@ in
kpmcore = callPackage ../development/libraries/kpmcore { };
mlt = callPackage ../development/libraries/mlt/qt-5.nix {
- ffmpeg = ffmpeg_2;
+ ffmpeg = ffmpeg_4;
};
openbr = callPackage ../development/libraries/openbr { };
@@ -13552,12 +13565,6 @@ in
sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { };
};
- skydive = callPackage ../tools/networking/skydive {
- # XXX: this is failing with Go 1.12. Error is related to cgo, an
- # update to this package might fix it.
- buildGoPackage = buildGo111Package;
- };
-
slang = callPackage ../development/libraries/slang { };
slibGuile = callPackage ../development/libraries/slib {
@@ -13736,6 +13743,8 @@ in
sundials = callPackage ../development/libraries/sundials { };
+ sundials_3 = callPackage ../development/libraries/sundials/3.x.nix { };
+
sutils = callPackage ../tools/misc/sutils { };
svrcore = callPackage ../development/libraries/svrcore { };
@@ -13989,24 +13998,24 @@ in
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
- rev = "26c1b8878315a7a5c188df45e0bc236bb222b698";
- sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b";
+ rev = "aa9e8f538041db3055ea443080e0ccc315fa114f";
+ sha256 = "1nbii0xa5zgs36dmpvzpli1jbzb9ijr7bkgvzmlpcjrjsl02cnbk";
};
});
spirv-headers = spirv-tools.overrideAttrs (_: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Headers";
- rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f";
- sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm";
+ rev = "45c2cc37276d69e5b257507d97fd90d2a5684ccc";
+ sha256 = "1jrzazv5j8nsn8hz5vc43vz4msps05d65wdy9spfg2hg36r1s2pm";
};
});
}).overrideAttrs (_: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
- rev = "e06c7e9a515b716c731bda13f507546f107775d1";
- sha256 = "04y4dd1cqdkd4qffmhgmg3agf9j07ii2w38vpp4jw53ir818bqdq";
+ rev = "333d1c95792692205472c457d7bec915a94c8000";
+ sha256 = "04srq1zcilhs7p1xz7wcnrncjxqskhfnqggisvxw5f774gk01ks6";
};
});
};
@@ -14102,7 +14111,7 @@ in
x265 = callPackage ../development/libraries/x265 { };
inherit (callPackages ../development/libraries/xapian { })
- xapian_1_2_22 xapian_1_4;
+ xapian_1_4;
xapian = xapian_1_4;
xapian-omega = callPackage ../development/libraries/xapian/tools/omega {
@@ -14332,22 +14341,12 @@ in
### DEVELOPMENT / GO MODULES
- buildGo110Package = callPackage ../development/go-packages/generic {
- go = buildPackages.go_1_10;
- };
- buildGo111Package = callPackage ../development/go-packages/generic {
- go = buildPackages.go_1_11;
- };
buildGo112Package = callPackage ../development/go-packages/generic {
go = buildPackages.go_1_12;
};
buildGoPackage = buildGo112Package;
- buildGo111Module = callPackage ../development/go-modules/generic {
- go = buildPackages.go_1_11;
- };
-
buildGo112Module = callPackage ../development/go-modules/generic {
go = buildPackages.go_1_12;
};
@@ -14410,8 +14409,8 @@ in
perl530Packages = recurseIntoAttrs perl530.pkgs;
perldevelPackages = perldevel.pkgs;
- perl = perl528;
- perlPackages = perl528Packages;
+ perl = perl530;
+ perlPackages = perl530Packages;
ack = perlPackages.ack;
@@ -14715,9 +14714,7 @@ in
mediatomb = callPackage ../servers/mediatomb { };
- meguca = callPackage ../servers/meguca {
- buildGoPackage = buildGo110Package;
- };
+ meguca = callPackage ../servers/meguca { };
memcached = callPackage ../servers/memcached {};
@@ -14978,20 +14975,10 @@ in
seabios = callPackage ../applications/virtualization/seabios { };
- cbfstool = callPackage ../applications/virtualization/cbfstool { };
-
- ifdtool = callPackage ../tools/misc/ifdtool { };
-
- cbmem = callPackage ../tools/misc/cbmem { };
-
- nvramtool = callPackage ../tools/misc/nvramtool { };
-
vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };
pgbouncer = callPackage ../servers/sql/pgbouncer { };
- pgpool94 = pgpool.override { postgresql = postgresql_9_4; };
-
pgpool = callPackage ../servers/sql/pgpool {
pam = if stdenv.isLinux then pam else null;
libmemcached = null; # Detection is broken upstream
@@ -15002,7 +14989,6 @@ in
timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { };
inherit (import ../servers/sql/postgresql pkgs)
- postgresql_9_4
postgresql_9_5
postgresql_9_6
postgresql_10
@@ -15014,16 +15000,10 @@ in
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
- inherit (callPackage ../servers/monitoring/prometheus {
- buildGoPackage = buildGo110Package;
- }) prometheus_1;
-
- inherit (callPackage ../servers/monitoring/prometheus { })
- prometheus_2;
-
prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
- prometheus = prometheus_1;
+ prometheus = callPackage ../servers/monitoring/prometheus { };
prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
+ prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { };
prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { };
prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };
prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
@@ -15044,11 +15024,10 @@ in
prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { };
prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { };
prometheus-postgres-exporter = callPackage ../servers/monitoring/prometheus/postgres-exporter.nix { };
+ prometheus-process-exporter = callPackage ../servers/monitoring/prometheus/process-exporter.nix { };
prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { };
prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { };
- prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix {
- buildGoPackage = buildGo110Package;
- };
+ prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { };
prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { };
prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { };
@@ -15253,8 +15232,7 @@ in
inherit (callPackages ../servers/unifi { })
unifiLTS
- unifiStable
- unifiTesting;
+ unifiStable;
unifi = unifiStable;
virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { };
@@ -15493,9 +15471,7 @@ in
dstat = callPackage ../os-specific/linux/dstat { };
# unstable until the first 1.x release
- fscrypt-experimental = callPackage ../os-specific/linux/fscrypt {
- buildGoPackage = buildGo110Package;
- };
+ fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { };
fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { };
fwupd = callPackage ../os-specific/linux/firmware/fwupd { };
@@ -15743,14 +15719,6 @@ in
];
};
- linux_5_1 = callPackage ../os-specific/linux/kernel/linux-5.1.nix {
- kernelPatches =
- [ kernelPatches.bridge_stp_helper
- kernelPatches.modinst_arg_list_too_long
- kernelPatches.export_kernel_fpu_functions
- ];
- };
-
linux_5_2 = callPackage ../os-specific/linux/kernel/linux-5.2.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
@@ -15762,8 +15730,6 @@ in
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
- kernelPatches.modinst_arg_list_too_long
- kernelPatches.export_kernel_fpu_functions
];
};
@@ -15863,6 +15829,8 @@ in
nvidia_x11_beta = nvidiaPackages.beta;
nvidia_x11 = nvidiaPackages.stable;
+ openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { };
+
ply = callPackage ../os-specific/linux/ply { };
r8168 = callPackage ../os-specific/linux/r8168 { };
@@ -15903,7 +15871,7 @@ in
perf = callPackage ../os-specific/linux/kernel/perf.nix { };
- phc-intel = callPackage ../os-specific/linux/phc-intel { };
+ phc-intel = if stdenv.lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null;
# Disable for kernels 4.15 and above due to compatibility issues
prl-tools = if stdenv.lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null;
@@ -15961,7 +15929,6 @@ in
linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
- linuxPackages_5_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_1);
linuxPackages_5_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2);
# When adding to this list:
@@ -16287,7 +16254,7 @@ in
semodule-utils = callPackage ../os-specific/linux/semodule-utils { };
- powerdns = callPackage ../servers/dns/powerdns { libressl = libressl_2_8; };
+ powerdns = callPackage ../servers/dns/powerdns { };
dnsdist = callPackage ../servers/dns/dnsdist { };
@@ -16503,13 +16470,11 @@ in
upower = callPackage ../os-specific/linux/upower { };
- usbguard = libsForQt5.callPackage ../os-specific/linux/usbguard {
+ usbguard = callPackage ../os-specific/linux/usbguard {
libgcrypt = null;
};
- usbguard-nox = usbguard.override {
- withGui = false;
- };
+ usbtop = callPackage ../os-specific/linux/usbtop { };
usbutils = callPackage ../os-specific/linux/usbutils { };
@@ -16539,6 +16504,8 @@ in
wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
+ xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { };
+
xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { };
xf86_input_multitouch = callPackage ../os-specific/linux/xf86-input-multitouch { };
@@ -16644,7 +16611,7 @@ in
# solve collision for nix-env before https://github.com/NixOS/nix/pull/815
dejavu_fontsEnv = buildEnv {
- name = "${dejavu_fonts.name}";
+ name = dejavu_fonts.name;
paths = [ dejavu_fonts.out ];
};
@@ -16837,6 +16804,10 @@ in
liberation-sans-narrow = callPackage ../data/fonts/liberation-sans-narrow { };
+ libevdevc = callPackage ../os-specific/linux/libevdevc { };
+
+ libgestures = callPackage ../os-specific/linux/libgestures { };
+
liberastika = callPackage ../data/fonts/liberastika { };
libertine = callPackage ../data/fonts/libertine { };
@@ -17362,6 +17333,8 @@ in
avocode = callPackage ../applications/graphics/avocode {};
+ azpainter = callPackage ../applications/graphics/azpainter { };
+
cadence = libsForQt5.callPackage ../applications/audio/cadence { };
milkytracker = callPackage ../applications/audio/milkytracker { };
@@ -17705,6 +17678,8 @@ in
cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { };
+ crun = callPackage ../applications/virtualization/crun {};
+
csdp = callPackage ../applications/science/math/csdp { };
ctop = callPackage ../tools/system/ctop { };
@@ -17914,7 +17889,7 @@ in
electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { };
- electrum = callPackage ../applications/misc/electrum { };
+ electrum = libsForQt5.callPackage ../applications/misc/electrum { };
electrum-dash = callPackage ../applications/misc/electrum/dash.nix { };
@@ -17989,7 +17964,6 @@ in
external = {
inherit (haskellPackages)
ghc-mod structured-haskell-mode Agda hindent;
- inherit (pythonPackages) elpy;
inherit
autoconf automake editorconfig-core-c git libffi libpng pkgconfig
poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages
@@ -18420,8 +18394,6 @@ in
getxbook = callPackage ../applications/misc/getxbook { };
- ghq = gitAndTools.ghq;
-
gimp = callPackage ../applications/graphics/gimp {
gegl = gegl_0_4;
lcms = lcms2;
@@ -18440,7 +18412,7 @@ in
gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {});
- inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret git-secrets transcrypt git-crypt;
+ inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret git-secrets transcrypt git-crypt ghq;
gitMinimal = git.override {
withManual = false;
@@ -18667,6 +18639,8 @@ in
hpl = callPackage ../tools/misc/hpl { mpi = openmpi; };
+ hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { };
+
ht = callPackage ../applications/editors/ht { };
hubstaff = callPackage ../applications/misc/hubstaff { };
@@ -18942,6 +18916,8 @@ in
japa = callPackage ../applications/audio/japa { };
+ dupd = callPackage ../tools/misc/dupd { };
+
jdupes = callPackage ../tools/misc/jdupes { };
jedit = callPackage ../applications/editors/jedit { };
@@ -18989,7 +18965,7 @@ in
inherit (kdeApplications)
akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b
kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog
- keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole
+ keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake
kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle;
okteta = libsForQt5.callPackage ../applications/editors/okteta { };
@@ -19042,8 +19018,6 @@ in
ffmpeg = ffmpeg_2;
};
- kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins { };
-
kitty = callPackage ../applications/misc/kitty {
harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL;
@@ -19206,7 +19180,7 @@ in
links2 = callPackage ../applications/networking/browsers/links2 { };
- linphone = callPackage ../applications/networking/instant-messengers/linphone rec {
+ linphone = callPackage ../applications/networking/instant-messengers/linphone {
polarssl = mbedtls_1_3;
};
@@ -19353,6 +19327,8 @@ in
mhwaveedit = callPackage ../applications/audio/mhwaveedit {};
+ michabo = libsForQt5.callPackage ../applications/misc/michabo { };
+
mid2key = callPackage ../applications/audio/mid2key { };
midori-unwrapped = callPackage ../applications/networking/browsers/midori { };
@@ -19538,15 +19514,7 @@ in
speechdSupport = config.mumble.speechdSupport or false;
pulseSupport = config.pulseaudio or false;
iceSupport = config.murmur.iceSupport or true;
- }) mumble mumble_rc murmur;
-
- inherit (callPackages ../applications/networking/mumble {
- avahi = avahi-compat;
- jackSupport = config.mumble.jackSupport or false;
- speechdSupport = config.mumble.speechdSupport or false;
- pulseSupport = config.pulseaudio or false;
- iceSupport = false;
- }) murmur_rc;
+ }) mumble mumble_rc murmur murmur_rc;
mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {
mumble_i686 = if stdenv.hostPlatform.system == "x86_64-linux"
@@ -19659,12 +19627,6 @@ in
speedread = callPackage ../applications/misc/speedread { };
- sup = callPackage ../applications/networking/mailreaders/sup {
- bundlerApp = bundlerApp.override{
- ruby = ruby.override { cursesSupport = true; };
- };
- };
-
synapse = callPackage ../applications/misc/synapse { };
synapse-bt = callPackage ../applications/networking/p2p/synapse-bt {
@@ -19858,6 +19820,8 @@ in
openmpt123 = callPackage ../applications/audio/openmpt123 { };
+ openrazer-daemon = with python3Packages; toPythonApplication openrazer-daemon;
+
opusfile = callPackage ../applications/audio/opusfile { };
opusTools = callPackage ../applications/audio/opus-tools { };
@@ -20356,7 +20320,7 @@ in
sakura = callPackage ../applications/misc/sakura { };
- sayonara = callPackage ../applications/audio/sayonara { };
+ sayonara = libsForQt5.callPackage ../applications/audio/sayonara { };
sbagen = callPackage ../applications/misc/sbagen { };
@@ -20452,9 +20416,7 @@ in
wavebox = callPackage ../applications/networking/instant-messengers/wavebox { };
- sonic-pi = callPackage ../applications/audio/sonic-pi {
- ruby = ruby_2_3;
- };
+ sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { };
st = callPackage ../applications/misc/st {
conf = config.st.conf or null;
@@ -20835,6 +20797,8 @@ in
inherit (linuxPackages) x86_energy_perf_policy;
};
+ tippecanoe = callPackage ../applications/misc/tippecanoe { };
+
tmatrix = callPackage ../applications/misc/tmatrix { };
tnef = callPackage ../applications/misc/tnef { };
@@ -21161,6 +21125,8 @@ in
way-cooler = callPackage ../applications/window-managers/way-cooler {};
+ waypipe = callPackage ../applications/networking/remote/waypipe { };
+
wayv = callPackage ../tools/X11/wayv {};
webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {};
@@ -21185,6 +21151,7 @@ in
libva = null;
libwebp = null;
xwayland = null;
+ pipewire = null;
};
chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {};
@@ -21340,6 +21307,8 @@ in
x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { };
+ x2goserver = callPackage ../applications/networking/remote/x2goserver { };
+
x2vnc = callPackage ../tools/X11/x2vnc { };
x32edit = callPackage ../applications/audio/midas/x32edit.nix {};
@@ -21579,10 +21548,6 @@ in
yabar-unstable = callPackage ../applications/window-managers/yabar/unstable.nix { };
- yakuake = libsForQt5.callPackage ../applications/misc/yakuake {
- inherit (kdeApplications) konsole;
- };
-
yarp = callPackage ../applications/science/robotics/yarp {};
yarssr = callPackage ../applications/misc/yarssr { };
@@ -21617,7 +21582,13 @@ in
zathura = callPackage ../applications/misc/zathura { };
- zeroc_ice = callPackage ../development/libraries/zeroc-ice {
+ zeroc-ice = callPackage ../development/libraries/zeroc-ice {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
+ zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; };
+
+ zeroc-ice-36 = callPackage ../development/libraries/zeroc-ice/3.6.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -21698,9 +21669,6 @@ in
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) IOKit;
};
- go-ethereum-classic = callPackage ../applications/blockchains/go-ethereum-classic {
- buildGoPackage = buildGo110Package;
- };
jormungandr = callPackage ../applications/blockchains/jormungandr { };
@@ -22154,7 +22122,7 @@ in
mrrescue = callPackage ../games/mrrescue { };
mudlet = libsForQt5.callPackage ../games/mudlet {
- inherit (lua51Packages) luafilesystem lrexlib-pcre luazip luasql-sqlite3;
+ lua = lua5_1;
};
n2048 = callPackage ../games/n2048 {};
@@ -22634,6 +22602,7 @@ in
gnomeExtensions = recurseIntoAttrs {
appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { };
+ arc-menu = callPackage ../desktops/gnome-3/extensions/arc-menu { };
battery-status = callPackage ../desktops/gnome-3/extensions/battery-status { };
caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { };
clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { };
@@ -22751,6 +22720,8 @@ in
plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
systemsettings user-manager xdg-desktop-portal-kde;
+ kwin-tiling = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/tiling.nix { };
+
### SCIENCE
### SCIENCE/CHEMISTY
@@ -23648,9 +23619,6 @@ in
cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { };
- crashplan = callPackage ../applications/backup/crashplan { };
- crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { gconf = gnome2.GConf; };
-
colort = callPackage ../applications/misc/colort { };
terminal-parrot = callPackage ../applications/misc/terminal-parrot { };
@@ -23939,6 +23907,8 @@ in
initialRamdisk.
The result can be extended in the modules by defining
extra attributes in system.build.
+ Alternatively, you may use the result's config and
+ options attributes to query any option.
Example:
@@ -23976,10 +23946,13 @@ in
Note that you will need to have called Nixpkgs with the system
parameter set to the right value for your deployment target.
*/
- nixos = configuration:
- (import (pkgs.path + "/nixos/lib/eval-config.nix") {
- inherit (pkgs.stdenv.hostPlatform) system;
- modules = [(
+ nixos =
+ configuration:
+ let
+ c = import (pkgs.path + "/nixos/lib/eval-config.nix") {
+ inherit (pkgs.stdenv.hostPlatform) system;
+ modules =
+ [(
{ lib, ... }: {
config.nixpkgs.pkgs = lib.mkDefault pkgs;
}
@@ -23988,7 +23961,9 @@ in
then configuration
else [configuration]
);
- }).config.system.build;
+ };
+ in
+ c.config.system.build // c;
/*
@@ -24104,6 +24079,8 @@ in
nix-serve = callPackage ../tools/package-management/nix-serve { };
+ nixfmt = haskell.lib.justStaticExecutables haskellPackages.nixfmt;
+
nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { };
nixos-artwork = callPackage ../data/misc/nixos-artwork { };
@@ -24112,6 +24089,8 @@ in
nixos-container = callPackage ../tools/virtualization/nixos-container { };
+ nixos-generators = callPackage ../tools/nix/nixos-generators { };
+
norwester-font = callPackage ../data/fonts/norwester {};
nut = callPackage ../applications/misc/nut { };
@@ -24347,7 +24326,7 @@ in
terraform_plugins_test
;
- terraform = terraform_0_11;
+ terraform = terraform_0_12;
# deprecated
terraform-full = terraform.full;
@@ -24711,6 +24690,8 @@ in
hy = callPackage ../development/interpreters/hy {};
+ wmic-bin = callPackage ../servers/monitoring/plugins/wmic-bin.nix { };
+
check-uptime = callPackage ../servers/monitoring/plugins/uptime.nix { };
ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; };
@@ -24836,4 +24817,8 @@ in
verifpal = callPackage ../tools/security/verifpal {};
+ nix-store-gcs-proxy = callPackage ../tools/nix/nix-store-gcs-proxy {};
+
+ wifi-password = callPackage ../os-specific/darwin/wifi-password {};
+
}
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index df9d3dbcff5b..7496449c044c 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -82,7 +82,7 @@ rec {
# Each field in this tuple represents all Beam packages in nixpkgs built with
# appropriate Erlang/OTP version.
- packages = rec {
+ packages = {
# Packages built with default Erlang version.
erlang = packagesWith interpreters.erlang;
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index e89a7d9df2aa..f06b4f1c2866 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -430,14 +430,14 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
};
};
- Deedle = fetchNuGet rec {
+ Deedle = fetchNuGet {
baseName = "Deedle";
version = "1.2.5";
sha256 = "0g19ll6bp97ixprcnpwwvshr1n9jxxf9xjhkxp0r63mg46z48jnw";
outputFiles = [ "*" ];
};
- ExcelDna = buildDotnetPackage rec {
+ ExcelDna = buildDotnetPackage {
baseName = "Excel-DNA";
version = "0.32.0";
@@ -496,7 +496,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
};
};
- ExtCore = buildDotnetPackage rec {
+ ExtCore = buildDotnetPackage {
baseName = "ExtCore";
version = "0.8.46";
@@ -564,7 +564,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
};
};
- FSharpCompilerService = buildDotnetPackage rec {
+ FSharpCompilerService = buildDotnetPackage {
baseName = "FSharp.Compiler.Service";
version = "0.0.90";
@@ -667,7 +667,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
# };
# };
- GitVersionTree = buildDotnetPackage rec {
+ GitVersionTree = buildDotnetPackage {
baseName = "GitVersionTree";
version = "2013-10-01";
@@ -927,7 +927,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
};
};
- UnionArgParser = buildDotnetPackage rec {
+ UnionArgParser = buildDotnetPackage {
baseName = "UnionArgParser";
version = "0.8.7";
diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix
index 5b5b32b89da5..a36c89fac0ab 100644
--- a/pkgs/top-level/emscripten-packages.nix
+++ b/pkgs/top-level/emscripten-packages.nix
@@ -134,7 +134,7 @@ rec {
zlib = (pkgs.zlib.override {
stdenv = pkgs.emscriptenStdenv;
}).overrideDerivation
- (old: rec {
+ (old: {
buildInputs = old.buildInputs ++ [ pkgconfig ];
# we need to reset this setting!
NIX_CFLAGS_COMPILE="";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 86e8228f1870..49bfc58adf06 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -105,7 +105,7 @@ in {
(pkgs.lib.attrNames compiler);
in pkgs.recurseIntoAttrs (pkgs.lib.genAttrs
integerSimpleGhcNames
- (name: compiler."${name}".override { enableIntegerSimple = true; }));
+ (name: compiler.${name}.override { enableIntegerSimple = true; }));
};
# Default overrides that are applied to all package sets.
@@ -176,9 +176,9 @@ in {
integerSimpleGhcNames = pkgs.lib.filter
(name: ! builtins.elem name integerSimpleExcludes)
(pkgs.lib.attrNames packages);
- in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override {
- ghc = bh.compiler.integer-simple."${name}";
- buildHaskellPackages = bh.packages.integer-simple."${name}";
+ in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages.${name}.override {
+ ghc = bh.compiler.integer-simple.${name};
+ buildHaskellPackages = bh.packages.integer-simple.${name};
overrides = _self : _super : {
integer-simple = null;
integer-gmp = null;
diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix
index 35b0b42da3fe..06b82a478a87 100644
--- a/pkgs/top-level/haxe-packages.nix
+++ b/pkgs/top-level/haxe-packages.nix
@@ -99,7 +99,7 @@ let
hxnodejs_6 = let
libname = "hxnodejs";
version = "6.9.0";
- in stdenv.mkDerivation rec {
+ in stdenv.mkDerivation {
name = "${libname}-${version}";
src = fetchFromGitHub {
owner = "HaxeFoundation";
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 87c9bd3bacfb..c9e9305666e2 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -64,17 +64,18 @@ in
with self; {
getLuaPathList = majorVersion: [
- "lib/lua/${majorVersion}/?.lua" "share/lua/${majorVersion}/?.lua"
- "share/lua/${majorVersion}/?/init.lua" "lib/lua/${majorVersion}/?/init.lua"
+ "share/lua/${majorVersion}/?.lua"
+ "share/lua/${majorVersion}/?/init.lua"
];
getLuaCPathList = majorVersion: [
- "lib/lua/${majorVersion}/?.so" "share/lua/${majorVersion}/?.so" "share/lua/${majorVersion}/?/init.so"
+ "lib/lua/${majorVersion}/?.so"
];
# helper functions for dealing with LUA_PATH and LUA_CPATH
- getPath = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}";
- getLuaPath = lib : getPath lib "lua";
- getLuaCPath = lib : getPath lib "so";
+ getPath = drv: pathListForVersion:
+ lib.concatMapStringsSep ";" (path: "${drv}/${path}") (pathListForVersion lua.luaversion);
+ getLuaPath = drv: getPath drv getLuaPathList;
+ getLuaCPath = drv: getPath drv getLuaCPathList;
#define build lua package function
buildLuaPackage = callPackage ../development/lua-modules/generic {
@@ -132,7 +133,7 @@ with self; {
};
vicious = toLuaModule(stdenv.mkDerivation rec {
- name = "vicious-${version}";
+ pname = "vicious";
version = "2.3.1";
src = fetchFromGitHub {
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index 6f30bd06a81c..288971403f1a 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -11,7 +11,7 @@
with pkgs;
-releaseTools.sourceTarball rec {
+releaseTools.sourceTarball {
name = "nixpkgs-tarball";
src = nixpkgs;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9dbc36e8601f..4ece950f09e2 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -57,7 +57,9 @@ let
base64 = callPackage ../development/ocaml-modules/base64 { };
- bap = callPackage ../development/ocaml-modules/bap { };
+ bap = callPackage ../development/ocaml-modules/bap {
+ llvm = pkgs.llvm_8;
+ };
batteries = callPackage ../development/ocaml-modules/batteries { };
@@ -395,7 +397,7 @@ let
linenoise = callPackage ../development/ocaml-modules/linenoise { };
llvm = callPackage ../development/ocaml-modules/llvm {
- llvm = pkgs.llvm_39;
+ llvm = pkgs.llvm_8;
};
logs = callPackage ../development/ocaml-modules/logs {
@@ -553,6 +555,10 @@ let
ocplib-json-typed = callPackage ../development/ocaml-modules/ocplib-json-typed { };
+ ocplib-json-typed-browser = callPackage ../development/ocaml-modules/ocplib-json-typed/browser.nix { };
+
+ ocplib-json-typed-bson = callPackage ../development/ocaml-modules/ocplib-json-typed/bson.nix { };
+
ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { };
ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };
@@ -725,6 +731,8 @@ let
rope = callPackage ../development/ocaml-modules/rope { };
+ rpclib = callPackage ../development/ocaml-modules/rpclib { };
+
rresult = callPackage ../development/ocaml-modules/rresult { };
safepass = callPackage ../development/ocaml-modules/safepass { };
@@ -817,7 +825,14 @@ let
janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
- janeStreet = import ../development/ocaml-modules/janestreet {
+ janeStreet =
+ if lib.versionOlder "4.07" ocaml.version
+ then import ../development/ocaml-modules/janestreet/0.12.nix {
+ janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {};
+ inherit ctypes num octavius ppxlib re;
+ inherit (pkgs) openssl;
+ }
+ else import ../development/ocaml-modules/janestreet {
inherit janePackage ocamlbuild angstrom ctypes cryptokit;
inherit magic-mime num ocaml-migrate-parsetree octavius ounit;
inherit ppx_deriving re ppxlib;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6180f6372e27..8b1e7943fb6e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -219,7 +219,7 @@ let
};
buildInputs = [ ArchiveExtract ];
- TIDYP_DIR = "${pkgs.tidyp}";
+ TIDYP_DIR = pkgs.tidyp;
propagatedBuildInputs = [ FileShareDir ];
};
@@ -2879,6 +2879,18 @@ let
};
};
+ ConfigSimple = buildPerlPackage {
+ pname = "Config-Simple";
+ version = "4.59";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/S/SH/SHERZODR/Config-Simple-4.59.tar.gz;
+ sha256 = "0m0hg29baarw5ds768q9r4rxb27im8kj4fazyf9gjqw4mmssjy6b";
+ };
+ meta = {
+ description = "Simple configuration file class";
+ };
+ };
+
ConfigStd = buildPerlModule {
pname = "Config-Std";
version = "0.903";
@@ -6194,6 +6206,9 @@ let
url = mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.78.tar.gz;
sha256 = "1cxavhzg4gyw4gl9kirpbdimjr8gk1rjc3pqs3xrnh1gjybld5xa";
};
+ postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ sed -i '/use IO::File/d' Makefile.PL
+ '';
};
FCGIClient = buildPerlModule {
@@ -7522,7 +7537,7 @@ let
};
propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ];
meta = {
- description = "Perl interface to the 3.x series of the gtk+ toolkit";
+ description = "Perl interface to the 3.x series of the GTK toolkit";
license = stdenv.lib.licenses.lgpl21Plus;
};
};
@@ -10646,23 +10661,26 @@ let
};
};
- MHonArc = buildPerlPackage {
+ MHonArc = buildPerlPackage rec {
pname = "MHonArc";
- version = "2.6.18";
+ version = "2.6.19";
src = fetchurl {
- url = "http://dcssrv1.oit.uci.edu/indiv/ehood/release/MHonArc/tar/MHonArc-2.6.18.tar.gz";
- sha256 = "1xmf26dfwr8achprc3n1pxgl0mkiyr6pf25wq3dqgzqkghrrsxa2";
+ url = "https://www.mhonarc.org/release/MHonArc/tar/MHonArc-${version}.tar.gz";
+ sha256 = "0ll3v93yji334zqp6xfzfxc0127pmjcznmai1l5q6dzawrs2igzq";
};
+
+ patches = [ ../development/perl-modules/mhonarc.patch ];
+
outputs = [ "out" "dev" ]; # no "devdoc"
installTargets = "install";
meta = with stdenv.lib; {
- homepage = http://dcssrv1.oit.uci.edu/indiv/ehood/mhonarch.html;
+ homepage = "https://www.mhonarc.org/";
description = "A mail-to-HTML converter";
maintainers = with maintainers; [ lovek323 ];
- license = licenses.gpl2;
+ license = licenses.gpl2;
};
};
@@ -19364,7 +19382,7 @@ let
};
propagatedBuildInputs = [ AlienWxWidgets ];
# Testing requires an X server:
- # Error: Unable to initialize GTK+, is DISPLAY set properly?"
+ # Error: Unable to initialize GTK, is DISPLAY set properly?"
doCheck = false;
buildInputs = [ ExtUtilsXSpp ];
};
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 879ffc9f441c..fc6d76743385 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -15,7 +15,7 @@ let
isPhp73 = pkgs.lib.versionAtLeast php.version "7.3";
- apcu = buildPecl rec {
+ apcu = buildPecl {
version = "5.1.17";
pname = "apcu";
@@ -29,7 +29,7 @@ let
outputs = [ "out" "dev" ];
};
- apcu_bc = buildPecl rec {
+ apcu_bc = buildPecl {
version = "1.0.5";
pname = "apcu_bc";
@@ -38,7 +38,7 @@ let
buildInputs = [ apcu (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ];
};
- ast = buildPecl rec {
+ ast = buildPecl {
version = "1.0.3";
pname = "ast";
@@ -142,7 +142,7 @@ let
];
};
- event = buildPecl rec {
+ event = buildPecl {
version = "2.5.3";
pname = "event";
@@ -167,7 +167,7 @@ let
};
};
- igbinary = buildPecl rec {
+ igbinary = buildPecl {
version = "3.0.1";
pname = "igbinary";
@@ -178,7 +178,7 @@ let
outputs = [ "out" "dev" ];
};
- imagick = buildPecl rec {
+ imagick = buildPecl {
version = "3.4.4";
pname = "imagick";
@@ -189,7 +189,7 @@ let
buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ];
};
- mailparse = buildPecl rec {
+ mailparse = buildPecl {
version = "3.0.3";
pname = "mailparse";
@@ -232,7 +232,7 @@ let
] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security;
};
- oci8 = buildPecl rec {
+ oci8 = buildPecl {
version = "2.2.0";
pname = "oci8";
@@ -245,14 +245,14 @@ let
'';
};
- pcs = buildPecl rec {
+ pcs = buildPecl {
version = "1.3.3";
pname = "pcs";
sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p";
};
- pdo_sqlsrv = buildPecl rec {
+ pdo_sqlsrv = buildPecl {
version = "5.6.1";
pname = "pdo_sqlsrv";
@@ -427,7 +427,7 @@ let
pinba = if isPhp73 then pinba73 else pinba7;
- pinba7 = assert !isPhp73; buildPecl rec {
+ pinba7 = assert !isPhp73; buildPecl {
version = "1.1.1";
pname = "pinba";
@@ -448,7 +448,7 @@ let
};
};
- pinba73 = assert isPhp73; buildPecl rec {
+ pinba73 = assert isPhp73; buildPecl {
version = "1.1.2-dev";
pname = "pinba";
@@ -469,7 +469,7 @@ let
};
};
- protobuf = buildPecl rec {
+ protobuf = buildPecl {
version = "3.9.0";
pname = "protobuf";
@@ -529,7 +529,7 @@ let
buildInputs = with pkgs; [ pcre.dev ];
};
- pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl rec {
+ pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl {
version = "3.2.0-dev";
pname = "pthreads";
@@ -543,14 +543,14 @@ let
buildInputs = with pkgs; [ pcre2.dev ];
};
- redis = buildPecl rec {
+ redis = buildPecl {
version = "5.0.2";
pname = "redis";
sha256 = "0b5pw17lzqknhijfymksvf8fm1zilppr97ypb31n599jw3mxf62f";
};
- sqlsrv = buildPecl rec {
+ sqlsrv = buildPecl {
version = "5.6.1";
pname = "sqlsrv";
@@ -559,7 +559,7 @@ let
buildInputs = [ pkgs.unixODBC ];
};
- v8 = buildPecl rec {
+ v8 = buildPecl {
version = "0.2.2";
pname = "v8";
@@ -570,7 +570,7 @@ let
meta.broken = true;
};
- v8js = assert !isPhp73; buildPecl rec {
+ v8js = assert !isPhp73; buildPecl {
version = "2.1.0";
pname = "v8js";
@@ -581,7 +581,7 @@ let
meta.broken = true;
};
- xdebug = buildPecl rec {
+ xdebug = buildPecl {
version = "2.7.1";
pname = "xdebug";
@@ -591,7 +591,7 @@ let
checkTarget = "test";
};
- yaml = buildPecl rec {
+ yaml = buildPecl {
version = "2.0.4";
pname = "yaml";
@@ -604,7 +604,7 @@ let
nativeBuildInputs = [ pkgs.pkgconfig ];
};
- zmq = assert !isPhp73; buildPecl rec {
+ zmq = assert !isPhp73; buildPecl {
version = "1.1.3";
pname = "zmq";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9099552add23..96885a83ebb4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -42,17 +42,14 @@ let
}
else ff;
- buildPythonPackage = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix {
- flit = self.flit;
- # We want Python libraries to be named like e.g. "python3.6-${name}"
- inherit namePrefix;
- inherit toPythonModule;
+ buildPythonPackage = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix {
+ inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}"
+ inherit toPythonModule; # Libraries provide modules
}));
- buildPythonApplication = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix {
- flit = self.flit;
- namePrefix = "";
- toPythonModule = x: x; # Application does not provide modules.
+ buildPythonApplication = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix {
+ namePrefix = ""; # Python applications should not have any prefix
+ toPythonModule = x: x; # Application does not provide modules.
}));
# See build-setupcfg/default.nix for documentation.
@@ -110,6 +107,9 @@ in {
inherit toPythonModule toPythonApplication;
inherit buildSetupcfg;
+ inherit (callPackage ../development/interpreters/python/hooks { })
+ flitBuildHook pipBuildHook pipInstallHook pytestCheckHook pythonCatchConflictsHook pythonImportsCheckHook pythonRemoveBinBytecodeHook setuptoolsBuildHook setuptoolsCheckHook wheelUnpackHook;
+
# helpers
wrapPython = callPackage ../development/interpreters/python/wrap-python.nix {inherit python; inherit (pkgs) makeSetupHook makeWrapper; };
@@ -121,7 +121,7 @@ in {
recursivePthLoader = callPackage ../development/python-modules/recursive-pth-loader { };
- setuptools = toPythonModule (callPackage ../development/python-modules/setuptools { });
+ setuptools = callPackage ../development/python-modules/setuptools { };
vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { };
@@ -475,10 +475,14 @@ in {
clifford = callPackage ../development/python-modules/clifford { };
+ clickclick = callPackage ../development/python-modules/clickclick { };
+
clustershell = callPackage ../development/python-modules/clustershell { };
cnvkit = callPackage ../development/python-modules/cnvkit { };
+ connexion = callPackage ../development/python-modules/connexion { };
+
cozy = callPackage ../development/python-modules/cozy { };
codespell = callPackage ../development/python-modules/codespell { };
@@ -715,8 +719,12 @@ in {
mailman = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/core.nix { });
+ mailman-web = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/web.nix { });
+
mailmanclient = callPackage ../development/python-modules/mailmanclient { };
+ mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { };
+
manhole = callPackage ../development/python-modules/manhole { };
markerlib = callPackage ../development/python-modules/markerlib { };
@@ -837,6 +845,8 @@ in {
pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { };
+ purl = callPackage ../development/python-modules/purl { };
+
pymystem3 = callPackage ../development/python-modules/pymystem3 { };
pymysql = callPackage ../development/python-modules/pymysql { };
@@ -863,6 +873,8 @@ in {
pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { };
+ pybids = callPackage ../development/python-modules/pybids { };
+
pybind11 = callPackage ../development/python-modules/pybind11 { };
pybullet = callPackage ../development/python-modules/pybullet { };
@@ -990,6 +1002,8 @@ in {
*/
pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; };
+ pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; };
+
pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine {
pythonPackages = self;
};
@@ -1235,7 +1249,9 @@ in {
unifi = callPackage ../development/python-modules/unifi { };
- uvloop = callPackage ../development/python-modules/uvloop { };
+ uvloop = callPackage ../development/python-modules/uvloop {
+ inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
+ };
pyunifi = callPackage ../development/python-modules/pyunifi { };
@@ -1297,6 +1313,8 @@ in {
aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { };
+ aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { };
+
aioprocessing = callPackage ../development/python-modules/aioprocessing { };
aioresponses = callPackage ../development/python-modules/aioresponses { };
@@ -1392,8 +1410,6 @@ in {
argcomplete = callPackage ../development/python-modules/argcomplete { };
- area53 = callPackage ../development/python-modules/area53 { };
-
arxiv2bib = callPackage ../development/python-modules/arxiv2bib { };
chai = callPackage ../development/python-modules/chai { };
@@ -1408,6 +1424,8 @@ in {
gui = false;
};
+ delegator-py = callPackage ../development/python-modules/delegator-py { };
+
deluge-client = callPackage ../development/python-modules/deluge-client { };
arrow = callPackage ../development/python-modules/arrow { };
@@ -1504,6 +1522,8 @@ in {
bidict = callPackage ../development/python-modules/bidict { };
+ bids-validator = callPackage ../development/python-modules/bids-validator { };
+
binwalk = callPackage ../development/python-modules/binwalk { };
binwalk-full = appendToName "full" (self.binwalk.override {
@@ -1971,12 +1991,15 @@ in {
pyhepmc = callPackage ../development/python-modules/pyhepmc { };
- pytest = self.pytest_4;
-
- pytest_4 = callPackage ../development/python-modules/pytest {
- # hypothesis tests require pytest that causes dependency cycle
- hypothesis = self.hypothesis.override { doCheck = false; };
- };
+ pytest = if isPy3k then
+ callPackage ../development/python-modules/pytest {
+ # hypothesis tests require pytest that causes dependency cycle
+ hypothesis = self.hypothesis.override { doCheck = false; };
+ }
+ else callPackage ../development/python-modules/pytest/2.nix {
+ # hypothesis tests require pytest that causes dependency cycle
+ hypothesis = self.hypothesis.override { doCheck = false; };
+ };
pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { };
@@ -2048,6 +2071,8 @@ in {
pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { };
+ pytest-random-order = callPackage ../development/python-modules/pytest-random-order { };
+
pytest-repeat = callPackage ../development/python-modules/pytest-repeat { };
pytestrunner = callPackage ../development/python-modules/pytestrunner { };
@@ -2235,8 +2260,6 @@ in {
pythonPackages = self;
});
- EditorConfig = callPackage ../development/python-modules/editorconfig { };
-
edward = callPackage ../development/python-modules/edward { };
elasticsearch = callPackage ../development/python-modules/elasticsearch { };
@@ -2327,16 +2350,14 @@ in {
future-fstrings = callPackage ../development/python-modules/future-fstrings { };
+ fx2 = callPackage ../development/python-modules/fx2 { };
+
gateone = callPackage ../development/python-modules/gateone { };
- # TODO: Remove after 19.03 is branched off:
- gcutil = throw ''
- pythonPackages.gcutil is deprecated and can be replaced with "gcloud
- compute" from the package google-cloud-sdk.
- '';
-
GeoIP = callPackage ../development/python-modules/GeoIP { };
+ glasgow = callPackage ../development/python-modules/glasgow { };
+
gmpy = callPackage ../development/python-modules/gmpy { };
gmpy2 = callPackage ../development/python-modules/gmpy2 { };
@@ -2422,6 +2443,8 @@ in {
ijson = callPackage ../development/python-modules/ijson {};
+ imagecodecs-lite = disabledIf (!isPy3k) (callPackage ../development/python-modules/imagecodecs-lite { });
+
imagesize = callPackage ../development/python-modules/imagesize { };
image-match = callPackage ../development/python-modules/image-match { };
@@ -2567,10 +2590,17 @@ in {
Nikola = callPackage ../development/python-modules/Nikola { };
+ nmigen = callPackage ../development/python-modules/nmigen { };
+
+ nmigen-boards = callPackage ../development/python-modules/nmigen-boards { };
+
nxt-python = callPackage ../development/python-modules/nxt-python { };
odfpy = callPackage ../development/python-modules/odfpy { };
+ openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { };
+ openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { };
+
oset = callPackage ../development/python-modules/oset { };
pamela = callPackage ../development/python-modules/pamela { };
@@ -2649,7 +2679,7 @@ in {
pycares = callPackage ../development/python-modules/pycares { };
- pycuda = callPackage ../development/python-modules/pycuda rec {
+ pycuda = callPackage ../development/python-modules/pycuda {
cudatoolkit = pkgs.cudatoolkit_7_5;
inherit (pkgs.stdenv) mkDerivation;
};
@@ -2796,6 +2826,8 @@ in {
starfish = callPackage ../development/python-modules/starfish { };
+ swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { };
+
multi_key_dict = callPackage ../development/python-modules/multi_key_dict { };
random2 = callPackage ../development/python-modules/random2 { };
@@ -2983,8 +3015,6 @@ in {
effect = callPackage ../development/python-modules/effect {};
- elpy = callPackage ../development/python-modules/elpy { };
-
enum = callPackage ../development/python-modules/enum { };
enum-compat = callPackage ../development/python-modules/enum-compat { };
@@ -3855,8 +3885,6 @@ in {
monotonic = callPackage ../development/python-modules/monotonic { };
- MySQL_python = callPackage ../development/python-modules/mysql_python { };
-
mysql-connector = callPackage ../development/python-modules/mysql-connector { };
namebench = callPackage ../development/python-modules/namebench { };
@@ -3943,6 +3971,8 @@ in {
ntplib = callPackage ../development/python-modules/ntplib { };
+ num2words = callPackage ../development/python-modules/num2words { };
+
numba = callPackage ../development/python-modules/numba { };
numcodecs = callPackage ../development/python-modules/numcodecs { };
@@ -3956,10 +3986,10 @@ in {
blas = pkgs.openblasCompat;
};
numpy_2 = numpy_.overridePythonAttrs(oldAttrs: rec {
- version = "1.16.4";
+ version = "1.16.5";
src = oldAttrs.src.override {
inherit version;
- sha256 = "1ivrwh66cmly7xh1dl7pybizfz5rcicn4kkkx5g29v4gll9bwhkj";
+ sha256 = "8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c";
};
});
in if pythonOlder "3.5" then numpy_2 else numpy_;
@@ -4121,7 +4151,10 @@ in {
pathlib2 = callPackage ../development/python-modules/pathlib2 { };
- pathpy = callPackage ../development/python-modules/path.py { };
+ pathpy = if isPy3k then
+ callPackage ../development/python-modules/path.py { }
+ else
+ callPackage ../development/python-modules/path.py/2.nix { };
paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { };
@@ -4210,8 +4243,6 @@ in {
pysoundfile = self.soundfile; # Alias added 23-06-2019
- python3pika = callPackage ../development/python-modules/python3pika { };
-
python-jenkins = callPackage ../development/python-modules/python-jenkins { };
pystringtemplate = callPackage ../development/python-modules/stringtemplate { };
@@ -4406,6 +4437,8 @@ in {
pyupdate = callPackage ../development/python-modules/pyupdate {};
+ pyvmomi = callPackage ../development/python-modules/pyvmomi { };
+
pyx = callPackage ../development/python-modules/pyx { };
mmpython = callPackage ../development/python-modules/mmpython { };
@@ -4552,6 +4585,8 @@ in {
python-markdown-math = callPackage ../development/python-modules/python-markdown-math { };
+ python-pipedrive = callPackage ../development/python-modules/python-pipedrive { };
+
python-ptrace = callPackage ../development/python-modules/python-ptrace { };
python-wifi = callPackage ../development/python-modules/python-wifi { };
@@ -4636,6 +4671,8 @@ in {
inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package
};
+ rfc6555 = callPackage ../development/python-modules/rfc6555 { };
+
qdarkstyle = callPackage ../development/python-modules/qdarkstyle { };
quamash = callPackage ../development/python-modules/quamash { };
@@ -4793,10 +4830,10 @@ in {
scipy = let
scipy_ = callPackage ../development/python-modules/scipy { };
scipy_1_2 = scipy_.overridePythonAttrs(oldAttrs: rec {
- version = "1.2.1";
+ version = "1.2.2";
src = oldAttrs.src.override {
inherit version;
- sha256 = "0g5a03jkjiqlh6h9yz508p5c9ni43735m01fivjvn6dlpjxd31g0";
+ sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1";
};
});
in if pythonOlder "3.5" then scipy_1_2 else scipy_;
@@ -4813,6 +4850,8 @@ in {
scikit-build = callPackage ../development/python-modules/scikit-build { };
+ scikits-odes = callPackage ../development/python-modules/scikits-odes { };
+
scikit-optimize = callPackage ../development/python-modules/scikit-optimize { };
scikit-tda = callPackage ../development/python-modules/scikit-tda { };
@@ -6155,10 +6194,14 @@ in {
yattag = callPackage ../development/python-modules/yattag { };
+ xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { });
+
z3 = (toPythonModule (pkgs.z3.override {
inherit python;
})).python;
+ zeroc-ice = callPackage ../development/python-modules/zeroc-ice { };
+
zm-py = callPackage ../development/python-modules/zm-py { };
rfc7464 = callPackage ../development/python-modules/rfc7464 { };
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 17239c6d879b..1ed3601270f8 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -14,7 +14,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
officialRelease = false;
};
-} // (mapTestOn (rec {
+} // (mapTestOn ({
aspell = all;
at = linux;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 9ae5a9e1fbdc..da81a696337d 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -102,7 +102,7 @@ let
# Needed for support
jobs.nix-info.x86_64-linux
jobs.nix-info-tested.x86_64-linux
- # Ensure that X11/GTK+ are in order.
+ # Ensure that X11/GTK are in order.
jobs.thunderbird.x86_64-linux
jobs.unar.x86_64-linux
@@ -185,7 +185,7 @@ let
};
};
- } // (mapTestOn ((packagePlatforms pkgs) // rec {
+ } // (mapTestOn ((packagePlatforms pkgs) // {
haskell.compiler = packagePlatforms pkgs.haskell.compiler;
haskellPackages = packagePlatforms pkgs.haskellPackages;
idrisPackages = packagePlatforms pkgs.idrisPackages;
diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
new file mode 100644
index 000000000000..ed2321887a7b
--- /dev/null
+++ b/pkgs/top-level/ruby-packages.nix
@@ -0,0 +1,2666 @@
+{
+ actionmailer = {
+ dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18wwlj4f7jffv3vxm80d2z36nwza95l5xfcqc401hvvrls4xzhsy";
+ type = "gem";
+ };
+ version = "4.2.11.1";
+ };
+ actionpack = {
+ dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rmldsk3a4lwxk0lrp6x1nz1v1r2xmbm3300l4ghgfygv3grdwjh";
+ type = "gem";
+ };
+ version = "4.2.11.1";
+ };
+ actionview = {
+ dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0x7vjn8q6blzyf7j3kwg0ciy7vnfh28bjdkd1mp9k4ghp9jn0g9p";
+ type = "gem";
+ };
+ version = "4.2.11.1";
+ };
+ activejob = {
+ dependencies = ["activesupport" "globalid"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jy1c1r6syjqpa0sh9f1p4iaxzvp6qg4n6zs774j9z27q7h407mj";
+ type = "gem";
+ };
+ version = "4.2.11.1";
+ };
+ activemodel = {
+ dependencies = ["activesupport" "builder"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1c1x0rd6wnk1f0gsmxs6x3gx7yf6fs9qqkdv7r4hlbcdd849in33";
+ type = "gem";
+ };
+ version = "4.2.11.1";
+ };
+ activerecord = {
+ dependencies = ["activemodel" "activesupport" "arel"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "07ixiwi0zzs9skqarvpfamsnay7npfswymrn28ngxaf8hi279q5p";
+ type = "gem";
+ };
+ version = "4.2.11.1";
+ };
+ activesupport = {
+ dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6";
+ type = "gem";
+ };
+ version = "4.2.11.1";
+ };
+ addressable = {
+ dependencies = ["public_suffix"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
+ type = "gem";
+ };
+ version = "2.7.0";
+ };
+ arel = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nfcrdiys6q6ylxiblky9jyssrw2xj96fmxmal7f4f0jj3417vj4";
+ type = "gem";
+ };
+ version = "6.0.4";
+ };
+ ast = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
+ type = "gem";
+ };
+ version = "2.4.0";
+ };
+ atk = {
+ dependencies = ["glib2"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0saginz71qy4k1hz3sffrjd6zcw54jsm61f7jks02fxys31ir865";
+ type = "gem";
+ };
+ version = "3.3.7";
+ };
+ atomos = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17vq6sjyswr5jfzwdccw748kgph6bdw30bakwnn6p8sl4hpv4hvx";
+ type = "gem";
+ };
+ version = "0.1.3";
+ };
+ awesome_print = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14arh1ixfsd6j5md0agyzvksm5svfkvchb90fp32nn7y3avcmc2h";
+ type = "gem";
+ };
+ version = "1.8.0";
+ };
+ bacon = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1f06gdj77bmwzc1k5iragl1595hbn67yc7sqvs56ca8plrr2vmai";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ builder = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
+ type = "gem";
+ };
+ version = "3.2.3";
+ };
+ byebug = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1mmkls9n56l4gx2k0dnyianwz36z2zgpxli5bpsbr7jbw7hn2x6j";
+ type = "gem";
+ };
+ version = "11.0.1";
+ };
+ cairo = {
+ dependencies = ["native-package-installer" "pkg-config"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0yvv2lcbsybzbw1nrmfivmln23da4rndrs3av6ymjh0x3ww5h7p8";
+ type = "gem";
+ };
+ version = "1.16.4";
+ };
+ cairo-gobject = {
+ dependencies = ["cairo" "glib2"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1380dvd5dbnhlvagb9z9cr62kh1knza7bcgr9msqshj55iqk4p0k";
+ type = "gem";
+ };
+ version = "3.3.7";
+ };
+ camping = {
+ dependencies = ["mab" "rack"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1q2a5x97pgnld0b8yziblp9fqkjyib4gfwv9gcyynyhswqwsldpf";
+ type = "gem";
+ };
+ version = "2.1.532";
+ };
+ CFPropertyList = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8";
+ type = "gem";
+ };
+ version = "3.0.1";
+ };
+ charlock_holmes = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
+ type = "gem";
+ };
+ version = "0.7.6";
+ };
+ claide = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
+ clamp = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0dka8f3hwzz7p558kiyyrdabljvwp71cbzk46akb3kvnvhcyjx89";
+ type = "gem";
+ };
+ version = "1.3.1";
+ };
+ cld3 = {
+ dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "06p4jgrr0zixqnflmg5dcrbmhlnmll85j7vxkrjmnng293cwvzgw";
+ type = "gem";
+ };
+ version = "3.2.4";
+ };
+ cocoapods = {
+ dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz";
+ type = "gem";
+ };
+ version = "1.7.5";
+ };
+ cocoapods-acknowledgements = {
+ dependencies = ["activesupport" "redcarpet"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "07n638ijlc4y5vfzs5ykzhmwwsng7njb2nnwn4ravydqqxqgv13m";
+ type = "gem";
+ };
+ version = "1.1.3";
+ };
+ cocoapods-art = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1gp7rib26diw4n5gs4dcb8sy0dga9xmdw0i2nwdqn1qm3qp7kbg5";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
+ cocoapods-bin = {
+ dependencies = ["cocoapods" "cocoapods-generate" "parallel"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03x5grabb8nyky0nq1h78vmlka66pkgdif0f6i6nhjfy96gpil87";
+ type = "gem";
+ };
+ version = "0.1.18";
+ };
+ cocoapods-browser = {
+ dependencies = ["cocoapods"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1mq9mcw3xnf2nqkmcjg874sx422dbmfa99vhw31c9jb0cd4j3m9p";
+ type = "gem";
+ };
+ version = "0.1.5";
+ };
+ cocoapods-bugsnag = {
+ dependencies = ["cocoapods"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1r34h66rqswsyhanx69qnhhr02xsqy2y1zp5265gl6m76nyqq5wa";
+ type = "gem";
+ };
+ version = "2.0.1";
+ };
+ cocoapods-check = {
+ dependencies = ["cocoapods"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17wb5xzhjvrqllsjqqbm00w8gnsrwcb6k7wsb36ykbcp0aiagvaf";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ cocoapods-clean = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "16zy8xl94clblxivlcrw2jf3dnvmwlr6jni6kz74rnc8wj42sf1w";
+ type = "gem";
+ };
+ version = "0.0.1";
+ };
+ cocoapods-clean_build_phases_scripts = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1b91sfsriizsr08m1vn9j4sf9sb8vgsyr6xjnw18bpy66bpwsqca";
+ type = "gem";
+ };
+ version = "0.0.2";
+ };
+ cocoapods-core = {
+ dependencies = ["activesupport" "fuzzy_match" "nap"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4";
+ type = "gem";
+ };
+ version = "1.7.5";
+ };
+ cocoapods-coverage = {
+ dependencies = ["cocoapods-testing" "slather"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04bzk1x67pqrmnmz3pdw107j5p9ncwfm7gdv8n4bk4r9nqxdv3wn";
+ type = "gem";
+ };
+ version = "0.2.0";
+ };
+ cocoapods-deintegrate = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn";
+ type = "gem";
+ };
+ version = "1.0.4";
+ };
+ cocoapods-dependencies = {
+ dependencies = ["ruby-graphviz"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10ssv98af44698kp4w0wfdrc7x3ccf2w9dhcva6i7hwlffjvcsz3";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ cocoapods-deploy = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1qnhl54z0dqyn0sk7rgn3vwmfax0yr3sk2r464h888d2qjxz6v7j";
+ type = "gem";
+ };
+ version = "0.0.12";
+ };
+ cocoapods-disable-podfile-validations = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fxrq0b1x5gr2gr9md6mkwgaj8519gf1sbyqs88yqphbigf5iy75";
+ type = "gem";
+ };
+ version = "0.1.1";
+ };
+ cocoapods-downloader = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09fd4zaqkz8vz3djplacngcs4n0j6j956wgq43s1y6bwl0zyjmd3";
+ type = "gem";
+ };
+ version = "1.2.2";
+ };
+ cocoapods-expert-difficulty = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19shjj4kj9rqg1a3pax568q0w9rkq8jcba2mycvq0szbv7bw6pgl";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ cocoapods-fix-react-native = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01aqxp4d5v8fjbg9f7a61h1b4fnmrqwhrng28ybd80p2z44s186a";
+ type = "gem";
+ };
+ version = "2019.03.19.11";
+ };
+ cocoapods-generate = {
+ dependencies = ["cocoapods-disable-podfile-validations"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0hlczv5x4qz60daqb93cis2l5ps86cvx74rrl6qwggwz2hm76adr";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ cocoapods-git_url_rewriter = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1cmyrj92d781pkq1b6qbvpmxvfx8k3l36cdqsi46w55icjm1jqbw";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ cocoapods-keys = {
+ dependencies = ["dotenv" "osx_keychain"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14jmfibzvhqxhvhphj3g83d70ya16p7s4i43wir48hnaxkaqrm85";
+ type = "gem";
+ };
+ version = "2.1.0";
+ };
+ cocoapods-no-dev-schemes = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14w8yqs3r6pg06zpv58mc9vzfxhp3ka4mfhnc2p7vmyhy4nmcdza";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ cocoapods-open = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1z9x1cqrz4zc6yd08clawi8gg7ip8vbhkh9lkrdkzw7i6lqyrp0j";
+ type = "gem";
+ };
+ version = "0.0.8";
+ };
+ cocoapods-packager = {
+ dependencies = ["cocoapods"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1083zv9pyqyqal6dk3kvfxdmylbll6078z5zw03m4j5jcz3m8nbm";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ cocoapods-packager-pro = {
+ dependencies = ["cocoapods"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1sjnlnqrc3fvc33c3lg3h6y8n969isjswxg2jdc1kfc3x0cakawl";
+ type = "gem";
+ };
+ version = "1.5.4";
+ };
+ cocoapods-playgrounds = {
+ dependencies = ["cocoapods"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jsc489j6dh3mczzs880vc6jvzd8yjqrszmbbnkz9azndak3mhln";
+ type = "gem";
+ };
+ version = "1.2.2";
+ };
+ cocoapods-plugins = {
+ dependencies = ["nap"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "16na82sfyc8801qs1n22nwq486s4j7yj6rj7fcp8cbxmj371fpbj";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ cocoapods-prune-localizations = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hvpl56rnblmdbj40sysvk56j5hx5kdpqry00raw2p184sb5k4cf";
+ type = "gem";
+ };
+ version = "0.3.1";
+ };
+ cocoapods-rome = {
+ dependencies = ["cocoapods" "fourflusher"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1z5z49m5aww7q301bn5dzb6fzq6lcj6fvqibpg5ys1r0c41lsj0l";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ cocoapods-search = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ cocoapods-sorted-search = {
+ dependencies = ["cocoapods" "hashie" "osx_keychain" "ruby-progressbar" "typhoeus"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1da86mjq4spfsx6xjk7qylvj5423ai9y39g9xxfl9r6h8i54dmpp";
+ type = "gem";
+ };
+ version = "0.2.4";
+ };
+ cocoapods-static-swift-framework = {
+ dependencies = ["cocoapods"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12hhh25bj5dyz6rwc5jgarlld35vmgn43qk5lq9kfrpcli2ynhp2";
+ type = "gem";
+ };
+ version = "0.5";
+ };
+ cocoapods-stats = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xhdh5v94p6l612rwrk290nd2hdfx8lbaqfbkmj34md218kilqww";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ cocoapods-tdfire-binary = {
+ dependencies = ["cocoapods" "cocoapods-bin" "cocoapods-packager-pro"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10idp7yr2zni6zhpj1pqkj4wkk5g48f5iizjb20i8minj52l64m0";
+ type = "gem";
+ };
+ version = "2.0.9";
+ };
+ cocoapods-testing = {
+ dependencies = ["xctasks"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0f7w4gxr45m42ca6fpbq38jfzii00xysz12vcc68myvi8x0krr5l";
+ type = "gem";
+ };
+ version = "0.2.0";
+ };
+ cocoapods-trunk = {
+ dependencies = ["nap" "netrc"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1m0p27aij7d0n0b8h7nvyv3q3prcpwisbj7sla0fp2hvn4lqarl5";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ cocoapods-try = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ cocoapods-try-release-fix = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0a7hbc5j0p507cyd9a0rd2mf2d525ia3gcnx7bdspxqnhl0a43bf";
+ type = "gem";
+ };
+ version = "0.1.2";
+ };
+ cocoapods-update-if-you-dare = {
+ dependencies = ["colored2"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nqvywrbfxiagip2vl9kj71h39g4idq1lshkxl5bqh1hq57g4k9q";
+ type = "gem";
+ };
+ version = "0.2.0";
+ };
+ cocoapods-whitelist = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ln4kywj4bx32qyqvr0byi3g4fk8yj026n00xch782x0147f8lka";
+ type = "gem";
+ };
+ version = "0.0.11";
+ };
+ cocoapods-wholemodule = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03gr4r0aa9mrj8i27dd6l87jzq78sid3jbywmkazg3yrq6y38i21";
+ type = "gem";
+ };
+ version = "0.0.1";
+ };
+ coderay = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
+ type = "gem";
+ };
+ version = "1.1.2";
+ };
+ colorator = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ colored2 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i";
+ type = "gem";
+ };
+ version = "3.1.2";
+ };
+ concurrent-ruby = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
+ type = "gem";
+ };
+ version = "1.1.5";
+ };
+ crass = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
+ type = "gem";
+ };
+ version = "1.0.4";
+ };
+ curb = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0s27g4nkdf8wipzyxx87nnw43ps8xqg30sqz86ay7dvmmpkd786k";
+ type = "gem";
+ };
+ version = "0.9.10";
+ };
+ curses = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1nkh62n5jbkfka8s5sgvhzzpsjkgsr9d3g7b8grhvy92yigkrr7z";
+ type = "gem";
+ };
+ version = "1.3.1";
+ };
+ daemons = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w";
+ type = "gem";
+ };
+ version = "1.3.1";
+ };
+ data_objects = {
+ dependencies = ["addressable"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19fw1ckqc5f1wc4r72qrymy2k6cmd8azbxpn61ksbsjqhzc2bgqd";
+ type = "gem";
+ };
+ version = "0.10.17";
+ };
+ dep-selector-libgecode = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1nff0nai8h8786xix92f3k5wjb51gqd9gkibmah2bvrcwyn9qiw5";
+ type = "gem";
+ };
+ version = "1.3.1";
+ };
+ diff-lcs = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
+ type = "gem";
+ };
+ version = "1.3";
+ };
+ digest-sha3 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "135a8r9nq10wlzbjm74dflls67y9iiwp04aj1089ablbmvbiiq41";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ do_sqlite3 = {
+ dependencies = ["data_objects"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0gxz54qjgwg6a2mkqpai28m0i5swbyxpr4qmh9x1nwf20lysrgcf";
+ type = "gem";
+ };
+ version = "0.10.17";
+ };
+ docile = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif";
+ type = "gem";
+ };
+ version = "1.3.2";
+ };
+ domain_name = {
+ dependencies = ["unf"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
+ type = "gem";
+ };
+ version = "0.5.20190701";
+ };
+ dotenv = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17hkd62ig9b0czv192kqdfq7gw0a8hgq07yclri6myc8y5lmfin5";
+ type = "gem";
+ };
+ version = "2.7.5";
+ };
+ em-websocket = {
+ dependencies = ["eventmachine" "http_parser.rb"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3";
+ type = "gem";
+ };
+ version = "0.5.1";
+ };
+ erubis = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
+ type = "gem";
+ };
+ version = "2.7.0";
+ };
+ escape = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0sa1xkfc9jvkwyw1jbz3jhkq0ms1zrvswi6mmfiwcisg5fp497z4";
+ type = "gem";
+ };
+ version = "0.0.4";
+ };
+ ethon = {
+ dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9";
+ type = "gem";
+ };
+ version = "0.12.0";
+ };
+ eventmachine = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
+ type = "gem";
+ };
+ version = "1.2.7";
+ };
+ excon = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05qmrx7l8abpbvp0z01fdpc731c4k6akk67l424vdp5dywhachpr";
+ type = "gem";
+ };
+ version = "0.66.0";
+ };
+ faraday = {
+ dependencies = ["multipart-post"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0";
+ type = "gem";
+ };
+ version = "0.15.4";
+ };
+ ffi = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
+ type = "gem";
+ };
+ version = "1.10.0";
+ };
+ ffi-compiler = {
+ dependencies = ["ffi" "rake"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ ffi-rzmq-core = {
+ dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0amkbvljpjfnv0jpdmz71p1i3mqbhyrnhamjn566w0c01xd64hb5";
+ type = "gem";
+ };
+ version = "1.0.7";
+ };
+ fog-core = {
+ dependencies = ["builder" "excon" "formatador" "mime-types"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fsama04wlxhv537bm4b7rr4zzn0mvisy87m3qzv6f0mhlrq3zp8";
+ type = "gem";
+ };
+ version = "2.1.2";
+ };
+ fog-dnsimple = {
+ dependencies = ["fog-core" "fog-json"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lbzkc0w96a62ahjw0b7mfbqgg9x2jp7khg5hvpbgw0kfs5xza63";
+ type = "gem";
+ };
+ version = "2.1.0";
+ };
+ fog-json = {
+ dependencies = ["fog-core" "multi_json"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ formatador = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
+ type = "gem";
+ };
+ version = "0.2.5";
+ };
+ forwardable-extended = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v";
+ type = "gem";
+ };
+ version = "2.6.0";
+ };
+ fourflusher = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1afabh3g3gwj0ad53fs62waks815xcckf7pkci76l6vrghffcg8v";
+ type = "gem";
+ };
+ version = "2.3.1";
+ };
+ fuzzy_match = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19gw1ifsgfrv7xdi6n61658vffgm1867f4xdqfswb2b5h6alzpmm";
+ type = "gem";
+ };
+ version = "2.0.4";
+ };
+ gdk_pixbuf2 = {
+ dependencies = ["gio2"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bvw0xlq0nrvzv559d3kbihc8m3iv3q70cs6xan0n6dywxayizbf";
+ type = "gem";
+ };
+ version = "3.3.7";
+ };
+ gh_inspector = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04";
+ type = "gem";
+ };
+ version = "1.1.3";
+ };
+ gio2 = {
+ dependencies = ["gobject-introspection"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1cv617ad4bhd3qhi5m0638v0mf9kw32g7r89c754xsmmas921igc";
+ type = "gem";
+ };
+ version = "3.3.7";
+ };
+ gitlab-markup = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d";
+ type = "gem";
+ };
+ version = "1.7.0";
+ };
+ glib2 = {
+ dependencies = ["native-package-installer" "pkg-config"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08cqwk8valxv4bls891f3ciqa258vbsfgqd3mymf62qdld8m9y3z";
+ type = "gem";
+ };
+ version = "3.3.7";
+ };
+ globalid = {
+ dependencies = ["activesupport"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1";
+ type = "gem";
+ };
+ version = "0.4.2";
+ };
+ gobject-introspection = {
+ dependencies = ["glib2"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14kcf8079wmimzy78yysizsl44d6iaw2pp5xj70vdxg342r4a6k5";
+ type = "gem";
+ };
+ version = "3.3.7";
+ };
+ gpgme = {
+ dependencies = ["mini_portile2"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m";
+ type = "gem";
+ };
+ version = "2.0.18";
+ };
+ gtk2 = {
+ dependencies = ["atk" "gdk_pixbuf2" "pango"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0hgb555j5pimy8pjpf20pzbmhpr1wx59phlwbwsq37zjv89wirva";
+ type = "gem";
+ };
+ version = "3.3.7";
+ };
+ hashie = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13bdzfp25c8k51ayzxqkbzag3wj5gc1jd8h7d985nsq6pn57g5xh";
+ type = "gem";
+ };
+ version = "3.6.0";
+ };
+ highline = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1g0zpalfj8wvca86hcnirir5py2zyqrhkgdgv9f87fxkjaw815wr";
+ type = "gem";
+ };
+ version = "2.0.2";
+ };
+ hike = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0hbhmchyhm1xf632cczmyg3fsbn7zly988q3fjpi8l3nb4cn40xj";
+ type = "gem";
+ };
+ version = "2.1.3";
+ };
+ hitimes = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1w2lkanmw9was9v6b90vhi23rigdq9nc1brrsdvxczxd3c39b36x";
+ type = "gem";
+ };
+ version = "1.3.1";
+ };
+ hpricot = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1jn8x9ch79gqmnzgyz78kppavjh5lqx0y0r6frykga2b86rz9s6z";
+ type = "gem";
+ };
+ version = "0.8.6";
+ };
+ http-accept = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09m1facypsdjynfwrcv19xcb1mqg8z6kk31g8r33pfxzh838c9n6";
+ type = "gem";
+ };
+ version = "1.7.0";
+ };
+ http-cookie = {
+ dependencies = ["domain_name"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
+ "http_parser.rb" = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
+ type = "gem";
+ };
+ version = "0.6.0";
+ };
+ httpclient = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
+ type = "gem";
+ };
+ version = "2.8.3";
+ };
+ i18n = {
+ dependencies = ["concurrent-ruby"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3";
+ type = "gem";
+ };
+ version = "0.9.5";
+ };
+ iconv = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00fppiz9ypy7xpc08xdk6glq842rbc69c7a1p0kmv195271i4yqv";
+ type = "gem";
+ };
+ version = "1.0.8";
+ };
+ idn-ruby = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+ jaro_winkler = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf";
+ type = "gem";
+ };
+ version = "1.5.3";
+ };
+ jbuilder = {
+ dependencies = ["activesupport"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03adzsc2hfd0lvprm45s52bkxpnpnw8r9prcx8zx1aw2a8lzp9r7";
+ type = "gem";
+ };
+ version = "2.9.1";
+ };
+ jekyll = {
+ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fpckw5nf4hfr5vhhdlmaxxp5lkdmc1vyqnmijwvy9fmjn4c87aa";
+ type = "gem";
+ };
+ version = "4.0.0";
+ };
+ jekyll-sass-converter = {
+ dependencies = ["sassc"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fbc25p8vqyzmg8wpmgacqjkk3jhrr6kz9y45m43ygck74h2cad2";
+ type = "gem";
+ };
+ version = "2.0.0";
+ };
+ jekyll-watch = {
+ dependencies = ["listen"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1qd7hy1kl87fl7l0frw5qbn22x7ayfzlv9a5ca1m59g0ym1ysi5w";
+ type = "gem";
+ };
+ version = "2.2.1";
+ };
+ jmespath = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ json = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
+ type = "gem";
+ };
+ version = "2.2.0";
+ };
+ jwt = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01zg1vp3lyl3flyjdkrcc93ghf833qgfgh2p1biqfhkzz11r129c";
+ type = "gem";
+ };
+ version = "2.2.1";
+ };
+ kramdown = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688";
+ type = "gem";
+ };
+ version = "2.1.0";
+ };
+ kramdown-parser-gfm = {
+ dependencies = ["kramdown"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ libv8 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0271i5sfma05gvhmrmxqb0jj667bl6m54yd49ay6yrdbh1g4wpl1";
+ type = "gem";
+ };
+ version = "3.16.14.19";
+ };
+ libxml-ruby = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1r7m7zipkpam8ns4ys4qyh7yj3is3dy7ky6qwnw557pvpgx0aqrd";
+ type = "gem";
+ };
+ version = "3.1.0";
+ };
+ liquid = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by";
+ type = "gem";
+ };
+ version = "4.0.3";
+ };
+ listen = {
+ dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx";
+ type = "gem";
+ };
+ version = "3.1.5";
+ };
+ loofah = {
+ dependencies = ["crass" "nokogiri"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg";
+ type = "gem";
+ };
+ version = "2.2.3";
+ };
+ mab = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0manxbilpx0hdi19lhdsr4ncvbzgmwh279b64j8w60dg0p0i4b4j";
+ type = "gem";
+ };
+ version = "0.0.3";
+ };
+ magic = {
+ dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18vkdq2748wxg0kr923fbhx92wikh2dwv2hp8xind57qs7gn26pr";
+ type = "gem";
+ };
+ version = "0.2.9";
+ };
+ mail = {
+ dependencies = ["mini_mime"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc";
+ type = "gem";
+ };
+ version = "2.7.1";
+ };
+ markaby = {
+ dependencies = ["builder"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1j4jc31ycydbkh5h3q6zwidzpavg3g5mbb5lqyaczd3jrq78rd7i";
+ type = "gem";
+ };
+ version = "0.9.0";
+ };
+ mercenary = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a";
+ type = "gem";
+ };
+ version = "0.3.6";
+ };
+ method_source = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
+ type = "gem";
+ };
+ version = "0.9.2";
+ };
+ mime-types = {
+ dependencies = ["mime-types-data"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
+ type = "gem";
+ };
+ version = "3.2.2";
+ };
+ mime-types-data = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
+ type = "gem";
+ };
+ version = "3.2019.0331";
+ };
+ mini_magick = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4";
+ type = "gem";
+ };
+ version = "4.9.5";
+ };
+ mini_mime = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
+ type = "gem";
+ };
+ version = "1.0.2";
+ };
+ mini_portile2 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
+ type = "gem";
+ };
+ version = "2.4.0";
+ };
+ minitest = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+ type = "gem";
+ };
+ version = "5.11.3";
+ };
+ molinillo = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hh40z1adl4lw16dj4hxgabx4rr28mgqycih1y1d91bwww0jjdg6";
+ type = "gem";
+ };
+ version = "0.6.6";
+ };
+ msgpack = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1";
+ type = "gem";
+ };
+ version = "1.3.1";
+ };
+ multi_json = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
+ type = "gem";
+ };
+ version = "1.13.1";
+ };
+ multipart-post = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
+ type = "gem";
+ };
+ version = "2.1.1";
+ };
+ mysql2 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1a2kdjgzwh1p2rkcmxaawy6ibi32b04wbdd5d4wr8i342pq76di4";
+ type = "gem";
+ };
+ version = "0.5.2";
+ };
+ nanaimo = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ajfyaqjw3dzykk612yw8sm21savfqy292hgps8h8l4lvxww1lz6";
+ type = "gem";
+ };
+ version = "0.2.6";
+ };
+ nap = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xm5xssxk5s03wjarpipfm39qmgxsalb46v1prsis14x1xk935ll";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ native-package-installer = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03qrzhk807f98bdwy6c37acksyb5fnairdz4jpl7y3fifh7k7yfn";
+ type = "gem";
+ };
+ version = "1.0.7";
+ };
+ ncursesw = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1nc14wls1yiigz593vw7580hb99lf4n485axapiz6sqpg1jnlhcr";
+ type = "gem";
+ };
+ version = "1.4.10";
+ };
+ net-scp = {
+ dependencies = ["net-ssh"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nkf3my587f0izqw0dl3zl24c3lnrw9y5xrq9vb0lhgymmgcav9g";
+ type = "gem";
+ };
+ version = "2.0.0";
+ };
+ net-ssh = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40";
+ type = "gem";
+ };
+ version = "5.2.0";
+ };
+ netrc = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
+ type = "gem";
+ };
+ version = "0.11.0";
+ };
+ nio4r = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bi1r1xvlxpkghvmk1js88djlw7vi4ky6ildk8akn73hkf5phd2j";
+ type = "gem";
+ };
+ version = "2.5.1";
+ };
+ nokogiri = {
+ dependencies = ["mini_portile2"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
+ type = "gem";
+ };
+ version = "1.10.4";
+ };
+ opus-ruby = {
+ dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lyf2a8f1w1jk0qrl8h0gsydfalbh19g5k2c6xlq8j1sfzb0ij4d";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ osx_keychain = {
+ dependencies = ["RubyInline"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10hr3lihq7s5fv18dp0g4mfncvapkcwcd6xnn5483ximyd7rhfx0";
+ type = "gem";
+ };
+ version = "1.0.2";
+ };
+ ovirt-engine-sdk = {
+ dependencies = ["json"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09lb0a9y4q7946jaf53li1v4cb6ksfb5bq5wb15yn8ja6wf9n427";
+ type = "gem";
+ };
+ version = "4.3.0";
+ };
+ pango = {
+ dependencies = ["cairo-gobject" "gobject-introspection"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03jdjphc5vk9a9rgvkfhz78dfyxi67a20c12h6pcd22r5xq8hzj0";
+ type = "gem";
+ };
+ version = "3.3.7";
+ };
+ parallel = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r";
+ type = "gem";
+ };
+ version = "1.17.0";
+ };
+ parser = {
+ dependencies = ["ast"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1s1plz33jjd0wm0vlspl5hg1rcg772zm5ibbix9binpd03jrbb8c";
+ type = "gem";
+ };
+ version = "2.6.4.0";
+ };
+ pathutil = {
+ dependencies = ["forwardable-extended"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12fm93ljw9fbxmv2krki5k5wkvr7560qy8p4spvb9jiiaqv78fz4";
+ type = "gem";
+ };
+ version = "0.16.2";
+ };
+ patron = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0523gddx88zql2mq6655k60gy2ac8vybpzkcf90lmd9nx7wl3fi9";
+ type = "gem";
+ };
+ version = "0.13.3";
+ };
+ pcaprub = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0h4iarqdych6v4jm5s0ywkc01qspadz8sf6qn7pkqmszq4iqv67q";
+ type = "gem";
+ };
+ version = "0.13.0";
+ };
+ pg = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
+ type = "gem";
+ };
+ version = "1.1.4";
+ };
+ pkg-config = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1mvs1hs8ry3s4fh8sd94zhpn2pdasdqwpf5nylgxnp8x3xa2dmnd";
+ type = "gem";
+ };
+ version = "1.3.8";
+ };
+ polyglot = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
+ type = "gem";
+ };
+ version = "0.3.5";
+ };
+ pry = {
+ dependencies = ["coderay" "method_source"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69";
+ type = "gem";
+ };
+ version = "0.12.2";
+ };
+ pry-byebug = {
+ dependencies = ["byebug" "pry"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1aqz4gz8z44k6svpvcsfrqbigcpjd2kwvfm77yq3v8yzkhjrx0zi";
+ type = "gem";
+ };
+ version = "3.7.0";
+ };
+ pry-doc = {
+ dependencies = ["pry" "yard"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14lwb5dxfibcqbjygzvnf8ry0mayx48fk20qhg06214sll0sp0kv";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ public_suffix = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
+ type = "gem";
+ };
+ version = "4.0.1";
+ };
+ puma = {
+ dependencies = ["nio4r"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1d8hnqdr2acrlw5rp1wlyz1lwarfc6my5h9m5a7b3259zc4y9f5q";
+ type = "gem";
+ };
+ version = "4.1.0";
+ };
+ rack = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
+ type = "gem";
+ };
+ version = "1.6.11";
+ };
+ rack-protection = {
+ dependencies = ["rack"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss";
+ type = "gem";
+ };
+ version = "1.5.5";
+ };
+ rack-test = {
+ dependencies = ["rack"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
+ type = "gem";
+ };
+ version = "0.6.3";
+ };
+ rails = {
+ dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ywvis59dd3v8qapi9ix6743zgk07l21x1cd6nb1ddpahxhm7dml";
+ type = "gem";
+ };
+ version = "4.2.11.1";
+ };
+ rails-deprecated_sanitizer = {
+ dependencies = ["activesupport"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
+ rails-dom-testing = {
+ dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6";
+ type = "gem";
+ };
+ version = "1.0.9";
+ };
+ rails-html-sanitizer = {
+ dependencies = ["loofah"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ railties = {
+ dependencies = ["actionpack" "activesupport" "rake" "thor"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bjf21z9maiiazc1if56nnh9xmgbkcqlpznv34f40a1hsvgk1d1m";
+ type = "gem";
+ };
+ version = "4.2.11.1";
+ };
+ rainbow = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
+ type = "gem";
+ };
+ version = "3.0.0";
+ };
+ rake = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b";
+ type = "gem";
+ };
+ version = "10.5.0";
+ };
+ rb-fsevent = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
+ type = "gem";
+ };
+ version = "0.10.3";
+ };
+ rb-inotify = {
+ dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4";
+ type = "gem";
+ };
+ version = "0.10.0";
+ };
+ rb-readline = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14w79a121czmvk1s953qfzww30mqjb2zc0k9qhi0ivxxk3hxg6wy";
+ type = "gem";
+ };
+ version = "0.5.5";
+ };
+ rbnacl = {
+ dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1s559dxhwmd42n5va4m7h3v04s57a3nm8ff7p5g7hz030kiswyrc";
+ type = "gem";
+ };
+ version = "7.0.0";
+ };
+ re2 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00wf9k1hkv3z3nfkrnfyyfq9ah0l7k14awqys3h2hqz4c21pqd2i";
+ type = "gem";
+ };
+ version = "1.1.1";
+ };
+ redcarpet = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k";
+ type = "gem";
+ };
+ version = "3.5.0";
+ };
+ redis = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1mymdx7s5sr4mablklaipz679ckczsiigswm1g2v5mc93yj5amw3";
+ type = "gem";
+ };
+ version = "4.1.2";
+ };
+ redis-rack = {
+ dependencies = ["rack" "redis-store"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03xgdmq4fh187aqlh8z05idbxrmgddcarlb8x1kw4wjfcsf5afqi";
+ type = "gem";
+ };
+ version = "2.0.5";
+ };
+ redis-store = {
+ dependencies = ["redis"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1mrcnjgkbmx1zf569mly82agdizqayjvnp2k6055k1iy07in3j8b";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ ref = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04p4pq4sikly7pvn30dc7v5x2m7fqbfwijci4z1y6a1ilwxzrjii";
+ type = "gem";
+ };
+ version = "2.0.0";
+ };
+ rest-client = {
+ dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1qs74yzl58agzx9dgjhcpgmzfn61fqkk33k1js2y5yhlvc5l19im";
+ type = "gem";
+ };
+ version = "2.1.0";
+ };
+ rmagick = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "06ya2zpz2g3g4c90bmd1z11qkajls3srq5b7cswrjq8ima568ja0";
+ type = "gem";
+ };
+ version = "4.0.0";
+ };
+ rouge = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "07j29vbgsi9v7kpx4lqpmh0hx59i420jig73dy46wx3id1i7vdqz";
+ type = "gem";
+ };
+ version = "3.10.0";
+ };
+ rpam2 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zvli3s4z1hf2l7gyfickm5i3afjrnycc3ihbiax6ji6arpbyf33";
+ type = "gem";
+ };
+ version = "4.0.2";
+ };
+ rspec = {
+ dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3";
+ type = "gem";
+ };
+ version = "3.8.0";
+ };
+ rspec-core = {
+ dependencies = ["rspec-support"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0spjgmd3yx6q28q950r32bi0cs8h2si53zn6rq8s7n1i4zp4zwbf";
+ type = "gem";
+ };
+ version = "3.8.2";
+ };
+ rspec-expectations = {
+ dependencies = ["diff-lcs" "rspec-support"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0x3iddjjaramqb0yb51c79p2qajgi9wb5b59bzv25czddigyk49r";
+ type = "gem";
+ };
+ version = "3.8.4";
+ };
+ rspec-mocks = {
+ dependencies = ["diff-lcs" "rspec-support"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12zplnsv4p6wvvxsk8xn6nm87a5qadxlkk497zlxfczd0jfawrni";
+ type = "gem";
+ };
+ version = "3.8.1";
+ };
+ rspec-support = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "139mbhfdr10flm2ffryvxkyqgqs1gjdclc1xhyh7i7njfqayxk7g";
+ type = "gem";
+ };
+ version = "3.8.2";
+ };
+ rubocop = {
+ dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wpyass9qb2wvq8zsc7wdzix5xy2ldiv66wnx8mwwprz2dcvzayk";
+ type = "gem";
+ };
+ version = "0.74.0";
+ };
+ rubocop-performance = {
+ dependencies = ["rubocop"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ssizdnyai2hxdp6nd4b9hqyrc4gwhjlznhrdliz8wj4p8cvas44";
+ type = "gem";
+ };
+ version = "1.4.1";
+ };
+ ruby-graphviz = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1jzbs0jhaz77azsc30gsfg89fy44vsr565jcj4axhc65n1fmhs90";
+ type = "gem";
+ };
+ version = "1.2.4";
+ };
+ ruby-libvirt = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0d754d6pgdqyq52pl9hp0x38q1vn3vf9nz4nm5gqdj5i4fw7pba6";
+ type = "gem";
+ };
+ version = "0.7.1";
+ };
+ ruby-lxc = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08pnghqp15fwylq6w2qh7x1ikkiq87irpy0z03n0gma4gdzzx2qa";
+ type = "gem";
+ };
+ version = "1.2.3";
+ };
+ ruby-macho = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lhdjn91jkifsy2hzq2hgcm0pp8pbik87m58zmw1ifh6hkp9adjb";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ ruby-progressbar = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
+ type = "gem";
+ };
+ version = "1.10.1";
+ };
+ ruby-terminfo = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rl4ic5pzvrpgd42z0c1s2n3j39c9znksblxxvmhkzrc0ckyg2cm";
+ type = "gem";
+ };
+ version = "0.1.1";
+ };
+ ruby-vips = {
+ dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12sd0ci3zayrzv1xd5qwa3p9z06ga4xzigpqyk3w52x5acngkld3";
+ type = "gem";
+ };
+ version = "2.0.14";
+ };
+ ruby_dep = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ RubyInline = {
+ dependencies = ["ZenTest"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1q0384afhxcbm6yz74hzk0ypzf1ahgg1w94pnkhmag9dq0abqnr0";
+ type = "gem";
+ };
+ version = "3.12.4";
+ };
+ rubyzip = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
+ type = "gem";
+ };
+ version = "1.2.3";
+ };
+ rugged = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6";
+ type = "gem";
+ };
+ version = "0.28.3.1";
+ };
+ safe_yaml = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56";
+ type = "gem";
+ };
+ version = "1.0.5";
+ };
+ sassc = {
+ dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "178iflma5z4qk2lfzlxk8kh942skj45q6v6xwllkqng9xbjlyzkf";
+ type = "gem";
+ };
+ version = "2.2.0";
+ };
+ scrypt = {
+ dependencies = ["ffi-compiler"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ggwynnlgr3a4l5h4zg2w4xyfvqh86nsvmgxicxkc40igyrwqz73";
+ type = "gem";
+ };
+ version = "3.0.6";
+ };
+ semian = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1w4qv3mcz005lb3wrh55imh6551lhf0qpslb3xw3b6chf746s0rj";
+ type = "gem";
+ };
+ version = "0.8.9";
+ };
+ sequel = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1r920jps2mpvz5ww9rzs3svprfjxz0vsy6dsa1cinsk3qizqbq7a";
+ type = "gem";
+ };
+ version = "5.24.0";
+ };
+ sequel_pg = {
+ dependencies = ["pg" "sequel"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1y010rfdgpkw1yspqchjqdp7n8yahscyw98g3l2pw56nzbqipjb8";
+ type = "gem";
+ };
+ version = "1.12.2";
+ };
+ simplecov = {
+ dependencies = ["docile" "json" "simplecov-html"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0dq0nkaxvbsnl70hkimy35g4yjfs3blx4s7nbpzbvgqx72hxgv5v";
+ type = "gem";
+ };
+ version = "0.17.0";
+ };
+ simplecov-html = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn";
+ type = "gem";
+ };
+ version = "0.10.2";
+ };
+ sinatra = {
+ dependencies = ["rack" "rack-protection" "tilt"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
+ type = "gem";
+ };
+ version = "1.4.8";
+ };
+ slather = {
+ dependencies = ["CFPropertyList" "activesupport" "clamp" "nokogiri" "xcodeproj"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0v4wll10mwmynj2v2g71kgr1psck3qglhz2mnrw2n281v30jxyyn";
+ type = "gem";
+ };
+ version = "2.4.7";
+ };
+ slop = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0hv64fpbdwyswqhnq8bia66vlsz72yjqm00lvlhh4dnjjivdjcy5";
+ type = "gem";
+ };
+ version = "4.7.0";
+ };
+ snappy = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00zzs25sm78zs3rifc02z54cp3f03r9dq5ilzykyq1ykvbv65vw4";
+ type = "gem";
+ };
+ version = "0.0.17";
+ };
+ sprockets = {
+ dependencies = ["concurrent-ruby" "rack"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay";
+ type = "gem";
+ };
+ version = "3.7.2";
+ };
+ sprockets-rails = {
+ dependencies = ["actionpack" "activesupport" "sprockets"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1";
+ type = "gem";
+ };
+ version = "3.2.1";
+ };
+ sqlite3 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1v903nbcws3ifm6jnxrdfcpgl1qg2x3lbif16mhlbyfn0npzb494";
+ type = "gem";
+ };
+ version = "1.4.1";
+ };
+ taglib-ruby = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0r8g7zdncc6243d000jn0grc1n70rn9mx16vggy3q7c4wgsa37xi";
+ type = "gem";
+ };
+ version = "0.7.1";
+ };
+ terminal-table = {
+ dependencies = ["unicode-display_width"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
+ type = "gem";
+ };
+ version = "1.8.0";
+ };
+ therubyracer = {
+ dependencies = ["libv8" "ref"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1g95bzs2axjglyjyj6xvsywqgr80bnzlkw7mddxx1fdrak5wni2q";
+ type = "gem";
+ };
+ version = "0.12.3";
+ };
+ thor = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
+ type = "gem";
+ };
+ version = "0.20.3";
+ };
+ thread_safe = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
+ type = "gem";
+ };
+ version = "0.3.6";
+ };
+ thrift = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv";
+ type = "gem";
+ };
+ version = "0.11.0.0";
+ };
+ tilt = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
+ type = "gem";
+ };
+ version = "2.0.9";
+ };
+ tiny_tds = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0z2n1qwad86zkcmmq883bw8rgidjsqjphrbqf1mwyfi5y22jhxfp";
+ type = "gem";
+ };
+ version = "2.1.2";
+ };
+ treetop = {
+ dependencies = ["polyglot"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";
+ type = "gem";
+ };
+ version = "1.6.10";
+ };
+ typhoeus = {
+ dependencies = ["ethon"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5";
+ type = "gem";
+ };
+ version = "1.3.1";
+ };
+ tzinfo = {
+ dependencies = ["thread_safe"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
+ type = "gem";
+ };
+ version = "1.2.5";
+ };
+ unf = {
+ dependencies = ["unf_ext"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+ type = "gem";
+ };
+ version = "0.1.4";
+ };
+ unf_ext = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf";
+ type = "gem";
+ };
+ version = "0.0.7.6";
+ };
+ unicode-display_width = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ uuid4r = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qlcxzn8pnql34pcdrkd20kdla3k6n2sspaxp3lwwx8a87jnzbc3";
+ type = "gem";
+ };
+ version = "0.2.0";
+ };
+ whois = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12dlqsynscin7f0wrhkya505s22i92w9n8padjvjbhylrnja7rwx";
+ type = "gem";
+ };
+ version = "4.1.0";
+ };
+ xcodeproj = {
+ dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "162gwhrl7ppj6hlmnpp1scvy1ylcv5xqk51826v075sckdqjp8c8";
+ type = "gem";
+ };
+ version = "1.12.0";
+ };
+ xctasks = {
+ dependencies = ["nokogiri" "rake"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1m01vnmdy9m4hn85ajji5v595faqsy8d3a0r646q79vphw1fikj1";
+ type = "gem";
+ };
+ version = "0.6.0";
+ };
+ yard = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rxqwry3h2hjz069f0kfr140wgx1khgljnqf112dk5x9rm4l0xny";
+ type = "gem";
+ };
+ version = "0.9.20";
+ };
+ ZenTest = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1h76ym6cx9b3an8hf1n5w85d1sj3anbvcs99vqw51vbamx84fyld";
+ type = "gem";
+ };
+ version = "4.11.2";
+ };
+ zookeeper = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1blww00r5za6vl46psaldxpllsxll78ms8rrs6qfwb1iaa8rla2d";
+ type = "gem";
+ };
+ version = "1.4.11";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 9f4b63293ef6..4fe067694dcd 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -169,9 +169,9 @@ let
then "localSystem" else "crossSystem"} = {
parsed = stdenv.hostPlatform.parsed // {
abi = {
- "gnu" = lib.systems.parse.abis.musl;
- "gnueabi" = lib.systems.parse.abis.musleabi;
- "gnueabihf" = lib.systems.parse.abis.musleabihf;
+ gnu = lib.systems.parse.abis.musl;
+ gnueabi = lib.systems.parse.abis.musleabi;
+ gnueabihf = lib.systems.parse.abis.musleabihf;
}.${stdenv.hostPlatform.parsed.abi.name}
or lib.systems.parse.abis.musl;
};
@@ -217,9 +217,9 @@ let
crossSystem = {
parsed = stdenv.hostPlatform.parsed // {
abi = {
- "gnu" = lib.systems.parse.abis.musl;
- "gnueabi" = lib.systems.parse.abis.musleabi;
- "gnueabihf" = lib.systems.parse.abis.musleabihf;
+ gnu = lib.systems.parse.abis.musl;
+ gnueabi = lib.systems.parse.abis.musleabi;
+ gnueabihf = lib.systems.parse.abis.musleabihf;
}.${stdenv.hostPlatform.parsed.abi.name}
or lib.systems.parse.abis.musl;
};