Merge remote-tracking branch 'origin/master' into staging
This commit is contained in:
Shea Levy
commit
05e375d710
2
.gitattributes
vendored
2
.gitattributes
vendored
|
|
@ -13,4 +13,4 @@ nixos/doc/** linguist-documentation
|
|||
nixos/doc/default.nix linguist-documentation=false
|
||||
|
||||
nixos/modules/module-list.nix merge=union
|
||||
pkgs/top-level/all-packages.nix merge=union
|
||||
# pkgs/top-level/all-packages.nix merge=union
|
||||
|
|
|
|||
6
doc/.gitignore
vendored
Normal file
6
doc/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
*.chapter.xml
|
||||
*.section.xml
|
||||
.version
|
||||
out
|
||||
manual-full.xml
|
||||
highlightjs
|
||||
96
doc/Makefile
Normal file
96
doc/Makefile
Normal file
|
|
@ -0,0 +1,96 @@
|
|||
MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md)))
|
||||
|
||||
.PHONY: all
|
||||
all: validate out/html/index.html out/epub/manual.epub
|
||||
|
||||
.PHONY: debug
|
||||
debug:
|
||||
nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml"
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f ${MD_TARGETS} .version manual-full.xml
|
||||
rm -rf ./out/ ./highlightjs
|
||||
|
||||
.PHONY: validate
|
||||
validate: manual-full.xml
|
||||
jing "$$RNG" manual-full.xml
|
||||
|
||||
out/html/index.html: manual-full.xml style.css highlightjs
|
||||
mkdir -p out/html
|
||||
xsltproc ${xsltFlags} \
|
||||
--nonet --xinclude \
|
||||
--output $@ \
|
||||
"$$XSL/docbook/xhtml/docbook.xsl" \
|
||||
./manual-full.xml
|
||||
|
||||
mkdir -p out/html/highlightjs/
|
||||
echo "document.onreadystatechange = function () { \
|
||||
var listings = document.querySelectorAll('.programlisting, .screen'); \
|
||||
for (i = 0; i < listings.length; ++i) { \
|
||||
hljs.highlightBlock(listings[i]); \
|
||||
} \
|
||||
} " > out/html/highlightjs/loader.js
|
||||
|
||||
cp -r highlightjs out/html/
|
||||
|
||||
cp ./overrides.css out/html/
|
||||
cp ./style.css out/html/style.css
|
||||
|
||||
mkdir -p out/html/images/callouts
|
||||
cp "$$XSL/docbook/images/callouts/"*.svg out/html/images/callouts/
|
||||
chmod u+w -R out/html/
|
||||
|
||||
out/epub/manual.epub: manual-full.xml
|
||||
mkdir -p out/epub/scratch
|
||||
xsltproc ${xsltFlags} --nonet \
|
||||
--output out/epub/scratch/ \
|
||||
"$$XSL/docbook/epub/docbook.xsl" \
|
||||
./manual-full.xml
|
||||
|
||||
cp ./overrides.css out/epub/scratch/OEBPS
|
||||
cp ./style.css out/epub/scratch/OEBPS
|
||||
mkdir -p out/epub/scratch/OEBPS/images/callouts/
|
||||
cp "$$XSL/docbook/images/callouts/"*.svg out/epub/scratch/OEBPS/images/callouts/
|
||||
echo "application/epub+zip" > mimetype
|
||||
zip -0Xq "out/epub/manual.epub" mimetype
|
||||
rm mimetype
|
||||
cd "out/epub/scratch/" && zip -Xr9D "../manual.epub" *
|
||||
rm -rf "out/epub/scratch/"
|
||||
|
||||
highlightjs:
|
||||
mkdir -p highlightjs
|
||||
cp -r "$$HIGHLIGHTJS/highlight.pack.js" highlightjs/
|
||||
cp -r "$$HIGHLIGHTJS/LICENSE" highlightjs/
|
||||
cp -r "$$HIGHLIGHTJS/mono-blue.css" highlightjs/
|
||||
|
||||
|
||||
manual-full.xml: ${MD_TARGETS} .version *.xml
|
||||
xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
|
||||
|
||||
.version:
|
||||
nix-instantiate --eval \
|
||||
-E '(import ../lib).nixpkgsVersion' > .version
|
||||
|
||||
%.section.xml: %.section.md
|
||||
pandoc $^ -w docbook+smart \
|
||||
-f markdown+smart \
|
||||
| sed -e 's|<ulink url=|<link xlink:href=|' \
|
||||
-e 's|</ulink>|</link>|' \
|
||||
-e 's|<sect. id=|<section xml:id=|' \
|
||||
-e 's|</sect[0-9]>|</section>|' \
|
||||
-e '1s| id=| xml:id=|' \
|
||||
-e '1s|\(<[^ ]* \)|\1xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" |' \
|
||||
| cat > $@
|
||||
|
||||
%.chapter.xml: %.chapter.md
|
||||
pandoc $^ -w docbook+smart \
|
||||
--top-level-division=chapter \
|
||||
-f markdown+smart \
|
||||
| sed -e 's|<ulink url=|<link xlink:href=|' \
|
||||
-e 's|</ulink>|</link>|' \
|
||||
-e 's|<sect. id=|<section xml:id=|' \
|
||||
-e 's|</sect[0-9]>|</section>|' \
|
||||
-e '1s| id=| xml:id=|' \
|
||||
-e '1s|\(<[^ ]* \)|\1|' \
|
||||
| cat > $@
|
||||
|
|
@ -6,12 +6,27 @@
|
|||
|
||||
<para>The DocBook sources of the Nixpkgs manual are in the <filename
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename>
|
||||
subdirectory of the Nixpkgs repository. If you make modifications to
|
||||
the manual, it's important to build it before committing. You can do that as follows:
|
||||
subdirectory of the Nixpkgs repository.</para>
|
||||
|
||||
<para>You can quickly check your edits with <command>make</command>:</para>
|
||||
|
||||
<screen>
|
||||
$ cd /path/to/nixpkgs
|
||||
$ nix-build doc
|
||||
$ cd /path/to/nixpkgs/doc
|
||||
$ nix-shell
|
||||
[nix-shell]$ make
|
||||
</screen>
|
||||
|
||||
<para>If you experience problems, run <command>make debug</command>
|
||||
to help understand the docbook errors.</para>
|
||||
|
||||
<para>After making modifications to the manual, it's important to
|
||||
build it before committing. You can do that as follows:
|
||||
|
||||
<screen>
|
||||
$ cd /path/to/nixpkgs/doc
|
||||
$ nix-shell
|
||||
[nix-shell]$ make clean
|
||||
[nix-shell]$ nix-build .
|
||||
</screen>
|
||||
|
||||
If the build succeeds, the manual will be in
|
||||
|
|
|
|||
135
doc/default.nix
135
doc/default.nix
|
|
@ -7,116 +7,41 @@ in
|
|||
pkgs.stdenv.mkDerivation {
|
||||
name = "nixpkgs-manual";
|
||||
|
||||
buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing ];
|
||||
|
||||
buildInputs = with pkgs; [ pandoc libxml2 libxslt zip ];
|
||||
src = ./.;
|
||||
|
||||
xsltFlags = ''
|
||||
--param section.autolabel 1
|
||||
--param section.label.includes.component.label 1
|
||||
--param html.stylesheet 'style.css'
|
||||
--param xref.with.number.and.title 1
|
||||
--param toc.section.depth 3
|
||||
--param admon.style '''
|
||||
--param callout.graphics.extension '.gif'
|
||||
# Hacking on these variables? Make sure to close and open
|
||||
# nix-shell between each test, maybe even:
|
||||
# $ nix-shell --run "make clean all"
|
||||
# otherwise they won't reapply :)
|
||||
HIGHLIGHTJS = pkgs.documentation-highlighter;
|
||||
XSL = "${pkgs.docbook5_xsl}/xml/xsl";
|
||||
RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng";
|
||||
xsltFlags = lib.concatStringsSep " " [
|
||||
"--param section.autolabel 1"
|
||||
"--param section.label.includes.component.label 1"
|
||||
"--stringparam html.stylesheet 'style.css overrides.css highlightjs/mono-blue.css'"
|
||||
"--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'"
|
||||
"--param xref.with.number.and.title 1"
|
||||
"--param toc.section.depth 3"
|
||||
"--stringparam admon.style ''"
|
||||
"--stringparam callout.graphics.extension .svg"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
echo ${lib.nixpkgsVersion} > .version
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
dest="$out/share/doc/nixpkgs"
|
||||
mkdir -p "$(dirname "$dest")"
|
||||
mv out/html "$dest"
|
||||
mv "$dest/index.html" "$dest/manual.html"
|
||||
|
||||
buildCommand = let toDocbook = { useChapters ? false, inputFile, outputFile }:
|
||||
let
|
||||
extraHeader = lib.optionalString (!useChapters)
|
||||
''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" '';
|
||||
in ''
|
||||
{
|
||||
pandoc '${inputFile}' -w docbook+smart ${lib.optionalString useChapters "--top-level-division=chapter"} \
|
||||
-f markdown+smart \
|
||||
| sed -e 's|<ulink url=|<link xlink:href=|' \
|
||||
-e 's|</ulink>|</link>|' \
|
||||
-e 's|<sect. id=|<section xml:id=|' \
|
||||
-e 's|</sect[0-9]>|</section>|' \
|
||||
-e '1s| id=| xml:id=|' \
|
||||
-e '1s|\(<[^ ]* \)|\1${extraHeader}|'
|
||||
} > '${outputFile}'
|
||||
'';
|
||||
in
|
||||
mv out/epub/manual.epub "$dest/nixpkgs-manual.epub"
|
||||
|
||||
''
|
||||
ln -s '${sources}/'*.xml .
|
||||
mkdir ./languages-frameworks
|
||||
cp -s '${sources-langs}'/* ./languages-frameworks
|
||||
''
|
||||
+ toDocbook {
|
||||
inputFile = ./introduction.md;
|
||||
outputFile = "introduction.xml";
|
||||
useChapters = true;
|
||||
}
|
||||
+ toDocbook {
|
||||
inputFile = ./shell.md;
|
||||
outputFile = "shell.xml";
|
||||
}
|
||||
+ toDocbook {
|
||||
inputFile = ./languages-frameworks/python.md;
|
||||
outputFile = "./languages-frameworks/python.xml";
|
||||
}
|
||||
+ toDocbook {
|
||||
inputFile = ./languages-frameworks/haskell.md;
|
||||
outputFile = "./languages-frameworks/haskell.xml";
|
||||
}
|
||||
+ toDocbook {
|
||||
inputFile = ../pkgs/development/idris-modules/README.md;
|
||||
outputFile = "languages-frameworks/idris.xml";
|
||||
}
|
||||
+ toDocbook {
|
||||
inputFile = ../pkgs/development/node-packages/README.md;
|
||||
outputFile = "languages-frameworks/node.xml";
|
||||
}
|
||||
+ toDocbook {
|
||||
inputFile = ../pkgs/development/r-modules/README.md;
|
||||
outputFile = "languages-frameworks/r.xml";
|
||||
}
|
||||
+ toDocbook {
|
||||
inputFile = ./languages-frameworks/rust.md;
|
||||
outputFile = "./languages-frameworks/rust.xml";
|
||||
}
|
||||
+ toDocbook {
|
||||
inputFile = ./languages-frameworks/vim.md;
|
||||
outputFile = "./languages-frameworks/vim.xml";
|
||||
}
|
||||
+ toDocbook {
|
||||
inputFile = ./languages-frameworks/emscripten.md;
|
||||
outputFile = "./languages-frameworks/emscripten.xml";
|
||||
}
|
||||
+ ''
|
||||
echo ${lib.nixpkgsVersion} > .version
|
||||
|
||||
# validate against relaxng schema
|
||||
xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
|
||||
${pkgs.jing}/bin/jing ${pkgs.docbook5}/xml/rng/docbook/docbook.rng manual-full.xml
|
||||
|
||||
dst=$out/share/doc/nixpkgs
|
||||
mkdir -p $dst
|
||||
xsltproc $xsltFlags --nonet --xinclude \
|
||||
--output $dst/manual.html \
|
||||
${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
|
||||
./manual.xml
|
||||
|
||||
cp ${./style.css} $dst/style.css
|
||||
|
||||
mkdir -p $dst/images/callouts
|
||||
cp "${pkgs.docbook5_xsl}/xml/xsl/docbook/images/callouts/"*.gif $dst/images/callouts/
|
||||
|
||||
mkdir -p $out/nix-support
|
||||
echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products
|
||||
|
||||
xsltproc $xsltFlags --nonet --xinclude \
|
||||
--output $dst/epub/ \
|
||||
${pkgs.docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \
|
||||
./manual.xml
|
||||
|
||||
cp -r $dst/images $dst/epub/OEBPS
|
||||
echo "application/epub+zip" > mimetype
|
||||
manual="$dst/nixpkgs-manual.epub"
|
||||
zip -0Xq "$manual" mimetype
|
||||
cd $dst/epub && zip -Xr9D "$manual" *
|
||||
rm -rf $dst/epub
|
||||
mkdir -p $out/nix-support/
|
||||
echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
39
doc/languages-frameworks/idris.section.md
Normal file
39
doc/languages-frameworks/idris.section.md
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
Idris packages
|
||||
==============
|
||||
|
||||
This directory contains build rules for idris packages. In addition,
|
||||
it contains several functions to build and compose those packages.
|
||||
Everything is exposed to the user via the `idrisPackages` attribute.
|
||||
|
||||
callPackage
|
||||
------------
|
||||
|
||||
This is like the normal nixpkgs callPackage function, specialized to
|
||||
idris packages.
|
||||
|
||||
builtins
|
||||
---------
|
||||
|
||||
This is a list of all of the libraries that come packaged with Idris
|
||||
itself.
|
||||
|
||||
build-idris-package
|
||||
--------------------
|
||||
|
||||
A function to build an idris package. Its sole argument is a set like
|
||||
you might pass to `stdenv.mkDerivation`, except `build-idris-package`
|
||||
sets several attributes for you. See `build-idris-package.nix` for
|
||||
details.
|
||||
|
||||
build-builtin-package
|
||||
----------------------
|
||||
|
||||
A version of `build-idris-package` specialized to builtin libraries.
|
||||
Mostly for internal use.
|
||||
|
||||
with-packages
|
||||
-------------
|
||||
|
||||
Bundle idris together with a list of packages. Because idris currently
|
||||
only supports a single directory in its library path, you must include
|
||||
all desired libraries here, including `prelude` and `base`.
|
||||
|
|
@ -17,20 +17,20 @@ such as Perl or Haskell. These are described in this chapter.</para>
|
|||
<xi:include href="bower.xml" />
|
||||
<xi:include href="coq.xml" />
|
||||
<xi:include href="go.xml" />
|
||||
<xi:include href="haskell.xml" />
|
||||
<xi:include href="idris.xml" /> <!-- generated from ../../pkgs/development/idris-modules/README.md -->
|
||||
<xi:include href="haskell.section.xml" />
|
||||
<xi:include href="idris.section.xml" />
|
||||
<xi:include href="java.xml" />
|
||||
<xi:include href="lua.xml" />
|
||||
<xi:include href="node.xml" /> <!-- generated from ../../pkgs/development/node-packages/README.md -->
|
||||
<xi:include href="node.section.xml" />
|
||||
<xi:include href="perl.xml" />
|
||||
<xi:include href="python.xml" />
|
||||
<xi:include href="python.section.xml" />
|
||||
<xi:include href="qt.xml" />
|
||||
<xi:include href="r.xml" /> <!-- generated from ../../pkgs/development/r-modules/README.md -->
|
||||
<xi:include href="r.section.xml" />
|
||||
<xi:include href="ruby.xml" />
|
||||
<xi:include href="rust.xml" />
|
||||
<xi:include href="rust.section.xml" />
|
||||
<xi:include href="texlive.xml" />
|
||||
<xi:include href="vim.xml" />
|
||||
<xi:include href="emscripten.xml" />
|
||||
<xi:include href="vim.section.xml" />
|
||||
<xi:include href="emscripten.section.xml" />
|
||||
|
||||
|
||||
</chapter>
|
||||
|
|
|
|||
51
doc/languages-frameworks/node.section.md
Normal file
51
doc/languages-frameworks/node.section.md
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
Node.js packages
|
||||
================
|
||||
The `pkgs/development/node-packages` folder contains a generated collection of
|
||||
[NPM packages](https://npmjs.com/) that can be installed with the Nix package
|
||||
manager.
|
||||
|
||||
As a rule of thumb, the package set should only provide *end user* software
|
||||
packages, such as command-line utilities. Libraries should only be added to the
|
||||
package set if there is a non-NPM package that requires it.
|
||||
|
||||
When it is desired to use NPM libraries in a development project, use the
|
||||
`node2nix` generator directly on the `package.json` configuration file of the
|
||||
project.
|
||||
|
||||
The package set also provides support for multiple Node.js versions. The policy
|
||||
is that a new package should be added to the collection for the latest stable LTS
|
||||
release (which is currently 6.x), unless there is an explicit reason to support
|
||||
a different release.
|
||||
|
||||
If your package uses native addons, you need to examine what kind of native
|
||||
build system it uses. Here are some examples:
|
||||
|
||||
* `node-gyp`
|
||||
* `node-gyp-builder`
|
||||
* `node-pre-gyp`
|
||||
|
||||
After you have identified the correct system, you need to override your package
|
||||
expression while adding in build system as a build input. For example, `dat`
|
||||
requires `node-gyp-build`, so we override its expression in `default-v6.nix`:
|
||||
|
||||
```nix
|
||||
dat = nodePackages.dat.override (oldAttrs: {
|
||||
buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ];
|
||||
});
|
||||
```
|
||||
|
||||
To add a package from NPM to nixpkgs:
|
||||
|
||||
1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update
|
||||
or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json`
|
||||
for packages depending on Node.js 4.x)
|
||||
2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
|
||||
3. Build your new package to test your changes:
|
||||
`cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
|
||||
To build against a specific Node.js version (e.g. 4.x):
|
||||
`nix-build -A nodePackages_4_x.<new-or-updated-package>`
|
||||
4. Add and commit all modified and generated files.
|
||||
|
||||
For more information about the generation process, consult the
|
||||
[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix`
|
||||
tool.
|
||||
120
doc/languages-frameworks/r.section.md
Normal file
120
doc/languages-frameworks/r.section.md
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
R packages
|
||||
==========
|
||||
|
||||
## Installation
|
||||
|
||||
Define an environment for R that contains all the libraries that you'd like to
|
||||
use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file:
|
||||
|
||||
```nix
|
||||
{
|
||||
packageOverrides = super: let self = super.pkgs; in
|
||||
{
|
||||
|
||||
rEnv = super.rWrapper.override {
|
||||
packages = with self.rPackages; [
|
||||
devtools
|
||||
ggplot2
|
||||
reshape2
|
||||
yaml
|
||||
optparse
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
Then you can use `nix-env -f "<nixpkgs>" -iA rEnv` to install it into your user
|
||||
profile. The set of available libraries can be discovered by running the
|
||||
command `nix-env -f "<nixpkgs>" -qaP -A rPackages`. The first column from that
|
||||
output is the name that has to be passed to rWrapper in the code snipped above.
|
||||
|
||||
However, if you'd like to add a file to your project source to make the
|
||||
environment available for other contributors, you can create a `default.nix`
|
||||
file like so:
|
||||
```nix
|
||||
let
|
||||
pkgs = import <nixpkgs> {};
|
||||
stdenv = pkgs.stdenv;
|
||||
in with pkgs; {
|
||||
myProject = stdenv.mkDerivation {
|
||||
name = "myProject";
|
||||
version = "1";
|
||||
src = if pkgs.lib.inNixShell then null else nix;
|
||||
|
||||
buildInputs = with rPackages; [
|
||||
R
|
||||
ggplot2
|
||||
knitr
|
||||
];
|
||||
};
|
||||
}
|
||||
```
|
||||
and then run `nix-shell .` to be dropped into a shell with those packages
|
||||
available.
|
||||
|
||||
## RStudio
|
||||
|
||||
RStudio uses a standard set of packages and ignores any custom R
|
||||
environments or installed packages you may have. To create a custom
|
||||
environment, see `rstudioWrapper`, which functions similarly to
|
||||
`rWrapper`:
|
||||
|
||||
```nix
|
||||
{
|
||||
packageOverrides = super: let self = super.pkgs; in
|
||||
{
|
||||
|
||||
rstudioEnv = super.rstudioWrapper.override {
|
||||
packages = with self.rPackages; [
|
||||
dplyr
|
||||
ggplot2
|
||||
reshape2
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
Then like above, `nix-env -f "<nixpkgs>" -iA rstudioEnv` will install
|
||||
this into your user profile.
|
||||
|
||||
Alternatively, you can create a self-contained `shell.nix` without the need to
|
||||
modify any configuration files:
|
||||
|
||||
```nix
|
||||
{ pkgs ? import <nixpkgs> {}
|
||||
}:
|
||||
|
||||
pkgs.rstudioWrapper.override {
|
||||
packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ];
|
||||
}
|
||||
|
||||
```
|
||||
|
||||
Executing `nix-shell` will then drop you into an environment equivalent to the
|
||||
one above. If you need additional packages just add them to the list and
|
||||
re-enter the shell.
|
||||
|
||||
## Updating the package set
|
||||
|
||||
```bash
|
||||
nix-shell generate-shell.nix
|
||||
|
||||
Rscript generate-r-packages.R cran > cran-packages.nix.new
|
||||
mv cran-packages.nix.new cran-packages.nix
|
||||
|
||||
Rscript generate-r-packages.R bioc > bioc-packages.nix.new
|
||||
mv bioc-packages.nix.new bioc-packages.nix
|
||||
```
|
||||
|
||||
`generate-r-packages.R <repo>` reads `<repo>-packages.nix`, therefor the renaming.
|
||||
|
||||
|
||||
## Testing if the Nix-expression could be evaluated
|
||||
|
||||
```bash
|
||||
nix-build test-evaluation.nix --dry-run
|
||||
```
|
||||
|
||||
If this exits fine, the expression is ok. If not, you have to edit `default.nix`
|
||||
|
|
@ -16,6 +16,12 @@ cargo
|
|||
into the `environment.systemPackages` or bring them into
|
||||
scope with `nix-shell -p rustc cargo`.
|
||||
|
||||
> If you are using NixOS and you want to use rust without a nix expression you
|
||||
> probably want to add the following in your `configuration.nix` to build
|
||||
> crates with C dependencies.
|
||||
>
|
||||
> environment.systemPackages = [binutils gcc gnumake openssl pkgconfig]
|
||||
|
||||
For daily builds (beta and nightly) use either rustup from
|
||||
nixpkgs or use the [Rust nightlies
|
||||
overlay](#using-the-rust-nightlies-overlay).
|
||||
|
|
@ -76,7 +82,7 @@ an example for a minimal `hello` crate:
|
|||
Compiling hello v0.1.0 (file:///tmp/hello)
|
||||
Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs
|
||||
$ carnix -o hello.nix --src ./. Cargo.lock --standalone
|
||||
$ nix-build hello.nix
|
||||
$ nix-build hello.nix -A hello_0_1_0
|
||||
|
||||
Now, the file produced by the call to `carnix`, called `hello.nix`, looks like:
|
||||
|
||||
|
|
@ -276,6 +282,84 @@ features, we would write:
|
|||
|
||||
Where `diesel.nix` is the file generated by Carnix, as explained above.
|
||||
|
||||
|
||||
## Setting Up `nix-shell`
|
||||
Oftentimes you want to develop code from within `nix-shell`. Unfortunately
|
||||
`buildRustCrate` does not support common `nix-shell` operations directly
|
||||
(see [this issue](https://github.com/NixOS/nixpkgs/issues/37945))
|
||||
so we will use `stdenv.mkDerivation` instead.
|
||||
|
||||
Using the example `hello` project above, we want to do the following:
|
||||
- Have access to `cargo` and `rustc`
|
||||
- Have the `openssl` library available to a crate through it's _normal_
|
||||
compilation mechanism (`pkg-config`).
|
||||
|
||||
A typical `shell.nix` might look like:
|
||||
|
||||
```
|
||||
with import <nixpkgs> {};
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "rust-env";
|
||||
buildInputs = [
|
||||
rustc cargo
|
||||
|
||||
# Example Additional Dependencies
|
||||
pkgconfig openssl
|
||||
];
|
||||
|
||||
# Set Environment Variables
|
||||
RUST_BACKTRACE = 1;
|
||||
}
|
||||
```
|
||||
|
||||
You should now be able to run the following:
|
||||
```
|
||||
$ nix-shell --pure
|
||||
$ cargo build
|
||||
$ cargo test
|
||||
```
|
||||
|
||||
### Controlling Rust Version Inside `nix-shell`
|
||||
To control your rust version (i.e. use nightly) from within `shell.nix` (or
|
||||
other nix expressions) you can use the following `shell.nix`
|
||||
|
||||
```
|
||||
# Latest Nightly
|
||||
with import <nixpkgs> {};
|
||||
let src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "nixpkgs-mozilla";
|
||||
# commit from: 2018-03-27
|
||||
rev = "2945b0b6b2fd19e7d23bac695afd65e320efcebe";
|
||||
sha256 = "034m1dryrzh2lmjvk3c0krgip652dql46w5yfwpvh7gavd3iypyw";
|
||||
};
|
||||
in
|
||||
with import "${src.out}/rust-overlay.nix" pkgs pkgs;
|
||||
stdenv.mkDerivation {
|
||||
name = "rust-env";
|
||||
buildInputs = [
|
||||
# Note: to use use stable, just replace `nightly` with `stable`
|
||||
latest.rustChannels.nightly.rust
|
||||
|
||||
# Add some extra dependencies from `pkgs`
|
||||
pkgconfig openssl
|
||||
];
|
||||
|
||||
# Set Environment Variables
|
||||
RUST_BACKTRACE = 1;
|
||||
}
|
||||
```
|
||||
|
||||
Now run:
|
||||
```
|
||||
$ rustc --version
|
||||
rustc 1.26.0-nightly (188e693b3 2018-03-26)
|
||||
```
|
||||
|
||||
To see that you are using nightly.
|
||||
|
||||
|
||||
## Using the Rust nightlies overlay
|
||||
|
||||
Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope.
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
</info>
|
||||
|
||||
<xi:include href="introduction.xml" />
|
||||
<xi:include href="introduction.chapter.xml" />
|
||||
<xi:include href="quick-start.xml" />
|
||||
<xi:include href="stdenv.xml" />
|
||||
<xi:include href="multiple-output.xml" />
|
||||
|
|
|
|||
8
doc/overrides.css
Normal file
8
doc/overrides.css
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
|
||||
.programlisting img {
|
||||
width: 1em;
|
||||
}
|
||||
|
||||
.calloutlist img {
|
||||
width: 1.5em;
|
||||
}
|
||||
4
doc/shell.nix
Normal file
4
doc/shell.nix
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
{ pkgs ? import ../. {} }:
|
||||
(import ./default.nix).overrideAttrs (x: {
|
||||
buildInputs = x.buildInputs ++ [ pkgs.xmloscopy ];
|
||||
})
|
||||
|
|
@ -4,6 +4,8 @@ author: zimbatm
|
|||
date: 2017-10-30
|
||||
---
|
||||
|
||||
# mkShell
|
||||
|
||||
pkgs.mkShell is a special kind of derivation that is only useful when using
|
||||
it combined with nix-shell. It will in fact fail to instantiate when invoked
|
||||
with nix-build.
|
||||
|
|
@ -29,8 +29,8 @@ h2 /* chapters, appendices, subtitle */
|
|||
}
|
||||
|
||||
/* Extra space between chapters, appendices. */
|
||||
div.chapter > div.titlepage h2, div.appendix > div.titlepage h2
|
||||
{
|
||||
div.chapter > div.titlepage h2, div.appendix > div.titlepage h2
|
||||
{
|
||||
margin-top: 1.5em;
|
||||
}
|
||||
|
||||
|
|
@ -104,7 +104,7 @@ pre.screen, pre.programlisting
|
|||
padding: 3px 3px;
|
||||
margin-left: 1.5em;
|
||||
margin-right: 1.5em;
|
||||
color: #600000;
|
||||
|
||||
background: #f4f4f8;
|
||||
font-family: monospace;
|
||||
border-radius: 0.4em;
|
||||
|
|
@ -118,7 +118,6 @@ div.example pre.programlisting
|
|||
margin: 0 0 0 0;
|
||||
}
|
||||
|
||||
|
||||
/***************************************************************************
|
||||
Notes, warnings etc:
|
||||
***************************************************************************/
|
||||
|
|
@ -172,7 +171,7 @@ div.navfooter *
|
|||
|
||||
|
||||
/***************************************************************************
|
||||
Links colors and highlighting:
|
||||
Links colors and highlighting:
|
||||
***************************************************************************/
|
||||
|
||||
a { text-decoration: none; }
|
||||
|
|
@ -209,7 +208,7 @@ tt, code
|
|||
.term
|
||||
{
|
||||
font-weight: bold;
|
||||
|
||||
|
||||
}
|
||||
|
||||
div.variablelist dd p, div.glosslist dd p
|
||||
|
|
@ -252,4 +251,4 @@ table
|
|||
div.affiliation
|
||||
{
|
||||
font-style: italic;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,4 +86,6 @@ rec {
|
|||
then { system = elem; }
|
||||
else { parsed = elem; };
|
||||
in lib.matchAttrs pattern platform;
|
||||
|
||||
enableIfAvailable = p: if p.meta.available or true then [ p ] else [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -660,7 +660,7 @@ rec {
|
|||
doRename = { from, to, visible, warn, use }:
|
||||
let
|
||||
toOf = attrByPath to
|
||||
(abort "Renaming error: option `${showOption to}' does not exists.");
|
||||
(abort "Renaming error: option `${showOption to}' does not exist.");
|
||||
in
|
||||
{ config, options, ... }:
|
||||
{ options = setAttrByPath from (mkOption {
|
||||
|
|
|
|||
|
|
@ -39,12 +39,8 @@ rec {
|
|||
isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];
|
||||
isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
|
||||
|
||||
isKexecable = map (family: { kernel = kernels.linux; cpu.family = family; })
|
||||
[ "x86" "arm" "aarch64" "mips" ];
|
||||
isEfi = map (family: { cpu.family = family; })
|
||||
[ "x86" "arm" "aarch64" ];
|
||||
isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
|
||||
[ "x86" "arm" "aarch64" "mips" ];
|
||||
};
|
||||
|
||||
matchAnyAttrs = patterns:
|
||||
|
|
|
|||
|
|
@ -572,6 +572,11 @@
|
|||
github = "bergey";
|
||||
name = "Daniel Bergey";
|
||||
};
|
||||
bgamari = {
|
||||
email = "ben@smart-cactus.org";
|
||||
github = "bgamari";
|
||||
name = "Ben Gamari";
|
||||
};
|
||||
bhipple = {
|
||||
email = "bhipple@protonmail.com";
|
||||
github = "bhipple";
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@ let
|
|||
kernelPackages.nvidia_x11
|
||||
else if elem "nvidiaBeta" drivers then
|
||||
kernelPackages.nvidia_x11_beta
|
||||
else if elem "nvidiaLegacy173" drivers then
|
||||
kernelPackages.nvidia_x11_legacy173
|
||||
else if elem "nvidiaLegacy304" drivers then
|
||||
kernelPackages.nvidia_x11_legacy304
|
||||
else if elem "nvidiaLegacy340" drivers then
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@
|
|||
freenet = 79;
|
||||
ircd = 80;
|
||||
bacula = 81;
|
||||
almir = 82;
|
||||
#almir = 82; # removed 2018-03-25, the almir package was removed in 30291227f2411abaca097773eedb49b8f259e297 during 2017-08
|
||||
deluge = 83;
|
||||
mysql = 84;
|
||||
rabbitmq = 85;
|
||||
|
|
@ -393,7 +393,7 @@
|
|||
freenet = 79;
|
||||
ircd = 80;
|
||||
bacula = 81;
|
||||
almir = 82;
|
||||
#almir = 82; # removed 2018-03-25, the almir package was removed in 30291227f2411abaca097773eedb49b8f259e297 during 2017-08
|
||||
deluge = 83;
|
||||
mysql = 84;
|
||||
rabbitmq = 85;
|
||||
|
|
|
|||
|
|
@ -158,7 +158,6 @@
|
|||
./services/audio/slimserver.nix
|
||||
./services/audio/squeezelite.nix
|
||||
./services/audio/ympd.nix
|
||||
./services/backup/almir.nix
|
||||
./services/backup/bacula.nix
|
||||
./services/backup/borgbackup.nix
|
||||
./services/backup/crashplan.nix
|
||||
|
|
|
|||
|
|
@ -1,173 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.almir;
|
||||
|
||||
bconsoleconf = pkgs.writeText "bconsole.conf"
|
||||
''
|
||||
Director {
|
||||
Name = ${cfg.director_name}
|
||||
DIRport = ${toString cfg.director_port}
|
||||
address = ${cfg.director_address}
|
||||
Password = "${cfg.director_password}"
|
||||
}
|
||||
'';
|
||||
|
||||
productionini = pkgs.writeText "production.ini"
|
||||
''
|
||||
[app:main]
|
||||
use = egg:almir
|
||||
|
||||
pyramid.reload_templates = false
|
||||
pyramid.debug_authorization = false
|
||||
pyramid.debug_notfound = false
|
||||
pyramid.debug_routematch = false
|
||||
pyramid.debug_templates = false
|
||||
pyramid.default_locale_name = en
|
||||
pyramid.includes =
|
||||
pyramid_exclog
|
||||
exclog.extra_info = true
|
||||
|
||||
sqlalchemy.url = ${cfg.sqlalchemy_engine_url}
|
||||
timezone = ${cfg.timezone}
|
||||
bconsole_config = ${bconsoleconf}
|
||||
|
||||
[server:main]
|
||||
use = egg:waitress#main
|
||||
host = 127.0.0.1
|
||||
port = ${toString cfg.port}
|
||||
|
||||
|
||||
# Begin logging configuration
|
||||
|
||||
[loggers]
|
||||
keys = root, almir, sqlalchemy, exc_logger
|
||||
|
||||
[handlers]
|
||||
keys = console
|
||||
|
||||
[formatters]
|
||||
keys = generic
|
||||
|
||||
[logger_root]
|
||||
level = WARN
|
||||
handlers = console
|
||||
|
||||
[logger_almir]
|
||||
level = WARN
|
||||
handlers =
|
||||
qualname = almir
|
||||
|
||||
[logger_exc_logger]
|
||||
level = ERROR
|
||||
handlers =
|
||||
qualname = exc_logger
|
||||
|
||||
[logger_sqlalchemy]
|
||||
level = WARN
|
||||
handlers =
|
||||
qualname = sqlalchemy.engine
|
||||
# "level = INFO" logs SQL queries.
|
||||
# "level = DEBUG" logs SQL queries and results.
|
||||
# "level = WARN" logs neither. (Recommended for production systems.)
|
||||
|
||||
[handler_console]
|
||||
class = StreamHandler
|
||||
args = (sys.stderr,)
|
||||
level = NOTSET
|
||||
formatter = generic
|
||||
|
||||
[formatter_generic]
|
||||
format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
|
||||
'';
|
||||
in {
|
||||
options = {
|
||||
services.almir = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enable Almir web server. Also configures postgresql database and installs bacula.
|
||||
'';
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
default = 35000;
|
||||
type = types.int;
|
||||
description = ''
|
||||
Port for Almir web server to listen on.
|
||||
'';
|
||||
};
|
||||
|
||||
timezone = mkOption {
|
||||
description = ''
|
||||
Timezone as specified in https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
|
||||
'';
|
||||
example = "Europe/Ljubljana";
|
||||
};
|
||||
|
||||
sqlalchemy_engine_url = mkOption {
|
||||
default = "postgresql:///bacula";
|
||||
example = ''
|
||||
postgresql://bacula:bacula@localhost:5432/bacula
|
||||
mysql+mysqlconnector://<user>:<password>@<hostname>/<database>'
|
||||
sqlite:////var/lib/bacula/bacula.db'
|
||||
'';
|
||||
description = ''
|
||||
Define SQL database connection to bacula catalog as specified in http://docs.sqlalchemy.org/en/latest/core/engines.html#database-urls
|
||||
'';
|
||||
};
|
||||
|
||||
director_name = mkOption {
|
||||
description = ''
|
||||
Name of the Director to connect with bconsole.
|
||||
'';
|
||||
};
|
||||
|
||||
director_password = mkOption {
|
||||
description = ''
|
||||
Password for Director to connect with bconsole.
|
||||
'';
|
||||
};
|
||||
|
||||
director_port = mkOption {
|
||||
default = 9101;
|
||||
type = types.int;
|
||||
description = ''
|
||||
Port for Director to connect with bconsole.
|
||||
'';
|
||||
};
|
||||
|
||||
director_address = mkOption {
|
||||
default = "127.0.0.1";
|
||||
description = ''
|
||||
IP/Hostname for Director to connect with bconsole.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.almir = {
|
||||
after = [ "network.target" "postgresql.service" ];
|
||||
description = "Almir web app";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = [ pkgs.pythonPackages.almir ];
|
||||
environment.PYTHONPATH = "${pkgs.pythonPackages.almir}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages";
|
||||
serviceConfig.ExecStart = "${pkgs.pythonPackages.pyramid}/bin/pserve ${productionini}";
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.pythonPackages.almir ];
|
||||
|
||||
users.extraUsers.almir = {
|
||||
group = "almir";
|
||||
uid = config.ids.uids.almir;
|
||||
createHome = true;
|
||||
shell = "${pkgs.bash}/bin/bash";
|
||||
};
|
||||
|
||||
users.extraGroups.almir.gid = config.ids.gids.almir;
|
||||
};
|
||||
}
|
||||
|
|
@ -238,6 +238,20 @@ in
|
|||
Whether to produce verbose logging output.
|
||||
'';
|
||||
};
|
||||
explicitSymlinks = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to follow symlinks specified as archives.
|
||||
'';
|
||||
};
|
||||
followSymlinks = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to follow all symlinks in archive trees.
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
));
|
||||
|
|
@ -285,12 +299,12 @@ in
|
|||
}) gcfg.archives);
|
||||
|
||||
systemd.services =
|
||||
mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}" {
|
||||
(mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}" {
|
||||
description = "Tarsnap archive '${name}'";
|
||||
requires = [ "network-online.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
|
||||
path = [ pkgs.iputils pkgs.tarsnap pkgs.utillinux ];
|
||||
path = with pkgs; [ iputils tarsnap utillinux ];
|
||||
|
||||
# In order for the persistent tarsnap timer to work reliably, we have to
|
||||
# make sure that the tarsnap server is reachable after systemd starts up
|
||||
|
|
@ -300,10 +314,12 @@ in
|
|||
while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done
|
||||
'';
|
||||
|
||||
script =
|
||||
let run = ''tarsnap --configfile "/etc/tarsnap/${name}.conf" \
|
||||
-c -f "${name}-$(date +"%Y%m%d%H%M%S")" \
|
||||
script = let
|
||||
tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"'';
|
||||
run = ''${tarsnap} -c -f "${name}-$(date +"%Y%m%d%H%M%S")" \
|
||||
${optionalString cfg.verbose "-v"} \
|
||||
${optionalString cfg.explicitSymlinks "-H"} \
|
||||
${optionalString cfg.followSymlinks "-L"} \
|
||||
${concatStringsSep " " cfg.directories}'';
|
||||
in if (cfg.cachedir != null) then ''
|
||||
mkdir -p ${cfg.cachedir}
|
||||
|
|
@ -313,7 +329,7 @@ in
|
|||
if [ ! -e ${cfg.cachedir}/firstrun ]; then
|
||||
( flock 10
|
||||
flock -u 9
|
||||
tarsnap --configfile "/etc/tarsnap/${name}.conf" --fsck
|
||||
${tarsnap} --fsck
|
||||
flock 9
|
||||
) 10>${cfg.cachedir}/firstrun
|
||||
fi
|
||||
|
|
@ -329,7 +345,44 @@ in
|
|||
CapabilityBoundingSet = [ "CAP_DAC_READ_SEARCH" ];
|
||||
PermissionsStartOnly = "true";
|
||||
};
|
||||
}) gcfg.archives;
|
||||
}) gcfg.archives) //
|
||||
|
||||
(mapAttrs' (name: cfg: nameValuePair "tarsnap-restore-${name}"{
|
||||
description = "Tarsnap restore '${name}'";
|
||||
requires = [ "network-online.target" ];
|
||||
|
||||
path = with pkgs; [ iputils tarsnap utillinux ];
|
||||
|
||||
script = let
|
||||
tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"'';
|
||||
lastArchive = ''$(${tarsnap} --list-archives | sort | tail -1)'';
|
||||
run = ''${tarsnap} -x -f "${lastArchive}" ${optionalString cfg.verbose "-v"}'';
|
||||
|
||||
in if (cfg.cachedir != null) then ''
|
||||
mkdir -p ${cfg.cachedir}
|
||||
chmod 0700 ${cfg.cachedir}
|
||||
|
||||
( flock 9
|
||||
if [ ! -e ${cfg.cachedir}/firstrun ]; then
|
||||
( flock 10
|
||||
flock -u 9
|
||||
${tarsnap} --fsck
|
||||
flock 9
|
||||
) 10>${cfg.cachedir}/firstrun
|
||||
fi
|
||||
) 9>${cfg.cachedir}/lockf
|
||||
|
||||
exec flock ${cfg.cachedir}/firstrun ${run}
|
||||
'' else "exec ${run}";
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
IOSchedulingClass = "idle";
|
||||
NoNewPrivileges = "true";
|
||||
CapabilityBoundingSet = [ "CAP_DAC_READ_SEARCH" ];
|
||||
PermissionsStartOnly = "true";
|
||||
};
|
||||
}) gcfg.archives);
|
||||
|
||||
# Note: the timer must be Persistent=true, so that systemd will start it even
|
||||
# if e.g. your laptop was asleep while the latest interval occurred.
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ with lib;
|
|||
let
|
||||
cfg = config.services.tor;
|
||||
torDirectory = "/var/lib/tor";
|
||||
torRunDirectory = "/run/tor";
|
||||
|
||||
opt = name: value: optionalString (value != null) "${name} ${value}";
|
||||
optint = name: value: optionalString (value != null && value != 0) "${name} ${toString value}";
|
||||
|
|
@ -38,6 +39,7 @@ let
|
|||
''}
|
||||
|
||||
${optint "ControlPort" cfg.controlPort}
|
||||
${optionalString cfg.controlSocket.enable "ControlSocket ${torRunDirectory}/control GroupWritable RelaxDirModeCheck"}
|
||||
''
|
||||
# Client connection config
|
||||
+ optionalString cfg.client.enable ''
|
||||
|
|
@ -140,6 +142,17 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
controlSocket = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Wheter to enable Tor control socket. Control socket is created
|
||||
in <literal>${torRunDirectory}/control</literal>
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
client = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
|
|
@ -692,7 +705,7 @@ in
|
|||
|
||||
# Translated from the upstream contrib/dist/tor.service.in
|
||||
preStart = ''
|
||||
install -o tor -g tor -d ${torDirectory}/onion
|
||||
install -o tor -g tor -d ${torDirectory}/onion ${torRunDirectory}
|
||||
${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config
|
||||
'';
|
||||
|
||||
|
|
@ -716,7 +729,7 @@ in
|
|||
DevicePolicy = "closed";
|
||||
InaccessibleDirectories = "/home";
|
||||
ReadOnlyDirectories = "/";
|
||||
ReadWriteDirectories = torDirectory;
|
||||
ReadWriteDirectories = [torDirectory torRunDirectory];
|
||||
NoNewPrivileges = "yes";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ with lib;
|
|||
default = [];
|
||||
example = [
|
||||
{ urlPath = "/foo/bar.png";
|
||||
files = "/home/eelco/some-file.png";
|
||||
file = "/home/eelco/some-file.png";
|
||||
}
|
||||
];
|
||||
description = ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
config = lib.mkIf (pkgs.kexectools != null) {
|
||||
config = lib.mkIf (pkgs.kexectools.meta.available) {
|
||||
environment.systemPackages = [ pkgs.kexectools ];
|
||||
|
||||
systemd.services."prepare-kexec" =
|
||||
|
|
|
|||
|
|
@ -523,6 +523,14 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
systemd.enableCgroupAccounting = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Whether to enable cgroup accounting.
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.extraConfig = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
|
|
@ -724,6 +732,13 @@ in
|
|||
|
||||
"systemd/system.conf".text = ''
|
||||
[Manager]
|
||||
${optionalString config.systemd.enableCgroupAccounting ''
|
||||
DefaultCPUAccounting=yes
|
||||
DefaultIOAccounting=yes
|
||||
DefaultBlockIOAccounting=yes
|
||||
DefaultMemoryAccounting=yes
|
||||
DefaultTasksAccounting=yes
|
||||
''}
|
||||
${config.systemd.extraConfig}
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -17,20 +17,14 @@ import ./make-test.nix ({ pkgs, lib, ... }:
|
|||
startAll;
|
||||
|
||||
$machine->fail("test -f ~root/at-1");
|
||||
$machine->fail("test -f ~root/batch-1");
|
||||
$machine->fail("test -f ~alice/at-1");
|
||||
$machine->fail("test -f ~alice/batch-1");
|
||||
|
||||
$machine->succeed("echo 'touch ~root/at-1' | at now+1min");
|
||||
$machine->succeed("echo 'touch ~root/batch-1' | batch");
|
||||
$machine->succeed("su - alice -c \"echo 'touch at-1' | at now+1min\"");
|
||||
$machine->succeed("su - alice -c \"echo 'touch batch-1' | batch\"");
|
||||
|
||||
$machine->succeed("sleep 1.5m");
|
||||
|
||||
$machine->succeed("test -f ~root/at-1");
|
||||
$machine->succeed("test -f ~root/batch-1");
|
||||
$machine->succeed("test -f ~alice/at-1");
|
||||
$machine->succeed("test -f ~alice/batch-1");
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,78 +0,0 @@
|
|||
diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
|
||||
index 63908005..f6656d5c 100644
|
||||
--- a/src/wallet/CMakeLists.txt
|
||||
+++ b/src/wallet/CMakeLists.txt
|
||||
@@ -86,43 +86,40 @@ target_link_libraries(wallet
|
||||
${EXTRA_LIBRARIES})
|
||||
add_dependencies(wallet version)
|
||||
|
||||
-if (NOT BUILD_GUI_DEPS)
|
||||
- set(wallet_rpc_sources
|
||||
- wallet_rpc_server.cpp)
|
||||
+set(wallet_rpc_sources
|
||||
+ wallet_rpc_server.cpp)
|
||||
|
||||
- set(wallet_rpc_headers)
|
||||
+set(wallet_rpc_headers)
|
||||
|
||||
- set(wallet_rpc_private_headers
|
||||
- wallet_rpc_server.h)
|
||||
+set(wallet_rpc_private_headers
|
||||
+ wallet_rpc_server.h)
|
||||
|
||||
- monero_private_headers(wallet_rpc_server
|
||||
- ${wallet_rpc_private_headers})
|
||||
- monero_add_executable(wallet_rpc_server
|
||||
- ${wallet_rpc_sources}
|
||||
- ${wallet_rpc_headers}
|
||||
- ${wallet_rpc_private_headers})
|
||||
-
|
||||
- target_link_libraries(wallet_rpc_server
|
||||
- PRIVATE
|
||||
- wallet
|
||||
- epee
|
||||
- rpc
|
||||
- cryptonote_core
|
||||
- cncrypto
|
||||
- common
|
||||
- ${Boost_CHRONO_LIBRARY}
|
||||
- ${Boost_PROGRAM_OPTIONS_LIBRARY}
|
||||
- ${Boost_FILESYSTEM_LIBRARY}
|
||||
- ${Boost_THREAD_LIBRARY}
|
||||
- ${CMAKE_THREAD_LIBS_INIT}
|
||||
- ${EXTRA_LIBRARIES})
|
||||
- add_dependencies(wallet_rpc_server version)
|
||||
- set_property(TARGET wallet_rpc_server
|
||||
- PROPERTY
|
||||
- OUTPUT_NAME "monero-wallet-rpc")
|
||||
- install(TARGETS wallet_rpc_server DESTINATION bin)
|
||||
-endif()
|
||||
+monero_private_headers(wallet_rpc_server
|
||||
+ ${wallet_rpc_private_headers})
|
||||
+monero_add_executable(wallet_rpc_server
|
||||
+ ${wallet_rpc_sources}
|
||||
+ ${wallet_rpc_headers}
|
||||
+ ${wallet_rpc_private_headers})
|
||||
|
||||
+target_link_libraries(wallet_rpc_server
|
||||
+ PRIVATE
|
||||
+ wallet
|
||||
+ epee
|
||||
+ rpc
|
||||
+ cryptonote_core
|
||||
+ cncrypto
|
||||
+ common
|
||||
+ ${Boost_CHRONO_LIBRARY}
|
||||
+ ${Boost_PROGRAM_OPTIONS_LIBRARY}
|
||||
+ ${Boost_FILESYSTEM_LIBRARY}
|
||||
+ ${Boost_THREAD_LIBRARY}
|
||||
+ ${CMAKE_THREAD_LIBS_INIT}
|
||||
+ ${EXTRA_LIBRARIES})
|
||||
+add_dependencies(wallet_rpc_server version)
|
||||
+set_property(TARGET wallet_rpc_server
|
||||
+ PROPERTY
|
||||
+ OUTPUT_NAME "monero-wallet-rpc")
|
||||
+install(TARGETS wallet_rpc_server DESTINATION bin)
|
||||
|
||||
# build and install libwallet_merged only if we building for GUI
|
||||
if (BUILD_GUI_DEPS)
|
||||
|
|
@ -1,34 +1,31 @@
|
|||
{ stdenv, fetchpatch, fetchFromGitHub, cmake
|
||||
, boost, miniupnpc, openssl, pkgconfig, unbound
|
||||
, IOKit
|
||||
{ stdenv, fetchpatch, fetchFromGitHub, cmake, pkgconfig, git
|
||||
, boost, miniupnpc, openssl, unbound, cppzmq, zeromq, pcsclite
|
||||
, readline, IOKit
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "monero-${version}";
|
||||
version = "0.11.1.0";
|
||||
version = "0.12.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero";
|
||||
rev = "v${version}";
|
||||
sha256 = "0nrpxx6r63ia6ard85d504x2kgaikvrhb5sg93ml70l6djyy1148";
|
||||
sha256 = "1lc9mkrl1m8mdbvj88y8y5rv44vinxf7dyv221ndmw5c5gs5zfgk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkgconfig git ];
|
||||
|
||||
buildInputs = [ boost miniupnpc openssl unbound ]
|
||||
buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin IOKit;
|
||||
|
||||
patches = [
|
||||
./build-wallet-rpc.patch # fixed in next release
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DBUILD_GUI_DEPS=ON"
|
||||
"-DReadline_ROOT_DIR=${readline.dev}"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
installPhase = ''
|
||||
make install
|
||||
|
|
|
|||
|
|
@ -20,13 +20,16 @@ stdenv.mkDerivation rec {
|
|||
mv helmholtz~/src/Makefile .
|
||||
rm -rf helmholtz~/src/
|
||||
rm helmholtz~/helmholtz~.pd_darwin
|
||||
rm helmholtz~/helmholtz~.pd_linux
|
||||
rm helmholtz~/helmholtz~.dll
|
||||
rm -rf __MACOSX
|
||||
'';
|
||||
|
||||
patchPhase = ''
|
||||
mkdir -p $out/helmholtz~
|
||||
sed -i "s@current: pd_darwin@current: pd_linux@g" Makefile
|
||||
sed -i "s@-Wl@@g" Makefile
|
||||
sed -i "s@\$(NAME).pd_linux \.\./\$(NAME).pd_linux@helmholtz~.pd_linux $out/helmholtz~/@g" Makefile
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
propagatedUserEnvPkgs = [ duplicity ];
|
||||
|
||||
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
|
||||
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "lib/nautilus/extensions-3.0";
|
||||
|
||||
postInstall = ''
|
||||
glib-compile-schemas $out/share/glib-2.0/schemas
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, cmake, pkgconfig, xorg, libjpeg, libpng
|
||||
{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng
|
||||
, fontconfig, freetype, pam, dbus_libs, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -26,7 +26,10 @@ stdenv.mkDerivation rec {
|
|||
# Allow to set logfile to a special "/dev/stderr" in order to continue
|
||||
# logging to stderr and thus to the journal.
|
||||
./no-logfile.patch
|
||||
];
|
||||
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/gentoo/musl/8eddda8072add075ebf56cf6d288bc1450d6b5f8/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch";
|
||||
sha256 = "0f82672s2r2cmdqfn2mbg3di76mbla9n0ik20p2gv4igi6p866xm";
|
||||
});
|
||||
|
||||
preConfigure = "substituteInPlace CMakeLists.txt --replace /lib $out/lib";
|
||||
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ let
|
|||
inherit (gnome2) GConf gnome_vfs;
|
||||
};
|
||||
latestVersion = {
|
||||
version = "3.2.0.6"; # "Android Studio 3.2 Canary 7"
|
||||
build = "173.4658582";
|
||||
sha256Hash = "0a6ssw5mb9my5kfd5fkfdddkgdi2jdq23jlhd6rrqcs6rhdlpl38";
|
||||
version = "3.2.0.7"; # "Android Studio 3.2 Canary 8"
|
||||
build = "173.4670218";
|
||||
sha256Hash = "0p1lls1pkhji8x0p32clsiq3ng64jhqv2vxkhdkmsbh5p4dc1g21";
|
||||
};
|
||||
in rec {
|
||||
# Old alias
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
name = "darktable-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
|
||||
sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32";
|
||||
sha256 = "10asz918kv2248px3w9bn5k8cfrad5xrci58x9y61l0yf5hcpk0r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "blender-2.79a";
|
||||
name = "blender-2.79b";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.blender.org/source/${name}.tar.gz";
|
||||
sha256 = "1mw45mvfk9f0fhn12vp3g2vwqzinrp3by0m3w01wj87h9ri5zkwc";
|
||||
sha256 = "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "electrum-${version}";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
|
||||
sha256 = "1hc0ylkq89459wy3av42hp73p34pmh7grsa3qm8fb1k0qg17zy78";
|
||||
sha256 = "0ds3p7cjbavsbizm04rhzl8s59czynynpx1jvg367mwbi6gng59i";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
, yubikey-personalization
|
||||
, libXi
|
||||
, qtx11extras
|
||||
, qtmacextras
|
||||
|
||||
, withKeePassBrowser ? true
|
||||
, withKeePassSSHAgent ? true
|
||||
|
|
@ -25,17 +26,27 @@ with stdenv.lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "keepassxc-${version}";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keepassxreboot";
|
||||
repo = "keepassxc";
|
||||
rev = "${version}";
|
||||
sha256 = "1zch1qbqgphhp2p2kvjlah8s337162m69yf4y00kcnfb3539ii5f";
|
||||
sha256 = "1xlg8zb22c2f1pi2has4f4qwggd0m2z254f0d6jrgz368x4g3p87";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-old-style-cast";
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
|
||||
"-Wno-old-style-cast"
|
||||
"-Wno-error"
|
||||
"-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}"
|
||||
];
|
||||
|
||||
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "/usr/local/bin" "../bin" \
|
||||
--replace "/usr/local/share/man" "../share/man"
|
||||
'';
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
|
||||
patches = [ ./darwin.patch ];
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -72,7 +83,7 @@ stdenv.mkDerivation rec {
|
|||
qtx11extras
|
||||
yubikey-personalization
|
||||
zlib
|
||||
];
|
||||
] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras;
|
||||
|
||||
postInstall = optionalString stdenv.isDarwin ''
|
||||
# Make it work without Qt in PATH.
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "redis-desktop-manager-${version}";
|
||||
version = "0.9.0-alpha5";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/uglide/RedisDesktopManager.git";
|
||||
fetchSubmodules = true;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "1grw4zng0ff0lvplzzld133hlz6zjn5f5hl3z6z7kc1nq5642yr9";
|
||||
sha256 = "0yd4i944d4blw8jky0nxl7sfkkj975q4d328rdcbhizwvf6dx81f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig qmake ];
|
||||
|
|
@ -30,17 +30,13 @@ stdenv.mkDerivation rec {
|
|||
qtquick1 qtquickcontrols qtsvg qttools qtcharts
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/google/breakpad/commit/bddcc58860f522a0d4cbaa7e9d04058caee0db9d.patch";
|
||||
sha256 = "1bcamjkmif62rb0lbp111r0ppf4raqw664m5by7vr3pdkcjbbilq";
|
||||
})
|
||||
];
|
||||
|
||||
patchFlags = "-d 3rdparty/gbreakpad -p1";
|
||||
|
||||
dontUseQmakeConfigure = true;
|
||||
|
||||
# Disable annoying update reminder
|
||||
postPatch = ''
|
||||
sed -i s/'^\s*initUpdater();'/'\/\/initUpdater():'/ src/app/app.cpp
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
srcdir=$PWD
|
||||
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
, opencl-headers, ocl-icd, hwloc, cudatoolkit
|
||||
, devDonationLevel ? "0.0"
|
||||
, cudaSupport ? false
|
||||
, openclSupport ? false
|
||||
, openclSupport ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xmr-stak-${version}";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fireice-uk";
|
||||
repo = "xmr-stak";
|
||||
rev = "v${version}";
|
||||
sha256 = "0n21y37d8khgfk9965mrhnh6y5ag7w0s6as1fmf76yx6vajvajsn";
|
||||
rev = "${version}";
|
||||
sha256 = "1iisy73pi4xx3vmqvy6whdzb566jqyjx4pdyx0g35qjj8giflpc8";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-O3";
|
||||
|
|
|
|||
33
pkgs/applications/misc/xmrig/default.nix
Normal file
33
pkgs/applications/misc/xmrig/default.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd
|
||||
, donateLevel ? 0
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xmrig-${version}";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmrig";
|
||||
repo = "xmrig";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jc6vzqdl85pmiw5qv9b148kfw4k4wxn90ggylxfpfdv7czamh2c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libuv libmicrohttpd ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/donate.h --replace "kDonateLevel = 5;" "kDonateLevel = ${toString donateLevel};"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -vD xmrig $out/bin/xmrig
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Monero (XMR) CPU miner";
|
||||
homepage = "https://github.com/xmrig/xmrig";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
};
|
||||
}
|
||||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation {
|
|||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableGUI) ''
|
||||
wrapProgram $out/bin/xpdf \
|
||||
--set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
beta = {
|
||||
sha256 = "13n84ky5fr5by71jd9ivj3q7czd2gxrnvbj8msskb62zamjb8z80";
|
||||
sha256bin64 = "16f2b9sxyljrmj2rcfzamf9ji01pkamnb6qv363lf67fshm37ky0";
|
||||
version = "65.0.3325.124";
|
||||
sha256 = "18dampi62wwvscywvdz8lil0zhxdr4p6bhr4yv08arz029w356lc";
|
||||
sha256bin64 = "129jq8ynj4y81rhzxyyfcfpllq3a6ddhiy766zw28s7d43q4zca2";
|
||||
version = "66.0.3359.45";
|
||||
};
|
||||
dev = {
|
||||
sha256 = "1qy8gv859qhg5s6gi3mvdgg1s5wi69r6qkhd851nwlmmjhvarfg8";
|
||||
sha256bin64 = "1z1s6i4yx20ayr6a2ycbgd0ipy1ncw4i19k0g8jbn639kynmfxjw";
|
||||
version = "66.0.3359.26";
|
||||
sha256 = "09x7p83p188ms0awxj3kl9kdx796ns6m42smqd3jccnljx54jls2";
|
||||
sha256bin64 = "1aa24gvbf9awm59n05jkb4wy6ssr7fns4rl1hd2c66cq2d4mx3d8";
|
||||
version = "67.0.3377.1";
|
||||
};
|
||||
stable = {
|
||||
sha256 = "1kkc276jfhw2kp9pfg1drxm1h98d2cwm4c5c7xay2pbrhkypnzk2";
|
||||
sha256bin64 = "1vv34g05x2jyg8hgk1r760g38rb3r17p5iwf1f1wqkjp3z6c952v";
|
||||
version = "65.0.3325.162";
|
||||
sha256 = "11w6wg862ixbgm7dpqag2lmbjknv83zlr9imd8zchvmrqr468rlk";
|
||||
sha256bin64 = "0r14w94aa7zg2i3zjpwvb7d6fg9yg0xkki7jzcpjmzwygy78fs16";
|
||||
version = "65.0.3325.181";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -18,10 +18,10 @@ rec {
|
|||
|
||||
firefox = common rec {
|
||||
pname = "firefox";
|
||||
version = "59.0.1";
|
||||
version = "59.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://hg.mozilla.org/releases/mozilla-release/archive/3db9e3d52b17563efca181ccbb50deb8660c59ae.tar.bz2";
|
||||
sha512 = "3da3gmfv2aalsbsx15csas4mwnvlliy1q081sd2riz3nvxr7qyrdx1qvxj4gdr97wlmvz7mig9djhh5gwx7ddah5hfhj23cvccmw6jw";
|
||||
url = "https://hg.mozilla.org/releases/mozilla-release/archive/239e434d6d2b8e1e2b697c3416d1e96d48fe98e5.tar.bz2";
|
||||
sha512 = "3kfh224sfc9ig4733frnskcs49xzjkrs00lxllsvx1imm6f4sf117mqlvc7bhgrn8ldiqn6vaa5g6gd9b7awkk1g975bbzk9namb3yv";
|
||||
};
|
||||
|
||||
patches = nixpkgsPatches ++ [
|
||||
|
|
@ -41,10 +41,10 @@ rec {
|
|||
|
||||
firefox-esr = common rec {
|
||||
pname = "firefox-esr";
|
||||
version = "52.7.2esr";
|
||||
version = "52.7.3esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "e275fd10fd32a0dc237135af3395e3a1ae501844632c973ff3b9bca1456702ee36dbee99fc57300598403c924c0db63bd62a199845c8f4a2e29db5d1e5973395";
|
||||
sha512 = "31y3qrslg61724vmly6gr1lqcrqgpkh3zsl8riax45gizfcp3qbgkvmd5wwfn9fiwjqi6ww3i08j51wxrfxcxznv7c6qzsvzzc30mgw";
|
||||
};
|
||||
|
||||
patches = nixpkgsPatches;
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.14";
|
||||
version = "2.15";
|
||||
name = "links2-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/download/links-${version}.tar.bz2";
|
||||
sha256 = "1f24y83wa1vzzjq5kp857gjqdpnmf8pb29yw7fam0m8wxxw0c3gp";
|
||||
sha256 = "1jp3xyvp87a188b4kg5ycqahrazj7928zncgsznzn54w8d5iqahy";
|
||||
};
|
||||
|
||||
buildInputs = with stdenv.lib;
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ let
|
|||
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||
|
||||
# Upstream source
|
||||
version = "7.5.1";
|
||||
version = "7.5.3";
|
||||
|
||||
lang = "en-US";
|
||||
|
||||
|
|
@ -108,7 +108,7 @@ let
|
|||
"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 = "1c5mrc10gm5nklirzwflg7lrdr1v36354g9lgxnjk432izhwb1s0";
|
||||
sha256 = "0vgw1qsd6rqbbgnsw9zwcv5m308abh7wp1p12mp8g04xndxnzw0d";
|
||||
};
|
||||
|
||||
"i686-linux" = fetchurl {
|
||||
|
|
@ -116,7 +116,7 @@ let
|
|||
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "0d274f3qhbf1cid3fmpk9s482bjvgcig3q7gdklv9va89bpxzsa6";
|
||||
sha256 = "0scjy51zmyn7za0gii0dvndq06slip64nd0ik2cjyq232agvbxmr";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, makeWrapper, cdrtools }:
|
||||
|
||||
# USAGE:
|
||||
# install the following package globally or in nix-shell:
|
||||
#
|
||||
# (terraform.withPlugins (old: [terraform-provider-libvirt]))
|
||||
#
|
||||
# configuration.nix:
|
||||
#
|
||||
# virtualisation.libvirtd.enable = true;
|
||||
#
|
||||
# terraform-provider-libvirt does not manage pools at the moment:
|
||||
#
|
||||
# $ virsh --connect "qemu:///system" pool-define-as default dir - - - - /var/lib/libvirt/images
|
||||
# $ virsh --connect "qemu:///system" pool-start default
|
||||
#
|
||||
# pick an example from (i.e ubuntu):
|
||||
# https://github.com/dmacvicar/terraform-provider-libvirt/tree/master/examples
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "terraform-provider-libvirt-${version}";
|
||||
version = "0.3";
|
||||
|
||||
goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmacvicar";
|
||||
repo = "terraform-provider-libvirt";
|
||||
rev = "v${version}";
|
||||
sha256 = "004gxy55p5cf39f2zpah0i2zhvs4x6ixnxy8z9v7314604ggpkna";
|
||||
};
|
||||
|
||||
buildInputs = [ libvirt pkgconfig makeWrapper ];
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
propagatedBuildInputs = [ cdrtools ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/dmacvicar/terraform-provider-libvirt;
|
||||
description = "Terraform provider for libvirt";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
};
|
||||
}
|
||||
|
||||
12
pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix
generated
Normal file
12
pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix
generated
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/aws/aws-sdk-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/aws/aws-sdk-go";
|
||||
rev = "c861d27d0304a79f727e9a8a4e2ac1e74602fdc0";
|
||||
sha256 = "023cyg551dvm2l50dx1qsikkj77lk2dhiya7by8in7h65av6hjgl";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -44,6 +44,9 @@ let
|
|||
let
|
||||
actualPlugins = plugins terraform.plugins;
|
||||
|
||||
# Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries
|
||||
wrapperInputs = lib.unique (lib.flatten (lib.catAttrs "propagatedBuildInputs" (builtins.filter (x: x != null) actualPlugins)));
|
||||
|
||||
passthru = {
|
||||
withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins);
|
||||
|
||||
|
|
@ -64,7 +67,8 @@ let
|
|||
buildCommand = ''
|
||||
mkdir -p $out/bin/
|
||||
makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \
|
||||
--set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin"
|
||||
--set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin" \
|
||||
--prefix PATH : "${lib.makeBinPath wrapperInputs}"
|
||||
'';
|
||||
|
||||
inherit passthru;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook
|
||||
, python, gtk3, gobjectIntrospection
|
||||
, nbxmpp, pyasn1, pygobject3, dbus-python, pillow
|
||||
, nbxmpp, pyasn1, pygobject3, gnome3, dbus-python, pillow
|
||||
, xvfb_run, dbus
|
||||
, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly
|
||||
, enableE2E ? true, pycrypto, python-gnupg
|
||||
, enableSecrets ? true, libsecret
|
||||
|
|
@ -23,8 +24,13 @@ buildPythonApplication rec {
|
|||
sha256 = "10da4imfldj04917h54vrmg70a1d832jd8p6386paa5jqzf5qk20";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# This test requires network access
|
||||
echo "" > test/integration/test_resolver.py
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
gobjectIntrospection gtk3
|
||||
gobjectIntrospection gtk3 gnome3.defaultIconTheme
|
||||
] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
|
||||
++ optional enableSecrets libsecret
|
||||
++ optional enableSpelling gspell
|
||||
|
|
@ -41,12 +47,13 @@ buildPythonApplication rec {
|
|||
++ optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
|
||||
++ extraPythonPackages pythonPackages;
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} test/runtests.py
|
||||
'';
|
||||
checkInputs = [ xvfb_run dbus.daemon ];
|
||||
|
||||
# Tests try to use GTK+ which fails.
|
||||
doCheck = false;
|
||||
checkPhase = ''
|
||||
xvfb-run dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
${python.interpreter} test/runtests.py
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://gajim.org/;
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ let
|
|||
mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
|
||||
stableVersion = {
|
||||
stable = true;
|
||||
version = "1.2.14";
|
||||
sha256Hash = "1412bls4qmfsa4nlqrxrc1j1jslhj6rhg8k69blhks9grrz36s1l";
|
||||
version = "1.2.15";
|
||||
sha256Hash = "18srw7g8h5zmc0plzqd03aijaylrsfaybraw97b1w9hj4lf2bl92";
|
||||
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
|
||||
archPatchesRevision = "310557";
|
||||
archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stable, version, sha256Hash, archPatchesRevision, archPatchesHash }:
|
||||
|
||||
{ mkDerivation, lib, fetchgit, fetchsvn
|
||||
, pkgconfig, pythonPackages, cmake, makeWrapper
|
||||
, pkgconfig, pythonPackages, cmake, wrapGAppsHook
|
||||
, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify
|
||||
, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
|
||||
}:
|
||||
|
|
@ -37,7 +37,10 @@ mkDerivation rec {
|
|||
--replace '"notify"' '"${libnotify}/lib/libnotify.so"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake makeWrapper ];
|
||||
nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook ];
|
||||
|
||||
# We want to run wrapProgram manually (with additional parameters)
|
||||
dontWrapGApps = true;
|
||||
|
||||
buildInputs = [
|
||||
qtbase qtimageformats gtk3 libappindicator-gtk3
|
||||
|
|
@ -113,11 +116,14 @@ mkDerivation rec {
|
|||
for icon_size in 16 32 48 64 128 256 512; do
|
||||
install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
|
||||
done
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# This is necessary to run Telegram in a pure environment.
|
||||
# We also use gappsWrapperArgs from wrapGAppsHook.
|
||||
wrapProgram $out/bin/telegram-desktop \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \
|
||||
--suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
|
||||
--set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
|
||||
sed -i $out/bin/telegram-desktop \
|
||||
-e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
, sqlite, libsoup, libnice, gnutls}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "telepathy-gabble-0.18.3";
|
||||
name = "telepathy-gabble-0.18.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz";
|
||||
sha256 = "1hl9k6jwn2afwwv7br16wfw5szdhwxqziba47xd8vjwvgrh19iwf";
|
||||
sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig libxslt ];
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@ let
|
|||
'';
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "20180223";
|
||||
version = "20180323";
|
||||
name = "neomutt-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neomutt";
|
||||
repo = "neomutt";
|
||||
rev = "neomutt-${version}";
|
||||
sha256 = "1q0zwm8p2mk85icrbq42z4235mpqfra38pigd064kharx54k36sb";
|
||||
sha256 = "0wxk1fqxk9pf2s43mw7diixv3hpwdry1cyr2xh119gqjc27lrc5w";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
|
|||
--replace /etc/mime.types ${mime-types}/etc/mime.types
|
||||
|
||||
# The string conversion tests all fail with the first version of neomutt
|
||||
# that has tests (20180223) so we disable them for now.
|
||||
# that has tests (20180223) as well as 20180323 so we disable them for now.
|
||||
# I don't know if that is related to the tests or our build environment.
|
||||
# Try again with a later release.
|
||||
sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchFromGitHub, pkgs }:
|
||||
|
||||
let
|
||||
version = "2.9.5-2";
|
||||
version = "2.9.5-3";
|
||||
pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
|
||||
opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
|
||||
|
||||
|
|
@ -12,13 +12,9 @@ in stdenv.mkDerivation rec {
|
|||
owner = "drwetter";
|
||||
repo = "testssl.sh";
|
||||
rev = "v${version}";
|
||||
sha256 = "0nrzb2lhjq0s4dabyq8nldjijsld9gq4cxm8ys1cw5jyz1875g2w";
|
||||
sha256 = "07vlmf3gn2xa4wam2sql6c1s1hvj5adzd6l1fl12lq066v0k7r7n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with pkgs; [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
patches = [ ./testssl.patch ];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ let
|
|||
isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; };
|
||||
isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; };
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "gnumeric-1.12.38";
|
||||
name = "gnumeric-1.12.39";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
|
||||
sha256 = "3435d7d93a47a32764b1ec2d03f7fbb348a97af52530815e49370803a1a69c65";
|
||||
sha256 = "26cceb7fa97dc7eee7181a79a6251a85b1f1464dcaaaf7624829f7439c5f7d3f";
|
||||
};
|
||||
|
||||
configureFlags = "--disable-component";
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ in stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
passthru = {
|
||||
inherit srcs;
|
||||
inherit srcs jdk;
|
||||
};
|
||||
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
|
|
|||
|
|
@ -261,7 +261,7 @@ in stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
passthru = {
|
||||
inherit srcs;
|
||||
inherit srcs jdk;
|
||||
};
|
||||
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
|
|
|||
16
pkgs/applications/office/libreoffice/wrapper.nix
Normal file
16
pkgs/applications/office/libreoffice/wrapper.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{ libreoffice, runCommand, dbus, bash }:
|
||||
let
|
||||
jdk = libreoffice.jdk;
|
||||
in
|
||||
(runCommand "${libreoffice.name}" {
|
||||
inherit dbus libreoffice jdk bash;
|
||||
} ''
|
||||
mkdir -p "$out/bin"
|
||||
ln -s "${libreoffice}/share" "$out/share"
|
||||
substituteAll "${./wrapper.sh}" "$out/bin/soffice"
|
||||
chmod a+x "$out/bin/soffice"
|
||||
|
||||
for i in $(ls "${libreoffice}/bin/"); do
|
||||
test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")"
|
||||
done
|
||||
'') // { inherit libreoffice dbus; }
|
||||
27
pkgs/applications/office/libreoffice/wrapper.sh
Normal file
27
pkgs/applications/office/libreoffice/wrapper.sh
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
#!@bash@/bin/bash
|
||||
export JAVA_HOME="${JAVA_HOME:-@jdk@}"
|
||||
export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}"
|
||||
|
||||
if uname | grep Linux > /dev/null &&
|
||||
! ( test -n "$DBUS_SESSION_BUS_ADDRESS" &&
|
||||
test -n "$DBUS_SYSTEM_BUS_ADDRESS" ); then
|
||||
dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"
|
||||
mkdir "$dbus_tmp_dir"
|
||||
dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")"
|
||||
cat "@dbus@/share/dbus-1/system.conf" |
|
||||
grep -v '[<]user[>]messagebus' > "$dbus_socket_dir/system.conf"
|
||||
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
|
||||
"@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" >&2 &
|
||||
export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
|
||||
fi
|
||||
if test -z "$DBUS_SYSTEM_BUS_ADDRESS"; then
|
||||
"@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "$dbus_socket_dir/system.conf" --address "unix:path=$dbus_socket_dir/system" >&2 &
|
||||
export DBUS_SYSTEM_BUS_ADDRESS="unix:path=$dbus_socket_dir/system"
|
||||
fi
|
||||
fi
|
||||
|
||||
"@libreoffice@/bin/$(basename "$0")" "$@"
|
||||
code="$?"
|
||||
|
||||
test -n "$dbus_socket_dir" && rm -rf "$dbus_socket_dir"
|
||||
exit "$code"
|
||||
|
|
@ -3,10 +3,12 @@
|
|||
, doxygen, pcre, libpthreadstubs, libXdmcp
|
||||
|
||||
, oceSupport ? true, opencascade_oce
|
||||
, ngspiceSupport ? true, ngspice
|
||||
, ngspiceSupport ? true, libngspice
|
||||
, scriptingSupport ? true, swig, python, wxPython
|
||||
}:
|
||||
|
||||
assert ngspiceSupport -> libngspice != null;
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kicad-unstable-${version}";
|
||||
|
|
@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
|
||||
cairo curl openssl boost
|
||||
] ++ optional (oceSupport) opencascade_oce
|
||||
++ optional (ngspiceSupport) ngspice
|
||||
++ optional (ngspiceSupport) libngspice
|
||||
++ optionals (scriptingSupport) [ swig python wxPython ];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext}:
|
||||
{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext, fftw}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ngspice-27";
|
||||
|
|
@ -8,15 +8,16 @@ stdenv.mkDerivation {
|
|||
sha256 = "15862npsy5sj56z5yd1qiv3y0fgicrzj7wwn8hbcy89fgbawf20c";
|
||||
};
|
||||
|
||||
buildInputs = [ readline libX11 flex bison libICE libXaw libXext ];
|
||||
nativeBuildInputs = [ flex bison ];
|
||||
buildInputs = [ readline libX11 libICE libXaw libXext fftw ];
|
||||
|
||||
configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" "--with-ngshared" ];
|
||||
configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The Next Generation Spice (Electronic Circuit Simulator)";
|
||||
homepage = http://ngspice.sourceforge.net;
|
||||
license = with licenses; [ "BSD" gpl2 ];
|
||||
maintainers = with maintainers; [ viric rongcuid ];
|
||||
maintainers = with maintainers; [ bgamari viric rongcuid ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,10 @@ stdenv.mkDerivation rec {
|
|||
preferLocalBuild = true;
|
||||
|
||||
src = fetchurl {
|
||||
urls = "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
|
||||
urls = [
|
||||
"https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
|
||||
"http://web.archive.org/web/20180325075100/http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
|
||||
];
|
||||
sha256 = "1x2h40m62zbhmy42hln5gjj3fwk4b6803v3k9agpv5c6j468sq0p";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
, youtubeSupport ? true, youtube-dl ? null
|
||||
, vaapiSupport ? true, libva ? null
|
||||
, drmSupport ? true, libdrm ? null
|
||||
, openalSupport ? true, openalSoft ? null
|
||||
, vapoursynthSupport ? false, vapoursynth ? null
|
||||
, archiveSupport ? false, libarchive ? null
|
||||
, jackaudioSupport ? false, libjack2 ? null
|
||||
|
|
@ -59,6 +60,7 @@ assert dvdnavSupport -> available libdvdnav;
|
|||
assert bluraySupport -> available libbluray;
|
||||
assert speexSupport -> available speex;
|
||||
assert theoraSupport -> available libtheora;
|
||||
assert openalSupport -> available openalSoft;
|
||||
assert pulseSupport -> available libpulseaudio;
|
||||
assert bs2bSupport -> available libbs2b;
|
||||
assert cacaSupport -> available libcaca;
|
||||
|
|
@ -113,6 +115,7 @@ in stdenv.mkDerivation rec {
|
|||
(enableFeature archiveSupport "libarchive")
|
||||
(enableFeature dvdreadSupport "dvdread")
|
||||
(enableFeature dvdnavSupport "dvdnav")
|
||||
(enableFeature openalSupport "openal")
|
||||
(enableFeature vaapiSupport "vaapi")
|
||||
(enableFeature waylandSupport "wayland")
|
||||
(enableFeature stdenv.isLinux "dvbin")
|
||||
|
|
@ -143,6 +146,8 @@ in stdenv.mkDerivation rec {
|
|||
++ optional vdpauSupport libvdpau
|
||||
++ optional speexSupport speex
|
||||
++ optional bs2bSupport libbs2b
|
||||
++ optional openalSupport openalSoft
|
||||
++ optional (openalSupport && stdenv.isDarwin) darwin.apple_sdk.frameworks.OpenAL
|
||||
++ optional libpngSupport libpng
|
||||
++ optional youtubeSupport youtube-dl
|
||||
++ optional sdl2Support SDL2
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ let
|
|||
dynamicLinker =
|
||||
/**/ if libc == null then null
|
||||
else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*"
|
||||
else if targetPlatform.libc == "bionic" then "/system/bin/linker"
|
||||
else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2"
|
||||
else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2"
|
||||
# ARM with a wildcard, which can be "" or "-armhf".
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@ rec {
|
|||
|
||||
cp ${./tarsum.go} tarsum.go
|
||||
export GOPATH=$(pwd)
|
||||
mkdir src
|
||||
ln -sT ${docker.src}/components/engine/pkg/tarsum src/tarsum
|
||||
mkdir -p src/github.com/docker/docker/pkg
|
||||
ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
|
||||
go build
|
||||
|
||||
cp tarsum $out
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import (
|
|||
"io"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"tarsum"
|
||||
"github.com/docker/docker/pkg/tarsum"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ let makeDeps = dependencies:
|
|||
echo_build_heading() {
|
||||
start=""
|
||||
end=""
|
||||
if [[ x"${colors}" -eq x"always" ]]; then
|
||||
if [[ "${colors}" == "always" ]]; then
|
||||
start="$(printf '\033[0;1;32m')" #set bold, and set green.
|
||||
end="$(printf '\033[0m')" #returns to "normal"
|
||||
fi
|
||||
|
|
@ -34,7 +34,7 @@ let makeDeps = dependencies:
|
|||
noisily() {
|
||||
start=""
|
||||
end=""
|
||||
if [[ x"${colors}" -eq x"always" ]]; then
|
||||
if [[ "${colors}" == "always" ]]; then
|
||||
start="$(printf '\033[0;1;32m')" #set bold, and set green.
|
||||
end="$(printf '\033[0m')" #returns to "normal"
|
||||
fi
|
||||
|
|
@ -194,7 +194,7 @@ let makeDeps = dependencies:
|
|||
bold=""
|
||||
green=""
|
||||
boldgreen=""
|
||||
if [[ "${colors}" -eq "always" ]]; then
|
||||
if [[ "${colors}" == "always" ]]; then
|
||||
norm="$(printf '\033[0m')" #returns to "normal"
|
||||
bold="$(printf '\033[0;1m')" #set bold
|
||||
green="$(printf '\033[0;32m')" #set green
|
||||
|
|
@ -230,7 +230,7 @@ let makeDeps = dependencies:
|
|||
${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \
|
||||
$LINK ${deps}$EXTRA_LIB --cap-lints allow \
|
||||
$BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
|
||||
if [ "$crate_name_" -ne "$crate_name" ]; then
|
||||
if [ "$crate_name_" != "$crate_name" ]; then
|
||||
mv target/bin/$crate_name_ target/bin/$crate_name
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ];
|
||||
|
||||
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
|
||||
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "lib/nautilus/extensions-3.0";
|
||||
|
||||
postPatch = ''
|
||||
chmod +x postinstall.py # patchShebangs requires executable file
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme libunistring ];
|
||||
|
||||
mesonFlags = [
|
||||
"-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
|
||||
"-Ddbus_service_dir=share/dbus-1/services"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
|
|||
"-DENABLE_VALA_BINDINGS=ON"
|
||||
"-DENABLE_INTROSPECTION=ON"
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||
"-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
|
||||
];
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dudev_dir=${placeholder "out"}/lib/udev"
|
||||
"-Dudev_dir=lib/udev"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@ in
|
|||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
|
||||
sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v";
|
||||
|
|
@ -15,12 +13,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
patches = [ ./fix_introspection_paths.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ];
|
||||
buildInputs = [ glib ];
|
||||
|
||||
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
|
||||
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
--- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000
|
||||
+++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000
|
||||
@@ -12085,8 +12085,8 @@
|
||||
INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
|
||||
INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
|
||||
INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
|
||||
- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
|
||||
- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
|
||||
+ INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
|
||||
+ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
|
||||
INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
|
||||
INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
|
||||
INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
|
||||
|
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
patchShebangs .
|
||||
'';
|
||||
|
||||
mesonFlags = [ "-Dwith-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0" ];
|
||||
mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ];
|
||||
|
||||
wrapPrefixVariables = [ "PYTHONPATH" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-shell-impatience-${version}";
|
||||
version = "6564c21e4caf4a6bc5fe2bf21116d7c15408d494";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timbertson";
|
||||
repo = "gnome-shell-impatience";
|
||||
rev = version;
|
||||
sha256 = "10zyj42i07dcvaciv47qgkcs5g5n2bpc8a0m6fsimfi0442iwlcn";
|
||||
rev = "version-${version}";
|
||||
sha256 = "0kvdhlz41fjyqdgcfw6mrr9nali6wg2qwji3dvykzfi0aypljzpx";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
installPhase = ''
|
||||
cp -r impatience $out
|
||||
mkdir -p $out/share/gnome-shell/extensions
|
||||
cp -r impatience $out/share/gnome-shell/extensions/${uuid}
|
||||
'';
|
||||
|
||||
uuid = "impatience@gfxmonk.net";
|
||||
|
|
@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with stdenv.lib; {
|
||||
description = "Speed up builtin gnome-shell animations";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ aneeshusa timbertson ];
|
||||
maintainers = with maintainers; [ aneeshusa timbertson tiramiseb ];
|
||||
homepage = http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,28 @@
|
|||
{ stdenv, fetchFromGitHub, glib }:
|
||||
{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib_networking, libgtop, pkgs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-shell-system-monitor-${version}";
|
||||
version = "8b31f070e9e59109d729661ced313d6a63e31787";
|
||||
version = "33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paradoxxxzero";
|
||||
repo = "gnome-shell-system-monitor-applet";
|
||||
rev = version;
|
||||
sha256 = "0fm5zb6qp53jjy2mnkb8ybxygzjwpb314giiq0ywq87hhrpch8m3";
|
||||
rev = "v${version}";
|
||||
sha256 = "0abqaanl5r26x8f0mm0jgrjsr86hcx7mk75dx5c3zz7csw4nclkk";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
glib_networking
|
||||
libgtop
|
||||
];
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./paths_and_nonexisting_dirs.patch;
|
||||
gtop_path = "${libgtop}/lib/girepository-1.0";
|
||||
glib_net_path = "${glib_networking}/lib/girepository-1.0";
|
||||
})
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
|
|
@ -20,7 +30,8 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
installPhase = ''
|
||||
cp -r ${uuid} $out
|
||||
mkdir -p $out/share/gnome-shell/extensions
|
||||
cp -r ${uuid} $out/share/gnome-shell/extensions
|
||||
'';
|
||||
|
||||
uuid = "system-monitor@paradoxxx.zero.gmail.com";
|
||||
|
|
@ -28,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with stdenv.lib; {
|
||||
description = "Display system informations in gnome shell status bar";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ aneeshusa ];
|
||||
maintainers = with maintainers; [ aneeshusa tiramiseb ];
|
||||
homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js
|
||||
index b4b7f15..d139135 100644
|
||||
--- a/system-monitor@paradoxxx.zero.gmail.com/extension.js
|
||||
+++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js
|
||||
@@ -18,6 +18,9 @@
|
||||
|
||||
// Author: Florian Mounier aka paradoxxxzero
|
||||
|
||||
+imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@');
|
||||
+imports.gi.GIRepository.Repository.prepend_search_path('@glib_net_path@');
|
||||
+
|
||||
/* Ugly. This is here so that we don't crash old libnm-glib based shells unnecessarily
|
||||
* by loading the new libnm.so. Should go away eventually */
|
||||
const libnm_glib = imports.gi.GIRepository.Repository.get_default().is_registered("NMClient", "1.0");
|
||||
@@ -386,7 +389,7 @@ const smMountsMonitor = new Lang.Class({
|
||||
connected: false,
|
||||
_init: function () {
|
||||
this._volumeMonitor = Gio.VolumeMonitor.get();
|
||||
- let sys_mounts = ['/home', '/tmp', '/boot', '/usr', '/usr/local'];
|
||||
+ let sys_mounts = ['/home', '/tmp', '/boot'];
|
||||
this.base_mounts = ['/'];
|
||||
sys_mounts.forEach(Lang.bind(this, function (sMount) {
|
||||
if (this.is_sys_mount(sMount + '/')) {
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{ gsmakeDerivation, fetchurl, base }:
|
||||
let
|
||||
version = "0.25.0";
|
||||
version = "0.26.2";
|
||||
in
|
||||
gsmakeDerivation {
|
||||
name = "gnustep-gui-${version}";
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz";
|
||||
sha256 = "10jf3xir59qzbhhl0bvs9wdw40fsmvv6mdv5akdkia1rnck60xf5";
|
||||
sha256 = "1dsbkifnjha3ghq8xx55bpsbbng0cjsni3yz71r7342ax2ixcvxc";
|
||||
};
|
||||
buildInputs = [ base ];
|
||||
patches = [ ./fixup-all.patch ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper, gobjectIntrospection }:
|
||||
{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, wrapGAppsHook, gobjectIntrospection }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
majorVersion = "0.4";
|
||||
|
|
@ -9,19 +9,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0bfrqxig26i9qhm15kk7h9lgmzgnqada5snbbwqkp0n0pnyyh4ss";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${granite}/lib64/pkgconfig"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
for f in $out/bin/*; do
|
||||
wrapProgram $f \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$XDG_ICON_DIRS:$out/share"
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl cmake vala_0_38 pkgconfig makeWrapper
|
||||
perl cmake vala_0_38 pkgconfig wrapGAppsHook
|
||||
# For setup hook
|
||||
gobjectIntrospection
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.3/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.4/ -A '*.tar.xz' )
|
||||
|
|
|
|||
|
|
@ -3,355 +3,355 @@
|
|||
|
||||
{
|
||||
bluedevil = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/bluedevil-5.12.3.tar.xz";
|
||||
sha256 = "1vzdj2byxrsnxg1hkw8fhjnmxazypb8x6nplfi2wpjbm0inpv0gk";
|
||||
name = "bluedevil-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/bluedevil-5.12.4.tar.xz";
|
||||
sha256 = "1gr7zrs2h3xk6rc16wqh2fx40q6q2vm5nwk2fy9r6z639wyxhk2x";
|
||||
name = "bluedevil-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/breeze-5.12.3.tar.xz";
|
||||
sha256 = "0mknaxcgr51wbv43hhlplxmvi8k7xk73ns3ld86djj3mpa9cxfhw";
|
||||
name = "breeze-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/breeze-5.12.4.tar.xz";
|
||||
sha256 = "12baji960mfkb9ynkhz6c2a76m8fwx4kvzwifwn40sxqv5m857w7";
|
||||
name = "breeze-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-grub = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/breeze-grub-5.12.3.tar.xz";
|
||||
sha256 = "1fh26sywr9cawywndw16zhdhs6pz9bfx0i9j0x1v7nbbnz0qam2b";
|
||||
name = "breeze-grub-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/breeze-grub-5.12.4.tar.xz";
|
||||
sha256 = "0jnpwznhfml9mshx9zl9wsi8s6ygfplfw4bycq1r9gyxzlcm9zvs";
|
||||
name = "breeze-grub-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-gtk = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/breeze-gtk-5.12.3.tar.xz";
|
||||
sha256 = "0nw1d62fd74m9dsvnvy25bcd1y08fv3c51jnp06b3p1yljx8gw8x";
|
||||
name = "breeze-gtk-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/breeze-gtk-5.12.4.tar.xz";
|
||||
sha256 = "183pj18ldhql845xd2lvd4klp6m2xiiaszprw83n7048s9b0bk4c";
|
||||
name = "breeze-gtk-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-plymouth = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/breeze-plymouth-5.12.3.tar.xz";
|
||||
sha256 = "15px5iw237lb27ms70w8vcm1kqf5k5wmyqkxqdd70x8aqrqzf9zn";
|
||||
name = "breeze-plymouth-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/breeze-plymouth-5.12.4.tar.xz";
|
||||
sha256 = "1apv2jqcjmsfvj4xi736vqsly57wwzxv088hsqcryv3l4v4qkyfr";
|
||||
name = "breeze-plymouth-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
discover = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/discover-5.12.3.tar.xz";
|
||||
sha256 = "132hbrnpr416yyzl8yh1d66j6j8h7paxw1lx2dm6fpyd0nf8zkdd";
|
||||
name = "discover-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/discover-5.12.4.tar.xz";
|
||||
sha256 = "1gyddpafis1yfhh1dz0zvjca8pxnq5z0xvwfbmyh062xmhfy66wq";
|
||||
name = "discover-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
drkonqi = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/drkonqi-5.12.3.tar.xz";
|
||||
sha256 = "0vc5q9g9chwsbbg98mg0mnxcfva7dm9qgcpwxv5v0qdlddzm6m7m";
|
||||
name = "drkonqi-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/drkonqi-5.12.4.tar.xz";
|
||||
sha256 = "0ijrhd689w6pg4biikfv7w6h5hwfjmsp7wcbpd2dq0xwjp3vnyb6";
|
||||
name = "drkonqi-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivitymanagerd = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/kactivitymanagerd-5.12.3.tar.xz";
|
||||
sha256 = "0fmr8n4s4qbfvrg0nmxl0rdl07rsy4l76idramn85rfbplv4nqr1";
|
||||
name = "kactivitymanagerd-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/kactivitymanagerd-5.12.4.tar.xz";
|
||||
sha256 = "1llni6dz8014r8gaihnaxg0nn6ihjvqy7bfyigfda6iz5gwfbpcg";
|
||||
name = "kactivitymanagerd-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kde-cli-tools = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/kde-cli-tools-5.12.3.tar.xz";
|
||||
sha256 = "0d2mkrpy2pib0za75m2mg6pvkklbwizh14cqi3zabqi384fys1j3";
|
||||
name = "kde-cli-tools-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/kde-cli-tools-5.12.4.tar.xz";
|
||||
sha256 = "0w6iz9rqi9b6vy18jxksah5lr44211dhfgaxccm0gmggqpiqm5wb";
|
||||
name = "kde-cli-tools-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kdecoration = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/kdecoration-5.12.3.tar.xz";
|
||||
sha256 = "1xsjq8aw8r4yl5wpr0alihfaf6r146x4rz7p8k635n771b25ilsy";
|
||||
name = "kdecoration-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/kdecoration-5.12.4.tar.xz";
|
||||
sha256 = "0njs3b05hvm5s04cfn56dc98yc8sw52hwlclx0qf1hqcsjmm8bnj";
|
||||
name = "kdecoration-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kde-gtk-config = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/kde-gtk-config-5.12.3.tar.xz";
|
||||
sha256 = "0wsxz5v585srkn8qbb4b82ci1wgrpzg87krixzsxzd3k0wc0c71q";
|
||||
name = "kde-gtk-config-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/kde-gtk-config-5.12.4.tar.xz";
|
||||
sha256 = "00j2279z4b9qknip4rpaliwpwv25g3d6j9s0ajs151x94cl18wd6";
|
||||
name = "kde-gtk-config-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kdeplasma-addons = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/kdeplasma-addons-5.12.3.tar.xz";
|
||||
sha256 = "06g61flgszaks5p9xrlnyjkdyfddyxrgv0vyf85h78wvydxca18p";
|
||||
name = "kdeplasma-addons-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/kdeplasma-addons-5.12.4.tar.xz";
|
||||
sha256 = "0ggvxmsj4r25sjaap377i6ap2qkdhjqwslcjym9bcyys1lldbcg5";
|
||||
name = "kdeplasma-addons-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kgamma5 = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/kgamma5-5.12.3.tar.xz";
|
||||
sha256 = "0nvv4fg2hjxxmkjr1yrwsywgcm2y8w7xng928kisgaarf55dfmvm";
|
||||
name = "kgamma5-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/kgamma5-5.12.4.tar.xz";
|
||||
sha256 = "1v19ay77vv8y37pxqainkrlh0lpajwxgx4xxra84gzd8g7l4zs0h";
|
||||
name = "kgamma5-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
khotkeys = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/khotkeys-5.12.3.tar.xz";
|
||||
sha256 = "1sx3g6pk23lwpc7x2a90vakb4vlmr3lzmhy86iq07r0kbp6fz3wa";
|
||||
name = "khotkeys-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/khotkeys-5.12.4.tar.xz";
|
||||
sha256 = "1lj8axpimh34vbpgwnfhkh3f7njmqy7jihqk51vkq7ngcy1bmd6f";
|
||||
name = "khotkeys-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kinfocenter = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/kinfocenter-5.12.3.tar.xz";
|
||||
sha256 = "0l9mfxylcf9rmq3yih7gp43vxy8j9rfgniml831prax5kcqgk3yr";
|
||||
name = "kinfocenter-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/kinfocenter-5.12.4.tar.xz";
|
||||
sha256 = "0dgybc8xa5lxgmw3nxfh5y085921qm5x6aw0233mwx3zj4v6nsj3";
|
||||
name = "kinfocenter-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kmenuedit = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/kmenuedit-5.12.3.tar.xz";
|
||||
sha256 = "1x60z8g1lphsjmsrf6j3br0nx5ip6rk8f8g4r1xmbczgpnyzsqr4";
|
||||
name = "kmenuedit-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/kmenuedit-5.12.4.tar.xz";
|
||||
sha256 = "063509xbvpk2n86anpl2kcsb1v4zvx6ycwl1ppyjhgg4jim9p099";
|
||||
name = "kmenuedit-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kscreen = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/kscreen-5.12.3.tar.xz";
|
||||
sha256 = "1azgvl7zx98a4jlqdb3w2h3951kg05l5lgz2bqfss5npm2kddis9";
|
||||
name = "kscreen-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/kscreen-5.12.4.tar.xz";
|
||||
sha256 = "1pix8gfvgig5phvcqjc7yqvn1pgmdn6l8g56n06pijicrpksq315";
|
||||
name = "kscreen-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kscreenlocker = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/kscreenlocker-5.12.3.tar.xz";
|
||||
sha256 = "1incnja96342wdyqyayn4kyk5fhmyvg7r13pszcc9a5gx937n2dm";
|
||||
name = "kscreenlocker-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/kscreenlocker-5.12.4.tar.xz";
|
||||
sha256 = "187c6azmbcfs5w18f450f75hikpvh3lhz7qn8zb93kfm65yvjz1m";
|
||||
name = "kscreenlocker-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
ksshaskpass = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/ksshaskpass-5.12.3.tar.xz";
|
||||
sha256 = "11wgb311pi1mxhy1xiylg5y3blyl234gcyfdn0xivmrgjn1kzg7h";
|
||||
name = "ksshaskpass-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/ksshaskpass-5.12.4.tar.xz";
|
||||
sha256 = "0k405qp8ji84gd7h3lsyfhsya7z55kw2klj9a0ld9z5r7jpr95z5";
|
||||
name = "ksshaskpass-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
ksysguard = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/ksysguard-5.12.3.tar.xz";
|
||||
sha256 = "0w7yz7qwfz3hy0vg95rv09c4yzw7g90hm9a0jzz3prdm1sicsvbc";
|
||||
name = "ksysguard-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/ksysguard-5.12.4.tar.xz";
|
||||
sha256 = "0svk5ggdbjqq9lg4ggwijy7nbwmn3mdkmvm1jqbd174myyd6hmwk";
|
||||
name = "ksysguard-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kwallet-pam = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/kwallet-pam-5.12.3.tar.xz";
|
||||
sha256 = "106dyl7w1b29351kzmgh5fjvy06yf6ab26x5p0aj7di2ymai9cqz";
|
||||
name = "kwallet-pam-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/kwallet-pam-5.12.4.tar.xz";
|
||||
sha256 = "058xxqkyyiwn34iwbmapk6bk6fi3l1g4vwbf125vc9pcbx6nqn2q";
|
||||
name = "kwallet-pam-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kwayland-integration = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/kwayland-integration-5.12.3.tar.xz";
|
||||
sha256 = "0cx1dnds4wr5fm2kbc7mlkpq82pzhq59jgij273lr6y656drxxdi";
|
||||
name = "kwayland-integration-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/kwayland-integration-5.12.4.tar.xz";
|
||||
sha256 = "1lcz12iqisls2icv4jmgjndlamz2zlfyd9lbn6j2hizz7riybsla";
|
||||
name = "kwayland-integration-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kwin = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/kwin-5.12.3.tar.xz";
|
||||
sha256 = "0xsqiqnvk1gxrgik2cpqmzyl3q3ncr58r5p0xbyzqsybqz1jys71";
|
||||
name = "kwin-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/kwin-5.12.4.tar.xz";
|
||||
sha256 = "0br27craalz6vqcv2g7jkskk0ia91hrir1wf1phm2lrnn4yadgf8";
|
||||
name = "kwin-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kwrited = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/kwrited-5.12.3.tar.xz";
|
||||
sha256 = "1yhx94wdf19k2qaym7d89xj03rs6br2mk6z64nkw70d8i01vlax1";
|
||||
name = "kwrited-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/kwrited-5.12.4.tar.xz";
|
||||
sha256 = "0m2snmvyxfnmlhfpvghp3w6apmba7rna9xsp5szdzrxgrd92ibgy";
|
||||
name = "kwrited-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
libkscreen = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/libkscreen-5.12.3.tar.xz";
|
||||
sha256 = "09pg4fnzyklhgkgqrwqpc0kb4siiyz67mq2lyk5h50gmys4l48b4";
|
||||
name = "libkscreen-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/libkscreen-5.12.4.tar.xz";
|
||||
sha256 = "1dq5mbz7vqz4dzgnpsxgmygnz00d7ziqs98qcdgfcbvkh0j4sqsr";
|
||||
name = "libkscreen-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
libksysguard = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/libksysguard-5.12.3.tar.xz";
|
||||
sha256 = "06lg3sd8h3wya9ss3cii9fsn4r4al2vqa0m0zb68s2l5340mcy7l";
|
||||
name = "libksysguard-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/libksysguard-5.12.4.tar.xz";
|
||||
sha256 = "09mqfr4dxiq4xs4ihrxvsa9wf8azmilpnl5jbi06pfw5bd1q6fpd";
|
||||
name = "libksysguard-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
milou = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/milou-5.12.3.tar.xz";
|
||||
sha256 = "0ywa8yvblc07mzmrzhrmsgdygzxdq6c3nnd7ayw68iil8886r7wq";
|
||||
name = "milou-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/milou-5.12.4.tar.xz";
|
||||
sha256 = "0v0m4a0idah99dvsmgng6kmlcqwpwh1rbd2j9ih7ka1xmlshdml7";
|
||||
name = "milou-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/oxygen-5.12.3.tar.xz";
|
||||
sha256 = "1fcp3swa7b8qk2zzvs9nxjp0100hgpxc4av39rvvw0d2m647k856";
|
||||
name = "oxygen-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/oxygen-5.12.4.tar.xz";
|
||||
sha256 = "1k9kls7xzwb49gwjlhyxhg2jn9zh034csbdlz0pnq9h1yzwph4wa";
|
||||
name = "oxygen-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-desktop = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/plasma-desktop-5.12.3.tar.xz";
|
||||
sha256 = "1mz20r7cc7mn1ay7dkz6sikhadnk2dsxf5y6ijlpan7mp3ljlsq8";
|
||||
name = "plasma-desktop-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/plasma-desktop-5.12.4.tar.xz";
|
||||
sha256 = "16g2vnbfd7nl61hfx7i6b3m0hms2aw4v85nbj8mf2i6csc1vzhmy";
|
||||
name = "plasma-desktop-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-integration = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/plasma-integration-5.12.3.tar.xz";
|
||||
sha256 = "0q9kgfsa530qkjari4zw6bxrk7127v6gpirs76phw9lphpqbvgww";
|
||||
name = "plasma-integration-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/plasma-integration-5.12.4.tar.xz";
|
||||
sha256 = "0qdyckmm52d0bf0062v103hy5szqqgfbh4z6h9bbjcz5l372aklb";
|
||||
name = "plasma-integration-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-nm = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/plasma-nm-5.12.3.tar.xz";
|
||||
sha256 = "143xma5i5qpfzg727pixvjgwcczj6zi0jwyibd05qmpbcyy09c9w";
|
||||
name = "plasma-nm-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/plasma-nm-5.12.4.tar.xz";
|
||||
sha256 = "1mvj41hxd42wk8ja186vxv080igrdza6sqbgcajk48r2klybpfzj";
|
||||
name = "plasma-nm-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-pa = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/plasma-pa-5.12.3.tar.xz";
|
||||
sha256 = "0jlx07isw63nw2dfvn4sbv8j0az8bw62j7wp2mhxnwn5g6afci2l";
|
||||
name = "plasma-pa-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/plasma-pa-5.12.4.tar.xz";
|
||||
sha256 = "1mngqa9957m45ij73xp3lzp19hmwwq9h40ig39mwh20gm5jrdw56";
|
||||
name = "plasma-pa-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-sdk = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/plasma-sdk-5.12.3.tar.xz";
|
||||
sha256 = "0hla9vi4yp79fmv06w89974fxzsfxnxfad4iyhpqpsrp3g004qli";
|
||||
name = "plasma-sdk-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/plasma-sdk-5.12.4.tar.xz";
|
||||
sha256 = "1mw477p1z396gsbdx3m9cp0b2ljhqjw39grklg7l4cgrhiwrnjk2";
|
||||
name = "plasma-sdk-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-tests = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/plasma-tests-5.12.3.tar.xz";
|
||||
sha256 = "1025prmvwlx5id14243m14hmz626nbpzn98q25i1nagmj2whw4w7";
|
||||
name = "plasma-tests-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/plasma-tests-5.12.4.tar.xz";
|
||||
sha256 = "13gq7mfimh4xd4f2vqaqri3f1v8nh7yixqppjip8s9mq3amf6xd9";
|
||||
name = "plasma-tests-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-vault = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/plasma-vault-5.12.3.tar.xz";
|
||||
sha256 = "0a9cqfvxjzcgka786s9arz3zahl2qpj6qkh5vdxpf6akvcffw70h";
|
||||
name = "plasma-vault-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/plasma-vault-5.12.4.tar.xz";
|
||||
sha256 = "022vqjra25v9bw9j14j0a5jl9r08iqvzd5zn0dhz6l4bj0amcd8n";
|
||||
name = "plasma-vault-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-workspace = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/plasma-workspace-5.12.3.tar.xz";
|
||||
sha256 = "0br36qyd7w7cgd6fzw1iai06mfzyvsf94qyip008h68j92wznfcy";
|
||||
name = "plasma-workspace-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-5.12.4.tar.xz";
|
||||
sha256 = "00n2i6hj0fqss69gmmdhf32sfybak3l1iw379ljc3l4k6b3kzmh7";
|
||||
name = "plasma-workspace-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-workspace-wallpapers = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/plasma-workspace-wallpapers-5.12.3.tar.xz";
|
||||
sha256 = "0gmpf0d7dzpnmm9lzgjqmr201mjkvjwbf0qlg5n87w7j9j4c580v";
|
||||
name = "plasma-workspace-wallpapers-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-wallpapers-5.12.4.tar.xz";
|
||||
sha256 = "1y2mqkql2nadq3npxjp5hr2vzq3i45b4xp7gzcjl9bb2wppmhv4j";
|
||||
name = "plasma-workspace-wallpapers-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plymouth-kcm = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/plymouth-kcm-5.12.3.tar.xz";
|
||||
sha256 = "1zqmlmzrxmvm49mj33wj51q83j15rq8a6v3xmv7fr55gsfh9hmpk";
|
||||
name = "plymouth-kcm-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/plymouth-kcm-5.12.4.tar.xz";
|
||||
sha256 = "1aakf2qrbnnv2n2rp57jql6nvl9i5mxpy0f4f5bjlqjxhzjlwwkn";
|
||||
name = "plymouth-kcm-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
polkit-kde-agent = {
|
||||
version = "1-5.12.3";
|
||||
version = "1-5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/polkit-kde-agent-1-5.12.3.tar.xz";
|
||||
sha256 = "0kb2ijjfqncrw02lrkh6jw2g2rps7aqs7v20gjdam9sacmnwy5j0";
|
||||
name = "polkit-kde-agent-1-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/polkit-kde-agent-1-5.12.4.tar.xz";
|
||||
sha256 = "0wwk1cr4mh2csjv0xrahzwyxyg8znd839zz518hfxdcv9a1rba2q";
|
||||
name = "polkit-kde-agent-1-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
powerdevil = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/powerdevil-5.12.3.tar.xz";
|
||||
sha256 = "1xj6d4b3iam0xpv27506k11qyh9bwafq4vlwah6bla944cvza484";
|
||||
name = "powerdevil-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/powerdevil-5.12.4.tar.xz";
|
||||
sha256 = "043k0zhab6nqa1kc09d9d8jg7j1sd7jy0zhrwb66lf29yc6iyahx";
|
||||
name = "powerdevil-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
sddm-kcm = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/sddm-kcm-5.12.3.tar.xz";
|
||||
sha256 = "1fd3ski6pnz6lba2zwvwqnxrszsn5505gnxbs15wc7zk6avf2hp2";
|
||||
name = "sddm-kcm-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/sddm-kcm-5.12.4.tar.xz";
|
||||
sha256 = "0bm8h5r4nin0hx1nfqya1lxcp93745shk6ifqrizgzw1ldqqyah7";
|
||||
name = "sddm-kcm-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
systemsettings = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/systemsettings-5.12.3.tar.xz";
|
||||
sha256 = "05l3yl27577567apmbiw884qkbrlgjzwz93s26va76apqn71vali";
|
||||
name = "systemsettings-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/systemsettings-5.12.4.tar.xz";
|
||||
sha256 = "0af2vqnlwxa7ldra78y0gwq1cra227q49ww7w1cnvgq0il7cav4a";
|
||||
name = "systemsettings-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
user-manager = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/user-manager-5.12.3.tar.xz";
|
||||
sha256 = "11glncc24qna9v6mjz7rgv18nrx90bhmfamlf07n3fziz9fmxvkh";
|
||||
name = "user-manager-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/user-manager-5.12.4.tar.xz";
|
||||
sha256 = "1y144lw1a4q4pp9hw31lr806fpm1p397ibpbagcdr3xaka2z36lm";
|
||||
name = "user-manager-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
xdg-desktop-portal-kde = {
|
||||
version = "5.12.3";
|
||||
version = "5.12.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.12.3/xdg-desktop-portal-kde-5.12.3.tar.xz";
|
||||
sha256 = "0swy8kcczvs2ariyjrkln6mvc0xqrjznpkhw5gzyh61v3hpddgk9";
|
||||
name = "xdg-desktop-portal-kde-5.12.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.12.4/xdg-desktop-portal-kde-5.12.4.tar.xz";
|
||||
sha256 = "18b97mbyfqvf2ygwrggi5zvkv8a9givqjlyaqi184h8mgndn044c";
|
||||
name = "xdg-desktop-portal-kde-5.12.4.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Optimizing Scheme to C compiler, bootstrap step";
|
||||
homepage = "http://gambitscheme.org";
|
||||
license = stdenv.lib.licenses.lgpl2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Optimizing Scheme to C compiler";
|
||||
homepage = "http://gambitscheme.org";
|
||||
license = stdenv.lib.licenses.lgpl2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ EOF
|
|||
description = "Gerbil Scheme";
|
||||
homepage = "https://github.com/vyzo/gerbil";
|
||||
license = stdenv.lib.licenses.lgpl2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ fare ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
|
||||
|
||||
let
|
||||
version = "1.2.30";
|
||||
version = "1.2.31";
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
name = "kotlin-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
|
||||
sha256 = "0wg08cncwfajxfx8860wdf5dr4h92j069qvdr90l5m01ff3nasad";
|
||||
sha256 = "09l0vjff9kkiprf5irgq1sb9cils8plbzbrf55ajj8m5fyxcd6fs";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
, libjpeg, giflib
|
||||
, setJavaClassPath
|
||||
, minimal ? false
|
||||
#, enableInfinality ? true # font rendering patch
|
||||
, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
|
||||
}:
|
||||
|
||||
|
|
@ -20,18 +19,16 @@ let
|
|||
|
||||
update = "10";
|
||||
build = "46";
|
||||
baseurl = "http://hg.openjdk.java.net/jdk/jdk10";
|
||||
repover = "jdk-${update}+${build}";
|
||||
paxflags = if stdenv.isi686 then "msp" else "m";
|
||||
jdk10 = fetchurl {
|
||||
url = "${baseurl}/archive/${repover}.tar.gz";
|
||||
sha256 = "1n5jccf2rw15hzwppnvy87bysb84g3fcnkxbjhj8gi0iv79dxlc7";
|
||||
};
|
||||
|
||||
openjdk10 = stdenv.mkDerivation {
|
||||
name = "openjdk-${update}-b${build}";
|
||||
|
||||
srcs = [ jdk10 ];
|
||||
sourceRoot = ".";
|
||||
src = fetchurl {
|
||||
url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz";
|
||||
sha256 = "1a2cjad816qilsigkq035rqzfhzmq5vaz1klilrrws456flbsjlg";
|
||||
};
|
||||
|
||||
outputs = [ "out" "jre" ];
|
||||
|
||||
|
|
@ -44,10 +41,6 @@ let
|
|||
gtk2 gnome_vfs GConf glib
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
cd jdk10*
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./fix-java-home-jdk10.patch
|
||||
./read-truststore-from-env-jdk10.patch
|
||||
|
|
@ -126,12 +119,6 @@ let
|
|||
|
||||
lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
|
||||
|
||||
# Make sure cmm/*.pf are not symlinks:
|
||||
# https://youtrack.jetbrains.com/issue/IDEA-147272
|
||||
# in 9, it seems no *.pf files end up in $out ... ?
|
||||
# rm -rf $out/lib/openjdk/jre/lib/cmm
|
||||
# ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
|
||||
|
||||
# Set PaX markings
|
||||
exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
|
||||
echo "to mark: *$exes*"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchFromGitHub, coq }:
|
||||
|
||||
let param =
|
||||
let params =
|
||||
{
|
||||
"8.6" = {
|
||||
rev = "v8.6.0";
|
||||
|
|
@ -14,7 +14,8 @@ let param =
|
|||
rev = "V8.8+beta1";
|
||||
sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";
|
||||
};
|
||||
}."${coq.coq-version}"
|
||||
};
|
||||
param = params."${coq.coq-version}"
|
||||
; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -37,6 +38,6 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
passthru = {
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ];
|
||||
compatibleCoqVersions = v: builtins.hasAttr v params;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -244,6 +244,8 @@ self: super: {
|
|||
# base bound
|
||||
digit = doJailbreak super.digit;
|
||||
|
||||
# https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat
|
||||
hnix = doJailbreak super.hnix;
|
||||
|
||||
# Fails for non-obvious reasons while attempting to use doctest.
|
||||
search = dontCheck super.search;
|
||||
|
|
@ -920,17 +922,6 @@ self: super: {
|
|||
# https://github.com/bos/text-icu/issues/32
|
||||
text-icu = dontCheck super.text-icu;
|
||||
|
||||
# https://github.com/strake/lenz.hs/issues/2
|
||||
lenz =
|
||||
let patch = pkgs.fetchpatch
|
||||
{ url = https://github.com/strake/lenz.hs/commit/4b9b79104759b9c6b24484455e1eb0d962eb3cff.patch;
|
||||
sha256 = "02i0w9i55a4r251wgjzl5vbk6m2qhilwl7bfp5jwmf22z66sglyn";
|
||||
};
|
||||
in overrideCabal super.lenz (drv:
|
||||
{ patches = (drv.patches or []) ++ [ patch ];
|
||||
editedCabalFile = null;
|
||||
});
|
||||
|
||||
# https://github.com/haskell/cabal/issues/4969
|
||||
haddock-library_1_4_4 = dontHaddock super.haddock-library_1_4_4;
|
||||
haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; };
|
||||
|
|
@ -1014,4 +1005,7 @@ self: super: {
|
|||
# https://github.com/GaloisInc/pure-zlib/issues/6
|
||||
pure-zlib = doJailbreak super.pure-zlib;
|
||||
|
||||
# https://github.com/strake/lenz-template.hs/issues/1
|
||||
lenz-template = doJailbreak super.lenz-template;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -239,17 +239,7 @@ self: super: {
|
|||
};
|
||||
});
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
singletons = overrideCabal super.singletons (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## th-desugar ==1.7.*
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "goldfirere";
|
||||
repo = "singletons";
|
||||
rev = "23aa4bdaf05ce025a2493b35ec3c26cc94e3fdce";
|
||||
sha256 = "0hw12v4z8jxmykc3j8z6g27swmfpxv40bgnx7nl0ialpwbz9mz27";
|
||||
};
|
||||
});
|
||||
singletons = super.singletons_2_4_1;
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
tar = overrideCabal super.tar (drv: {
|
||||
|
|
@ -264,18 +254,7 @@ self: super: {
|
|||
};
|
||||
});
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
th-desugar = overrideCabal super.th-desugar (drv: {
|
||||
## • Could not deduce (MonadIO (DsM q))
|
||||
## arising from the 'deriving' clause of a data type declaration
|
||||
## from the context: Quasi q
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "goldfirere";
|
||||
repo = "th-desugar";
|
||||
rev = "4ca98c6492015e6ad063d3ad1a2ad6c4f0a56837";
|
||||
sha256 = "1n3myd3gia9qsgdvrwqa023d3g7wkrhyv0wc8czwzz0lj9xzh7lw";
|
||||
};
|
||||
});
|
||||
th-desugar = super.th-desugar_1_8;
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
websockets = overrideCabal super.websockets (drv: {
|
||||
|
|
@ -649,9 +628,7 @@ self: super: {
|
|||
|
||||
# Older versions don't compile.
|
||||
brick = self.brick_0_35_1;
|
||||
getopt-generics = self.getopt-generics_0_13_0_2;
|
||||
HaTeX = self.HaTeX_3_19_0_0;
|
||||
json = self.json_0_9_2;
|
||||
matrix = self.matrix_0_3_6_1;
|
||||
pandoc = self.pandoc_2_1_3;
|
||||
pandoc-types = self.pandoc-types_1_17_4_2;
|
||||
|
|
|
|||
|
|
@ -38,22 +38,22 @@ core-packages:
|
|||
- ghcjs-base-0
|
||||
|
||||
default-package-overrides:
|
||||
# LTS Haskell 11.1
|
||||
# LTS Haskell 11.2
|
||||
- abstract-deque ==0.3
|
||||
- abstract-deque-tests ==0.3
|
||||
- abstract-par ==0.3.3
|
||||
- accelerate ==1.1.1.0
|
||||
- accelerate-arithmetic ==1.0
|
||||
- accelerate-arithmetic ==1.0.0.1
|
||||
- accelerate-bignum ==0.1.0.0
|
||||
- accelerate-blas ==0.1.0.1
|
||||
- accelerate-fft ==1.1.0.0
|
||||
- accelerate-fftw ==1.0
|
||||
- accelerate-fourier ==1.0.0.4
|
||||
- accelerate-fftw ==1.0.0.1
|
||||
- accelerate-fourier ==1.0.0.5
|
||||
- accelerate-io ==1.0.0.1
|
||||
- accelerate-llvm ==1.1.0.0
|
||||
- accelerate-llvm-native ==1.1.0.1
|
||||
- accelerate-llvm-ptx ==1.1.0.1
|
||||
- accelerate-utility ==1.0
|
||||
- accelerate-utility ==1.0.0.1
|
||||
- accuerr ==0.2.0.2
|
||||
- ace ==0.6
|
||||
- action-permutations ==0.0.0.1
|
||||
|
|
@ -235,7 +235,7 @@ default-package-overrides:
|
|||
- bson-lens ==0.1.1
|
||||
- btrfs ==0.1.2.3
|
||||
- buchhaltung ==0.0.7
|
||||
- buffer-builder ==0.2.4.4
|
||||
- buffer-builder ==0.2.4.5
|
||||
- buffer-pipe ==0.0
|
||||
- butcher ==1.3.0.0
|
||||
- bv ==0.5
|
||||
|
|
@ -252,7 +252,7 @@ default-package-overrides:
|
|||
- bytestring-tree-builder ==0.2.7.1
|
||||
- bytestring-trie ==0.2.4.1
|
||||
- bzlib ==0.5.0.5
|
||||
- bzlib-conduit ==0.3.0
|
||||
- bzlib-conduit ==0.3.0.1
|
||||
- c2hs ==0.28.3
|
||||
- Cabal ==2.0.1.1
|
||||
- cabal-doctest ==1.0.6
|
||||
|
|
@ -275,7 +275,7 @@ default-package-overrides:
|
|||
- cassava-records ==0.1.0.4
|
||||
- cassette ==0.1.0
|
||||
- cast ==0.1.0.2
|
||||
- cayley-client ==0.4.4
|
||||
- cayley-client ==0.4.5
|
||||
- cereal ==0.5.5.0
|
||||
- cereal-conduit ==0.8.0
|
||||
- cereal-text ==0.1.0.2
|
||||
|
|
@ -303,6 +303,7 @@ default-package-overrides:
|
|||
- cipher-des ==0.0.6
|
||||
- cipher-rc4 ==0.1.4
|
||||
- circle-packing ==0.1.0.6
|
||||
- cisco-spark-api ==0.1.0.2
|
||||
- clang-compilation-database ==0.1.0.1
|
||||
- classyplate ==0.3.0.2
|
||||
- classy-prelude ==1.4.0
|
||||
|
|
@ -351,7 +352,7 @@ default-package-overrides:
|
|||
- concurrent-split ==0.0.1
|
||||
- concurrent-supply ==0.1.8
|
||||
- cond ==0.4.1.1
|
||||
- conduit ==1.3.0.1
|
||||
- conduit ==1.3.0.2
|
||||
- conduit-algorithms ==0.0.8.0
|
||||
- conduit-combinators ==1.3.0
|
||||
- conduit-connection ==0.1.0.4
|
||||
|
|
@ -429,12 +430,12 @@ default-package-overrides:
|
|||
- czipwith ==1.0.0.0
|
||||
- data-accessor ==0.2.2.7
|
||||
- data-accessor-mtl ==0.2.0.4
|
||||
- data-accessor-template ==0.2.1.14
|
||||
- data-accessor-template ==0.2.1.15
|
||||
- data-accessor-transformers ==0.2.1.7
|
||||
- data-binary-ieee754 ==0.4.4
|
||||
- data-bword ==0.1.0.1
|
||||
- data-checked ==0.3
|
||||
- data-clist ==0.1.2.0
|
||||
- data-clist ==0.1.2.1
|
||||
- data-default ==0.7.1.1
|
||||
- data-default-class ==0.1.2.0
|
||||
- data-default-instances-containers ==0.0.1
|
||||
|
|
@ -442,7 +443,7 @@ default-package-overrides:
|
|||
- data-default-instances-old-locale ==0.0.1
|
||||
- data-diverse ==2.0.1.0
|
||||
- data-diverse-lens ==2.1.0.0
|
||||
- datadog ==0.2.0.0
|
||||
- datadog ==0.2.2.0
|
||||
- data-dword ==0.3.1.2
|
||||
- data-endian ==0.1.1
|
||||
- data-fix ==0.2.0
|
||||
|
|
@ -467,8 +468,9 @@ default-package-overrides:
|
|||
- dbcleaner ==0.1.3
|
||||
- dbus ==0.10.15
|
||||
- debian-build ==0.10.1.0
|
||||
- debug ==0.1
|
||||
- debug ==0.1.1
|
||||
- Decimal ==0.5.1
|
||||
- declarative ==0.5.2
|
||||
- deepseq-generics ==0.2.0.0
|
||||
- dejafu ==1.3.2.0
|
||||
- dependent-map ==0.2.4.0
|
||||
|
|
@ -478,6 +480,7 @@ default-package-overrides:
|
|||
- deriving-compat ==0.4.1
|
||||
- descriptive ==0.9.4
|
||||
- dhall ==1.11.1
|
||||
- dhall-json ==1.0.13
|
||||
- dice ==0.1
|
||||
- dictionaries ==0.2.0.4
|
||||
- Diff ==0.3.4
|
||||
|
|
@ -487,7 +490,7 @@ default-package-overrides:
|
|||
- dimensional ==1.1
|
||||
- directory-tree ==0.12.1
|
||||
- direct-rocksdb ==0.0.3
|
||||
- direct-sqlite ==2.3.22
|
||||
- direct-sqlite ==2.3.23
|
||||
- discount ==0.1.1
|
||||
- discrimination ==0.3
|
||||
- disk-free-space ==0.1.0.1
|
||||
|
|
@ -516,7 +519,7 @@ default-package-overrides:
|
|||
- doctemplates ==0.2.2.1
|
||||
- doctest ==0.13.0
|
||||
- doctest-discover ==0.1.0.7
|
||||
- doctest-driver-gen ==0.2.0.0
|
||||
- doctest-driver-gen ==0.2.0.1
|
||||
- do-list ==1.0.1
|
||||
- dom-parser ==3.0.0
|
||||
- dotenv ==0.5.2.4
|
||||
|
|
@ -544,7 +547,7 @@ default-package-overrides:
|
|||
- editor-open ==0.6.0.0
|
||||
- either ==5
|
||||
- either-unwrap ==1.1
|
||||
- ekg ==0.4.0.14
|
||||
- ekg ==0.4.0.15
|
||||
- ekg-core ==0.1.1.4
|
||||
- ekg-json ==0.1.0.6
|
||||
- ekg-statsd ==0.2.2.0
|
||||
|
|
@ -558,7 +561,7 @@ default-package-overrides:
|
|||
- email-validate ==2.3.2.5
|
||||
- enclosed-exceptions ==1.0.2
|
||||
- entropy ==0.3.8
|
||||
- enummapset ==0.5.2.1
|
||||
- enummapset ==0.5.2.2
|
||||
- enumset ==0.0.4.1
|
||||
- envelope ==0.2.2.0
|
||||
- envparse ==0.4
|
||||
|
|
@ -603,7 +606,7 @@ default-package-overrides:
|
|||
- extensible ==0.4.8
|
||||
- extensible-effects ==2.4.0.0
|
||||
- extensible-exceptions ==0.1.1.4
|
||||
- extra ==1.6.4
|
||||
- extra ==1.6.5
|
||||
- extractable-singleton ==0.0.1
|
||||
- extrapolate ==0.3.1
|
||||
- fail ==4.9.0.0
|
||||
|
|
@ -643,7 +646,7 @@ default-package-overrides:
|
|||
- flexible-defaults ==0.0.1.2
|
||||
- FloatingHex ==0.4
|
||||
- floatshow ==0.2.4
|
||||
- flow ==1.0.11
|
||||
- flow ==1.0.12
|
||||
- fmlist ==0.9.2
|
||||
- fmt ==0.5.0.0
|
||||
- fn ==0.3.0.2
|
||||
|
|
@ -659,7 +662,7 @@ default-package-overrides:
|
|||
- ForestStructures ==0.0.0.2
|
||||
- forma ==0.2.0
|
||||
- format-numbers ==0.1.0.0
|
||||
- formatting ==6.3.1
|
||||
- formatting ==6.3.2
|
||||
- foundation ==0.0.20
|
||||
- FPretty ==1.1
|
||||
- Frames ==0.3.0.2
|
||||
|
|
@ -714,7 +717,7 @@ default-package-overrides:
|
|||
- genvalidity-unordered-containers ==0.1.0.0
|
||||
- genvalidity-uuid ==0.0.0.0
|
||||
- genvalidity-vector ==0.1.0.0
|
||||
- getopt-generics ==0.13.0.1
|
||||
- getopt-generics ==0.13.0.2
|
||||
- ghc-compact ==0.1.0.0
|
||||
- ghc-core ==0.5.6
|
||||
- ghc-events ==0.7.2
|
||||
|
|
@ -725,7 +728,7 @@ default-package-overrides:
|
|||
- ghcjs-perch ==0.3.3.2
|
||||
- ghc-parser ==0.2.0.2
|
||||
- ghc-paths ==0.1.0.9
|
||||
- ghc-prof ==1.4.1
|
||||
- ghc-prof ==1.4.1.1
|
||||
- ghc-syb-utils ==0.2.3.3
|
||||
- ghc-tcplugins-extra ==0.2.4
|
||||
- ghc-typelits-extra ==0.2.4
|
||||
|
|
@ -740,14 +743,14 @@ default-package-overrides:
|
|||
- ginger ==0.7.3.0
|
||||
- git ==0.2.1
|
||||
- github ==0.19
|
||||
- github-release ==1.1.5
|
||||
- github-release ==1.1.6
|
||||
- github-types ==0.2.1
|
||||
- github-webhook-handler ==0.0.8
|
||||
- github-webhook-handler-snap ==0.0.7
|
||||
- github-webhooks ==0.9.1
|
||||
- gitrev ==1.3.1
|
||||
- gl ==0.8.0
|
||||
- glabrous ==0.3.4
|
||||
- glabrous ==0.3.5
|
||||
- glaze ==0.3.0.1
|
||||
- glazier ==0.11.0.1
|
||||
- glazier-pipes ==0.1.5.1
|
||||
|
|
@ -761,8 +764,8 @@ default-package-overrides:
|
|||
- gloss-raster ==1.11.1.1
|
||||
- gloss-raster-accelerate ==2.0.0.0
|
||||
- gloss-rendering ==1.11.1.1
|
||||
- GLURaw ==2.0.0.3
|
||||
- GLUT ==2.7.0.12
|
||||
- GLURaw ==2.0.0.4
|
||||
- GLUT ==2.7.0.13
|
||||
- gluturtle ==0.0.58.1
|
||||
- gnuplot ==0.5.5.1
|
||||
- goggles ==0.3.2
|
||||
|
|
@ -793,6 +796,7 @@ default-package-overrides:
|
|||
- haddock-library ==1.4.5
|
||||
- hailgun ==0.4.1.6
|
||||
- hailgun-simple ==0.1.0.0
|
||||
- hakyll ==4.12.0.1
|
||||
- half ==0.2.2.3
|
||||
- hamilton ==0.1.0.2
|
||||
- HandsomeSoup ==0.4.2
|
||||
|
|
@ -807,7 +811,7 @@ default-package-overrides:
|
|||
- hashable-time ==0.2.0.1
|
||||
- hashids ==1.0.2.4
|
||||
- hashmap ==1.3.3
|
||||
- hashtables ==1.2.2.1
|
||||
- hashtables ==1.2.3.0
|
||||
- haskeline ==0.7.4.2
|
||||
- haskell-gi ==0.21.0
|
||||
- haskell-gi-base ==0.21.0
|
||||
|
|
@ -837,6 +841,7 @@ default-package-overrides:
|
|||
- hasql-pool ==0.4.3
|
||||
- hasql-transaction ==0.6
|
||||
- hastache ==0.6.1
|
||||
- hasty-hamiltonian ==1.3.2
|
||||
- HaTeX ==3.18.0.0
|
||||
- haxl ==0.5.1.0
|
||||
- HaXml ==1.25.4
|
||||
|
|
@ -910,7 +915,7 @@ default-package-overrides:
|
|||
- HPDF ==1.4.10
|
||||
- hpio ==0.9.0.5
|
||||
- hpp ==0.5.1
|
||||
- hpqtypes ==1.5.1.1
|
||||
- hpqtypes ==1.5.2.0
|
||||
- hquantlib ==0.0.4.0
|
||||
- hreader ==1.1.0
|
||||
- hreader-lens ==0.1.3.0
|
||||
|
|
@ -958,7 +963,7 @@ default-package-overrides:
|
|||
- hsshellscript ==3.4.5
|
||||
- hstatistics ==0.3
|
||||
- hstatsd ==0.1
|
||||
- HStringTemplate ==0.8.6
|
||||
- HStringTemplate ==0.8.7
|
||||
- HSvm ==0.1.0.3.22
|
||||
- hsx-jmacro ==7.3.8
|
||||
- hsyslog ==5.0.1
|
||||
|
|
@ -987,7 +992,7 @@ default-package-overrides:
|
|||
- human-readable-duration ==0.2.0.3
|
||||
- HUnit ==1.6.0.0
|
||||
- HUnit-approx ==1.1.1.1
|
||||
- hunit-dejafu ==1.1.0.2
|
||||
- hunit-dejafu ==1.1.0.3
|
||||
- hvect ==0.4.0.0
|
||||
- hw-balancedparens ==0.2.0.1
|
||||
- hw-bits ==0.7.0.2
|
||||
|
|
@ -995,8 +1000,8 @@ default-package-overrides:
|
|||
- hw-diagnostics ==0.0.0.5
|
||||
- hweblib ==0.6.3
|
||||
- hw-excess ==0.2.0.0
|
||||
- hw-fingertree ==0.1.0.0
|
||||
- hw-fingertree-strict ==0.1.0.1
|
||||
- hw-fingertree ==0.1.0.1
|
||||
- hw-fingertree-strict ==0.1.0.2
|
||||
- hw-hedgehog ==0.1.0.1
|
||||
- hw-hspec-hedgehog ==0.1.0.2
|
||||
- hw-int ==0.0.0.3
|
||||
|
|
@ -1074,8 +1079,8 @@ default-package-overrides:
|
|||
- ip ==1.1.2
|
||||
- ip6addr ==0.5.3
|
||||
- iproute ==1.7.3
|
||||
- IPv6Addr ==1.0.1
|
||||
- IPv6DB ==0.2.5
|
||||
- IPv6Addr ==1.0.2
|
||||
- IPv6DB ==0.2.6
|
||||
- ipython-kernel ==0.9.0.2
|
||||
- irc ==0.6.1.0
|
||||
- irc-client ==1.1.0.2
|
||||
|
|
@ -1101,7 +1106,7 @@ default-package-overrides:
|
|||
- jose-jwt ==0.7.8
|
||||
- js-flot ==0.8.3
|
||||
- js-jquery ==3.3.1
|
||||
- json ==0.9.1
|
||||
- json ==0.9.2
|
||||
- json-autotype ==1.0.18
|
||||
- json-builder ==0.3
|
||||
- json-rpc-generic ==0.2.1.3
|
||||
|
|
@ -1128,7 +1133,7 @@ default-package-overrides:
|
|||
- kraken ==0.1.0
|
||||
- l10n ==0.1.0.1
|
||||
- labels ==0.3.3
|
||||
- lackey ==1.0.1
|
||||
- lackey ==1.0.2
|
||||
- lambdabot-core ==5.1.0.1
|
||||
- lambdabot-irc-plugins ==5.1.0.1
|
||||
- lame ==0.1.1
|
||||
|
|
@ -1143,7 +1148,7 @@ default-package-overrides:
|
|||
- language-javascript ==0.6.0.11
|
||||
- lapack-carray ==0.0.1
|
||||
- lapack-ffi ==0.0.1
|
||||
- lapack-ffi-tools ==0.1
|
||||
- lapack-ffi-tools ==0.1.0.1
|
||||
- large-hashable ==0.1.0.4
|
||||
- largeword ==1.2.5
|
||||
- latex ==0.1.0.3
|
||||
|
|
@ -1152,7 +1157,7 @@ default-package-overrides:
|
|||
- lca ==0.3.1
|
||||
- leancheck ==0.7.0
|
||||
- leapseconds-announced ==2017.1.0.1
|
||||
- lens ==4.16
|
||||
- lens ==4.16.1
|
||||
- lens-accelerate ==0.1.0.0
|
||||
- lens-action ==0.2.3
|
||||
- lens-aeson ==1.0.2
|
||||
|
|
@ -1189,7 +1194,7 @@ default-package-overrides:
|
|||
- List ==0.6.2
|
||||
- ListLike ==4.6
|
||||
- listsafe ==0.1.0.1
|
||||
- list-t ==1.0.0.1
|
||||
- list-t ==1.0.1
|
||||
- llvm-hs ==5.1.3
|
||||
- llvm-hs-pure ==5.1.2
|
||||
- lmdb ==0.2.5
|
||||
|
|
@ -1202,10 +1207,10 @@ default-package-overrides:
|
|||
- log-elasticsearch ==0.9.1.0
|
||||
- logfloat ==0.13.3.3
|
||||
- logger-thread ==0.1.0.2
|
||||
- logging-effect ==1.2.4
|
||||
- logging-effect ==1.2.5
|
||||
- logging-effect-extra ==1.2.2
|
||||
- logging-effect-extra-file ==1.1.2
|
||||
- logging-effect-extra-handler ==1.1.3
|
||||
- logging-effect-extra-handler ==1.1.4
|
||||
- logging-facade ==0.3.0
|
||||
- logging-facade-syslog ==1
|
||||
- logict ==0.6.0.2
|
||||
|
|
@ -1234,7 +1239,7 @@ default-package-overrides:
|
|||
- markov-chain ==0.0.3.4
|
||||
- markup ==4.0.4
|
||||
- marvin-interpolate ==1.1.2
|
||||
- massiv ==0.1.2.0
|
||||
- massiv ==0.1.4.0
|
||||
- massiv-io ==0.1.1.0
|
||||
- mathexpr ==0.3.0.0
|
||||
- math-functions ==0.2.1.0
|
||||
|
|
@ -1287,7 +1292,7 @@ default-package-overrides:
|
|||
- mmark ==0.0.5.6
|
||||
- mmark-cli ==0.0.3.0
|
||||
- mmark-ext ==0.2.0.0
|
||||
- mmorph ==1.1.1
|
||||
- mmorph ==1.1.2
|
||||
- mnist-idx ==0.1.2.8
|
||||
- mockery ==0.3.5
|
||||
- model ==0.4.4
|
||||
|
|
@ -1319,7 +1324,7 @@ default-package-overrides:
|
|||
- monad-products ==4.0.1
|
||||
- MonadPrompt ==1.0.0.5
|
||||
- MonadRandom ==0.5.1
|
||||
- monad-recorder ==0.1.0
|
||||
- monad-recorder ==0.1.1
|
||||
- monad-skeleton ==0.1.5
|
||||
- monad-st ==0.2.4.1
|
||||
- monads-tf ==0.1.0.3
|
||||
|
|
@ -1333,7 +1338,7 @@ default-package-overrides:
|
|||
- monoid-transformer ==0.0.4
|
||||
- mono-traversable ==1.0.8.1
|
||||
- mono-traversable-instances ==0.1.0.0
|
||||
- morte ==1.6.16
|
||||
- morte ==1.6.18
|
||||
- mountpoints ==1.0.2
|
||||
- mstate ==0.2.7
|
||||
- mtl ==2.2.2
|
||||
|
|
@ -1350,11 +1355,11 @@ default-package-overrides:
|
|||
- mwc-probability ==2.0.2
|
||||
- mwc-random ==0.13.6.0
|
||||
- mwc-random-accelerate ==0.1.0.0
|
||||
- mysql ==0.1.4
|
||||
- mysql ==0.1.5
|
||||
- mysql-haskell ==0.8.3.0
|
||||
- mysql-haskell-nem ==0.1.0.0
|
||||
- mysql-haskell-openssl ==0.8.3.0
|
||||
- mysql-simple ==0.4.4
|
||||
- mysql-simple ==0.4.5
|
||||
- nagios-check ==0.3.2
|
||||
- names-th ==0.2.0.3
|
||||
- nano-erl ==0.1.0.1
|
||||
|
|
@ -1391,7 +1396,7 @@ default-package-overrides:
|
|||
- network-transport-tests ==0.2.4.2
|
||||
- network-uri ==2.6.1.0
|
||||
- newtype ==0.2
|
||||
- newtype-generics ==0.5.2.2
|
||||
- newtype-generics ==0.5.3
|
||||
- next-ref ==0.1.0.2
|
||||
- nfc ==0.1.0
|
||||
- nicify-lib ==1.0.1
|
||||
|
|
@ -1431,11 +1436,11 @@ default-package-overrides:
|
|||
- online ==0.2.1.0
|
||||
- Only ==0.1
|
||||
- oo-prototypes ==0.1.0.0
|
||||
- opaleye ==0.6.0.0
|
||||
- opaleye ==0.6.1.0
|
||||
- OpenAL ==1.7.0.4
|
||||
- open-browser ==0.2.1.0
|
||||
- openexr-write ==0.1.0.1
|
||||
- OpenGL ==3.0.2.0
|
||||
- OpenGL ==3.0.2.1
|
||||
- OpenGLRaw ==3.2.7.0
|
||||
- openpgp-asciiarmor ==0.1
|
||||
- opensource ==0.1.0.0
|
||||
|
|
@ -1458,7 +1463,7 @@ default-package-overrides:
|
|||
- pagination ==0.2.1
|
||||
- palette ==0.1.0.5
|
||||
- pandoc ==2.1.2
|
||||
- pandoc-citeproc ==0.14.1.5
|
||||
- pandoc-citeproc ==0.14.3
|
||||
- pandoc-types ==1.17.3.1
|
||||
- pango ==0.13.4.0
|
||||
- papillon ==0.1.0.5
|
||||
|
|
@ -1521,7 +1526,7 @@ default-package-overrides:
|
|||
- pipes-attoparsec ==0.5.1.5
|
||||
- pipes-bytestring ==2.1.6
|
||||
- pipes-category ==0.3.0.0
|
||||
- pipes-concurrency ==2.0.9
|
||||
- pipes-concurrency ==2.0.10
|
||||
- pipes-csv ==1.4.3
|
||||
- pipes-extras ==1.0.13
|
||||
- pipes-fastx ==0.3.0.0
|
||||
|
|
@ -1557,7 +1562,7 @@ default-package-overrides:
|
|||
- postgresql-simple ==0.5.3.0
|
||||
- postgresql-simple-migration ==0.1.11.0
|
||||
- postgresql-simple-queue ==1.0.1
|
||||
- postgresql-simple-url ==0.2.0.0
|
||||
- postgresql-simple-url ==0.2.1.0
|
||||
- postgresql-transactional ==1.1.1
|
||||
- postgresql-typed ==0.5.2
|
||||
- post-mess-age ==0.2.1.0
|
||||
|
|
@ -1582,7 +1587,7 @@ default-package-overrides:
|
|||
- pretty-show ==1.6.16
|
||||
- pretty-simple ==2.1.0.0
|
||||
- pretty-types ==0.2.3.1
|
||||
- prim-array ==0.2.1
|
||||
- prim-array ==0.2.2
|
||||
- primes ==0.2.1.0
|
||||
- primitive ==0.6.3.0
|
||||
- prim-uniq ==0.1.0.1
|
||||
|
|
@ -1607,7 +1612,7 @@ default-package-overrides:
|
|||
- proto-lens ==0.2.2.0
|
||||
- proto-lens-arbitrary ==0.1.1.1
|
||||
- proto-lens-descriptors ==0.2.2.0
|
||||
- proto-lens-optparse ==0.1.0.4
|
||||
- proto-lens-optparse ==0.1.1.0
|
||||
- protolude ==0.2.1
|
||||
- proxied ==0.3
|
||||
- psql-helpers ==0.1.0.0
|
||||
|
|
@ -1655,8 +1660,8 @@ default-package-overrides:
|
|||
- rank-product ==0.2.0.1
|
||||
- Rasterific ==0.7.2.3
|
||||
- rasterific-svg ==0.3.3.1
|
||||
- ratel ==1.0.2
|
||||
- ratel-wai ==1.0.1
|
||||
- ratel ==1.0.3
|
||||
- ratel-wai ==1.0.2
|
||||
- ratio-int ==0.1.2
|
||||
- rawfilepath ==0.2.4
|
||||
- rawstring-qm ==0.2.3.0
|
||||
|
|
@ -1715,7 +1720,7 @@ default-package-overrides:
|
|||
- rest-types ==1.14.1.1
|
||||
- result ==0.2.6.0
|
||||
- rethinkdb-client-driver ==0.0.25
|
||||
- retry ==0.7.6.1
|
||||
- retry ==0.7.6.2
|
||||
- rev-state ==0.1.2
|
||||
- rfc5051 ==0.1.0.3
|
||||
- riak ==1.1.2.4
|
||||
|
|
@ -1741,10 +1746,10 @@ default-package-overrides:
|
|||
- sampling ==0.3.2
|
||||
- sandman ==0.2.0.1
|
||||
- say ==0.1.0.0
|
||||
- sbp ==2.3.9
|
||||
- sbp ==2.3.13
|
||||
- sbv ==7.5
|
||||
- SCalendar ==1.1.0
|
||||
- scalendar ==1.2.0
|
||||
- SCalendar ==1.1.0
|
||||
- scalpel ==0.5.1
|
||||
- scalpel-core ==0.5.1
|
||||
- scanner ==0.2
|
||||
|
|
@ -1782,7 +1787,7 @@ default-package-overrides:
|
|||
- servant-docs ==0.11.2
|
||||
- servant-elm ==0.4.0.1
|
||||
- servant-exceptions ==0.1.1
|
||||
- servant-foreign ==0.11
|
||||
- servant-foreign ==0.11.1
|
||||
- servant-generic ==0.1.0.1
|
||||
- servant-github-webhook ==0.4.0.0
|
||||
- servant-js ==0.9.3.2
|
||||
|
|
@ -1816,7 +1821,7 @@ default-package-overrides:
|
|||
- shake-language-c ==0.11.0
|
||||
- shakespeare ==2.0.15
|
||||
- shelltestrunner ==1.9
|
||||
- shelly ==1.7.1
|
||||
- shelly ==1.7.2
|
||||
- shikensu ==0.3.8
|
||||
- shortcut-links ==0.4.2.0
|
||||
- should-not-typecheck ==2.1.0
|
||||
|
|
@ -1830,7 +1835,7 @@ default-package-overrides:
|
|||
- simple-sendfile ==0.2.27
|
||||
- simple-session ==0.10.1.1
|
||||
- simple-templates ==0.8.0.1
|
||||
- singleton-bool ==0.1.3
|
||||
- singleton-bool ==0.1.4
|
||||
- singleton-nats ==0.4.0.4
|
||||
- singletons ==2.3.1
|
||||
- siphash ==1.0.3
|
||||
|
|
@ -1845,7 +1850,7 @@ default-package-overrides:
|
|||
- smtp-mail ==0.1.4.6
|
||||
- snap ==1.1.0.0
|
||||
- snap-blaze ==0.2.1.5
|
||||
- snap-core ==1.0.3.1
|
||||
- snap-core ==1.0.3.2
|
||||
- snap-server ==1.0.3.3
|
||||
- snowflake ==0.1.1.1
|
||||
- soap ==0.2.3.6
|
||||
|
|
@ -1917,7 +1922,7 @@ default-package-overrides:
|
|||
- streaming ==0.2.1.0
|
||||
- streaming-bytestring ==0.1.5
|
||||
- streaming-commons ==0.1.19
|
||||
- streamly ==0.1.0
|
||||
- streamly ==0.1.1
|
||||
- streamproc ==1.6.2
|
||||
- streams ==3.3
|
||||
- strict ==0.3.2
|
||||
|
|
@ -1934,7 +1939,7 @@ default-package-overrides:
|
|||
- stringsearch ==0.3.6.6
|
||||
- string-transform ==1.0.0
|
||||
- stripe-core ==2.3.0
|
||||
- strive ==5.0.3
|
||||
- strive ==5.0.4
|
||||
- structs ==0.1.1
|
||||
- sum-type-boilerplate ==0.1.1
|
||||
- sundown ==0.6
|
||||
|
|
@ -1942,8 +1947,8 @@ default-package-overrides:
|
|||
- svg-builder ==0.1.0.2
|
||||
- svg-tree ==0.6.2.2
|
||||
- swagger ==0.3.0
|
||||
- swagger2 ==2.2
|
||||
- swish ==0.9.2.0
|
||||
- swagger2 ==2.2.1
|
||||
- swish ==0.9.2.1
|
||||
- syb ==0.7
|
||||
- syb-with-class ==0.6.1.8
|
||||
- symbol ==0.2.4
|
||||
|
|
@ -1966,12 +1971,12 @@ default-package-overrides:
|
|||
- tasty ==1.0.1.1
|
||||
- tasty-ant-xml ==1.1.3
|
||||
- tasty-auto ==0.2.0.0
|
||||
- tasty-dejafu ==1.1.0.1
|
||||
- tasty-dejafu ==1.1.0.2
|
||||
- tasty-discover ==4.2.0
|
||||
- tasty-expected-failure ==0.11.1.1
|
||||
- tasty-golden ==2.3.1.3
|
||||
- tasty-hedgehog ==0.1.0.2
|
||||
- tasty-hspec ==1.1.3.3
|
||||
- tasty-hspec ==1.1.4
|
||||
- tasty-html ==0.4.1.1
|
||||
- tasty-hunit ==0.10.0.1
|
||||
- tasty-kat ==0.0.3
|
||||
|
|
@ -2037,7 +2042,7 @@ default-package-overrides:
|
|||
- threads ==0.5.1.6
|
||||
- threads-extras ==0.1.0.2
|
||||
- threepenny-editors ==0.5.6
|
||||
- threepenny-gui ==0.8.2.2
|
||||
- threepenny-gui ==0.8.2.3
|
||||
- threepenny-gui-flexbox ==0.4.2
|
||||
- th-reify-compat ==0.0.1.3
|
||||
- th-reify-many ==0.1.8
|
||||
|
|
@ -2095,13 +2100,13 @@ default-package-overrides:
|
|||
- tuple ==0.3.0.2
|
||||
- tuples-homogenous-h98 ==0.1.1.0
|
||||
- tuple-th ==0.2.5
|
||||
- turtle ==1.5.6
|
||||
- turtle ==1.5.7
|
||||
- turtle-options ==0.1.0.4
|
||||
- type-assertions ==0.1.0.0
|
||||
- type-combinators ==0.2.4.3
|
||||
- type-combinators-singletons ==0.2.1.0
|
||||
- TypeCompose ==0.9.12
|
||||
- typed-process ==0.2.1.0
|
||||
- typed-process ==0.2.2.0
|
||||
- type-fun ==0.1.1
|
||||
- type-hint ==0.1
|
||||
- type-level-integers ==0.0.1
|
||||
|
|
@ -2112,7 +2117,7 @@ default-package-overrides:
|
|||
- type-operators ==0.1.0.4
|
||||
- type-spec ==0.3.0.1
|
||||
- typography-geometry ==1.0.0.1
|
||||
- tz ==0.1.3.0
|
||||
- tz ==0.1.3.1
|
||||
- tzdata ==0.1.20180122.0
|
||||
- ua-parser ==0.7.4.1
|
||||
- uglymemo ==0.1.0.1
|
||||
|
|
@ -2131,8 +2136,8 @@ default-package-overrides:
|
|||
- union-find ==0.2
|
||||
- uniplate ==1.6.12
|
||||
- uniq-deep ==1.1.0.0
|
||||
- unique ==0
|
||||
- Unique ==0.4.7.2
|
||||
- unique ==0
|
||||
- unit-constraint ==0.0.0
|
||||
- units-parser ==0.1.1.2
|
||||
- universe ==1.0
|
||||
|
|
@ -2145,7 +2150,7 @@ default-package-overrides:
|
|||
- unix-bytestring ==0.3.7.3
|
||||
- unix-compat ==0.5.0.1
|
||||
- unix-time ==0.3.8
|
||||
- unliftio ==0.2.5.0
|
||||
- unliftio ==0.2.6.0
|
||||
- unliftio-core ==0.1.1.0
|
||||
- unlit ==0.4.0.0
|
||||
- unordered-containers ==0.2.9.0
|
||||
|
|
@ -2156,7 +2161,7 @@ default-package-overrides:
|
|||
- uri-encode ==1.5.0.5
|
||||
- uri-templater ==0.3.1.0
|
||||
- urlpath ==8.0.1
|
||||
- userid ==0.1.3.1
|
||||
- userid ==0.1.3.2
|
||||
- users ==0.5.0.0
|
||||
- users-postgresql-simple ==0.5.0.2
|
||||
- users-test ==0.5.0.1
|
||||
|
|
@ -2196,7 +2201,7 @@ default-package-overrides:
|
|||
- vector-th-unbox ==0.2.1.6
|
||||
- vectortiles ==1.3.0
|
||||
- verbosity ==0.2.3.0
|
||||
- versions ==3.3.1
|
||||
- versions ==3.3.2
|
||||
- vhd ==0.2.2
|
||||
- ViennaRNAParser ==1.3.3
|
||||
- vinyl ==0.7.0
|
||||
|
|
@ -2205,10 +2210,10 @@ default-package-overrides:
|
|||
- vivid-supercollider ==0.3.0.0
|
||||
- void ==0.7.2
|
||||
- vty ==5.20
|
||||
- wai ==3.2.1.1
|
||||
- wai-app-static ==3.1.6.1
|
||||
- wai ==3.2.1.2
|
||||
- wai-app-static ==3.1.6.2
|
||||
- wai-cli ==0.1.1
|
||||
- wai-conduit ==3.0.0.3
|
||||
- wai-conduit ==3.0.0.4
|
||||
- wai-cors ==0.2.6
|
||||
- wai-eventsource ==3.0.0
|
||||
- wai-extra ==3.0.22.0
|
||||
|
|
@ -2231,8 +2236,8 @@ default-package-overrides:
|
|||
- wai-session-postgresql ==0.2.1.2
|
||||
- wai-slack-middleware ==0.2.0
|
||||
- wai-transformers ==0.0.7
|
||||
- wai-websockets ==3.0.1.1
|
||||
- warp ==3.2.18.1
|
||||
- wai-websockets ==3.0.1.2
|
||||
- warp ==3.2.18.2
|
||||
- warp-tls ==3.2.4.2
|
||||
- wave ==0.1.5
|
||||
- wavefront ==0.7.1.2
|
||||
|
|
@ -2240,7 +2245,7 @@ default-package-overrides:
|
|||
- webdriver-angular ==0.1.11
|
||||
- webpage ==0.0.5
|
||||
- web-plugins ==0.2.9
|
||||
- web-routes ==0.27.14
|
||||
- web-routes ==0.27.14.2
|
||||
- web-routes-boomerang ==0.28.4.2
|
||||
- web-routes-happstack ==0.23.11
|
||||
- web-routes-hsp ==0.24.6.1
|
||||
|
|
@ -2285,7 +2290,7 @@ default-package-overrides:
|
|||
- writer-cps-morph ==0.1.0.2
|
||||
- writer-cps-mtl ==0.1.1.4
|
||||
- writer-cps-transformers ==0.1.1.3
|
||||
- wuss ==1.1.6
|
||||
- wuss ==1.1.8
|
||||
- X11 ==1.8
|
||||
- X11-xft ==0.3.1
|
||||
- x11-xim ==0.0.9.0
|
||||
|
|
@ -2305,7 +2310,7 @@ default-package-overrides:
|
|||
- xml-basic ==0.1.3
|
||||
- xml-conduit ==1.8.0
|
||||
- xml-conduit-writer ==0.1.1.2
|
||||
- xmlgen ==0.6.2.1
|
||||
- xmlgen ==0.6.2.2
|
||||
- xml-hamlet ==0.5.0
|
||||
- xmlhtml ==0.2.5.2
|
||||
- xml-html-qq ==0.1.0.1
|
||||
|
|
@ -2340,6 +2345,7 @@ default-package-overrides:
|
|||
- yesod-form ==1.6.1
|
||||
- yesod-form-bootstrap4 ==0.1.0.2
|
||||
- yesod-gitrepo ==0.3.0
|
||||
- yesod-gitrev ==0.2.0.0
|
||||
- yesod-newsfeed ==1.6.1.0
|
||||
- yesod-paginator ==0.11.0
|
||||
- yesod-persistent ==1.6.0
|
||||
|
|
@ -2377,7 +2383,7 @@ default-package-overrides:
|
|||
- zlib-lens ==0.1.2.1
|
||||
- zot ==0.0.3
|
||||
- zstd ==0.1.0.0
|
||||
- ztail ==1.2
|
||||
- ztail ==1.2.0.1
|
||||
|
||||
extra-packages:
|
||||
- aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier
|
||||
|
|
@ -2403,6 +2409,7 @@ extra-packages:
|
|||
- haddock-api == 2.16.* # required on GHC 7.10.x
|
||||
- haddock-api == 2.17.* # required on GHC 8.0.x
|
||||
- haddock-library == 1.2.* # required for haddock-api-2.16.x
|
||||
- haddock-library == 1.4.3 # required for haddock-api-2.17.x
|
||||
- haddock-library == 1.4.4 # required for haddock-api-2.18.x
|
||||
- happy <1.19.6 # newer versions break Agda
|
||||
- haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue