diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bac601fbf82..dde31a2c0c0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -83,7 +83,6 @@
/pkgs/applications/editors/eclipse @rycee
# https://github.com/NixOS/nixpkgs/issues/31401
-/lib/maintainers.nix @ghost
/lib/licenses.nix @ghost
# Qt / KDE
diff --git a/doc/default.nix b/doc/default.nix
index 60c613878c7..ec458634a42 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -81,6 +81,10 @@ pkgs.stdenv.mkDerivation {
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
diff --git a/doc/languages-frameworks/emscripten.md b/doc/languages-frameworks/emscripten.md
new file mode 100644
index 00000000000..24c49ec1409
--- /dev/null
+++ b/doc/languages-frameworks/emscripten.md
@@ -0,0 +1,185 @@
+# User's Guide to Emscripten in Nixpkgs
+
+[Emscripten](https://github.com/kripken/emscripten): An LLVM-to-JavaScript Compiler
+
+This section of the manual covers how to use `emscripten` in nixpkgs.
+
+Minimal requirements:
+
+* nix
+* nixpkgs
+
+Modes of use of `emscripten`:
+
+* **Imperative usage** (on the command line):
+
+ If you want to work with `emcc`, `emconfigure` and `emmake` as you are used to from Ubuntu and similar distributions you can use these commands:
+
+ * `nix-env -i emscripten`
+ * `nix-shell -p emscripten`
+
+* **Declarative usage**:
+
+ This mode is far more power full since this makes use of `nix` for dependency management of emscripten libraries and targets by using the `mkDerivation` which is implemented by `pkgs.emscriptenStdenv` and `pkgs.buildEmscriptenPackage`. The source for the packages is in `pkgs/top-level/emscripten-packages.nix` and the abstraction behind it in `pkgs/development/em-modules/generic/default.nix`.
+ * build and install all packages:
+ * `nix-env -iA emscriptenPackages`
+
+ * dev-shell for zlib implementation hacking:
+ * `nix-shell -A emscriptenPackages.zlib`
+
+
+## Imperative usage
+
+A few things to note:
+
+* `export EMCC_DEBUG=2` is nice for debugging
+* `~/.emscripten`, the build artifact cache sometimes creates issues and needs to be removed from time to time
+
+
+## Declarative usage
+
+Let's see two different examples from `pkgs/top-level/emscripten-packages.nix`:
+
+* `pkgs.zlib.override`
+* `pkgs.buildEmscriptenPackage`
+
+Both are interesting concepts.
+
+A special requirement of the `pkgs.buildEmscriptenPackage` is the `doCheck = true` is a default meaning that each emscriptenPackage requires a `checkPhase` implemented.
+
+* Use `export EMCC_DEBUG=2` from within a emscriptenPackage's `phase` to get more detailed debug output what is going wrong.
+* ~/.emscripten cache is requiring us to set `HOME=$TMPDIR` in individual phases. This makes compilation slower but also makes it more deterministic.
+
+### Usage 1: pkgs.zlib.override
+
+This example uses `zlib` from nixpkgs but instead of compiling **C** to **ELF** it compiles **C** to **JS** since we were using `pkgs.zlib.override` and changed stdenv to `pkgs.emscriptenStdenv`. A few adaptions and hacks were set in place to make it working. One advantage is that when `pkgs.zlib` is updated, it will automatically update this package as well. However, this can also be the downside...
+
+See the `zlib` example:
+
+ zlib = (pkgs.zlib.override {
+ stdenv = pkgs.emscriptenStdenv;
+ }).overrideDerivation
+ (old: rec {
+ buildInputs = old.buildInputs ++ [ pkgconfig ];
+ # we need to reset this setting!
+ NIX_CFLAGS_COMPILE="";
+ configurePhase = ''
+ # FIXME: Some tests require writing at $HOME
+ HOME=$TMPDIR
+ runHook preConfigure
+
+ #export EMCC_DEBUG=2
+ emconfigure ./configure --prefix=$out --shared
+
+ runHook postConfigure
+ '';
+ dontStrip = true;
+ outputs = [ "out" ];
+ buildPhase = ''
+ emmake make
+ '';
+ installPhase = ''
+ emmake make install
+ '';
+ checkPhase = ''
+ echo "================= testing zlib using node ================="
+
+ echo "Compiling a custom test"
+ set -x
+ emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \
+ libz.so.${old.version} -I . -o example.js
+
+ echo "Using node to execute the test"
+ ${pkgs.nodejs}/bin/node ./example.js
+
+ set +x
+ if [ $? -ne 0 ]; then
+ echo "test failed for some reason"
+ exit 1;
+ else
+ echo "it seems to work! very good."
+ fi
+ echo "================= /testing zlib using node ================="
+ '';
+
+ postPatch = pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin ''
+ substituteInPlace configure \
+ --replace '/usr/bin/libtool' 'ar' \
+ --replace 'AR="libtool"' 'AR="ar"' \
+ --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
+ '';
+ });
+
+### Usage 2: pkgs.buildEmscriptenPackage
+
+This `xmlmirror` example features a emscriptenPackage which is defined completely from this context and no `pkgs.zlib.override` is used.
+
+ xmlmirror = pkgs.buildEmscriptenPackage rec {
+ name = "xmlmirror";
+
+ buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ];
+ nativeBuildInputs = [ pkgconfig zlib ];
+
+ src = pkgs.fetchgit {
+ url = "https://gitlab.com/odfplugfest/xmlmirror.git";
+ rev = "4fd7e86f7c9526b8f4c1733e5c8b45175860a8fd";
+ sha256 = "1jasdqnbdnb83wbcnyrp32f36w3xwhwp0wq8lwwmhqagxrij1r4b";
+ };
+
+ configurePhase = ''
+ rm -f fastXmlLint.js*
+ # a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728
+ # https://gitlab.com/odfplugfest/xmlmirror/issues/8
+ sed -e "s/TOTAL_MEMORY=234217728/TOTAL_MEMORY=268435456/g" -i Makefile.emEnv
+ # https://github.com/kripken/emscripten/issues/6344
+ # https://gitlab.com/odfplugfest/xmlmirror/issues/9
+ sed -e "s/\$(JSONC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(LIBXML20_LDFLAGS)/\$(JSONC_LDFLAGS) \$(LIBXML20_LDFLAGS) \$(ZLIB_LDFLAGS) /g" -i Makefile.emEnv
+ # https://gitlab.com/odfplugfest/xmlmirror/issues/11
+ sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv
+ '';
+
+ buildPhase = ''
+ HOME=$TMPDIR
+ make -f Makefile.emEnv
+ '';
+
+ outputs = [ "out" "doc" ];
+
+ installPhase = ''
+ mkdir -p $out/share
+ mkdir -p $doc/share/${name}
+
+ cp Demo* $out/share
+ cp -R codemirror-5.12 $out/share
+ cp fastXmlLint.js* $out/share
+ cp *.xsd $out/share
+ cp *.js $out/share
+ cp *.xhtml $out/share
+ cp *.html $out/share
+ cp *.json $out/share
+ cp *.rng $out/share
+ cp README.md $doc/share/${name}
+ '';
+ checkPhase = ''
+
+ '';
+ };
+
+### Declarative debugging
+
+Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from there you can go trough the individual steps. This makes it easy to build a good `unit test` or list the files of the project.
+
+1. `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz`
+2. `cd /tmp/`
+3. `unpackPhase`
+4. cd libz-1.2.3
+5. `configurePhase`
+6. `buildPhase`
+7. ... happy hacking...
+
+## Summary
+
+Using this toolchain makes it easy to leverage `nix` from NixOS, MacOSX or even Windows (WSL+ubuntu+nix). This toolchain is reproducible, behaves like the rest of the packages from nixpkgs and contains a set of well working examples to learn and adapt from.
+
+If in trouble, ask the maintainers.
+
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index fc15d847d15..6743c131201 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -30,6 +30,7 @@ such as Perl or Haskell. These are described in this chapter.
+
diff --git a/doc/meta.xml b/doc/meta.xml
index 35632599186..5dbe810810d 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -174,7 +174,7 @@ meta-attributes
maintainers of this Nix expression. If
you would like to be a maintainer of a package, you may want to add
yourself to nixpkgs/lib/maintainers.nix
+ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix">nixpkgs/maintainers/maintainer-list.nix
and write something like [ stdenv.lib.maintainers.alice
stdenv.lib.maintainers.bob ].
diff --git a/lib/default.nix b/lib/default.nix
index 7bd02106f7b..cbe0a0ba21b 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -47,7 +47,7 @@ let
filesystem = callLibs ./filesystem.nix;
# back-compat aliases
- platforms = systems.doubles;
+ platforms = systems.forMeta;
inherit (builtins) add addErrorContext attrNames
concatLists deepSeq elem elemAt filter genericClosure genList
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 03af13b990e..ba575c27052 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -179,6 +179,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "CeCILL-C Free Software License Agreement";
};
+ cpal10 = spdx {
+ spdxId = "CPAL-1.0";
+ fullName = "Common Public Attribution License 1.0";
+ };
+
cpl10 = spdx {
spdxId = "CPL-1.0";
fullName = "Common Public License 1.0";
diff --git a/lib/meta.nix b/lib/meta.nix
index 07b1710fff7..199030c103a 100644
--- a/lib/meta.nix
+++ b/lib/meta.nix
@@ -67,4 +67,23 @@ rec {
*/
hiPrioSet = set: mapDerivationAttrset hiPrio set;
+
+ /* Check to see if a platform is matched by the given `meta.platforms`
+ element.
+
+ A `meta.platform` pattern is either
+
+ 1. (legacy) a system string.
+
+ 2. (modern) a pattern for the platform `parsed` field.
+
+ We can inject these into a patten for the whole of a structured platform,
+ and then match that.
+ */
+ platformMatch = platform: elem: let
+ pattern =
+ if builtins.isString elem
+ then { system = elem; }
+ else { parsed = elem; };
+ in lib.matchAttrs pattern platform;
}
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index d5a206e620c..bd408e00bb1 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -3,6 +3,7 @@
rec {
doubles = import ./doubles.nix { inherit lib; };
+ forMeta = import ./for-meta.nix { inherit lib; };
parse = import ./parse.nix { inherit lib; };
inspect = import ./inspect.nix { inherit lib; };
platforms = import ./platforms.nix { inherit lib; };
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 0e1ee62ac95..012a1786a3c 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -30,14 +30,14 @@ in rec {
aarch64 = filterDoubles predicates.isAarch64;
x86 = filterDoubles predicates.isx86;
i686 = filterDoubles predicates.isi686;
- mips = filterDoubles predicates.isMips;
x86_64 = filterDoubles predicates.isx86_64;
+ mips = filterDoubles predicates.isMips;
cygwin = filterDoubles predicates.isCygwin;
darwin = filterDoubles predicates.isDarwin;
freebsd = filterDoubles predicates.isFreeBSD;
# Should be better, but MinGW is unclear, and HURD is bit-rotted.
- gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; });
+ gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; });
illumos = filterDoubles predicates.isSunOS;
linux = filterDoubles predicates.isLinux;
netbsd = filterDoubles predicates.isNetBSD;
diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
new file mode 100644
index 00000000000..fa713b1e613
--- /dev/null
+++ b/lib/systems/for-meta.nix
@@ -0,0 +1,27 @@
+{ lib }:
+let
+ inherit (lib.systems) parse;
+ inherit (lib.systems.inspect) patterns;
+
+in rec {
+ inherit (lib.systems.doubles) all mesaPlatforms;
+ none = [];
+
+ arm = [ patterns.isArm ];
+ aarch64 = [ patterns.isAarch64 ];
+ x86 = [ patterns.isx86 ];
+ i686 = [ patterns.isi686 ];
+ x86_64 = [ patterns.isx86_64 ];
+ mips = [ patterns.isMips ];
+
+ cygwin = [ patterns.isCygwin ];
+ darwin = [ patterns.isDarwin ];
+ freebsd = [ patterns.isFreeBSD ];
+ # Should be better, but MinGW is unclear, and HURD is bit-rotted.
+ gnu = [ { kernel = parse.kernels.linux; abi = parse.abis.gnu; } ];
+ illumos = [ patterns.isSunOS ];
+ linux = [ patterns.isLinux ];
+ netbsd = [ patterns.isNetBSD ];
+ openbsd = [ patterns.isOpenBSD ];
+ unix = patterns.isUnix; # Actually a list
+}
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index ab220af46e3..e8ea2bed25f 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -5,51 +5,51 @@ with lib.lists;
rec {
patterns = rec {
- i686 = { cpu = cpuTypes.i686; };
- x86_64 = { cpu = cpuTypes.x86_64; };
- PowerPC = { cpu = cpuTypes.powerpc; };
- x86 = { cpu = { family = "x86"; }; };
- Arm = { cpu = { family = "arm"; }; };
- Aarch64 = { cpu = { family = "aarch64"; }; };
- Mips = { cpu = { family = "mips"; }; };
- RiscV = { cpu = { family = "riscv"; }; };
- Wasm = { cpu = { family = "wasm"; }; };
+ isi686 = { cpu = cpuTypes.i686; };
+ isx86_64 = { cpu = cpuTypes.x86_64; };
+ isPowerPC = { cpu = cpuTypes.powerpc; };
+ isx86 = { cpu = { family = "x86"; }; };
+ isArm = { cpu = { family = "arm"; }; };
+ isAarch64 = { cpu = { family = "aarch64"; }; };
+ isMips = { cpu = { family = "mips"; }; };
+ isRiscV = { cpu = { family = "riscv"; }; };
+ isWasm = { cpu = { family = "wasm"; }; };
- "32bit" = { cpu = { bits = 32; }; };
- "64bit" = { cpu = { bits = 64; }; };
- BigEndian = { cpu = { significantByte = significantBytes.bigEndian; }; };
- LittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
+ is32bit = { cpu = { bits = 32; }; };
+ is64bit = { cpu = { bits = 64; }; };
+ isBigEndian = { cpu = { significantByte = significantBytes.bigEndian; }; };
+ isLittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
- BSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
- Unix = [ BSD Darwin Linux SunOS Hurd Cygwin ];
+ isBSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
+ isDarwin = { kernel = { families = { inherit (kernelFamilies) darwin; }; }; };
+ isUnix = [ isBSD isDarwin isLinux isSunOS isHurd isCygwin ];
- Darwin = { kernel = kernels.darwin; };
- Linux = { kernel = kernels.linux; };
- SunOS = { kernel = kernels.solaris; };
- FreeBSD = { kernel = kernels.freebsd; };
- Hurd = { kernel = kernels.hurd; };
- NetBSD = { kernel = kernels.netbsd; };
- OpenBSD = { kernel = kernels.openbsd; };
- Windows = { kernel = kernels.windows; };
- Cygwin = { kernel = kernels.windows; abi = abis.cygnus; };
- MinGW = { kernel = kernels.windows; abi = abis.gnu; };
+ isMacOS = { kernel = kernels.macos; };
+ isiOS = { kernel = kernels.ios; };
+ isLinux = { kernel = kernels.linux; };
+ isSunOS = { kernel = kernels.solaris; };
+ isFreeBSD = { kernel = kernels.freebsd; };
+ isHurd = { kernel = kernels.hurd; };
+ isNetBSD = { kernel = kernels.netbsd; };
+ isOpenBSD = { kernel = kernels.openbsd; };
+ isWindows = { kernel = kernels.windows; };
+ isCygwin = { kernel = kernels.windows; abi = abis.cygnus; };
+ isMinGW = { kernel = kernels.windows; abi = abis.gnu; };
- Android = [ { abi = abis.android; } { abi = abis.androideabi; } ];
- Musl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
+ isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];
+ isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
- Kexecable = map (family: { kernel = kernels.linux; cpu.family = family; })
- [ "x86" "arm" "aarch64" "mips" ];
- Efi = map (family: { cpu.family = family; })
- [ "x86" "arm" "aarch64" ];
- Seccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
- [ "x86" "arm" "aarch64" "mips" ];
+ 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:
if builtins.isList patterns then attrs: any (pattern: matchAttrs pattern attrs) patterns
else matchAttrs patterns;
- predicates = mapAttrs'
- (name: value: nameValuePair ("is" + name) (matchAnyAttrs value))
- patterns;
+ predicates = mapAttrs (_: matchAnyAttrs) patterns;
}
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 03d052f5f19..641a7f5d758 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -134,6 +134,7 @@ rec {
kernelFamilies = setTypes types.openKernelFamily {
bsd = {};
+ darwin = {};
};
################################################################################
@@ -149,7 +150,10 @@ rec {
types.kernel = enum (attrValues kernels);
kernels = with execFormats; with kernelFamilies; setTypes types.openKernel {
- darwin = { execFormat = macho; families = { }; };
+ # TODO(@Ericson2314): Don't want to mass-rebuild yet to keeping 'darwin' as
+ # the nnormalized name for macOS.
+ macos = { execFormat = macho; families = { inherit darwin; }; name = "darwin"; };
+ ios = { execFormat = macho; families = { inherit darwin; }; };
freebsd = { execFormat = elf; families = { inherit bsd; }; };
hurd = { execFormat = elf; families = { }; };
linux = { execFormat = elf; families = { }; };
@@ -159,9 +163,13 @@ rec {
solaris = { execFormat = elf; families = { }; };
windows = { execFormat = pe; families = { }; };
} // { # aliases
+ # 'darwin' is the kernel for all of them. We choose macOS by default.
+ darwin = kernels.macos;
# TODO(@Ericson2314): Handle these Darwin version suffixes more generally.
- darwin10 = kernels.darwin;
- darwin14 = kernels.darwin;
+ darwin10 = kernels.macos;
+ darwin14 = kernels.macos;
+ watchos = kernels.ios;
+ tvos = kernels.ios;
win32 = kernels.windows;
};
@@ -263,8 +271,8 @@ rec {
mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s));
doubleFromSystem = { cpu, vendor, kernel, abi, ... }:
- if abi == abis.cygnus
- then "${cpu.name}-cygwin"
+ /**/ if abi == abis.cygnus then "${cpu.name}-cygwin"
+ else if kernel.families ? darwin then "${cpu.name}-darwin"
else "${cpu.name}-${kernel.name}";
tripleFromSystem = { cpu, vendor, kernel, abi, ... } @ sys: assert isSystem sys; let
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 445fd712298..867cd0b4888 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -63,6 +63,10 @@
github = "DmitryTsygankov";
name = "Dmitry Tsygankov";
};
+ Esteth = {
+ email = "adam.copp@gmail.com";
+ name = "Adam Copp";
+ };
FireyFly = {
email = "nix@firefly.nu";
github = "FireyFly";
@@ -87,6 +91,11 @@
github = "MP2E";
name = "Cray Elliott";
};
+ Mogria = {
+ email = "m0gr14@gmail.com";
+ github = "mogria";
+ name = "Mogria";
+ };
MostAwesomeDude = {
email = "cds@corbinsimpson.com";
github = "MostAwesomeDude";
@@ -617,6 +626,11 @@
github = "bradediger";
name = "Brad Ediger";
};
+ brainrape = {
+ email = "martonboros@gmail.com";
+ github = "brainrape";
+ name = "Marton Boros";
+ };
bramd = {
email = "bram@bramd.nl";
github = "bramd";
@@ -2037,6 +2051,11 @@
github = "lo1tuma";
name = "Mathias Schreck";
};
+ lopsided98 = {
+ email = "benwolsieffer@gmail.com";
+ github = "lopsided98";
+ name = "Ben Wolsieffer";
+ };
loskutov = {
email = "ignat.loskutov@gmail.com";
github = "loskutov";
@@ -2164,6 +2183,11 @@
github = "markuskowa";
name = "Markus Kowalewski";
};
+ marsam = {
+ email = "marsam@users.noreply.github.com";
+ github = "marsam";
+ name = "Mario Rodas";
+ };
martijnvermaat = {
email = "martijn@vermaat.name";
github = "martijnvermaat";
@@ -2920,6 +2944,11 @@
github = "rbasso";
name = "Rafael Basso";
};
+ rdnetto = {
+ email = "rdnetto@gmail.com";
+ github = "rdnetto";
+ name = "Reuben D'Netto";
+ };
redbaron = {
email = "ivanov.maxim@gmail.com";
github = "redbaron";
@@ -3447,6 +3476,11 @@
github = "tavyc";
name = "Octavian Cerna";
};
+ tazjin = {
+ email = "mail@tazj.in";
+ github = "tazjin";
+ name = "Vincent Ambo";
+ };
teh = {
email = "tehunger@gmail.com";
github = "teh";
diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py
index ddc3c7c4a96..d0bd1913ba8 100755
--- a/maintainers/scripts/hydra-eval-failures.py
+++ b/maintainers/scripts/hydra-eval-failures.py
@@ -13,7 +13,7 @@ from pyquery import PyQuery as pq
maintainers_json = subprocess.check_output([
- 'nix-instantiate', '-E', 'import ./lib/maintainers.nix {}', '--eval', '--json'
+ 'nix-instantiate', '-E', 'import ./maintainers/maintainer-list.nix {}', '--eval', '--json'
])
maintainers = json.loads(maintainers_json)
MAINTAINERS = {v: k for k, v in maintainers.iteritems()}
diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix
index c637540a5aa..8d1e47c6bc9 100755
--- a/maintainers/scripts/update.nix
+++ b/maintainers/scripts/update.nix
@@ -45,7 +45,7 @@ let
let
maintainer =
if ! builtins.hasAttr maintainer' pkgs.lib.maintainers then
- builtins.throw "Maintainer with name `${maintainer'} does not exist in `lib/maintainers.nix`."
+ builtins.throw "Maintainer with name `${maintainer'} does not exist in `maintainers/maintainer-list.nix`."
else
builtins.getAttr maintainer' pkgs.lib.maintainers;
in
diff --git a/maintainers/scripts/vanity.sh b/maintainers/scripts/vanity.sh
index 27e7741799f..aa7d4ec967d 100755
--- a/maintainers/scripts/vanity.sh
+++ b/maintainers/scripts/vanity.sh
@@ -10,7 +10,7 @@ git_data="$(echo "$raw_git_log" | grep 'Author:' |
# Name - nick - email correspondence from log and from maintainer list
# Also there are a few manual entries
-maintainers="$(cat "$(dirname "$0")/../../lib/maintainers.nix" |
+maintainers="$(cat "$(dirname "$0")/../maintainer-list.nix" |
grep '=' | sed -re 's/\\"/''/g;
s/[ ]*([^ =]*)[ ]*=[ ]*" *(.*[^ ]) *[<](.*)[>] *".*/\1\t\2\t\3/')"
git_lines="$( ( echo "$git_data";
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index ec940d5d2b8..13fa8d1e114 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -282,8 +282,8 @@ options.mod = mkOption {
option set ().
-Declaration of a list
- nof submodules
+Declaration of a list
+ of submodules
options.mod = mkOption {
description = "submodule example";
diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix
index 5cc96d8bd07..50af022b93c 100644
--- a/nixos/modules/hardware/video/amdgpu-pro.nix
+++ b/nixos/modules/hardware/video/amdgpu-pro.nix
@@ -15,13 +15,19 @@ let
opengl = config.hardware.opengl;
+ kernel = pkgs.linux_4_9.override {
+ extraConfig = ''
+ KALLSYMS_ALL y
+ '';
+ };
+
in
{
config = mkIf enabled {
- nixpkgs.config.xorg.abiCompat = "1.18";
+ nixpkgs.config.xorg.abiCompat = "1.19";
services.xserver.drivers = singleton
{ name = "amdgpu"; modules = [ package ]; libPath = [ package ]; };
@@ -31,6 +37,9 @@ in
boot.extraModulePackages = [ package ];
+ boot.kernelPackages =
+ pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor kernel);
+
boot.blacklistedKernelModules = [ "radeon" ];
hardware.firmware = [ package ];
@@ -38,10 +47,15 @@ in
system.activationScripts.setup-amdgpu-pro = ''
mkdir -p /run/lib
ln -sfn ${package}/lib ${package.libCompatDir}
+ ln -sfn ${package} /run/amdgpu-pro
'' + optionalString opengl.driSupport32Bit ''
ln -sfn ${package32}/lib ${package32.libCompatDir}
'';
+ system.requiredKernelConfig = with config.lib.kernelConfig; [
+ (isYes "KALLSYMS_ALL")
+ ];
+
environment.etc = {
"amd/amdrc".source = package + "/etc/amd/amdrc";
"amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 74ed92de0c0..e0c0ec2711b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -160,6 +160,7 @@
./services/audio/ympd.nix
./services/backup/almir.nix
./services/backup/bacula.nix
+ ./services/backup/borgbackup.nix
./services/backup/crashplan.nix
./services/backup/crashplan-small-business.nix
./services/backup/mysql-backup.nix
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index e0ec77a2959..24283e1d616 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -47,8 +47,8 @@ in
default = true;
description =
''
- Whether users of the wheel group can execute
- commands as super user without entering a password.
+ Whether users of the wheel group must
+ provide a password to run commands as super user via sudo.
'';
};
diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
new file mode 100644
index 00000000000..1b730e0c2b7
--- /dev/null
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -0,0 +1,580 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ isLocalPath = x:
+ builtins.substring 0 1 x == "/" # absolute path
+ || builtins.substring 0 1 x == "." # relative path
+ || builtins.match "[.*:.*]" == null; # not machine:path
+
+ mkExcludeFile = cfg:
+ # Write each exclude pattern to a new line
+ pkgs.writeText "excludefile" (concatStringsSep "\n" cfg.exclude);
+
+ mkKeepArgs = cfg:
+ # If cfg.prune.keep e.g. has a yearly attribute,
+ # its content is passed on as --keep-yearly
+ concatStringsSep " "
+ (mapAttrsToList (x: y: "--keep-${x}=${toString y}") cfg.prune.keep);
+
+ mkBackupScript = cfg: ''
+ on_exit()
+ {
+ exitStatus=$?
+ # Reset the EXIT handler, or else we're called again on 'exit' below
+ trap - EXIT
+ ${cfg.postHook}
+ exit $exitStatus
+ }
+ trap 'on_exit' INT TERM QUIT EXIT
+
+ archiveName="${cfg.archiveBaseName}-$(date ${cfg.dateFormat})"
+ archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}"
+ ${cfg.preHook}
+ '' + optionalString cfg.doInit ''
+ # Run borg init if the repo doesn't exist yet
+ if ! borg list > /dev/null; then
+ borg init \
+ --encryption ${cfg.encryption.mode} \
+ $extraInitArgs
+ ${cfg.postInit}
+ fi
+ '' + ''
+ borg create \
+ --compression ${cfg.compression} \
+ --exclude-from ${mkExcludeFile cfg} \
+ $extraCreateArgs \
+ "::$archiveName$archiveSuffix" \
+ ${escapeShellArgs cfg.paths}
+ '' + optionalString cfg.appendFailedSuffix ''
+ borg rename "::$archiveName$archiveSuffix" "$archiveName"
+ '' + ''
+ ${cfg.postCreate}
+ '' + optionalString (cfg.prune.keep != { }) ''
+ borg prune \
+ ${mkKeepArgs cfg} \
+ --prefix ${escapeShellArg cfg.prune.prefix} \
+ $extraPruneArgs
+ ${cfg.postPrune}
+ '';
+
+ mkPassEnv = cfg: with cfg.encryption;
+ if passCommand != null then
+ { BORG_PASSCOMMAND = passCommand; }
+ else if passphrase != null then
+ { BORG_PASSPHRASE = passphrase; }
+ else { };
+
+ mkBackupService = name: cfg:
+ let
+ userHome = config.users.users.${cfg.user}.home;
+ in nameValuePair "borgbackup-job-${name}" {
+ description = "BorgBackup job ${name}";
+ path = with pkgs; [
+ borgbackup openssh
+ ];
+ script = mkBackupScript cfg;
+ serviceConfig = {
+ User = cfg.user;
+ Group = cfg.group;
+ # Only run when no other process is using CPU or disk
+ CPUSchedulingPolicy = "idle";
+ IOSchedulingClass = "idle";
+ ProtectSystem = "strict";
+ ReadWritePaths =
+ [ "${userHome}/.config/borg" "${userHome}/.cache/borg" ]
+ # Borg needs write access to repo if it is not remote
+ ++ optional (isLocalPath cfg.repo) cfg.repo;
+ PrivateTmp = true;
+ };
+ environment = {
+ BORG_REPO = cfg.repo;
+ inherit (cfg) extraInitArgs extraCreateArgs extraPruneArgs;
+ } // (mkPassEnv cfg) // cfg.environment;
+ inherit (cfg) startAt;
+ };
+
+ # Paths listed in ReadWritePaths must exist before service is started
+ mkActivationScript = name: cfg:
+ let
+ install = "install -o ${cfg.user} -g ${cfg.group}";
+ in
+ nameValuePair "borgbackup-job-${name}" (stringAfter [ "users" ] (''
+ # Eensure that the home directory already exists
+ # We can't assert createHome == true because that's not the case for root
+ cd "${config.users.users.${cfg.user}.home}"
+ ${install} -d .config/borg
+ ${install} -d .cache/borg
+ '' + optionalString (isLocalPath cfg.repo) ''
+ ${install} -d ${escapeShellArg cfg.repo}
+ ''));
+
+ mkPassAssertion = name: cfg: {
+ assertion = with cfg.encryption;
+ mode != "none" -> passCommand != null || passphrase != null;
+ message =
+ "passCommand or passphrase has to be specified because"
+ + '' borgbackup.jobs.${name}.encryption != "none"'';
+ };
+
+ mkRepoService = name: cfg:
+ nameValuePair "borgbackup-repo-${name}" {
+ description = "Create BorgBackup repository ${name} directory";
+ script = ''
+ mkdir -p ${escapeShellArg cfg.path}
+ chown ${cfg.user}:${cfg.group} ${escapeShellArg cfg.path}
+ '';
+ serviceConfig = {
+ # The service's only task is to ensure that the specified path exists
+ Type = "oneshot";
+ };
+ wantedBy = [ "multi-user.target" ];
+ };
+
+ mkAuthorizedKey = cfg: appendOnly: key:
+ let
+ # Because of the following line, clients do not need to specify an absolute repo path
+ cdCommand = "cd ${escapeShellArg cfg.path}";
+ restrictedArg = "--restrict-to-${if cfg.allowSubRepos then "path" else "repository"} .";
+ appendOnlyArg = optionalString appendOnly "--append-only";
+ quotaArg = optionalString (cfg.quota != null) "--storage-quota ${cfg.quota}";
+ serveCommand = "borg serve ${restrictedArg} ${appendOnlyArg} ${quotaArg}";
+ in
+ ''command="${cdCommand} && ${serveCommand}",restrict ${key}'';
+
+ mkUsersConfig = name: cfg: {
+ users.${cfg.user} = {
+ openssh.authorizedKeys.keys =
+ (map (mkAuthorizedKey cfg false) cfg.authorizedKeys
+ ++ map (mkAuthorizedKey cfg true) cfg.authorizedKeysAppendOnly);
+ useDefaultShell = true;
+ };
+ groups.${cfg.group} = { };
+ };
+
+ mkKeysAssertion = name: cfg: {
+ assertion = cfg.authorizedKeys != [ ] || cfg.authorizedKeysAppendOnly != [ ];
+ message =
+ "borgbackup.repos.${name} does not make sense"
+ + " without at least one public key";
+ };
+
+in {
+ meta.maintainers = with maintainers; [ dotlambda ];
+
+ ###### interface
+
+ options.services.borgbackup.jobs = mkOption {
+ description = "Deduplicating backups using BorgBackup.";
+ default = { };
+ example = literalExample ''
+ {
+ rootBackup = {
+ paths = "/";
+ exclude = [ "/nix" ];
+ repo = "/path/to/local/repo";
+ encryption = {
+ mode = "repokey";
+ passphrase = "secret";
+ };
+ compression = "auto,lzma";
+ startAt = "weekly";
+ };
+ }
+ '';
+ type = types.attrsOf (types.submodule (let globalConfig = config; in
+ { name, config, ... }: {
+ options = {
+
+ paths = mkOption {
+ type = with types; either path (nonEmptyListOf path);
+ description = "Path(s) to back up.";
+ example = "/home/user";
+ apply = x: if isList x then x else [ x ];
+ };
+
+ repo = mkOption {
+ type = types.str;
+ description = "Remote or local repository to back up to.";
+ example = "user@machine:/path/to/repo";
+ };
+
+ archiveBaseName = mkOption {
+ type = types.strMatching "[^/{}]+";
+ default = "${globalConfig.networking.hostName}-${name}";
+ defaultText = "\${config.networking.hostName}-";
+ description = ''
+ How to name the created archives. A timestamp, whose format is
+ determined by , will be appended. The full
+ name can be modified at runtime ($archiveName).
+ Placeholders like {hostname} must not be used.
+ '';
+ };
+
+ dateFormat = mkOption {
+ type = types.str;
+ description = ''
+ Arguments passed to date
+ to create a timestamp suffix for the archive name.
+ '';
+ default = "+%Y-%m-%dT%H:%M:%S";
+ example = "-u +%s";
+ };
+
+ startAt = mkOption {
+ type = with types; either str (listOf str);
+ default = "daily";
+ description = ''
+ When or how often the backup should run.
+ Must be in the format described in
+ systemd.time
+ 7.
+ If you do not want the backup to start
+ automatically, use [ ].
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ description = ''
+ The user borg is run as.
+ User or group need read permission
+ for the specified .
+ '';
+ default = "root";
+ };
+
+ group = mkOption {
+ type = types.str;
+ description = ''
+ The group borg is run as. User or group needs read permission
+ for the specified .
+ '';
+ default = "root";
+ };
+
+ encryption.mode = mkOption {
+ type = types.enum [
+ "repokey" "keyfile"
+ "repokey-blake2" "keyfile-blake2"
+ "authenticated" "authenticated-blake2"
+ "none"
+ ];
+ description = ''
+ Encryption mode to use. Setting a mode
+ other than "none" requires
+ you to specify a
+ or a .
+ '';
+ };
+
+ encryption.passCommand = mkOption {
+ type = with types; nullOr str;
+ description = ''
+ A command which prints the passphrase to stdout.
+ Mutually exclusive with .
+ '';
+ default = null;
+ example = "cat /path/to/passphrase_file";
+ };
+
+ encryption.passphrase = mkOption {
+ type = with types; nullOr str;
+ description = ''
+ The passphrase the backups are encrypted with.
+ Mutually exclusive with .
+ If you do not want the passphrase to be stored in the
+ world-readable Nix store, use .
+ '';
+ default = null;
+ };
+
+ compression = mkOption {
+ # "auto" is optional,
+ # compression mode must be given,
+ # compression level is optional
+ type = types.strMatching "none|(auto,)?(lz4|zstd|zlib|lzma)(,[[:digit:]]{1,2})?";
+ description = ''
+ Compression method to use. Refer to
+ borg help compression
+ for all available options.
+ '';
+ default = "lz4";
+ example = "auto,lzma";
+ };
+
+ exclude = mkOption {
+ type = with types; listOf str;
+ description = ''
+ Exclude paths matching any of the given patterns. See
+ borg help patterns for pattern syntax.
+ '';
+ default = [ ];
+ example = [
+ "/home/*/.cache"
+ "/nix"
+ ];
+ };
+
+ doInit = mkOption {
+ type = types.bool;
+ description = ''
+ Run borg init if the
+ specified does not exist.
+ You should set this to false
+ if the repository is located on an external drive
+ that might not always be mounted.
+ '';
+ default = true;
+ };
+
+ appendFailedSuffix = mkOption {
+ type = types.bool;
+ description = ''
+ Append a .failed suffix
+ to the archive name, which is only removed if
+ borg create has a zero exit status.
+ '';
+ default = true;
+ };
+
+ prune.keep = mkOption {
+ # Specifying e.g. `prune.keep.yearly = -1`
+ # means there is no limit of yearly archives to keep
+ # The regex is for use with e.g. --keep-within 1y
+ type = with types; attrsOf (either int (strMatching "[[:digit:]]+[Hdwmy]"));
+ description = ''
+ Prune a repository by deleting all archives not matching any of the
+ specified retention options. See borg help prune
+ for the available options.
+ '';
+ default = { };
+ example = literalExample ''
+ {
+ within = "1d"; # Keep all archives from the last day
+ daily = 7;
+ weekly = 4;
+ monthly = -1; # Keep at least one archive for each month
+ }
+ '';
+ };
+
+ prune.prefix = mkOption {
+ type = types.str;
+ description = ''
+ Only consider archive names starting with this prefix for pruning.
+ By default, only archives created by this job are considered.
+ Use "" to consider all archives.
+ '';
+ default = config.archiveBaseName;
+ defaultText = "\${archiveBaseName}";
+ };
+
+ environment = mkOption {
+ type = with types; attrsOf str;
+ description = ''
+ Environment variables passed to the backup script.
+ You can for example specify which SSH key to use.
+ '';
+ default = { };
+ example = { BORG_RSH = "ssh -i /path/to/key"; };
+ };
+
+ preHook = mkOption {
+ type = types.lines;
+ description = ''
+ Shell commands to run before the backup.
+ This can for example be used to mount file systems.
+ '';
+ default = "";
+ example = ''
+ # To add excluded paths at runtime
+ extraCreateArgs="$extraCreateArgs --exclude /some/path"
+ '';
+ };
+
+ postInit = mkOption {
+ type = types.lines;
+ description = ''
+ Shell commands to run after borg init.
+ '';
+ default = "";
+ };
+
+ postCreate = mkOption {
+ type = types.lines;
+ description = ''
+ Shell commands to run after borg create. The name
+ of the created archive is stored in $archiveName.
+ '';
+ default = "";
+ };
+
+ postPrune = mkOption {
+ type = types.lines;
+ description = ''
+ Shell commands to run after borg prune.
+ '';
+ default = "";
+ };
+
+ postHook = mkOption {
+ type = types.lines;
+ description = ''
+ Shell commands to run just before exit. They are executed
+ even if a previous command exits with a non-zero exit code.
+ The latter is available as $exitStatus.
+ '';
+ default = "";
+ };
+
+ extraInitArgs = mkOption {
+ type = types.str;
+ description = ''
+ Additional arguments for borg init.
+ Can also be set at runtime using $extraInitArgs.
+ '';
+ default = "";
+ example = "--append-only";
+ };
+
+ extraCreateArgs = mkOption {
+ type = types.str;
+ description = ''
+ Additional arguments for borg create.
+ Can also be set at runtime using $extraCreateArgs.
+ '';
+ default = "";
+ example = "--stats --checkpoint-interval 600";
+ };
+
+ extraPruneArgs = mkOption {
+ type = types.str;
+ description = ''
+ Additional arguments for borg prune.
+ Can also be set at runtime using $extraPruneArgs.
+ '';
+ default = "";
+ example = "--save-space";
+ };
+
+ };
+ }
+ ));
+ };
+
+ options.services.borgbackup.repos = mkOption {
+ description = ''
+ Serve BorgBackup repositories to given public SSH keys,
+ restricting their access to the repository only.
+ Also, clients do not need to specify the absolute path when accessing the repository,
+ i.e. user@machine:. is enough. (Note colon and dot.)
+ '';
+ default = { };
+ type = types.attrsOf (types.submodule (
+ { name, config, ... }: {
+ options = {
+
+ path = mkOption {
+ type = types.path;
+ description = ''
+ Where to store the backups. Note that the directory
+ is created automatically, with correct permissions.
+ '';
+ default = "/var/lib/borgbackup";
+ };
+
+ user = mkOption {
+ type = types.str;
+ description = ''
+ The user borg serve is run as.
+ User or group needs write permission
+ for the specified .
+ '';
+ default = "borg";
+ };
+
+ group = mkOption {
+ type = types.str;
+ description = ''
+ The group borg serve is run as.
+ User or group needs write permission
+ for the specified .
+ '';
+ default = "borg";
+ };
+
+ authorizedKeys = mkOption {
+ type = with types; listOf str;
+ description = ''
+ Public SSH keys that are given full write access to this repository.
+ You should use a different SSH key for each repository you write to, because
+ the specified keys are restricted to running borg serve
+ and can only access this single repository.
+ '';
+ default = [ ];
+ };
+
+ authorizedKeysAppendOnly = mkOption {
+ type = with types; listOf str;
+ description = ''
+ Public SSH keys that can only be used to append new data (archives) to the repository.
+ Note that archives can still be marked as deleted and are subsequently removed from disk
+ upon accessing the repo with full write access, e.g. when pruning.
+ '';
+ default = [ ];
+ };
+
+ allowSubRepos = mkOption {
+ type = types.bool;
+ description = ''
+ Allow clients to create repositories in subdirectories of the
+ specified . These can be accessed using
+ user@machine:path/to/subrepo. Note that a
+ applies to repositories independently.
+ Therefore, if this is enabled, clients can create multiple
+ repositories and upload an arbitrary amount of data.
+ '';
+ default = false;
+ };
+
+ quota = mkOption {
+ # See the definition of parse_file_size() in src/borg/helpers/parseformat.py
+ type = with types; nullOr (strMatching "[[:digit:].]+[KMGTP]?");
+ description = ''
+ Storage quota for the repository. This quota is ensured for all
+ sub-repositories if is enabled
+ but not for the overall storage space used.
+ '';
+ default = null;
+ example = "100G";
+ };
+
+ };
+ }
+ ));
+ };
+
+ ###### implementation
+
+ config = mkIf (with config.services.borgbackup; jobs != { } || repos != { })
+ (with config.services.borgbackup; {
+ assertions =
+ mapAttrsToList mkPassAssertion jobs
+ ++ mapAttrsToList mkKeysAssertion repos;
+
+ system.activationScripts = mapAttrs' mkActivationScript jobs;
+
+ systemd.services =
+ # A job named "foo" is mapped to systemd.services.borgbackup-job-foo
+ mapAttrs' mkBackupService jobs
+ # A repo named "foo" is mapped to systemd.services.borgbackup-repo-foo
+ // mapAttrs' mkRepoService repos;
+
+ users = mkMerge (mapAttrsToList mkUsersConfig repos);
+
+ environment.systemPackages = with pkgs; [ borgbackup ];
+ });
+}
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 54047a50caa..c2f4e9c0c5a 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -145,6 +145,11 @@ in {
};
config = mkIf cfg.enable {
+ # server references the dejavu fonts
+ environment.systemPackages = [
+ pkgs.dejavu_fonts
+ ];
+
users.extraGroups = optional (cfg.group == "jenkins") {
name = "jenkins";
gid = config.ids.gids.jenkins;
@@ -200,10 +205,12 @@ in {
${replacePlugins}
'';
+ # For reference: https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript
script = ''
${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
--httpPort=${toString cfg.port} \
--prefix=${cfg.prefix} \
+ -Djava.awt.headless=true \
${concatStringsSep " " cfg.extraOptions}
'';
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 458d0087dbd..63e976ae566 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -40,6 +40,10 @@ let
SECRET_KEY = #secretkey#
INSTALL_LOCK = true
+ [log]
+ ROOT_PATH = ${cfg.log.rootPath}
+ LEVEL = ${cfg.log.level}
+
${cfg.extraConfig}
'';
in
@@ -65,6 +69,19 @@ in
description = "gitea data directory.";
};
+ log = {
+ rootPath = mkOption {
+ default = "${cfg.stateDir}/log";
+ type = types.str;
+ description = "Root path for log files.";
+ };
+ level = mkOption {
+ default = "Trace";
+ type = types.enum [ "Trace" "Debug" "Info" "Warn" "Error" "Critical" ];
+ description = "General log level.";
+ };
+ };
+
user = mkOption {
type = types.str;
default = "gitea";
@@ -287,6 +304,7 @@ in
description = "Gitea Service";
home = cfg.stateDir;
createHome = true;
+ useDefaultShell = true;
};
};
diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index cc60a143fa6..ac37c11106e 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -104,7 +104,6 @@ in {
config = mkIf cfg.enable {
systemd.services.home-assistant = {
description = "Home Assistant";
- wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
preStart = lib.optionalString (cfg.config != null) ''
rm -f ${cfg.configDir}/configuration.yaml
@@ -121,6 +120,16 @@ in {
ReadWritePaths = "${cfg.configDir}";
PrivateTmp = true;
};
+ path = [
+ "/run/wrappers" # needed for ping
+ ];
+ };
+
+ systemd.targets.home-assistant = rec {
+ description = "Home Assistant";
+ wantedBy = [ "multi-user.target" ];
+ wants = [ "home-assistant.service" ];
+ after = wants;
};
users.extraUsers.hass = {
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 921be23f368..a5b6dbab157 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -25,6 +25,7 @@ let
DATABASE_USER = cfg.database.user;
DATABASE_PASSWORD = cfg.database.password;
DATABASE_PATH = cfg.database.path;
+ DATABASE_CONN_MAX_LIFETIME = cfg.database.connMaxLifetime;
SECURITY_ADMIN_USER = cfg.security.adminUser;
SECURITY_ADMIN_PASSWORD = cfg.security.adminPassword;
@@ -143,6 +144,15 @@ in {
default = "${cfg.dataDir}/data/grafana.db";
type = types.path;
};
+
+ connMaxLifetime = mkOption {
+ description = ''
+ Sets the maximum amount of time (in seconds) a connection may be reused.
+ For MySQL this setting should be shorter than the `wait_timeout' variable.
+ '';
+ default = 14400;
+ type = types.int;
+ };
};
security = {
@@ -241,7 +251,9 @@ in {
description = "Grafana Service Daemon";
wantedBy = ["multi-user.target"];
after = ["networking.target"];
- environment = mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions;
+ environment = {
+ QT_QPA_PLATFORM = "offscreen";
+ } // mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions;
serviceConfig = {
ExecStart = "${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}";
WorkingDirectory = cfg.dataDir;
diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix
index e267fed2795..bb56e2df09b 100644
--- a/nixos/modules/services/security/hologram-server.nix
+++ b/nixos/modules/services/security/hologram-server.nix
@@ -12,9 +12,12 @@ let
dn = cfg.ldapBindDN;
password = cfg.ldapBindPassword;
};
- insecureldap = cfg.ldapInsecure;
- userattr = cfg.ldapUserAttr;
- baseDN = cfg.ldapBaseDN;
+ insecureldap = cfg.ldapInsecure;
+ userattr = cfg.ldapUserAttr;
+ baseDN = cfg.ldapBaseDN;
+ enableldapRoles = cfg.enableLdapRoles;
+ roleAttr = cfg.roleAttr;
+ groupClassAttr = cfg.groupClassAttr;
};
aws = {
account = cfg.awsAccount;
@@ -70,6 +73,24 @@ in {
description = "Password of account to use to query the LDAP server";
};
+ enableLdapRoles = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to assign user roles based on the user's LDAP group memberships";
+ };
+
+ groupClassAttr = mkOption {
+ type = types.str;
+ default = "groupOfNames";
+ description = "The objectclass attribute to search for groups when enableLdapRoles is true";
+ };
+
+ roleAttr = mkOption {
+ type = types.str;
+ default = "businessCategory";
+ description = "Which LDAP group attribute to search for authorized role ARNs";
+ };
+
awsAccount = mkOption {
type = types.str;
description = "AWS account number";
diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
index d63fb954ef9..bc74d62b116 100644
--- a/nixos/modules/services/web-servers/varnish/default.nix
+++ b/nixos/modules/services/web-servers/varnish/default.nix
@@ -6,13 +6,22 @@ let
cfg = config.services.varnish;
commandLine = "-f ${pkgs.writeText "default.vcl" cfg.config}" +
- optionalString (cfg.extraModules != []) " -p vmod_path='${makeSearchPathOutput "lib" "lib/varnish/vmods" ([pkgs.varnish] ++ cfg.extraModules)}' -r vmod_path";
+ optionalString (cfg.extraModules != []) " -p vmod_path='${makeSearchPathOutput "lib" "lib/varnish/vmods" ([cfg.package] ++ cfg.extraModules)}' -r vmod_path";
in
{
options = {
services.varnish = {
enable = mkEnableOption "Varnish Server";
+ package = mkOption {
+ type = types.package;
+ default = pkgs.varnish5;
+ defaultText = "pkgs.varnish5";
+ description = ''
+ The package to use
+ '';
+ };
+
http_address = mkOption {
type = types.str;
default = "*:6081";
@@ -39,7 +48,7 @@ in
extraModules = mkOption {
type = types.listOf types.package;
default = [];
- example = literalExample "[ pkgs.varnish-geoip ]";
+ example = literalExample "[ pkgs.varnish5Packages.geoip ]";
description = "
Varnish modules (except 'std').
";
@@ -73,7 +82,7 @@ in
serviceConfig = {
Type = "simple";
PermissionsStartOnly = true;
- ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -n ${cfg.stateDir} -F ${cfg.extraCommandLine} ${commandLine}";
+ ExecStart = "${cfg.package}/sbin/varnishd -a ${cfg.http_address} -n ${cfg.stateDir} -F ${cfg.extraCommandLine} ${commandLine}";
Restart = "always";
RestartSec = "5s";
User = "varnish";
@@ -84,13 +93,13 @@ in
};
};
- environment.systemPackages = [ pkgs.varnish ];
+ environment.systemPackages = [ cfg.package ];
# check .vcl syntax at compile time (e.g. before nixops deployment)
system.extraDependencies = [
(pkgs.stdenv.mkDerivation {
name = "check-varnish-syntax";
- buildCommand = "${pkgs.varnish}/sbin/varnishd -C ${commandLine} 2> $out";
+ buildCommand = "${cfg.package}/sbin/varnishd -C ${commandLine} 2> $out || (cat $out; exit 1)";
})
];
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index 25ba95fccd7..bc420831ad8 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -12,6 +12,7 @@ in
./afterstep.nix
./bspwm.nix
./dwm.nix
+ ./evilwm.nix
./exwm.nix
./fluxbox.nix
./fvwm.nix
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 4039e4e5163..a2d2eb1c311 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -489,7 +489,7 @@ in
networking.interfaces = mkOption {
default = {};
example =
- { eth0.ipv4 = [ {
+ { eth0.ipv4.addresses = [ {
address = "131.211.84.78";
prefixLength = 25;
} ];
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index a369b7ddbe1..024db7f87c2 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -119,18 +119,10 @@ in {
after = [ "systemd-udev-settle.service" ]
++ optional vswitch.enable "vswitchd.service";
- environment = {
- LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
- };
+ environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
- path = with pkgs; [
- bridge-utils
- dmidecode
- dnsmasq
- ebtables
- cfg.qemuPackage # libvirtd requires qemu-img to manage disk images
- ]
- ++ optional vswitch.enable vswitch.package;
+ path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images
+ ++ optional vswitch.enable vswitch.package;
preStart = ''
mkdir -p /var/log/libvirt/qemu -m 755
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 674f230c810..ee327ed805b 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -320,7 +320,7 @@ in
mkOption {
default = [
"-net nic,netdev=user.0,model=virtio"
- "-netdev user,id=user.0,\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
+ "-netdev user,id=user.0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
];
type = types.listOf types.str;
description = ''
diff --git a/nixos/release.nix b/nixos/release.nix
index 6a3fcea1768..0b8d7318cd8 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -17,14 +17,14 @@ let
} // args);
# Note: only supportedSystems are considered.
- callTestOnTheseSystems = systems: fn: args:
- forTheseSystems
+ callTestOnMatchingSystems = systems: fn: args:
+ forMatchingSystems
(intersectLists supportedSystems systems)
(system: hydraJob (importTest fn args system));
- callTest = callTestOnTheseSystems supportedSystems;
+ callTest = callTestOnMatchingSystems supportedSystems;
- callSubTests = callSubTestsOnTheseSystems supportedSystems;
- callSubTestsOnTheseSystems = systems: fn: args: let
+ callSubTests = callSubTestsOnMatchingSystems supportedSystems;
+ callSubTestsOnMatchingSystems = systems: fn: args: let
discover = attrs: let
subTests = filterAttrs (const (hasAttr "test")) attrs;
in mapAttrs (const (t: hydraJob t.test)) subTests;
@@ -127,7 +127,7 @@ in rec {
# Build the initial ramdisk so Hydra can keep track of its size over time.
initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);
- netboot = forTheseSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot {
+ netboot = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot {
inherit system;
modules = [
./modules/installer/netboot/netboot-minimal.nix
@@ -141,7 +141,7 @@ in rec {
inherit system;
});
- iso_graphical = forTheseSystems [ "x86_64-linux" ] (system: makeIso {
+ iso_graphical = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-graphical-kde.nix;
type = "graphical";
inherit system;
@@ -149,7 +149,7 @@ in rec {
# A variant with a more recent (but possibly less stable) kernel
# that might support more hardware.
- iso_minimal_new_kernel = forTheseSystems [ "x86_64-linux" ] (system: makeIso {
+ iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;
type = "minimal-new-kernel";
inherit system;
@@ -157,7 +157,7 @@ in rec {
# A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
- ova = forTheseSystems [ "x86_64-linux" ] (system:
+ ova = forMatchingSystems [ "x86_64-linux" ] (system:
with import nixpkgs { inherit system; };
@@ -233,9 +233,9 @@ in rec {
tests.boot-stage1 = callTest tests/boot-stage1.nix {};
tests.borgbackup = callTest tests/borgbackup.nix {};
tests.buildbot = callTest tests/buildbot.nix {};
- tests.cadvisor = callTestOnTheseSystems ["x86_64-linux"] tests/cadvisor.nix {};
- tests.ceph = callTestOnTheseSystems ["x86_64-linux"] tests/ceph.nix {};
- tests.chromium = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/chromium.nix {}).stable or {};
+ tests.cadvisor = callTestOnMatchingSystems ["x86_64-linux"] tests/cadvisor.nix {};
+ tests.ceph = callTestOnMatchingSystems ["x86_64-linux"] tests/ceph.nix {};
+ tests.chromium = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/chromium.nix {}).stable or {};
tests.cjdns = callTest tests/cjdns.nix {};
tests.cloud-init = callTest tests/cloud-init.nix {};
tests.containers-ipv4 = callTest tests/containers-ipv4.nix {};
@@ -249,21 +249,21 @@ in rec {
tests.containers-hosts = callTest tests/containers-hosts.nix {};
tests.containers-macvlans = callTest tests/containers-macvlans.nix {};
tests.couchdb = callTest tests/couchdb.nix {};
- tests.docker = callTestOnTheseSystems ["x86_64-linux"] tests/docker.nix {};
- tests.docker-tools = callTestOnTheseSystems ["x86_64-linux"] tests/docker-tools.nix {};
- tests.docker-edge = callTestOnTheseSystems ["x86_64-linux"] tests/docker-edge.nix {};
+ tests.docker = callTestOnMatchingSystems ["x86_64-linux"] tests/docker.nix {};
+ tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {};
+ tests.docker-edge = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-edge.nix {};
tests.dovecot = callTest tests/dovecot.nix {};
- tests.dnscrypt-proxy = callTestOnTheseSystems ["x86_64-linux"] tests/dnscrypt-proxy.nix {};
+ tests.dnscrypt-proxy = callTestOnMatchingSystems ["x86_64-linux"] tests/dnscrypt-proxy.nix {};
tests.ecryptfs = callTest tests/ecryptfs.nix {};
- tests.etcd = callTestOnTheseSystems ["x86_64-linux"] tests/etcd.nix {};
- tests.ec2-nixops = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-nixops or {};
- tests.ec2-config = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-config or {};
- tests.elk = callSubTestsOnTheseSystems ["x86_64-linux"] tests/elk.nix {};
+ tests.etcd = callTestOnMatchingSystems ["x86_64-linux"] tests/etcd.nix {};
+ tests.ec2-nixops = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-nixops or {};
+ tests.ec2-config = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-config or {};
+ tests.elk = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/elk.nix {};
tests.env = callTest tests/env.nix {};
tests.ferm = callTest tests/ferm.nix {};
tests.firefox = callTest tests/firefox.nix {};
tests.firewall = callTest tests/firewall.nix {};
- tests.fleet = callTestOnTheseSystems ["x86_64-linux"] tests/fleet.nix {};
+ tests.fleet = callTestOnMatchingSystems ["x86_64-linux"] tests/fleet.nix {};
tests.fwupd = callTest tests/fwupd.nix {};
#tests.gitlab = callTest tests/gitlab.nix {};
tests.gitolite = callTest tests/gitolite.nix {};
@@ -296,7 +296,7 @@ in rec {
tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
tests.kernel-latest = callTest tests/kernel-latest.nix {};
tests.kernel-lts = callTest tests/kernel-lts.nix {};
- tests.kubernetes = callSubTestsOnTheseSystems ["x86_64-linux"] tests/kubernetes/default.nix {};
+ tests.kubernetes = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/kubernetes/default.nix {};
tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
tests.ldap = callTest tests/ldap.nix {};
#tests.lightdm = callTest tests/lightdm.nix {};
@@ -326,14 +326,14 @@ in rec {
tests.nginx = callTest tests/nginx.nix { };
tests.nghttpx = callTest tests/nghttpx.nix { };
tests.nix-ssh-serve = callTest tests/nix-ssh-serve.nix { };
- tests.novacomd = callTestOnTheseSystems ["x86_64-linux"] tests/novacomd.nix { };
+ tests.novacomd = callTestOnMatchingSystems ["x86_64-linux"] tests/novacomd.nix { };
tests.leaps = callTest tests/leaps.nix { };
tests.nsd = callTest tests/nsd.nix {};
tests.openssh = callTest tests/openssh.nix {};
tests.openldap = callTest tests/openldap.nix {};
tests.owncloud = callTest tests/owncloud.nix {};
tests.pam-oath-login = callTest tests/pam-oath-login.nix {};
- #tests.panamax = callTestOnTheseSystems ["x86_64-linux"] tests/panamax.nix {};
+ #tests.panamax = callTestOnMatchingSystems ["x86_64-linux"] tests/panamax.nix {};
tests.peerflix = callTest tests/peerflix.nix {};
tests.php-pcre = callTest tests/php-pcre.nix {};
tests.postgresql = callSubTests tests/postgresql.nix {};
@@ -366,7 +366,7 @@ in rec {
tests.tomcat = callTest tests/tomcat.nix {};
tests.udisks2 = callTest tests/udisks2.nix {};
tests.vault = callTest tests/vault.nix {};
- tests.virtualbox = callSubTestsOnTheseSystems ["x86_64-linux"] tests/virtualbox.nix {};
+ tests.virtualbox = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/virtualbox.nix {};
tests.wordpress = callTest tests/wordpress.nix {};
tests.xautolock = callTest tests/xautolock.nix {};
tests.xfce = callTest tests/xfce.nix {};
diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix
index 123b02be725..36731773de2 100644
--- a/nixos/tests/borgbackup.nix
+++ b/nixos/tests/borgbackup.nix
@@ -1,21 +1,162 @@
-import ./make-test.nix ({ pkgs, ...}: {
+import ./make-test.nix ({ pkgs, ... }:
+
+let
+ passphrase = "supersecret";
+ dataDir = "/ran:dom/data";
+ excludeFile = "not_this_file";
+ keepFile = "important_file";
+ keepFileData = "important_data";
+ localRepo = "/root/back:up";
+ archiveName = "my_archive";
+ remoteRepo = "borg@server:."; # No need to specify path
+ privateKey = pkgs.writeText "id_ed25519" ''
+ -----BEGIN OPENSSH PRIVATE KEY-----
+ b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+ QyNTUxOQAAACBx8UB04Q6Q/fwDFjakHq904PYFzG9pU2TJ9KXpaPMcrwAAAJB+cF5HfnBe
+ RwAAAAtzc2gtZWQyNTUxOQAAACBx8UB04Q6Q/fwDFjakHq904PYFzG9pU2TJ9KXpaPMcrw
+ AAAEBN75NsJZSpt63faCuaD75Unko0JjlSDxMhYHAPJk2/xXHxQHThDpD9/AMWNqQer3Tg
+ 9gXMb2lTZMn0pelo8xyvAAAADXJzY2h1ZXR6QGt1cnQ=
+ -----END OPENSSH PRIVATE KEY-----
+ '';
+ publicKey = ''
+ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHHxQHThDpD9/AMWNqQer3Tg9gXMb2lTZMn0pelo8xyv root@client
+ '';
+ privateKeyAppendOnly = pkgs.writeText "id_ed25519" ''
+ -----BEGIN OPENSSH PRIVATE KEY-----
+ b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+ QyNTUxOQAAACBacZuz1ELGQdhI7PF6dGFafCDlvh8pSEc4cHjkW0QjLwAAAJC9YTxxvWE8
+ cQAAAAtzc2gtZWQyNTUxOQAAACBacZuz1ELGQdhI7PF6dGFafCDlvh8pSEc4cHjkW0QjLw
+ AAAEAAhV7wTl5dL/lz+PF/d4PnZXuG1Id6L/mFEiGT1tZsuFpxm7PUQsZB2Ejs8Xp0YVp8
+ IOW+HylIRzhweORbRCMvAAAADXJzY2h1ZXR6QGt1cnQ=
+ -----END OPENSSH PRIVATE KEY-----
+ '';
+ publicKeyAppendOnly = ''
+ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFpxm7PUQsZB2Ejs8Xp0YVp8IOW+HylIRzhweORbRCMv root@client
+ '';
+
+in {
name = "borgbackup";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ mic92 ];
+ meta = with pkgs.stdenv.lib; {
+ maintainers = with maintainers; [ dotlambda ];
};
nodes = {
- machine = { config, pkgs, ... }: {
- environment.systemPackages = [ pkgs.borgbackup ];
+ client = { config, pkgs, ... }: {
+ services.borgbackup.jobs = {
+
+ local = rec {
+ paths = dataDir;
+ repo = localRepo;
+ preHook = ''
+ # Don't append a timestamp
+ archiveName="${archiveName}"
+ '';
+ encryption = {
+ mode = "repokey";
+ inherit passphrase;
+ };
+ compression = "auto,zlib,9";
+ prune.keep = {
+ within = "1y";
+ yearly = 5;
+ };
+ exclude = [ "*/${excludeFile}" ];
+ postHook = "echo post";
+ startAt = [ ]; # Do not run automatically
+ };
+
+ remote = {
+ paths = dataDir;
+ repo = remoteRepo;
+ encryption.mode = "none";
+ startAt = [ ];
+ environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519";
+ };
+
+ remoteAppendOnly = {
+ paths = dataDir;
+ repo = remoteRepo;
+ encryption.mode = "none";
+ startAt = [ ];
+ environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519.appendOnly";
+ };
+
+ };
+ };
+
+ server = { config, pkgs, ... }: {
+ services.openssh = {
+ enable = true;
+ passwordAuthentication = false;
+ challengeResponseAuthentication = false;
+ };
+
+ services.borgbackup.repos.repo1 = {
+ authorizedKeys = [ publicKey ];
+ path = "/data/borgbackup";
+ };
+
+ # Second repo to make sure the authorizedKeys options are merged correctly
+ services.borgbackup.repos.repo2 = {
+ authorizedKeysAppendOnly = [ publicKeyAppendOnly ];
+ path = "/data/borgbackup";
+ quota = ".5G";
+ };
};
};
testScript = ''
- my $borg = "BORG_PASSPHRASE=supersecret borg";
- $machine->succeed("$borg init --encryption=repokey /tmp/backup");
- $machine->succeed("mkdir /tmp/data/ && echo 'data' >/tmp/data/file");
- $machine->succeed("$borg create --stats /tmp/backup::test /tmp/data");
- $machine->succeed("$borg extract /tmp/backup::test");
- $machine->succeed('c=$(cat data/file) && echo "c = $c" >&2 && [[ "$c" == "data" ]]');
+ startAll;
+
+ $client->fail('test -d "${remoteRepo}"');
+
+ $client->succeed("cp ${privateKey} /root/id_ed25519");
+ $client->succeed("chmod 0600 /root/id_ed25519");
+ $client->succeed("cp ${privateKeyAppendOnly} /root/id_ed25519.appendOnly");
+ $client->succeed("chmod 0600 /root/id_ed25519.appendOnly");
+
+ $client->succeed("mkdir -p ${dataDir}");
+ $client->succeed("touch ${dataDir}/${excludeFile}");
+ $client->succeed("echo '${keepFileData}' > ${dataDir}/${keepFile}");
+
+ subtest "local", sub {
+ my $borg = "BORG_PASSPHRASE='${passphrase}' borg";
+ $client->systemctl("start --wait borgbackup-job-local");
+ $client->fail("systemctl is-failed borgbackup-job-local");
+ # Make sure exactly one archive has been created
+ $client->succeed("c=\$($borg list '${localRepo}' | wc -l) && [[ \$c == '1' ]]");
+ # Make sure excludeFile has been excluded
+ $client->fail("$borg list '${localRepo}::${archiveName}' | grep -qF '${excludeFile}'");
+ # Make sure keepFile has the correct content
+ $client->succeed("$borg extract '${localRepo}::${archiveName}'");
+ $client->succeed('c=$(cat ${dataDir}/${keepFile}) && [[ "$c" == "${keepFileData}" ]]');
+ };
+
+ subtest "remote", sub {
+ my $borg = "BORG_RSH='ssh -oStrictHostKeyChecking=no -i /root/id_ed25519' borg";
+ $server->waitForUnit("sshd.service");
+ $client->waitForUnit("network.target");
+ $client->systemctl("start --wait borgbackup-job-remote");
+ $client->fail("systemctl is-failed borgbackup-job-remote");
+
+ # Make sure we can't access repos other than the specified one
+ $client->fail("$borg list borg\@server:wrong");
+
+ #TODO: Make sure that data is actually deleted
+ };
+
+ subtest "remoteAppendOnly", sub {
+ my $borg = "BORG_RSH='ssh -oStrictHostKeyChecking=no -i /root/id_ed25519.appendOnly' borg";
+ $server->waitForUnit("sshd.service");
+ $client->waitForUnit("network.target");
+ $client->systemctl("start --wait borgbackup-job-remoteAppendOnly");
+ $client->fail("systemctl is-failed borgbackup-job-remoteAppendOnly");
+
+ # Make sure we can't access repos other than the specified one
+ $client->fail("$borg list borg\@server:wrong");
+
+ #TODO: Make sure that data is not actually deleted
+ };
+
'';
})
diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix
index 2c08d06f286..515d5c8bac2 100644
--- a/nixos/tests/vault.nix
+++ b/nixos/tests/vault.nix
@@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ... }:
$machine->waitForUnit('multi-user.target');
$machine->waitForUnit('vault.service');
$machine->waitForOpenPort(8200);
- $machine->succeed('vault init');
- $machine->succeed('vault status | grep "Sealed: true"');
+ $machine->succeed('vault operator init');
+ $machine->succeed('vault status | grep Sealed | grep true');
'';
})
diff --git a/pkgs/applications/audio/eflite/buf-overflow.patch b/pkgs/applications/audio/eflite/buf-overflow.patch
deleted file mode 100644
index 8873aa77b0e..00000000000
--- a/pkgs/applications/audio/eflite/buf-overflow.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix buffer overflow
-
---- eflite-0.4.1.orig/es.c
-+++ eflite-0.4.1/es.c
-@@ -329,7 +329,7 @@
- char *p;
-
- p = getenv("HOME");
-- sprintf(buf, "%s/.es.conf", p);
-+ snprintf(buf, sizeof(buf), "%s/.es.conf", p);
- fp = fopen(buf, "r");
- if (!fp) fp = fopen("/etc/es.conf", "r");
- if (!fp) return 1;
-@@ -438,7 +438,7 @@
- char logname[200];
-
- if ((flags & 0xffff) > DEBUG) return;
-- sprintf(logname, "%s/es.log", getenv("HOME"));
-+ snprintf(logname, sizeof(logname), "%s/es.log", getenv("HOME"));
- va_start(arg, text);
- vsnprintf(buf, 200, text, arg);
- va_end(arg);
diff --git a/pkgs/applications/audio/eflite/cvs-update.patch b/pkgs/applications/audio/eflite/cvs-update.patch
deleted file mode 100644
index 1ceace83aa5..00000000000
--- a/pkgs/applications/audio/eflite/cvs-update.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- eflite-0.4.1.orig/fs.c
-+++ eflite-0.4.1/fs.c
-@@ -9,7 +9,7 @@
- * GNU General Public License, as published by the Free Software
- * Foundation. Please see the file COPYING for details.
- *
-- * $Id: fs.c,v 1.19 2007/01/18 23:58:42 mgorse Exp $
-+ * $Id: fs.c,v 1.22 2008/03/05 15:21:43 mgorse Exp $
- *
- * Notes:
- *
-@@ -505,19 +505,6 @@
- }
- }
-
--
--
--static void play_audio_close(void *cancel)
--{
-- if (audiodev)
-- {
-- audio_drain(audiodev);
-- close_audiodev();
-- // usleep(5000);
-- }
--}
--
--
- static inline void determine_playlen(int speed, cst_wave *wptr, int type, int *pl, int *s)
- {
- int playlen, skip;
-@@ -573,12 +560,12 @@
- type = ac[ac_head].type;
- WAVE_UNLOCK;
- pthread_testcancel();
-- pthread_cleanup_push(play_audio_close, NULL);
--
-+
- es_log(2, "Opening audio device.");
- /* We abuse the wave mutex here to avoid being canceled
- * while the audio device is being openned */
- WAVE_LOCK;
-+ assert(audiodev == NULL);
- audiodev = audio_open(wptr->sample_rate, wptr->num_channels, CST_AUDIO_LINEAR16);
- WAVE_UNLOCK;
- if (audiodev == NULL)
-@@ -606,8 +593,8 @@
- #ifdef DEBUG
- start_time = get_ticks_count();
- #endif
-- pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
- audio_write(audiodev, wptr->samples + skip, playlen * 2);
-+ pthread_testcancel();
- es_log(2, "Write took %.2f seconds.", get_ticks_count() - start_time);
- }
- es_log(2, "play: syncing.");
-@@ -617,16 +604,16 @@
- audio_flush(audiodev);
- pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
- es_log(2, "Flush took %.2f seconds.", get_ticks_count() - start_time);
-- es_log(2, "play: Closing audio device");
-- close_audiodev();
-- pthread_cleanup_pop(0);
-- pthread_testcancel();
-- TEXT_LOCK;
-+ pthread_testcancel();
-+
-+ TEXT_LOCK;
- time_left -= ((float)playlen) / wptr->sample_rate;
- pthread_cond_signal(&text_condition);
- TEXT_UNLOCK;
-
- WAVE_LOCK;
-+ es_log(2, "play: Closing audio device");
-+ close_audiodev();
- ac_destroy(&ac[ac_head]);
- ac_head++;
- if (ac_head == ac_tail)
-@@ -894,6 +881,7 @@
- WAVE_LOCK_NI;
- pthread_cond_signal(&wave_condition); // necessary because we inhibit cancellation while waiting
- pthread_cancel(wave_thread);
-+ if (audiodev != NULL) audio_drain(audiodev);
- WAVE_UNLOCK_NI;
- }
-
-@@ -917,7 +905,10 @@
- }
-
- /* At this point, no thread is running */
--
-+
-+ // Make sure audio device is closed
-+ close_audiodev();
-+
- /* Free any wave data */
- es_log(2, "s_clear: freeing wave data: %d", ac_tail);
- for (i = 0; i < ac_tail; i++)
diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix
index 36fbdbc2cc9..4138a07ec06 100644
--- a/pkgs/applications/audio/eflite/default.nix
+++ b/pkgs/applications/audio/eflite/default.nix
@@ -1,21 +1,40 @@
-{stdenv,fetchurl,flite,alsaLib,debug ? false}:
+{ stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }:
stdenv.mkDerivation rec {
name = "eflite-${version}";
version = "0.4.1";
+
src = fetchurl {
url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${name}.tar.gz";
sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci";
};
+
buildInputs = [ flite alsaLib ];
- configureFlags = "flite_dir=${flite} --with-audio=alsa --with-vox=cmu_us_kal16";
+
+ configureFlags = [
+ "flite_dir=${flite}"
+ "--with-audio=alsa"
+ "--with-vox=cmu_us_kal16"
+ ];
+
patches = [
- ./buf-overflow.patch
- ./cvs-update.patch
- ./link.patch
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/cvs-update";
+ sha256 = "0r631vzmky7b7qyhm152557y4fr0xqrpi3y4w66fcn6p4rj03j05";
+ })
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/buf-overflow";
+ sha256 = "071qk133kb7n7bq6kxgh3p9bba6hcl1ixsn4lx8vp8klijgrvkmx";
+ })
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/link";
+ sha256 = "0p833dp4pdsya72bwh3syvkq85927pm6snxvx13lvcppisbhj0fc";
+ })
./format.patch
- ]; # Patches are taken from debian.
+ ];
+
CFLAGS = stdenv.lib.optionalString debug " -DDEBUG=2";
+
meta = {
homepage = http://eflite.sourceforge.net;
description = "EFlite is a speech server for screen readers";
diff --git a/pkgs/applications/audio/eflite/link.patch b/pkgs/applications/audio/eflite/link.patch
deleted file mode 100644
index 73c69da965c..00000000000
--- a/pkgs/applications/audio/eflite/link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eflite-0.4.1/Makefile.in 2007-01-19 01:01:09.000000000 +0100
-+++ eflite-0.4.1-new/Makefile.in 2017-03-01 23:25:34.223615492 +0100
-@@ -34,7 +34,7 @@
- $(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS) $(FLITE_LIBS) $(AUDIOLIBS)
-
- fs.o: fs.c
-- $(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(subst cmu_us_kal16,cmu_us_kal,$(FL_VOX)) -DSTANDALONE -DEFLITE -c -o $@ $<
-+ $(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(FL_VOX) -DSTANDALONE -DEFLITE -c -o $@ $<
-
- tone.o: tone.c
- $(CC) $(CFLAGS) -I$(flite_include_dir) -DEFLITE -c -o $@ $<
diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix
new file mode 100644
index 00000000000..6affb16e073
--- /dev/null
+++ b/pkgs/applications/audio/elisa/default.nix
@@ -0,0 +1,36 @@
+{ mkDerivation, fetchFromGitHub, lib
+, extra-cmake-modules, kdoctools, wrapGAppsHook
+, qtmultimedia, qtquickcontrols2, qtwebsockets
+, kconfig, kcmutils, kcrash, kdeclarative, kfilemetadata, kinit
+, baloo
+}:
+
+mkDerivation rec {
+ name = "elisa-${version}";
+ # 0.1 is expected in early/mid 2018-04
+ version = "0.0.20180320";
+
+ src = fetchFromGitHub {
+ owner = "KDE";
+ repo = "elisa";
+ rev = "9dd35d7244a8a3553275152f5b50fbe6d272ce64";
+ sha256 = "0mjqvcpk2y4jlwkka8gzl50wgqjjx9bzpbrj79cr0ib3jyviss4k";
+ };
+
+ nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+
+ propagatedBuildInputs = [
+ qtmultimedia qtquickcontrols2 qtwebsockets
+ kconfig kcmutils kcrash kdeclarative kfilemetadata kinit
+ baloo
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ description = "Elisa Music Player";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ peterhoeg ];
+ inherit (kconfig.meta) platforms;
+ };
+}
diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix
new file mode 100644
index 00000000000..65cb7dab34a
--- /dev/null
+++ b/pkgs/applications/audio/rhvoice/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, lib, pkgconfig, fetchFromGitHub, scons, python, glibmm, libpulseaudio, libao
+}:
+
+let
+ version = "unstable-2018-02-10";
+in stdenv.mkDerivation rec {
+ name = "rhvoice-${version}";
+
+ src = fetchFromGitHub {
+ owner = "Olga-Yakovleva";
+ repo = "RHVoice";
+ rev = "7a25a881b0465e47a12d8029b56f3b71a1d02312";
+ sha256 = "1gkrlmv7msh9qlm0gkjqpl9gswghpclfdwszr1p85v8vk6m63v0b";
+ };
+
+ nativeBuildInputs = [
+ scons pkgconfig
+ ];
+
+ buildInputs = [
+ python glibmm libpulseaudio libao
+ ];
+
+ # SConstruct patch
+ # Scons creates an independent environment that assumes standard POSIX paths.
+ # The patch is needed to push the nix environment.
+ # - PATH
+ # - PKG_CONFIG_PATH, to find available (sound) libraries
+ # - RPATH, to link to the newly built libraries
+
+ patches = [ ./honor_nix_environment.patch ];
+
+ buildPhase = ''
+ scons prefix=$out
+ '';
+
+ installPhase = ''
+ scons install
+ '';
+
+ meta = {
+ description = "A free and open source speech synthesizer for Russian language and others";
+ homepage = https://github.com/Olga-Yakovleva/RHVoice/wiki;
+ license = lib.licenses.gpl3;
+ maintainers = with lib.maintainers; [ berce ];
+ platforms = with lib.platforms; all;
+ };
+}
diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch
new file mode 100644
index 00000000000..ed180c92deb
--- /dev/null
+++ b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch
@@ -0,0 +1,14 @@
+diff --git a/SConstruct b/SConstruct
+index 2421399..ba39254 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -147,6 +147,9 @@ def create_base_env(vars):
+ env_args["package_name"]="RHVoice"
+ env_args["CPPDEFINES"]=[("RHVOICE","1")]
+ env=Environment(**env_args)
++ env.PrependENVPath("PATH", os.environ["PATH"])
++ env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"]
++ env["RPATH"]=env["libdir"]
+ env["package_version"]=get_version(env["release"])
+ env.Append(CPPDEFINES=("PACKAGE",env.subst(r'\"$package_name\"')))
+ env.Append(CPPDEFINES=("VERSION",env.subst(r'\"$package_version\"')))
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index 5e6d44807ee..f963fe378d5 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -112,6 +112,7 @@ let
# environment is used as a work around for that.
fhsEnv = buildFHSUserEnv {
name = "${pname}-fhs-env";
+ multiPkgs = pkgs: [ pkgs.ncurses5 ];
};
in
diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index e5e64a32e97..a6611d2f167 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -1,26 +1,25 @@
-{ stdenv, fetchurl, spidermonkey, unzip, curl, pcre, readline, openssl, perl, html-tidy }:
+{ stdenv, fetchFromGitHub, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
stdenv.mkDerivation rec {
name = "edbrowse-${version}";
- version = "3.6.1";
+ version = "3.7.2";
- nativeBuildInputs = [ unzip ];
- buildInputs = [ curl pcre readline openssl spidermonkey perl html-tidy ];
+ buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
patchPhase = ''
- substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\"
for i in ./tools/*.pl
do
substituteInPlace $i --replace "/usr/bin/perl" "${perl}/bin/perl"
done
'';
- NIX_CFLAGS_COMPILE = "-I${spidermonkey}/include/mozjs-31";
makeFlags = "-C src prefix=$(out)";
- src = fetchurl {
- url = "http://edbrowse.org/${name}.zip";
- sha256 = "1grkn09r31nmvcnm76jkd8aclmd9n5141mpqvb86wndp9pa7gz7q";
+ src = fetchFromGitHub {
+ owner = "CMB";
+ repo = "edbrowse";
+ rev = "v${version}";
+ sha256 = "00wi0m91zf8p8wk4ixlz99dndgv4xqy93m2vsiwdr3khw3jwipp2";
};
meta = with stdenv.lib; {
description = "Command Line Editor Browser";
@@ -35,6 +34,5 @@ stdenv.mkDerivation rec {
homepage = http://edbrowse.org/;
maintainers = [ maintainers.schmitthenner maintainers.vrthra ];
platforms = platforms.linux;
- broken = true; # no compatible spidermonkey
};
}
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index ac50e829100..49783650393 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -54,10 +54,10 @@
}) {};
adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "adaptive-wrap";
- version = "0.5.1";
+ version = "0.5.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.1.el";
- sha256 = "0qi7gjprcpywk2daivnlavwsx53hl5wcqvpxbwinvigg42vxh3ll";
+ url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.2.el";
+ sha256 = "1qcf1cabn4wb34cdmlyk3rv5dl1dcrxrbaw38kly1prs6y4l22aw";
};
packageRequires = [];
meta = {
@@ -1438,10 +1438,10 @@
}) {};
muse = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "muse";
- version = "3.20";
+ version = "3.20.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/muse-3.20.tar";
- sha256 = "0i5gfhgxdm1ripw7j3ixqlfkinx3fxjj2gk5md99h70iigrhcnm9";
+ url = "https://elpa.gnu.org/packages/muse-3.20.1.tar";
+ sha256 = "0h8lxm08r519psz93m1i43prkcpsm2dgkcvdlpvg7sm0ky7i5cay";
};
packageRequires = [];
meta = {
@@ -1688,6 +1688,19 @@
license = lib.licenses.free;
};
}) {};
+ posframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+ pname = "posframe";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/posframe-0.3.0.el";
+ sha256 = "0q74lwklr29c50qgaqly48nj7f49kgxiv70lsvhdy8cg2v082v8k";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/posframe.html";
+ license = lib.licenses.free;
+ };
+ }) {};
psgml = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "psgml";
version = "1.3.4";
@@ -2400,10 +2413,10 @@
xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "xelb";
- version = "0.13";
+ version = "0.14";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/xelb-0.13.tar";
- sha256 = "0sfygy6ihjwszhn6a81fz2yn70rr7vpygl7z49vz4rsd8s0fdgjc";
+ url = "https://elpa.gnu.org/packages/xelb-0.14.tar";
+ sha256 = "09flnbjy9ck784kprz036rwg9qk45hpv0w5hz3pz3zhwyk57fv74";
};
packageRequires = [ cl-generic emacs ];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index a24cb9e4910..c91812fc30a 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -740,8 +740,8 @@
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "56a18467de4bc1cf408a1910458e1819102312dd";
- sha256 = "0x9ilnqaw9vim9f17rl4g8ikbi4qwagjz41j9f2i72aspir3jdfg";
+ rev = "221a8a854488cf455aa05eeda1f2b3f658639c9c";
+ sha256 = "0nrwda6fvnbwpcya4hk6ibh6rxjw19mb1b3prwl3zmfigjf0z35y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -757,12 +757,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild {
pname = "ac-php-core";
- version = "20180222.2209";
+ version = "20180314.2055";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "56a18467de4bc1cf408a1910458e1819102312dd";
- sha256 = "0x9ilnqaw9vim9f17rl4g8ikbi4qwagjz41j9f2i72aspir3jdfg";
+ rev = "221a8a854488cf455aa05eeda1f2b3f658639c9c";
+ sha256 = "0nrwda6fvnbwpcya4hk6ibh6rxjw19mb1b3prwl3zmfigjf0z35y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -803,8 +803,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "4f27c1cc60742622e6616b579c82b5440ad446d3";
- sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0";
+ rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+ sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1009,12 +1009,12 @@
ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-link";
- version = "20180224.2244";
+ version = "20180308.100";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "ace-link";
- rev = "177e0f9a60ddca62cc44c2395b075cb230b26f4d";
- sha256 = "1rjxpjanyxfrx4dfsag6g647flxvw75vf0jh6y6y0w2jdiih919i";
+ rev = "fae5d508ff519ba1fab21c51f46c0906fd82229f";
+ sha256 = "118dp8w0z475j67gvl1dj137glbli2ykbm934vdvlz6q0k94vds7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
@@ -1489,12 +1489,12 @@
alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "alchemist";
- version = "20171029.2307";
+ version = "20180312.604";
src = fetchFromGitHub {
owner = "tonini";
repo = "alchemist.el";
- rev = "38ec1faf4a9cbeb2944b517ec30d999022082bc1";
- sha256 = "1hqr1phkm4mxzfszzraqljb32mpin1h1r26al9bazrsq2azmd5a7";
+ rev = "6f99367511ae209f8fe2c990779764bbb4ccb6ed";
+ sha256 = "12f95rwxs11sqf1w9pnf6cxc2lh2jz4nqkq33p8b5yamnl8cq9kg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1514,8 +1514,8 @@
src = fetchFromGitHub {
owner = "jgkamat";
repo = "alda-mode";
- rev = "ea0d3a25ca2b45d08c510ad55b3d8a5374b2ec43";
- sha256 = "18rfn6608sxwv8r0kdrzhag58kf1822xmy7h9gw1ci7mfpq2i1ns";
+ rev = "2582122c41cd34d034b6bbe71469f5ceb1de40c7";
+ sha256 = "11miyk48p09327ivmsk1hiw0brnx1pgjvdrfsdfhcwhbv2cafnf9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1531,12 +1531,12 @@
alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "alect-themes";
- version = "20180113.1316";
+ version = "20180312.1338";
src = fetchFromGitHub {
owner = "alezost";
repo = "alect-themes";
- rev = "b30158d5d9e43318fa0e4a211d81fe4b2495c027";
- sha256 = "0hylvk7ivibm8l6y21v88j1gfv8mwggdcbgw6gb4rz5ws6n0jdxd";
+ rev = "69045201a8597181509c71c770d0fbce398f0af5";
+ sha256 = "0qmrd9csa3w8a0nkrc8f4a3f67inj7hpbdwsk0883dnc7lq4lkjn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes";
@@ -1792,12 +1792,12 @@
amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "amx";
- version = "20180203.1043";
+ version = "20180313.857";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "amx";
- rev = "356393033980746eccff950c84c6e3c2984cbae4";
- sha256 = "12ady1k621difw8b00x8ynhynkra02nkcm22s2cyzh9vv4m505zg";
+ rev = "f2b030121e59b9b3c8f05218e6c673bc6d69125e";
+ sha256 = "10369f68wzpxb01bmk35yhm1z99wj0vm5d6ivdq5n6lard5afgvy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx";
@@ -1817,8 +1817,8 @@
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
- rev = "b3f742620c17f9866f3a85ec771f4d0b239f2970";
- sha256 = "1ycfq11x1nshv69d891am50j5zclk62krwyfgia8wk3rxmgnaj53";
+ rev = "384f1c5995a96c2687cea7cf18ff5710d00a39c2";
+ sha256 = "0qk1cd39pqjfm9hpgwm6xb205rgcka9jxfdkw3fcay3rmj3qyzws";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -2379,12 +2379,12 @@
anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "anything-tramp";
- version = "20171224.601";
+ version = "20180311.2344";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-anything-tramp";
- rev = "7364472a8e9ddaafdff7ad004c7a2bad42da9d92";
- sha256 = "0sfbx63mq8pmwwb2y7w6l9hy1qr4f7d9wij6r5n7y75r19l1j9ph";
+ rev = "9b88be0c58843569dcb016550e6fad4f75847fc5";
+ sha256 = "18016zgdqa7i0vaqj9j3zkdw2i3iw8i2axyrm0579hq4hksx69w0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@@ -2610,11 +2610,11 @@
apt-sources-list = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apt-sources-list";
- version = "20171004.1143";
+ version = "20180311.437";
src = fetchgit {
url = "https://git.korewanetadesu.com/apt-sources-list.git";
- rev = "842c3896f660295e4c16938aa1fd195e5d377460";
- sha256 = "1d1v2h91vabqdrjcrdnzqj4xzmm7gbad4mxcphrj5yfnc4rrfc12";
+ rev = "fd12fbacf245714be5ca20563572cb49e2f1eb45";
+ sha256 = "0kfz9gj66a9wqcdrvxg4hzndmh1j01wqfqkdrblplgni4h7907a4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/141a22e593415302d64cf8ebd2635a1baf35eb38/recipes/apt-sources-list";
@@ -2690,22 +2690,22 @@
license = lib.licenses.free;
};
}) {};
- arduino-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ arduino-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "arduino-mode";
- version = "20151017.2335";
+ version = "20180305.1916";
src = fetchFromGitHub {
- owner = "bookest";
+ owner = "stardiviner";
repo = "arduino-mode";
- rev = "3e2bad4569ad26e929e6db2cbcff0d6d36812698";
- sha256 = "1yvaqjc9hadbnnay5fprnh890xsp53kidad1zpb4a5z4a5z61n3c";
+ rev = "40bc53149b517ebfa448b07f0b766f24d612f716";
+ sha256 = "0rh8rmi7y1a4myf6pa51qhr9sa1arjfbrr6rzbsdlwcbzinfj83f";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e21ef938877444097d6d9cb7769819e2acb77cff/recipes/arduino-mode";
- sha256 = "1lpsjpc7par12zsmg9sf4r1h039kxa4n68anjr3mhpp3d6rapjcx";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2db785f52c2facc55459e945ccb4d4b088506747/recipes/arduino-mode";
+ sha256 = "1amqah0sx95866ikdlc7h7n9hmrwaqizc0rj0gliv15kjjggv55v";
name = "arduino-mode";
};
- packageRequires = [];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/arduino-mode";
license = lib.licenses.free;
@@ -2781,8 +2781,8 @@
src = fetchFromGitHub {
owner = "sachac";
repo = "artbollocks-mode";
- rev = "4a907e470bf345b88c3802c1241ce2b8cf4123ee";
- sha256 = "1l1dwhdfd5bwx92k84h5v47pv9my4p4wj0wq8hrwvwzwlv8dzn2w";
+ rev = "33a41ca4f8206f57e5498a526d3b0ea18d08bb93";
+ sha256 = "06a2dp6nwy8xjr01k6d2c611qr2n9m7hdkrz9fci9r4rv1ikx5xv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/22b237ab91ddd3c17986ea12e6a32f2ce62d3a79/recipes/artbollocks-mode";
@@ -2966,12 +2966,12 @@
atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "atom-one-dark-theme";
- version = "20180215.828";
+ version = "20180305.1454";
src = fetchFromGitHub {
owner = "jonathanchu";
repo = "atom-one-dark-theme";
- rev = "f67722244554025db1d1ccd2a30e9fa22f8985cd";
- sha256 = "1slk5zbwjr7jv21hxsn61ppijj6p98sqh0k0flnd4512gywdrz2r";
+ rev = "7b73ab795286fe121d23026dcc94d6a0a211e4c4";
+ sha256 = "1w5j773zg6lz8vq9yqfx2w5076h53k0narcnknni8hd8z4qg6b6q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme";
@@ -3131,22 +3131,22 @@
license = lib.licenses.free;
};
}) {};
- auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
+ auth-password-store = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auth-password-store";
- version = "20180214.558";
+ version = "20180222.916";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "auth-password-store";
- rev = "6af0458a6b586cc5004fa652f23615433304924d";
- sha256 = "150cx8ida9bl0g84iq051rziy64ic2pxz6hn0blsys1qcp9lf8wa";
+ rev = "0a83b8fa074571023a10aed263d2ee7d865a49f7";
+ sha256 = "0z4pk614ndjg68z70lbc20ns9kv8r3vdayv4yy6n0jj9fvnd2pn8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5";
name = "auth-password-store";
};
- packageRequires = [ cl-lib emacs password-store seq ];
+ packageRequires = [];
meta = {
homepage = "https://melpa.org/#/auth-password-store";
license = lib.licenses.free;
@@ -3894,8 +3894,8 @@
src = fetchFromGitHub {
owner = "zenspider";
repo = "elisp";
- rev = "c1b59448e103e32202423a56c873967033778a92";
- sha256 = "1v3swwmkmfgpylypmg6qv9bykcxqcg9d1awk8zxbwh83ys0q70sf";
+ rev = "ee8a9c3052446876057ff853369d136aea7831f5";
+ sha256 = "15sla4n88003fclni5nhsrw3ib7bql11ks8pb7rgjyjddqrq274r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc2c4a590cbeccfb43003972a78f5d76ec4a9e7/recipes/autotest";
@@ -4250,6 +4250,27 @@
license = lib.licenses.free;
};
}) {};
+ backup-each-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "backup-each-save";
+ version = "20180226.2157";
+ src = fetchFromGitHub {
+ owner = "conornash";
+ repo = "backup-each-save";
+ rev = "3c414b9d6b278911c95c5b8b71819e6af6f8a02a";
+ sha256 = "13pliz2ra020hhxcidkyhfa0767n188l1w5r0vpvv6zqyc2p414i";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caa478356d20b5b0e9a450f7b4a8b25937e583a4/recipes/backup-each-save";
+ sha256 = "1l7lx3vd27qypkxa0cdm8zbd9fv08xn1bf6xj6g9c49ql95xbyiv";
+ name = "backup-each-save";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/backup-each-save";
+ license = lib.licenses.free;
+ };
+ }) {};
backup-walker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "backup-walker";
@@ -4337,12 +4358,12 @@
bar-cursor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bar-cursor";
- version = "20160923.920";
+ version = "20180226.1645";
src = fetchFromGitHub {
owner = "ajsquared";
repo = "bar-cursor";
- rev = "afa1d4bc1937610cc30575d71aab85ea20ebf2ea";
- sha256 = "1cj28v48xajy1nsqk92vinaz2rh1crm5g58ma5gnibkdnkpq828s";
+ rev = "20cb59bedc3532a712fe7feeff3660ebd72a8107";
+ sha256 = "06b0nkcp8yjixps72nrgk2zmljc9f71cdr96jdpgssydfhn4pcdf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/932e7b128f092ec724ebf18c9c5ca84e16edc82c/recipes/bar-cursor";
@@ -4379,12 +4400,12 @@
base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "base16-theme";
- version = "20180211.1545";
+ version = "20180308.1227";
src = fetchFromGitHub {
owner = "belak";
repo = "base16-emacs";
- rev = "2c3f8dc0f00446376ed1d1e7776d118337e42a41";
- sha256 = "03z477y26gwnrd1hy9ysmdqxih54adlkbvgd57m4s6zfcd6f9cyx";
+ rev = "f84ffb4d4065068f89a416f84002de92a39da1f1";
+ sha256 = "06hkpf6azjii9iiqvv3sh0vn7qczsjim9y1mk4vq3hp799ca67wh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4400,12 +4421,12 @@
bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bash-completion";
- version = "20170924.1021";
+ version = "20180303.1144";
src = fetchFromGitHub {
owner = "szermatt";
repo = "emacs-bash-completion";
- rev = "2c0b8d6a6e5cec52740b8f773297459b98f3e064";
- sha256 = "0psp1rli7h477js25kzm00s4j5x3604ly1m3xh2w29lz8jpc0nvk";
+ rev = "6aedd690006e07199b2fcd319b9b840a527650e5";
+ sha256 = "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion";
@@ -4526,16 +4547,16 @@
bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bbcode-mode";
- version = "20141103.1341";
+ version = "20180316.519";
src = fetchFromGitHub {
- owner = "ejmr";
+ owner = "lassik";
repo = "bbcode-mode";
- rev = "b6ff1bfb8041b1435ebfc0a7d8e5e34eeb1b6aae";
- sha256 = "17ip24fk13aj9zldn2qsr4naa8anqhm484m1an5l5i9m9awfiyn7";
+ rev = "653cf811460f60cb8c9489cfb3155c6493828d9f";
+ sha256 = "120g480vys6wrxhcch87jsxxvqwi31wi3dv1dckcqbxd1w1jfkzm";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/bbcode-mode";
- sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1ef095d23cc043f5d14a9deea788ed71d90c586c/recipes/bbcode-mode";
+ sha256 = "1kfxzp0916gdphp4dkk4xbramsbqmg6mazvfqni86mra41rdq6sb";
name = "bbcode-mode";
};
packageRequires = [];
@@ -4969,8 +4990,8 @@
src = fetchFromGitHub {
owner = "cadadr";
repo = "elisp";
- rev = "497c7e68df5e3b6b8c3ebaaf6edfce6b2d29b616";
- sha256 = "1j15dfg1mr21vyf7c9h3dij1pnikwvmxr3rs0vdrx8lz9x321amf";
+ rev = "3059378379a6fbd0363cd14fe6227c27739af4e1";
+ sha256 = "1hnph9x5981rfqc5p5imiah2cd7fr1f3bbs2x23z7lckaqa5v0g7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8308e72c4437237fded29db1f60b3eba0edd26/recipes/bibliothek";
@@ -5095,8 +5116,8 @@
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a";
- sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1";
+ rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182";
+ sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/bind-chord";
@@ -5116,8 +5137,8 @@
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a";
- sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1";
+ rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182";
+ sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5529,6 +5550,27 @@
license = lib.licenses.free;
};
}) {};
+ bolt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "bolt-mode";
+ version = "20180310.10";
+ src = fetchFromGitHub {
+ owner = "mpontus";
+ repo = "bolt-mode";
+ rev = "85a5a752bfbebb4aed884326c25db64c000e9934";
+ sha256 = "03nxcmpm5n8jcca39ivrl7cjqz3gzsl3w6qc30hcp278qf2jq6va";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ec9e35f0e37db90d906fccd08fb25b673c88d3b8/recipes/bolt-mode";
+ sha256 = "03x89k8v0m9kv1fhyys2gwympb70qlmg7gdib8wsmdxs34ys5igz";
+ name = "bolt-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/bolt-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
bongo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bongo";
@@ -5637,12 +5679,12 @@
borg = callPackage ({ dash, emacs, epkg, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "borg";
- version = "20180220.505";
+ version = "20180307.717";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "borg";
- rev = "28abb4b602d060bba38e6f38623b2d3f309e1ede";
- sha256 = "15iim40gzirw75h6b3alhb95x7pmzmanx6pbdrfmyw7yv4bjsdbx";
+ rev = "6b49136f37a04c5f0c328a83bb512b86f6159d6f";
+ sha256 = "1nlxdapxqdikqicyp0mq394xs7cbdkyzfw2yx1h5qww33mjl4jja";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg";
@@ -5826,12 +5868,12 @@
browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "browse-at-remote";
- version = "20171115.210";
+ version = "20180227.52";
src = fetchFromGitHub {
owner = "rmuslimov";
repo = "browse-at-remote";
- rev = "31dcf77d7c89a12f230e2b2332585db2c44530ef";
- sha256 = "017cb8lf7zbg0jmr7zxzd7d5kz2jy35cvw5vcpdmq1fdr3wqwkgj";
+ rev = "47bab994640f086939c30cc6416e770ad067e950";
+ sha256 = "0vhia7xmszcb3lxrb8wh93a3knjfzj48h8nhj4fh8zj1pjz6args";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote";
@@ -6036,12 +6078,12 @@
buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buffer-flip";
- version = "20180223.2341";
+ version = "20180307.1451";
src = fetchFromGitHub {
owner = "killdash9";
repo = "buffer-flip.el";
- rev = "443f74c1186ee91dab42812e864e7ad095f45b9a";
- sha256 = "18ii9gd7hbfcibj7fpx9b9bz3cbpdhvy4z143hmlh3ywj2mjdfii";
+ rev = "e093360e05164c78255866c1ac8f966aa38ba514";
+ sha256 = "1s35llycdhhclf9kl1q9l7zzzfqrnnvbiqv5csfw0mngfj0lz77f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip";
@@ -6809,22 +6851,22 @@
license = lib.licenses.free;
};
}) {};
- call-graph = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }:
+ call-graph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }:
melpaBuild {
pname = "call-graph";
- version = "20180226.156";
+ version = "20180309.220";
src = fetchFromGitHub {
owner = "beacoder";
repo = "call-graph";
- rev = "bdbd5130476b8ad5606e694f4310678a90bab9c2";
- sha256 = "1a7fcpdnmjmc151d4vma9wng1m9mw102sw8qx02h61gqsg6ia8bc";
+ rev = "1c23b22b9e1a5e6484e5dfc2f4724e964ba64dc4";
+ sha256 = "1mwxxn3m5jrpa9kwm4sg0famzgxqhqgzwd93nlidkbv1vjhj2gdi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph";
sha256 = "0cklr79gqqrb94jq8aq65wqriamay78vv9sd3jrvp86ixl3ig5xc";
name = "call-graph";
};
- packageRequires = [ emacs hierarchy ivy tree-mode ];
+ packageRequires = [ cl-lib emacs hierarchy ivy tree-mode ];
meta = {
homepage = "https://melpa.org/#/call-graph";
license = lib.licenses.free;
@@ -6879,8 +6921,8 @@
src = fetchFromGitHub {
owner = "ocaml";
repo = "ocaml";
- rev = "70eb179b20d401b2fad43d3ddfd2752fc7925ab1";
- sha256 = "1l0qfkm9jz4yx5rpwr8bxcjpn1z1mm4zi0na6b21zbsspbmpv912";
+ rev = "02326ad0f4d0d964be89434b9b43c4f19237ea35";
+ sha256 = "09v1lasgnlv01cl1ayah183da90pcwn08fhwq0b36wk54ksymhyx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
@@ -7298,8 +7340,8 @@
src = fetchFromGitHub {
owner = "anler";
repo = "centered-window-mode";
- rev = "1234a364c9fa3a54087884ced2a7357b93fbb5d7";
- sha256 = "1z3zi6zy1z68g4sfiv21l998n04hbbqp660khind6ap8yjjn8ik8";
+ rev = "56cb4a9ebc9a3bac7e00b4d5662dca4c39fdbb50";
+ sha256 = "067pdyzdl193pjyia8lc69s5p069kpwsrar2y221lmcvs4s164wv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/58bfd795d4d620f0c83384fb03008e129c71dc09/recipes/centered-window";
@@ -7382,8 +7424,8 @@
src = fetchFromGitHub {
owner = "cfengine";
repo = "core";
- rev = "8a24c2cb8a59bc4eba0a9271e86d078c80a3864c";
- sha256 = "17my98032fx95kbi0hklwnk52c5n8w9npynd24255637fan46x30";
+ rev = "03ccbd8a38eef55f0801c249fc278700c52d31ed";
+ sha256 = "0ly4igpqdafmnijdlqzcrs4g4snmrp854j8vykvx7sn2wil5l9f0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7963,15 +8005,36 @@
license = lib.licenses.free;
};
}) {};
+ chyla-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "chyla-theme";
+ version = "20180302.858";
+ src = fetchFromGitHub {
+ owner = "chyla";
+ repo = "ChylaThemeForEmacs";
+ rev = "ae5e7ecace2ab474151eb0ac5ef07fba2dc32f8a";
+ sha256 = "1gqzwwr3fnhd9iqn7zmqpxgxvmrhq7g849ndjwizksk0bfj3b596";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5c55eebf8df165360ce1e5d18e484c90f296fe52/recipes/chyla-theme";
+ sha256 = "1mgr6483bjjwk8bi6kijyw61s52nq6g2svhy5n1jnffi3gaw7hl5";
+ name = "chyla-theme";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/chyla-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "20180219.1846";
+ version = "20180315.950";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "88f4fcf1d39a13ff336657b2cc4161ebb9d955d6";
- sha256 = "13yl09chl8j5n3mlwb25ipxgi4a3cfs8822lahkisjv42n62f234";
+ rev = "0ca04ebceeabda645dd9bc584b4683fe3b2ea317";
+ sha256 = "0fxd77cls2g5iq1r09zgf7iqznldbyi3y989wh27sjzqnjdw8k7j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8134,12 +8197,12 @@
circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circadian";
- version = "20171215.1403";
+ version = "20180307.954";
src = fetchFromGitHub {
owner = "GuidoSchmidt";
repo = "circadian.el";
- rev = "bb49da54b2fb57524066e54ffee27cb9549ec925";
- sha256 = "0ra9cs407mz5243ymf4qsr92sly0k5gfl24xgdmxczg35w8hn31l";
+ rev = "26ffd83a5931bb3fb04f01cb780715a05c8dd33e";
+ sha256 = "0z8jkbycvia8ha1yv9v8zrcpqn0jqlb5myqx3qcvykn9yysmv2lq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian";
@@ -8449,12 +8512,12 @@
clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }:
melpaBuild {
pname = "clj-refactor";
- version = "20171117.317";
+ version = "20180316.1000";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clj-refactor.el";
- rev = "408ab1f13b8d956dd8d2c839bea5197175ef5a93";
- sha256 = "0iqq74w65dp88y1iqc5rx7i4489ksr8lfmnjqrmwmzqzmax53nld";
+ rev = "2648558b4c27fccbd71ca679ff4bf9b9150c6c60";
+ sha256 = "1kfs1y3cwazz118ll18hyvw4wdms4byzj3z9i7kriys46lsgd05y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8629,12 +8692,12 @@
clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clojure-mode";
- version = "20180202.922";
+ version = "20180313.620";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "5cf0fd9360dc5a9a95464601319062673d213807";
- sha256 = "07ignia68340fjd0qnlrmgb7p6v15xysjx30xxfvd215slpjc4qw";
+ rev = "d1e0a6e99f8a98cc2976a23e856efa6d25283f23";
+ sha256 = "1xp0f5ivyg8xlfggvyazkxyqk0wqix9104frpn4g5bfihwp01m7i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8654,8 +8717,8 @@
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "5cf0fd9360dc5a9a95464601319062673d213807";
- sha256 = "07ignia68340fjd0qnlrmgb7p6v15xysjx30xxfvd215slpjc4qw";
+ rev = "d1e0a6e99f8a98cc2976a23e856efa6d25283f23";
+ sha256 = "1xp0f5ivyg8xlfggvyazkxyqk0wqix9104frpn4g5bfihwp01m7i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8692,12 +8755,12 @@
clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "clojure-snippets";
- version = "20170713.2310";
+ version = "20180314.608";
src = fetchFromGitHub {
owner = "mpenet";
repo = "clojure-snippets";
- rev = "36207f9d8738851f5b686dfe0225ad0553bf8e68";
- sha256 = "0fb4l4gjzpr5rij4kyvz0r705blv2a5w1rf1c92d34g8jyy2hmd5";
+ rev = "6068dca90467a0f4ebc2cd39338a173d6f5ddc04";
+ sha256 = "0vvadcydpsz4b17dlm1jd4fbddzfqibh3mlzv3k4gvp67vv10cqy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets";
@@ -8860,12 +8923,12 @@
cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "cmake-ide";
- version = "20180212.258";
+ version = "20180314.1546";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "cmake-ide";
- rev = "91dd693dca350d0744fcbaa2b5a36029fb17adcb";
- sha256 = "1gy32n8xslgdsrw9riiy1rf5pxsqiwp7is71qc6z2qp2fn2dr83j";
+ rev = "4fe0a65235c3202ab6a5a6c72c91e20b43f9dd65";
+ sha256 = "0c8xcrjgyk86zk18sqbknlihwblj53h4xjjdhrf26gp28j6hrbf4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8885,8 +8948,8 @@
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "25613b9fa46e6433f987e9e9f47533db3a0939f3";
- sha256 = "1pnyx2niscm7bs2n48xxlxdfavxvb40vl0sm0j5m8vp9ybl11g4m";
+ rev = "c824b6c667cdcb978d6ed52ca5d19fd0b6bfde27";
+ sha256 = "0p2y9y2f238pns1az6ig204lj5cqq4ala0am6dc8sdidlf8m1x1z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8986,12 +9049,12 @@
cobalt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cobalt";
- version = "20180222.1938";
+ version = "20180304.355";
src = fetchFromGitHub {
owner = "cobalt-org";
repo = "cobalt.el";
- rev = "b542c4172ef41bb1d50e1b1dc712acf50c2392d5";
- sha256 = "1614m2m19wa6awvaz8akakbm2kbvj55s2lh7k3lgysaw007wbi1d";
+ rev = "634ace275697e188746ca22a30ff94380ec756be";
+ sha256 = "1mrydmzldgabkkdpmlwfrfb6iddj4by7scc14k9bak5y6hj6ix7l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b2435d98e7564d333c8224b67ac6ad9c95debda1/recipes/cobalt";
@@ -9217,12 +9280,12 @@
color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-identifiers-mode";
- version = "20170814.1121";
+ version = "20180308.1739";
src = fetchFromGitHub {
owner = "ankurdave";
repo = "color-identifiers-mode";
- rev = "5750ee9e1ab8a6890381bb461982113b1eb98879";
- sha256 = "17ry98s4lcl6g63bj8a0wd1rmh8whlxlmzfdjhp8mapdybqplcql";
+ rev = "e9705815cc547293fbb1c5cdac5ba90391a82878";
+ sha256 = "10cqkn4y40qwzkv9vsa5zlsqh851xacjvccw4l34piasbvm7q0hy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode";
@@ -9364,12 +9427,12 @@
color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme-sanityinc-tomorrow";
- version = "20180210.2104";
+ version = "20180302.1412";
src = fetchFromGitHub {
owner = "purcell";
repo = "color-theme-sanityinc-tomorrow";
- rev = "17bfc80dec721914299b50ef48ce47a5c18bb6b0";
- sha256 = "1jlkpp027xfsgyw5kw9wigwxrlgihj01x76rpp2mly9pghggx6mb";
+ rev = "1d67e4a4da74323f42c1f70c8bb7dbb9feaaf4e6";
+ sha256 = "0pywpvp1ak4qp98z81qwxdd67yz8sbk8n41hv454y7jnrwxjm0w5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9406,12 +9469,12 @@
color-theme-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme-x";
- version = "20160924.854";
+ version = "20180226.1646";
src = fetchFromGitHub {
owner = "ajsquared";
repo = "color-theme-x";
- rev = "7cba227f8bd4c82269405848550a4f4475057c65";
- sha256 = "053dq567iy9hkidsx76wjzgnq91z4gncx4870cj5lyp6j4g4mc8h";
+ rev = "6c2264aa6c5d9a72caeae67ebaa4472090e70350";
+ sha256 = "1fyz8bampcqzpbyg0l1g0nvv2m5n8000xy5yl05217dlxb448nnd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/321900baf4149f8b58b075b9fb27716cf708f2a2/recipes/color-theme-x";
@@ -9637,12 +9700,12 @@
common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "common-lisp-snippets";
- version = "20170918.356";
+ version = "20180226.723";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "common-lisp-snippets";
- rev = "cd46223fbc6ee99372a25ba455ffec4354895e45";
- sha256 = "0xii63fw3gx1hhx57yh8gr9mhkgb2vjkfs2sl5z9010myi9504is";
+ rev = "1ddf808311ba4d9e8444a1cb50bd5ee75e4111f6";
+ sha256 = "0zalsvs47hv33dmbs94srpb8q354sr52sxbad182p69dn1khlwyp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets";
@@ -9658,12 +9721,12 @@
company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company";
- version = "20180225.1741";
+ version = "20180315.439";
src = fetchFromGitHub {
owner = "company-mode";
repo = "company-mode";
- rev = "a64d52ca033208cda34f2fb7d0a2f951cce8bd29";
- sha256 = "1n44f9kbmp95nbsyp4g60d6pi044vxy2ccai9lgkjm3wlg7xdzrd";
+ rev = "67650dee565c57568d22065041326a58eb0f891d";
+ sha256 = "1307v1b1dk0m95ds69b66jrpapz06mwq15awmyk6vf54h9hpbm6q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9750,12 +9813,12 @@
company-auctex = callPackage ({ auctex, company, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "company-auctex";
- version = "20161025.24";
+ version = "20180226.2248";
src = fetchFromGitHub {
owner = "alexeyr";
repo = "company-auctex";
- rev = "d3727c9f5bb13c52b4a345bc8f895d3dbd9178b3";
- sha256 = "0bcf6vaq6bcp60wgfq0vr3mjzv74fn7jibndz5g1d9jkd1vj64xw";
+ rev = "d98ac778658ce242e70bc30f1350a93582473bd6";
+ sha256 = "0jfy96xyhsvpvwn467aq9fchz1wnyqrmr35mz4i76lykirsb93aa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/189e1a60894db0787a4468b120fbab84be1b5d59/recipes/company-auctex";
@@ -9875,12 +9938,12 @@
company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "company-coq";
- version = "20180219.751";
+ version = "20180307.510";
src = fetchFromGitHub {
owner = "cpitclaudel";
repo = "company-coq";
- rev = "e2bbd06af9661628198d12e7b4725a17ef260dd9";
- sha256 = "01qyy4037isa5ghy7gwl77byydn3s5mc6pvd7w79910cg5h60dkg";
+ rev = "c2bd34f79472c27ee6f819820558c8b26f774748";
+ sha256 = "1dvd7w93gly70x7j7dsn2n90w7n76k2bp96p4zlzxad94kvdj2a8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -10411,8 +10474,8 @@
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "56a18467de4bc1cf408a1910458e1819102312dd";
- sha256 = "0x9ilnqaw9vim9f17rl4g8ikbi4qwagjz41j9f2i72aspir3jdfg";
+ rev = "221a8a854488cf455aa05eeda1f2b3f658639c9c";
+ sha256 = "0nrwda6fvnbwpcya4hk6ibh6rxjw19mb1b3prwl3zmfigjf0z35y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10564,8 +10627,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "4f27c1cc60742622e6616b579c82b5440ad446d3";
- sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0";
+ rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+ sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10956,6 +11019,27 @@
license = lib.licenses.free;
};
}) {};
+ conllu-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsec }:
+ melpaBuild {
+ pname = "conllu-mode";
+ version = "20180304.637";
+ src = fetchFromGitHub {
+ owner = "odanoburu";
+ repo = "conllu-mode";
+ rev = "5c1f4de04d5cba9ff4fc3246c507f74f50a2aa6c";
+ sha256 = "0zr8pglciqc1af06qsvqjks823wbb7s33g3qvhajxlfcz10iyd98";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode";
+ sha256 = "1wffvvs8d0xcnz6mcm9rbr8imyj4npyc148yh0gzfzlgjm0fiz1v";
+ name = "conllu-mode";
+ };
+ packageRequires = [ cl-lib emacs parsec ];
+ meta = {
+ homepage = "https://melpa.org/#/conllu-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
connection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "connection";
@@ -11211,12 +11295,12 @@
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "counsel";
- version = "20180225.744";
+ version = "20180308.1121";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5";
- sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3";
+ rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774";
+ sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11250,6 +11334,27 @@
license = lib.licenses.free;
};
}) {};
+ counsel-css = callPackage ({ cl-lib ? null, counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-css";
+ version = "20180302.236";
+ src = fetchFromGitHub {
+ owner = "hlissner";
+ repo = "emacs-counsel-css";
+ rev = "0536af00236cdce1ed08b40dd46c917e8b4b8869";
+ sha256 = "04qm5dqxnl4s0axbrin7a7dpj3h8rx096q01bwzfs10qsdx3l7c0";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/519a05a9f0e43f3e1dfac75759346476bfc40772/recipes/counsel-css";
+ sha256 = "1sckfq8kv68q1anqmslrvhcf83m7b5r0clny6q33b9x0qypkv9xp";
+ name = "counsel-css";
+ };
+ packageRequires = [ cl-lib counsel emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-css";
+ license = lib.licenses.free;
+ };
+ }) {};
counsel-dash = callPackage ({ counsel, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, helm-dash, lib, melpaBuild }:
melpaBuild {
pname = "counsel-dash";
@@ -11274,12 +11379,12 @@
counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-etags";
- version = "20180222.2023";
+ version = "20180304.58";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-etags";
- rev = "9d70490b551503aac22241c8089a46e55dd3deba";
- sha256 = "03yr0y3z0jgh8c1db43nq0888rr561f6ks5fmf254aibh63schff";
+ rev = "e97902f9947c663372698affd1577a8d23876561";
+ sha256 = "1i0gb11x70nj4zp6mdqc91nd9812wsbfkpg94fssgwyqa0dqkb29";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
@@ -11358,12 +11463,12 @@
counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "counsel-projectile";
- version = "20180217.2349";
+ version = "20180316.1608";
src = fetchFromGitHub {
owner = "ericdanan";
repo = "counsel-projectile";
- rev = "bf98fbd1988885e82129823bf189b777dd52a084";
- sha256 = "0z940554lqsyrj1wljmgl4najrxpv4d6kqf5n60a6sj630ak0blc";
+ rev = "d428d08015f83fe91c058abf7f1fa95657e90483";
+ sha256 = "177w7v9hxx7p5l25hap4n4x8axzvp019a4xhkla8r1i821bxbqjw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -11421,12 +11526,12 @@
counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-tramp";
- version = "20171224.321";
+ version = "20180311.2327";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-counsel-tramp";
- rev = "6efa0e6e204d08d5b8b8b66f7e3ae7f07d5a3665";
- sha256 = "1byskmvhs0vdj08xjnds8zczw19d2kmnsym514c56k3a0v7g1ldz";
+ rev = "3f5ae75a6bde00bffeb2877b4ed4bd45610c0dfa";
+ sha256 = "06dhhjrgpikzpdl1hck0ckjbx8yzx8jbymb3ajfxglgvrvid4l1k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp";
@@ -11484,12 +11589,12 @@
coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }:
melpaBuild {
pname = "coverage";
- version = "20160222.114";
+ version = "20180226.2057";
src = fetchFromGitHub {
owner = "trezona-lecomte";
repo = "coverage";
- rev = "d68e5d20108e280b11a802a671bd009c7dcfff89";
- sha256 = "0glnvr10lwi17g44653qqswn9vnyh5r2nmpaa0y6lvfb952zn0k0";
+ rev = "c73d984168955ca0f47f44b0464aa45282df42b6";
+ sha256 = "1kn61j91x4r4kc498y2jas5il4pc4qzhkj8392g2qiq5m3lbv4vl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cd70e138534551dd12ba4d165ba56fbd1e033241/recipes/coverage";
@@ -11610,12 +11715,12 @@
cquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "cquery";
- version = "20180226.428";
+ version = "20180314.2158";
src = fetchFromGitHub {
owner = "cquery-project";
repo = "emacs-cquery";
- rev = "0b70a10869581a682ade3730442881250304a331";
- sha256 = "01jf77m3d8ydrnjms62c6zn2xwfcs3wadk7wcc73qrsqz99i81ba";
+ rev = "f38c4b996877b5a0f5f7619bf46b268b64ef4e3c";
+ sha256 = "06s4qjwj9ikbxip84kjvs7yzdax19bp56hikzlmayzg6idbn9ld2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery";
@@ -11841,12 +11946,12 @@
crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "crystal-mode";
- version = "20180104.1920";
+ version = "20180306.1821";
src = fetchFromGitHub {
owner = "crystal-lang-tools";
repo = "emacs-crystal-mode";
- rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10";
- sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m";
+ rev = "490f213c17e67ac28e7de19a0cfa62652d44b5de";
+ sha256 = "0isz91ikwc5175y9a984j8j9nmli0qf2j0shljk576ywlybiy00a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode";
@@ -11925,12 +12030,12 @@
css-autoprefixer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "css-autoprefixer";
- version = "20180118.1411";
+ version = "20180311.900";
src = fetchFromGitHub {
owner = "kkweon";
repo = "emacs-css-autoprefixer";
- rev = "a694e7e725074da99d90b18dd166707f1649bfae";
- sha256 = "0cd4i9xbc7rqsmaa73gj4p9za3g6x6xv54ngnkf6vprpg3g7lb6n";
+ rev = "386a5defc8543a3b87820f1761c075c7d1d93b38";
+ sha256 = "0ymba9bhzfi7kkrha4d4sn0hrc3sid4b5k8lhakwwdwafhym0jjb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/122e3813a5b8a57303345e9cd855f4d85eced6f0/recipes/css-autoprefixer";
@@ -12370,8 +12475,8 @@
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "cf70c10744aec43df0708f5ee3d692d378fc31f1";
- sha256 = "03ka1lnw4qdg5lzlimdg8w1gynmbf66wvr7iplgszf752cg1q01i";
+ rev = "93843b9469d164a7e98962f8f0645b93b2f7442f";
+ sha256 = "1n9g9h3pn09mfbwlq2grqjxmwhrm34wkchshhpbswngbpc0m10gk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12412,8 +12517,8 @@
src = fetchFromGitHub {
owner = "Emacs-D-Mode-Maintainers";
repo = "Emacs-D-Mode";
- rev = "398f1854d53863185e60873b494eec0263bdd0dd";
- sha256 = "0xka4k0j0rl4kjjyzryx7a7ngf9qzry148nhpzc66yirlrp5hjn8";
+ rev = "8d0ed0460189d0e91fa454866c1ed7b9b36f99e2";
+ sha256 = "0pdg6s10vcr95r2azin1svkdgn8grlgwi4di30d0f3vcq8jmmfhi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode";
@@ -12468,6 +12573,27 @@
license = lib.licenses.free;
};
}) {};
+ daemons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "daemons";
+ version = "20180310.1147";
+ src = fetchFromGitHub {
+ owner = "cbowdon";
+ repo = "daemons.el";
+ rev = "75b54be70a909282b20c872b5f01d30e18e19f84";
+ sha256 = "0jv1i66b035yvj2mj83ihylk6vv7skljnr6kxa15zzj4daw9462c";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1f780485e72ae2885f698fdab0156855f70831f1/recipes/daemons";
+ sha256 = "14givkrw9p0m261hawahzi0n8jarapb63kv1s62faq57mqnq23jr";
+ name = "daemons";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/daemons";
+ license = lib.licenses.free;
+ };
+ }) {};
dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dakrone-light-theme";
@@ -12765,12 +12891,12 @@
dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dash";
- version = "20180206.2124";
+ version = "20180310.1317";
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "48a5015dd1314a8bcad48f2ad8866dd911001b01";
- sha256 = "0cs8l20fw34ilr7qir1p708wx925d3qkp7g4py2s2d8k1yf0kjmy";
+ rev = "87d5feac1a08ea09e55e52442dc5e497817b4f08";
+ sha256 = "05rm9rs4083ccsscwi7kl094ij5lz7hgs9kvxdsrjmvxj4fqdqm7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12811,8 +12937,8 @@
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "48a5015dd1314a8bcad48f2ad8866dd911001b01";
- sha256 = "0cs8l20fw34ilr7qir1p708wx925d3qkp7g4py2s2d8k1yf0kjmy";
+ rev = "87d5feac1a08ea09e55e52442dc5e497817b4f08";
+ sha256 = "05rm9rs4083ccsscwi7kl094ij5lz7hgs9kvxdsrjmvxj4fqdqm7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -13080,12 +13206,12 @@
decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "decide";
- version = "20170702.1617";
+ version = "20180316.1101";
src = fetchFromGitHub {
owner = "lifelike";
repo = "decide-mode";
- rev = "90133687118c236142b8110571c463304b3192f9";
- sha256 = "04yakjnh9c165ssmcwkkm03lnlhgfx5bnk0v3cm73kmwdmfd2q7s";
+ rev = "257f0e39ac60ca375942950b44eeaee04cb9d961";
+ sha256 = "0hiv3wlqidj1qd8z5jy800spzrpbca2vgq4zg1lkzvbcmhqvcqqm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide";
@@ -13650,8 +13776,8 @@
src = fetchFromGitHub {
owner = "alezost";
repo = "dim.el";
- rev = "4b00587dfaabc1f2393b9a9f9993996c288d4445";
- sha256 = "0qvx81glmrsaafcikxz07ym60haxhb39dyspv5x95f2p345f03q4";
+ rev = "79b81724b951fedffdd3113f473c18990af837a9";
+ sha256 = "1fclhpcrsi09z2np7q3dq3hhb3pqxsvv1l2dqis27afxnb1zshr3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a740ab40cab3a1890f56df808f41a2d541aa77c/recipes/dim";
@@ -13772,12 +13898,12 @@
dired-atool = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-atool";
- version = "20160208.433";
+ version = "20180302.2340";
src = fetchFromGitHub {
owner = "HKey";
repo = "dired-atool";
- rev = "f188ccf6092330dbbefc0e75aa4fad3e7258749d";
- sha256 = "06m2p5sf47ykhkl958x4k0j0rxzrq0wfwf86mvnarlgc1215dbaf";
+ rev = "b92e0106827d34fa686e189c7e9a537a3a947a8b";
+ sha256 = "1i40zd7y1jf9skr3wi2zqv4awrgff244p1h89r707aq67v1j19yk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-atool";
@@ -14192,12 +14318,12 @@
dired-sidebar = callPackage ({ dired-subtree, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-sidebar";
- version = "20180218.1717";
+ version = "20180312.1715";
src = fetchFromGitHub {
owner = "jojojames";
repo = "dired-sidebar";
- rev = "e43864a70ee240bf8dcaddd7bb88b77c6e1e9fe6";
- sha256 = "1s70qlm1jxq7larwq5gr2zc58q4qxch5f2qk6fzqwkpcvsvlv304";
+ rev = "df9d46615930ad3709303babd45bc12b96d0945c";
+ sha256 = "0yj0jlm695v1kzdlvi0lqa0phafvgn1y9bwbin5cikygvn2wjjxw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar";
@@ -14339,12 +14465,12 @@
direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "direnv";
- version = "20180213.1238";
+ version = "20180307.748";
src = fetchFromGitHub {
owner = "wbolster";
repo = "emacs-direnv";
- rev = "5b55dac12467689083ff995777f54a304ff47be1";
- sha256 = "0sjrnab8rx1bpnxim268b8jfpyh8h0iy3j38925r0jqjgjb19ksn";
+ rev = "78bb6894348b1d958aa8947837db4b3bceaa55bb";
+ sha256 = "1i37pylq6gh9144vhf0lxqnkzcwqhaq7vm18f64qajvcv3rj5s84";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
@@ -15081,12 +15207,12 @@
docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
melpaBuild {
pname = "docker-compose-mode";
- version = "20170916.1438";
+ version = "20180311.611";
src = fetchFromGitHub {
owner = "meqif";
repo = "docker-compose-mode";
- rev = "f3c06a43d69dfe80041a82a9365281bd5c65a105";
- sha256 = "1fzz950wb95lp15ak8q4vzls21w9fc3qxqs5hlf50najdw36w52h";
+ rev = "7f4cd0b1718df2ab93d51bd395b2f37df9482265";
+ sha256 = "1fbcxwfvm33xcdj3cs26d9i1zyrryyjjkv7sc3mfxd45nq8d3ivj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
@@ -15207,16 +15333,16 @@
doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom";
- version = "20160121.722";
+ version = "20180301.1508";
src = fetchFromGitHub {
- owner = "emacsorphanage";
+ owner = "kensanata";
repo = "doom";
- rev = "5e2d3f54e5b84eaa533cbdb6cf17b1b6009f0730";
- sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73";
+ rev = "e59040aefc92dd9b3134eb623624307fb9e4327b";
+ sha256 = "14lwq30m0s7pkwkbn6vm5gdlkww7sszc6pdhxyinkhj67b0bxpin";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7e41ed64142be89a62fddeceee5e39603a18525c/recipes/doom";
- sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0960deb3b1d106ad2ffa95a44f34cb9efc026f01/recipes/doom";
+ sha256 = "1ji2fdiw5b13n76nv2wvkz6v155b0qgh1rxwmv3m5nnrbmklfjh5";
name = "doom";
};
packageRequires = [ cl-lib ];
@@ -15228,12 +15354,12 @@
doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom-themes";
- version = "20180219.1227";
+ version = "20180312.1228";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-doom-themes";
- rev = "aa57d222b65a4dc9dddd76f66adbe6ac003f57a6";
- sha256 = "05chhg1mpnp3jqjgwwsnzkh19ci4429sgq9xpx4jxfbbalhd4z11";
+ rev = "933bf2a006c5de611e03d377b967f213e285c296";
+ sha256 = "0lcxglnq5zic2hbjwc67x60dqk3j65rsschhwvxcmcmcyfg0whfi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -15249,12 +15375,12 @@
dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dot-mode";
- version = "20161025.1037";
+ version = "20180312.1600";
src = fetchFromGitHub {
owner = "wyrickre";
repo = "dot-mode";
- rev = "cde2d593cb3f8e31db8778e434d3a4550707d2cc";
- sha256 = "1pvmypsz5c5jkx4g3hvznayyv9cs9yr5sgf251prxnqcl0ivc0y9";
+ rev = "6ca22b73bcdae2363ee9641b822a60685df16a3e";
+ sha256 = "10lmwra48ihxqxyl54m3yn1zy0q5w6cxqd2n5pbs4lva1yck0z4w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dot-mode";
@@ -15652,8 +15778,8 @@
src = fetchFromGitHub {
owner = "jscheid";
repo = "dtrt-indent";
- rev = "3ea5136bde1240f93fbf3ce30fffc4f279a58d27";
- sha256 = "0lkc8y09lhlpg7vrn2459c5fxn0nvxbzqhwadmkgc046i3aapqpg";
+ rev = "7019ecd7f20428cd33d96a25934416adc28e4159";
+ sha256 = "0vb3fhi361v4kjyhvmax60550f3xkkkm2fyhi3ssjq21cq0k923g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent";
@@ -15732,12 +15858,12 @@
dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "dumb-jump";
- version = "20180225.1541";
+ version = "20180228.2206";
src = fetchFromGitHub {
owner = "jacktasia";
repo = "dumb-jump";
- rev = "65b9a3aea2bb212cc83d2f9414d0897331278000";
- sha256 = "14g99l038f29wh66ybfi99nvk1niqkk613j0rz7hkw9l0y912m2k";
+ rev = "260054500d4731c36574b6cbc519de29fdd22f43";
+ sha256 = "00ph85vp8sa3k99qrdxfz4l8zx121q9xf47vvspzg26bk9l4nwin";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -16109,12 +16235,12 @@
eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "eacl";
- version = "20180204.1911";
+ version = "20180308.1656";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "eacl";
- rev = "0e4d4e016caedbfed8dea0e700a33a043e798029";
- sha256 = "06dcv3ws91ldld3qjpbpp5j7jnjp0s8ng6g7w8wj0rspjbcb2dg5";
+ rev = "80113a9f6cc246cef67e3e20ec052788c38ab116";
+ sha256 = "1pwppn0m288d6j9b7cdshgc3rxv0nfs94klc1fpsyfxqx0a6f23z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
@@ -16169,22 +16295,22 @@
license = lib.licenses.free;
};
}) {};
- easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "easy-hugo";
- version = "20180225.2153";
+ version = "20180312.352";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "336fb8ec510c10596d65bfd50f65b59e2f7711e9";
- sha256 = "1bkd3q8lr9admpipad1vi42gvs1sv7l7rzgi6dhl799zq1691kd3";
+ rev = "b14dc7f9d0da804daf8219fea48604b192a4389d";
+ sha256 = "0y1d1vpqbdm86y52fd97l64zfnl4g428h30152mamhmbjzjsi0v5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g";
name = "easy-hugo";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs popup ];
meta = {
homepage = "https://melpa.org/#/easy-hugo";
license = lib.licenses.free;
@@ -16197,8 +16323,8 @@
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-jekyll";
- rev = "b3176d34f1e2850ab96795e264da6e05e23e280b";
- sha256 = "175by3aswpd00lhin69f2jkb1aqi487vzk3qa6wqp41hjpga6fag";
+ rev = "e7016084c6212e393496cf19fb5e519c380227ba";
+ sha256 = "0jpg31z7f2him4lcnazknx9lpipf1nbqvhaqr5razkckq71llq18";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
@@ -16982,8 +17108,8 @@
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
- rev = "a41addef812318bb6bc0a693ce3a22606f27a3cf";
- sha256 = "1303m6d53qdkv3j7bx708ipvrjb4mjdj1b58600x8471bddamgh3";
+ rev = "9948d6a1933af7af45621c9521d7a124c715191b";
+ sha256 = "0j2026bnz5wjcw9g1kbgjddapv0hnfmfiv1aab24ffh5s1mr8gnl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16999,12 +17125,12 @@
ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
melpaBuild {
pname = "ego";
- version = "20180123.2256";
+ version = "20180228.1704";
src = fetchFromGitHub {
owner = "emacs-china";
repo = "EGO";
- rev = "ec91e8234e2b8fbfd37b6135dfda352a923c556e";
- sha256 = "1m98zkmyy1bbcz7jpa15in9kdgskl3l498q7a9vxpr8w2scq3cls";
+ rev = "719809679c1a60887735db41abae53b61f08ef59";
+ sha256 = "10f179kl53la4dyikzl1xysccx4gk04skzwaw3w1pgr8f5fjppxc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ego";
@@ -17060,12 +17186,12 @@
ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }:
melpaBuild {
pname = "ein";
- version = "20180226.416";
+ version = "20180311.1029";
src = fetchFromGitHub {
owner = "millejoh";
repo = "emacs-ipython-notebook";
- rev = "7a52ebca3527d891ecb7e8a3e46785b271717acc";
- sha256 = "01ifzww8gs4qy9yrhhf5dm0s3ifrlppknvllkajfp6lh9hc7q4cx";
+ rev = "115c16eb9f38447790a75c71e67036c5f4be15e0";
+ sha256 = "112wnfhn468gfgac1vhclm6lycsp904wmf60akcng71fqgvyzcda";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -17133,12 +17259,12 @@
ejc-sql = callPackage ({ auto-complete, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
melpaBuild {
pname = "ejc-sql";
- version = "20180215.627";
+ version = "20180305.1047";
src = fetchFromGitHub {
owner = "kostafey";
repo = "ejc-sql";
- rev = "ef19d5e33b632d776e9e369281c522e26e632384";
- sha256 = "1q8gh79rfcn4v8ps4z3a0s60qr5nf9j93p0mkq0fdll57h2y6cbz";
+ rev = "dad0777b7dbcdee8d16134b565924a9081806ae8";
+ sha256 = "0cmkcnz2mqi3qdcl6srrdzp1yxk6qvm0dk413wkx1grx5gqs1vpr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -17179,8 +17305,8 @@
src = fetchFromGitHub {
owner = "dimitri";
repo = "el-get";
- rev = "129789cef476279a7840647a5bf39aa5cd2bc2f6";
- sha256 = "0b20s3bc92jwi4xl2fralj0ffdj1zvagbmnsp2dw5cj94dhm33p1";
+ rev = "93fb44441b18b67d61400ca5f63e3194c34181b6";
+ sha256 = "0w9iiwnbrk18si064q433f89f8xf5b2lk5zxx1b3nrawbbk76k1r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -17427,12 +17553,12 @@
el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el2org";
- version = "20180216.2005";
+ version = "20180311.855";
src = fetchFromGitHub {
owner = "tumashu";
repo = "el2org";
- rev = "742b2e4de42026edbff20dfcc6f63200c1d0ad40";
- sha256 = "0ji8ngf6zzhhq2vhn9i04dpgg1sgqcs0vzq7wdyfl9cfa0cpwlps";
+ rev = "81f1c97db8911f5bdf92c729630ab509de4ec73f";
+ sha256 = "152y6a6qjch2w84axghzcqiswhx1cq5bq1r1gjfffh41wsddqb53";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org";
@@ -17448,12 +17574,12 @@
elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "elbank";
- version = "20180215.556";
+ version = "20180316.627";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "Elbank";
- rev = "f494716105b1a9f4f52f43bc3dd37c9cd0309bf5";
- sha256 = "0bvx6nq0gjjbjs0mzd1x1ajyjpa181z0n4kv4aknh3is210gbpbb";
+ rev = "28143b3076f2ac64a9db84a53e9af0ad43fe4322";
+ sha256 = "0gdhdq3g34m1jqpq4m12pbf70sl5jrmj8wbakj36vh540p12f0ph";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank";
@@ -17490,12 +17616,12 @@
elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elcord";
- version = "20180203.1417";
+ version = "20180306.1515";
src = fetchFromGitHub {
owner = "Mstrodl";
repo = "elcord";
- rev = "a97824ead7c63fb114a9f34ed46a8401407fb4ea";
- sha256 = "12mjmdr5kwmgpihnc943widbbw5pcp0gw1mcjf06v4lh0fpihk7h";
+ rev = "3071250488613d8dbd79daf81ddbe3bad4b87001";
+ sha256 = "0lcs0713r4vcln2im53mkfwcibr3j7ygs467rfgf163kd979gp5c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf2c52366a8f60b68a33a40ea92cc96e7f0933d2/recipes/elcord";
@@ -17767,6 +17893,27 @@
license = lib.licenses.free;
};
}) {};
+ elgrep = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "elgrep";
+ version = "20180302.527";
+ src = fetchFromGitHub {
+ owner = "TobiasZawada";
+ repo = "elgrep";
+ rev = "5e982024250e75fe02aee358a542ae3ed2a472d5";
+ sha256 = "0bkiay3mmk00lay2cv91qmas346ffhb2nlrg6xw083s5vk45fbbv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9ab623b2d634936a79ff6f4b98b31825d44b6d/recipes/elgrep";
+ sha256 = "0b8dma52zv57sh1jbrabfy6k5lzixs7f541s8dsqyrg0fzlq460j";
+ name = "elgrep";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/elgrep";
+ license = lib.licenses.free;
+ };
+ }) {};
elhome = callPackage ({ fetchFromGitHub, fetchurl, initsplit, lib, melpaBuild }:
melpaBuild {
pname = "elhome";
@@ -17788,6 +17935,27 @@
license = lib.licenses.free;
};
}) {};
+ elisp-def = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "elisp-def";
+ version = "20180309.1434";
+ src = fetchFromGitHub {
+ owner = "Wilfred";
+ repo = "elisp-def";
+ rev = "4c300ea67594892171076f49df7c56f25e35d0ff";
+ sha256 = "15kqlf87nxy5vnny5l6jrfj28mxz97w07h6bmj1n1x9lwxbd830n";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1f027b844efdc5946d2ad80d7052a8f3b96aac3d/recipes/elisp-def";
+ sha256 = "1y29nsgjv9nb03g0jc5hb1a8k23r54ivdlv9h0a384cig8i91hsz";
+ name = "elisp-def";
+ };
+ packageRequires = [ dash emacs f s ];
+ meta = {
+ homepage = "https://melpa.org/#/elisp-def";
+ license = lib.licenses.free;
+ };
+ }) {};
elisp-depend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elisp-depend";
@@ -18190,12 +18358,12 @@
elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elpa-mirror";
- version = "20180113.2321";
+ version = "20180228.1636";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "elpa-mirror";
- rev = "3fedb1ca6f84cdbfc27723d6906b67a0e2ca2972";
- sha256 = "087sa553aqyphrdrn8clb8pjl609aw3qkmim47hvnq8npzvhhr0l";
+ rev = "6ca78e3fb69ef582da1a01f1d193e07ae8223142";
+ sha256 = "0s0c5qqg1cl63kig7kc4fx9rz4kgchxc3w3ywgh5csmgwlkpg0id";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror";
@@ -18211,12 +18379,12 @@
elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "20180223.1119";
+ version = "20180314.1340";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "0c51b0d3aede3e3e3d2107ea86d133c669220948";
- sha256 = "1404r7al2rndy2nqfgdm2iw37mn2dr9hb51fr5f0l0w34mhfhyji";
+ rev = "2f4388f949482a4dd83b2dfc408dd94f72edd3d4";
+ sha256 = "1mbv1xr015pimfqx108gcnpq9ah974h8lbhc9rkb866rbwsfrnss";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -19477,12 +19645,12 @@
epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "epkg";
- version = "20180221.1318";
+ version = "20180222.1622";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "epkg";
- rev = "5d0bf705ccb617fafe28f2748d566d2a990aba06";
- sha256 = "1igiwnvl3w907hz83x8hwf298wdv86s5c54zs4naw1pbi875j7zw";
+ rev = "bc78f600b2c451bc8df1cf73bbb14476c11ece1d";
+ sha256 = "0w4c3j5pnzn6yisfb02s2aw8pzhqlkmidzk0yxfalgn8gmqbz57r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -19582,12 +19750,12 @@
eproject = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "eproject";
- version = "20151205.2130";
+ version = "20180312.942";
src = fetchFromGitHub {
owner = "jrockway";
repo = "eproject";
- rev = "fdff000d601eb8bdb165db3dc4925c6797308b78";
- sha256 = "13ds5z2nvanx8cvxrzi0da6ixx7kw222z6mrlbs8cldqcmzm7xh2";
+ rev = "068218d2cf2138cb2e8fc29b57e773a0097a7e8b";
+ sha256 = "110b8gn47m5kafmvxr8q9zzrj0pdn6ikw9xsx4z1rc58i02jy307";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d7e82668617a9b599f8994c720f3f123ba1e008a/recipes/eproject";
@@ -20043,12 +20211,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "20171219.305";
+ version = "20180302.427";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "1c7938bc9539f1c06b5493ced9f265e05a4824af";
- sha256 = "0vrrxh4ngbmsr2iaw5hqr0xf43vnbqghql2sm9ffm0zh6snd4kag";
+ rev = "bdbb5f0376678c0aae289b3f9264a2bd4d9b96ee";
+ sha256 = "0f93f2w0c8gclvizh4vlkfii7y07ca7fqr40wqgs1bqjdqw9b9cv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -20130,8 +20298,8 @@
version = "20180208.935";
src = fetchgit {
url = "https://bitbucket.org/olanilsson/ert-junit";
- rev = "b335d7fb84d6af381a5dbc40c324078faf397b66";
- sha256 = "0nbpqhpff3my4ndsf148iqgnl84ilsbq6na5jnn3nddyhbmidcxb";
+ rev = "e0cd3c21292e4a80fa8a9648981b61e62a996e80";
+ sha256 = "0i6962j2k6qmdlrw2m5jv2pyxvciyawd954q462nv64cddaa5581";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit";
@@ -20672,12 +20840,12 @@
ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
melpaBuild {
pname = "ess";
- version = "20180216.1616";
+ version = "20180314.612";
src = fetchFromGitHub {
owner = "emacs-ess";
repo = "ESS";
- rev = "f10792493602cb5c77a7010b1b4c7063c7c41add";
- sha256 = "03spbyi24gpmw7wlf0aifg0aa793sm0s1lxk9xw2lm974rj0g6w7";
+ rev = "87034e808c5279d73d666797971fac505215fd7f";
+ sha256 = "0ycgid2b74f07wc97ywwr5rkk4hxxwhc4zly9xfqa75ngrj993z4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20840,12 +21008,12 @@
eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
melpaBuild {
pname = "eterm-256color";
- version = "20180202.1722";
+ version = "20180308.1615";
src = fetchFromGitHub {
owner = "dieggsy";
repo = "eterm-256color";
- rev = "72b2d650a173c39648f1cb0f2b68fab5a6886d79";
- sha256 = "15vj55l71v9yzl7cw4yw7lc71045xa3y6q0hn8a5pmakmb6fiwdf";
+ rev = "dab96af559deb443c4c9c00e23389926e1607192";
+ sha256 = "0ysxblc90kjcz84siprnyxwh94scflivqbxylzkvjm7hbx93rsh1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color";
@@ -21029,12 +21197,12 @@
evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "evil";
- version = "20180222.1032";
+ version = "20180307.109";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "3bf198796b2d135776143eac854e8d855cd94475";
- sha256 = "0bzmq988x9734dxgjli70r9dpa3kagbz43md79zr32q4z96rj4y4";
+ rev = "90b41a21a31e99d4153c536f1a04a69b73d96360";
+ sha256 = "1vfvhz0r9n1psb6z35r282y4snkxjsbwr3whpzin2a5g515vvx92";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
@@ -21176,16 +21344,16 @@
evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-collection";
- version = "20180226.21";
+ version = "20180313.1759";
src = fetchFromGitHub {
- owner = "jojojames";
+ owner = "emacs-evil";
repo = "evil-collection";
- rev = "7adf05cf25b022197c0542920ddc65acdae1703e";
- sha256 = "1cxsi0aqm2fd344q6nlahhg0q2bf4k6gagi6sxsvjlhwvb80skxq";
+ rev = "4d3f755884a93132659976c510fdc90b2b98622c";
+ sha256 = "05lwd9c2hdd8pdd5vy2f8h3q2djj4zpp4dfwbqqrgqkhw0wavg7s";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d7538c9eb00b6826867891b037e7aa537ac5b160/recipes/evil-collection";
- sha256 = "0wxx6x9lxlnxaa3i36gj4nad3q8c25mbw17bp4aa0agh43yk4bgn";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a9b93a8e3750e4e7767498e418f46d553d814604/recipes/evil-collection";
+ sha256 = "1fggdlssb8sai00vbrxph8cama3r0f7w8qhmiajj4cy2il7jgmhy";
name = "evil-collection";
};
packageRequires = [ emacs evil ];
@@ -21344,12 +21512,12 @@
evil-expat = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-expat";
- version = "20171125.752";
+ version = "20180302.657";
src = fetchFromGitHub {
owner = "edkolev";
repo = "evil-expat";
- rev = "ff443637fc514813ed3139d99950391189a9360a";
- sha256 = "1w1yj0avg54gl7a143ib3rszi0a6arrvcb3s8j5pjr4hs7sy9jbd";
+ rev = "523edb0d1fd6ad17b777c1893cbe1f4857469a4d";
+ sha256 = "10irfd546pz0sz0ckfms1md37ni44p7i12imii5ck13hga7grv7i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f08f6396e66479eb9510727968c5bb01ac239476/recipes/evil-expat";
@@ -21617,12 +21785,12 @@
evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "evil-magit";
- version = "20171213.1019";
+ version = "20180313.931";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil-magit";
- rev = "4cdfbcd13075869c238b2253a64668736a16880e";
- sha256 = "148k9ssq8arlvkvacjxwpyg3g8i961ab6wcgg92jmxwl7ir853yf";
+ rev = "69dfa5a06e8a4024803223b9873ea5d591a97294";
+ sha256 = "1kd09z4qxcanvxnawhczwp3y61kn4gnaaji9chqrny633r8j64jk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit";
@@ -21743,12 +21911,12 @@
evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
melpaBuild {
pname = "evil-multiedit";
- version = "20171217.2317";
+ version = "20180209.1819";
src = fetchFromGitHub {
owner = "hlissner";
repo = "evil-multiedit";
- rev = "adcadd09c9f628a65d73a140c37b649c3415a3cd";
- sha256 = "1iz0hd0h4y9crqwbq7ysnkgvwqhd9vcjcca8hk2506cks8sab73q";
+ rev = "ea3d9177b74ab0bc65e55df9cc0a0b42e4ef815d";
+ sha256 = "17zm35r474z8ras4xy7124pcb972d385pbdv4jxyj5vq042vq07w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
@@ -21827,12 +21995,12 @@
evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-org";
- version = "20180116.1347";
+ version = "20180309.252";
src = fetchFromGitHub {
owner = "Somelauw";
repo = "evil-org-mode";
- rev = "491b0b302b95d44ceb73d291dedbb9d5517ccee2";
- sha256 = "04lyp4z0vr8imjwrqc88d1pdpl86wgwn19vzl6256yl63xaipvf2";
+ rev = "79c8e067bbc31ead51894a28492f28cf3a103808";
+ sha256 = "02qdsc6fzcxmblvlg0zpznzfi8xkmc4rr44zdxgw462xyfk2fwrq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
@@ -22016,12 +22184,12 @@
evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-snipe";
- version = "20170903.603";
+ version = "20180228.2218";
src = fetchFromGitHub {
owner = "hlissner";
repo = "evil-snipe";
- rev = "69adb46546a871beb54a445cb22652ac276555c1";
- sha256 = "1g6whd2zg880wxxyn269q4b0697aybj1lc936gi7nrxvm6fnaiwc";
+ rev = "5de756fc02108cb2360908f6ec5e9630492ef422";
+ sha256 = "10ch2xkw3ca3g190344jw9wsq297sip9nh12wmd8wxgsnqjlfzfs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -22058,12 +22226,12 @@
evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }:
melpaBuild {
pname = "evil-string-inflection";
- version = "20171225.1815";
+ version = "20180313.1055";
src = fetchFromGitHub {
owner = "ninrod";
repo = "evil-string-inflection";
- rev = "f13a4aab75e5d50c0c63c126c4cbc0067d452d85";
- sha256 = "1i4vc8iqyhswa77awczgqi1vqaxx8png5is1hwisxf0j9ydsgw4c";
+ rev = "00b62fb82de36e9c7b44bd644c7e11ae88f35f62";
+ sha256 = "0f24722vl3sqri389hi6qj7hhfalqpjvyq4ain5hhr0gsx2dznw4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection";
@@ -22167,8 +22335,8 @@
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "3bf198796b2d135776143eac854e8d855cd94475";
- sha256 = "0bzmq988x9734dxgjli70r9dpa3kagbz43md79zr32q4z96rj4y4";
+ rev = "90b41a21a31e99d4153c536f1a04a69b73d96360";
+ sha256 = "1vfvhz0r9n1psb6z35r282y4snkxjsbwr3whpzin2a5g515vvx92";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers";
@@ -22433,22 +22601,22 @@
license = lib.licenses.free;
};
}) {};
- exato = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }:
+ exato = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "exato";
- version = "20171127.1736";
+ version = "20180305.242";
src = fetchFromGitHub {
owner = "ninrod";
repo = "exato";
- rev = "5b709c128680d4dc5ac4c11253eab94a1e38bcbc";
- sha256 = "0ins7z1a3np7h7l2n7syhj10hm01v0gxn0m8kzjim59x57l0l3wb";
+ rev = "70f7ca2a4c6de0392e5e54ac4f16c96daa106be6";
+ sha256 = "0ns43whqcq3cv9vh8wbakj5fgs0lsn8f3q1rgl4rw4mfgbvv85pm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato";
sha256 = "1h2dd3yhv1n0sznznw8ncx98g53hgi1rg1zkd0nmldih2rd5qisn";
name = "exato";
};
- packageRequires = [ evil thingatpt-plus ];
+ packageRequires = [ emacs evil ];
meta = {
homepage = "https://melpa.org/#/exato";
license = lib.licenses.free;
@@ -22687,12 +22855,12 @@
exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }:
melpaBuild {
pname = "exwm-x";
- version = "20180225.1531";
+ version = "20180227.257";
src = fetchFromGitHub {
owner = "tumashu";
repo = "exwm-x";
- rev = "d26d719d95b3b3296e113d89ef36972312610f4e";
- sha256 = "0n0b7gxamizmkm2gz1ghyg36i7wvy5ims63nzjgwhbrc3ifig6cn";
+ rev = "4f7946db67d6599baba6b3961e8f543a68707742";
+ sha256 = "00lcn5106xig2y9gyir1f1gzyp2i05rwq1lbbbah8aipkdi3z9xl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -22926,12 +23094,12 @@
faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "faff-theme";
- version = "20170522.1219";
+ version = "20180315.1304";
src = fetchFromGitHub {
owner = "WJCFerguson";
repo = "emacs-faff-theme";
- rev = "e79dc142d99bc5a455a46345d3aba6f95f3f3f42";
- sha256 = "0j5vdbwwpav09v3kkx7cn5qd41inam0jd7smx8133hqpnirsh8mv";
+ rev = "abbfde9311a2b0562541d2bf455182d6197f8c48";
+ sha256 = "15x2lb41df0kvlvncqp7m4a97yb7m4jhpgb8hp35if5cgp99xmbj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme";
@@ -23679,12 +23847,12 @@
fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fish-mode";
- version = "20180117.1847";
+ version = "20180306.818";
src = fetchFromGitHub {
owner = "wwwjfy";
repo = "emacs-fish";
- rev = "276db7de3c86411fbe3117f30272c5882b24a69e";
- sha256 = "04srqfndhm6f190l7jfcswhd84xkw6vi09s6kv8bjwrk8iiy3qm9";
+ rev = "bac709ac1235751952d6022dddc6307d9135d096";
+ sha256 = "0a74ghmjjrxfdhk4mvq6lar4w6l6lc4iilabs99smqr2fn5rsslq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode";
@@ -23788,6 +23956,27 @@
license = lib.licenses.free;
};
}) {};
+ flame = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flame";
+ version = "20180303.1216";
+ src = fetchFromGitHub {
+ owner = "mschuldt";
+ repo = "flame";
+ rev = "2cfb860a483197e92a4c20d7b9b055d586e76fe0";
+ sha256 = "1h6mm2zjv03y2d6dv4gq7iaz6r2glgcljzgmi6m4jp6flvyqh09g";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b7a14c14368de722855286c088020a5657f7cf8b/recipes/flame";
+ sha256 = "1br9c48anscq9vbssr0gq8f5kbq755hjaglbljwwh9nd5riycv5v";
+ name = "flame";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/flame";
+ license = lib.licenses.free;
+ };
+ }) {};
flappymacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flappymacs";
@@ -24063,12 +24252,12 @@
flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flow-minor-mode";
- version = "20180204.141";
+ version = "20180315.1124";
src = fetchFromGitHub {
owner = "an-sh";
repo = "flow-minor-mode";
- rev = "9a90436f9208a8f4796ce0d5b08f9d1ba5dbbacf";
- sha256 = "012q3rdzg5zrqwx5ywq07h8bzpvv0lnldkv4p1wxlr9yzxxhrv4a";
+ rev = "6c782a3fe3f810484009d87813b88804beafafac";
+ sha256 = "1awf44fyjwzlxjavk31lha8iknm8nxr2r6z07sxhzyy23ff127mh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
@@ -24084,12 +24273,12 @@
flower = callPackage ({ clomacs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flower";
- version = "20180222.1112";
+ version = "20180316.1052";
src = fetchFromGitHub {
owner = "PositiveTechnologies";
repo = "flower";
- rev = "6a9ba9f25daecfb994b8d71afbf9ab0cc9de5349";
- sha256 = "1i95nqbcqm0gld74g5r42wwpsgdlv8fjalr8kgcn09wzg4glpvrk";
+ rev = "98c53b03da698833058b9ad6b6eb8be46cfd00f6";
+ sha256 = "08wq66gvqy14mcpm8x14xz3hvw4h7rcd5ivynma91d4358qrmqap";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower";
@@ -24130,8 +24319,8 @@
src = fetchFromGitHub {
owner = "lewang";
repo = "flx";
- rev = "9c5cb5de0202b4eaac9359c84ca7ce9cbd7ee835";
- sha256 = "0i7pj4l0ilihvkgal8d71idy5jr9zwanzxch350pg4myr6j1hnad";
+ rev = "46040d0b096a0340d91235561f27a959a61d0fef";
+ sha256 = "0zysqnxa6kgnyfgknsin7pk25a8dy8208qw2yzan93cabplgqszy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx";
@@ -24151,8 +24340,8 @@
src = fetchFromGitHub {
owner = "lewang";
repo = "flx";
- rev = "9c5cb5de0202b4eaac9359c84ca7ce9cbd7ee835";
- sha256 = "0i7pj4l0ilihvkgal8d71idy5jr9zwanzxch350pg4myr6j1hnad";
+ rev = "46040d0b096a0340d91235561f27a959a61d0fef";
+ sha256 = "0zysqnxa6kgnyfgknsin7pk25a8dy8208qw2yzan93cabplgqszy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx-ido";
@@ -24189,12 +24378,12 @@
flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
melpaBuild {
pname = "flycheck";
- version = "20180224.1046";
+ version = "20180315.25";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck";
- rev = "b0edfef87457a13118450969696a68505cce936d";
- sha256 = "146v50nl2a4ryd7p9lpavah01idlsjg3ff1pb0bnblprrs9sg0fw";
+ rev = "3cdef22f638a3d66b6d98ef5c51f28dcd1651e3a";
+ sha256 = "128bmgbjskgamwi6w25vjay19kd8bfq4k1rkac62jl0xa5c3kvs8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -24483,12 +24672,12 @@
flycheck-crystal = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-crystal";
- version = "20171124.740";
+ version = "20180306.1821";
src = fetchFromGitHub {
owner = "crystal-lang-tools";
repo = "emacs-crystal-mode";
- rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10";
- sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m";
+ rev = "490f213c17e67ac28e7de19a0cfa62652d44b5de";
+ sha256 = "0isz91ikwc5175y9a984j8j9nmli0qf2j0shljk576ywlybiy00a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c718f809af30226611358f9aaed7519e52923fd3/recipes/flycheck-crystal";
@@ -24672,12 +24861,12 @@
flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-dmd-dub";
- version = "20180220.15";
+ version = "20180316.746";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "flycheck-dmd-dub";
- rev = "3d378a59492c810842b7c72506d2037bf70b8545";
- sha256 = "0y8iqyml27sx2d765w2hhbyrdx0alaqvj5ls8x1zf53xfwv88x3z";
+ rev = "7e975ec648b048d6dc11ff3e41ec5b2cc201a958";
+ sha256 = "0k2pzfx6iia74cfjgf59dv5d0dsqi5424v41lmdigb7daqw0rbw7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub";
@@ -24711,6 +24900,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-dtrace = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-dtrace";
+ version = "20180126.1135";
+ src = fetchFromGitHub {
+ owner = "juergenhoetzel";
+ repo = "flycheck-dtrace";
+ rev = "0b03e2e50c5d706a4fd4bcdc0ac643425d64d51b";
+ sha256 = "00ld1aih6axdh7zz5bhlgxqzbh80vla08hklmf5lz7mq3v7aizz7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cdcdd10fbcd58a5c67e4d07632212e7dedf42dbe/recipes/flycheck-dtrace";
+ sha256 = "14sg7zkq9f5zbcfn8app8m9mdc8cnwcxh7h4glsz32yaqc1dj7h8";
+ name = "flycheck-dtrace";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-dtrace";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-elixir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-elixir";
@@ -24840,12 +25050,12 @@
flycheck-gradle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-gradle";
- version = "20180121.2251";
+ version = "20180306.1809";
src = fetchFromGitHub {
owner = "jojojames";
repo = "flycheck-gradle";
- rev = "f8c7ec0abdd77f35c5a9a653f8a80acea717b014";
- sha256 = "11lsk5mw2fkx81vd9r2xychh4nwadi516mpg8hr0ibh154p4ql6z";
+ rev = "3710464576f423ae4825fa18826c007adcc6aa5b";
+ sha256 = "0dislqlr4h5p85kkfhi8fnq86176xkgxdsvypr8l027svbb9aabi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/382d9afd2bbb0c137719c308a67d185b86d84331/recipes/flycheck-gradle";
@@ -24942,6 +25152,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-jest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-jest";
+ version = "20180307.1";
+ src = fetchFromGitHub {
+ owner = "jojojames";
+ repo = "flycheck-jest";
+ rev = "2f524e275338e46edb9c1c9ab543020f9031b030";
+ sha256 = "1ipr1yyk5vf2i8q7923r18a216sgf759x5f6j5776jcjkhp98c98";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/31e2ac9de5f28ee9d847097cdeb60afa99476a51/recipes/flycheck-jest";
+ sha256 = "19dg8v0xzni7x6zn472n4ach1c1jv4syzarfi8ba8r6n26vz9ss4";
+ name = "flycheck-jest";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-jest";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-joker";
@@ -25383,6 +25614,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, posframe }:
+ melpaBuild {
+ pname = "flycheck-posframe";
+ version = "20180313.450";
+ src = fetchFromGitHub {
+ owner = "alexmurray";
+ repo = "flycheck-posframe";
+ rev = "93a8c590ac2275d754b4ca57f64e8335620ae789";
+ sha256 = "1n3nhv13wwkqw2wmajgkvmykj1s4g5jx9gjyv5k8qxc5pmf2b3f8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/124f2a7833e3386a0bf57c8111d782ae7a7ee02e/recipes/flycheck-posframe";
+ sha256 = "02ym2isn761w2nsfxiqjh0jk4md9wy3hk9na2aw7pyycm5cgmfwp";
+ name = "flycheck-posframe";
+ };
+ packageRequires = [ emacs flycheck posframe ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-posframe";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-purescript = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }:
melpaBuild {
pname = "flycheck-purescript";
@@ -25407,12 +25659,12 @@
flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-pycheckers";
- version = "20171207.1754";
+ version = "20180316.1028";
src = fetchFromGitHub {
owner = "msherry";
repo = "flycheck-pycheckers";
- rev = "41e676931f37ba32652edde727e443e304e7e6ee";
- sha256 = "118y7r06cmvas5g2nypabslfch3g5wlzl3p69ynmpfsmbrlclsz1";
+ rev = "88fcbed2ab07dc14724d728dfe5ac899ced67e04";
+ sha256 = "1nz0pbafrr41sz2c7f07p1kagqqwkk6p7vkgxjw9vp5ik85a1hhf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -25474,8 +25726,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "4f27c1cc60742622e6616b579c82b5440ad446d3";
- sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0";
+ rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+ sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -25596,12 +25848,12 @@
flycheck-swiftlint = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-swiftlint";
- version = "20180121.2251";
+ version = "20180312.1656";
src = fetchFromGitHub {
owner = "jojojames";
repo = "flycheck-swiftlint";
- rev = "fef7fd20cc167790cb29f16de16a8045717e0a18";
- sha256 = "06m352s5ixxm5wdrkljfk0b2chlqhm8f7bp8c2f2fkcf1l2gvs5q";
+ rev = "8496fd4499ef5c0e0cfeb65f4d76c6f9dd8991f3";
+ sha256 = "0d2s9brccv7lgw2vnglhhaq29mxb3pxiclhx4w28gb76x8r2rsf7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e2a979726507e974a0a19dfc2ca6884157025be/recipes/flycheck-swiftlint";
@@ -25659,12 +25911,12 @@
flycheck-vale = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-vale";
- version = "20170619.2322";
+ version = "20180308.2243";
src = fetchFromGitHub {
owner = "abingham";
repo = "flycheck-vale";
- rev = "97df981468120aaedeaa4cf8ecfd68b07046d998";
- sha256 = "1zic9mirz2xi25pcj3d6r9sclambyn9q5dp7v9jvvxqkml3vy88c";
+ rev = "7777e0d4cf961b6ee6ae4ef917636121d18b3ee8";
+ sha256 = "1k0bhyy2r9c79lld7mbhw8n4c1hlzwr5qp5wmcxzya0fnp3s6g9j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7693eeb536e601589b49f96d0e2734cd08fad4f2/recipes/flycheck-vale";
@@ -25722,12 +25974,12 @@
flycheck-yang = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yang-mode }:
melpaBuild {
pname = "flycheck-yang";
- version = "20170915.1308";
+ version = "20180312.1131";
src = fetchFromGitHub {
owner = "andaru";
repo = "flycheck-yang";
- rev = "c5f65fe3f710f73d56e04d077868719afc1ebfaf";
- sha256 = "00w91mif3wnxgj93qag51yyadnfcsyxik96vf91qlfvwh4wi6ii7";
+ rev = "47881fc42ef0163c47064b72b5d6dbef4f83d778";
+ sha256 = "0bkbl1pas44bl6s3xjdb5zjbd6bmfjk39md5ds1ix4wchnkjm3iy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e58b4f4294d11424918b399898c0044f5b76ab14/recipes/flycheck-yang";
@@ -26839,8 +27091,8 @@
src = fetchFromGitHub {
owner = "cadadr";
repo = "elisp";
- rev = "497c7e68df5e3b6b8c3ebaaf6edfce6b2d29b616";
- sha256 = "1j15dfg1mr21vyf7c9h3dij1pnikwvmxr3rs0vdrx8lz9x321amf";
+ rev = "3059378379a6fbd0363cd14fe6227c27739af4e1";
+ sha256 = "1hnph9x5981rfqc5p5imiah2cd7fr1f3bbs2x23z7lckaqa5v0g7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast";
@@ -27024,12 +27276,12 @@
fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fountain-mode";
- version = "20180215.2005";
+ version = "20180316.914";
src = fetchFromGitHub {
owner = "rnkn";
repo = "fountain-mode";
- rev = "f131de1052d724f14c6c4a19d72978be7c70e5ad";
- sha256 = "04dqdzyiy6iqi9p8dy8k2zml5nmlrin0p60b9p5hhxabmkwawmbx";
+ rev = "8269066a9035fcf50eb835de3745a62c1cb96660";
+ sha256 = "1s1wyhjdyp12iz3zk333z5wlbxl5x3hki9q16164fk9ifhkrppxd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -27126,6 +27378,27 @@
license = lib.licenses.free;
};
}) {};
+ frameshot = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "frameshot";
+ version = "20180228.408";
+ src = fetchFromGitHub {
+ owner = "tarsius";
+ repo = "frameshot";
+ rev = "65994602fdf3d8881f0cabffebbce6c0e493e3c8";
+ sha256 = "0crvvacpajlhdida54gvv4y11xx78qscr6nznx0bhdb12sj3n45q";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e5cfaa4b5fda97054d45691fad9d79b559f2df14/recipes/frameshot";
+ sha256 = "1z5f988m9s25miyxbhaxk6m4af9afvblb2p5mdidva04szjklr70";
+ name = "frameshot";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/frameshot";
+ license = lib.licenses.free;
+ };
+ }) {};
framesize = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
melpaBuild {
pname = "framesize";
@@ -27284,12 +27557,12 @@
fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
melpaBuild {
pname = "fstar-mode";
- version = "20171105.1108";
+ version = "20180315.1927";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "fstar-mode.el";
- rev = "742e427068b5a8568f257585db3fc89c2c6c620e";
- sha256 = "1id41sw15cvazrh7rfb3b840n2ff42qspfr7pm1sfb3v0g7cq6i6";
+ rev = "57d00abf5f4087fbb52f4072513672d6258f4656";
+ sha256 = "107pv959hqpd05w70i5klabkcy52kcfz2y6c9xb98m75c9i5bzbb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -27317,8 +27590,8 @@
src = fetchFromGitHub {
owner = "factor";
repo = "factor";
- rev = "f1030159af4a5998a8ea751a20fc8bd6598952da";
- sha256 = "18zy8nmbi6a79rs6n3d8qrm52640fxmg6s9xfflhkr5pprbwi8fn";
+ rev = "e50be2a1ca65e9d3b3c8116fd71f743ab59fcf65";
+ sha256 = "19g188kniikjw2pjszj4shsad9iwr0z00fq1ias1yiq529z2pmri";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel";
@@ -27415,6 +27688,27 @@
license = lib.licenses.free;
};
}) {};
+ fuo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "fuo";
+ version = "20180314.948";
+ src = fetchFromGitHub {
+ owner = "cosven";
+ repo = "emacs-fuo";
+ rev = "5318bef9d935b53031e6312652554920def69af2";
+ sha256 = "02f4kl1y277pry13hz1jscdh2nrbn3xp7zm1dmqyn8yfhn1s1yx2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/25fb625becf7f582d2a8d53726d6f01d9ea89ecc/recipes/fuo";
+ sha256 = "02mvgz2cxrdn5kp5dw0c57rl5nfavqli5yqbxczmbsih164ljdxf";
+ name = "fuo";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/fuo";
+ license = lib.licenses.free;
+ };
+ }) {};
furl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "furl";
@@ -27443,8 +27737,8 @@
src = fetchFromGitHub {
owner = "HIPERFIT";
repo = "futhark";
- rev = "bb36b2c074449955649907449fa84bd3336528ce";
- sha256 = "1ji4bnwqpbhldjpnkdfvd05y8bv0nc0g52iza1q4azcw4qqdkwql";
+ rev = "1c8650d39a16ead77df9f5f741d21d148818ed82";
+ sha256 = "0wifcbs5m4q9vvb0ch7x4ki05mc1babi35vqpc4pp24axm5b3c3s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -27752,12 +28046,12 @@
geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "geiser";
- version = "20180202.1825";
+ version = "20180313.1902";
src = fetchFromGitHub {
owner = "jaor";
repo = "geiser";
- rev = "e1603edd6f64094495af34432f0d9be621173403";
- sha256 = "0qab1c3d9glp15sh1b1i40zlg50phhix5c2k0vr2i9j6wl8vc80b";
+ rev = "e357eae8fa8c7d6a59f22a1c97cb90a386762089";
+ sha256 = "1ayy3pg0af5bhskkr03dmv0vad6zmlk89sn8304s0mq5barmmfi6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -27896,22 +28190,22 @@
license = lib.licenses.free;
};
}) {};
- gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }:
+ gh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache }:
melpaBuild {
pname = "gh";
- version = "20180112.1110";
+ version = "20180308.1338";
src = fetchFromGitHub {
owner = "sigma";
repo = "gh.el";
- rev = "519e8397fb223bb1071b726ed65c59a9ebd9fa48";
- sha256 = "0fz6f9g1r6lzwvnqmlnn4lr91nn2s59wrv9ajm9baxvivgr4x8w1";
+ rev = "92418cd1b67ff6e8fb0a64478444975a4b8581a3";
+ sha256 = "1vl6wy904jw1mqdic54ssvvbs4xqxhmgacldnfkdkx586vwf0hqi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh";
sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
name = "gh";
};
- packageRequires = [ dash emacs logito marshal pcache s ];
+ packageRequires = [ emacs logito marshal pcache ];
meta = {
homepage = "https://melpa.org/#/gh";
license = lib.licenses.free;
@@ -28067,12 +28361,12 @@
ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "ghub";
- version = "20180221.1319";
+ version = "20180316.1351";
src = fetchFromGitHub {
owner = "magit";
repo = "ghub";
- rev = "bd16d17006488bcbcea32b258752ddf625954c78";
- sha256 = "0fqkl0dhiqq53p51044aw1zx64phdqklz5c0c1kd3vx92j76zsp6";
+ rev = "18bab447b69507802f0261dc284376276ae8a5c8";
+ sha256 = "0ld9s2vrzzfmy6cjnylxh6zik4hwzspx3m8n2751m3avmjdazxfc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub";
@@ -28109,12 +28403,12 @@
gif-screencast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gif-screencast";
- version = "20180226.212";
+ version = "20180309.242";
src = fetchFromGitHub {
owner = "Ambrevar";
repo = "emacs-gif-screencast";
- rev = "08eebb7e9dc583b02b86d2b62f25b7b8ff8bbd9e";
- sha256 = "1j3bp4ahwk6jdanqspqxhf6jvk78mad6zhn7ym88561hv4gq3ngk";
+ rev = "825e606950ec842304bf75cf85baef707b853b03";
+ sha256 = "0xdzfw19zll8v9kpvay2rm8piq92ksz574m2gb6b63nm3z7sia1j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b149509fb245975b450d15470c7d915e3c7b474d/recipes/gif-screencast";
@@ -28323,8 +28617,8 @@
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "60a167ad12ce9e4dc9637254f39ae11ab2f22a81";
- sha256 = "1s6n2j56cvrdg130w2iy2wvynzsqgjqcrnra3f39llpgl4vw9spl";
+ rev = "242ea1d84b3ae2489caa68acd3070e24d08aa00a";
+ sha256 = "1vx3c0r4ci1f967whzjk6hdn11yh7k778s22fa8n522a1mj3gh7n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -28463,6 +28757,27 @@
license = lib.licenses.free;
};
}) {};
+ git-io = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "git-io";
+ version = "20180223.112";
+ src = fetchFromGitHub {
+ owner = "tejasbubane";
+ repo = "emacs-git-io";
+ rev = "e141629f3133c38fdb0dcee58b205f9457d0f802";
+ sha256 = "0vvnifx9cprdr4dbi2jm6j18h2wj7d1dysbaz5lc62c3kwxz3dfp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a713197f227e3c43de3609dd505cf7cd226d94b9/recipes/git-io";
+ sha256 = "1acwc9iqchvlvx98fxh4xf3xphv0xzrnxpv8kkl8qaly41izfj0v";
+ name = "git-io";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/git-io";
+ license = lib.licenses.free;
+ };
+ }) {};
git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-lens";
@@ -28571,12 +28886,12 @@
git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-timemachine";
- version = "20180208.1342";
+ version = "20180307.414";
src = fetchFromGitHub {
owner = "pidu";
repo = "git-timemachine";
- rev = "8e85fff38a7aec727d29d93b79f57c2a9f95c488";
- sha256 = "0ds5pbg87r7ydip2dwdc3dagjby5j5q7rnrl14wpkzm3xq1zpjl3";
+ rev = "dbcb92ffaa5f8350d47f4fbd74512f4000b8c043";
+ sha256 = "1ml06jfjyrcqmbpr5hqvbpi3yy6l2aa836jq8qjla1h74g9qka7z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine";
@@ -28886,12 +29201,12 @@
gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
melpaBuild {
pname = "gitlab";
- version = "20170710.724";
+ version = "20180312.947";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "emacs-gitlab";
- rev = "67567a354a1888419331b79862f151817d9747c5";
- sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw";
+ rev = "68318aca3206d50701039c9aae39734ca29a49f9";
+ sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab";
@@ -28904,6 +29219,48 @@
license = lib.licenses.free;
};
}) {};
+ gitlab-ci-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, yaml-mode }:
+ melpaBuild {
+ pname = "gitlab-ci-mode";
+ version = "20180314.1704";
+ src = fetchFromGitLab {
+ owner = "joewreschnig";
+ repo = "gitlab-ci-mode";
+ rev = "cbad305987ff26fd604a8632fc7ee2f1a733417c";
+ sha256 = "0kcffrmww03lbarw2q4fw0sghncfiqw067wv7j1k00fyy7fwlrad";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode";
+ sha256 = "1jg6ihrgccrcwg30ysyqw9k7rmvfmsrp70skr2057hfamvccwn4f";
+ name = "gitlab-ci-mode";
+ };
+ packageRequires = [ emacs yaml-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/gitlab-ci-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
+ gitlab-ci-mode-flycheck = callPackage ({ emacs, fetchFromGitLab, fetchurl, flycheck, gitlab-ci-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "gitlab-ci-mode-flycheck";
+ version = "20180313.1157";
+ src = fetchFromGitLab {
+ owner = "joewreschnig";
+ repo = "gitlab-ci-mode-flycheck";
+ rev = "11293547385b8252ce1776bfc6455630fbc669d4";
+ sha256 = "1xfhdnny7gyxqpccss0qsmialrjw3dm8x80s7a7ahfyrx5f77yxm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode-flycheck";
+ sha256 = "19ixd60yynsvmaj7mkppp6k73793x794vrnhx3hh6n7dap1rsjdh";
+ name = "gitlab-ci-mode-flycheck";
+ };
+ packageRequires = [ emacs flycheck gitlab-ci-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/gitlab-ci-mode-flycheck";
+ license = lib.licenses.free;
+ };
+ }) {};
gitolite-clone = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
melpaBuild {
pname = "gitolite-clone";
@@ -28995,8 +29352,8 @@
src = fetchFromGitHub {
owner = "magit";
repo = "ghub";
- rev = "bd16d17006488bcbcea32b258752ddf625954c78";
- sha256 = "0fqkl0dhiqq53p51044aw1zx64phdqklz5c0c1kd3vx92j76zsp6";
+ rev = "18bab447b69507802f0261dc284376276ae8a5c8";
+ sha256 = "0ld9s2vrzzfmy6cjnylxh6zik4hwzspx3m8n2751m3avmjdazxfc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab";
@@ -29789,12 +30146,12 @@
go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-tag";
- version = "20180116.2332";
+ version = "20180226.2011";
src = fetchFromGitHub {
owner = "brantou";
repo = "emacs-go-tag";
- rev = "3e334d9ef3c85fd09b05973734584f401ea18c21";
- sha256 = "1nr6ijbc4g7mwrhsbl2pacagcrhkyb32vmbp2wdc3c5j9831h7j1";
+ rev = "59b243f2fa079d9de9d56f6e2d94397e9560310a";
+ sha256 = "0r72qk79q8yyidpxgq4r0295fm73id946p1r4s65bwyzii76rjyi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag";
@@ -29961,8 +30318,8 @@
src = fetchFromGitHub {
owner = "golang";
repo = "lint";
- rev = "3ea3fa98a8104b2c8f8a7bffaebc7e54dddf99e1";
- sha256 = "0d2xxvk44i3m4zirl9rzp6dfkf85kssw2kk8wv7h2rqgc3cxi38z";
+ rev = "46530068cce6db92aaafde350b5059841861d5be";
+ sha256 = "17wwvcmyrmi654jkbg6787kc3k0i5w99byk3g69a1rw90gx87gbr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -30024,8 +30381,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "styleguide";
- rev = "209d38166b1a56b177de486d894d39ae6822eee6";
- sha256 = "1qssg9sz6b5mx1x6x9ygi5kjmazi1787h8pph990fblh8gvp41wx";
+ rev = "89be4df26da2a8c50853d2e82ed4b3cc29abc8e2";
+ sha256 = "0ih82n619x7k39y0mv6mcaniv3s418b4nq5ql04rv3r4xk5z71gl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -30297,8 +30654,8 @@
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
- rev = "0f82f03a2bbf14037d2331cf02f1d4157bbef6cc";
- sha256 = "19bbx8jmigflyarmydf03ms8lsjwlpn6hl97s63dcw3l4gz4jab2";
+ rev = "af9d8fad593242a5ff7e6de55f5d3dd677fcf227";
+ sha256 = "129rzpffxsnnnsmb268j028vwd9m5pb042skp829883mxk8gx231";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -30423,8 +30780,8 @@
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "771a9f448593216b8d93deb8cb18465f3551406d";
- sha256 = "1gyj8j02if4hlrj06j5mya1qa8c3vm11y1s4qamsak07r7p26n4s";
+ rev = "7ac48be3bfd2653422de7ef696827e49f4fbf273";
+ sha256 = "0h733mn02fg4jqgaxx4f6drz1b8n2nq6ma0a4f6clw3cl8djlarn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -30533,22 +30890,22 @@
license = lib.licenses.free;
};
}) {};
- graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+ graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "graphql-mode";
- version = "20171102.1606";
+ version = "20180303.1558";
src = fetchFromGitHub {
owner = "davazp";
repo = "graphql-mode";
- rev = "1f3bd34b18a41dbda75a0baee38aa0f0f1fffb7a";
- sha256 = "16cqncjyai3kak9p108c85d8jp0n83jpfijkwjv8nx2s5wyw57dx";
+ rev = "36b1a4ed9fe78ccd1f386111644e69a5424a1a7b";
+ sha256 = "1azq0igx07aff9r7fbl0l4vbr44c4ylfq41g5rahbc70spd85bk6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode";
sha256 = "074dc8fgbrikb5inv837n9bpmz1ami7aaxsqcci1f94x3iw8i74i";
name = "graphql-mode";
};
- packageRequires = [ emacs request ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/graphql-mode";
license = lib.licenses.free;
@@ -30640,12 +30997,12 @@
green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "green-is-the-new-black-theme";
- version = "20180220.1332";
+ version = "20180228.206";
src = fetchFromGitHub {
owner = "fredcamps";
repo = "green-is-the-new-black-emacs";
- rev = "374d14b99f4959fa039c0e1ce8e0e7991b726d98";
- sha256 = "135w5vwbk2468b82v6icc8nh50d9flpi7zd63xch8vpvsri0vpw0";
+ rev = "8eb51dff843f39552f009e34efbf831052557188";
+ sha256 = "1jrlbp93qjdb7mfsq1x0n45j7n3zq5q3dzyifp7767bd7ng3srlg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme";
@@ -30742,6 +31099,27 @@
license = lib.licenses.free;
};
}) {};
+ grep-context = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "grep-context";
+ version = "20180311.807";
+ src = fetchFromGitHub {
+ owner = "mkcms";
+ repo = "grep-context";
+ rev = "9602b7b9582d5a5cc036edf0877533b23570ad2d";
+ sha256 = "1ybw0mvif1cfkw7vr9kvb9naz06rjmcnyh6l8lk20wfpmcc1rz2r";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637/recipes/grep-context";
+ sha256 = "175s9asbnk2wlgpzc5izcd3vlfvdj064n38myy9qf4awn12c2y1g";
+ name = "grep-context";
+ };
+ packageRequires = [ cl-lib dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/grep-context";
+ license = lib.licenses.free;
+ };
+ }) {};
greymatters-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "greymatters-theme";
@@ -30827,12 +31205,12 @@
groovy-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "groovy-mode";
- version = "20180214.810";
+ version = "20180305.352";
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "771a9f448593216b8d93deb8cb18465f3551406d";
- sha256 = "1gyj8j02if4hlrj06j5mya1qa8c3vm11y1s4qamsak07r7p26n4s";
+ rev = "7ac48be3bfd2653422de7ef696827e49f4fbf273";
+ sha256 = "0h733mn02fg4jqgaxx4f6drz1b8n2nq6ma0a4f6clw3cl8djlarn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -30890,12 +31268,12 @@
gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gruvbox-theme";
- version = "20180210.756";
+ version = "20180313.1451";
src = fetchFromGitHub {
owner = "Greduan";
repo = "emacs-theme-gruvbox";
- rev = "156848895d16057c1dda2fdde5a7dde3053c9948";
- sha256 = "04szg56wxf0x7w8nvf98fmnry2s77kx7jg7j6gjkp16nr0asiqp8";
+ rev = "dd5e5ad109cf0b5db6c5d9ba279337a799e12b89";
+ sha256 = "17ga9qrjmvyjj7i77k6k0riy1jc3lvjvc3v631yvza4qi28492fv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -31624,12 +32002,12 @@
hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "hasky-stack";
- version = "20171231.942";
+ version = "20180311.24";
src = fetchFromGitHub {
owner = "hasky-mode";
repo = "hasky-stack";
- rev = "b981467f557498de46101ddfcbdfd025e7ec1f8c";
- sha256 = "17vvz8gawih8rksbcn3ndyjqhxaczmjzqm42b1y51j9lky5hmsw0";
+ rev = "d162ec82f4da80f72de0d28c84a4e7ef93197a8b";
+ sha256 = "1b87i8c4i5801vsx0wwii0mk4l7z9cp5a58bj2pa3d8yy8qnwriy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@@ -31812,12 +32190,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "20180226.417";
+ version = "20180315.2354";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "07f6dcfabb8904b758c87ea192d9eb44e5d56d35";
- sha256 = "1mzf7lidnz9y6744qh5v66kpmy1lqp7gh2i1ys3cjgfiqk8shy84";
+ rev = "4154fd45d8f990c063455ddf208b3b5ec93bd6be";
+ sha256 = "0wmvdiw4qp27zq92xd2p79v9xpjvriwcv2rhr5bc5grwamzqdwm3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -32022,12 +32400,12 @@
helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-bbdb";
- version = "20170505.2338";
+ version = "20180314.1527";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-bbdb";
- rev = "c0e6b83911598fe334c51b12f51ff1a8252ed11d";
- sha256 = "084m23w4088njk2c8z6yxi2851dakdq71jhpazlzms85i2dlwg21";
+ rev = "f4a0e9bb882febf126ec95af65913c6c23f8e826";
+ sha256 = "06a2930mhnwzgl97salqccnfr4p6nx5rj94xf4dc844kriqhzy1w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb";
@@ -32043,12 +32421,12 @@
helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
melpaBuild {
pname = "helm-bibtex";
- version = "20180222.630";
+ version = "20180316.447";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "9002522af7ea199a1453326746ffccbd934d290f";
- sha256 = "1h5czxjxlq16na9rxyg73zpkrvalqyyvdfr7qyknn1avibn2msz7";
+ rev = "bff3b2e7551aa6d9b2f41cc412c40f7cf3cebfe3";
+ sha256 = "0dmnj7qcwaljjagb087dx6y6w4ciqjzwcfp4ssb0c2lsv63l4nbj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -32274,12 +32652,12 @@
helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
melpaBuild {
pname = "helm-cider";
- version = "20180202.1818";
+ version = "20180306.2058";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "helm-cider";
- rev = "f498727b2a742560256942ea184dcb28c455fee2";
- sha256 = "1g7hy6fjym11yznzb8m5cn9bq5ys5iszf81hhwyia5n8qdvnlmm5";
+ rev = "9363cc537f06233345aa3af5cd46aa5681ad607b";
+ sha256 = "0vfn4smqba1vsshz48ggkj8gs94la0sxb1sq4shrb41qj2x3dci7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider";
@@ -32442,12 +32820,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "20180226.417";
+ version = "20180314.947";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "07f6dcfabb8904b758c87ea192d9eb44e5d56d35";
- sha256 = "1mzf7lidnz9y6744qh5v66kpmy1lqp7gh2i1ys3cjgfiqk8shy84";
+ rev = "4154fd45d8f990c063455ddf208b3b5ec93bd6be";
+ sha256 = "0wmvdiw4qp27zq92xd2p79v9xpjvriwcv2rhr5bc5grwamzqdwm3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -32799,12 +33177,12 @@
helm-exwm = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-exwm";
- version = "20180115.311";
+ version = "20180301.958";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-exwm";
- rev = "0b557cbf0f1c84b80a83ffafb17c5aadf753859b";
- sha256 = "0i2sbdxjv3nbnv2250gwghqk202s3z43s6dn1pa5sdsp7gkvwxjz";
+ rev = "9eec927d7fa092762b467d400d996b66c1f6d9c2";
+ sha256 = "131xb40y8n3laivzbx4pjynbv0c5v09ihvq4r9c3m1d7qmq6x3kh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ecdf9e00cf19fabbeade12a66d66cd010561366/recipes/helm-exwm";
@@ -33177,12 +33555,12 @@
helm-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-gitlab";
- version = "20160519.303";
+ version = "20180312.947";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "emacs-gitlab";
- rev = "67567a354a1888419331b79862f151817d9747c5";
- sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw";
+ rev = "68318aca3206d50701039c9aae39734ca29a49f9";
+ sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab";
@@ -33636,6 +34014,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-lib-babel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-lib-babel";
+ version = "20180225.1322";
+ src = fetchFromGitHub {
+ owner = "dfeich";
+ repo = "helm-lib-babel";
+ rev = "69bce58c1ef109dd33cc7f7696ad02a536f1b215";
+ sha256 = "0x39ds3hziabizaa3hrqfbz2a9by4s25dndp8ymxbl8jjvqgdi3a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d6718da5d8849a8c3ec17188b89a1273cf963047/recipes/helm-lib-babel";
+ sha256 = "0ddj6xrhz4n0npplkjmblqb43jnd6fmr4i4vv1cigrgb7zj6bjx4";
+ name = "helm-lib-babel";
+ };
+ packageRequires = [ cl-lib emacs helm ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-lib-babel";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-lobsters";
@@ -33975,12 +34374,12 @@
helm-pass = callPackage ({ auth-password-store, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }:
melpaBuild {
pname = "helm-pass";
- version = "20180208.1313";
+ version = "20180311.959";
src = fetchFromGitHub {
owner = "jabranham";
repo = "helm-pass";
- rev = "231c496eb2da4ecf26fcf8545de9a9819683a17f";
- sha256 = "1lv47cwb3j7lvx8qd4p5ripmvh3ixyd0x5bql143hja396wx12rr";
+ rev = "3171a90c33ea7baaf01da37ca048a538dcb58381";
+ sha256 = "01wcc5lxnym66qgnviwsdbnzdmp4c1hyw524ii2jphhm8vyvd1k1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass";
@@ -34101,12 +34500,12 @@
helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
melpaBuild {
pname = "helm-projectile";
- version = "20170926.1123";
+ version = "20180228.1125";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "helm-projectile";
- rev = "4466adbcada8be19ec97b9dba52e12b8da3da849";
- sha256 = "1a4s3vs2vh2dz31an7jjrbyli1dsqwl7qcd1r63ak87klzpqn98b";
+ rev = "20eb422df057533c6b2728f2a0871eec4f837d53";
+ sha256 = "0iba3w6kir9ymisbv7bjsb0vmmai4m24kh34693lsh4x7m8mjyz9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -34206,12 +34605,12 @@
helm-qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-qiita";
- version = "20170821.609";
+ version = "20180301.635";
src = fetchFromGitHub {
owner = "masutaka";
repo = "emacs-helm-qiita";
- rev = "f00a61fc802d0f6442f07e7bd1c55fedf60f3895";
- sha256 = "0z5xyb4kh3hwv8a869kgfx7hdzmja4ksvfkmc7v0xmxzjcg3nb7j";
+ rev = "3ccb85640bf54491ed3c3c8110d454ae181650dc";
+ sha256 = "03km0hm3jy6qcs8szqsmzpdmhfmyh121i5f68cf60am8y616f0kp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita";
@@ -34336,8 +34735,8 @@
src = fetchFromGitHub {
owner = "cosmicexplorer";
repo = "helm-rg";
- rev = "775ee76d8b6f45eab1330c714ddac1da20c87fe3";
- sha256 = "11f7m143qnmh2x4987a56ir3acxbp0n54msak3mp5nc1i1h8hq31";
+ rev = "cbce7b4f1afefa1e9a505b45c1b58c688a42f3b9";
+ sha256 = "1z8ijiqih902mzfc7kbnfbdhjwfqh5yzg4w3v4mxac0ys5j4z6sg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg";
@@ -34420,8 +34819,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "4f27c1cc60742622e6616b579c82b5440ad446d3";
- sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0";
+ rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+ sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -34689,12 +35088,12 @@
helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }:
melpaBuild {
pname = "helm-system-packages";
- version = "20180210.1307";
+ version = "20180309.833";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-system-packages";
- rev = "715a8ee0257d7d7138d4cd0cfdd61ee0ebb8ee08";
- sha256 = "0hc51ndn3jaxykflr5mkhwc7lajp5fsnzxpqwr17hqq4aa6g1sci";
+ rev = "497d53a81fe989c341a24c3e4a288f8777b0c6e0";
+ sha256 = "1gil4y4n0glj5kksyh7r81ih9hlywx9rwp91a74g93zml0yf7rrp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages";
@@ -34752,12 +35151,12 @@
helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-tramp";
- version = "20171224.702";
+ version = "20180311.2157";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-helm-tramp";
- rev = "94e05b0bf6f2604a2786ef6ff358363b9d4790ec";
- sha256 = "0b0d1ka9jx68dfkdw2l7sbawa85yzkzxigjwlwki1i5l7m3cr5pd";
+ rev = "34cc68bededd3ff6cbec8140f33c530fd3206a64";
+ sha256 = "1lway52ssh6zn6jw8157fp8d4brrkdln03vgll2r53bd69i2ipmn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -34962,12 +35361,12 @@
helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "helpful";
- version = "20180220.1512";
+ version = "20180316.1421";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "helpful";
- rev = "4abe04870467beb8a5a798773e1f145f65298e59";
- sha256 = "1la6im11wmid8k2smsaks1vgw42b4plpy65mr4z22c2bx4q1a24w";
+ rev = "b42bd5adcbf910bffec44022d1c99df7322d98f7";
+ sha256 = "1bmf2cw3jj5yq2ggzmh8dmsv2wq0arikn0hyfdbsxh8qzpkxc502";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -35190,6 +35589,27 @@
license = lib.licenses.free;
};
}) {};
+ hide-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "hide-mode-line";
+ version = "20180302.1110";
+ src = fetchFromGitHub {
+ owner = "hlissner";
+ repo = "emacs-hide-mode-line";
+ rev = "86b9057391edad75467261c2e579603567e608f9";
+ sha256 = "0qmjmwhmlm008r22n2mv7lir4v1lpfz1c3yvqlwjgv0glbyvqd88";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2af28365f9fbc6ae71043a67966490c5d18a6095/recipes/hide-mode-line";
+ sha256 = "0yl6aicpib5h1ckqi3gyilh2nwvp8gf1017n1w1755j01gw1p9hl";
+ name = "hide-mode-line";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/hide-mode-line";
+ license = lib.licenses.free;
+ };
+ }) {};
hideshow-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hideshow-org";
@@ -36513,12 +36933,12 @@
hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "hy-mode";
- version = "20180115.1230";
+ version = "20180308.2201";
src = fetchFromGitHub {
owner = "hylang";
repo = "hy-mode";
- rev = "5c1167c17372c7448fedbbabbca6abc0e7e50050";
- sha256 = "09pvgrbbq1z9s4bbr40iabcxpw1z08hqbr8i997hmfy7whmv8mwp";
+ rev = "ca874a29eace152027f982b9720e3962c57a06b1";
+ sha256 = "0s1z53v95dnygjp48gmny6a9wq4740rmsaa7p99hlvgqnksx0mzq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
@@ -36597,12 +37017,12 @@
hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hydra";
- version = "20180201.846";
+ version = "20180226.1116";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "hydra";
- rev = "cf961400796aea8b385b64ac0ad31c1e2500cf6a";
- sha256 = "03ffjrq4hidvxb6m4kk0xp8rmi53al16nab6lbid5brky67hvpmq";
+ rev = "62e0f374623df15c1eabebe78f4100850d708227";
+ sha256 = "1ydipk4fkc7dlfjr7isadgap9mfnmi1lj6n7ckrnzia22vyi9i7r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -36658,12 +37078,12 @@
ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ialign";
- version = "20180202.1447";
+ version = "20180303.1356";
src = fetchFromGitHub {
owner = "mkcms";
repo = "interactive-align";
- rev = "523df320197b587abd8c0ec4e9fbc763aeab1cf6";
- sha256 = "04jak5j4yywl7fn5sggc125yh6cy0livf55194mfxs2kmbs5wm0h";
+ rev = "7ad88c8f7922adc616b8f060b65fa1add8952ea1";
+ sha256 = "0bh03w91i622hbar5dcq631ndxx1y8kd3h655pgw1g0lqkv1mlnc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign";
@@ -36998,8 +37418,8 @@
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-completing-read-plus";
- rev = "cb9aa780addb9d9b24a7be777d9fc70807596fa4";
- sha256 = "0pqpjk7gmd28pmlih63c5z8j8h18ph780gba9yd71s2b2vkaw649";
+ rev = "2f4050ebd9591a3c2c73cbae1014c908226c43ec";
+ sha256 = "1jg3k8ivfjfqh5gw0zzwknvpa8hq21n9p2k913wvxyazv0b1gvqx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
@@ -37313,8 +37733,8 @@
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-completing-read-plus";
- rev = "cb9aa780addb9d9b24a7be777d9fc70807596fa4";
- sha256 = "0pqpjk7gmd28pmlih63c5z8j8h18ph780gba9yd71s2b2vkaw649";
+ rev = "2f4050ebd9591a3c2c73cbae1014c908226c43ec";
+ sha256 = "1jg3k8ivfjfqh5gw0zzwknvpa8hq21n9p2k913wvxyazv0b1gvqx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
@@ -37957,12 +38377,12 @@
indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild {
pname = "indium";
- version = "20180221.1434";
+ version = "20180307.1359";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "Indium";
- rev = "001ef02a2a3ac0803f0f89fb90ea92d7a6e23db2";
- sha256 = "08plikqy6k1drc1m08c9jsln8laq3mzh6056ib64pxip64fwpl62";
+ rev = "e9db390fa273b02d4e637ab94244358792caead9";
+ sha256 = "1cddcnmgdjdm9aqn5nr6g2p93rd4rb0xllyf7rimgf64xnqa96hm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -37999,12 +38419,12 @@
inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-clojure";
- version = "20180223.1717";
+ version = "20180316.1140";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "inf-clojure";
- rev = "f420c8a4d27c7c2dfea2ebee230d4d1b632a4e3f";
- sha256 = "06l1mqawpaypxmb8mx7l65nzms7amr2wjz2xyhhx2czg7wdhg7sk";
+ rev = "1295e58e9f7fb575149a7b9b2604547c7331b4d5";
+ sha256 = "1c0rjnhlrbl396a5gjm7pnpqmxrbymr63l2ff0v5l2wjwfjrjiny";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -38062,12 +38482,12 @@
inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-ruby";
- version = "20180121.2300";
+ version = "20180309.433";
src = fetchFromGitHub {
owner = "nonsequitur";
repo = "inf-ruby";
- rev = "d39ea0bd59e5f62eb92a051c1ab3d7a0f896ae0c";
- sha256 = "0jfcdmyvxk8vj097qiq2zsr2h6v7wmsxlm8yldpsan8wa0s4rkzx";
+ rev = "57710da5c8c146fef805deb7dc6a2cd8ccbc11d4";
+ sha256 = "0kwxa8mpn3drvn1rnfh4g1hvin8l2sa1gns01dshf1qqaa829jkb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -38502,12 +38922,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
- version = "20180221.149";
+ version = "20180313.605";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
- rev = "752e5ab174bdde87dcadccf478ca43fe328d8aeb";
- sha256 = "0darhg4iwzgfpi62f2l9p83fvl877dw1fml8y4sfn9vrwqnvy93f";
+ rev = "ebcf8a0935b57eb54351b78ed8c358cbef96f4bd";
+ sha256 = "11ycc0ig2asndma38jhrqsy0s22m8ws6s1mjxk7p7armxca0g0pi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -38817,12 +39237,12 @@
irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "irony";
- version = "20180104.1109";
+ version = "20180308.1256";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "irony-mode";
- rev = "82ba45ec15c9011bbdf1d69cf25c8193d33c0028";
- sha256 = "0iby446mpgjrs4kg0ji8435h3aamdvcxbmv1j3qg0i9p6abmi7f8";
+ rev = "847cf4e84f554fdcce49587747f0c18dae12b3ba";
+ sha256 = "004b9av02q9165rfr6b3c7qfbry72s9bdkfs3n40f4fp25dcwq0q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -38943,12 +39363,12 @@
isortify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "isortify";
- version = "20180206.450";
+ version = "20180312.2132";
src = fetchFromGitHub {
owner = "proofit404";
repo = "isortify";
- rev = "18c273ff401643fb903e90dff73c47a4b52268ef";
- sha256 = "18ziajgjij66g01fyrr1z95z4x2ynfvcyas92b2rvdc1dnsdhs10";
+ rev = "2e53c9ce3fa1ef80b08a8568cdae19a3669f3056";
+ sha256 = "1l2py65xr0m3w9lc6qp2jcc9477kjhkfnjdnkgfimz6aqlg1p9xg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify";
@@ -39111,12 +39531,12 @@
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
- version = "20180225.744";
+ version = "20180315.1446";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5";
- sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3";
+ rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774";
+ sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -39132,12 +39552,12 @@
ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
melpaBuild {
pname = "ivy-bibtex";
- version = "20180222.630";
+ version = "20180316.447";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "9002522af7ea199a1453326746ffccbd934d290f";
- sha256 = "1h5czxjxlq16na9rxyg73zpkrvalqyyvdfr7qyknn1avibn2msz7";
+ rev = "bff3b2e7551aa6d9b2f41cc412c40f7cf3cebfe3";
+ sha256 = "0dmnj7qcwaljjagb087dx6y6w4ciqjzwcfp4ssb0c2lsv63l4nbj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -39174,12 +39594,12 @@
ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-erlang-complete";
- version = "20180201.427";
+ version = "20180311.558";
src = fetchFromGitHub {
owner = "s-kostyaev";
repo = "ivy-erlang-complete";
- rev = "9783970f7dc39aaa8263d420d9d1ed6912c8e19d";
- sha256 = "1fanxpynp3cigll0x3vknxr8r6plvsbyn34qs28zjfi0l062a8jv";
+ rev = "62e2b14ff25b0c143c882cb38d029b216acc3dd6";
+ sha256 = "0sbxmj3ap0navgi7lxlgwb9ykfb8khgh7nl1hmqfh2jn9vx2s568";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -39216,12 +39636,12 @@
ivy-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, ivy, lib, melpaBuild, s }:
melpaBuild {
pname = "ivy-gitlab";
- version = "20160519.312";
+ version = "20180312.947";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "emacs-gitlab";
- rev = "67567a354a1888419331b79862f151817d9747c5";
- sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw";
+ rev = "68318aca3206d50701039c9aae39734ca29a49f9";
+ sha256 = "0arsjdn0anp7pacwxd3cw4db8a7pgzjlnwav1l3maaz1176h4lpb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab";
@@ -39262,8 +39682,8 @@
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5";
- sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3";
+ rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774";
+ sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -39297,6 +39717,27 @@
license = lib.licenses.free;
};
}) {};
+ ivy-mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, libmpdel, melpaBuild, mpdel }:
+ melpaBuild {
+ pname = "ivy-mpdel";
+ version = "20180304.50";
+ src = fetchFromGitHub {
+ owner = "mpdel";
+ repo = "ivy-mpdel";
+ rev = "d63c7ae492a3ce3288dc9f04cbc203d6a6f7c502";
+ sha256 = "04bryyq67qi7zhkvvfymcjbz1w93xwmy8svp02293an9n67dirm2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel";
+ sha256 = "1v9xiy4bs7r24li6fwi5dfqav8dfr3dy0xhj3wnzvcgwxp5ji56r";
+ name = "ivy-mpdel";
+ };
+ packageRequires = [ emacs ivy libmpdel mpdel ];
+ meta = {
+ homepage = "https://melpa.org/#/ivy-mpdel";
+ license = lib.licenses.free;
+ };
+ }) {};
ivy-pages = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-pages";
@@ -39339,15 +39780,36 @@
license = lib.licenses.free;
};
}) {};
+ ivy-phpunit = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, phpunit }:
+ melpaBuild {
+ pname = "ivy-phpunit";
+ version = "20180219.115";
+ src = fetchFromGitHub {
+ owner = "12pt";
+ repo = "ivy-phpunit";
+ rev = "ffedb0138d36564e8e36a28fd9bc71ea8944681f";
+ sha256 = "0kf1k3jqg2r20x985h6brg92sg7y47c5vkfjky8xp11gqyqw47bi";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/93822c5588f81683e3d43f690785b80c207d331d/recipes/ivy-phpunit";
+ sha256 = "1spvcf41lvjdmiwp6058wrpp0hfg1cjld6b7zm28m2ys6mn35ycs";
+ name = "ivy-phpunit";
+ };
+ packageRequires = [ emacs ivy phpunit ];
+ meta = {
+ homepage = "https://melpa.org/#/ivy-phpunit";
+ license = lib.licenses.free;
+ };
+ }) {};
ivy-posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, posframe }:
melpaBuild {
pname = "ivy-posframe";
- version = "20180222.343";
+ version = "20180309.132";
src = fetchFromGitHub {
owner = "tumashu";
repo = "ivy-posframe";
- rev = "ddaf875d5f5a8629ba49731c199e0ca57effd3d8";
- sha256 = "0k7mc268lrkkv7ril7z4vnm5z1ha7hl4274av8m2vfsd1szryip2";
+ rev = "b9b9a45455692d06b89d4fbf40bba6852b9a109a";
+ sha256 = "1sc8mwk5ans3l0p465wl3blvchfmkhyg06x95b0dnkjldzkk2v6a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9e7c6f7ca439683abf11dcaa38672ac139c0da4f/recipes/ivy-posframe";
@@ -39384,12 +39846,12 @@
ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-rich";
- version = "20180225.1752";
+ version = "20180314.1909";
src = fetchFromGitHub {
owner = "yevgnen";
repo = "ivy-rich";
- rev = "7fc9859802e264afeadb464aa8945f508727e8fa";
- sha256 = "0lw2ywk47cbgdc37m41hm1rin3r79j5w1qrb45mixdw3l5b1vsv2";
+ rev = "69314197b6563b87d145eb13ea16efd5b20513a6";
+ sha256 = "1a09mf51nbjvz8i91vx09rricvnlpmnh1znwhrxi5iiwa1pd0dlh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich";
@@ -39409,8 +39871,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "4f27c1cc60742622e6616b579c82b5440ad446d3";
- sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0";
+ rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+ sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -39928,12 +40390,12 @@
jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jbeans-theme";
- version = "20171212.1053";
+ version = "20180309.825";
src = fetchFromGitHub {
owner = "synic";
repo = "jbeans-emacs";
- rev = "08dbcc9d8d33ed17cfe2de279f6979692c6fcaab";
- sha256 = "09w9rkp6vh3v632kbd38aizbl3njpwxpx3n1819sz452iqsx81c7";
+ rev = "3caa95998d8492a2ca6c17971de499ca15609871";
+ sha256 = "0k8bd5j09753czl55dcwijs4j1vxir4zwcwlgsxli4b4f8sl2z8r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme";
@@ -39974,8 +40436,8 @@
src = fetchFromGitHub {
owner = "jdee-emacs";
repo = "jdee";
- rev = "6244d4608fe1ec1a1cac7b4b45cf6d1edb06cb91";
- sha256 = "00bscgxv2gmxbmb88p8yhb5ckz73srm251h1vsdfz84cn7vsk1wz";
+ rev = "07afc434bb502d85fc8b882f62fc4d237d23f34e";
+ sha256 = "0pnf80l5v0sn24p64pb36lrajs9b7p4y9m984hm52k2ah8kjg2n5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -40138,12 +40600,12 @@
jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jetbrains";
- version = "20171107.847";
+ version = "20180228.2102";
src = fetchFromGitHub {
owner = "emacs-php";
repo = "jetbrains.el";
- rev = "8d0851793d0658cc39bca455dc14c89f78ab8335";
- sha256 = "1k3zb3c5h8bqa7yxl3by4vxlzabh3wl5sz6ynpi01pmqf75qxa4s";
+ rev = "56f71a17d455581c10d48f6dbb31d9e2126227bf";
+ sha256 = "0v948k7xjm66px20ad331pskc7svpcrcffh3hbkjsksd4k0pggds";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains";
@@ -40537,12 +40999,12 @@
js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js2-mode";
- version = "20171224.1833";
+ version = "20180305.1647";
src = fetchFromGitHub {
owner = "mooz";
repo = "js2-mode";
- rev = "40885b6b50e497d2af53161785b3c9cc3133e42d";
- sha256 = "1yr96bm3vd6na967nn13p462ggh16k0lczgjmwg2qafmpyypn1di";
+ rev = "4125b49a6982a3eb36674962160118250daf665e";
+ sha256 = "0783l752jxca5mb7y44fbx366zkrnninzy06yahidsmhzxpw5bhj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -40558,12 +41020,12 @@
js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
melpaBuild {
pname = "js2-refactor";
- version = "20180118.251";
+ version = "20180316.552";
src = fetchFromGitHub {
owner = "magnars";
repo = "js2-refactor.el";
- rev = "c005a0df51fd671213a45d8693a1d9cf5b21a06f";
- sha256 = "1jyrirfnrb38jcl24ad2v427arzw3ynxwsw29b58zm9c6rxr7k6h";
+ rev = "4bc2ff3b89c734ba7dfd9824d4ef5271ed09fb96";
+ sha256 = "103kvzkvwc6g3jdwz1hin61b070zhd8q32h7v1qzgbnn1zczlplf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -40747,12 +41209,12 @@
jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jsonnet-mode";
- version = "20171005.24";
+ version = "20180310.2256";
src = fetchFromGitHub {
owner = "mgyucht";
repo = "jsonnet-mode";
- rev = "efe768fdcff25d746674fbbf229b9e1a7efea4f1";
- sha256 = "1a52266y83z9i3sg7hhc8sw7rhjy5i9wdy2bv7s2fv00lnngaj29";
+ rev = "4eb52cff8ce6020f5a6309a1c0465b5cdd6c698e";
+ sha256 = "0l9q6g00yxz5j1hchd2vim33n39zshv7qmmga1zf8qcn20yxz7mm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode";
@@ -41226,12 +41688,12 @@
kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kaolin-themes";
- version = "20180223.1702";
+ version = "20180314.1046";
src = fetchFromGitHub {
owner = "ogdenwebb";
repo = "emacs-kaolin-themes";
- rev = "bf301134df90159a8657fe772365fd9c82de977b";
- sha256 = "0gm96xxa2zvmn442cjzqsqhjw6r8fsrxqacphwa19lvmm9csv3wj";
+ rev = "1576b4daca7c7504f7c91e63670d8026e9a3c927";
+ sha256 = "1ycwpj3ciwahjinwq7mnb8fhph954bv11yfxjdhhfv3yhbyd2rng";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@@ -41433,6 +41895,27 @@
license = lib.licenses.free;
};
}) {};
+ keycast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "keycast";
+ version = "20180226.542";
+ src = fetchFromGitHub {
+ owner = "tarsius";
+ repo = "keycast";
+ rev = "c64742ee21cdfb816d33ad0574249982e5fb10e2";
+ sha256 = "0pa87l92y2yvyghjvindvdaqy4dgzwxdg87ywzv043fl1s610c2z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaf62c586818f2493667ad6ec8877234a58da53/recipes/keycast";
+ sha256 = "19qq5y1zjp3029kfq0c59xl9xnxqmdn2pd04sblznchcr9jdy5id";
+ name = "keycast";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/keycast";
+ license = lib.licenses.free;
+ };
+ }) {};
keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "keychain-environment";
@@ -41734,8 +42217,8 @@
src = fetchFromGitHub {
owner = "kivy";
repo = "kivy";
- rev = "9f64f5e24240cbf7e2cd34315d08131fd31ec822";
- sha256 = "0liyqkwv94wz623ihz5kyzfagdi08qp3q0q2hcvavjyk3j8ih6ll";
+ rev = "002e46f7db78c02cd1c12114bd9c15815cd97d83";
+ sha256 = "0h6vs7nbdi7pnh1399r2brizcnyyp7r5wlwsqss5wvm6vscyyqdm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -42066,12 +42549,12 @@
kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "kurecolor";
- version = "20170808.602";
+ version = "20180313.1719";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "kurecolor";
- rev = "3e8b63e89e294179e42a14a4a357c29a72669a22";
- sha256 = "0pj8252x5s61bwsfrhi5qvwk8jia3kc67r82v5m4a900zpmx3a7k";
+ rev = "28521a8738943d7e3ceafbf4a54ac676b3ba5f3c";
+ sha256 = "0nwflkrys84ik7abnr9pswk9qks4gyjd8ashbisqd82r2iljcqni";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor";
@@ -42881,6 +43364,27 @@
license = lib.licenses.free;
};
}) {};
+ libmpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "libmpdel";
+ version = "20180316.122";
+ src = fetchFromGitHub {
+ owner = "mpdel";
+ repo = "libmpdel";
+ rev = "60239978403a802c09d52f4638d9533dac275f25";
+ sha256 = "07y2mqz443n6wim1dq6wv22axkq4vv7y58ncm6cahl7jivkvkk4c";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel";
+ sha256 = "0qi9g3czwzi9hhp7gjczpzjx9vgzz52xi91332l0sxcxmwbawjp1";
+ name = "libmpdel";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/libmpdel";
+ license = lib.licenses.free;
+ };
+ }) {};
lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lice";
@@ -42930,8 +43434,8 @@
src = fetchFromGitHub {
owner = "janestreet";
repo = "line-up-words";
- rev = "b2cedc45295fd27f534f3b025d2ce72041850c2d";
- sha256 = "0f3601k1clflan8h7a2g4l8ag2f5i5f1gh37mg5hrny8b98n009z";
+ rev = "91f5f7e38fa87bda437091f6480acfb420be808c";
+ sha256 = "07vmv8m7aip8xfjcv9plcxz9q9q4wdqx6smmc57z77zlnf27k9x8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words";
@@ -43165,12 +43669,12 @@
lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "lispy";
- version = "20180215.1527";
+ version = "20180315.1216";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "lispy";
- rev = "ae975815db5da512ea86c8547e5907cf04af54bc";
- sha256 = "02s5242yc0c93g9wdry75pg3wrf53da9a3hdvm57zg7b1sjw6p4s";
+ rev = "0fdc50b703bb4ee41ba76df169382d1bec93668c";
+ sha256 = "127frm285hblpcp1cbjfvfzbszf9b0ik72hhlvnzw7arqns611r4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -43207,12 +43711,12 @@
lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }:
melpaBuild {
pname = "lispyville";
- version = "20180218.1555";
+ version = "20180228.1154";
src = fetchFromGitHub {
owner = "noctuid";
repo = "lispyville";
- rev = "d99f08d5971613bcecdd2768241b9c6d617a24c7";
- sha256 = "12kjh2b9jdwrf6naq6qvskbhlv8xkjsqr1igbldg9mi8qmas60b9";
+ rev = "b4291857ed6a49a67c4ea77522889ce51fb171ab";
+ sha256 = "095zibzc3naknahdrnb59g9rbljy8wz9rkc7rf8avb3wxlwvxhm3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville";
@@ -43480,12 +43984,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
- version = "20180129.2352";
+ version = "20180311.2027";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
- rev = "22406984b66201441c7ad5689ab010bdfadd768b";
- sha256 = "0ni1cvrabxiprb4gl5rd5hgwl5csy9q6b0yjd40ffvl1x5lmb0qw";
+ rev = "0c9f7a09a5c58d82bad706afd2e6e236e0cf42b8";
+ sha256 = "0ii724lvcfs9jnlpd6kgrxjwlfmg41chywcp8j85m49al8b6pipa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -44048,8 +44552,8 @@
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-haskell";
- rev = "cf3739e96b623fe8b95617561bb29476d7553462";
- sha256 = "0739kclc6g80r38yjwwsyx7arc0z4jlmp4x7gmf30ijdpn32qb4b";
+ rev = "aa421f9702056a89cd4e63c0dcf5543acb62840f";
+ sha256 = "1m0diap909jn9w54j9462zg972xhwxivcda59jmb6isgjpyi1yyb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell";
@@ -44125,22 +44629,22 @@
license = lib.licenses.free;
};
}) {};
- lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lsp-mode";
- version = "20180224.246";
+ version = "20180314.634";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-mode";
- rev = "14d5626f905d2929e4358cbea3e0106b9f3c0454";
- sha256 = "00py4qp1rivr54h033cjnipx7011cqac49v9x86zn2g2hfclhy7n";
+ rev = "6383fb9e414dc92eca41aed6e1b643accd4271d8";
+ sha256 = "0xfg3dwi06z45y1hiff42lgyv5diz69hrrlsssar47vlprscmdxr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9";
name = "lsp-mode";
};
- packageRequires = [ emacs flycheck ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/lsp-mode";
license = lib.licenses.free;
@@ -44212,12 +44716,12 @@
lsp-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, markdown-mode, melpaBuild, rust-mode }:
melpaBuild {
pname = "lsp-rust";
- version = "20180213.2304";
+ version = "20180305.508";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-rust";
- rev = "b4053425d57101f0c16ee3d4f7e3a3c483205f90";
- sha256 = "037y7ns1p6riyycf65gq6myn921zjc2ga3h804yjx1n11wvrw9al";
+ rev = "ecc889cc8735b280e0e6e84d2f4526b0048148b3";
+ sha256 = "0wmci5lij5721xpfsj3mnvr3z1j8b9s0w76dhzd0lnyaknvyv1rs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust";
@@ -44230,22 +44734,29 @@
license = lib.licenses.free;
};
}) {};
- lsp-ui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }:
+ lsp-ui = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }:
melpaBuild {
pname = "lsp-ui";
- version = "20180224.2300";
+ version = "20180314.556";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-ui";
- rev = "7d73049dc2cf703550decdea42e35920efe7339f";
- sha256 = "0cah4azsgks5qq8iv3g8dv0l18wkc4lca9xr7g79p2vl4z34sgps";
+ rev = "6ba9d3fe2d9c0f239ebd8a124e10bc038c76fdb3";
+ sha256 = "071bdnn1hs31bd479xs6dpyb98gf20q4z2k9sv0wfxmbjzm241s3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui";
sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j";
name = "lsp-ui";
};
- packageRequires = [ dash emacs flycheck lsp-mode markdown-mode ];
+ packageRequires = [
+ dash
+ dash-functional
+ emacs
+ flycheck
+ lsp-mode
+ markdown-mode
+ ];
meta = {
homepage = "https://melpa.org/#/lsp-ui";
license = lib.licenses.free;
@@ -44590,12 +45101,12 @@
magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }:
melpaBuild {
pname = "magit";
- version = "20180224.1651";
+ version = "20180315.1731";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "60a167ad12ce9e4dc9637254f39ae11ab2f22a81";
- sha256 = "1s6n2j56cvrdg130w2iy2wvynzsqgjqcrnra3f39llpgl4vw9spl";
+ rev = "242ea1d84b3ae2489caa68acd3070e24d08aa00a";
+ sha256 = "1vx3c0r4ci1f967whzjk6hdn11yh7k778s22fa8n522a1mj3gh7n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit";
@@ -44827,27 +45338,6 @@
license = lib.licenses.free;
};
}) {};
- magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
- melpaBuild {
- pname = "magit-rockstar";
- version = "20171215.1135";
- src = fetchFromGitHub {
- owner = "tarsius";
- repo = "magit-rockstar";
- rev = "c8320472e8a50c8299140ba0943bb1fe485d294a";
- sha256 = "1xjym51z0v7ibxw059f6k3zljli6z390rmxvrywbfzkb8hqms0l1";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar";
- sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n";
- name = "magit-rockstar";
- };
- packageRequires = [ dash magit ];
- meta = {
- homepage = "https://melpa.org/#/magit-rockstar";
- license = lib.licenses.free;
- };
- }) {};
magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-stgit";
@@ -44935,12 +45425,12 @@
magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }:
melpaBuild {
pname = "magithub";
- version = "20180225.529";
+ version = "20180307.446";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "magithub";
- rev = "8d8d136ae4c380f004354675519f4016c735d78c";
- sha256 = "1dnz8rz78wfvpjz652hs4jh90pkkgiak4vp9fzf2kx1j4c9skp97";
+ rev = "d3fc59ddf4f3a6179386e967ad9dfcd1facb6759";
+ sha256 = "1x7ql95qf8ldzf4p9zd79qmvqh1zin96xair9rhlab0zmvk3vzca";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
@@ -45082,12 +45572,12 @@
makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "makefile-executor";
- version = "20171017.438";
+ version = "20180315.632";
src = fetchFromGitHub {
owner = "thiderman";
repo = "makefile-executor.el";
- rev = "a950438c93dc2fdcb867ac25174c773deda95aff";
- sha256 = "1vpa24k8gm9zr8mpam76k1wbzc1zama5s5ch1f8c1h539l8i8cl9";
+ rev = "06b2efa4539c319ab36806b0bd8ea87e214aaa74";
+ sha256 = "08rjj3bdnvmaxiwnys4cjd19wkkk06wv0l58hpn3c7vi077ps3cc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor";
@@ -45275,8 +45765,8 @@
src = fetchFromGitHub {
owner = "mandoku";
repo = "mandoku";
- rev = "a07d1cd310f59b28125717620dff5cd3ff674ab1";
- sha256 = "1rpn1c66yi6rdn7f2dgdspbwgdyidvpdwshh52dydgwy4z08lpfs";
+ rev = "90b828f94872f6bdb9eb3c06bbc2a9c20e017f22";
+ sha256 = "0n5kd7fngxs3zc7scv34mfr7ppl5nkg8mnvgxwsnkghlv5a76wwp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -45664,12 +46154,12 @@
mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mastodon";
- version = "20170619.1050";
+ version = "20180305.1909";
src = fetchFromGitHub {
owner = "jdenen";
repo = "mastodon.el";
- rev = "e08bb5794762d22f90e85fd65cef7c143e6b9318";
- sha256 = "0bil0xxava04pd4acjqm3bfqm1kjdk4g0czd4zqvacsp5c9sl2qp";
+ rev = "ae8dabda04e377a6ac22cb854e4844f68073f533";
+ sha256 = "1avf2wkzd14dj27i9skm3mn3ipkr1zp93yrwxrk2q5kphj1qji2j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
@@ -46332,15 +46822,36 @@
license = lib.licenses.free;
};
}) {};
+ mgmtconfig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "mgmtconfig-mode";
+ version = "20180222.1257";
+ src = fetchFromGitHub {
+ owner = "purpleidea";
+ repo = "mgmt";
+ rev = "ddefb4e98778d4568a96754df52e3a6a494f2ad3";
+ sha256 = "17kzi4jyjbmqkkadaz0h46cjw3dxv5qcy27rpfrajhbny72x9j1h";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode";
+ sha256 = "0bdjaqfk68av4lfc4cpacrl2mxvimplfkbadi9l6wb65vlqz6sil";
+ name = "mgmtconfig-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/mgmtconfig-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mhc";
- version = "20180127.621";
+ version = "20180314.3";
src = fetchFromGitHub {
owner = "yoshinari-nomura";
repo = "mhc";
- rev = "5c5265be1a0099d48ada502aaa28c7f3f08f9078";
- sha256 = "0xaqbkdmn3hlalnzz69812a2cigpgh1199fl6hp20d4dq4hj4m6c";
+ rev = "f7bce7f5504093737071e2fc79ae6bc95dd37af5";
+ sha256 = "0sash77j2k1gpi35miyaf96g0zfx3d5hjqag8vcwc692lx1sf06c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc";
@@ -46646,6 +47157,27 @@
license = lib.licenses.free;
};
}) {};
+ minions = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "minions";
+ version = "20180306.5";
+ src = fetchFromGitHub {
+ owner = "tarsius";
+ repo = "minions";
+ rev = "360e433fb8a0c62a3661434241ba29d2ba7bf95c";
+ sha256 = "1az01ragbqwqipp1mah963l8vvyhcm003fa6rw24mfg6wv9pq58c";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/769a2167d7f6dfdbbfda058ddea036f80b97d230/recipes/minions";
+ sha256 = "0ximlj93yp6646bh99r2vnayk15ky26sibrmrqqysfw1pzs4a940";
+ name = "minions";
+ };
+ packageRequires = [ dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/minions";
+ license = lib.licenses.free;
+ };
+ }) {};
minitest = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "minitest";
@@ -46754,12 +47286,12 @@
mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mixed-pitch";
- version = "20180121.1039";
+ version = "20180314.1441";
src = fetchFromGitHub {
owner = "jabranham";
repo = "mixed-pitch";
- rev = "5915172c86a1d249854fed32c0e472501d1df1e6";
- sha256 = "1mm5nkc167bli01lbng1iiswh5mgz0a48k11aipki213inhm29jc";
+ rev = "b76567bd0c55f72942e686b7de97a222d333b333";
+ sha256 = "186s9ligb1b3hh54pdhfkvpzva5dkj87ydslyi3jjf7yrhvxgw9k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/20e85b11dc864500d44b25e36c5e7c4c67c1ebe2/recipes/mixed-pitch";
@@ -46834,22 +47366,22 @@
license = lib.licenses.free;
};
}) {};
- mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ mmm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mmm-mode";
- version = "20171212.1428";
+ version = "20180314.729";
src = fetchFromGitHub {
owner = "purcell";
repo = "mmm-mode";
- rev = "3fb2964c1923fa4ae71741afbd87c76dc16af93a";
- sha256 = "1al8n18h3pnjsaffwbfbxv68zwh7svnkrjjrvzdav1ja5qs39wa4";
+ rev = "cb905bdc728fb3b5f9fdff8836d71b62bd717eab";
+ sha256 = "1vyvp20g2dppnywa2clpvsvn5yac4pczj4f316dx63xp4zh7193l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode";
sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw";
name = "mmm-mode";
};
- packageRequires = [];
+ packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/mmm-mode";
license = lib.licenses.free;
@@ -47131,12 +47663,12 @@
moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "moe-theme";
- version = "20170914.2111";
+ version = "20180314.2108";
src = fetchFromGitHub {
owner = "kuanyui";
repo = "moe-theme.el";
- rev = "b8f0206614ab40ffb75e50ce6c38675fb9c7cf2e";
- sha256 = "0pn3a1rrj7ycxh91x3q008b6rmq7rbl8ir6diqzqfp6y465pn2w2";
+ rev = "c3ec67b02d55b5072ef4d32ff412019e5940d988";
+ sha256 = "1kjyv8mypcpqhhrmbnzjfrf4i40zws9sysaar8f7i08cr79idjj1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme";
@@ -47298,12 +47830,12 @@
monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monokai-theme";
- version = "20180201.553";
+ version = "20180314.501";
src = fetchFromGitHub {
owner = "oneKelvinSmith";
repo = "monokai-emacs";
- rev = "031849ab863a29e7576535af92b11d535e762440";
- sha256 = "1xl6b71r0j90n9r96f6hfvd9fzwzwy7rmn44c1p2r76inyxvlyil";
+ rev = "da23ef64d4848636e47a026259526575381bd164";
+ sha256 = "08py8dmwlqhc16fjcjf24dmpfbv2xpq8b0l43cx8f44f6791r2qf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -47344,8 +47876,8 @@
src = fetchFromGitHub {
owner = "sanel";
repo = "monroe";
- rev = "666431c047479e414b47ca1f83fe0a2ecc02144a";
- sha256 = "0k7d2k3m9rf77a1812clqvmsva27c7wpvkgdhkgvi7kpglj1dz2n";
+ rev = "609dfd82897c14324a99206ebf450377e5c6257e";
+ sha256 = "07qyxc7mjly0j2x7aqbpnn7nd5fp2pck02ks25m62gn4a1sq4v3z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe";
@@ -47358,6 +47890,27 @@
license = lib.licenses.free;
};
}) {};
+ moody = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "moody";
+ version = "20180316.340";
+ src = fetchFromGitHub {
+ owner = "tarsius";
+ repo = "moody";
+ rev = "890218c6c175f6f3efbf584dd27b8702a16b8272";
+ sha256 = "05q8l32mwz6sb40lflh6vwhnqj41sfmw7dp7lw3qlhg2skwjvc29";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/63521fe6a1e540544a07231cc94144439e8caea7/recipes/moody";
+ sha256 = "095241sjw330fb5lk48aa4zx8xbzk8s4ml22n6a8bzr99nkhn5jy";
+ name = "moody";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/moody";
+ license = lib.licenses.free;
+ };
+ }) {};
moonscript = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "moonscript";
@@ -47617,8 +48170,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "mozc";
- rev = "6b878e31fb6ac4347dc9dfd8ccc1080fe718479f";
- sha256 = "03gcda62xl6hfibw3y15lf6b04998kj1v95gyzs3q0bqxav74ahw";
+ rev = "afb03ddfe72dde4cf2409863a3bfea160f7a66d8";
+ sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc";
@@ -47715,6 +48268,48 @@
license = lib.licenses.free;
};
}) {};
+ mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, libmpdel, melpaBuild }:
+ melpaBuild {
+ pname = "mpdel";
+ version = "20180316.115";
+ src = fetchFromGitHub {
+ owner = "mpdel";
+ repo = "mpdel";
+ rev = "78bcaadd5471740a6c61a7e338086bf7a6ebfe54";
+ sha256 = "1zgv6z3mp6bjw8akqhx6add00w9qclqf94mmqmfhbg3mqaky6zgh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel";
+ sha256 = "1py6zk16yl7pyql2qxzd770clzszw7c769hw70n963kns1qmpif8";
+ name = "mpdel";
+ };
+ packageRequires = [ emacs libmpdel ];
+ meta = {
+ homepage = "https://melpa.org/#/mpdel";
+ license = lib.licenses.free;
+ };
+ }) {};
+ mpmc-queue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }:
+ melpaBuild {
+ pname = "mpmc-queue";
+ version = "20180303.1229";
+ src = fetchFromGitHub {
+ owner = "smizoe";
+ repo = "mpmc-queue";
+ rev = "df07d6bef7468edb1d73ef73b8331b94d0e5d0ca";
+ sha256 = "17817l3afghg9z8jxkj61yg85plmr74ki3wf4hz685llx8fr69w0";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30511f1e5eaf45b5f43fbacdd6c7254cb39b1d2c/recipes/mpmc-queue";
+ sha256 = "08jcmhfl87nsg6zgv582yfs152bqihbcssh085gxxqn2x99li354";
+ name = "mpmc-queue";
+ };
+ packageRequires = [ emacs queue ];
+ meta = {
+ homepage = "https://melpa.org/#/mpmc-queue";
+ license = lib.licenses.free;
+ };
+ }) {};
mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }:
melpaBuild {
pname = "mpv";
@@ -47802,12 +48397,12 @@
mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "mu4e-alert";
- version = "20180211.2319";
+ version = "20180304.2246";
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "mu4e-alert";
- rev = "997ef1bfc7dc09d87f50ece80f0345782065eb92";
- sha256 = "0pc95w6idvrmdpiq6gmcmi31rmh0d94rfhwjafsxqqimmsm9fk0z";
+ rev = "96a293b28646f4620e257f24748becc4a06843cd";
+ sha256 = "01rgsd958shph01ialk0lp3snxqydvjkiik170jshfls1jric1di";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert";
@@ -48242,12 +48837,12 @@
mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mwim";
- version = "20180214.837";
+ version = "20180227.852";
src = fetchFromGitHub {
owner = "alezost";
repo = "mwim.el";
- rev = "508efa3a616d4b371039053b1fa80b057422196c";
- sha256 = "067m1r19fc4zhgwc7gwb6khbh3sz74li2fcxfj42d9sx1dqhy218";
+ rev = "462207227b98a6a4356d51419f5ad5ba9356e5cf";
+ sha256 = "06lw6064i82daasgm87gm58d142pypqc1q3cnx1cm35hyj4skd32";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim";
@@ -48834,7 +49429,7 @@
owner = "yyr";
repo = "ncl-mode";
rev = "602292712a9e6b7e7c25155978999e77d06b7338";
- sha256 = "0sv44hn2ylick7ywpcbij8h2vxdj06zridjdmcfgpv5d090dbl9n";
+ sha256 = "0a1pwhnllyb1q45gjfhply0q2p4bk208a19z9gaf635d7ck9qhny";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2eea3936b8a3a7546450d1d7399e0f86d855fefd/recipes/ncl-mode";
@@ -48897,7 +49492,7 @@
owner = "rsdn";
repo = "nemerle";
rev = "59b28607968a9bee060b42eac55c69c37d1c0e69";
- sha256 = "1anbzlm7ccgd9ss6fqfq1gyvnpnjsxi9y9q3fk6c6cwd11dyq16g";
+ sha256 = "1qba0zg37irnk35pgiasyslp9l0lfiysms1bw3znscay5s20lm8m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle";
@@ -49206,12 +49801,12 @@
nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nimbus-theme";
- version = "20180220.440";
+ version = "20180309.430";
src = fetchFromGitHub {
owner = "m-cat";
repo = "nimbus-theme";
- rev = "451a570d656e18e66d58182577685da0e43c87a3";
- sha256 = "02bvvrvbfg7cgbd83y7544ra5a0hfrk8kh938hwygq991krc2zhp";
+ rev = "0527060cc8b27dc26496a3a9b20ee6a8526e9efe";
+ sha256 = "0iyj61870g84m6pr0vib3dj5dcrhrnwdiad6xzp8j2anf0gc23ii";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -49602,6 +50197,27 @@
license = lib.licenses.free;
};
}) {};
+ nofrils-acme-theme = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "nofrils-acme-theme";
+ version = "20180227.1353";
+ src = fetchFromGitLab {
+ owner = "esessoms";
+ repo = "nofrils-theme";
+ rev = "0bb6f199ace1488613884075fe588f02000bb0ab";
+ sha256 = "1aslhxk5mp6khf66ac4c441vywhiqpb4kyajagb8b1p10z8hrqva";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c59ddaa5e41d3c25c446b1ed1905d7f88b448e0a/recipes/nofrils-acme-theme";
+ sha256 = "01xqsn8whczv34lfa9vbm5rpvrvsrlpav8pzng10jvax1a9wdp3a";
+ name = "nofrils-acme-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/nofrils-acme-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nord-theme";
@@ -51139,12 +51755,12 @@
olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "olivetti";
- version = "20180205.2323";
+ version = "20180308.638";
src = fetchFromGitHub {
owner = "rnkn";
repo = "olivetti";
- rev = "6893bef23e576fd776ca69517dbf0981a8dc4b2a";
- sha256 = "0jxqnc7cwrrl9kw0fng515kl9hblkqkd5yf2gqq7di09q3rccq65";
+ rev = "b1759abbb2be27107c0c09beae10ca5e4c556b56";
+ sha256 = "0zdxvd3xh5p9j8si2kfmavzdjwpz9352nr6i0c550m10lrnixnv4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@@ -51290,8 +51906,8 @@
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
- rev = "7a6fe00e841106b17e7554f8a21f8457d12c5197";
- sha256 = "1vrgj2irm87pykfjyx27a46g5xam7rxwjdfqh4jl6p8cgzgprrrg";
+ rev = "c00a3a9157432c578fffb79169232e4a81d4ad31";
+ sha256 = "0ghwqf1wbiywzdx0qlgs4y94z4ivlgac8rpg1bimlb8xfx62sia0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -51778,12 +52394,12 @@
org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-board";
- version = "20170507.858";
+ version = "20180226.1136";
src = fetchFromGitHub {
owner = "scallywag";
repo = "org-board";
- rev = "2978aee8981a2ff5c09104b2d8b055957b277078";
- sha256 = "1vbpwzzrl5vq0vwkwn0cr1w9wkfbjd9rmxbpsddm0sbx7k4m3am9";
+ rev = "eef4cd47ea221dcdc352b5af578007bcde5f3e6a";
+ sha256 = "1sj5n2gynwc14kl6cjmdg8mvs0nc187nfj4czd3rbz4yqq818l3b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -51922,6 +52538,27 @@
license = lib.licenses.free;
};
}) {};
+ org-chef = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "org-chef";
+ version = "20180304.1104";
+ src = fetchFromGitHub {
+ owner = "Chobbes";
+ repo = "org-chef";
+ rev = "94427d5e48cadce45a906de16fff42676903fd9f";
+ sha256 = "10hwbfhjz2bwiralgsqwzhjgjzfil51gs8qhig8vkbxq9brhcgd4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/23b9e64887a290fca7c7ab2718f627f8d728575f/recipes/org-chef";
+ sha256 = "1xzbdrv5z31lxnzzgbp50l10lzlvx6j7kc7ssg76fma49wfpnra5";
+ name = "org-chef";
+ };
+ packageRequires = [ emacs org ];
+ meta = {
+ homepage = "https://melpa.org/#/org-chef";
+ license = lib.licenses.free;
+ };
+ }) {};
org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-cliplink";
@@ -51967,12 +52604,12 @@
org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "org-clock-csv";
- version = "20180128.2130";
+ version = "20180313.1957";
src = fetchFromGitHub {
owner = "atheriel";
repo = "org-clock-csv";
- rev = "e3b1c4236f6b74105b291ec68c0909226621b4ac";
- sha256 = "1ykam54wz53n0gx0raywhd92diggyxw8669w988sw6jghhg65ivs";
+ rev = "4a6e9e4895799afa0b994f4a908c1e3c2043451f";
+ sha256 = "1f7xvarimv82xwiw5cavnak7av0yi4afn94nhhp60pyfh8azls50";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv";
@@ -52135,12 +52772,12 @@
org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-download";
- version = "20171116.1045";
+ version = "20180315.1220";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "org-download";
- rev = "d0e6793497d57a90543d711310ad26fae7c9bcba";
- sha256 = "0b9a09gx9idsaw2jx5z6zd8k8la0ly3132gkz7krzkvf3nc4yfz9";
+ rev = "3f568b163a8a26f22a9b2d9a90b85fcea89c67f2";
+ sha256 = "1whp3cpdyxrip5id9ddajy0k04b81hrq12j9w5ir8244m1k5kkf4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
@@ -52321,6 +52958,27 @@
license = lib.licenses.free;
};
}) {};
+ org-fancy-priorities = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-fancy-priorities";
+ version = "20180221.1545";
+ src = fetchFromGitHub {
+ owner = "harrybournis";
+ repo = "org-fancy-priorities";
+ rev = "0998b27c02e81bc554e76fde3b7cac4aced2210e";
+ sha256 = "0nlazpgfrv67vbb5w2pcwhsxf296f62xgw1zajrkp16gvj63hry6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/712902ae1cf967ceb2052266ed3244e92998f8a7/recipes/org-fancy-priorities";
+ sha256 = "13rljgi5fbzlc16cxqj49yg47a5qpyxzj0lswhdyhgzncp1fyq7p";
+ name = "org-fancy-priorities";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/org-fancy-priorities";
+ license = lib.licenses.free;
+ };
+ }) {};
org-fstree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-fstree";
@@ -52488,6 +53146,27 @@
license = lib.licenses.free;
};
}) {};
+ org-kanban = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-kanban";
+ version = "20180313.1339";
+ src = fetchFromGitHub {
+ owner = "gizmomogwai";
+ repo = "org-kanban";
+ rev = "c240a1894b7ae4ed292657b4d3cf03db8274f451";
+ sha256 = "12l9yb5dzhv9fgcl8nba5dh403bafx1klq2sw0n1v7zv82dic57i";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban";
+ sha256 = "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41";
+ name = "org-kanban";
+ };
+ packageRequires = [ dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/org-kanban";
+ license = lib.licenses.free;
+ };
+ }) {};
org-link-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-link-minor-mode";
@@ -52554,12 +53233,12 @@
org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mime";
- version = "20180220.1906";
+ version = "20180309.2241";
src = fetchFromGitHub {
owner = "org-mime";
repo = "org-mime";
- rev = "0752659f7a19cead182584fabc9544464f69b83e";
- sha256 = "06lay5w03ah3w156spgh4bv2ma4x42pyhr3glfxw7vplfr5klvfz";
+ rev = "e35c367e7dc1449e63916e424d4e7349c91f8c1d";
+ sha256 = "0yyxji50cvpbrmwwqmsv48556yzd7537zzlbpng6fgsq93iq62v5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -52621,8 +53300,8 @@
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-mru-clock";
- rev = "0894a5dad148524f6e31cd089eda2879fc85fbe4";
- sha256 = "0ya3f86kryaminjja1868wh6db5hsnczhqldq3hgh7bvlnnsvp6s";
+ rev = "18301b6ffe1149e373dc07d5047b67b9e1faec64";
+ sha256 = "13x25fk2wnddzgx11rmkrhpvaava0knaqhlhk36c6pyldbhbhbxy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -52680,12 +53359,12 @@
org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-noter";
- version = "20180225.1352";
+ version = "20180307.1029";
src = fetchFromGitHub {
owner = "weirdNox";
repo = "org-noter";
- rev = "6ef0f4d1ee13a91da837a940f7c6633e4f5d8d65";
- sha256 = "06c35lmy2852n1ss7ry2x1m05s7indb3x5zy6lii64bmqcqr1w7v";
+ rev = "abeb48573a62b62c57f63fc89fff31c4d47141e9";
+ sha256 = "17pdx7kc3zk5yx4i10lv421zqv6a9xn37gzyd1h4vljjgs81j4yz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter";
@@ -52814,11 +53493,11 @@
org-password-manager = callPackage ({ dash, fetchgit, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "org-password-manager";
- version = "20170701.919";
+ version = "20180227.1010";
src = fetchgit {
url = "https://git.leafac.com/org-password-manager";
- rev = "3e7058586b2ab96b12e9b1195b1db1e66e704f20";
- sha256 = "0ac0nd84y8lckapyckbdvc1wdflwz5nxm7isxcc8cp92pgqy49r2";
+ rev = "4b30a36e71182553a02e4dd415369290d98ec03a";
+ sha256 = "1a6i3g032c5xzsnaf7rprn22kk68y1ay3w21p3q52p3lvlzhnfis";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager";
@@ -52876,12 +53555,12 @@
org-present = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-present";
- version = "20141109.1756";
+ version = "20180303.1530";
src = fetchFromGitHub {
owner = "rlister";
repo = "org-present";
- rev = "1b519cfd5abf44bed307cac576dc9fd61eb2c35f";
- sha256 = "1n9magg7r7xnw16d43fh6nzjf42s70l3mxq6ph727zi4lz5ngmfm";
+ rev = "d13acd70eff6a1608bc991920232146a0de76b21";
+ sha256 = "0jz8xiny3rv9ql0p623byz32pip1b82j2c2nyfz2wd114kiabb6q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aba18f15fbaab115456e6afc9433074558a379f5/recipes/org-present";
@@ -52981,12 +53660,12 @@
org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-random-todo";
- version = "20171219.58";
+ version = "20180312.104";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-random-todo";
- rev = "24500edf303a854f09a88b07e1a16a21e164eb87";
- sha256 = "0c2d5dbr10p1hz51ybygmwv25si6sfwy21kc9xmbjyrrlw5l5sqv";
+ rev = "8357350a66bbc4e0e5cb590acc104d39870cf736";
+ sha256 = "1cl1abgflbnnmvakb1z69rpr2gsm3hyg20iggwl6pn2fl0pf5wf5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
@@ -53092,12 +53771,12 @@
org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
melpaBuild {
pname = "org-ref";
- version = "20180224.1445";
+ version = "20180310.1908";
src = fetchFromGitHub {
owner = "jkitchin";
repo = "org-ref";
- rev = "8e469035a73e3658d818d1665bcfdfb108d7ae41";
- sha256 = "1ff901w7qrlgqzxn0cfnw3a6nqs3nip6vja11ikj9lykrh1pkf44";
+ rev = "b4bbc9774c741c299a3a232036342f89905910c8";
+ sha256 = "1ddksbznxq7cpksiqm4cx2k2c442vrm8dsb1ii6xqvnm32wsx4bf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -53166,12 +53845,12 @@
org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-rich-yank";
- version = "20180218.156";
+ version = "20180301.401";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-rich-yank";
- rev = "ffa90b29604e27a60ad341c06d0e43769af19715";
- sha256 = "1z9137nirbaydqpw5b7ii3qnpn09v1kiqnyxsxkgc0q3arb1m1f6";
+ rev = "5d9bc7f474187013a8e1cdc5fc3dc86c41385873";
+ sha256 = "144cyi5k0fjnzdrp9hvhnlxshxhf6jhagiinzaw5aklswz0qs1w5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank";
@@ -53229,12 +53908,12 @@
org-send-ebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "org-send-ebook";
- version = "20180117.1824";
+ version = "20180314.14";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "org-send-ebook";
- rev = "3e8030a16e420fe4a6fc73b6f166af73880c4843";
- sha256 = "19v9vjbpvib9jcv4z0jflqym2z101a2xaf2mcjcf692nlrz8y2wk";
+ rev = "c41b6a69a16e73dd64ff1c7353d402e03a2003e2";
+ sha256 = "0j962vyvgavs9h6grayy4c6frba3ksv5n8rklgicwj4zx53b0blf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/646106cf43649544056285aef8c4035b6e5bbbdb/recipes/org-send-ebook";
@@ -53544,12 +54223,12 @@
org-trello = callPackage ({ dash, dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
melpaBuild {
pname = "org-trello";
- version = "20170225.1247";
+ version = "20180310.2352";
src = fetchFromGitHub {
owner = "org-trello";
repo = "org-trello";
- rev = "d7885038d7e160a64f561f8abc942206d582faa6";
- sha256 = "091hznr9pznm26p5vm0kav69qkji6hihf6bil0a314d8k0kaj5bc";
+ rev = "c38c36159cdeb2348c4e9ca75246aa9cc1dfd76c";
+ sha256 = "02gx3kv4mkij69ln8x8wf9n28x17pbb4kv85v78d3lxph7ykqimc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello";
@@ -54390,6 +55069,27 @@
license = lib.licenses.free;
};
}) {};
+ overcast-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "overcast-theme";
+ version = "20180315.1243";
+ src = fetchFromGitHub {
+ owner = "myTerminal";
+ repo = "overcast-theme";
+ rev = "009257956522dedf07d9e136ee41ac0b1b0b3518";
+ sha256 = "1g3s44n839s7fw3spkph31m0a5walilj151v0jyp302mjfn396nh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d86691c61fc880954a05502a6474cc2fa0d0a43b/recipes/overcast-theme";
+ sha256 = "1v8hdnvc4pfmadkvdm6b8z0cy20pminvhjdlr13q5m9immr88a4r";
+ name = "overcast-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/overcast-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
overseer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "overseer";
@@ -54477,12 +55177,12 @@
ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-clip";
- version = "20170805.505";
+ version = "20180305.1940";
src = fetchFromGitHub {
owner = "jkitchin";
repo = "ox-clip";
- rev = "b596760aec2ab4e10b18807c01839047aa209d6e";
- sha256 = "0bd5vbbz0p0dg5v7s54a88ba7aca53xwr8niirshfkm916lc8mpy";
+ rev = "594c90953a91948505bb394350adf110e041f19a";
+ sha256 = "1alm6hh7qg8sv50cm5p03icx47za2g7b2nvbwzx6kxkrgmgqfq6c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6d9ae1e58a1f214a9b88627a2d3254ce7de50740/recipes/ox-clip";
@@ -54561,12 +55261,12 @@
ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-hugo";
- version = "20180222.1537";
+ version = "20180314.2012";
src = fetchFromGitHub {
owner = "kaushalmodi";
repo = "ox-hugo";
- rev = "d53acbb3f8557583a1a03e92ec7626ccc63f5264";
- sha256 = "0p0a0qfsfg548bymvy57frj9yg5bzbp9r70l31p86q2x3dyjgiyi";
+ rev = "8c792bd2c4899fae6753689198599c8c730fc116";
+ sha256 = "1d6ni4i36srnh4b8f2v1279z67k1rd877ha8rw6a44vjyanzxcvd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@@ -54792,12 +55492,12 @@
ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-rst";
- version = "20180222.533";
+ version = "20180314.1713";
src = fetchFromGitHub {
owner = "msnoigrs";
repo = "ox-rst";
- rev = "313640ac945ec63b7de37fe58d4e71098c2fa4d8";
- sha256 = "0frxwb5mi4gzv2qfqjvw10xl2vnxkra8p73hp6hx7dawbgxb56j4";
+ rev = "a74b60883b0d844c80efb364dac1560b85f2548f";
+ sha256 = "0smgz2q7bjj2svx1gdr187m58yxq1hs878bciz9h6jcp03a9sb61";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst";
@@ -55384,8 +56084,8 @@
src = fetchFromGitHub {
owner = "cadadr";
repo = "elisp";
- rev = "497c7e68df5e3b6b8c3ebaaf6edfce6b2d29b616";
- sha256 = "1j15dfg1mr21vyf7c9h3dij1pnikwvmxr3rs0vdrx8lz9x321amf";
+ rev = "3059378379a6fbd0363cd14fe6227c27739af4e1";
+ sha256 = "1hnph9x5981rfqc5p5imiah2cd7fr1f3bbs2x23z7lckaqa5v0g7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme";
@@ -55409,8 +56109,8 @@
sha256 = "1b2gm823qd6bllgp9qg2vgskzg4rpdvh8bgic8708hkq6lwpdv70";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/921ba9059183a57e08f9c79af2b28bb77a210508/recipes/paperless";
- sha256 = "02jbqdhbq4b3yb9lrqkwaxmyymvcqrjswhzp4sbccw6arla4q7wg";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/500be17952ffb6b8d1e524b5b3d316878202fabc/recipes/paperless";
+ sha256 = "182arnx2fz0dww6bvg6m70a1picqd3czmzwv92x0rb4ghwrnq2dq";
name = "paperless";
};
packageRequires = [ cl-lib emacs f s ];
@@ -55567,12 +56267,12 @@
parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "parinfer";
- version = "20180214.1040";
+ version = "20180226.2134";
src = fetchFromGitHub {
owner = "DogLooksGood";
repo = "parinfer-mode";
- rev = "05f554bb5633d48e1ffb053aa3cca462c52600cf";
- sha256 = "1dxvwc48z4z23pl317pkcrnlpwpyw1qyggzn89xcv7p3abyqqhpz";
+ rev = "5bfc915c4a91da740f3216798327b5676d227569";
+ sha256 = "0zz4l7k2blbxcg1ni3amfys58szw51fvrjk7dbjxp7vsgpp7x3ji";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -55648,6 +56348,27 @@
license = lib.licenses.free;
};
}) {};
+ parseclj = callPackage ({ a, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "parseclj";
+ version = "20180225.2233";
+ src = fetchFromGitHub {
+ owner = "clojure-emacs";
+ repo = "parseclj";
+ rev = "af6102c4a80693cc3b40c4eb5c340358ab4b9696";
+ sha256 = "1m1yvskgvm4np6r36c5gjg5whi1dyg6c1xd0nfqgc0cw9awwxp6b";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e2a977779a7ee49f57b849b14e581210a7f47d61/recipes/parseclj";
+ sha256 = "077qigx0qyjyvm3437ffnv05rmnpqxvpxf69yyfdgnay1xclv172";
+ name = "parseclj";
+ };
+ packageRequires = [ a emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/parseclj";
+ license = lib.licenses.free;
+ };
+ }) {};
pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pasp-mode";
@@ -57056,12 +57777,12 @@
php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-mode";
- version = "20180219.1806";
+ version = "20180309.822";
src = fetchFromGitHub {
owner = "ejmr";
repo = "php-mode";
- rev = "e9e1b5806c169a8c7a7881530dcd2e9a52ab5fe8";
- sha256 = "1d2isgf17sg7n7vg6dif88yn31yxxgargvllys8azl48x0y40hh9";
+ rev = "b67b34c43c6e937b70fcf87cc324936ef117093b";
+ sha256 = "0z3byyy5wd2h9ab8wnhyfj3xymwz3dxq37caxjfyspzsgaviwq4c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -57074,27 +57795,6 @@
license = lib.licenses.free;
};
}) {};
- php-plus--mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "php-plus--mode";
- version = "20171027.921";
- src = fetchFromGitHub {
- owner = "echosa";
- repo = "phpplus-mode";
- rev = "523e7e50f9978ba74b8a324f9f896cd9b5dfd9de";
- sha256 = "0xf79pxsrfr9bi3138hdq2ccrh391sci8lvmvzcs3vnzw0hrzbfh";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d542e94471b9f601f1ee6f31e727bc4a31fa8f9e/recipes/php+-mode";
- sha256 = "1wl15l4m68xng1b87a19fm21qwr230ckjz1iwi3y1xl184zliv8p";
- name = "php-plus--mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/php+-mode";
- license = lib.licenses.free;
- };
- }) {};
php-refactor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-refactor-mode";
@@ -57434,12 +58134,12 @@
pip-requirements = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pip-requirements";
- version = "20171109.1439";
+ version = "20180306.1522";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "pip-requirements.el";
- rev = "d6d0437794e5de205a5fb03e0ff0a4a1b9e04eea";
- sha256 = "01j33xlrh8zflzib7gngjhkgg8fvyx2yz57clxzbjkd4377f22c2";
+ rev = "88c764ad5d988a3ed0d2b6f0b7dd22308b03a058";
+ sha256 = "01gl4nzqpmczprsdg13yvcj8d1p49wdwskmkm8nzssrshir6xdxl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5eaf6987f92070ccc33d3e28c6bb2b96f72ba1aa/recipes/pip-requirements";
@@ -57770,12 +58470,12 @@
playerctl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "playerctl";
- version = "20170414.156";
+ version = "20180301.554";
src = fetchFromGitHub {
owner = "thomasluquet";
repo = "playerctl.el";
- rev = "8354352813cd206efb60002f2af4427957bf8894";
- sha256 = "1138jcn2yjfhg0abkiwzzrf69pc5nddppf2hj35mn8b0rr7zs4bq";
+ rev = "3eee541423c2e5eb9f23a26fa9aa88c9c5a19ad1";
+ sha256 = "16qvn1mss5j8vpf1qpq4lwl4hwng64caw3c3shixsncfmgw25z6f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6db0d82c2eef7c5bef5f9f2c15969da4c404b62d/recipes/playerctl";
@@ -57791,12 +58491,12 @@
playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "playground";
- version = "20180224.2325";
+ version = "20180309.1614";
src = fetchFromGitHub {
owner = "akirak";
repo = "emacs-playground";
- rev = "5b8d9eb5ea48313e2b33ed3a390d7a2e04d9dda8";
- sha256 = "1v83mkg4573iy6rjnvi5hshbgp98jhyj2c2swz7p4vfcdcak8j2n";
+ rev = "0781674b0d65b287d253f143c2bc51ee65ec5959";
+ sha256 = "0jb8qkj2hbnz4j5xzky1n9kq035xzqadssa3s9zwm43cyn6nn6f7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f062a74fe1746129879ad19c1735621f58509d33/recipes/playground";
@@ -57938,8 +58638,8 @@
version = "20170419.303";
src = fetchgit {
url = "https://git.savannah.gnu.org/git/gettext.git";
- rev = "7b967191976bf013cca0a5b21b1e3dbe34e86889";
- sha256 = "18ar8m5sj3drflcpl7z528x28nskhahjl5bwa8624csdzn0fhngy";
+ rev = "007245c860654e88d5228b341c9066e84f035903";
+ sha256 = "091p7m0vs96wywysqbagirpkyn1iw1g4b5afnpv9ng0x4fvilq62";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
@@ -58196,12 +58896,12 @@
pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pomidor";
- version = "20180224.946";
+ version = "20180312.828";
src = fetchFromGitHub {
owner = "TatriX";
repo = "pomidor";
- rev = "458ff63f640ba741959670fca0e439374d2d840a";
- sha256 = "0vg38cccjfkn2w7a7fxks26x4v27bhxkpz7nfnq1scw88z9hl1sh";
+ rev = "b15219a7a31adeebc80a060c42aed36d4b48d149";
+ sha256 = "0xfl08cfgnms404vmc64mdihp49z00cyqyihk7i4fp1ag8cbja1k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor";
@@ -58532,12 +59232,12 @@
posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "posframe";
- version = "20180225.2325";
+ version = "20180308.1627";
src = fetchFromGitHub {
owner = "tumashu";
repo = "posframe";
- rev = "489620f6bd1ca5a6363d4ab9176b6eeb753e7f3b";
- sha256 = "1p1khm0mcjq6acjh08z5gaw24hns6sg7p1iy8x6zf63c8kyfq2ls";
+ rev = "c29228eb2100503a0fda39252d4f11c1eb5acc56";
+ sha256 = "1k92gzzy6ys2f86jzggqlz3x6v665hwkafj3frj4mgmxp7yxsiw0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe";
@@ -58973,12 +59673,12 @@
prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "prodigy";
- version = "20180214.1249";
+ version = "20180312.325";
src = fetchFromGitHub {
owner = "rejeep";
repo = "prodigy.el";
- rev = "a90f917390cac8ae7e95b57e88a1527b7f3242b3";
- sha256 = "0b53xgja04vsw22yqxj5vnn4w2x23zcm3fsjwzfxlcgy4h50y3ay";
+ rev = "67b74d1354616f4761acd947fb4f89c6c8bd758e";
+ sha256 = "0pnkw65kr046368xd29rpfbf4x7qd9h430knpy8rgf4czqqvl3hw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy";
@@ -59182,12 +59882,12 @@
projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "projectile";
- version = "20180128.655";
+ version = "20180316.2010";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "projectile";
- rev = "c3562c3a182d3c9948db9c8f364e84da2e90c218";
- sha256 = "044fdvcjqkp25kn20lr77jirgdnzjrxp8i024zp3lz7wa4gywyhy";
+ rev = "981ef7de7cd4d2465e95ae649993561783d85bc8";
+ sha256 = "0za8a1p05xqss2n4y1pvmr686xzaqwqsnp8myc8d3xqpl5412ha3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -59308,12 +60008,12 @@
projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, ripgrep }:
melpaBuild {
pname = "projectile-ripgrep";
- version = "20170211.857";
+ version = "20180301.651";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "ripgrep.el";
- rev = "c47a2da4668ca338e7fadc3d8c095e075caaa17d";
- sha256 = "0x2rkm1yf03qfzylx6pk32cq7mmydila2iwiq40k5nl4wgfia5vx";
+ rev = "1f4338eeeb4bb3084a4b43762fa69a2c93ddff85";
+ sha256 = "0im6l8gn3msl5jks3qif0jmi358kj46a50p2lirpjh6rnilmnanq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep";
@@ -59627,8 +60327,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "a6037c5230c0ccb6531f80cef909dbfe37257884";
- sha256 = "1847pbxsh2xwfj7vm1hvf88prwni5k2jbswilply034f1648r9ar";
+ rev = "ab95b1bc1eb964ee5f1fb48297344c5d37d35191";
+ sha256 = "0abx3gs9x081wn2p3pc7v2s9rfyv0a1fmrzfwlrv2i4cx1axafig";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -59717,12 +60417,12 @@
psession = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "psession";
- version = "20180202.44";
+ version = "20180314.205";
src = fetchFromGitHub {
owner = "thierryvolpiatto";
repo = "psession";
- rev = "0d5091ae1090bad41d8e10a2f3f94a9e87711610";
- sha256 = "1h60j33nygivwa9hgn98ibyvxmxr02p338iq80z0nhqqkhzg24rp";
+ rev = "6f7c8d6807c76fd351380b2f6f273d800736c5ec";
+ sha256 = "1wc4fx5wqcqj2xzcch0wg5xr5vjdlqm04ljwz3cqv5ipdvqjz80z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession";
@@ -60241,12 +60941,12 @@
pydoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pydoc";
- version = "20170429.1158";
+ version = "20180302.2041";
src = fetchFromGitHub {
owner = "statmobile";
repo = "pydoc";
- rev = "916153516382e5546b59b46342c58ed76cf27faf";
- sha256 = "18ba5mcp030l6ywdq70ryvbwn7af28kp0xi8h1bma5mwcxj2sg2c";
+ rev = "146a006493f5284fdf23b42ef90454f1be25d0c1";
+ sha256 = "1wk9zkwqi7vf0jpsf5y7hz0z198x4k9xp2fpqggkqfbv007ks1qq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4988a66040ddf659492bdb0ae2b9617c342c69/recipes/pydoc";
@@ -60307,8 +61007,8 @@
src = fetchFromGitHub {
owner = "ssbb";
repo = "pyenv-mode-auto";
- rev = "51248f13e98240ab146ff45a8247e0f5286277b2";
- sha256 = "1y5fmc6jrw9xrafq1j2j0k1p5hydvbw1m3zy47b5c55ll97dsflj";
+ rev = "08f319efbc31571f391e032379169ab90fa71418";
+ sha256 = "089n0s0vhwysgrkpjidy7gsl6skmzz2lg011mgiskfvqwijj2vyx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f3fcb707356bd16fd0b573c176023534cd69d0d7/recipes/pyenv-mode-auto";
@@ -60450,12 +61150,12 @@
pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "pyimport";
- version = "20170808.346";
+ version = "20180308.952";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "pyimport";
- rev = "50789ef8c5e19997bd5b0d4c47acb7660d128e76";
- sha256 = "1g4kp6m9bqpvyp0wy1bjx8246mqvdy5jznl1ash1qn7gr07kb34s";
+ rev = "a6f63cf7ed93f0c0f7c207e6595813966f8852b9";
+ sha256 = "1q5gqhvh4zq5dy8vns694warcz48j1hdnxg16sjck4gsi9xivbvs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport";
@@ -60496,8 +61196,8 @@
src = fetchFromGitHub {
owner = "PyCQA";
repo = "pylint";
- rev = "04481735e10c8d4584447a6dba97df8653fc7ec5";
- sha256 = "1v100ccggdhprj7zgs8cs7qi86a6xs2pkzx0whi2hvb8nyyp9gx9";
+ rev = "03aa4ca2d6a78a4d9dc69438cbc76b982aca1569";
+ sha256 = "0a8jdksaabm8ybpk0fzp58v9zy4vld1h857nwxf0crk68r50dv6z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -60681,12 +61381,12 @@
python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }:
melpaBuild {
pname = "python-pytest";
- version = "20180226.305";
+ version = "20180307.844";
src = fetchFromGitHub {
owner = "wbolster";
repo = "emacs-python-pytest";
- rev = "0ed385f7e8edd1a7d0aee72f5112459ea9054cbe";
- sha256 = "1wpvgx8ldrnq0pjr8iq65f3m0kmh1c9hnv1lkrgrglqazs2c6hbm";
+ rev = "6772ecfaa86f0f4a1a66bfd3a454c9b11956de70";
+ sha256 = "086jjygzdrcjfp7j70xs8jh8nq0xv496kza6iap7lyc3qf16b4kk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest";
@@ -60793,12 +61493,12 @@
pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pyvenv";
- version = "20180223.22";
+ version = "20180304.712";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "pyvenv";
- rev = "71eec02c25006737444dec7dfd004285f6cff6a8";
- sha256 = "1j62qf4llrbmwwi7ynrhnzvh0g4razbc21vdlaa8jkjg6y5id95m";
+ rev = "f83c31a825138645dc55db49c5389cd8c7bf7b42";
+ sha256 = "0xq71zbwfl0ijmljcsq74nxmm2pj8m3rbdpwpcdk2j2i6zx2wgr6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
@@ -60898,12 +61598,12 @@
quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "quasi-monochrome-theme";
- version = "20171126.203";
+ version = "20180307.458";
src = fetchFromGitHub {
owner = "lbolla";
repo = "emacs-quasi-monochrome";
- rev = "aa6a3649ad518b9eebd7bc5c84f184469ea735a9";
- sha256 = "04ihrwnnfhwzg2l3sjsdk84rv36672hapq4016c10z0f106dcyrz";
+ rev = "7c1217521616f568a1c9aba76cc87a7381b833a4";
+ sha256 = "1yg3dg6ldlpxgsxxd15qgpda0jivj4g4cyy631hakdrp5skvpmk6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a9c8498e4bcca19c4c24b2fd0db035c3da477e2a/recipes/quasi-monochrome-theme";
@@ -61171,12 +61871,12 @@
racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "racket-mode";
- version = "20171116.1435";
+ version = "20180313.719";
src = fetchFromGitHub {
owner = "greghendershott";
repo = "racket-mode";
- rev = "240a52f5e944ca6aa1799cb32160301b1d128917";
- sha256 = "1r14q751g87846ilvqkifaq0nqyl02dgkfdfdpmsw9k006ml8rfa";
+ rev = "62c40b5a166f3d15d4ab82f5ccc0bbbd0fe90334";
+ sha256 = "0v3myl2sfpk8b4n9xsnpwn37f7bzxyh99lm3ya1qj8p3qvmqszgv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -61801,12 +62501,12 @@
realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
melpaBuild {
pname = "realgud";
- version = "20180207.1330";
+ version = "20180312.1514";
src = fetchFromGitHub {
owner = "rocky";
repo = "emacs-dbgr";
- rev = "251eb8c971b2a706767326f4f8c6fc5221dd6bd8";
- sha256 = "0w00j3m73lwkwr2jv1bw8glbx50xk1h5vqnpb26zqk54nz310lw1";
+ rev = "6706358aa7adbfc6b551d8a2fd394287b01070e5";
+ sha256 = "1m9j3gfz9nhlvdfxrn1qf6fysj6zjjzyvr4vs8wnd7zdv2s4cvrw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -61828,12 +62528,12 @@
realgud-byebug = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }:
melpaBuild {
pname = "realgud-byebug";
- version = "20160805.732";
+ version = "20180308.1923";
src = fetchFromGitHub {
owner = "rocky";
repo = "realgud-byebug";
- rev = "cb75d6bd9abbe04afa4c74a7ce9c66852814e0c3";
- sha256 = "04fn27a079zsdrf08w4rrvw9xd473ni1bh57gbizdznnvgjldfkr";
+ rev = "de603d58aa9ef72a2619247a0234fccf6bc2cc9a";
+ sha256 = "1hk2z7axy1v5yvx4xgkisfk00varq5rf8j88f0l63ywylyw1fwhl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-byebug";
@@ -62164,12 +62864,12 @@
redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "redprl";
- version = "20180216.646";
+ version = "20180227.723";
src = fetchFromGitHub {
owner = "RedPRL";
repo = "sml-redprl";
- rev = "fcc5b73e2139529e4c0c8b8639cab6bb51dd2b74";
- sha256 = "0kvh84k9k11xpnvs0kpk4q9nhfjrilwnhlzqmimd51pp7jqz5gff";
+ rev = "8482615ea753ff78aad2f16565ff3a918e7f6435";
+ sha256 = "1h6y2b0073xm996w4858w2xfhj97viq1fn674sfz21g93w4gjw51";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -62227,12 +62927,12 @@
refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
melpaBuild {
pname = "refine";
- version = "20180205.956";
+ version = "20180315.1528";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "refine";
- rev = "6b432bef019e7af38ee7145956fa28d512256420";
- sha256 = "0sf70cb3ahz42pb7lyp380w4k3698z6in9ng10pm47dv7j660llq";
+ rev = "0a99439a0b4ed6f79b9a240ea1270140a9e328bc";
+ sha256 = "1scw449mbmr70kb0r2ymhph9j0s5ym77ijp5fpwph9bri46cad3g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine";
@@ -62315,8 +63015,8 @@
src = fetchFromGitHub {
owner = "zonuexe";
repo = "right-click-context";
- rev = "a50d473c3bfb33537d12025115a14c821fa5325a";
- sha256 = "0n3jdclyxgi579mab8ayynrrcbwpk4rhq3l5dzfpsy1lk690g7hn";
+ rev = "2f8195fb81b8d27aeb42bdc4055ebce37c09717b";
+ sha256 = "05fr1gg5xfwp4rmyyn181vxn2mhmb3aca1g1rp2nk36v7lfzgpxv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert";
@@ -62772,12 +63472,12 @@
restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "restclient";
- version = "20171203.1248";
+ version = "20180316.851";
src = fetchFromGitHub {
owner = "pashky";
repo = "restclient.el";
- rev = "7242da37f7a3973c5fc5e84e8a62ff1aa09eef1b";
- sha256 = "0ll1aws1m46c0k1dxgd05bajj09fxf20ya4rs2wapvzm4mwrbz2c";
+ rev = "859d944796ce298b5779d9d256bd8d271d57e221";
+ sha256 = "18grh9pislyr1mnj05nd2wj2ns8wy2irsxi7y203qkhkhqaamdgn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient";
@@ -62797,8 +63497,8 @@
src = fetchFromGitHub {
owner = "pashky";
repo = "restclient.el";
- rev = "7242da37f7a3973c5fc5e84e8a62ff1aa09eef1b";
- sha256 = "0ll1aws1m46c0k1dxgd05bajj09fxf20ya4rs2wapvzm4mwrbz2c";
+ rev = "859d944796ce298b5779d9d256bd8d271d57e221";
+ sha256 = "18grh9pislyr1mnj05nd2wj2ns8wy2irsxi7y203qkhkhqaamdgn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm";
@@ -62898,12 +63598,12 @@
review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "review-mode";
- version = "20171029.650";
+ version = "20180312.535";
src = fetchFromGitHub {
owner = "kmuto";
repo = "review-el";
- rev = "115cd06558c01889f89feaa659e0d7513a2ad21e";
- sha256 = "0162gg3hf633zhr5jwj222lx143xvph001qmpmlbbqdxc0sgw5hv";
+ rev = "bf38b0ce8be2eef1cf810ac6f3664d2190bb9ef7";
+ sha256 = "0vmv19qvpba715xqx18dmlxq9kgkzvkf6jfd03bdcj2lh804y3pb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode";
@@ -62940,12 +63640,12 @@
rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "rg";
- version = "20180218.1129";
+ version = "20180312.2254";
src = fetchFromGitHub {
owner = "dajva";
repo = "rg.el";
- rev = "26413536ee71ac6ee07f193b94e60e544d800655";
- sha256 = "1ic4ym575qj38xd3565nvwyrhzw7lx2mflbirb5aycnz7dis9xsq";
+ rev = "a3516855e12e58cef5894ddf1ca7f7b524c804d7";
+ sha256 = "1hc85c0ffkiawy3ifln8i6rak3samdzlsyl5kz7rqgg8x9pzvaf4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -63108,12 +63808,12 @@
ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ripgrep";
- version = "20170810.1118";
+ version = "20180301.650";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "ripgrep.el";
- rev = "c47a2da4668ca338e7fadc3d8c095e075caaa17d";
- sha256 = "0x2rkm1yf03qfzylx6pk32cq7mmydila2iwiq40k5nl4wgfia5vx";
+ rev = "1f4338eeeb4bb3084a4b43762fa69a2c93ddff85";
+ sha256 = "0im6l8gn3msl5jks3qif0jmi358kj46a50p2lirpjh6rnilmnanq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep";
@@ -63150,12 +63850,12 @@
rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "rjsx-mode";
- version = "20171029.1156";
+ version = "20180314.845";
src = fetchFromGitHub {
owner = "felipeochoa";
repo = "rjsx-mode";
- rev = "ed8ff80f7fb7a9d46715577e4937de756b001ff7";
- sha256 = "14a6qhh4rvsn1z8jhj4wjlljmxmmq2hrmsqpfmvx7yn1r3x51liq";
+ rev = "f7d31589acd8a2dfcf4ca8851d2384e4f90364d0";
+ sha256 = "057pgylflzd69ydqz41g8wisvixypdrfn8yv81mfixh3iyq740y8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -63381,12 +64081,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "20180224.1134";
+ version = "20180224.1658";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "4f27c1cc60742622e6616b579c82b5440ad446d3";
- sha256 = "08310vkd7gyfc9jcis7r5dfdb6spilxw1kf7p8vm078v8hmmjyj0";
+ rev = "4310b26e69dd9569582962d0013ebc8c372730e5";
+ sha256 = "03mkchsrfxf8g9c36n8b8wxb99kb3nb74x293yw9ch1rbfvw3xis";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -63822,12 +64522,12 @@
rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rust-mode";
- version = "20180221.1130";
+ version = "20180303.854";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-mode";
- rev = "cc2435b9e5899c0787929a62dc6e6dcdb982febc";
- sha256 = "0aq665cd28k4szc07m6cfl50dvr87i4pkbggfj8qim0gwzsgc4bi";
+ rev = "42c98bbf3550aff91fd2a3f24637508b408d4cdb";
+ sha256 = "0l0dk7w1jklg8sh5i8sxh6ggcyb9gna0n72b0icvyfihqn25qk30";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -63906,12 +64606,12 @@
s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "s";
- version = "20171102.227";
+ version = "20180227.51";
src = fetchFromGitHub {
owner = "magnars";
repo = "s.el";
- rev = "5e9a6857d42015c67681616aa3519f599f97b8d8";
- sha256 = "00g7nvcbf1291npid30pih72209l5hv2fpv6s6m5i1vg94z081fg";
+ rev = "5968b951bd646c003f2825f31cdf9da94d6f1cae";
+ sha256 = "1ai8r6dmlvaa702yr74dbph97kp5xar3h147ahpk3vj1gh5irvnr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s";
@@ -64263,12 +64963,12 @@
sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sbt-mode";
- version = "20171111.1558";
+ version = "20180314.1511";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-sbt-mode";
- rev = "84c3d178a1f2c580f620fd8f03a05ac6413086a3";
- sha256 = "1ndxylb2jbnfrrsbbs5vcxygrqd3ssf3az01nh694hv6lkcidw5k";
+ rev = "aebea880b3d3de606d8d8c8d65bc6a5040f52d1f";
+ sha256 = "1iqbigqdv1g12q2bg0f6j7xl0z1ra7vy4k8h1wfqxvlb9fqfqr1y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -64288,8 +64988,8 @@
src = fetchFromGitHub {
owner = "openscad";
repo = "openscad";
- rev = "21f67de6389234d00a2dde437616063a6479402b";
- sha256 = "1vn3i5gvyn8nn5sfd8lm9csgl1v4m6n59mkif6c6h37h04232dqn";
+ rev = "3e7fbfff14baf75c5f0c23496ac3fb5c5e6f8a96";
+ sha256 = "12vs4k6ci02jw9l2z0iknm1mhs0w8kis2b9r5r1ip61nb9d43qx1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -65899,12 +66599,12 @@
shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shx";
- version = "20171230.1219";
+ version = "20180310.1748";
src = fetchFromGitHub {
owner = "riscy";
repo = "shx-for-emacs";
- rev = "33383bd359d795df2d7ef725b5349c953f5a6aa8";
- sha256 = "1arwsb6as8jpah0bs3b92a3kdnbfkhnsm1jglspfh4lqpafmx5vf";
+ rev = "b33b23097ad34177e4179e9d3731ec5db30c6391";
+ sha256 = "0vlgm1aix074ifi9gvp4c0ygdmzplydj4gdsl46173qbd8lfi2rj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -66025,12 +66725,12 @@
silkworm-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "silkworm-theme";
- version = "20160217.509";
+ version = "20180301.637";
src = fetchFromGitHub {
owner = "mswift42";
repo = "silkworm-theme";
- rev = "7951b53e5caf9daf6a5a15a57ae3a668cb78bd7b";
- sha256 = "1q21886qsam8y3s60zlfh48w0jl67q14qg9pzda7j2jcbj1q6r91";
+ rev = "4a297f952401cfe894dcb24174f6eda05e00fada";
+ sha256 = "00kjibpn3ry7j1s6kqmakybialpcx4919344lxks7wij5l6qqxx0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9451d247693c3e991f79315868c73808c0a664d4/recipes/silkworm-theme";
@@ -66113,8 +66813,8 @@
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacs-web-server";
- rev = "c252765de191441cc25068b35bdff6a912745268";
- sha256 = "08n41cshzxjjd06n8q94yivc72kmwwnmbg469w61v8sanzv0j04q";
+ rev = "868ec06abdc23c69597bc3a12da7aa2e5c0ad9c5";
+ sha256 = "1grq5a74arng2nn5q1xjm7gl5gk55a1js2r22wsahm8gd0fn0jdv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd";
@@ -66424,12 +67124,12 @@
slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
melpaBuild {
pname = "slack";
- version = "20180209.1923";
+ version = "20180315.253";
src = fetchFromGitHub {
owner = "yuya373";
repo = "emacs-slack";
- rev = "61dfcaeb4f560406c188390797448747eef1e90d";
- sha256 = "0pmkjdq1dlbsjpfcgnmxrkj7iggwzw1b0qpyvldwp6h8xlnkca54";
+ rev = "b7e8aaee092a45ad96ea680a812cdb615463ad6e";
+ sha256 = "1hlynbydgi194j9x2na66zdnf7i2r7iklyxly4jbq7jqqh1zybgr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -66487,12 +67187,12 @@
slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
melpaBuild {
pname = "slime";
- version = "20180218.1356";
+ version = "20180308.733";
src = fetchFromGitHub {
owner = "slime";
repo = "slime";
- rev = "bb663e97339d1ff217c674d649088493b82d08a9";
- sha256 = "0sc7k7b5fixwpmjx15vpbh3fmaxqz6m21z1ajd4c25jfnxvvhyck";
+ rev = "85ffc5ff9cd1d88e0b2fa10bbcd03d0c84768896";
+ sha256 = "0wvfw7hk95zn78j6ry82gixz3q0z3wdiy7s3gwi8v9a8lizwq83i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -66844,12 +67544,12 @@
smart-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smart-compile";
- version = "20171104.2333";
+ version = "20180315.2030";
src = fetchFromGitHub {
owner = "zenitani";
repo = "elisp";
- rev = "2a0c9b33bd97461d100e24df0103d4e5526a30d6";
- sha256 = "1h0d1rbaprxrwgwi8pq2q93xf9j8q8qy7p42iyywav9ilc6sak6p";
+ rev = "16ebc3c570f1949b8198fcc8663d6d26df32717a";
+ sha256 = "0i5g7inbr90l3n1rsf4152ax4wkbw2q41ks9j3x6a956zxn8q92w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/93562afd7b62d7535b8010179ba6ac7e8e6280d0/recipes/smart-compile";
@@ -67011,12 +67711,12 @@
smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }:
melpaBuild {
pname = "smart-mode-line";
- version = "20180129.130";
+ version = "20180313.1752";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "smart-mode-line";
- rev = "5aca51956fae55d7310c1f96b5d128201087864a";
- sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw";
+ rev = "08993097c991070a3f804e797862a92a8bb4d59c";
+ sha256 = "0mkhg4hj48yqzdr9ziszqm43pxr5n6ybk28sidrv8w10skrgjara";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line";
@@ -67036,8 +67736,8 @@
src = fetchFromGitHub {
owner = "Malabarba";
repo = "smart-mode-line";
- rev = "5aca51956fae55d7310c1f96b5d128201087864a";
- sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw";
+ rev = "08993097c991070a3f804e797862a92a8bb4d59c";
+ sha256 = "0mkhg4hj48yqzdr9ziszqm43pxr5n6ybk28sidrv8w10skrgjara";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme";
@@ -67200,12 +67900,12 @@
smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smartparens";
- version = "20180219.758";
+ version = "20180308.1042";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "smartparens";
- rev = "3452c21f34751bf04f2ede175b3f8eb3fe6ae282";
- sha256 = "0df4q6467a2rkpsml7bg7s9y336cw6zlgrp1s9h04f92fhv8z9c2";
+ rev = "3181747d9b84ed44b95fa95855609b624ce83d9b";
+ sha256 = "0gv1k922w2sz1lgmivd1d5hh2gvv2w5zpvr51y94ddzpfmph4bwy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -67767,12 +68467,12 @@
solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solarized-theme";
- version = "20180101.42";
+ version = "20180316.859";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "solarized-emacs";
- rev = "2dd2699b2f315374333292b132dc0dc03719aba2";
- sha256 = "04365kpw8a3f3963v6c3q8zka5xivx9jikvcar7fx59l4l7k5i2p";
+ rev = "1a46af3ff988e656a12b93c503fff87324b7420b";
+ sha256 = "1w8rw2fqrf5xmy2i5pr7bxlr6n21vzfhcgd65jknbp2229nggkrh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -68152,12 +68852,12 @@
spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "spacemacs-theme";
- version = "20180214.758";
+ version = "20180309.1335";
src = fetchFromGitHub {
owner = "nashamri";
repo = "spacemacs-theme";
- rev = "0cd15af82bb3adb5fa18bef795a2ea7f021b7e20";
- sha256 = "19mifs075kkn45dxkgcqixvmf9d72rp79g12vpxi0rp5aw90ddfx";
+ rev = "122b5b7edb0202610be7fcfd96b7a5e03b418de3";
+ sha256 = "1pv0pv1bkp5syvkg2rss82m3f4cfx8s4726hxglm7ar72i6qy21s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -68362,12 +69062,12 @@
sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sphinx-mode";
- version = "20170607.1436";
+ version = "20180316.856";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "sphinx-mode";
- rev = "0a9fcd60639f1f4235b4747e8449b9f48651705f";
- sha256 = "05kn45gh4l1wrj06qb3qzphx8mfqn3zqb8v73awhn5p7a1asb8kr";
+ rev = "95a14a288b50db70ee10598f83e5b087ba693bfb";
+ sha256 = "0c8p65jwrbn9pmk6j87g99p6fqcahfrc6wngmx94zw5m2wvxca2j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sphinx-mode";
@@ -68632,6 +69332,27 @@
license = lib.licenses.free;
};
}) {};
+ sql-clickhouse = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sql-clickhouse";
+ version = "20180302.755";
+ src = fetchFromGitHub {
+ owner = "leethargo";
+ repo = "sql-clickhouse";
+ rev = "35308c9292622547a79c0cc2659db2fc9de42e93";
+ sha256 = "12j9facwvwnwc8ga3nj9yddx3xp3kp28mih6lg4s1b67zj28pccg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a0ef23e6825924094eb69bd8526a95d8fab210c1/recipes/sql-clickhouse";
+ sha256 = "083i9aaf69yk71mndl5x0pimn3bkkhp3mfppxvy0f5lzf2847q2j";
+ name = "sql-clickhouse";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/sql-clickhouse";
+ license = lib.licenses.free;
+ };
+ }) {};
sql-impala = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sql-impala";
@@ -68845,12 +69566,12 @@
ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-deploy";
- version = "20180222.2157";
+ version = "20180301.2215";
src = fetchFromGitHub {
owner = "cjohansson";
repo = "emacs-ssh-deploy";
- rev = "aef539bb4feefe927fa48d01736dfadb7b3d7930";
- sha256 = "0vra7y2icid9sdyp7iygwkp4xaas249nm1lcbcyfpaad250g2pn4";
+ rev = "a3f9ec5dc8ecf7caa7551be31e62a6edfdc542c3";
+ sha256 = "130jrdj9y6cv78a71xsl6j9l79vnzf4081w6v1llxpyy1mn81a33";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -69122,8 +69843,8 @@
src = fetchFromGitHub {
owner = "ctmarinas";
repo = "stgit";
- rev = "416a4569ccd644718b694d4c587b313f357c6f4d";
- sha256 = "19d8r0l0bqzwkbzd90symq65w2ay30k5bc2xrgdqpawiqz2sx7qf";
+ rev = "ffd7fb7a67b4c90b38f6caa7ce14448e11cbc86e";
+ sha256 = "01rxlg2qqqw1bvzdqdmhikag02sp9f6fira0zhwzxmrp5gsvbh3a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit";
@@ -69269,8 +69990,8 @@
src = fetchFromGitHub {
owner = "akicho8";
repo = "string-inflection";
- rev = "d3bbc560bad160ba183778ca4628a2cce34fdd65";
- sha256 = "1yjy11s027r7v8bzwsqfpfzh2r2ywnywx7ngajw9gy9yfchw1xxs";
+ rev = "d506eeeac59ea71601a901c311a874949a25372f";
+ sha256 = "0mp9h42qrgdlk34m9ffdqmhyy65slna5vw71bpw1883aic4agq70";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@@ -69935,12 +70656,12 @@
swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "swiper";
- version = "20180225.744";
+ version = "20180316.924";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "e4b05e7af0ea80c91ddca6be5eae447a0ba3b8b5";
- sha256 = "00vdb4mwgy6cza3ybjza2xk3rzk4y14d83cnvw58wvnj190gphm3";
+ rev = "b53ba0be297a6bf22e0fab831eb1297c986bf774";
+ sha256 = "15azw9x9pbcdzkkllh4nc1wk9l5dk95l1p5qzdszfizb1kc1xjqi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -70082,12 +70803,12 @@
symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "symbol-overlay";
- version = "20180218.729";
+ version = "20180306.648";
src = fetchFromGitHub {
owner = "wolray";
repo = "symbol-overlay";
- rev = "1d610fa5023e210e59f823e1bbe819f0fb8727ef";
- sha256 = "14v5rw2yby2n3dhzc7y1jwnmz53apljb34a9g64h08wdpg2ff0wq";
+ rev = "bb02b971b06fb8e612c62bd2517b49884bc603a0";
+ sha256 = "18ib707rky1k5qw5m4zfd88y1lvgqfilc336ha3v88i7fz8bbzh9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -70312,12 +71033,12 @@
system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "system-packages";
- version = "20180131.1624";
+ version = "20180316.811";
src = fetchFromGitHub {
owner = "jabranham";
repo = "system-packages";
- rev = "ba902ce6602649aefda675e3c3cfcf20ac7995f2";
- sha256 = "017gif03773wlb0jfy45lsmq5vxqhghslxck9g6rgap22xn3xbcs";
+ rev = "557b1eb96479cc6c73b9b7d509dd60b0ee71934d";
+ sha256 = "01r8754ckbzsvlmnbpwpx2j33q693cmg5a59i5d77adn24ssk4f4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
@@ -70672,8 +71393,8 @@
src = fetchFromGitHub {
owner = "phillord";
repo = "tawny-owl";
- rev = "f10b81de14a71c6cb682a46d1a5012daba321e9b";
- sha256 = "0iwhxikv81i45q6q31yhbij2fli1g7vsbnv5bsaf1rshbwjla3k6";
+ rev = "3d353a435c7fcb0d9edae3094a9ece81914ba34e";
+ sha256 = "14kb6pzj23zrxwfkcxnra1j4fxzm94a3fym0nx1gf7bx362yqn5g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -71596,8 +72317,8 @@
src = fetchFromGitHub {
owner = "apache";
repo = "thrift";
- rev = "d907cc92db5b93e699a4282e979d097ea863215a";
- sha256 = "1zswprjkjyav2502dfsyyvh9w0hs43qpfwq9q4617p909d0sj1nb";
+ rev = "a9efd1abd4fd4862d8e967ec207015af79494b6c";
+ sha256 = "104viwwc6z9qk7p77wlmb088278f9awwx1v5cycnn6qv8wglhxfj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -71676,12 +72397,12 @@
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "20180212.2229";
+ version = "20180301.121";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "d80f62c07ab880fa486853846dbcda15351b61b5";
- sha256 = "00bky1vxw08s0z1s9jm813acrnawj0s6mkg71d82lc4ig5x4lbvi";
+ rev = "bd6948be51c61845238fd323a6c08b929534cac1";
+ sha256 = "1ppzr2nhwarzmc3gpf0qcfphq2nz7jjvml1dkskpbm1j322z0mqa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -72063,12 +72784,12 @@
toggle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "toggle";
- version = "20160331.100";
+ version = "20180315.1703";
src = fetchFromGitHub {
owner = "zenspider";
repo = "elisp";
- rev = "c1b59448e103e32202423a56c873967033778a92";
- sha256 = "1v3swwmkmfgpylypmg6qv9bykcxqcg9d1awk8zxbwh83ys0q70sf";
+ rev = "ee8a9c3052446876057ff853369d136aea7831f5";
+ sha256 = "15sla4n88003fclni5nhsrw3ib7bql11ks8pb7rgjyjddqrq274r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd02426ce7ab46361363c7a6c56b1575642003e0/recipes/toggle";
@@ -72594,16 +73315,16 @@
treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }:
melpaBuild {
pname = "treemacs";
- version = "20180221.1229";
+ version = "20180314.435";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35";
- sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0";
+ rev = "535e9131f1500b355b0c35a7a1118aaad56cce53";
+ sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs";
- sha256 = "0zbnw48wrbq9g7vlwxapxpq9xz8cqyr63814w0pqnh6j40ia7r2a";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs";
+ sha256 = "1wcsn0kzrbawyyhxmsmrsxr1vp0llkxw6r7zx53pwyc82ia64nlv";
name = "treemacs";
};
packageRequires = [ ace-window cl-lib dash emacs f ht hydra pfuture s ];
@@ -72619,12 +73340,12 @@
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35";
- sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0";
+ rev = "535e9131f1500b355b0c35a7a1118aaad56cce53";
+ sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil";
- sha256 = "1b02dybvp2fs9n1f80gpnqaxic45wwykny7vdyfay11ds5xzfpsg";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-evil";
+ sha256 = "1i2mxqwnqb2jz775qg3z4lf7pk4mgi646fyyi2la5gdcnq6a46mg";
name = "treemacs-evil";
};
packageRequires = [ evil treemacs ];
@@ -72640,12 +73361,12 @@
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35";
- sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0";
+ rev = "535e9131f1500b355b0c35a7a1118aaad56cce53";
+ sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile";
- sha256 = "0q3rj0g03423ql0d1ssp928x5f4540kxqlg51584aw57dlyy2z3n";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-projectile";
+ sha256 = "1vyifik30673bwlfvbmw8pzz7f3wd4q6zzssvbj8d23zhk8kh8vc";
name = "treemacs-projectile";
};
packageRequires = [ projectile treemacs ];
@@ -72844,12 +73565,12 @@
tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tuareg";
- version = "20180218.130";
+ version = "20180312.410";
src = fetchFromGitHub {
owner = "ocaml";
repo = "tuareg";
- rev = "b9941efaba0dbf40ee96c9f1829b562052b3f2d3";
- sha256 = "1nlb46mkyzdfb0k98wsqqk7mwyh6dfw4i83wxmdpixskww4iywfj";
+ rev = "a3ad3a9220363f2fd0898369866f5879489d51ec";
+ sha256 = "1l7nbg273d1ffnac8crhvmiq8mz2xdyd52aflp0s3am9iw7319kn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -73117,12 +73838,12 @@
typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typescript-mode";
- version = "20180222.534";
+ version = "20180315.1309";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "typescript.el";
- rev = "2815dd1b4bbf902fb61e0a8f1aca6319c7b0c940";
- sha256 = "0d97frhcf6g4ijr1vphfnvrchj2p1rfpj7zrvj8i3jzb6dakyw4c";
+ rev = "526f307ca8ca50b8f98975f2812198212f6acf2f";
+ sha256 = "1hj4jy91qfpfmnajb4wc9vavx0zlmawi0r1nvkh87ngm3q09mnbi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -73670,22 +74391,22 @@
license = lib.licenses.free;
};
}) {};
- unidecode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ unidecode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "unidecode";
- version = "20140317.2118";
+ version = "20180312.1226";
src = fetchFromGitHub {
owner = "sindikat";
repo = "unidecode";
- rev = "9e279e88a689584027d5a1b088fe5def25d0f75c";
- sha256 = "1jvr1k8zd40m1rvwmxzidz1dvr4j8cbh78nqgc3vfb410fj619gw";
+ rev = "5502ada9287b4012eabb879f12f5b0a9df52c5b7";
+ sha256 = "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2a5265b00464bcd2bb397229e87385d172856474/recipes/unidecode";
- sha256 = "0h058mvb6x53zywpwg85dzhaynlgq577yyqhrn5qqyqjg1n8lhc1";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0af5c20984ebe5458c6e97b24ef97e8b2fbc4045/recipes/unidecode";
+ sha256 = "1xizid7hg98lx2i544w253h6c51ykimim1j58jkn1r5fzqg3r4xd";
name = "unidecode";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [];
meta = {
homepage = "https://melpa.org/#/unidecode";
license = lib.licenses.free;
@@ -73925,12 +74646,12 @@
use-package = callPackage ({ bind-key, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "use-package";
- version = "20180206.1414";
+ version = "20180314.1143";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a";
- sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1";
+ rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182";
+ sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package";
@@ -73950,8 +74671,8 @@
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a";
- sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1";
+ rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182";
+ sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-chords";
@@ -73988,12 +74709,12 @@
use-package-ensure-system-package = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, system-packages, use-package }:
melpaBuild {
pname = "use-package-ensure-system-package";
- version = "20180127.46";
+ version = "20180316.1307";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a";
- sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1";
+ rev = "f0932c9165700f77b1c8fd3fee7d8f59e0486182";
+ sha256 = "07m5fnk5m3l4s3d1qs1kydy3jbdi6lz53v635rzjkl2jzgybv8g5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package";
@@ -74009,12 +74730,12 @@
usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "usql";
- version = "20180204.1407";
+ version = "20180305.1523";
src = fetchFromGitHub {
owner = "nickbarnwell";
repo = "usql.el";
- rev = "b6bd210ba3feec946576ab1f130d9f91ad2e2c44";
- sha256 = "1y1da6ipig7r5wcnb1v4pj0j56dsykvgy2pw0h4jxxibcr50pa42";
+ rev = "bfaf428b366a9a185eef84f0d645a98dc918fe3d";
+ sha256 = "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql";
@@ -74030,12 +74751,12 @@
utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "utop";
- version = "20170508.2343";
+ version = "20180228.305";
src = fetchFromGitHub {
owner = "diml";
repo = "utop";
- rev = "262539ae26f5e0729d6ef59009e6339a1ec21e94";
- sha256 = "0f6m9nfvy7vgpnzra8xrb0bpgnhgi93iif4d1mswylwvj3805s6s";
+ rev = "1b4bd052c6513d38f6cc626c24665637d25fdc07";
+ sha256 = "05pv6nj88im1jf9nngv56z362wrp9pmkzrjn3nm846rdzbc5f21j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -75101,12 +75822,12 @@
wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wacspace";
- version = "20140826.2232";
+ version = "20180311.1650";
src = fetchFromGitHub {
owner = "shosti";
repo = "wacspace.el";
- rev = "4a11168d58c9c129cfcd04a1c9581962565eca4a";
- sha256 = "0nvlni3iy2sq76z8d4kj5492m0w7qv96shjqkynvlj0avf528hv4";
+ rev = "54d19aab6fd2bc5945b7ffc58104e695064927e2";
+ sha256 = "1nfx1qsl2gxjqbbc5xsr8f3xz2qyb4wnz3634k3hglb1jpa78j3n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/58e5ff4c5853c5350d0534894ddb358daa83cee9/recipes/wacspace";
@@ -75226,12 +75947,12 @@
wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
melpaBuild {
pname = "wanderlust";
- version = "20180210.2213";
+ version = "20180316.1534";
src = fetchFromGitHub {
owner = "wanderlust";
repo = "wanderlust";
- rev = "7c70e6308242a8e9f175fca02da9b55a1805508c";
- sha256 = "0ipwchasw6ijykyl6ikxkghzigbxg8g10rdxqcy0250ra57afc2p";
+ rev = "f0c8c4e55be6569c4c56a1d041f5c53769e4d5ac";
+ sha256 = "11p5kqp16bvas26i0zgdazqhgz6jb6j612q032g6d4476yb8df26";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -75457,12 +76178,12 @@
web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "web-mode";
- version = "20180224.733";
+ version = "20180313.1458";
src = fetchFromGitHub {
owner = "fxbois";
repo = "web-mode";
- rev = "c6d5cab4fc30ff9ca8b55a2a37d3ae3f7f540859";
- sha256 = "03vb5aqyvqzxxw5zafp0hgc5vs7c74917p4r4ki9dp2qwvh82ziq";
+ rev = "49a7a72adf77c8d3ee457ef38dce415cddd09aae";
+ sha256 = "0m0dg0w6pimvq0bp5xm7jca6619n38zsw40mddpb9xw01gxmaagb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -75835,12 +76556,12 @@
which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "which-key";
- version = "20180225.1951";
+ version = "20180301.1018";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-which-key";
- rev = "0f80d0f95cbf133f52f64578d6a152e7e48ceb0e";
- sha256 = "0bljzvggx1dzjl904bryny9pdg7xcncnqqzmvymgc3i6j70c0v2f";
+ rev = "d19fe4e037baf8a5cd6e8c0609d3999528bb5ac9";
+ sha256 = "1ylfy31a63g3306v0392a8nx2jdjms10f0r91i7am57pkygrx664";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -76028,8 +76749,8 @@
src = fetchFromGitHub {
owner = "foretagsplatsen";
repo = "emacs-js";
- rev = "5922cf54533e1f8a3b1db5f57f07ececf9a20e1e";
- sha256 = "1qjs9xkqv3084hj67vk9cz4pnkw7hzl48fzps5kng8ip94yiazh3";
+ rev = "900cf8213df6e58bdd3244b446ea02c67b7555d8";
+ sha256 = "1yn2hadcpcsgnf0wy7x8zcfw97c90dpp2ipdml176191vz41n7nb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -76545,6 +77266,27 @@
license = lib.licenses.free;
};
}) {};
+ wolfram-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "wolfram-mode";
+ version = "20180306.1613";
+ src = fetchFromGitHub {
+ owner = "kawabata";
+ repo = "wolfram-mode";
+ rev = "be680190cac6ccf579dbce107deaae495928d1b3";
+ sha256 = "1cvdw28gvhbr9l65xkv8ld12rb0pcf53jd55gns2b0abz1lg1jc4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/40ded2302e413e233d867caa4776c54a778b8b99/recipes/wolfram-mode";
+ sha256 = "0rc39vvpyhpn0m52i4hs23j6avqfddmrkhjqg339apfq7z35fpli";
+ name = "wolfram-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/wolfram-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }:
melpaBuild {
pname = "wonderland";
@@ -76590,12 +77332,12 @@
wordnut = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wordnut";
- version = "20151002.1457";
+ version = "20180312.2143";
src = fetchFromGitHub {
owner = "gromnitsky";
repo = "wordnut";
- rev = "6e223dced5b865e9d38af6f9b7e57b3a56d362bb";
- sha256 = "1w4037jplkl8sr6b7qj4cb5qcrjwz6vnfxfshdjimilwgc3ihs16";
+ rev = "feac531404041855312c1a046bde7ea18c674915";
+ sha256 = "1jl0b6g64a9w0q7bfvwha67vgws5xd15b7mkfyb5gkz3pymqhfxn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/321c5e171eb4da85980968ac3c8ef4300101c0b1/recipes/wordnut";
@@ -76632,12 +77374,12 @@
worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "worf";
- version = "20171002.1118";
+ version = "20180316.926";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "worf";
- rev = "cf2f382b368bcb3c8ba4785a7fac8ee9300e80b5";
- sha256 = "0rnvmwdks8m4f6dwnyinv9rli58mlvlnrg7swpdjfh0g3bqgr7w5";
+ rev = "543bfe21727c0ea96ee0c1022ed334103c0acdf0";
+ sha256 = "0ia74ijp6cdhxjfygvjb5kx36iyakbdws9lsz20761xlp8vw0dfq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -76804,8 +77546,8 @@
src = fetchFromGitHub {
owner = "lewang";
repo = "ws-butler";
- rev = "80dabd5d158929e8433e46207bb521282b21e4f3";
- sha256 = "0s4kfg2ga3qa6gb2ji1jv73fv66d9vn054cl0mif7n16kic4bkr4";
+ rev = "52321b99be69aa1b661da7743c4421a30d8b6bcb";
+ sha256 = "1b6hxhwhzs6xq12w0jmvvjw0bx4czw71xzj3qizq9gx0q4n7a0qf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ws-butler";
@@ -76947,12 +77689,12 @@
x509-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "x509-mode";
- version = "20180225.2330";
+ version = "20180313.153";
src = fetchFromGitHub {
owner = "jobbflykt";
repo = "x509-mode";
- rev = "33cddc0fe18652ba707308e907b255ead60e2850";
- sha256 = "05b7ifmjiy5rw0ywyjknf46garsyfaxrrdzn4rjwrw1crf8f804r";
+ rev = "d59058608bea1840fdba44810d7184b47bc88410";
+ sha256 = "1srqlzgrp75spygw360d1h2jfhlhmgszfsz9kyn8h564mlc3m35k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/27145423eb4e68e006ef96868a35b99d119a3099/recipes/x509-mode";
@@ -77010,12 +77752,12 @@
xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-elisp-mode";
- version = "20180225.1515";
+ version = "20180228.2206";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-elisp-mode";
- rev = "cf1cce0ddc3cba18ccd506b04d8278189fbd92c2";
- sha256 = "0wdfdjcq0yrj2g995879y5ymjb5z1pv38vxvniclifg478qym5yy";
+ rev = "3a617b446fda59294b5ff67c0b86a0a6e9f15feb";
+ sha256 = "1bj2w1r98db1jwirvbvxnbc8p7l9pz3n4l0w2rl9g6kqavdx8pnh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode";
@@ -77031,12 +77773,12 @@
xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-find";
- version = "20170821.358";
+ version = "20180310.450";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-find";
- rev = "6b7a60d6210d42559b46f0e17d7a0e4a2607f887";
- sha256 = "11whm7cnz6z61lycm5w6qmvbbl5f2c2lpgmk5c5whks7v3bkq6n6";
+ rev = "0cd985675c286bfa5f07ab9d00231f8a23505537";
+ sha256 = "01h5wdbzf7swrmddai2vsakr8rsqg447w9bnp7akxla426fsr8wg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-find";
@@ -77052,12 +77794,12 @@
xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-fly-keys";
- version = "20180221.1809";
+ version = "20180313.1143";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-fly-keys";
- rev = "c01ddd038e03051bcc8010629b7548838db2531b";
- sha256 = "132afibrgz6381nanjhalkgqmxwia6ykyprrasa19m9kbm96xwdl";
+ rev = "cef43c378743bd0073e9044b5cd4df212a022bd8";
+ sha256 = "1qa4payi7r6ncg2dgp9frs6g8gmsc5mfaxssf84lgm3p3468y0fw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys";
@@ -77115,12 +77857,12 @@
xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-math-input";
- version = "20180216.1040";
+ version = "20180308.349";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-math-input";
- rev = "16a441944da3fb3f844b93d0add1e042e1b5377a";
- sha256 = "1vr7dkibw5ibd1c3snxy2pw055yl620pi2vynxszsk82shz2xvbz";
+ rev = "2904922958f746cbb77692564e4c4487ff31c9ab";
+ sha256 = "1zk02fbkd9y6hy226lnqf31c3l5sync2m6gqj1m4pj4qqla98m1k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-math-input";
@@ -77829,12 +78571,12 @@
yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yang-mode";
- version = "20170323.1104";
+ version = "20180306.407";
src = fetchFromGitHub {
owner = "mbj4668";
repo = "yang-mode";
- rev = "0d5d5df86dbb6cbb2de3c0f2d0d5f8c8f29d0695";
- sha256 = "0ca55vjv9lz7w8mk2z731bia9vialrd4kv0igi09xs1mm0r2x5nv";
+ rev = "340aec635e359609b22f7e94df15af1af2b070f6";
+ sha256 = "0795z6s71vlb709n5lpx2f9adfjndafg1h5860zvy1qc4m1054rz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
@@ -77997,12 +78739,12 @@
yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yasnippet";
- version = "20180218.459";
+ version = "20180310.1614";
src = fetchFromGitHub {
owner = "joaotavora";
repo = "yasnippet";
- rev = "3d7cafccf8d7ea9d62e0ccd63c30769de5b8cf01";
- sha256 = "0m5z46vdv5npwpkqc87jsf488k31mpqphsg1yayy4pjqz2bn68vb";
+ rev = "5170f051ad39353ed46ae7ff7b67e50e0e27324c";
+ sha256 = "1ssb1ljbm8i78qii15yhd488y3q1w2082lb2pcwly2axwa5a02kv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -78018,12 +78760,12 @@
yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "yasnippet-snippets";
- version = "20180222.440";
+ version = "20180307.518";
src = fetchFromGitHub {
owner = "AndreaCrotti";
repo = "yasnippet-snippets";
- rev = "2373036c13d71c5fab2616d97498213f54688bd6";
- sha256 = "18sdc92qaacxp757yqdv71hx2pjhcy33vshkwjdi6mmmqa1d2zq8";
+ rev = "2b4c4d7ef7e85a3b9306ce7da82a65cf243edc22";
+ sha256 = "0v0q8ym8jp6pps6g9g0qnz9x39i4n4w937s8s6arf1f31fc73r52";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets";
@@ -78424,12 +79166,12 @@
zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
melpaBuild {
pname = "zerodark-theme";
- version = "20180201.246";
+ version = "20180308.957";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "zerodark-theme";
- rev = "553ba2ba9907e56bda1d2ebf142ba7cbf9bd16f1";
- sha256 = "1d9fclil0nf06gc9734y3p6clkxpwxa8nqh9mk9kpj8k9b36lxcn";
+ rev = "2a240de8cd89c741612d807a521d6b3e51088324";
+ sha256 = "10r806hzmgwnysjgg5lx252ychnhyma1bpwm980pf46vlywws5a0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme";
@@ -78445,16 +79187,16 @@
zig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zig-mode";
- version = "20170920.802";
+ version = "20180309.1458";
src = fetchFromGitHub {
- owner = "AndreaOrru";
+ owner = "zig-lang";
repo = "zig-mode";
- rev = "814657c5b6b0600ace78a7bbd216c3e90d611cfd";
- sha256 = "0nhx2wsk3qpdplvwxmdzwlka9255x46ca9vcjb58zbpb5wbfckzx";
+ rev = "4f281e4748a4eae64efaa98d9dfd9b7c163fbed8";
+ sha256 = "0pip0kgbxh4cf60j2kzgb9lvrm5vksg83mllk1pcs9mkbxdgjyww";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/33895b0ff559ffd18a62c04736597188f55419ee/recipes/zig-mode";
- sha256 = "1rmvlsgx01h62imbksxl164d5p0caz49nlgg0z7spvvd9bmplr09";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5cba49d25ebbaa9240d5d87d0c7ca48d928b2e4b/recipes/zig-mode";
+ sha256 = "005lsgnsaj8rjkzbhi23g99xy9zln4ggkad11xqmn4xa6g199wly";
name = "zig-mode";
};
packageRequires = [ emacs ];
@@ -78634,12 +79376,12 @@
zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zoom";
- version = "20171110.715";
+ version = "20180310.421";
src = fetchFromGitHub {
owner = "cyrus-and";
repo = "zoom";
- rev = "d4f417b24fe022b6512a1a0ffebf898044393250";
- sha256 = "0qksgg0c4z5c293avc87q2hgwnvr550rycwgnvrp574n3qmvqjmd";
+ rev = "a72714bb14eb32c1c5e7ad1cb4bdeb208450e507";
+ sha256 = "176fbhsh2rk6rn8fisfq4ja71lqvf1zbb393wzfsgg68df39mqyh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom";
@@ -78760,12 +79502,12 @@
zoutline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zoutline";
- version = "20170722.651";
+ version = "20180314.1059";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "zoutline";
- rev = "e86e739b53a1c8a0a2cf6de43dffabb15d465507";
- sha256 = "0ycri5d61pbwhwpwh9qx9m22mb4ab7bgniwgdbi9s8rzqs4q1p91";
+ rev = "b3ee0f0e0b916838c2d2c249beba74ffdb8d5699";
+ sha256 = "0sd0017piw0dis6dhpq5dkqd3acisxqgipl7dj8gmc1vnswhdwr8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline";
diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
index 76c8e4ae0e4..c5f691e95c2 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -1,23 +1,26 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig, poppler }:
+{ stdenv, fetchurl, qtbase, qtscript, qmake, zlib, pkgconfig, poppler }:
stdenv.mkDerivation rec {
pname = "texmaker";
- version = "4.5";
+ version = "5.0.2";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.xm1math.net/texmaker/${name}.tar.bz2";
- sha256 = "056njk6j8wma23mlp7xa3rgfaxx0q8ynwx8wkmj7iy0b85p9ds9c";
+ sha256 = "0y81mjm89b99pr9svcwpaf4iz2q9pc9hjas5kiwd1pbgl5vqskm9";
};
- buildInputs = [ qt4 poppler_qt4 zlib ];
- nativeBuildInputs = [ pkgconfig poppler qmake4Hook ];
+ buildInputs = [ qtbase qtscript poppler zlib ];
+ nativeBuildInputs = [ pkgconfig poppler qmake ];
NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler";
preConfigure = ''
- qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps"
+ qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps METAINFODIR=$out/share/metainfo"
'';
+
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "TeX and LaTeX editor";
longDescription=''
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 438ae26f06f..bd08d599755 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "tiled-${version}";
- version = "1.1.2";
+ version = "1.1.3";
src = fetchFromGitHub {
owner = "bjorn";
repo = "tiled";
rev = "v${version}";
- sha256 = "1bzp89914rlrwf2whky3fx10rwxqiwbw9acyqllvam3l4hmv4nlz";
+ sha256 = "0rf50w7nkdm70999q1mj7sy5hyjj41qjf4izi849q9a7xnhddv44";
};
nativeBuildInputs = [ pkgconfig qmake ];
diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix
deleted file mode 100644
index bcf262957bc..00000000000
--- a/pkgs/applications/editors/zed/default.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ stdenv, buildEnv, fetchgit, makeWrapper, writeScript, fetchurl, zip, pkgs
-, node_webkit }:
-
-let
- name = "zed-${version}";
- version = "1.1.0";
-
- nodePackages = import ./node.nix {
- inherit pkgs;
- system = stdenv.system;
- };
-
- node_env = buildEnv {
- name = "node_env";
- paths = [ nodePackages."body-parser-~1.6.3" nodePackages."express-~4.8.3"
- nodePackages."request-~2.34.0" nodePackages."tar-~0.1.19"
- nodePackages."ws-~0.4.32" ];
- pathsToLink = [ "/lib" ];
- ignoreCollisions = true;
- };
-
- zed = stdenv.mkDerivation rec {
- inherit name version;
-
- src = fetchgit {
- url = "git://github.com/zedapp/zed";
- rev = "refs/tags/v${version}";
- sha256 = "1zvlngv73h968jd2m42ylr9vfhf35n80wzy616cv2ic7gmr1fl9p";
- };
-
- buildInputs = [ makeWrapper zip ];
-
- dontBuild = true;
-
- installPhase = ''
- export NWPATH="${node_webkit}/share/node-webkit";
-
- mkdir -p $out/zed
-
- cd ${src}/app; zip -r $out/zed/app.nw *; cd ..
-
- cat $NWPATH/nw $out/zed/app.nw > $out/zed/zed-bin
- cp $NWPATH/nw.pak $out/zed/
- cp nw/zed-linux $out/zed/zed
- chmod +x $out/zed/zed*
- cp Zed.desktop.tmpl Zed.svg Zed.png $out/zed
- rm $out/zed/app.nw
- '';
-
- postFixup = ''
- wrapProgram $out/zed/zed-bin \
- --prefix NODE_PATH : ${node_env}/lib/node_modules
- '';
- };
-
- zed_script = writeScript "zed.sh" ''
- if [[ $1 == http://* ]] || [[ $1 == https://* ]]; then
- PROJECT=$1
- elif [ "" != "$1" ]; then
- PROJECT=$(readlink -f $1)
- fi
- ${zed}/zed/zed-bin $PROJECT
- '';
-
-in stdenv.mkDerivation rec {
- inherit name version;
-
- src = zed;
-
- installPhase = ''
- mkdir -p $out/bin
- ln -s ${zed_script} $out/bin/zed
- '';
-
- meta = with stdenv.lib; {
- description = "A fully offline-capable, open source, keyboard-focused, text and code editor for power users";
- license = licenses.mit;
- homepage = http://zedapp.org/;
- maintainers = with maintainers; [ matejc ma27 ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/editors/zed/deps.json b/pkgs/applications/editors/zed/deps.json
deleted file mode 100644
index d3a7708d156..00000000000
--- a/pkgs/applications/editors/zed/deps.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[ { "body-parser": "~1.6.3" }
-, { "express": "~4.8.3" }
-, { "request": "~2.34.0" }
-, { "tar": "~0.1.19" }
-, { "ws": "~0.4.32" }
-]
diff --git a/pkgs/applications/editors/zed/deps.sh b/pkgs/applications/editors/zed/deps.sh
deleted file mode 100755
index 6d2bf29532e..00000000000
--- a/pkgs/applications/editors/zed/deps.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages.node2nix
-
-node2nix -6 -i deps.json \
- -e ../../../development/node-packages/node-env.nix \
- --no-copy-node-env \
- -c node.nix
diff --git a/pkgs/applications/editors/zed/node-packages.nix b/pkgs/applications/editors/zed/node-packages.nix
deleted file mode 100644
index e47f11e6eb5..00000000000
--- a/pkgs/applications/editors/zed/node-packages.nix
+++ /dev/null
@@ -1,882 +0,0 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
-
-{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
-
-let
- sources = {
- "accepts-1.0.7" = {
- name = "accepts";
- packageName = "accepts";
- version = "1.0.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz";
- sha1 = "5b501fb4f0704309964ccdb048172541208dab1a";
- };
- };
- "asn1-0.1.11" = {
- name = "asn1";
- packageName = "asn1";
- version = "0.1.11";
- src = fetchurl {
- url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
- sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
- };
- };
- "assert-plus-0.1.5" = {
- name = "assert-plus";
- packageName = "assert-plus";
- version = "0.1.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
- sha1 = "ee74009413002d84cec7219c6ac811812e723160";
- };
- };
- "async-0.9.2" = {
- name = "async";
- packageName = "async";
- version = "0.9.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
- sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
- };
- };
- "aws-sign2-0.5.0" = {
- name = "aws-sign2";
- packageName = "aws-sign2";
- version = "0.5.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
- sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
- };
- };
- "balanced-match-1.0.0" = {
- name = "balanced-match";
- packageName = "balanced-match";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
- sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
- };
- };
- "block-stream-0.0.9" = {
- name = "block-stream";
- packageName = "block-stream";
- version = "0.0.9";
- src = fetchurl {
- url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz";
- sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
- };
- };
- "boom-0.4.2" = {
- name = "boom";
- packageName = "boom";
- version = "0.4.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
- sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
- };
- };
- "brace-expansion-1.1.11" = {
- name = "brace-expansion";
- packageName = "brace-expansion";
- version = "1.1.11";
- src = fetchurl {
- url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
- sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
- };
- };
- "buffer-crc32-0.2.3" = {
- name = "buffer-crc32";
- packageName = "buffer-crc32";
- version = "0.2.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
- sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921";
- };
- };
- "bytes-1.0.0" = {
- name = "bytes";
- packageName = "bytes";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
- sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
- };
- };
- "combined-stream-0.0.7" = {
- name = "combined-stream";
- packageName = "combined-stream";
- version = "0.0.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
- sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
- };
- };
- "commander-2.1.0" = {
- name = "commander";
- packageName = "commander";
- version = "2.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
- sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
- };
- };
- "concat-map-0.0.1" = {
- name = "concat-map";
- packageName = "concat-map";
- version = "0.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
- sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
- };
- };
- "cookie-0.1.2" = {
- name = "cookie";
- packageName = "cookie";
- version = "0.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
- sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
- };
- };
- "cookie-signature-1.0.4" = {
- name = "cookie-signature";
- packageName = "cookie-signature";
- version = "1.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
- sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca";
- };
- };
- "cryptiles-0.2.2" = {
- name = "cryptiles";
- packageName = "cryptiles";
- version = "0.2.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
- sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
- };
- };
- "ctype-0.5.3" = {
- name = "ctype";
- packageName = "ctype";
- version = "0.5.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
- sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
- };
- };
- "debug-1.0.4" = {
- name = "debug";
- packageName = "debug";
- version = "1.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
- sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
- };
- };
- "delayed-stream-0.0.5" = {
- name = "delayed-stream";
- packageName = "delayed-stream";
- version = "0.0.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
- sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
- };
- };
- "depd-0.4.4" = {
- name = "depd";
- packageName = "depd";
- version = "0.4.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz";
- sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662";
- };
- };
- "destroy-1.0.3" = {
- name = "destroy";
- packageName = "destroy";
- version = "1.0.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
- sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
- };
- };
- "ee-first-1.0.5" = {
- name = "ee-first";
- packageName = "ee-first";
- version = "1.0.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
- sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0";
- };
- };
- "escape-html-1.0.1" = {
- name = "escape-html";
- packageName = "escape-html";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
- sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
- };
- };
- "finalhandler-0.1.0" = {
- name = "finalhandler";
- packageName = "finalhandler";
- version = "0.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz";
- sha1 = "da05bbc4f5f4a30c84ce1d91f3c154007c4e9daa";
- };
- };
- "forever-agent-0.5.2" = {
- name = "forever-agent";
- packageName = "forever-agent";
- version = "0.5.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
- sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
- };
- };
- "form-data-0.1.4" = {
- name = "form-data";
- packageName = "form-data";
- version = "0.1.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
- sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
- };
- };
- "fresh-0.2.2" = {
- name = "fresh";
- packageName = "fresh";
- version = "0.2.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
- sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77";
- };
- };
- "fs.realpath-1.0.0" = {
- name = "fs.realpath";
- packageName = "fs.realpath";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
- sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
- };
- };
- "fstream-0.1.31" = {
- name = "fstream";
- packageName = "fstream";
- version = "0.1.31";
- src = fetchurl {
- url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
- sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
- };
- };
- "glob-7.1.2" = {
- name = "glob";
- packageName = "glob";
- version = "7.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
- sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
- };
- };
- "graceful-fs-3.0.11" = {
- name = "graceful-fs";
- packageName = "graceful-fs";
- version = "3.0.11";
- src = fetchurl {
- url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz";
- sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818";
- };
- };
- "hawk-1.0.0" = {
- name = "hawk";
- packageName = "hawk";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
- sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
- };
- };
- "hoek-0.9.1" = {
- name = "hoek";
- packageName = "hoek";
- version = "0.9.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
- sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
- };
- };
- "http-signature-0.10.1" = {
- name = "http-signature";
- packageName = "http-signature";
- version = "0.10.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
- sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
- };
- };
- "iconv-lite-0.4.4" = {
- name = "iconv-lite";
- packageName = "iconv-lite";
- version = "0.4.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
- sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8";
- };
- };
- "inflight-1.0.6" = {
- name = "inflight";
- packageName = "inflight";
- version = "1.0.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
- sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
- };
- };
- "inherits-2.0.3" = {
- name = "inherits";
- packageName = "inherits";
- version = "2.0.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
- sha1 = "633c2c83e3da42a502f52466022480f4208261de";
- };
- };
- "ipaddr.js-0.1.2" = {
- name = "ipaddr.js";
- packageName = "ipaddr.js";
- version = "0.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
- sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e";
- };
- };
- "json-stringify-safe-5.0.1" = {
- name = "json-stringify-safe";
- packageName = "json-stringify-safe";
- version = "5.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
- sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
- };
- };
- "media-typer-0.2.0" = {
- name = "media-typer";
- packageName = "media-typer";
- version = "0.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
- sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984";
- };
- };
- "merge-descriptors-0.0.2" = {
- name = "merge-descriptors";
- packageName = "merge-descriptors";
- version = "0.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
- sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
- };
- };
- "methods-1.1.0" = {
- name = "methods";
- packageName = "methods";
- version = "1.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/methods/-/methods-1.1.0.tgz";
- sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f";
- };
- };
- "mime-1.2.11" = {
- name = "mime";
- packageName = "mime";
- version = "1.2.11";
- src = fetchurl {
- url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
- sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
- };
- };
- "mime-types-1.0.2" = {
- name = "mime-types";
- packageName = "mime-types";
- version = "1.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
- sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
- };
- };
- "minimatch-3.0.4" = {
- name = "minimatch";
- packageName = "minimatch";
- version = "3.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
- sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
- };
- };
- "minimist-0.0.8" = {
- name = "minimist";
- packageName = "minimist";
- version = "0.0.8";
- src = fetchurl {
- url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
- sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
- };
- };
- "mkdirp-0.5.1" = {
- name = "mkdirp";
- packageName = "mkdirp";
- version = "0.5.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
- sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
- };
- };
- "ms-0.6.2" = {
- name = "ms";
- packageName = "ms";
- version = "0.6.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
- sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
- };
- };
- "nan-1.0.0" = {
- name = "nan";
- packageName = "nan";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
- sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
- };
- };
- "natives-1.1.1" = {
- name = "natives";
- packageName = "natives";
- version = "1.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz";
- sha512 = "08a9lf00d2pkqmdi6ipp00pjin0gwl6fh283cjdjbayaz834lppwrw19kn4s642kwa46bfcway3033j6rbqd96iy86qrzrfgz35mr7i";
- };
- };
- "negotiator-0.4.7" = {
- name = "negotiator";
- packageName = "negotiator";
- version = "0.4.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
- sha1 = "a4160f7177ec806738631d0d3052325da42abdc8";
- };
- };
- "node-uuid-1.4.8" = {
- name = "node-uuid";
- packageName = "node-uuid";
- version = "1.4.8";
- src = fetchurl {
- url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz";
- sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
- };
- };
- "oauth-sign-0.3.0" = {
- name = "oauth-sign";
- packageName = "oauth-sign";
- version = "0.3.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
- sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
- };
- };
- "on-finished-2.1.0" = {
- name = "on-finished";
- packageName = "on-finished";
- version = "2.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
- sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d";
- };
- };
- "once-1.4.0" = {
- name = "once";
- packageName = "once";
- version = "1.4.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
- sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
- };
- };
- "options-0.0.6" = {
- name = "options";
- packageName = "options";
- version = "0.0.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz";
- sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
- };
- };
- "parseurl-1.3.2" = {
- name = "parseurl";
- packageName = "parseurl";
- version = "1.3.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz";
- sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3";
- };
- };
- "path-is-absolute-1.0.1" = {
- name = "path-is-absolute";
- packageName = "path-is-absolute";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
- sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
- };
- };
- "path-to-regexp-0.1.3" = {
- name = "path-to-regexp";
- packageName = "path-to-regexp";
- version = "0.1.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
- sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
- };
- };
- "proxy-addr-1.0.1" = {
- name = "proxy-addr";
- packageName = "proxy-addr";
- version = "1.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
- sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8";
- };
- };
- "punycode-1.4.1" = {
- name = "punycode";
- packageName = "punycode";
- version = "1.4.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
- sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
- };
- };
- "qs-0.6.6" = {
- name = "qs";
- packageName = "qs";
- version = "0.6.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
- sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
- };
- };
- "qs-2.2.2" = {
- name = "qs";
- packageName = "qs";
- version = "2.2.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/qs/-/qs-2.2.2.tgz";
- sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c";
- };
- };
- "range-parser-1.0.0" = {
- name = "range-parser";
- packageName = "range-parser";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
- sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0";
- };
- };
- "raw-body-1.3.0" = {
- name = "raw-body";
- packageName = "raw-body";
- version = "1.3.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
- sha1 = "978230a156a5548f42eef14de22d0f4f610083d1";
- };
- };
- "rimraf-2.6.2" = {
- name = "rimraf";
- packageName = "rimraf";
- version = "2.6.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz";
- sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
- };
- };
- "send-0.8.5" = {
- name = "send";
- packageName = "send";
- version = "0.8.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/send/-/send-0.8.5.tgz";
- sha1 = "37f708216e6f50c175e74c69fec53484e2fd82c7";
- };
- };
- "serve-static-1.5.4" = {
- name = "serve-static";
- packageName = "serve-static";
- version = "1.5.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/serve-static/-/serve-static-1.5.4.tgz";
- sha1 = "819fb37ae46bd02dd520b77fcf7fd8f5112f9782";
- };
- };
- "sntp-0.2.4" = {
- name = "sntp";
- packageName = "sntp";
- version = "0.2.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
- sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
- };
- };
- "tinycolor-0.0.1" = {
- name = "tinycolor";
- packageName = "tinycolor";
- version = "0.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
- sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
- };
- };
- "tough-cookie-2.3.4" = {
- name = "tough-cookie";
- packageName = "tough-cookie";
- version = "2.3.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
- sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd";
- };
- };
- "tunnel-agent-0.3.0" = {
- name = "tunnel-agent";
- packageName = "tunnel-agent";
- version = "0.3.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
- sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
- };
- };
- "type-is-1.3.2" = {
- name = "type-is";
- packageName = "type-is";
- version = "1.3.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
- sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb";
- };
- };
- "utils-merge-1.0.0" = {
- name = "utils-merge";
- packageName = "utils-merge";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
- sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
- };
- };
- "vary-0.1.0" = {
- name = "vary";
- packageName = "vary";
- version = "0.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
- sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176";
- };
- };
- "wrappy-1.0.2" = {
- name = "wrappy";
- packageName = "wrappy";
- version = "1.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
- sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
- };
- };
- };
-in
-{
- "body-parser-~1.6.3" = nodeEnv.buildNodePackage {
- name = "body-parser";
- packageName = "body-parser";
- version = "1.6.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/body-parser/-/body-parser-1.6.7.tgz";
- sha1 = "82306becadf44543e826b3907eae93f0237c4e5c";
- };
- dependencies = [
- sources."bytes-1.0.0"
- sources."depd-0.4.4"
- sources."ee-first-1.0.5"
- sources."iconv-lite-0.4.4"
- sources."media-typer-0.2.0"
- sources."mime-types-1.0.2"
- sources."on-finished-2.1.0"
- sources."qs-2.2.2"
- sources."raw-body-1.3.0"
- sources."type-is-1.3.2"
- ];
- buildInputs = globalBuildInputs;
- meta = {
- description = "Node.js body parsing middleware";
- homepage = https://github.com/expressjs/body-parser;
- license = "MIT";
- };
- production = true;
- bypassCache = false;
- };
- "express-~4.8.3" = nodeEnv.buildNodePackage {
- name = "express";
- packageName = "express";
- version = "4.8.8";
- src = fetchurl {
- url = "https://registry.npmjs.org/express/-/express-4.8.8.tgz";
- sha1 = "6aba348ccdfa87608040b12ca0010107a0aac28e";
- };
- dependencies = [
- sources."accepts-1.0.7"
- sources."buffer-crc32-0.2.3"
- sources."cookie-0.1.2"
- sources."cookie-signature-1.0.4"
- sources."debug-1.0.4"
- sources."depd-0.4.4"
- sources."destroy-1.0.3"
- sources."ee-first-1.0.5"
- sources."escape-html-1.0.1"
- sources."finalhandler-0.1.0"
- sources."fresh-0.2.2"
- sources."ipaddr.js-0.1.2"
- sources."media-typer-0.2.0"
- sources."merge-descriptors-0.0.2"
- sources."methods-1.1.0"
- sources."mime-1.2.11"
- sources."mime-types-1.0.2"
- sources."ms-0.6.2"
- sources."negotiator-0.4.7"
- sources."on-finished-2.1.0"
- sources."parseurl-1.3.2"
- sources."path-to-regexp-0.1.3"
- sources."proxy-addr-1.0.1"
- sources."qs-2.2.2"
- sources."range-parser-1.0.0"
- sources."send-0.8.5"
- sources."serve-static-1.5.4"
- sources."type-is-1.3.2"
- sources."utils-merge-1.0.0"
- sources."vary-0.1.0"
- ];
- buildInputs = globalBuildInputs;
- meta = {
- description = "Fast, unopinionated, minimalist web framework";
- homepage = http://expressjs.com/;
- license = "MIT";
- };
- production = true;
- bypassCache = false;
- };
- "request-~2.34.0" = nodeEnv.buildNodePackage {
- name = "request";
- packageName = "request";
- version = "2.34.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/request/-/request-2.34.0.tgz";
- sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
- };
- dependencies = [
- sources."asn1-0.1.11"
- sources."assert-plus-0.1.5"
- sources."async-0.9.2"
- sources."aws-sign2-0.5.0"
- sources."boom-0.4.2"
- sources."combined-stream-0.0.7"
- sources."cryptiles-0.2.2"
- sources."ctype-0.5.3"
- sources."delayed-stream-0.0.5"
- sources."forever-agent-0.5.2"
- sources."form-data-0.1.4"
- sources."hawk-1.0.0"
- sources."hoek-0.9.1"
- sources."http-signature-0.10.1"
- sources."json-stringify-safe-5.0.1"
- sources."mime-1.2.11"
- sources."node-uuid-1.4.8"
- sources."oauth-sign-0.3.0"
- sources."punycode-1.4.1"
- sources."qs-0.6.6"
- sources."sntp-0.2.4"
- sources."tough-cookie-2.3.4"
- sources."tunnel-agent-0.3.0"
- ];
- buildInputs = globalBuildInputs;
- meta = {
- description = "Simplified HTTP request client.";
- homepage = https://github.com/mikeal/request;
- license = "Apache, Version 2.0";
- };
- production = true;
- bypassCache = false;
- };
- "tar-~0.1.19" = nodeEnv.buildNodePackage {
- name = "tar";
- packageName = "tar";
- version = "0.1.20";
- src = fetchurl {
- url = "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
- sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
- };
- dependencies = [
- sources."balanced-match-1.0.0"
- sources."block-stream-0.0.9"
- sources."brace-expansion-1.1.11"
- sources."concat-map-0.0.1"
- sources."fs.realpath-1.0.0"
- sources."fstream-0.1.31"
- sources."glob-7.1.2"
- sources."graceful-fs-3.0.11"
- sources."inflight-1.0.6"
- sources."inherits-2.0.3"
- sources."minimatch-3.0.4"
- sources."minimist-0.0.8"
- sources."mkdirp-0.5.1"
- sources."natives-1.1.1"
- sources."once-1.4.0"
- sources."path-is-absolute-1.0.1"
- sources."rimraf-2.6.2"
- sources."wrappy-1.0.2"
- ];
- buildInputs = globalBuildInputs;
- meta = {
- description = "tar for node";
- homepage = https://github.com/isaacs/node-tar;
- license = "BSD";
- };
- production = true;
- bypassCache = false;
- };
- "ws-~0.4.32" = nodeEnv.buildNodePackage {
- name = "ws";
- packageName = "ws";
- version = "0.4.32";
- src = fetchurl {
- url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
- sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
- };
- dependencies = [
- sources."commander-2.1.0"
- sources."nan-1.0.0"
- sources."options-0.0.6"
- sources."tinycolor-0.0.1"
- ];
- buildInputs = globalBuildInputs;
- meta = {
- description = "simple to use, blazing fast and thoroughly tested websocket client, server and console for node.js, up-to-date against RFC-6455";
- homepage = https://github.com/einaros/ws;
- };
- production = true;
- bypassCache = false;
- };
-}
\ No newline at end of file
diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix
deleted file mode 100644
index 75bc6ec109c..00000000000
--- a/pkgs/applications/editors/zed/node.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file has been generated by node2nix 1.5.3. Do not edit!
-
-{pkgs ? import {
- inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
-
-let
- nodeEnv = import ../../../development/node-packages/node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
- inherit nodejs;
- libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
- };
-in
-import ./node-packages.nix {
- inherit (pkgs) fetchurl fetchgit;
- inherit nodeEnv;
-}
\ No newline at end of file
diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index a52515ed1a3..c33c0b31a95 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [
- boost ilmbase libjpeg libpng
+ boost ilmbase libjpeg libpng
libtiff opencolorio openexr
unzip
];
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
description = "A library and tools for reading and writing images";
license = licenses.bsd3;
maintainers = [ maintainers.goibhniu ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
index 0ed98ee947b..a50070c4ead 100644
--- a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
+++ b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
@@ -77,9 +77,9 @@ index 0000000..1bd9bb5
+
+
+
-+
-+
-+
++
++
++
+
+
+
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index aaaa7f3c214..9ddd39981cc 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -3,15 +3,15 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- rev = "192dace49c2e5456ca235833ee9877e4b8b491cc";
- build = "unstable-2017-10-08.git${builtins.substring 0 7 rev}";
+ rev = "819d131110a9fedfc14f3b3bea8f1f56e68b077a";
+ build = "unstable-2018-02-27.git${builtins.substring 0 7 rev}";
name = "far2l-2.1.${build}";
src = fetchFromGitHub {
owner = "elfmz";
repo = "far2l";
rev = rev;
- sha256 = "1l1sf5zlr99xrmjlpzfk3snxqw13xgvnqilw4n7051b8km0snrbl";
+ sha256 = "1xjy2ricd68pm9j758pb2axc2269ns2xh86443x5llfcaxrjja4b";
};
nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];
diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix
index 8936d3f222f..464e0ba5334 100644
--- a/pkgs/applications/misc/gosmore/default.nix
+++ b/pkgs/applications/misc/gosmore/default.nix
@@ -22,6 +22,9 @@ stdenv.mkDerivation {
prePatch = ''
sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp}
'';
+
+ patches = [ ./pointer_int_comparison.patch ];
+ patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol
meta = with stdenv.lib; {
description = "Open Street Map viewer";
diff --git a/pkgs/applications/misc/gosmore/pointer_int_comparison.patch b/pkgs/applications/misc/gosmore/pointer_int_comparison.patch
new file mode 100644
index 00000000000..4a715b6d859
--- /dev/null
+++ b/pkgs/applications/misc/gosmore/pointer_int_comparison.patch
@@ -0,0 +1,11 @@
+--- blah_/jni/gosmore.cpp 1970-01-01 01:00:01.000000000 +0100
++++ /dev/stdin 2018-03-18 00:21:08.474217132 +0100
+@@ -1273,7 +1273,7 @@
+ if (deg[i] < -180 || deg[i] > 180) break;
+ if (i == 0 && (strncasecmp (t, "lat", 3) == 0 ||
+ strncasecmp (t, "lon", 3) == 0)) { // lat=-25.7 lon=28.2
+- for (t += 3; t != '\0' && !isalnum (*t); t++) {}
++ for (t += 3; *t != '\0' && !isalnum (*t); t++) {}
+ }
+ if (i == 1) { // Success !
+ //printf ("%lf %lf %u\n", deg[lonFirst ? 1 : 0], deg[lonFirst ? 0 : 1],
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 17746563c56..52f1c9fb1a1 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -1,8 +1,11 @@
-{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel, libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext }:
+{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz,
+ fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel,
+ libstartup_notification, libX11, libXrandr, libXinerama, libXcursor,
+ libxkbcommon, libXi, libXext }:
with python3Packages;
buildPythonApplication rec {
- version = "0.8.0";
+ version = "0.8.2";
name = "kitty-${version}";
format = "other";
@@ -10,10 +13,13 @@ buildPythonApplication rec {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "12pj4js704r4f6idam3ljg7yllij9v158ayq6ym24zq18bv1nmbz";
+ sha256 = "08s8l59bib363ykg4djcxrc1968n5j1cjlp6fwwv7xmf18wd1a6c";
};
- buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext ];
+ buildInputs = [
+ fontconfig glfw ncurses libunistring harfbuzz libX11
+ libXrandr libXinerama libXcursor libxkbcommon libXi libXext
+ ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix
new file mode 100644
index 00000000000..5ba8e1b6e31
--- /dev/null
+++ b/pkgs/applications/misc/projectlibre/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchgit, ant, jdk, makeWrapper, jre, coreutils, which }:
+
+stdenv.mkDerivation rec {
+ name = "projectlibre-${version}";
+ version = "1.7.0";
+
+ src = fetchgit {
+ url = "https://git.code.sf.net/p/projectlibre/code";
+ rev = "0c939507cc63e9eaeb855437189cdec79e9386c2"; # version 1.7.0 was not tagged
+ sha256 = "0vy5vgbp45ai957gaby2dj1hvmbxfdlfnwcanwqm9f8q16qipdbq";
+ };
+
+ buildInputs = [ ant jdk makeWrapper ];
+ buildPhase = ''
+ export ANT_OPTS=-Dbuild.sysclasspath=ignore
+ ${ant}/bin/ant -f openproj_build/build.xml
+ '';
+
+ resourcesPath = "openproj_build/resources";
+ desktopItem = "${resourcesPath}/projectlibre.desktop";
+
+ installPhase = ''
+ mkdir -p $out/share/{applications,projectlibre/samples,pixmaps,doc/projectlibre} $out/bin
+
+ substitute $resourcesPath/projectlibre $out/bin/projectlibre \
+ --replace "\"/usr/share/projectlibre\"" "\"$out/share/projectlibre\""
+ chmod +x $out/bin/projectlibre
+ wrapProgram $out/bin/projectlibre \
+ --prefix PATH : "${jre}/bin:${coreutils}/bin:${which}/bin"
+
+ cp -R openproj_build/dist/* $out/share/projectlibre
+ cp -R openproj_build/license $out/share/doc/projectlibre
+ cp $desktopItem $out/share/applications
+ cp $resourcesPath/projectlibre.png $out/share/pixmaps
+ cp -R $resourcesPath/samples/* $out/share/projectlibre/samples
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "http://www.projectlibre.com/";
+ description = "Project-Management Software similar to MS-Project";
+ maintainers = [ maintainers.Mogria ];
+ license = licenses.cpal10;
+ };
+}
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index c9064d93740..5ca8bfcf5df 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -2,14 +2,14 @@
with pythonPackages;
buildPythonApplication rec {
- version = "1.21.0";
+ version = "1.22.1";
name = "rtv-${version}";
src = fetchFromGitHub {
owner = "michael-lazar";
repo = "rtv";
rev = "v${version}";
- sha256 = "0srm01nrb23hdmj3ripsa9p8nv2cgss3m6and9rdr875qw5ii130";
+ sha256 = "1jil8cwhnpf2mclgah7s79j4c38hzm0j6di2mffrqhlsnn2vxbf4";
};
# Tests try to access network
diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r-prusa3d/default.nix
index 88cb42e3f5c..3a55ea6205e 100644
--- a/pkgs/applications/misc/slic3r-prusa3d/default.nix
+++ b/pkgs/applications/misc/slic3r-prusa3d/default.nix
@@ -33,7 +33,7 @@ let
in
stdenv.mkDerivation rec {
name = "slic3r-prusa-edition-${version}";
- version = "1.38.7";
+ version = "1.39.1";
enableParallelBuilding = true;
@@ -70,6 +70,10 @@ stdenv.mkDerivation rec {
XMLSAX
]);
+ prePatch = ''
+ sed -i 's|"/usr/include/asm-generic/ioctls.h"||g' xs/src/libslic3r/GCodeSender.cpp
+ '';
+
postInstall = ''
echo 'postInstall'
wrapProgram "$out/bin/slic3r-prusa3d" \
@@ -84,7 +88,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "prusa3d";
repo = "Slic3r";
- sha256 = "1nrryd2bxmk4y59bq5fp7n2alyvc5a9xvnbx5j4fg4mqr91ccs5c";
+ sha256 = "0frkjgzmiy788ijkcqz3baxcrncqmk9s2vcd99hb8p2q13cg51ff";
rev = "version_${version}";
};
diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index 1e4e72c4e48..6fa594dec04 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "spacefm-${version}";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchFromGitHub {
owner = "IgnorantGuru";
repo = "spacefm";
rev = "${version}";
- sha256 = "06askkrwls09d1x382zjrmnvcm0ghfgz4cms2qbhdkazfyy0ff65";
+ sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx";
};
configureFlags = [
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf
'';
+ preFixup = ''
+ gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
+ '';
+
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk3 udev desktop-file-utils shared-mime-info intltool
diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index 0394fa83d4a..6e92e98481e 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -1,39 +1,30 @@
-{ stdenv, fetchFromGitHub, fetchpatch
-, autoconf, automake, gettext, intltool, libtool, pkgconfig
+{ stdenv, fetchFromGitHub, wrapGAppsHook
+, autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkgconfig
, libICE, libSM, libXScrnSaver, libXtst, cheetah
-, glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm
-, dbus, dbus-glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }:
+, gobjectIntrospection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo
+, cairomm , dbus, dbus-glib, gdome2, gstreamer, gst-plugins-base
+, gst-plugins-good, libsigcxx }:
stdenv.mkDerivation rec {
name = "workrave-${version}";
- version = "1.10.7";
+ version = "1.10.20";
src = let
in fetchFromGitHub {
- sha256 = "1mxg882rfih7xzadrpj51m9r33f6s3rzwv61nfwi94vzd68qjnxb";
+ sha256 = "099a87zkrkmsgfz9isrfm89dh545x52891jh6qxmn19h6wwsi941";
rev = with stdenv.lib;
"v" + concatStringsSep "_" (splitString "." version);
repo = "workrave";
owner = "rcaelers";
};
- patches = [
- # Building with gtk{,mm}3 works just fine, but let's be conservative for once:
- (fetchpatch {
- name = "workrave-fix-compilation-with-gtk2.patch";
- url = "https://github.com/rcaelers/workrave/commit/"
- + "271efdcd795b3592bfede8b1af2162af4b1f0f26.patch";
- sha256 = "1a3d4jj8516m3m24bl6y8alanl1qnyzv5dv1hz5v3hjgk89fj6rk";
- })
- ];
-
nativeBuildInputs = [
- autoconf automake gettext intltool libtool pkgconfig
+ autoconf autoconf-archive automake gettext intltool libtool pkgconfig wrapGAppsHook
];
buildInputs = [
libICE libSM libXScrnSaver libXtst cheetah
- glib glibmm gtkmm2 atk pango pangomm cairo cairomm
- dbus dbus-glib GConf gconfmm gdome2 gstreamer libsigcxx
+ gobjectIntrospection glib glibmm gtkmm3 atk pango pangomm cairo cairomm
+ dbus dbus-glib gdome2 gstreamer gst-plugins-base gst-plugins-good libsigcxx
];
preConfigure = "./autogen.sh";
diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix
index 78e1d15481b..444ab802673 100644
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/pkgs/applications/misc/xfe/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }:
stdenv.mkDerivation rec {
- name = "xfe-1.37";
+ name = "xfe-1.42";
src = fetchurl {
url = "mirror://sourceforge/xfe/${name}.tar.gz";
- sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd";
+ sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index def771c2f72..44310b05462 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -176,7 +176,10 @@ let
(githubPatch "ba4141e451f4e0b1b19410b1b503bd32e150df06" "1cjxw1f9fin6z12b0mcxnxf2mdjb0n3chwz7mgvmp9yij8qhqnxj")
(githubPatch "b34ed1e6524479d61ee944ebf6ca7389ea47e563" "1s13zw93nsyr259dzck6gbhg4x46qg5sg14djf4bvrrc6hlkiczw")
(githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z")
- ] ++ optional enableWideVine ./patches/widevine.patch;
+ ] ++ optional enableWideVine ./patches/widevine.patch
+ ++ optionals (stdenv.isAarch64 && versionRange "65" "66") [
+ ./patches/skia_buildfix.patch
+ ];
postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
diff --git a/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch b/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch
new file mode 100644
index 00000000000..5348b9ac905
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch
@@ -0,0 +1,22 @@
+Index: chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp
+===================================================================
+--- chromium-browser-65.0.3325.73.orig/third_party/skia/src/jumper/SkJumper_stages.cpp
++++ chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp
+@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) {
+ }
+
+ SI F from_half(U16 h) {
+-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+ return vcvt_f32_f16(h);
+
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
+@@ -686,7 +686,7 @@ SI F from_half(U16 h) {
+ }
+
+ SI U16 to_half(F f) {
+-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+ return vcvt_f16_f32(f);
+
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index a714e5b47a1..66d41a9c165 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -6,13 +6,13 @@
version = "65.0.3325.124";
};
dev = {
- sha256 = "196k48qy97b7x25vv5gvqhnbkjb8vql42qi1h0x8y8sp216sdspg";
- sha256bin64 = "13jq19jg1hy5w1bdf0wpv5qmr44161clsxjk01m0iysipkbldpn5";
- version = "66.0.3355.0";
+ sha256 = "1qy8gv859qhg5s6gi3mvdgg1s5wi69r6qkhd851nwlmmjhvarfg8";
+ sha256bin64 = "1z1s6i4yx20ayr6a2ycbgd0ipy1ncw4i19k0g8jbn639kynmfxjw";
+ version = "66.0.3359.26";
};
stable = {
- sha256 = "18w1mfsfd2yy7sf30d5wypv6mrdlsj3807xnab2gfi1kb8zjykyb";
- sha256bin64 = "1g2i3cj6hgr4p0mfvv6xd8lvk217li7lrzgk4j6k563zpqhh863p";
- version = "65.0.3325.146";
+ sha256 = "1kkc276jfhw2kp9pfg1drxm1h98d2cwm4c5c7xay2pbrhkypnzk2";
+ sha256bin64 = "1vv34g05x2jyg8hgk1r760g38rb3r17p5iwf1f1wqkjp3z6c952v";
+ version = "65.0.3325.162";
};
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index b28d4645c38..851c95fb1a2 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,975 +1,975 @@
{
- version = "59.0";
+ version = "59.0.1";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ach/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ach/firefox-59.0.1.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "12e4398b10c4e2c6364307098307895afd2a5054f729be61230a402b7fc7e55371b1ae04693f3aa87ec1d8a537d92174be1b61bef601d41ba821c8f4a4c4353b";
+ sha512 = "b982f2bd54312d66b7a1d6d6e775bad21eb1bce3bbe161cf980d03e55d4bfb5eaa217b05c16c72cd55165cdf7ee409c2e0a56143a82374f66c67609fed1464ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/af/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/af/firefox-59.0.1.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "5e5f7febbe069692edcf4e1e91cb1f2cf5b54b66e3f8e77c4920f5f64011f426fcd69f04ed8f84cee569f7cb7d11445dd59c6e308a58927e37955f8bbf75f166";
+ sha512 = "fbafd3dcfc473b7ebc0d6230cff487819c37b6f41135060cceca72e8704afa147edf71405c1367137bab6c8013fdd98ad487bd7039a291f64b0b37eb468d5b18";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/an/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/an/firefox-59.0.1.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "50f0e7b76401de5c5f30fb58920263b2f4221a02ca0e9f987e19d0150eab3b81da0f9c28f0c6b711a7666abc3a34f22e820c4a3496fb73bd2d736f8cbf2691f9";
+ sha512 = "b7cf1261c2e776874ecb7c709d82f288e74d16770acd3215fbdcf44f6167544e626c1f809e4d68dac7a040e0dacba0095d24c1994fe329e5613c7a561ad652f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ar/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ar/firefox-59.0.1.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "d0d77e62ef730af02ef24794099e022296563906019f955861886aee3306aa8326ee5c89e0cd3734640b2253065ddeb1f6941a689593b616fb741e5d52c3a157";
+ sha512 = "16e308336b1ea37bc7aa18184e30eee4f1a073bc1dfe009c515a338f6412de6ad19ce96653cd58aa99d4ca34476e16693c03b01b7d5b1df3154ecab58fca157b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/as/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/as/firefox-59.0.1.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "2b6333d2e36d44d45d64c53481e82b110a03a18b6156b7d2b0666645a193b116112e3c061c3a07d96b1001b4e8842821f52f3ee1dc6676c44d2b1ae89087d5f9";
+ sha512 = "a6de3e421126adf95a02911db3140791c5a5dc9030e63327fbafd5fa3f5d6d81f4d62fa705c84a573788840e921ea1ab71e52d08df443405a6c8b2e69773e76b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ast/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ast/firefox-59.0.1.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "c21a0e8b1b4c4a6e7eaf9558d2ec72fcbddac12e5b75c066596c57687f02559ed15dedcd5e1a5b6d719664b086ea2b9c17a6dae51ac85a6a0019a8a44f50bf4a";
+ sha512 = "2bd15deae2a01d09a622df87ce5329adb5d5da2e76dce678aaee202eec2a7ddd0ae79de205d3dabbcd189fbd3aa5293ee551c31bb3850b3cd7e5c02d73862548";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/az/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/az/firefox-59.0.1.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "c057c7c73a9946aa8bafc535e3da57c59037c7150d9b3152ed993587999068712d05dc6625c1a36c38665f5495b4d147f48d962479ea849073f76e7f218e5330";
+ sha512 = "ba021c1531fbcc1c7f4b44f798d0046c39b2578fb4fa8f81927f7a4bb3a3e8b3d7de545bb2d818cfe1c095cb4387477d05541b5e5021c56086a700e8cf928b64";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/be/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/be/firefox-59.0.1.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "51403b2a65b4c4f3839b53793cb88d941e50c5b14d63f2690b3490b63d9bdef7c12c82d2ccedd633d9811b01dcadae9b94d5c6a5c6bfd59f7a1710c2cb1d8ae0";
+ sha512 = "ba5ac2b182f9534825468829b62359f5c24a2cfcfc0e27ff47469b814f746240155ceb228bb7fdf1855e378048806b70106bc0a3999b0cc2d4f69b28f7565784";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bg/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bg/firefox-59.0.1.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "5251dcbd0c87bc2d41f7ea1487e9ca4aff80bfaa8ed2be8a76ec96388587b41cf9a4a80f8936c9b770fbfc9f3d1b1716f6f8d591b6bd523e3bdf0baf35e8b5b3";
+ sha512 = "a1aff58b327ffa5dc62975e31e59306350bc8b4a2b38e5993aea4ca70fd4c0e295b7e25a8deafc9d354fc674d8c55ae917a110bfa832f54fd0067f4e2f35dd71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bn-BD/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bn-BD/firefox-59.0.1.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "3010153a9285c5f85eaf5910d93ccf64fc903db34ad8183ca7841040cae522b004d257bd17325d5fe333714baba4f300ab9b1ccde920568f849105acc4f5fbc0";
+ sha512 = "fe96f073482488f66f0b7a46852d763212e444c80cba0f495e275b4c73711374949d742bd8ca0c69cb9e662e71b13b28084c004b3530f702445796d7c1716f0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bn-IN/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bn-IN/firefox-59.0.1.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "12f013cad7391649482bae272899a74d0981df94693105fce9e22fd7ca9c28bd992c2f80cc68ec5e70713d82e21cb015af5a3469b7868b89ea182d2b8b41a52e";
+ sha512 = "31d8f589ec72a8ff3315fec3bcf9894ff6590768f2c380313c38efa2106bbc71bd11d54b553eca568cee0a7768f0e57b3ef8038d14ae2615fa1160145b123cb0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/br/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/br/firefox-59.0.1.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "f00b92c8328e7e97abc5b1f4233a49f9af396cf147e4ca0682b54c541fd40d3c03252464d6ad888cad06f8e79b6d02432e86f944d297457a4cca2fa668f3722e";
+ sha512 = "7ed8310521f981a4ff75037198a9bcde4fa07077c298c43f5baf532e84be017d604d27d59ae38c10d0c422a1cc793652c148e7c3944171044f4e9f267b64993b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/bs/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bs/firefox-59.0.1.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "70af2412a775157473b3018c630d6786c650cdbd5691ef893e91807020d360c37a3031771442f3e16d678658ac045bd4fe8393a35951ef9edfa77242785c6b41";
+ sha512 = "7ce16040b19d61d39936fd220351d6dce0210aa0edc0494d1956d1f19d7e027cb2d8d100940bbc34a77f05d305a5af3708d16bc78bd9b2364407bdb71ff05052";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ca/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ca/firefox-59.0.1.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "6cf8206a6b92878fe6cc789619eb92f231d758faad1cec562329399529dfa7671dd2245301be7d75e98afe5714185826f4ce13748a01c768bf186805be579488";
+ sha512 = "8f8ec749c55c4dd930d3e359b9a3003edddfb6ca36f6f65f0119d0049b09a4c3cbaf558178a327583769fafa2d64272099882833e2ef7d6956b606c05f8a6b76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/cak/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cak/firefox-59.0.1.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "01891976a3053fae3d8ad723456e2003afe75aa7904549f2d9e5cd3becbc3e33c3ae73755ebe6b92d9bbe05a2f3efb52e0794cc6a3f1c00cd9b376cac6f85818";
+ sha512 = "41f6ae5d0aa44b90724e578d51ad7a3d6903dd74d30957a8786cddbd3ae427da0a453c1504a11ff13ab9dbb350829c1928d27ca0ec67e94995346e1414109e26";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/cs/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cs/firefox-59.0.1.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "d307d2a2be21ca964e2bb48ef062ca4a84229108d8047e601cd9f650fb0c0445f477d08e48cc6fa3a6fd0f3877a2c65527ce98c6e42a85aa8b1734ac0467b9de";
+ sha512 = "e219ec91c7346a72b64503f89088554f8d322968fbed0ff764d90df53fac06d4febf407773192530ad98d6c51dea23fb7c5f07e2b9099c736759a3b60b8b0a48";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/cy/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cy/firefox-59.0.1.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "0d5eb86ca615908701972a03e12ab2485ecaa22ba6a5263ab4bd748fa91d5ce1aebea2cf86249e25fae46a3e50404d2f91d10937da6e85d9695ec70f04b92857";
+ sha512 = "c6650b47193449b28e1d9f6420b59c1235986ececcf724234e26fd8168f52120274d3d8acd8aba036c494393eb635c0ccd68833a1961a36a10b04b1a1050bd7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/da/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/da/firefox-59.0.1.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "f304162d5da09f87b318dd0c9f769d8a0dc37d205b1a1cee316b807c6b9ce80d5252af1e5fdef8da9d2575d5722d37cd15ea1cea587670695e1c3b577006050a";
+ sha512 = "b66299d7f65fdde01b644a21524635806c703df27cb4eff928189d65285f12140926e8d20d1f83b54263b8b17b7621034ac1da5867fd28d36b2733212c9b65ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/de/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/de/firefox-59.0.1.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "699ecbc68675286294d2917e5d024ba4705d8644a5c43aca5ccd5cce43f06717d853c109290806990909e55f0fa47ef308d9c1a9818502b1f9ea527c5d38dd60";
+ sha512 = "463ebdafacbe1eb4d0df9d4843ceb41849fc2680404e1e5f4af563bcd4fc4410f8cb212a396ccfca874c37a4cb245bfef8de4aa9620d3e30908f1c94d262cf71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/dsb/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/dsb/firefox-59.0.1.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "050e15e9e82638bd70a8a3ae845da65bf7021bab70411ed33b686b14aa8ac96a694f85a4ddc36b074ccffd63704c88e77010d24943bae6ba76c506cd2c2fcd92";
+ sha512 = "947dbe47ad286c57a62557532232a5e833cc6f7b6295699415c727bc30cd1cd67074a568c1f842e3e7b95460595b16b0a9c87e94f38a37f22b5e8db82a3a4932";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/el/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/el/firefox-59.0.1.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "5655883ffd4d55900b50fec19436c475c78a6d9616c277b1b547b9054674343a187f3cb0d637e08c45695994ab9173d4cd0fc24a0dff9770aea9f7defa9e53af";
+ sha512 = "b0d5015676280816cde17b217e078c8b912aaa87167317393c0c20b8ebb27460ead4a4656587bda19b93fcf4362e07ce11a0f5410cee733ab44bc2b1f0a1f093";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/en-GB/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-GB/firefox-59.0.1.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "059034d9f6be9153111e173b4c55a8670a94675aa574bd0f0859c93c0f32ae949b849bf77816f68f4e6b726bb0cc5ee2ba1b68c7c76beb72b2fe99a91183e296";
+ sha512 = "94864d56052d619d495c527af0941979470a3c7410e51c01e5a04be565a62a29a6055eaaa9f5b4bd6b443fb87702f52c935b3071b4ddccaf97a494fc2256728f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/en-US/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-US/firefox-59.0.1.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "0443db32335191e1cc2f65512c692663aaa1ffcf05875b9d955a9afc7a651999e0e1c81e515ba887cefd115a4db541999acca6014b7a3fbe89784d3077185905";
+ sha512 = "ef8c7518bc9abd2f730efa428ccc418410c7c571b32c06633ecf82c949aeb3e4006d888362ab511d55db98ee2d6e152f9ed7cecdd976272c89f8cc5957c9132e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/en-ZA/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-ZA/firefox-59.0.1.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "78d2e567a791ce410442ab0b8c12e5e4f5fc671f1f74870aa02ff3b08d69f51f7e06027d81f917ce79f8422548731bf78c6bdc208472e3a3d97e0b0c47139e57";
+ sha512 = "7e172fd957b000d77e4ff832ebbbf6b46a192668289394370ec95f12e5f319cee59da140bb3a809bcb7e161349c32f682083e7639bfb3f6fa5cab53ac4f33716";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/eo/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/eo/firefox-59.0.1.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "2e6a42a96dc3d29b229de4a214fd2106424cc702d6fd2a985f0de6854663c3cf3b5c1025e2f2032bc4c271efa02df450e8677cec516cde1114fcccf5b506c7ac";
+ sha512 = "369e76a861625bc9e757980c896fbd1563e5127ce770557aa7e81cd80040146af62c526ab148168b2a078a9c16432e97e96ca4fffa5db5945c3475353cfc894f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-AR/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-AR/firefox-59.0.1.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "48d2835f64b8e010288daaa5f9023b0f008479fceb3f08a19dcf7044283ec922632e2cb08725676ffc3b3406a379df790fdcb3c928a2a02ccb66269c91109c63";
+ sha512 = "a053bba1fb77617ccd9b2bb1595ebaf040760307dedc9984d3ccf5212f572835f9463611f38bce684e71728b04c4d3e484cbe6c20875b0703d39c3fdcddc6cec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-CL/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-CL/firefox-59.0.1.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "e35f259268f34fb0df14b85d5d50ba9ec55cb3a905df88b488a5c552f2820f426a86d7d820c8ea92055ba51cb48c2cf2c41cac2fb0d863f4e341d316960322e8";
+ sha512 = "618eb3fef5f3669bc104ba60b76cf280503bbb4f2700341e95a6024fb3113c56388fcfeca294e3fffa3af5db15d639c0e7613397505c63509d7f248e7a1825e2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-ES/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-ES/firefox-59.0.1.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "2b09055ff9a4a803003d98c4223c328502f863419a70c0a4f56d92df04f2b484ece4a86caa0cc670538ce91c7add1d31885493d5e49a3fa33d8c983d67443600";
+ sha512 = "f8fa78438bf7561d422d9187b16c1284df2a79c6f8cfdbdcd838501b5f2fca1d2e05bfad6d59b9484f46e4dabd2630706a8c47f3323534e24ef4c8fbc4937a56";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/es-MX/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-MX/firefox-59.0.1.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "1520332a48ca76d9101805943b7a40a6c55ac1959650361f87725fac542d8f6dd5f0ca4564ef28ad2375aa2ea9ea49b31c14e34687b566105b7098cbe8a4d4c9";
+ sha512 = "4dfc8c70cfd5eca191ed4feaaf8c4dcf2dadfd7226f1ebd939997e8bdcd7d867afe0c27a51cf5d578c380665023770b2e54110dc2af78ca63a2a38165d879665";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/et/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/et/firefox-59.0.1.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "330f653d29f02c7db61e1009af54a2f2d95e8d2a46283681475f988781dcc62650886fbdf4729448997d8eec8fe6aa401e095d7b0284a67682c3ba4ee24e0d4e";
+ sha512 = "9710192f0c87ebbbd68bf336f1560007a86f9c9d55ee3df7311725f7c81e1415f5d5346378fc86424cf1d94e51efcaf791318f040c3652132dacce59a8c2668b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/eu/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/eu/firefox-59.0.1.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "4a37bd50167f6bf57f7f89f12314bbe3bd198003f8bbe9c45c7f38b06f51956a5dfcc2cb65af536044b64b22ff778b274d5f87867a7f1d0d6a74aa07cfb2ed59";
+ sha512 = "47a76627b97b2190f532ac82a6684787a6cd45f4f831b2af6315e6242367af68f84be7965cb6d91df89d8e43d04655c0e41231eff0b86cf329ffff5b26a56dc4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fa/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fa/firefox-59.0.1.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "481a1a26bbfad9376f7da898d4aed4b5637fa3a8f72d5f2dd4240d310ca95349f31690df7ad4dc1316360d2c4837a8c40bb4b7261ef6459ed05bcc870fdda987";
+ sha512 = "3a888e43b737998938a624003c6eca6362aad95d0e13203d655d67c4b76c69484240da43d00e24a809e1fa40b18249c9549d52794f9cd92469a028ddb4b585ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ff/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ff/firefox-59.0.1.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "be22da0887c10742db25bdecc28170652fac7e3aa819e757b900e321cbb86e3570dd0cc1dc45ef6ae56bad7fb407f5081d656be44dd5c161294e6087ff563ee1";
+ sha512 = "365b907bb5d720874d206cc2fd3e6f21095ea1681a0bff5ffe51b49135bb3b3984e5cbb0a50951afc5bab3ef2bd2ea55af29912d25dba8f4680bf6bc25f24b05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fi/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fi/firefox-59.0.1.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "f9cc91a350c243fdbc80e4d4d85024ea805face7406098c2c016c154d7e705d15e6445478f63e9ef62838fb3ea74efa186336d14a57ac715df025f526010bd05";
+ sha512 = "9361b0554f221e13c4146f9eb0df4af64625062a368ff828d80350e932ef0bf6f9cd87e3399bdb42ca5e7ca0dfaec9357d57a345a978ff936958ddd074ac6c67";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fr/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fr/firefox-59.0.1.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "774a038f6b3b27e7aad40935d33c770cef2b0553b78ccdaeeecb23d1c153898beeedf14c59762581bd5ecf4489e739641d4ac04c44fcb64e40da419c232c79e7";
+ sha512 = "61123f188e491c32e9b912026554afee17d83ed8bb3480bc6ed8f10f46049e81f2444f6850c5a9f7841f9e897311ac0955105401fd2661ee703243c6e204fd60";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/fy-NL/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fy-NL/firefox-59.0.1.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "3d6149960c5bc044db065b7972e6c55ee74bc650ddff5ea127224d081de2122427fc6166d89448402bf8d07147d847e1be86c28fd4b949a3b2a90337979eefea";
+ sha512 = "4575949552f1e0951d75b2f3eae5a6ea5fbbc6b69f0ba5d82b69922209a46b8f9701112cd1dd61b6c892eb1f4e6463e28874f3f84891e3eca3de0b52036ad429";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ga-IE/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ga-IE/firefox-59.0.1.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "6d6ff8e7425ce6a5ab1a30936ba52e9f9f819b31b3b4cfa2028829a7260ab489b785e1f56d2095f3cc669e5b7647b5c5622cb751bfe90408b0c4c7edc09dadb7";
+ sha512 = "4a05d48803502ee435ea3b50f38ed262aa57048b0f013c7165af37ad44494a1aae7f643e14d5aaaf7a2d5a1085a67a078e70ade9e614bfe33295351686661ccd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gd/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gd/firefox-59.0.1.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "84c99ebe9add8acffe3fe82b7d0f233dab91d251c1211b4b0c79cdac99f272a12a551a91c6568ec0298160467cb17e9b2c9206ce1b8f78e2bd8e1f6b53bada94";
+ sha512 = "df9dcc72aacd44ecf73f0ddc34a6d97dafc9deddb35075273c2b958b2c23ce3a346433b050766f8b83040c495c2a84b454cd7742cdf6b59b69894a94553c21c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gl/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gl/firefox-59.0.1.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "8f5ac4fa1549e89946378dea8af31133e4918f4fa09f6392aa048aed8161e939f65bc5a86f44a416c55cf5f770eba27fe862d9c189f448f93bda44c50f01142c";
+ sha512 = "3f55336a02249aa06674adbe8f378ad2b1a7b99164608f04cefe8c642ecffd336f9f370fcc190debeb89f97f630032d41aacb46e03cfd09a9a20bdf5f207312d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gn/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gn/firefox-59.0.1.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "55a4ecfec8f853f9f97e3f810c377a0921f1553fde6fe60fc7e996c0f20b2576997ee4999e392687606ab89c20e44507db1668a8f5ef2491838da9951d9e8bad";
+ sha512 = "9bdb650bb25ad573a5722595d7b062b370d79ef6a9079354ee467ae8fdb8e319d3b666bef0569286a868e7d64453b2c69098945539a259184334910f70914211";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/gu-IN/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gu-IN/firefox-59.0.1.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "487a830757aecef4a8158f52231ba7128c4d0ccb1831fe986f78cf627997927b43ddaef073882b5d3f445c27a4a80c5960204c5ae666ed8d889531f06b433807";
+ sha512 = "5f2621253981d58aa643da76dadae44da76bad3f50d08c35c43d52da5b0a8521ee4c5df5262558edb4b2bd817985aa02d6ff908f326d99ea58dd4d96b9f04819";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/he/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/he/firefox-59.0.1.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "c6b0cadd23930933b80dffda825ab9bbf5a498f7d8f92c0a2e74e7f82b5bd9c19bd4f73f492ca9c7350015b0818d702519c97a3369ea3e7129caec7684737688";
+ sha512 = "ba7b0bedc2f8146dddb7f0a8a2c357dea4d23481e85f23e5d1f820da6b9c6ea84298ef609967e62741a2f9b57a6c4e94b0a90896daccb80b888313c75359879a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hi-IN/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hi-IN/firefox-59.0.1.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "2cbfa8f66aa329ad2311cc73b545f09236dc6f014f009cb77bf8ba1886b665002849f2f1a85d8827baae706557436203ba9f5ac85eb7a11766c388a7bec3087b";
+ sha512 = "7804c9b6bab169fda70db8ff3f638add9fc22a6b8f9adde30482558e97d32946085258bfdf93b0e67a35709c474fb3aa028816e7f501dd554ef05a282f656815";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hr/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hr/firefox-59.0.1.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "c7ef4d6c42685ce58402a3a7d42b556280e4bce0633d0d0125aaef391e7a0ebee17347c848928f134af3b2327ea547121c7834b33b98732fd32e29cc2bd739eb";
+ sha512 = "e97cd1b68d5a1d471edfddedbc05321444880dc9ad2910010c447515ace632c25b0516ca1dbd529d44777c8f9046b5a660a768bdb35ac5e199d1685724c6a7ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hsb/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hsb/firefox-59.0.1.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "ea42844766e41d634b4b50fba65cbbd4e8f4813bb56abee12fe8c559c031ba54e73aa8725074391b879f9ff88cb9ec285306bc816039037c7306ebbc8cfe7a82";
+ sha512 = "098842a0e8226eee716859b7e1bd1919a2bd251bc368ff6df58c95b556dc503f15186bb483503087a7e02d785453edc77d081e267b08487c0ff874361a82ee1d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hu/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hu/firefox-59.0.1.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "8e84cff8c9a20949d7ba08f57a671ae06ec4b3181cee67894d752289193d6652744611a82c666275e9ca6d03b9aa4b1e73637a9435fdc25e3dbb2100d53ed021";
+ sha512 = "cd6846f6268d96f84d405aac06c11322e188da3124ad848faaaaac7cd562c004655a8f7732294b0ce2ca42597c82d82fe8b1eb65dc5b0b659f7be342aec648ca";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/hy-AM/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hy-AM/firefox-59.0.1.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "33771438db83a53231502eea1921948c53095db70bb09e7ae354615af294b0b85c7318944b8cc524f6a6e8386b351153993b9368ce38ceb8f57f7486d2626a58";
+ sha512 = "3e4f4f536c4dbd4337e301272fd433e4e0ea26976f2a5add8a0d90f310e2c3fb14a4b558c556214409788bc2be09d36bdbf95bc5385260b70408f00ec71c30da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ia/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ia/firefox-59.0.1.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "1f529c3d83d419a8890f947b4999e9b27c6963987879d25c72e7f4217c1ed7a6c471822d59697c252f18bc5d0a10f869e63ddd76c2b2a762dd150e92a6c63af7";
+ sha512 = "35adfd5eaaeb3d40e32d501ff49979e4db878b6fab5598d64c3943cf57f846e439ef88693b39a03df65367436ce3efada9c367ee5de20a1d769620b00299bbaf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/id/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/id/firefox-59.0.1.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "c18fa29c6dfd11fe311440fb4eaeda46077b9270945d02d6e88546fee0682bc7cae8ed41a2cf50b42d851bd7b61f689bd3f6b92970b1ce7e314a7822a54526aa";
+ sha512 = "3203f599f6ed436280143aaa563780c64864488f125462a56241785f9e7d6d48b2d3fadd0366fee131d575d8dadc8ca4820716a03de4c3b23eb0f0b033cc73f3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/is/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/is/firefox-59.0.1.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "2057a0ac563b16d61ded5ad9f5ec45baf9e1789303d7fc0707a94caf2eb193aeee11610bac46146489993118a3a2b1aa0e1b8f2a4bb5aa0be95d55d48bc52092";
+ sha512 = "2100f728268efc1d2c0f96e745e2574847aa844ef4366dab44f9f0d89e79372a2180d530c7fdfe627e17644871b3a71387037057058a0ebd117e187343b5d1fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/it/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/it/firefox-59.0.1.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "175ec65442e20b0b05b6ec5ed104117163e25d96e801bf268b5a58ffc94d8ae91f237d0d88157fa70792e1b9ac9b3fa6e8dba8000e4f0d7f344a1598a56657b7";
+ sha512 = "abef6687c0e0b90f9857e29d5b82ded6dbc0b304dcabf2586e1328bbfb9948b37f582a5ac1c58cb46026ed674863c437a15872c46741fc4e8d0a4a4be80cc05e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ja/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ja/firefox-59.0.1.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "ef2aa0a3409fdf9553bcf11a6b87a86165f976a9c84587c369d32d9c25a0387b991d71e9c3333e603bf73e37db2c79b3fb47a8391ca75a84634b937ab9a7cf39";
+ sha512 = "d953aabe2368ebe9f944d91769b6e0fe18b1b5ad819040705283af6739b03fdf6fe9f3cfdbadf5231c9789ce62dbbe831035f8776f570e0be1e483b6eea578a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ka/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ka/firefox-59.0.1.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "31e09c540764e993246f929c6a8f1b8a0bb5b35856981e5edf7f55b4226caf5dd1bad2d4d1eb63f915b663c46a4800d11b1835c3234a21f5bccbea6c263631ec";
+ sha512 = "52c4b6338dbc79a670b33e97d7996daf1ef72c22982f16840ea0cde0e6ec16eda6eee1688e6eafa2ce6eaa9cacb33ceb7196f2923c81d4e1fdb3af9c200b9c7f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/kab/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kab/firefox-59.0.1.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "95105aeb8cff505ce4b6ad401bf1d823818a3ce9f64a02154c628a7bffac0a8cabfebd9cfe623f8bf945128f44d673220abf770c30c15b942e59ecbb36310e5b";
+ sha512 = "4832c730d37b5890a85091109ca150b882202be9028b448aa57fa8e74a2f91673d2c6be4e963235c0453cbf070a996423e64f7cd93caed973d5c5018d26d7a4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/kk/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kk/firefox-59.0.1.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "ce8f9488fba0789ed8d39ca3e2055a8b088761e0516c4b214421443a5d5c88ab9f732b600e937fabfd8b9f8cbfe35471bf8c8754c5e20ed103c986d945b2ac71";
+ sha512 = "efb2fac05f337f22c326822efa17f7063dc71180d54621b95c000d6c86bf5180d5ecb012ab72cef23177cf07d7f46f507bda862f87dea507a4c1be026829ca1d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/km/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/km/firefox-59.0.1.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "a31bf297f9f9eed047cff8b3ec7f5638caf3538b5662f8d2ecb8f37e54e22ddb1fc37c6c8c854d3d95b8e49cc2ca82e9aeca6894808b3b77fd8642c04f7caad3";
+ sha512 = "c7817dc8cd3e78b15708a863727627ebcdc6ad054da252f273a6e68cc914f5999fd6d7495d64586e1d218c068c9f38250db0ae54944a67f1116e5a12132c9dcd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/kn/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kn/firefox-59.0.1.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "941d71e3763c16d6387f397e7d6c7771c2b9ff99e1eb8a32ce188d704f3f89aef2a6c66e5397fe056725c25628960a8c58d5b2611c8728128ada60e92e6dc95f";
+ sha512 = "9ed4c6d0a6a5579d1cb32e35a97df2b05d836e5eab5df59406da4d86ebae6374c38649232c2dff849865f538ce4264d8f08c7fa6c778f9ac65362cd47297ce51";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ko/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ko/firefox-59.0.1.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "5c013f5a5b9033fb71896611570d3a465b7e264eda5f51f480e557ef6fb7eada5f291b714282c7c50bbd7b75a7d1664879e8575419e71e40a45043c031309e07";
+ sha512 = "f133fda3bfbc59f895ead4257a097102af10954f0fb7ddd6bc9337a520641d8f1a26bd86011c0922c2770e8191e68d96e46d56a76d498c7a44c713207a9f8585";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/lij/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lij/firefox-59.0.1.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "f94d01a0c63bae58027d973d67fbacc76b982abefe561ef086b4b897ea686d9c8521a81cbb8a2f1ee25f1402935107f42821e7c41f593b042891d6e8285000f5";
+ sha512 = "e4d55a021271186cf3553781aab1953c9bc53b86c5d8550c6d45bfcf2363dcf32def20d411c4df10aca3e7c2a79ee527b23e248910ec1bbef8d1e15793e1b831";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/lt/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lt/firefox-59.0.1.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "84a60ed8e168c63528c8b93e9e77eba73f27b6dad13e6042568272f992350086e72735cd184da71075d8111d1fb298a79ed4fc03b4734f83d13842a6a9715ca2";
+ sha512 = "a08315a4134181e2f8c559e0c70ff05b1455f85a85d5b5b06c5b8cc70bb17f3761468af42c27be476ea3e342365262f18b98c523e35576425ee8e5ef8df9c362";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/lv/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lv/firefox-59.0.1.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "6faa48a449627279bb291328428e4031e2e3f55d1ff6e0805e720a89c20aa50dec119fccfb552fe9dbfa302a7da560d63f1e0f4f053dc14cbb4df3a79e21b609";
+ sha512 = "e6e62886b8bf972668e3da6452bbaa970cd16aa5593c8a3d765e0d784ba755e17641a1d7e5410ea6474484eb14b3b6b18b69e3be38f2e2ff30890afa18c9a405";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/mai/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mai/firefox-59.0.1.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "00dfd076186f53915d26016107934705c4585edaa17a5a3a6887ff646d2c4583620b052f8fcdd66bb5841b5b63252e64460806c92ac895879035e91c2a957724";
+ sha512 = "a28537a457989974e11161ae84dee2de28d783447c0a0a6b5b03a36fcd1650d609ddbb40ed063f0c68149d314b1eb17dfe92d5396c855794d45a0bf8e3491c7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/mk/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mk/firefox-59.0.1.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "a0905eafcbc262c367cdd8ed94161a71bf0916727fb728033dd4f43462693550e90da9479cd72d8f9d644bbaff95cd2a04a17ca5fd4e90c151b3dcc6e8179c27";
+ sha512 = "da601ab25113316cb9ad44d2a8bd0eba23800fc97ab18ade8324048b1d7c757c51db9fe039992d18fa7b78846b5be496d9f3439500448f21d66a9d3a335479ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ml/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ml/firefox-59.0.1.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "53bcb3c892761447c0c0f62794d1765536d5ab3bb99e9d076ca75280b93b86d64694355569fbbdeefdf5b588bfaf90b0e0d0ef10f30b1efbb9a37073ad5cece1";
+ sha512 = "eacba5bf549f1398f561ad574775af8c749251f9d4a57a2c91400236cb2b72b00e429d4dcd4597b6dc6fe95a629d4b56c2c1776e03cf5d158cbc85743bbdd443";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/mr/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mr/firefox-59.0.1.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "3da0e724bd03a088d6e5f14bba294290800a46b245867381333d4f32e7c53ed2fa2e2ec0c7aa5d57b3a5af6e71310416b83f3511af26bb0431254bec387f1af4";
+ sha512 = "e9e9b13cc3c4f48871d5b73ea88aba384d0ae792f7c2bb49f41d5b7da36243c108dd96925c122abb0b202ba8ee7591d8edd783546402c2066f5459883a255897";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ms/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ms/firefox-59.0.1.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "6b2e6861cb3feb8987fec2e72e3bb958bc6d2884e4c71f5a762b57f17981130439e85a85acdf7285b4cced9b5088e34b7736a2dc57d35eaeb14185d88a7b7415";
+ sha512 = "edf6153c9e18e620558e283086a96d49e484a74983b7d5823b1c17f9276f3c41d4282a46dc120a181a7e53595e1434f56658d34b2cad4c97e30753c07c899fbf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/my/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/my/firefox-59.0.1.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "18201ec177a93ea77f8fbbd201754e05dc6126954771764778e48833f858c3c46bece73ac4698050f4f6126ef9f136365f7387d363dd274063d6bb46d23d527d";
+ sha512 = "c153e6cc2bb3ea49de8dea3661b4c5ec23193cd40e68da8160108b40fcda6717e35e7ef3bd2708ac2e47014b224e53f74b9183cb2c50f36d517f1a5ade425d40";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/nb-NO/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nb-NO/firefox-59.0.1.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "b18a913ef9aa15d43ff201f61d7350e41e0f8819a835bd777ebb29607f82f3b4d4e223c5c035b2ea49bc4306c489190f55e545f79989440824742b7ec22b3e6b";
+ sha512 = "1b94a618ec8f132bbf5b246354da4b424a682fcca74259b94f1ff5cb12cb0602d327dc7b9af2814fde45e5da829159df316442db6388fc45bee8c8255418a1ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ne-NP/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ne-NP/firefox-59.0.1.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "6f4fe4817d6204d2b1a93fda7e070ab17aab04148ab33508b4f2e4aefe4e23ace3cc1e3a0cf11df35582ee8f39e841e14e151d668f411529b99b0add1ebb34fb";
+ sha512 = "552aa2504e1d5c15a413a0e7e47b509d37a8b424be9ec4371f0920a9ac8b6ada2cafb9adf054b695499d41fc9b606f6f0c95d99104318cee1d69998ed7bd1812";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/nl/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nl/firefox-59.0.1.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "8a74b28ea9b288c8b35136274839d77c8bbbe0a11a2f3ab6b9577c000a8c3fbba3d1a053dde2ac336e91ab5cce4d5809ee0c08e91fb452251f2c33714c7089eb";
+ sha512 = "2449c6f7cb6106e7f49b5160ecf973a73882d653c68a8e5648a31595367ba41dd93e334f3a67e69958f4bf429a17069bdf5d66163f2be14e86068a30acc29045";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/nn-NO/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nn-NO/firefox-59.0.1.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "1e06c148bda453f841f837aface7dfc228b20c8e10d84afd90a0cff2e12a457c5f176461d79543e775c45bf4dd62d7cf1048bec5d3574c5dfcf62c8e6609b487";
+ sha512 = "c80169f8f2cab78efa8ad06a6e3dcea41359bfa2b4af7baa034b88c934d27243eb5b20b4ca4f956707472daaf1e315ee4d34e5abdc25edbdd0b8aa3915c14d5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/or/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/or/firefox-59.0.1.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "bc8575ff5aefdc8df53bf121733189775b1c145c189ed4b0ae8a99fd1f8f578b8380836331f77b03f766bbf9a4f1e6e7c9bbe6087686a14f0617569863c76d86";
+ sha512 = "48ebeb9e4233b303bf5300c9d7413c82f9340a7f1fdb4ce23cd9868ae6c8c7b61532535dde653fec0f9a56a3b8d4595d451c3abddee75f6aeaa5b2450f26b0d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pa-IN/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pa-IN/firefox-59.0.1.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "0d32075943cfad32e01df6a2efdfd20a4cab604227b44ba45d8389de18de020dc137096d9de602dda5cc9fabd80ab07017fde6f8ba6e9c46132fcb98908eaac8";
+ sha512 = "4d2caea086ddd56544b59793d3e2422940d64b16a623e9b9717329a639ce8a89f9e69d7c8ed9121bd08d692462c99316e1364d89eb8d1cbe978c67f99bff2469";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pl/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pl/firefox-59.0.1.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "c114fee704632eaa7fad91d82836329bc873984ab836edfb2d4b880be07e308bf50f4eb0989995a127bdc649501e9a4c76e91b73d5bba9b9ac67fde22b0a02ba";
+ sha512 = "6d10818fe57a2b10bd5cccf068f42ef8e2d949a79c4ce6e4b2ae088944f17dee8ce14396b2e3f86d492e3ce31780bbd96ecd4bfe39cb8e15dbc70cbdad6a3927";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pt-BR/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pt-BR/firefox-59.0.1.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "831f0f1e1442520b96706b672c2c34f46a1335808d552473a5eaec898fe7b085485b3c66535356731507937dc2d11f2082db1a182404d672c479f916868283a9";
+ sha512 = "b2a8732a03983b00e7e606099a215a8b6545e093e243662988400e059757f6699571a29e6c24433b345de5e47484d19c08685fe1b5410d71bfafe023d3bbc669";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/pt-PT/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pt-PT/firefox-59.0.1.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "9a6d7559d79808d47dd0dec15afbc477d599be476761d48426ecda6ac96cd9ce560bac9eee05a5020b8f6cb764d07546ef2fe59f79c39f20190739f1a3236967";
+ sha512 = "ffc7c4a8cb7a092ffb86ff32ff8d6e54b4c49600ea9c8ac77e337f4c71b283adced784d23cfe8e69d034b9cc22f118756af44fc5a22003c77c33135a24197b2c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/rm/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/rm/firefox-59.0.1.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "03925bf66c04031813b05008879bbac83ec81684a5419d6d0ec87ba35e15f3f8eb3fdcff191b4ced92f1ac50136f13544c03d58bb0f241ae50e953940a7be8cd";
+ sha512 = "ca174bb51554e73d647207c62f4f17de52b47ca6960dc13f45becf0a0e43b73edcc7925a913fd42e3b151acaeded5bb68d6cdc6ac17f3add2bcdecb8a4b20c3e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ro/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ro/firefox-59.0.1.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "5f7dfa6494e8c1687d8bc3ee473d8bf1a5721f2766c883f4072a55c0507eba1cf422769a099b2485762b996c8f7dd251577d94c785c186a73fd0db7d548e8a9e";
+ sha512 = "4046be435da5d23a46ea007ed04c35cc9431d22858211fb2647df1ad4e00e84476544448ca86ce353b889a8db92fa1723c0598e7d560fc9980b1c7b82fae1552";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ru/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ru/firefox-59.0.1.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "9104b67151238cc6b531a1d874d2474ded47ba1f5ba5bd65f66ac60ed0876d4170f19b2c5152f5d07e9965fe74de0df2504ae40f49d883546d21586d4d832a14";
+ sha512 = "a7b4becbe30e27c8bec3c71af691a03b916774a77e4626a89743a7a7deeb07e9489ba6e276e80b53becb78e5c2575465b6f141f694b71bf9cd68dd761c0442bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/si/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/si/firefox-59.0.1.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "79a88f42f81caa578afb3d7b1efd85a74c76c1b9ac7876e63d19a15bd3a7ebe5602cda5ba3b67c7e2a4f24d22d3a83bfb35ecd034ceb95fbd40652a88bdb89c4";
+ sha512 = "a9d8162bd8784be11924e9cc0567ea720b87232d175dee18212dbecd8280fecc610a964df77a3499c5f25cbbd466344221f5b071c8d83c3268d936e108adae48";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sk/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sk/firefox-59.0.1.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "9ce10a004fa3f3f4a02bfea3abccec28785a0db9c1e5a0e797f6eb83731c6e7f4902906863cd681f5351c7bb84dbeec59b840c4612b1b6ddbe244a4142f6bc0f";
+ sha512 = "999229f133193f19b49b9e4107515963fa28b524323cbf88a2d13542568997a91af911c42a3b353ab3d9dc4d05e45b8e2c9e08b4e6436da6292073365cb5db0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sl/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sl/firefox-59.0.1.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "898915cab6633ae442b7328ffc3e6ec60649b5d7bcebd795c05a2e552d40a6431ba02274079f2b3069ddf284be986b427509077526a03a550d635f518c8b1620";
+ sha512 = "10ecfc7d338462aa350aa957b3ca6c0de5eba93fdd680aa2dc406bbc0cbad821854c9a45dd12c72403393d7f9447d5dcc86981921f0eab4ce3c06549c642e08f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/son/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/son/firefox-59.0.1.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "fce8ede20a5f9510546736b37d6f80fe65470582ebf9608ab4d4984e8b46225f3f68c4d82569bf20db204094932703a74b1333884791db1bcce154fa17f45d09";
+ sha512 = "c0cea7d6ca475896c0b2b281a4a0df33311eda128d573b38b89b8f1653596d8d16bba713b8cc8bba267afc2a5cf734aa578532afaa3197cc92c5cd03db030dd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sq/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sq/firefox-59.0.1.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "4a92efdc1363069dd871aca5024334866443fd9228e317d2ead30a4546102e71c7678df46726774e989e4e0ed7d3f205c229dd9fbd3a18cb234d099f3ed7a90b";
+ sha512 = "45191b5974de941748d38ae74e87b135ffc813d5f207219b21469ca7804cb4b6ce9e7fdc1892bc6a6f4fc15d0935a7e770e82baf94f1c31dc77d1108d5f25cba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sr/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sr/firefox-59.0.1.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "6966a84f7846f20951f25e4e6c56a65d896e8e51f6d1cf8ff9ced8814fffbe3d6db301668cfea28bf34c338900410b8e633f8a7d241aaaf46fadbaa04ad3eabe";
+ sha512 = "e931f1d47644d6a770f193cea61148445d8f43eaf5670d7cc76b3b115db15ccd4fc0938a59e7bce237d2d05a924660a791f4b19d44ccf06572d814a692cb9173";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/sv-SE/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sv-SE/firefox-59.0.1.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "c4802d33c9574f6b676360ae402d27d755325f208547e7d6b137bce69b0e4170b3d7139d9fc97a6ea21d60ee083c90dbd9d09af4dce8dff78f502bf6669c608e";
+ sha512 = "95a8391082341543c2044a72d7f52de39767079957c99ec75c6daf95607877fce0ff1d3c42175964516cf93ff632789647f420687d51e717d3d51a280f5c9272";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ta/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ta/firefox-59.0.1.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "d3782b30491e9044e16d672e697b51449f66b750b466c830acf2b53a13d5448848fe2fb035338d32b43951f2d10b88a12c2dae3cc07050925e127e2c7da6bb1c";
+ sha512 = "428e2269126ce169f0e83ba1274d4a11cbad2964dd6bb31e8f3c3afdfd3968fc9a06d0f92a77a0bd745f36810a526a75f8c670489cb8a28bfe086cd04819fb0e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/te/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/te/firefox-59.0.1.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "37bad7c63601005ab4d93903a8e00c81449acd78a694a855edc9a5aeec404f49433467a9ed6b431886ab9dd754a5f51c29502ff350936f84df69676a6999c0a6";
+ sha512 = "34c0b91b14d70670ed0d1624a5d6b93ead775151b432add41bc13544ac2fc5acdf3ad9f8f26059655effc8f5507081461f737289011b41bb3972edf7dcf933ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/th/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/th/firefox-59.0.1.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "a0a6e1803c54f06ed49c1c339da0baf2058fd3a8e612df0c2bdc088d7bec8d8785a688b230e9df6c96aba4923253186f118d0c660bee60bde1054dde246082eb";
+ sha512 = "bd7bce3cf04674cd6423fcf7276bbcd3585c061b77c692cf33680f122b09d2c5c29ba0a2d8ec857425d9741ffce1ee23383d35c9b7a620aef5579d59dcbe0049";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/tr/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/tr/firefox-59.0.1.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "06c61402c4732041e2140dbb6e56d969edbd64a0e25a31ad521c2b692df2193369fbb6af2848c68da0c5b620af4c171f2d748a10f0e402ac56b72c2f5fea3277";
+ sha512 = "580604b9e4336aa6eac536d4514a41603890ceb6e9630609b4a36cfb0b34952f3d273ba1d100ea1b5509a6dc8dce9f10a335bf5aee7a0c6b133abaae3c4c7352";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/uk/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/uk/firefox-59.0.1.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "7a7a76241dbe77680229df13b1a724d71a2139c5fc38bbc573592fcb9f07e5ab2122700854e18af339805073fef0081ec3f1b0f47d19fd1edd225b4556137d8a";
+ sha512 = "f6c7a9fe068ce1f760a7ca45a82dc5dd28c7e054823e3b9dacb6d00d628ba56c8b2d831a36237290d8803b3284b90cbd29c3ef685cd0d4973ee338b91ab541d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/ur/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ur/firefox-59.0.1.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "33af5113a20708300d8d9de5584e22212a3561cda55a666e153af7e4dda67a114d1b7d3c9a3606f47ce0885613dcffea8c78981a24973d996533020ec3906161";
+ sha512 = "41c6ae7d2f80704754865982d4b64252a9a04a222c5cde279708960c8a2c167f68805ca2302a86f03ab55ba93afd069d4c289434dff8ec61b245123347e53e78";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/uz/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/uz/firefox-59.0.1.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "8cbe6151d20b18741af0ec6c2c70da8f23753562a4f8619f1d1a9fccc890bd13590dfd22c6bda0db4b113651d3e89c147733ebe5cc761a24eac656f6f3ad2bde";
+ sha512 = "5974e06472aa75eb2b9cdf1494d8bdf0f394d5a7493e9f77d631f47dbf0a0047dffda5fdbe23f32dbe65612b9b77caeb7c3f15887cc51fa7c2609d3960b9d32a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/vi/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/vi/firefox-59.0.1.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "22a8c52c09f6c8fce4cb9eecf6378d9b5fed6a60f0ae73c44a91156fca23d85db837e670f9afeff57290f42c00b10aad5a0ff5b279e7f7d91e9d139928244932";
+ sha512 = "5b35c3ab9593074c8f88f2ad34db0e161c075d8b04785ea658a8ba49172707e9776a5882b291645d0aea5e333870723b5fbbe6c7957f7ee02c9674eb237a63ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/xh/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/xh/firefox-59.0.1.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "874e3dd3bd4e5ccf058d026e61314e48c9f06f549912066058d3c936ec606264754c4ac76035ee09b4112faa2b96e146f5250caf1ee7421325f6beaae259f2db";
+ sha512 = "8ae8b2f36cac9e1aac1f44a786d6992ea6b31dd83cfc22d1cfd75d057ae429a35e1d61272aac7ecd24d4dbfd8448f54682388e4e708222d1c2f6c6e54c0b0da8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/zh-CN/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/zh-CN/firefox-59.0.1.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "658b94cdb5f6dde841c95a48bf1f3e401d02891d5385d0608951630b38aa74dd92894d67d672818cbeb63a3cecdcf101c9ac381b21f208fdb27061681911abd5";
+ sha512 = "76e09c7f0835270ed7788330486e1d00d10e8237e5e6b5af9bc2de227fdabb958c697c11f74d7df5b6876339adac09b6bd5e87c9d31b3c7945ffd00ef0d7527b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-x86_64/zh-TW/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/zh-TW/firefox-59.0.1.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "de8e1bb93294891439c9925a76b380aa40c29ccf6ce01db23c16469e60d8e9f7f49d0e8e5875cdf0f9afafa9df7968293ae6218039c9a3a0f38db15b39e89a41";
+ sha512 = "87f298e06f0b58500231367da1e9fcf19f39c25cbf2b4d20980f45947539398f6f394833a6baa676c6ea27f87da26e5f211333c76ce91b40e7a3e2a6c6a33fea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ach/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ach/firefox-59.0.1.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "a8f58cadcefed9ffaacc55c9e14a8a7c96f854ad624280eec4c978c3a2b8a8b503fbb6173e4c34168ea0563e5937a65736cd170413671670c04ab9155f279851";
+ sha512 = "3d922035f62c78c21e997f0b9e1265c8f9f8bbcd53d67d7042d8d30d418d54b3bc4f5b8fa056149d8c8dcd54afcae1ba3e418fc0b89ec19b7c3af27239a0d4d9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/af/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/af/firefox-59.0.1.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "b69726e9aaed92712f332a8c8a46310881f043d51f5c19ded3cc39feefccad26c41c94ac247cff870289217b36f3c035d60ed32844105b3b6decd87017f8a100";
+ sha512 = "d85f3a911741b6dceb35ea6f2daab06a6258e66b07b79fa7fba4b1c277ae8debe5fb1c45c3d9eb07b910a172ff94baf6e4520a6fe755cdeaf19204b4dadb1f42";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/an/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/an/firefox-59.0.1.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "c68b504e7ca5553e14562d347b8bfd69dad41d5f2961e6102db344ca42c1e05ae88c73537fbdf08c4d21cc907c4baa64f8d2592ab8ba284673b15162cdbb06d5";
+ sha512 = "f1be5c00436a1b613fe46f5adfc19eafbb0639687346a3939437e10e64a7ba0c94b9656bff988a07210be68c7e57e982e9280aa03a0e69c2cce9f3501846ff20";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ar/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ar/firefox-59.0.1.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "6dcde34f30e4f945b36d1d019190ae6aa83b70af4fc2ae4e2c6d02ca013dfb2955639cb0e02014cb65f21b969fd3d8589e0efdfdb13b6cdcde956751329e5c87";
+ sha512 = "aa2ce3ec19633a86d998132fe54eba30e52fc29d5b1dcde1c3197aab0bcf0a9f73caac3662d58e5465923edabcfb0559e8f23bff7f13b5cf89a11bde7d4b2eb2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/as/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/as/firefox-59.0.1.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "be78bef5378fee1a9c38df3364f294f56e5c1a64df2613504fc1d5e0728ad3e41bc8314c9489ff300dfc522d301c66045bb6ed567aac80528add08d8fd40490a";
+ sha512 = "993be32e81700a094358999edc280a0e0999efd1478eb03f0924c0fa6b8c6347e69e0408725b916a80f350d3fe93484bfe83137fc0ba007e7f7a0f41d1c12e60";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ast/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ast/firefox-59.0.1.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "4fb28c925add1b528406b7f951e06818c6e6f641a998c286bf68422faa037a890f9a556bc61a54a48607776bba33b1dc97f00244122310611d32a7d731d583fd";
+ sha512 = "ed49c1ea33b0057a8b6cd406820c788248016bede3983121503a8c5332fb305837add00f7a5c75ea0aeacbda16873cb519980f440d9c11b0b54b01c674832132";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/az/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/az/firefox-59.0.1.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "8708a6ed5266c4bb70c747bfe7e5225edce564d5ee5009f016c0a4ed87c6676c04dbcfe573ac31f7d8ad8db23d45c5218dba7ac1b8f16f546fb2484457bdea81";
+ sha512 = "f02af6b9865d4f6469f62c1168bc33ac1f2abbd0a238d38524643dc5fd84de4a48b146928ca7c6d82f9db3e55ebbe861c29850a0a3aca3b3c1cea632a6938f0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/be/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/be/firefox-59.0.1.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "a469f44da99b430acc985d077ae47d61d518ad9f172ddac88e65114ed144b69f0ede2aa7388b6dba3f9c35944489024a5a419f0433054983d328ff0d09c83736";
+ sha512 = "5b82b010b2ad960b8281e0cc016f7125bdae1b1f3b93a581998c4ef891ecf49b6b075949420d595ad644aa5c75ac6c552e7d26086b5ee6e807df5179ee6ad36d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bg/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bg/firefox-59.0.1.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "dc4c39517e124d241e9a779db619f3dcf1c11b9a2a5afd15d2ba4d4894978d1383c30beead473b9ebf5343d1f7ac1c6d6aea17f0865fa7abd06301f8c3648921";
+ sha512 = "b404b3f97a9dc8675e701ea2ef8bc0a57b40a2390d98573434fdc82097b12abf28e9179de3cdecd0e3c03f0cf78f47cade1e41795eaafc113ea2c954a197a1e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bn-BD/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bn-BD/firefox-59.0.1.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "82d1a8615e9d7f97d23ef9265674511a8c5ea15fcde020a6405e5e1b05eeebdd93d1f7c2f9cff96f88b36f1493b721566395834479253476c0e76d807faf4094";
+ sha512 = "a992b1cd5ae8c2237acc97bd1f7e61dfe2abb3b93c270e64d2ca190d8ebb84c84f8a45de5cfe7eb853f4e3e99d79eb19838c4d0a02c73f13795fbc42e79ec04a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bn-IN/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bn-IN/firefox-59.0.1.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "a0032964905e4b0df68d8db313759c510d236feef049149140d8eb8c9fea2a8a372ebf1c73f222b959d90c04ae84dae429113d97292f1b0395cb00147ca1e66c";
+ sha512 = "4188f40867dc0f23b2c52d59e569b7f030d4392bf7715d35678c69a29b85b0573bc3de6701bc550735881b1055bc66258f4c7090e5f4277ea494a60549ad98d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/br/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/br/firefox-59.0.1.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "cce14e58021b86447b6d7b58d082abc42451aa5af30bb5a81a42ee70c9b17cb653ca3f9a97180d2ebdc2ca943a96b1d85f0beccefebab926ee0872ed03579fc6";
+ sha512 = "c69b56c43aea2821d9b085c7be10d3cd8c7f609b8c053d8fe8bbce5f719001e620bc56d1e70fd85c77e01501a0df466cbca62e2e6ecff78196ad91b6c30cd8cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/bs/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bs/firefox-59.0.1.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "c91fc6c8d17aeb65bc95ea3e8f9c6e90cfd46a5b89ea8623dfa61e068e1b129a1c228649a73d70d1bfdaf9aca5a3ca90d2722b16593f3d5b55b5d1d5a7b3f305";
+ sha512 = "77dab75b3c10d6ec24ddfa436dc9a6e037da3d692912d0417a6781890eef992cef250e8a38d5c1d03045dec7a073d2658a3d17a1f3e9c6d85a58c93ee7b4e19b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ca/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ca/firefox-59.0.1.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "274f6cbc0488d1417ac34841f3b7574dab1663cd583e481c8c928445b1197c4a716810cbe3413e2857a43ff83b27cc02cd7735b1758d8c67f424fe797b633ea5";
+ sha512 = "7fdf1fa6eb06cc338d06d30e8f1ca432cf1d7930a534c6c613e0f1278ccc70f1e81f74e43cce1e1b865bdcf2b9bf10607d73fb18d51e796c731a735f1e729dcc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/cak/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cak/firefox-59.0.1.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "25c65e084a21bd1da1732e007020c57f22bc49c7be0c99e1932d733433f57d88d73fc0187ebc55db251876da2d2353f2bab205775bb4e8f66d8871a25b01b857";
+ sha512 = "e4e35ea7e81190343337439a3fc95786f318c1f0dc338f2d816a9845b596473067095d0f3b446087ca8dea98dd2aff4db1c8e9a8c1f8fc5d304644b06e0042ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/cs/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cs/firefox-59.0.1.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "8595e022a47f60bb9df6a54ada7d788b85e9caff164c4763e31544c099dcb161beb4cf7122b4eedcaaf0f330b47ea60f7f8f69bc442623c1d4fee00b6842717c";
+ sha512 = "48288a7ceb3fbd579511950b9c6d5fc133c1fcea8435994e804ea423e0cbfaf4780fdd6317bfea37a958f800a79b62792e01c7aa25a908fe62b21684d6fda060";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/cy/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cy/firefox-59.0.1.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "9e7d939963bc28bbe9d1c4c610d0c7820907a94add5d9afdb41b69e050378b1376bff82d429c6a340701063d9516891380f7b7630a2c8557ba36ca8a75a29069";
+ sha512 = "ae9fc1b0c8d9b46b86b6ec9bcfd97798fbab2410c6ddfab531e364871be70a3a74c48936bfec085220bc5f37397cd83fd31da4a709f337c57a8bd944e635e7c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/da/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/da/firefox-59.0.1.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "e28aa52cf42472eba10ff29419910d391e70f62492f4d4ac7e38619c48d4dad760123e1b26455c2fff05794c8f945982d4f4798894acc55f262185ff89829d63";
+ sha512 = "9ea4433a5c295abba639faed9681d68fb8976b1935a131ab763f6ac12f32afab2c1ead3709ad741e04c005b19fe230e13a93334434c76a033df69d6891f960a4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/de/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/de/firefox-59.0.1.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "24ef96a42c0d6a580d382e1c793ac0e8a70e1a2a6a66ef2a295e026ad52b706cd73ff0cf858ef927e2e031261e5e8b0bd3fa38d1afcc7659149494c1f0900cbb";
+ sha512 = "6d864350a270efabd5258157c78ac6b70bb81677939bfd381b6996fb672da240b5c7ef5780819729d3ade763b9eb5a4222c361394e48d9c1c9eafc54795be93f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/dsb/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/dsb/firefox-59.0.1.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "b60cd13f290def58ef219757004eb2ad4ed92f1497b091162b61fcf7f185fd2f7708a1f6ba2218b4cf28084ed270031900cc6ace00edf56dc94a97ff22214a4a";
+ sha512 = "71e5608acee3d2cac48160e71739540c6d94fe5523415d9b639a3b493910347d38f6230afc0febb444e35838e3d402fb5b3018cf437eb48632ca1d8b873ce0e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/el/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/el/firefox-59.0.1.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "fecbd2d681c81dc4a8459bde6fb55d595fef390cc54ab1f3e5ca0230ada9b0fa3d69d280aaf1ff6218b5a348b7fb7f06800bbd710f3b20db98056c5a7a75ec84";
+ sha512 = "37ec4073075a29403e4637b48a74bed5c470ad9722c28cfc3e1d7aa5bb63034a0660fcdd2f78d8681ad21b569bc9060be05f4e1cd3eaa3d347ba0d2304075eba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/en-GB/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-GB/firefox-59.0.1.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "be9bcda727b18bf8dd822fbaa62f7da17ce24f728b1c48fefdd6163934fcf9591f999f45bf5a2dbe092f37f37a7fa3b7d90afb2f2a915a11f17530ff17593a87";
+ sha512 = "d2731ba3dad5298e07edb49b608f04784312e6d7e0d1219eb45dfd38a65ef62c1f9b94eff5f97bf35d75ba36cce8a831db6964251873572edc60656a87ea5ff8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/en-US/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-US/firefox-59.0.1.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "6b42ca4bacb37012d99508048d01686b881217e80bd2f57bb9b3a22207888dc9db19151adabb64c074421460e0309d298edd7078a13c44c815ff99a24a97b2ad";
+ sha512 = "d56c62b111bb629a30e9de4098a9bfb11b9b437bab572f3e588f4d565d86979c64ec0bd4be4a54b6c1d2718e5cd91094ea046424c9e85952a4ddac2c5de8fc24";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/en-ZA/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-ZA/firefox-59.0.1.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "ef85c017d1df9eed592b1816692d2e57f6555575ab9eea630817ade5c156e944a4196637fd640ff22922da12710f000fb559b5e5f16d0ce5d07feb5bc59ec2ae";
+ sha512 = "5fd28d0239dd61c54a062a0f6efd5d0f406bcb483cbcc111a631199d430839129dcdba84b4da66d35f1c5052d530da07e3bc8fdd7f177a366974bfa54cb3303b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/eo/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/eo/firefox-59.0.1.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "9deb3e19177e35dffa51913decdf5579fb925158843c762bf44355e5a0173e2b7604c1d7c26a1cfcfb7420695b18a9002a4ec1a4b683911d09366569b7b0fbfd";
+ sha512 = "327b89fbc100d238f2c1211752ea1a95d2a5c33cdbf8fba35b44ff52f2b63f2d05d84c4c714090693df28c0057e29d047278fef6d4f7e5989ec207495bac3134";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-AR/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-AR/firefox-59.0.1.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "bab8d2eaf02961c665ddbfe4d380c72dc0363feb356854a9dd7d28526b7c01dc8b2dad13c087d91ad7056ce50d0cf37123ce54afa45c1279ff827e3ce808fbb2";
+ sha512 = "676b58cde2394983a7be06039fcd1150f6e73c95518f5889702cf71ce780c4994629c5452924354ce9826aa5e0726a5de75321295f55004afd10f727d456659d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-CL/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-CL/firefox-59.0.1.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "981df51596a9e3fab9281c3319960f766b02941d3d89371f15c3ef6ddb853cc3dc3b2de3f196eb83d20a503eec6cc7926ce66a41f67ad4690fb601b9731e8522";
+ sha512 = "274acb52107294b4a65f22114da6e79d4bcb6b06a126002a371c983a926a2ab9882896439f94ee2d2ded5e5955d42cc4a87fc0f16c8960e42d406b773e2a5fd5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-ES/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-ES/firefox-59.0.1.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "017875c18052a84bc262812332d854d6f1402b9b81d8e0399d319e5c2b9d41a6a199e5286cbb2973ed8eeec0d9753f66a4911deda4a31049033c1ce47c992c98";
+ sha512 = "d23192f6cbbad388d8f3183876a176197bd82ea0bd596ef03935eb020d5d6dbb94692335dbfc1b98e63097b7c66521154b0b3d013cc769c83bd48883646e44d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/es-MX/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-MX/firefox-59.0.1.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "9a4c52058d5db0b342b68b6c389932106ad1f4a041e152acac7bf86c7bfad84aa8228299bd0dc60817bc51ad3c42ca07ced58eb9b0d60cdfd58775eabdd06fb9";
+ sha512 = "48da06b532fa91a6b482b57a8cbbdfe3ee938b353433d22af479786129bed784380134ddebbfdc58bf06f5fb81629ec982ec5e1d9b51e92d75bde44014770fa3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/et/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/et/firefox-59.0.1.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "24c85711693582ee0eaf7985af0bfecc5e905d9687dace724a57c66ace2ed72318c48ee7c1d0ccd0de125929c829afb2b08a13cb4072ddb73d12e8143f95a267";
+ sha512 = "71ec513f6b3dba3145c7b424c8f331c2108d0420a75a91045b4dfa4529448923e3ccc8fcb6b90cc01d8acd18e2164755ace78aae2d8da5eec056222b4dcb1b00";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/eu/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/eu/firefox-59.0.1.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "916164528c57173f70adbe3f92a9f80aeb5cdd46540b3dfb4261afec0649ba976375dfa54e11ece249fa2cd6b8a905dc0f1fef3104e83ed3e7dc4e622a82f8f4";
+ sha512 = "b978c35a4ccf0efb9023f22cb05ae9696c94c8a642e3deded9c44900c84d3c0a58cfbce95aaafe7e99ee108db07a6b07a76813f7c2c3d971757eca817dc10ba6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fa/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fa/firefox-59.0.1.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "d3ec04850664f1480be7f722bd694a74091197e1fca9a780808884cd72864ce6502ec02ac6aab2498a5adc87b34770022edce940d7e5af6d1856641282547880";
+ sha512 = "a67f89767cbeb3b37012c4a1ee64c53e74b30de6c5a14bce2fca15a16ce11a048ccba4e55f88ce7f2a888b7248df51fcfd03e0b0715e826f6b936db953313994";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ff/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ff/firefox-59.0.1.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "b0af3deba5f7c823eab1053b21e0efe00492ac8dcc55ba7d223c4531ae16ccd7f81ea4acc4b6d3996efd25b2c3401449870d0818ab1c180b1b3aae86c2640af5";
+ sha512 = "d7b7d9b86b90d5ca609870313b2533b6feb048060902727ccf34dbbb4f180f7fdd69683e34a7483804a1ba2dae8b264ed3fbff81b065083631b234a2893d4716";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fi/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fi/firefox-59.0.1.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "d88a2b576f56f49953f0e9129fcf78ff62791a905afe41e1e7b7c73402f054d762983bc354acfc177a58a4e72e4786c82fd8776f07dc413d4b73851da26e2c3f";
+ sha512 = "7c555f5ebe3fd74eb782cf9f3508c9714844cbaaa3520bc1c3b60bc8d2840874850e5f92bbd1db4f2dcc4cfba211f4aba485307f898f0b47d4b9ec93b4346ec8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fr/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fr/firefox-59.0.1.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "8087e313549c8a4e8fb534c72b6de0be694305c4786a685f8899aa483c80e4ddb0a5d134cbaac56f4eeef31fb8802353d1a531dbf33f639c79e668bdbfb711a9";
+ sha512 = "edf4f0669c732312c27aa40f4aca66aa2a676f9b019cf1d35d0deef2ab4d27f5441ca9aafb3ed896e20538f765de4715b67a546e4364f384e05748cd495b3f0c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/fy-NL/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fy-NL/firefox-59.0.1.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "3fd21e1c39c32c11650cbbb095b64bd1ce720ef2614d98cf7af2fc3bf7979c19566b4c0abe0a24e2f80bce7f05a49740cfe8d9dca6edfbbc4a5ab32f808c5629";
+ sha512 = "58238d57335a18e63230fcbc67f83059e2439528f3d0ac508750dcfad4a2c48296e43c53ecc203258f917f87be78fe50dcafaabf88b6183d5d790761bd21a7ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ga-IE/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ga-IE/firefox-59.0.1.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "946fc4e3b831f91f5e505c7fe4aac8100d3b3edead97655a47ea5b2138595fd821d96dca3df88bb3e3cd6522753f2262bb61f5b9a563e073f27f128f390bd0ac";
+ sha512 = "fe4865df72926342c139309d34c8d42187b39e098848ff32b7a0bfa21798f2d1e6dc0879dcb17ae150d977942f355c532de7d402fca3226010de8812da0ffbe0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gd/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gd/firefox-59.0.1.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "ee014509e87ebd64096c8d87170ebefddfd600843e410fdbe74a65e5d4fdcd40de59881396d39db9e68a09ee7f10b03a5e3459b07ea442c4d1e5e44bb6b14a78";
+ sha512 = "68f94b2511f72a2049c07a20d120fe282a6b85a3f4284e9695ab5cbd6eadd4ee1926bcb133fc7f7394d90d2e3b47e2ee75b9860a49229012c208a144fde5e85a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gl/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gl/firefox-59.0.1.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "c90904cae401464bed29e5c2b33940f9b996ac46e071be89a5ca51dc6db492f6914d234b518706278b0d2d676bb1ab017b5055c3297d269017bcd6c04b766dce";
+ sha512 = "24bb4da7b5bd5a8bbb3d5bc8ccdc96ed29d9435ef00c35c70b67e0aec5baacbb910d77daec54fddaae7d68541bf1e9d051f3b1bc80e8467cc78f3c503acc0682";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gn/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gn/firefox-59.0.1.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "dd401ed91652cd458152372deab8c3067fc7f000abdda3b9d1f3e9e5b1cc253c9ee081fba3bdc9b5c5398d64d43a42a80c20d6caadc761bfe4469bd4ac7a4b9e";
+ sha512 = "24a6a40ecf5f8ca418c83c828cdc6905ed43afe137a0d59b036e68c093df3d8be679c64d06a71973a891d5765f9c366252959d6c95cfc8a5e9b5b145999526df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/gu-IN/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gu-IN/firefox-59.0.1.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "889d81035e9a618539eb9aeb85567406a589e6691c162481bd5622ea3be06e46910314b83c3008f3bf9f6c35b6330acce459b84136e111f45b247ce9771a99fe";
+ sha512 = "b36047e9e9957002d33be2c540104dc530d010a646ab8d8516ecffde0b89b9a6f82bf8b94bb3f55fafb002b5c39437b7941d5fb2a0cfdccc5159c2013db1b058";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/he/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/he/firefox-59.0.1.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "e8057f72bc093ccf150d9a014eb2ea2ecb86d7b383603542bb90944dfbba3bd391fe36645c6f0124d6e9fc50cc7cb3e70c1339d4eb9e4c928c2621aa38cefa3c";
+ sha512 = "c4d0195f72ee0afd3aa746d0a1ae5f0f7ef58646f6b4e7bffff8b1c4ac863275881c29fb7cca09ff12765e9902a6bf9404f11b45399919c9873758bbae8d017f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hi-IN/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hi-IN/firefox-59.0.1.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "d651eddbb9f3b419c86ff9535519dfde886172b0f81972880e10c7c0234f01f5fa4050218d1c8cad302a401fbf9dc369dbe9749822f2f9efe2426cba31dc9d7d";
+ sha512 = "7bab64a89c03e37add1c6d45756acc3ba19751313f212f3069b9c1938f7533ad1d0cb99b7bca392bb5598e2c10b461f79a47b45dbb77285f7afe12f5de781e94";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hr/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hr/firefox-59.0.1.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "e1de943f777afe8564d5da316cc13c7232f431e023eba55cccbf9443451089d84f0c66b6818d88b2dceb47299693e0c06e0058f41a0929cabc486fc7b78218da";
+ sha512 = "aa68496e4e82fa5f491b0df056460ab3169be81869248fff0d3ce2a180c9b9963edfbfbe5b051846302ab713f436836dc63d40f65ac10ab185bc12e5942fc71b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hsb/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hsb/firefox-59.0.1.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "20bdc20beb7853264a98201e4a3c39c2ff9058ad9a5cf23e0cf57879ed6d11f4c59589078410411276c2e4cef01869a7c418265f2755b1324c10757dd41accf0";
+ sha512 = "89640b9df29c1fa946351fb74ca61e6f318ac190976f75b73aa56c66f2a67ef88b64c663cbdeea86c30c6644cf7870b59c2f9fa479ac6557e368dd486fbc4a34";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hu/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hu/firefox-59.0.1.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "37d6b03aec34c3a958cd58e489dd1da715c676532b70a90ed87fd9e05ac30deb60e2e5c35ca6c4e2b21eda1066ee5c84780149298aed4149ad937fa99a71ab79";
+ sha512 = "46a6cdddc77b1d29bf85b40e6e33ab0d6b11a72d425ff59e9156cae7548288f02e3e1a54d296e4e1df1efc1e8e3c252a955c2a5be8bcb9e22d9d0e6e6b12d08e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/hy-AM/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hy-AM/firefox-59.0.1.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "b3f4b807a1a5c3c6a2e79570567a89d3fdf7ebfa565d57723f161a81ab05a23dadcd1d47b3a220553e14604ac54b0bd0dabce47d54383594978723fb67b37248";
+ sha512 = "0697f146aa1e7d0d4aa8be28b72a642c66a15d7e6a2208a4d704ee8559f4f814a8a6cf601c58a7516816c86a374bca5f755d30e11ca668d9f77c8ea4e388f204";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ia/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ia/firefox-59.0.1.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "48cc98802d7f5efe1b9ad21c5f223099b99f7cbb5f659577646fb56f412551d234f9c2709a6b26c790f91ad6e1167160e995e040c334836ae4abc7f20e07fabb";
+ sha512 = "107bdfde5633415250fa0cd34ecf29dc39bceb8a5762445b9b5429f4c83690193fe433128799446029f458492d4bb2fea27d7654dcba5a7ce3007bcf40052ff2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/id/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/id/firefox-59.0.1.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "f47d27aa649d702b372e7571fa2dc08179ecb1e8db3600eef7c2a26cb68ce74e747af5a7fe2e2cde68546a9a04cb895973a3cebb4cf93e54cf9f6cdf089bdd3a";
+ sha512 = "6935a4805b0498d5246f73720e02a022665fa40750937d31ba35d887ab289bcfc65fd122e6c18297443a6488a92a983e00844d384611e04e2e947d20a1aa82a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/is/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/is/firefox-59.0.1.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "c92a6940f537f13608a322de49027cefcf52f5f740c450c37083acafc805cfcdaa01ae8bcde46799a252e5149256c8a4c464411d14d02c969f1a158931b352cf";
+ sha512 = "f04f5a86e348802e38593a0c6868a1f0c534113d4511a35ad4e831a2b3d00d8d9f7522e9813230e2abe710708d61c502337de031f934813275e0d81eea8b0379";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/it/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/it/firefox-59.0.1.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "c5db9df2e668d91884d1c81f325a6cd5649fc8f9c1cd67e3107f54a2028db866c3d9e9f504ea84fb997403aba04e773225fb5509b60e194929756610e4f20813";
+ sha512 = "c0db0620e0df091f31ff576d5c87004f4c283a7455afb0098a5de50cfc8bb7879ece4d8525ec1c7f4d0af9d7934d254f114cbded07c8a93126cc6b35d6058f61";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ja/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ja/firefox-59.0.1.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "c56d79fcf04458d0d4b11c3ca675493a5c9ce8013eccace4d9182aaac361b5524cbeffee2c206d5d0c4c3b641f0a7db6acc05745bd1cf54a795b833a0585c7cb";
+ sha512 = "8a705718db55246b74ec0d1baa30e82c18b5898151d4b0ffa7f888cd53cf704444627c47a00af70eb381f9d5e4d163119ac57b23eb316524a4f949a722809d6a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ka/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ka/firefox-59.0.1.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "9596b0982e29f7302963e96c6db071d668cf7bfc8c31f634d2cbe687582906806c832c9d06cef22f44cec5418aeeaf42afbed6fd00e32f845e5f57eb08482a11";
+ sha512 = "6c0c0f2b67f327e03d874ea02fd084caac2756c21838c9787a03213961bc585db5bb0f2eb068a714dcc028a7d503836f1e7f652f60e08c0e9ab45f496e53b780";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/kab/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kab/firefox-59.0.1.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "6988478ec06e738e333508c5cd64688429f9445391899e57931dd7672c88767b7c84ac2bd7aaf952343c4c671a205864dbe7736401625decc2b72c48db749dc0";
+ sha512 = "381d4835f2dfc3a3a553d228e821daaa6966efcb47ca5d7a625813d59db8081a81a46dfd2f246842c937f75121585124c0e7607a9bd0cafb59ab42d88a2c908c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/kk/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kk/firefox-59.0.1.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "05ad5aef14e19bbf2b6665f96877d7484280484ea274a4bc1c5ed77911575ce9e6d9ff87dbde790c04691bb4dce02b03ba0286a48c159b9f48d5133581ccf040";
+ sha512 = "82f0e6cbbc9a686be9bf76a0c582800f75edd3f608671faceb813addc0e2fb66a631082e083016118dd3aff8775432ef566319cf9834a8aaa09ed6f774ddc34d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/km/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/km/firefox-59.0.1.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "5298858458e6a7fdb1c506b54ff3e0ea8d28b85120cda27994838ab614fcc5cb95699acd607970dc2fd8961d66f2640b9f135995e1407f7c511631c43586fca0";
+ sha512 = "7b1e81cf13051609897ad632afa18709dc6d9bbc66a6b7289188abe2f04a9bd1be159aa08342ce746930fc0cb50b19f0ff8abbea695787433acd25ad1cb48c58";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/kn/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kn/firefox-59.0.1.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "6a32c5e98920a90af971a12dfa15f434a968e2fd0faac302c8b79881e42917eb8e2fe028873f23159870c08e90d3410308ca3c7233c49d72cb4940ba076038de";
+ sha512 = "c17d8eba5bd0c1923f958dbde4a2fca62c423213b249fa1e2829361ade947aad32cdbe257cccf5d5160dd36033e827a78c6934db6bf96f166152b967a2c5d07d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ko/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ko/firefox-59.0.1.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "e05c536e4c901323d1e744bb1e85ae85df1454ffaff9234db6fd8fbc79807198c775cf1e0179ab670903bf12ca34c9356b30afe25d8dbc27c9ef4549a5148023";
+ sha512 = "c34c899ed8628829dcfb48b80a8b4022db9fadafc4edac4e227849ee58e06b0a9cd4fe089e080ff65e70177f7068686dab678f2e7b04dafbf1338caaea779b62";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/lij/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lij/firefox-59.0.1.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "2f47338944f8b34eaa7bb28a2804c637b392a2af4630d758b1c378b9b1d020aa6e611f8e8504adeff75e9eec5eb70c3b39f20b779003d22b87c79ebe0973ae6b";
+ sha512 = "be96ae1d90a0e5f2308af47cae8bef7e028f01ef156bbd0497e578a0440a7362b18c63b36806ab4f1f2f1c4f8d6c9e5d9d03593ce38d1271809745cd2b266584";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/lt/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lt/firefox-59.0.1.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "d593966d81f8a0652368f819f8e3f0624fc6d28ebc7387bd5a6a2b3a10d3e87f657076fdeb6eab7a93b7c22e87fea1b84a776ac3d667ea90b302fe1b20638af3";
+ sha512 = "b141b12385d040596085c328ce95b4ac741ccaebe1e950f00ebe09e96a2ea5b5ade4c5438f9b622423ef658f84659bab414eb467227cd9a664542fe76471d1f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/lv/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lv/firefox-59.0.1.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "3e0a350f87e487c0496f04b419f7eb2313341798f042344b5e2406f7b59d154bbe7830683797021a412c1e2a18f30324260a6988e8d2de5fe6e2a02b28a18493";
+ sha512 = "ca296c7d74bfb0b4aa59da3f82dfe32b7c6564953c9850513bcb429ad68b6c867112eef7b7a2f9e1eb0bb8b7baa5f0f4caf4c9da311729e21976d70f8847bf44";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/mai/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mai/firefox-59.0.1.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "6bdb0c149489e2acf9fa9ffeb9f519f0ce2d167fa4a7c36cde81675cc9876d202d116b97ccb853ee869e6ab7afc570a023b2a1be847a6ab976bb3c0186aa51b2";
+ sha512 = "378b32c8ca6cf0319c54dc239bfcd9edc8b834a5ecbe8c990ff8d7f7f28a89a30c53384c413352219309bf537dc4b0961ec0ea7eb2c1a4977b062c280ec130df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/mk/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mk/firefox-59.0.1.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "233551a16630146475f0bb479f9c2152e546b9e56d3137dc391dba586a1988246c86862c317c5ad13b3a96c8e4f80ef4e108047e9fd917b97165ef3d8dee6f6b";
+ sha512 = "7925c3a6beca9e35cf301dc7b4ebb059fc87cd710e0243c71b65c55918d10ada853b4a4b8a1c7aa0e0c89bd8e9cd4414d5a162a430cf2222e3d5c0e824b96c73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ml/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ml/firefox-59.0.1.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "59711210565b4fb45b7cb001e7315116a666819abe81ead43d8cb70604e33c2cccf5a1469ca8ae72ba2bf73a2d74e4ce024b75fcf7c2ca722ac390ce4371f2b6";
+ sha512 = "aa291245bcd21bd1e1a08f1b84346ec61311df8a9fa6f9b4af5b9cc6fcac6f332472cfe009f02faa9d842383c5e0588dd7705eaffb37c030f5e20951a4c0b2f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/mr/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mr/firefox-59.0.1.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "4dddc2a3f9f646062d0c047f66b86ed8270457d7184eb8147330576eb6c9afc025e025c99bca2cba1854248777eccdf4793be94df0100a035914f8dfd1918a7d";
+ sha512 = "3bf781cc015ff35393f2d30244bc7a8c32a0ac789b0eb9da9616b1d58bb211982db2b03873a91d500f3972d0ddc32383a8e77af4b2f453d2fb8dccb71c7532c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ms/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ms/firefox-59.0.1.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "635ebb9f601898097ec59368df8050df894d086e173371479ba4a922beb829adf3ed2af05bf03dd91526ac13cf4b7092f37c6253913806708326b7ed8901b203";
+ sha512 = "705665d30a04883d1fe5791348edc2fe0aa1554cbf2932901b99ef1f4334a1ea9658574fc02c05ee64f6b2e3e8d487b8520b1f1963f285f6475af1334160e5b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/my/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/my/firefox-59.0.1.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "7d58e3be5f83d1a42445debbe02a2b4d3305c61523bf3cf8550a7d1dff5f44a8be453f2d4a487b290c61258c4d9ea1c74579d207ce1ad270f3c0dfd2f16e3b7f";
+ sha512 = "b1272fc81d358c3386cbdebad0595c7595b1d16dcee3fdef5f49776d6607f8737bdd4807140989e16873455df4a8746e00b8d3548f60cc9b22c282a5cea5a136";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/nb-NO/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nb-NO/firefox-59.0.1.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "61b25e6697de41ea41daa549fb087b1ea35ac756eee3a783a29d3282ddbde1b63c46848a6ce9fd9f5455806c440ed7c9e4690f2176e3214979bd8c17c83b5e9f";
+ sha512 = "b44fc5f73c1dc3625ce50c9f6058f56f874a91e04178bb179667c6fde462a2436c6b35d58155ccabf340742f03d0ac1470b56fba405a13caaec4075567b3b8c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ne-NP/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ne-NP/firefox-59.0.1.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "9b10111c6ed5acd8e0e43bb91837f27e70149685ed40f274e63faa88dd6b2a984cd654e708a72c56f57f1e69fca8518be0e355113456d087256cd0cbe08bce2d";
+ sha512 = "bb063e310856adfbf3fe433d60d4fa19e8d5ace617064d334faa595cffc77d39d4e4e303b82858af8a956d43956928c7fcf70f319ce4059dae9b750d46ee3cf7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/nl/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nl/firefox-59.0.1.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "f35f5b21ed6d88686c3411581d3fa3545e8498b04b970e2d18794b56c2b155a2006b90f71fc2e66948f3476116933f1809db403672a66c698f949b4852dff56c";
+ sha512 = "64f3cfc10133c3fb0e566422282764679f9d1587b1aa742f24e9ba77f1f45e2c1dde4cb9b97d0eb3895b745cf2037a6dda9bcec469fce3b1ee125967f2869380";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/nn-NO/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nn-NO/firefox-59.0.1.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "39c0202f69f5d210da4996abe072a60354b2df73266dae36d636c48df576aa7cce1a85214a0c25ff41b3ea7128cb01c2302451d16d637c4b3d8b9595aae5914c";
+ sha512 = "621c8767c5874fe530a0b4775df12be89c778915ba1f0d46271390c2208672d4211a9de501449458e88429483bf1ce453db652256c59308b3d42aa294d36649b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/or/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/or/firefox-59.0.1.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "684c2c0d6886152632f530e0f6d290f5ceef9d427cb33d5214cde5e34131092ad682f010db8b6d12470d332b4cf9c7deb0905427a363c776959a64f8958a0c24";
+ sha512 = "3c271c3e01611d8e046d44fc90ea3a13cc974ad3fe08aeb1c3fa5f18f104dd1481a5a5c9273bf21a29b7aa15f49791584b32bacd26063ffde1ea4846166d4225";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pa-IN/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pa-IN/firefox-59.0.1.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "0098f298243cdd4bd114a796cd1e6325e73802d8b9d8fcdcad954c8d648de00d08efe51082bf24f66d23dce696764b745002d56ce049c68a71093ecedd4b661a";
+ sha512 = "b0f6248a44d247c7affc35c2c4e664620e6ad5b83c4135d66f803245180052e77fa84db9d05b96475a221d5c2c288b73ad23cd7c717cabf2557282d72731cf4e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pl/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pl/firefox-59.0.1.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "f759cb045f817264f63f7b222c93da2dece9b8c14d9621d23798c5e924982e64da2a15af888d1ef0a6b1b2de34695f1c3e70527dcd9b9ddc069c281eb43ffc43";
+ sha512 = "75726fff593b0143a192cf3947f6c83a30c77552b227ccf2e5d0869b7a48dde22b1d555fee3baae8398b5cab58e1523ba7e15db6e237ece085b920f5fbbf4094";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pt-BR/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pt-BR/firefox-59.0.1.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "367d1ba059d2c4c9b4dbd3422e7a7d964bcaed6d066e022fbbf5c603c80e36acf81aed8c8b9cc4c076f4293a5ec5da81c3c4f9e2cfe6fddcbe0c3db6db3a67b0";
+ sha512 = "701ffb3a4dd31cb6cf50a5523a384f222b6578c2d2a2870dc1e1cd985137dc9b78e81de092b1ebaee0108164bebc94aa1a8ea12981c02d49f885d8d6c9c8281c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/pt-PT/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pt-PT/firefox-59.0.1.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "a7fba52997e5925bc462fe6cbfb89b642d5759f4bb0c71e07ac2b88e1d726f664a829c433be14088f32eba59474bd3da152da10602fd57a3a8a8f433e738633a";
+ sha512 = "a978e219a044b3e507ff5d907626939f8f9d0c3c988662ccdf394e613ca1127b2714c9973d90bd7d835e2af574d115b495c277f2d668142155b54e9098a285ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/rm/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/rm/firefox-59.0.1.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "a009a30f8b1040e66bb6b49cbad0830e052e95c29a6b294d13f3475e0c2389d8123c20121580f503a1cb5427715d6e8eac501eb3919c894799e2eeb976d4b808";
+ sha512 = "f0f3d5e022793bc92cc84fa5f8b413fc1ae1ec9da126386283297b41e47d722b4399722f69a05aac216d46d1a1ee90a1b6fb57194284c157e68c84121d4d989c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ro/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ro/firefox-59.0.1.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "5856f65cdbc8ed9161b7a9be8d2f060ed029443bc45cf65b50ae97bd7786a069454a269ab98caff1449a6d6ce804438f08b0a39deaf047ebf024f8da79510ae8";
+ sha512 = "4995938aeb22e69a6cd8a6b37b479e9d23a140b73ce2e5c4e29e6ff4f34d702db426346a596e207c2dd2e4d1bc6f1dfea00bc7ab7a2eae763ffe9fcfbf3e00b5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ru/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ru/firefox-59.0.1.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "52a7634f62b97cf2af945d9c69599f2e6e65ae56d52c1e562a28f13f8631e9a75975e37d4bf97ad2b3e50d4e4c58f0b67b6514fc34bc2034989b0ae055187cab";
+ sha512 = "32ab4f1bca6a51d204c54f4485d9642e8ccbebc008cd56e0cba55ea3a5ae5aebca050fe1e8e2b2a7fdf04480ecbab04515c0944c0d5aae0b81e350370cc2cabd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/si/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/si/firefox-59.0.1.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "e87128bc44713f3d26bf97f2d5a607e63845bcf84e9016886c06ae5ca9153a42cc042e5754e4c97462bcf1079ba699e653f99761f991a0cd0d270eb28561cc54";
+ sha512 = "c2407c652b1907b3508f655c1bc831ecda75b8135dbfcaa1aed1a509a65fe2f21f22720bc80fdceede1e77c86fe39d0badf8d23f37ae48310df132c115bca448";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sk/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sk/firefox-59.0.1.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "3507a790a43da30d9ab82f5a54682d7907982a599ac88ce38f0db5940d49a45ec05093a577c4d549070bfd17f9e1fa3110e2e4fe07c8aeca338bb4486f0c7cfa";
+ sha512 = "f2a99e4f688a3384d23d36a87017ba0b5f28bfef2152867f8e8c8ca134a26e26052339c6edca1c24dfe5db5ce09d194675cac364a4918e46ae765d30ae3ab8d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sl/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sl/firefox-59.0.1.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "ccc7ec548f3639f4c44b42c2c787944c243c7824210cbb52dd8662f4035e12eb1026c6ee8bfc33452f8861fef16be2684e9fc10b7b6cedd94fc1559f98278d0a";
+ sha512 = "f454a9cf5a2e1528a546a82d6c2a1f4f2a668bd2b56633216d3955ec5c1c89d8734d8cdb0ee9306698aaa5060bc5f4797a9e0fa1c8967a00fd204eb035a8ba29";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/son/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/son/firefox-59.0.1.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "079a31ab92406db87653e5046b4abec632775404fd4850605fd57695d19fbd034b2b5e6de2bcb6340401bb16f0150a20ee437b881fbf23fcab235bb2cee86012";
+ sha512 = "4b020b9c0f6e9bd594afc47900025dbd2223e50668f9f43f139b00f5534487806810bc933ab0258f5fcc8c277f7c5d2411d8605dd0fbae893f5809f9cc400c22";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sq/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sq/firefox-59.0.1.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "c51c0631f9caf84e079bf38f842aa3f85ec8c7289483f7174109f957ee43bd998937f6bd0dc2f4db63bed3e5ee7f113af2def5ac957b854ec044f280feeabde7";
+ sha512 = "959f10db2a46cd8616686618d55119b01f0ac8e00e79093a949788ac903b6d3845a919a420d7517813e28b1227bd6f70fe8be9df39de8406743ddd7c65865e28";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sr/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sr/firefox-59.0.1.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "100b80f6644759840f41d926a5d18b39adf84d626b4dc60fb7b379b0b12d4925f0ba6d223ab36081948f47b527cea3b87600688b99b280bbfb7192dd68606dda";
+ sha512 = "407e9337429d644ed75d3b2ae4953c5da3c6994e2f2ef2320becbde68662f16c711c987d4dfe2f0a784833b3c721c62cdd0080cdc1ed45a099b0c7b256411b85";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/sv-SE/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sv-SE/firefox-59.0.1.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "3d3a400efa6288b69a42ff9a3dc61b0905250f677f4fcddbe084a562f15d8904a9233bd79c67dcdf1b7d04f7465f2f8cd5f93dfdb5e2e253697875bdda65ac55";
+ sha512 = "f59c60fbeb82cb56ddd447d4c3d4125ea3a98e95a74e7802d73eac25489f2acd4566e01397b9ee6c70260779bb895fb104ace61f2ce9268b4f3f3758d686de1b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ta/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ta/firefox-59.0.1.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "de47657375144e368e8a8801b9a486ff11628d86dcc43609ce285710b0bd529df418d8644c8b97e4f1562057d1d5cf7e2bda346cb01f1d9ddb800dbf517a9d6a";
+ sha512 = "3ddc5a37d37a7db421f46d1d66d52197473f0e73c5c633ae52f12caa473ad5a4e73612a57bfc8d5d212c2b573b8308fb1b7697f78e153094230f8da64f074b64";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/te/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/te/firefox-59.0.1.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "0a8a9e5fbacec8ac7473507e6304c52535f81a5b358651b87cb3412e193dfcbf30085b1b725113eceb1818e3c564de05a6a3fa5dc27cbe72b26ba9d58f2be76e";
+ sha512 = "c60cd73ec1eb27f9ab5e4ea63d3b4dc691c5c85d57a486ea408cda99f0c44c6c17e7d8e2a1de585dab1d4717bcdd7417b38b785c6f37722a3056a701163917b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/th/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/th/firefox-59.0.1.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "312ac50828b9a0fd63be8ef9341b98a3efa6fa8e358730b09e51a4553008a8a38b43306ceb65e9a6dde594c9615c0540584d0b67ece408bf4bd2f6ba19daf80a";
+ sha512 = "0ec9c7b5143268d1266e939e5ed2617edf41c99e5bddf2d4240f49b1ee2822c4c6b269a24aa607623bc82a54b501cebc1f924a9c87fac21f95108089495414f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/tr/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/tr/firefox-59.0.1.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "f07f4ec0ed1aad0de8196b7f74316156d677184c102e31e24d9b0384f8cbf4782fcd9ca847974a417d4ac596d6c9b90edc8be6b3a6440c65a39e2b760da12342";
+ sha512 = "ecf26013bc9cc189c89780c4b8b01c4f25dbc8f3f6c7bf924f528fe06ebf8c4952133e8446b3e0c8a09e3fa9d84b09883b3d4665d27ca7c028d90d3fe3d7fc1b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/uk/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/uk/firefox-59.0.1.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "6cdf07d539646c83059452750f6b70fdff5f9172fc68ac00a82a731c18cbdcb518fed4e1777d44a0ede00af0bfc8c2ccbe5c745140b6bbbeaa8916ed2f4417da";
+ sha512 = "c8595f21e86c4d1124b882ae4f1be026756b7cecb3ed5a02b4c723c37a999e2829881fab5d6349485078965881a91cfaf28bc926b5e96245e1771a9160adec76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/ur/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ur/firefox-59.0.1.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "a3111464bdad72fe3af763003941bb1d36de607b1df222a00fb65ed79c7b2c364657493408a634fc55bf3525d584231915970bcf31e94dbf331b65bae47fbcb5";
+ sha512 = "8d7be769c17135ad58a120cba472565597ddf05893f061e1efe2d2cf57c79bd8ec6f6a55e3271773fbc6a452e1794979cc619cc1a41d1bb13670b4f1badf4bb6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/uz/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/uz/firefox-59.0.1.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "852f44d66be42fb6973529143f99d358ce3b5839154b70ab57d9547dcbe1d3c408df396901b57a7c05c66cbc8e9cc6f7acc4d1bc638a19ab19279a053342cefd";
+ sha512 = "cd75b674a8ff62be2abc78cfa25873950914a7ef0fb6b652c483486c8dec888bed9276c2c7b323e5787ce802583e1d140d9414e7af9ce3ffc736e38fb1521177";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/vi/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/vi/firefox-59.0.1.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "b4a8662cb51660051ea0ce52156f8e767b0a465a3cf954f08b3e7eb6f55d2f48da16ac47ec8e6c431836956058df388c35437f29f3e993d2e918de328edb6ffa";
+ sha512 = "c5f9cb57563ff819236358c0ad18992f2c3f8b80decf690ec3945b029e2dbd6bc6f564af2a5bb6394eddb8a52ed0a0cab446cbd9c49284de821a814b766b60b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/xh/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/xh/firefox-59.0.1.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "a3bb908c5785995cbae70ed6bd8f819f1d7bd39073b210489d48db17132be0a28485969ce5619752724ea28eff33f7c20e532edfc260b4fcb80187755f9b3b76";
+ sha512 = "9f96977530f745eeb1cdb14b40bf657e9a3d9e322b250fab799b37d801665fa47a47aa88c1f28998a29ed69523e42f300b69e008f5d2ff7f166e12b3c1fb4497";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/zh-CN/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/zh-CN/firefox-59.0.1.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "7c9a083e669a8412915f3423b639605fe5377945d81f21c5acc4efa19d8204b53093bfe99f3a664e7190a91b2a5eb957f561667644569cbd272ab13dcf53568e";
+ sha512 = "5f3cbcfad55017b30e72ec4fb266d5b9f822804cee329c67c5998ad44a9fb6852b32764179586862cff1dc311c9a9a84259894282d57b5d2146c1d4de86442e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/59.0/linux-i686/zh-TW/firefox-59.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/zh-TW/firefox-59.0.1.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "9cfcf4928557a4158c802a20b7c63d8097fa629cb755399d16cfbd7e61c7dfc4058b3879f4840743ed25925a4a9d6ef200c7f6a40bed428915f3d3c0392deb23";
+ sha512 = "3f48bc028239f8cc8bf2f818129b1509f0e8d895087e8e7b16375df447e0d0ba7b543679a808aa579fc92bf2fc4af6c3797eacf03c905ce3714eed897a8b8f86";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 7a04c0d2d42..19a16dfe3a2 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -18,10 +18,10 @@ rec {
firefox = common rec {
pname = "firefox";
- version = "59.0";
+ version = "59.0.1";
src = fetchurl {
- url = "https://hg.mozilla.org/releases/mozilla-release/archive/c61f5f5ead48c78a80c80db5c489bdc7cfaf8175.tar.bz2";
- sha512 = "03yybi1yp9g29jzdfgrq32r7a0gl2jz64w6ai8219cvhx8y95ahxfznj3vm29frrp6c18dk2nlpv2s89iczwm00lnn42r7dn6s6ppl9";
+ url = "https://hg.mozilla.org/releases/mozilla-release/archive/3db9e3d52b17563efca181ccbb50deb8660c59ae.tar.bz2";
+ sha512 = "3da3gmfv2aalsbsx15csas4mwnvlliy1q081sd2riz3nvxr7qyrdx1qvxj4gdr97wlmvz7mig9djhh5gwx7ddah5hfhj23cvccmw6jw";
};
patches = nixpkgsPatches ++ [
@@ -41,10 +41,10 @@ rec {
firefox-esr = common rec {
pname = "firefox-esr";
- version = "52.7.1esr";
+ version = "52.7.2esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "0275ca9c093fd0dcf09cfd31a4bca8c6ddb87aa74ace6b273a62f61079eeed11c2c0330c52c5f76aa73ed97e9cd18aa63cee69387e1fe346a30e4f9affc91ba7";
+ sha512 = "e275fd10fd32a0dc237135af3395e3a1ae501844632c973ff3b9bca1456702ee36dbee99fc57300598403c924c0db63bd62a199845c8f4a2e29db5d1e5973395";
};
patches = nixpkgsPatches;
diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index cc69be36e37..d67d9d5851c 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -3,7 +3,7 @@
buildGoPackage rec {
name = "machine-${version}";
- version = "0.13.0";
+ version = "0.14.0";
goPackagePath = "github.com/docker/machine";
@@ -11,7 +11,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "docker";
repo = "machine";
- sha256 = "1bqblgz2avrvp9xv6rlvgl0xh2ghpml3a00xhq3mmzkznayw6chq";
+ sha256 = "0hd5sklmvkhhpfn318hq9w0f7x14165h1l2mdn9iv4447z1iibff";
};
postInstall = ''
diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix
index aa5f8663331..56cbef7f005 100644
--- a/pkgs/applications/networking/cluster/kontemplate/default.nix
+++ b/pkgs/applications/networking/cluster/kontemplate/default.nix
@@ -1,26 +1,35 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "kontemplate-${version}";
- version = "1.3.0";
-
+ name = "kontemplate-${version}";
+ version = "1.4.0";
goPackagePath = "github.com/tazjin/kontemplate";
+ goDeps = ./deps.nix;
src = fetchFromGitHub {
- rev = "v${version}";
- owner = "tazjin";
- repo = "kontemplate";
- sha256 = "0g9hs9gwwkng9vbnv07ibhll0kggdprffpmhlbz9nmv81w2z3myi";
+ owner = "tazjin";
+ repo = "kontemplate";
+ rev = "v${version}";
+ sha256 = "11aqc9sgyqz3pscx7njnb3xghl7d61vzdgl3bqndady0dxsccrpj";
};
- goDeps = ./deps.nix;
-
- meta = with stdenv.lib; {
- description = "Extremely simple Kubernetes resource templates";
- homepage = http://kontemplate.works;
- license = licenses.gpl3;
- maintainers = with maintainers; [ mbode ];
- platforms = platforms.unix;
+ meta = with lib; {
+ description = "Extremely simple Kubernetes resource templates";
+ homepage = "http://kontemplate.works";
+ downloadPage = "https://github.com/tazjin/kontemplate/releases";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ mbode tazjin ];
+ platforms = platforms.unix;
repositories.git = git://github.com/tazjin/kontemplate.git;
+
+ longDescription = ''
+ Kontemplate is a simple CLI tool that can take sets of
+ Kubernetes resource files with placeholders and insert values
+ per environment.
+
+ It can be used as a simple way of deploying the same set of
+ resources to different Kubernetes contexts with context-specific
+ configuration.
+ '';
};
}
diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/applications/networking/cluster/kontemplate/deps.nix
index 1d6dfb3e64f..db2692a79e7 100644
--- a/pkgs/applications/networking/cluster/kontemplate/deps.nix
+++ b/pkgs/applications/networking/cluster/kontemplate/deps.nix
@@ -3,118 +3,109 @@
{
goPackagePath = "github.com/Masterminds/semver";
fetch = {
- type = "git";
- url = "https://github.com/Masterminds/semver";
- rev = "15d8430ab86497c5c0da827b748823945e1cf1e1";
- sha256 = "0q5w6mjr1zws04z7x1ax1hp1zxdc4mbm9zsikgd6fv0c9ndnjr3q";
+ type = "git";
+ url = "https://github.com/Masterminds/semver";
+ rev = "517734cc7d6470c0d07130e40fd40bdeb9bcd3fd";
+ sha256 = "1625b5sxpmlz60jw67j1ljfcc09d4lhxg3z6gc4am8s2rrdgwij6";
};
}
{
goPackagePath = "github.com/Masterminds/sprig";
fetch = {
- type = "git";
- url = "https://github.com/Masterminds/sprig";
- rev = "b217b9c388de2cacde4354c536e520c52c055563";
- sha256 = "1f41v3c8c7zagc4qjhcb6nwkvi8nzvf70f89a7ss2m6krkxz0m2a";
+ type = "git";
+ url = "https://github.com/Masterminds/sprig";
+ rev = "e039e20e500c2c025d9145be375e27cf42a94174";
+ sha256 = "1yhpyzq6ghwl0242phjpbc9358fcw63pxrcxsyv9n4dm0w15va3m";
};
}
{
goPackagePath = "github.com/alecthomas/template";
fetch = {
- type = "git";
- url = "https://github.com/alecthomas/template";
- rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+ type = "git";
+ url = "https://github.com/alecthomas/template";
+ rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
};
}
{
goPackagePath = "github.com/alecthomas/units";
fetch = {
- type = "git";
- url = "https://github.com/alecthomas/units";
- rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+ type = "git";
+ url = "https://github.com/alecthomas/units";
+ rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
};
}
{
goPackagePath = "github.com/aokoli/goutils";
fetch = {
- type = "git";
- url = "https://github.com/aokoli/goutils";
- rev = "3391d3790d23d03408670993e957e8f408993c34";
+ type = "git";
+ url = "https://github.com/aokoli/goutils";
+ rev = "3391d3790d23d03408670993e957e8f408993c34";
sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n";
};
}
{
goPackagePath = "github.com/ghodss/yaml";
fetch = {
- type = "git";
- url = "https://github.com/ghodss/yaml";
- rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
+ type = "git";
+ url = "https://github.com/ghodss/yaml";
+ rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
};
}
{
goPackagePath = "github.com/huandu/xstrings";
fetch = {
- type = "git";
- url = "https://github.com/huandu/xstrings";
- rev = "37469d0c81a7910b49d64a0d308ded4823e90937";
- sha256 = "18c2b4h7phdm71mn66x8bsmghjr1b2lpg07zcbgmab37y36bjl20";
+ type = "git";
+ url = "https://github.com/huandu/xstrings";
+ rev = "3959339b333561bf62a38b424fd41517c2c90f40";
+ sha256 = "0f1jyd80grpr88gwhljx2x0xgsyzw07807n4z4axxxlybh5f0nh1";
};
}
{
goPackagePath = "github.com/imdario/mergo";
fetch = {
- type = "git";
- url = "https://github.com/imdario/mergo";
- rev = "7fe0c75c13abdee74b09fcacef5ea1c6bba6a874";
- sha256 = "1hclh5kpg25s2llpk7j7sm3vf66xci5jchn8wzdcr5fj372ghsbd";
- };
- }
- {
- goPackagePath = "github.com/polydawn/meep";
- fetch = {
- type = "git";
- url = "https://github.com/polydawn/meep";
- rev = "eaf1db2168fe380b4da17a35f0adddb5ae15a651";
- sha256 = "12n134fb2imnj67xkbznzm0gqkg36hdxwr960y91qb5s2q2krxir";
+ type = "git";
+ url = "https://github.com/imdario/mergo";
+ rev = "d806ba8c21777d504a2090a2ca4913c750dd3a33";
+ sha256 = "12n3lfbfxvnag916c6dpxl48j29s482zwsqjc6wk4vb68qbz2nl3";
};
}
{
goPackagePath = "github.com/satori/go.uuid";
fetch = {
- type = "git";
- url = "https://github.com/satori/go.uuid";
- rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b";
+ type = "git";
+ url = "https://github.com/satori/go.uuid";
+ rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b";
sha256 = "0l782l4srv36pj8pfgn61996d0vjifld4a569rbjwq5h14pd0c07";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122";
- sha256 = "095zyvjb0m2pz382500miqadhk7w3nis8z3j941z8cq4rdafijvi";
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "ab89591268e0c8b748cbe4047b00197516011af5";
+ sha256 = "1cbg8wlv1hmdps9ksa4kym5zy0mb2yjykw4ns7yqv7nmz4s5xajr";
};
}
{
goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
fetch = {
- type = "git";
- url = "https://gopkg.in/alecthomas/kingpin.v2";
- rev = "1087e65c9441605df944fb12c33f0fe7072d18ca";
+ type = "git";
+ url = "https://gopkg.in/alecthomas/kingpin.v2";
+ rev = "1087e65c9441605df944fb12c33f0fe7072d18ca";
sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "287cf08546ab5e7e37d55a84f7ed3fd1db036de5";
- sha256 = "15502klds9wwv567vclb9kx95gs8lnyzn4ybsk6l9fc7a67lk831";
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f";
+ sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6";
};
}
]
diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix
index 49c57b47028..45dcfb1738c 100644
--- a/pkgs/applications/networking/cluster/pig/default.nix
+++ b/pkgs/applications/networking/cluster/pig/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
- name = "pig-0.14.0";
+ name = "pig-0.16.0";
src = fetchurl {
url = "mirror://apache/pig/${name}/${name}.tar.gz";
- sha256 = "183in34cj93ny3lhqyq76g9pjqgw1qlwakk5v6x847vrlkfndska";
+ sha256 = "0p79grz5islnq195lv7pqdxb5l3v4y0k0w63602827qs70zpr508";
};
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 890fe231cbf..8b3e83ea86f 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -100,8 +100,8 @@ in rec {
terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues;
terraform_0_11 = pluggable (generic {
- version = "0.11.3";
- sha256 = "0637x7jcm62pdnivmh4rggly6dmlvdh3jpsd1z4vba15gbm203nz";
+ version = "0.11.4";
+ sha256 = "1r3x7qv0bfsnmj7l3hmsww26rb9hkg361515gpvjjzafz5b7bz0c";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix
index ce5e9ac048e..ab00cc7772b 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix
@@ -11,8 +11,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-archive";
- version = "1.0.1";
- sha256 = "1qxw9c38hsdmxyrrnl7s9iwlzjrwzml2m74bs4iw120gljpqphqz";
+ version = "1.0.2";
+ sha256 = "0n8939qai01lrk4kq3w344a73z6bfqbfq9yl28yh93fvmpkv6jz2";
};
arukas =
{
@@ -46,8 +46,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-azurerm";
- version = "1.2.0";
- sha256 = "10j7lk3rrlix04pcnnz25h0bm336nnmf3c2a1760v272sjdph51z";
+ version = "1.3.0";
+ sha256 = "0szw7fmdwy8r99w40z2h7fp5znj8s0ddbcwrgm1g3vdcp757vcg5";
};
bitbucket =
{
@@ -431,8 +431,8 @@
{
owner = "terraform-providers";
repo = "terraform-provider-scaleway";
- version = "1.1.0";
- sha256 = "10ghzwss3n95yln7brzwghkc0gv7bkmyml7zlj7hfbkjr3382m1p";
+ version = "1.2.0";
+ sha256 = "123rjvslq7gy2m96rikm0i2298jjpsnyh9civbyvbxj3h47z9h4v";
};
softlayer =
{
diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix
index e56dbe0817e..c3085519ec4 100644
--- a/pkgs/applications/networking/gmailieer/default.nix
+++ b/pkgs/applications/networking/gmailieer/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
name = "gmailieer";
- version = "0.5";
+ version = "0.6";
src = fetchFromGitHub {
owner = "gauteh";
repo = "gmailieer";
rev = "v${version}";
- sha256 = "152ky06k1wc3jffb48c6zh7c7pr732m9f4g1i316zaa4nx2ynfsa";
+ sha256 = "1z7r78ck81l8xdpjynjv8dfm4j0p6a1cbzgdckp41id27sq1vc76";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index ddc9df75999..87ef5f2a41a 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -1,24 +1,23 @@
{ stdenv, fetchFromGitHub, zlib
-, ocaml, ocamlbuild, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
+, ocaml, jbuilder, opam, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
stdenv.mkDerivation rec {
name = "google-drive-ocamlfuse-${version}";
- version = "0.6.21";
+ version = "0.6.25";
src = fetchFromGitHub {
owner = "astrada";
repo = "google-drive-ocamlfuse";
rev = "v${version}";
- sha256 = "14qvhz18pzxdgxk5vcs024ajbkxccfwc9p3z5r6vfkc9mm851v59";
+ sha256 = "1rjm2jcc93sz7l25zbgqal81534vvvbmwy7847s0k8fkr5nq97gp";
};
- nativeBuildInputs = [ ocamlbuild ];
+ nativeBuildInputs = [ jbuilder opam ];
buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ];
- configurePhase = "ocaml setup.ml -configure --prefix \"$out\"";
- buildPhase = "ocaml setup.ml -build";
- installPhase = "ocaml setup.ml -install";
+ buildPhase = "jbuilder build @install";
+ installPhase = "mkdir $out && jbuilder install --prefix $out";
meta = {
homepage = http://gdfuse.forge.ocamlcore.org/;
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 74a477b537c..134066cd352 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,133 +1,15 @@
-{ mkDerivation, lib, fetchgit, fetchpatch
-, pkgconfig, gyp, cmake, makeWrapper
-, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify
-, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
-}:
+{ qt5, stdenv }:
-with lib;
-
-mkDerivation rec {
- name = "telegram-desktop-${version}";
- version = "1.2.6";
-
- # Submodules
- src = fetchgit {
- url = "git://github.com/telegramdesktop/tdesktop";
- rev = "v${version}";
- sha256 = "15g0m2wwqfp13wd7j31p8cx1kpylx5m8ljaksnsqdkgyr9l1ar8w";
- fetchSubmodules = true;
+let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
+in {
+ stable = mkTelegram {
+ stable = true;
+ version = "1.2.6";
+ sha256Hash = "15g0m2wwqfp13wd7j31p8cx1kpylx5m8ljaksnsqdkgyr9l1ar8w";
};
-
- # TODO: Not active anymore.
- tgaur = fetchgit {
- url = "https://aur.archlinux.org/telegram-desktop-systemqt.git";
- rev = "1ed27ce40913b9e6e87faf7a2310660c2790b98e";
- sha256 = "1i7ipqgisaw54g1nbg2cvpbx89g9gyjjb3sak1486pxsasp1qhyc";
- };
-
- patches = [
- (fetchpatch {
- name = "tdesktop.patch";
- url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/tdesktop.patch?h=packages/telegram-desktop&id=f0eefac36f529295f8b065a14b6d5f1a51d7614d";
- sha256 = "1a4wap5xnp6zn4913r3zdpy6hvkcfxcy4zzimy7fwzp7iwy20iqa";
- })
- ];
-
- postPatch = ''
- substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
- substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp --replace '"notify"' '"${libnotify}/lib/libnotify.so"'
- '';
-
- nativeBuildInputs = [ pkgconfig gyp cmake makeWrapper ];
-
- buildInputs = [
- qtbase qtimageformats gtk3 libappindicator-gtk3
- dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
- ];
-
- enableParallelBuilding = true;
-
- GYP_DEFINES = concatStringsSep "," [
- "TDESKTOP_DISABLE_CRASH_REPORTS"
- "TDESKTOP_DISABLE_AUTOUPDATE"
- "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
- ];
-
- NIX_CFLAGS_COMPILE = [
- "-DTDESKTOP_DISABLE_AUTOUPDATE"
- "-DTDESKTOP_DISABLE_CRASH_REPORTS"
- "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
- "-I${minizip}/include/minizip"
- # See Telegram/gyp/qt.gypi
- "-I${getDev qtbase}/mkspecs/linux-g++"
- ] ++ concatMap (x: [
- "-I${getDev qtbase}/include/${x}"
- "-I${getDev qtbase}/include/${x}/${qtbase.version}"
- "-I${getDev qtbase}/include/${x}/${qtbase.version}/${x}"
- "-I${getDev libopus}/include/opus"
- "-I${getDev alsaLib}/include/alsa"
- "-I${getDev libpulseaudio}/include/pulse"
- ]) [ "QtCore" "QtGui" "QtDBus" ];
- CPPFLAGS = NIX_CFLAGS_COMPILE;
-
- preConfigure = ''
-
- pushd "Telegram/ThirdParty/libtgvoip"
- patch -Np1 -i "${tgaur}/libtgvoip.patch"
- popd
-
- sed -i Telegram/gyp/telegram_linux.gypi \
- -e 's,/usr,/does-not-exist,g' \
- -e 's,appindicator-0.1,appindicator3-0.1,g' \
- -e 's,-flto,,g'
-
- sed -i Telegram/gyp/qt.gypi \
- -e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \
- -e 's,\d+",\d+" | head -n1,g'
- sed -i Telegram/gyp/qt_moc.gypi \
- -e "s,/usr/bin/moc,moc,g"
- sed -i Telegram/gyp/qt_rcc.gypi \
- -e "s,/usr/bin/rcc,rcc,g"
-
- gyp \
- -Dbuild_defines=${GYP_DEFINES} \
- -Gconfig=Release \
- --depth=Telegram/gyp \
- --generator-output=../.. \
- -Goutput_dir=out \
- --format=cmake \
- Telegram/gyp/Telegram.gyp
-
- cd out/Release
-
- NUM=$((`wc -l < CMakeLists.txt` - 2))
- sed -i "$NUM r $tgaur/CMakeLists.inj" CMakeLists.txt
-
- export ASM=$(type -p gcc)
- '';
-
- installPhase = ''
- install -Dm755 Telegram $out/bin/telegram-desktop
- mkdir -p $out/share/applications $out/share/kde4/services
- sed "s,/usr/bin,$out/bin,g" $tgaur/telegram-desktop.desktop > $out/share/applications/telegram-desktop.desktop
- sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol
- 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
-
- # This is necessary to run Telegram in a pure environment.
- wrapProgram $out/bin/telegram-desktop \
- --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \
- --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)}\","
- '';
-
- meta = {
- description = "Telegram Desktop messaging app";
- license = licenses.gpl3;
- platforms = [ "x86_64-linux" "i686-linux" ];
- homepage = https://desktop.telegram.org/;
- maintainers = with maintainers; [ abbradar garbas primeos ];
+ preview = mkTelegram {
+ stable = false;
+ version = "1.2.12";
+ sha256Hash = "1b9qc4a14jqjl30z4bjh1zbqsmgl25kdp0hj8p7xbj34zlkzfw5m";
};
}
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
new file mode 100644
index 00000000000..a165e90c3bd
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -0,0 +1,140 @@
+{ stable, version, sha256Hash }:
+
+{ mkDerivation, lib, fetchgit, fetchpatch
+, pkgconfig, pythonPackages, cmake, makeWrapper
+, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify
+, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
+}:
+
+with lib;
+
+mkDerivation rec {
+ name = "telegram-desktop-${version}";
+ inherit version;
+
+ # Submodules
+ src = fetchgit {
+ url = "git://github.com/telegramdesktop/tdesktop";
+ rev = "v${version}";
+ sha256 = sha256Hash;
+ fetchSubmodules = true;
+ };
+
+ # TODO: Not active anymore.
+ tgaur = fetchgit {
+ url = "https://aur.archlinux.org/telegram-desktop-systemqt.git";
+ rev = "1ed27ce40913b9e6e87faf7a2310660c2790b98e";
+ sha256 = "1i7ipqgisaw54g1nbg2cvpbx89g9gyjjb3sak1486pxsasp1qhyc";
+ };
+
+ patches = [ (if stable
+ then (fetchpatch {
+ name = "tdesktop.patch";
+ url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/tdesktop.patch?h=packages/telegram-desktop&id=f0eefac36f529295f8b065a14b6d5f1a51d7614d";
+ sha256 = "1a4wap5xnp6zn4913r3zdpy6hvkcfxcy4zzimy7fwzp7iwy20iqa";
+ })
+ else (fetchpatch {
+ name = "tdesktop.patch";
+ url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/tdesktop.patch?h=packages/telegram-desktop&id=59ca8bd4428cf2fb3f02d7f1e1a5558545a4c075";
+ sha256 = "0jj2kifzx83f9nhk30csy2373avpyx0ci70a8bc7j2dm3wxym50l";
+ }))
+ ];
+
+ postPatch = ''
+ substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
+ substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp --replace '"notify"' '"${libnotify}/lib/libnotify.so"'
+ '';
+
+ nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake makeWrapper ];
+
+ buildInputs = [
+ qtbase qtimageformats gtk3 libappindicator-gtk3
+ dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
+ ];
+
+ enableParallelBuilding = true;
+
+ GYP_DEFINES = concatStringsSep "," [
+ "TDESKTOP_DISABLE_CRASH_REPORTS"
+ "TDESKTOP_DISABLE_AUTOUPDATE"
+ "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
+ ];
+
+ NIX_CFLAGS_COMPILE = [
+ "-DTDESKTOP_DISABLE_AUTOUPDATE"
+ "-DTDESKTOP_DISABLE_CRASH_REPORTS"
+ "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
+ "-I${minizip}/include/minizip"
+ # See Telegram/gyp/qt.gypi
+ "-I${getDev qtbase}/mkspecs/linux-g++"
+ ] ++ concatMap (x: [
+ "-I${getDev qtbase}/include/${x}"
+ "-I${getDev qtbase}/include/${x}/${qtbase.version}"
+ "-I${getDev qtbase}/include/${x}/${qtbase.version}/${x}"
+ "-I${getDev libopus}/include/opus"
+ "-I${getDev alsaLib}/include/alsa"
+ "-I${getDev libpulseaudio}/include/pulse"
+ ]) [ "QtCore" "QtGui" "QtDBus" ];
+ CPPFLAGS = NIX_CFLAGS_COMPILE;
+
+ preConfigure = ''
+
+ pushd "Telegram/ThirdParty/libtgvoip"
+ patch -Np1 -i "${tgaur}/libtgvoip.patch"
+ popd
+
+ sed -i Telegram/gyp/telegram_linux.gypi \
+ -e 's,/usr,/does-not-exist,g' \
+ -e 's,appindicator-0.1,appindicator3-0.1,g' \
+ -e 's,-flto,,g'
+
+ sed -i Telegram/gyp/qt.gypi \
+ -e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \
+ -e 's,\d+",\d+" | head -n1,g'
+ sed -i Telegram/gyp/qt_moc.gypi \
+ -e "s,/usr/bin/moc,moc,g"
+ sed -i Telegram/gyp/qt_rcc.gypi \
+ -e "s,/usr/bin/rcc,rcc,g"
+
+ gyp \
+ -Dbuild_defines=${GYP_DEFINES} \
+ -Gconfig=Release \
+ --depth=Telegram/gyp \
+ --generator-output=../.. \
+ -Goutput_dir=out \
+ --format=cmake \
+ Telegram/gyp/Telegram.gyp
+
+ cd out/Release
+
+ NUM=$((`wc -l < CMakeLists.txt` - 2))
+ sed -i "$NUM r $tgaur/CMakeLists.inj" CMakeLists.txt
+
+ export ASM=$(type -p gcc)
+ '';
+
+ installPhase = ''
+ install -Dm755 Telegram $out/bin/telegram-desktop
+ mkdir -p $out/share/applications $out/share/kde4/services
+ sed "s,/usr/bin,$out/bin,g" $tgaur/telegram-desktop.desktop > $out/share/applications/telegram-desktop.desktop
+ sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol
+ 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
+
+ # This is necessary to run Telegram in a pure environment.
+ wrapProgram $out/bin/telegram-desktop \
+ --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \
+ --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)}\","
+ '';
+
+ meta = {
+ description = "Telegram Desktop messaging app";
+ license = licenses.gpl3;
+ platforms = [ "x86_64-linux" "i686-linux" ];
+ homepage = https://desktop.telegram.org/;
+ maintainers = with maintainers; [ abbradar garbas primeos ];
+ };
+}
diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix
index 15f9def1151..b4532c5470b 100644
--- a/pkgs/applications/networking/irc/ii/default.nix
+++ b/pkgs/applications/networking/irc/ii/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "ii-1.8";
-
+
src = fetchurl {
url = "http://dl.suckless.org/tools/${name}.tar.gz";
sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr";
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index f4e59d1ca04..28b85936a28 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
, hicolor-icon-theme, libsoup, gnome3 }:
stdenv.mkDerivation rec {
- name = "homebank-5.1.7";
+ name = "homebank-5.1.8";
src = fetchurl {
url = "http://homebank.free.fr/public/${name}.tar.gz";
- sha256 = "19szz86jxya8v4r3pa5czng9q2kn5hhbk273x1wqvdv40z0577jp";
+ sha256 = "0fzjmwz2pgi0nw49xljp1za3vp67kjh88gf688d9ig4wc2ygr0qh";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index 48b278cc1df..9f7048f3646 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -9,11 +9,11 @@
python2Packages.buildPythonApplication rec {
name = "zim-${version}";
- version = "0.67";
+ version = "0.68";
src = fetchurl {
url = "http://zim-wiki.org/downloads/${name}.tar.gz";
- sha256 = "1gdbzy9qyzj3rn9fsl0ss7lbk9kyka99656bphx2dah694yyyz5k";
+ sha256 = "05fzb24a2s3pm89zb6gwa48wb925an5i652klx8yk9pn23h1h5fr";
};
propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ];
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index a666e80e68e..2f9999ab856 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings-desktop-schemas, gtk3, gnome3 }:
let
-version = "5.0.25";
+version = "5.0.35.1";
meta = with stdenv.lib; {
homepage = https://www.zotero.org;
description = "Collect, organize, cite, and share your research sources";
@@ -15,7 +15,7 @@ zoteroSrc = stdenv.mkDerivation rec {
src = fetchurl {
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
- sha256 = "1y3q5582xp4inpz137x0r9iscs1g0cjlqcfjpzl3klsq3yas688k";
+ sha256 = "0d2imvp84svllrnja1dl4nldp634z632g5xkm2q9v7j3dwbzw1hw";
};
buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index a065fdf4489..ddcfbf00bf9 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "picard-tools-${version}";
- version = "2.17.10";
+ version = "2.17.11";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
- sha256 = "0lf9appcs66mxmirzbys09xhq38kpa4ldxwwzrr9y2cklnxjn4hg";
+ sha256 = "1p50bzkwq5hrwal6i679yrkdqkh5hk4bb9l9gdff2x2i761v9y9b";
};
buildInputs = [ jre makeWrapper ];
diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix
index e1add2e1483..9c2d273b088 100644
--- a/pkgs/applications/science/biology/snpeff/default.nix
+++ b/pkgs/applications/science/biology/snpeff/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "snpeff-${version}";
- version = "4.3t";
+ version = "4.3q";
src = fetchurl {
- url = "mirror://sourceforge/project/snpeff/snpEff_v4_3t_core.zip";
- sha256 = "0i12mv93bfv8xjwc3rs2x73d6hkvi7kgbbbx3ry984l3ly4p6nnm";
+ url = "mirror://sourceforge/project/snpeff/snpEff_v4_3q_core.zip";
+ sha256 = "0sxz8zy8wrzcy01hyb1cirwbxqyjw30a2x3q6p4l7zmw2szi7mn1";
};
buildInputs = [ unzip jre makeWrapper ];
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix
index 46689dfc974..21eddde8267 100644
--- a/pkgs/applications/science/electronics/kicad/unstable.nix
+++ b/pkgs/applications/science/electronics/kicad/unstable.nix
@@ -10,13 +10,13 @@
with lib;
stdenv.mkDerivation rec {
name = "kicad-unstable-${version}";
- version = "2017-12-11";
+ version = "2018-03-10";
src = fetchFromGitHub {
owner = "KICad";
repo = "kicad-source-mirror";
- rev = "1955f252265c38a313f6c595d6c4c637f38fd316";
- sha256 = "15cc81h7nh5dk6gj6mc4ylcgdznfriilhb43n1g3xwyq3s8iaibz";
+ rev = "17c0917dac12ea0be50ff95cee374a0cd8b7f862";
+ sha256 = "1yn5hj5hjnpb5fkzzlyawg62a96fbfvha49395s22dcp95riqvf0";
};
postPatch = ''
diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix
index 44dc7af98c1..7b768f7077e 100644
--- a/pkgs/applications/science/math/ecm/default.nix
+++ b/pkgs/applications/science/math/ecm/default.nix
@@ -2,7 +2,7 @@
let
pname = "ecm";
- version = "6.4.4";
+ version = "7.0.4";
name = "${pname}-${version}";
in
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
inherit name;
src = fetchurl {
- url = http://gforge.inria.fr/frs/download.php/file/32159/ecm-6.4.4.tar.gz;
- sha256 = "0v5h2nicz9yx78c2d72plbhi30iq4nxbvphja1s9501db4aah4y8";
+ url = "http://gforge.inria.fr/frs/download.php/file/36224/ecm-${version}.tar.gz";
+ sha256 = "0hxs24c2m3mh0nq1zz63z3sb7dhy1rilg2s1igwwcb26x3pb7xqc";
};
# See https://trac.sagemath.org/ticket/19233
diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix
new file mode 100644
index 00000000000..8efe8d9da94
--- /dev/null
+++ b/pkgs/applications/science/math/nasc/default.nix
@@ -0,0 +1,71 @@
+{ stdenv
+, bash
+, gnused
+, fetchFromGitHub
+, gettext
+, pkgconfig
+, gtk3
+, granite
+, gnome3
+, cmake
+, ninja
+, vala
+, libqalculate
+, elementary-cmake-modules
+, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ name = "nasc-${version}";
+ version = "0.4.6";
+
+ src = fetchFromGitHub {
+ owner = "parnold-x";
+ repo = "nasc";
+ rev = version;
+ sha256 = "01n4ldj5phrsv97vb04qvs9c1ip6v8wygx9llj704hly1il9fb54";
+ };
+
+ XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [
+ "${granite}/share"
+ "${gnome3.libgee}/share"
+ ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ wrapGAppsHook
+ vala
+ cmake
+ gettext
+ ];
+ buildInputs = [
+ libqalculate
+ gtk3
+ granite
+ gnome3.libgee
+ gnome3.libsoup
+ gnome3.gtksourceview
+ ];
+
+ prePatch = ''
+ substituteInPlace ./libqalculatenasc/libtool \
+ --replace "/bin/bash" "${bash}/bin/bash" \
+ --replace "/bin/sed" "${gnused}/bin/sed"
+ substituteInPlace ./libqalculatenasc/configure.inc \
+ --replace 'ac_default_path="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"' 'ac_default_path=$PATH'
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Do maths like a normal person";
+ longDescription = ''
+ It’s an app where you do maths like a normal person. It lets you
+ type whatever you want and smartly figures out what is math and
+ spits out an answer on the right pane. Then you can plug those
+ answers in to future equations and if that answer changes, so does
+ the equations it’s used in.
+ '';
+ homepage = https://github.com/parnold-x/nasc;
+ maintainers = with maintainers; [ samdroid-apps ];
+ platforms = platforms.linux;
+ license = licenses.gpl3Plus;
+ };
+}
diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix
index 007514e6552..b3e36b6bf20 100644
--- a/pkgs/applications/science/math/pari/gp2c.nix
+++ b/pkgs/applications/science/math/pari/gp2c.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gp2c-${version}";
- version = "0.0.10";
+ version = "0.0.10pl1";
src = fetchurl {
url = "http://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz";
- sha256 = "1xhpz5p81iw261ay1kip283ggr0ir8ydz8qx3v24z8jfms1r3y70";
+ sha256 = "16hgmdvzxbmv63x1f72q1xgfyh0qhx7kaf9nbaamy0gdawxjxcav";
};
buildInputs = [ pari perl ];
diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix
index 82b95132d88..3a0bcb66813 100644
--- a/pkgs/applications/science/misc/gephi/default.nix
+++ b/pkgs/applications/science/misc/gephi/default.nix
@@ -1,37 +1,64 @@
-{stdenv, fetchurl, jdk}:
+{ stdenv, fetchFromGitHub, callPackage, jdk, maven, javaPackages }:
-with stdenv.lib;
+let
+ version = "0.9.2";
-let version = "0.9.2"; in
-stdenv.mkDerivation {
- name = "gephi-${version}";
-
- src = fetchurl {
- url = "https://github.com/gephi/gephi/releases/download/v${version}/gephi-${version}-linux.tar.gz";
- sha256 = "1wr3rka8j2y10nnwbg27iaxkbrp4d7d07ccs9n94yqv6wqawj5z8";
+ src = fetchFromGitHub {
+ owner = "gephi";
+ repo = "gephi";
+ rev = "v${version}";
+ sha256 = "0kqp2nvnsb55j1axb6hk0mlw5alyaiyb70z0mdybhpqqxyw2da2r";
};
- meta = {
- inherit version;
+ # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)
+ deps = stdenv.mkDerivation {
+ name = "gephi-${version}-deps";
+ inherit src;
+ buildInputs = [ jdk maven ];
+ buildPhase = ''
+ while mvn package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do
+ echo "timeout, restart maven to continue downloading"
+ done
+ '';
+ # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
+ installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "1p7yf97dn0nvr005cbs6vdk3i341s8fya4kfccj8qqad2qgxflif";
+ };
+in
+stdenv.mkDerivation rec {
+ name = "gephi-${version}";
+
+ inherit src;
+
+ buildInputs = [ jdk maven ];
+
+ buildPhase = ''
+ # 'maven.repo.local' must be writable so copy it out of nix store
+ mvn package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
+ '';
+
+ installPhase = ''
+ cp -r modules/application/target/gephi $out
+
+ # remove garbage
+ find $out -type f -name .lastModified -delete
+ find $out -type f -regex '.+\.exe' -delete
+
+ # use self-compiled JOGL to avoid patchelf'ing .so inside jars
+ rm $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-{jogl,gluegen}/*.jar
+ cp ${javaPackages.jogl_2_3_2}/share/java/jogl*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-jogl/
+ cp ${javaPackages.jogl_2_3_2}/share/java/glue*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-gluegen/
+
+ echo "jdkhome=${jdk}" >> $out/etc/gephi.conf
+ '';
+
+ meta = with stdenv.lib; {
description = "A platform for visualizing and manipulating large graphs";
homepage = https://gephi.org;
license = licenses.gpl3;
- maintainers = [maintainers.taeer];
- platforms = platforms.linux;
+ maintainers = [ maintainers.taeer ];
+ platforms = [ "x86_64-linux" ];
};
-
- buildInputs = [jdk];
-
- configurePhase = "
- echo \"jdkhome=${jdk}\" >> etc/gephi.conf
- ";
-
- dontBuild = true;
-
- installPhase = "
- mkdir $out
- for a in ./*; do
- mv $a $out
- done
- ";
}
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 3c7d0a86be0..d890001489f 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
, docbook_xml_xslt, pkgconfig, luajit
, gzip, bzip2, xz
+, python, wrapPython, pygments, markdown
}:
stdenv.mkDerivation rec {
@@ -20,10 +21,11 @@ stdenv.mkDerivation rec {
sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ];
buildInputs = [
openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit
];
+ pythonPath = [ pygments markdown ];
postPatch = ''
sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
@@ -50,6 +52,8 @@ stdenv.mkDerivation rec {
a2x --no-xmllint -f manpage cgitrc.5.txt
mkdir -p "$out/share/man/man5"
cp cgitrc.5 "$out/share/man/man5"
+
+ wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath"
'';
meta = {
diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 2bde0a68480..4a4879600ae 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "src-${version}";
- version = "1.17";
+ version = "1.18";
src = fetchurl {
url = "http://www.catb.org/~esr/src/${name}.tar.gz";
- sha256 = "17885hpq8nxhqzwl50nrgdk1q9dq4cxjxldgkk8shdf08s5hcqhk";
+ sha256 = "0n0skhvya8w2az45h2gsafxy8m2mvqas64nrgxifcmrzfv0rf26c";
};
buildInputs = [ python rcs git makeWrapper ];
@@ -24,9 +24,17 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Simple single-file revision control";
- homepage = http://www.catb.org/~esr/src/;
+ longDescription = ''
+ SRC, acronym of Simple Revision Control, is RCS/SCCS reloaded with a
+ modern UI, designed to manage single-file solo projects kept more than one
+ to a directory. Use it for FAQs, ~/bin directories, config files, and the
+ like. Features integer sequential revision numbers, a command set that
+ will seem familiar to Subversion/Git/hg users, and no binary blobs
+ anywhere.
+ '';
+ homepage = http://www.catb.org/esr/src/;
license = licenses.bsd3;
platforms = platforms.all;
- maintainers = with maintainers; [ calvertvl ];
+ maintainers = with maintainers; [ calvertvl AndersonTorres ];
};
}
diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix
index 862032572dc..b67c4a43cf5 100644
--- a/pkgs/applications/video/kazam/default.nix
+++ b/pkgs/applications/video/kazam/default.nix
@@ -42,9 +42,9 @@ python3Packages.buildPythonApplication rec {
meta = with stdenv.lib; {
- description = "Cross-platform, Friend-2-Friend and secure decentralised communication platform";
+ description = "A screencasting program created with design in mind";
homepage = https://code.launchpad.net/kazam;
- #license = licenses.bsd2;
+ license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = [ maintainers.domenkozar ];
};
diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index cd72142e979..8d5ecfce9fd 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, bc, python, fuse, libarchive }:
stdenv.mkDerivation rec {
- name = "lkl-2017-11-10";
- rev = "52a6a643c7d1dd3031c0cbec75e1ac7a999f3d57";
+ name = "lkl-2018-03-10";
+ rev = "8772a4da6064444c5b70766b806fe272b0287c31";
outputs = [ "dev" "lib" "out" ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
inherit rev;
owner = "lkl";
repo = "linux";
- sha256 = "1i5ywrfxqpykjjalwh9g4rwd4s186cqk3j806d327a67xb2ivxnp";
+ sha256 = "1m6gh4zcx1q7rv05d0knjpk3ivk2b3kc0kwjndciadqc45kws4wh";
};
# Fix a /usr/bin/env reference in here that breaks sandboxed builds
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
sed -i $out/bin/lkl-hijack.sh \
-e "s,LD_LIBRARY_PATH=.*,LD_LIBRARY_PATH=$lib/lib,"
- cp tools/lkl/{cptofs,cpfromfs,fs2tar,lklfuse} $out/bin
+ cp tools/lkl/{cptofs,fs2tar,lklfuse} $out/bin
+ ln -s cptofs $out/bin/cpfromfs
cp -r tools/lkl/include $dev/
cp tools/lkl/liblkl*.{a,so} $lib/lib
'';
diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix
index f411ea5c83e..493307d0d07 100644
--- a/pkgs/applications/virtualization/virt-top/default.nix
+++ b/pkgs/applications/virtualization/virt-top/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, ocamlPackages }:
+{ stdenv, fetchgit, ocamlPackages, autoreconfHook }:
stdenv.mkDerivation rec {
name = "virt-top-${version}";
- version = "1.0.8";
+ version = "2017-11-18-unstable";
- src = fetchurl {
- url = "https://people.redhat.com/~rjones/virt-top/files/virt-top-${version}.tar.gz";
- sha256 = "04i1sf2d3ghilmzvr2vh74qcy009iifyc2ymj9kxnbkp97lrz13w";
+ src = fetchgit {
+ url = git://git.annexia.org/git/virt-top.git;
+ rev = "18a751d8c26548bb090ff05e30ccda3092e3373b";
+ sha256 = "0c4whjvw7p3yvd476i4ppdhi8j821r5y6caqrj2v9dc181cnp01i";
};
+ nativeBuildInputs = [ autoreconfHook ];
buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt ocaml_gettext curses csv xml-light ];
buildPhase = "make opt";
diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
index bdddc28cc44..26520889c7d 100644
--- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "deepin-gtk-theme-${version}";
- version = "17.10.5";
+ version = "17.10.6";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "deepin-gtk-theme";
rev = version;
- sha256 = "0ff1yg4gz4p7nd0qg3dcbsiw8yqlvqccm55kxi998w8j1wrg6pq3";
+ sha256 = "01mfn3i234ynjvxl0yddsqqadwh6zmiibzrjm9xd1f78rj4xxkll";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 58fff802080..5dc9e9a7262 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "enlightenment-${version}";
- version = "0.22.1";
+ version = "0.22.2";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
- sha256 = "1q57fz57d0b26z06m1wiq7c1sniwh885b0vs02mk4jgwva46nyr0";
+ sha256 = "0b33w75s4w7xmz9cv8dyp8vy2gcffnrvjys20fhcpw26abw1wn2d";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix
new file mode 100644
index 00000000000..dcc018d1883
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "gnome-shell-extension-timepp-${version}";
+ version = "2018.03.17";
+
+ src = fetchFromGitHub {
+ owner = "zagortenay333";
+ repo = "timepp__gnome";
+ rev = "440cf85dc68d9e6ba876793f13910ee6239622cf";
+ sha256 = "0idsqsii5rvynvj78w2j7xiiz9rrl3384m5mj6bf6rg8vprpfi8v";
+ };
+
+ uuid = "timepp@zagortenay333";
+ installPhase = ''
+ mkdir -p $out/share/gnome-shell/extensions/${uuid}
+ cp -r . $out/share/gnome-shell/extensions/${uuid}
+ '';
+
+ meta = with stdenv.lib; {
+ description = " A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension.";
+ homepage = https://github.com/zagortenay333/timepp__gnome;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ svsdep ];
+ };
+}
diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix
index dfd3766df29..d82cd4b073a 100644
--- a/pkgs/desktops/mate/mate-sensors-applet/default.nix
+++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "mate-sensors-applet-${version}";
- version = "1.20.0";
+ version = "1.20.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
- sha256 = "1yj8zr9w0a1h4bpd27w7ssg97vnrz7yr10jqhx67yyb900ccr3ik";
+ sha256 = "0lnr3jjq30zw1i2rv5n69dhsa3x39lc91xcgbj4vyj1rxj9ff05x";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index ba1cf9ed993..20fdddfe46c 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.2/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.3/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 8d959478a0d..14b5f3a39ad 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,355 +3,355 @@
{
bluedevil = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/bluedevil-5.12.2.tar.xz";
- sha256 = "11xwyawcfkxhdzcgj4nkj1vlp6zn53k9dl3c4llpj1z08jc2vdpj";
- name = "bluedevil-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/bluedevil-5.12.3.tar.xz";
+ sha256 = "1vzdj2byxrsnxg1hkw8fhjnmxazypb8x6nplfi2wpjbm0inpv0gk";
+ name = "bluedevil-5.12.3.tar.xz";
};
};
breeze = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/breeze-5.12.2.tar.xz";
- sha256 = "1vx03wi4m6ly6sw7cznhzg96rkxbn2mxsn9719pra616axl6c00s";
- name = "breeze-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/breeze-5.12.3.tar.xz";
+ sha256 = "0mknaxcgr51wbv43hhlplxmvi8k7xk73ns3ld86djj3mpa9cxfhw";
+ name = "breeze-5.12.3.tar.xz";
};
};
breeze-grub = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/breeze-grub-5.12.2.tar.xz";
- sha256 = "1a76xbnrbd18cd6p0n94fixc7jmd8vdnzqbi9pbi3wj82cpp95xq";
- name = "breeze-grub-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/breeze-grub-5.12.3.tar.xz";
+ sha256 = "1fh26sywr9cawywndw16zhdhs6pz9bfx0i9j0x1v7nbbnz0qam2b";
+ name = "breeze-grub-5.12.3.tar.xz";
};
};
breeze-gtk = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/breeze-gtk-5.12.2.tar.xz";
- sha256 = "1811r8gqhrdf5b4a1k94cid1whcd8g6h2mrms6qm40brzj8qn9w0";
- name = "breeze-gtk-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/breeze-gtk-5.12.3.tar.xz";
+ sha256 = "0nw1d62fd74m9dsvnvy25bcd1y08fv3c51jnp06b3p1yljx8gw8x";
+ name = "breeze-gtk-5.12.3.tar.xz";
};
};
breeze-plymouth = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/breeze-plymouth-5.12.2.tar.xz";
- sha256 = "1n96iysljakhhkw9wavhbvj29zlkkajgwpxs6v5ny4iifv9gn3cv";
- name = "breeze-plymouth-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/breeze-plymouth-5.12.3.tar.xz";
+ sha256 = "15px5iw237lb27ms70w8vcm1kqf5k5wmyqkxqdd70x8aqrqzf9zn";
+ name = "breeze-plymouth-5.12.3.tar.xz";
};
};
discover = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/discover-5.12.2.tar.xz";
- sha256 = "1hkbannyrw1c6h45c8s669d4hg6irc991hjlg0mm31lnpa8lb51v";
- name = "discover-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/discover-5.12.3.tar.xz";
+ sha256 = "132hbrnpr416yyzl8yh1d66j6j8h7paxw1lx2dm6fpyd0nf8zkdd";
+ name = "discover-5.12.3.tar.xz";
};
};
drkonqi = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/drkonqi-5.12.2.tar.xz";
- sha256 = "0dw9axkhp0cgw276cpfp4ddf5g9s2ccz6q43pk68fvphbz7m2wqm";
- name = "drkonqi-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/drkonqi-5.12.3.tar.xz";
+ sha256 = "0vc5q9g9chwsbbg98mg0mnxcfva7dm9qgcpwxv5v0qdlddzm6m7m";
+ name = "drkonqi-5.12.3.tar.xz";
};
};
kactivitymanagerd = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/kactivitymanagerd-5.12.2.tar.xz";
- sha256 = "1l6ar094y272fjxzj6qpapz4g5mfbf82z80zygmrs0cizpz1xv84";
- name = "kactivitymanagerd-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/kactivitymanagerd-5.12.3.tar.xz";
+ sha256 = "0fmr8n4s4qbfvrg0nmxl0rdl07rsy4l76idramn85rfbplv4nqr1";
+ name = "kactivitymanagerd-5.12.3.tar.xz";
};
};
kde-cli-tools = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/kde-cli-tools-5.12.2.tar.xz";
- sha256 = "1jd7r49i24psrx59n0djbbxbv8c3wchiabgrv4x4dq6nsqygh6vc";
- name = "kde-cli-tools-5.12.2.tar.xz";
+ 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";
};
};
kdecoration = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/kdecoration-5.12.2.tar.xz";
- sha256 = "1whngfld0nlw3mbf70khvqiqqskfglnn3dzx5zg0l14xv0kips79";
- name = "kdecoration-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/kdecoration-5.12.3.tar.xz";
+ sha256 = "1xsjq8aw8r4yl5wpr0alihfaf6r146x4rz7p8k635n771b25ilsy";
+ name = "kdecoration-5.12.3.tar.xz";
};
};
kde-gtk-config = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/kde-gtk-config-5.12.2.tar.xz";
- sha256 = "1ncyj665hra8bj4nk2idpjq0lm72dr3r467ddx6k0n63arvfmxm4";
- name = "kde-gtk-config-5.12.2.tar.xz";
+ 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";
};
};
kdeplasma-addons = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/kdeplasma-addons-5.12.2.tar.xz";
- sha256 = "00x0jd8jw77fh5qy5z9xldw3m27il9mamq0fl8f4vmny7y8hqg2k";
- name = "kdeplasma-addons-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/kdeplasma-addons-5.12.3.tar.xz";
+ sha256 = "06g61flgszaks5p9xrlnyjkdyfddyxrgv0vyf85h78wvydxca18p";
+ name = "kdeplasma-addons-5.12.3.tar.xz";
};
};
kgamma5 = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/kgamma5-5.12.2.tar.xz";
- sha256 = "1xhn8dw0595f48qbvj304agkg34y2pr0czvkpl1ahhzsndgjkxjs";
- name = "kgamma5-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/kgamma5-5.12.3.tar.xz";
+ sha256 = "0nvv4fg2hjxxmkjr1yrwsywgcm2y8w7xng928kisgaarf55dfmvm";
+ name = "kgamma5-5.12.3.tar.xz";
};
};
khotkeys = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/khotkeys-5.12.2.tar.xz";
- sha256 = "1hsnasx67vf0jdxnmlvhm86ykvjc89zbr8rdgr1ixq6iy543c1ry";
- name = "khotkeys-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/khotkeys-5.12.3.tar.xz";
+ sha256 = "1sx3g6pk23lwpc7x2a90vakb4vlmr3lzmhy86iq07r0kbp6fz3wa";
+ name = "khotkeys-5.12.3.tar.xz";
};
};
kinfocenter = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/kinfocenter-5.12.2.tar.xz";
- sha256 = "0sagy72x94nv1zxvllkzgmln2j04bh8cib4fx3zsqfn572wncjqi";
- name = "kinfocenter-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/kinfocenter-5.12.3.tar.xz";
+ sha256 = "0l9mfxylcf9rmq3yih7gp43vxy8j9rfgniml831prax5kcqgk3yr";
+ name = "kinfocenter-5.12.3.tar.xz";
};
};
kmenuedit = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/kmenuedit-5.12.2.tar.xz";
- sha256 = "1ygwv1s9zgd6qh3gd7537dgjil8h3i21i5wwn99wynbifq0w6ikv";
- name = "kmenuedit-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/kmenuedit-5.12.3.tar.xz";
+ sha256 = "1x60z8g1lphsjmsrf6j3br0nx5ip6rk8f8g4r1xmbczgpnyzsqr4";
+ name = "kmenuedit-5.12.3.tar.xz";
};
};
kscreen = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/kscreen-5.12.2.tar.xz";
- sha256 = "1scmaydn4fypjizfm7l71vszx725vgbgsg7hpnv2dgwqrf98kl9v";
- name = "kscreen-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/kscreen-5.12.3.tar.xz";
+ sha256 = "1azgvl7zx98a4jlqdb3w2h3951kg05l5lgz2bqfss5npm2kddis9";
+ name = "kscreen-5.12.3.tar.xz";
};
};
kscreenlocker = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/kscreenlocker-5.12.2.tar.xz";
- sha256 = "0v8qyjkmaxq711dw1iw12j38aswfr4qccvzkm3qc1gvfjs1vl0gn";
- name = "kscreenlocker-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/kscreenlocker-5.12.3.tar.xz";
+ sha256 = "1incnja96342wdyqyayn4kyk5fhmyvg7r13pszcc9a5gx937n2dm";
+ name = "kscreenlocker-5.12.3.tar.xz";
};
};
ksshaskpass = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/ksshaskpass-5.12.2.tar.xz";
- sha256 = "1b70jbdm3c4agk66v5yvzvzdlwp0xn8lmxn3zyk1n280xgqr2z1m";
- name = "ksshaskpass-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/ksshaskpass-5.12.3.tar.xz";
+ sha256 = "11wgb311pi1mxhy1xiylg5y3blyl234gcyfdn0xivmrgjn1kzg7h";
+ name = "ksshaskpass-5.12.3.tar.xz";
};
};
ksysguard = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/ksysguard-5.12.2.tar.xz";
- sha256 = "0k8ziqbvm8igczij3a26jyc0i7hwiqfv0072kywz76m9pfsd3lp7";
- name = "ksysguard-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/ksysguard-5.12.3.tar.xz";
+ sha256 = "0w7yz7qwfz3hy0vg95rv09c4yzw7g90hm9a0jzz3prdm1sicsvbc";
+ name = "ksysguard-5.12.3.tar.xz";
};
};
kwallet-pam = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/kwallet-pam-5.12.2.tar.xz";
- sha256 = "0xg01iianf0ygpjf971i3fln0gn44gw83gxhplwjv3q5dn79plrd";
- name = "kwallet-pam-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/kwallet-pam-5.12.3.tar.xz";
+ sha256 = "106dyl7w1b29351kzmgh5fjvy06yf6ab26x5p0aj7di2ymai9cqz";
+ name = "kwallet-pam-5.12.3.tar.xz";
};
};
kwayland-integration = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/kwayland-integration-5.12.2.tar.xz";
- sha256 = "1s4vdsv8s72nplmk9395zfsp4fars14n2rkgqfp95b7ii76519nn";
- name = "kwayland-integration-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/kwayland-integration-5.12.3.tar.xz";
+ sha256 = "0cx1dnds4wr5fm2kbc7mlkpq82pzhq59jgij273lr6y656drxxdi";
+ name = "kwayland-integration-5.12.3.tar.xz";
};
};
kwin = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/kwin-5.12.2.tar.xz";
- sha256 = "0lnyikmjsxjjbz7mrf421y1lw0vjqsri66dsjv2wldlbgifp94kw";
- name = "kwin-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/kwin-5.12.3.tar.xz";
+ sha256 = "0xsqiqnvk1gxrgik2cpqmzyl3q3ncr58r5p0xbyzqsybqz1jys71";
+ name = "kwin-5.12.3.tar.xz";
};
};
kwrited = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/kwrited-5.12.2.tar.xz";
- sha256 = "1n20g92h2hgcgp9qdxifp55acbkgh09chqz0p8qrj39vw5w5abv4";
- name = "kwrited-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/kwrited-5.12.3.tar.xz";
+ sha256 = "1yhx94wdf19k2qaym7d89xj03rs6br2mk6z64nkw70d8i01vlax1";
+ name = "kwrited-5.12.3.tar.xz";
};
};
libkscreen = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/libkscreen-5.12.2.tar.xz";
- sha256 = "1hv180ac97m1i47c2bapv5bz149i8p55qyfxrka7fivhzszsa8x0";
- name = "libkscreen-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/libkscreen-5.12.3.tar.xz";
+ sha256 = "09pg4fnzyklhgkgqrwqpc0kb4siiyz67mq2lyk5h50gmys4l48b4";
+ name = "libkscreen-5.12.3.tar.xz";
};
};
libksysguard = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/libksysguard-5.12.2.tar.xz";
- sha256 = "1nf847lwx88f8g0bknaxzn0q6cvs2xn1cz6ch7qrblg0a8v3ig19";
- name = "libksysguard-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/libksysguard-5.12.3.tar.xz";
+ sha256 = "06lg3sd8h3wya9ss3cii9fsn4r4al2vqa0m0zb68s2l5340mcy7l";
+ name = "libksysguard-5.12.3.tar.xz";
};
};
milou = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/milou-5.12.2.tar.xz";
- sha256 = "1sick71qd04shs34nlsplln3zpgvrbal4jlklm4k094w487fvcc8";
- name = "milou-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/milou-5.12.3.tar.xz";
+ sha256 = "0ywa8yvblc07mzmrzhrmsgdygzxdq6c3nnd7ayw68iil8886r7wq";
+ name = "milou-5.12.3.tar.xz";
};
};
oxygen = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/oxygen-5.12.2.tar.xz";
- sha256 = "03g0pwk5n6idgrrm0g4hfvyls7h8by6lz6rp7h1i9ibpaph3czmy";
- name = "oxygen-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/oxygen-5.12.3.tar.xz";
+ sha256 = "1fcp3swa7b8qk2zzvs9nxjp0100hgpxc4av39rvvw0d2m647k856";
+ name = "oxygen-5.12.3.tar.xz";
};
};
plasma-desktop = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/plasma-desktop-5.12.2.tar.xz";
- sha256 = "0wymhk1wzvx3ihq7gn4zkisp5x1n5m62fk1vmg5il75hn69qw4g5";
- name = "plasma-desktop-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/plasma-desktop-5.12.3.tar.xz";
+ sha256 = "1mz20r7cc7mn1ay7dkz6sikhadnk2dsxf5y6ijlpan7mp3ljlsq8";
+ name = "plasma-desktop-5.12.3.tar.xz";
};
};
plasma-integration = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/plasma-integration-5.12.2.tar.xz";
- sha256 = "0hyxn51vjdbkw9kj5nqp7lr1myjpnlp5ri01jwg43v5h44mq6k08";
- name = "plasma-integration-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/plasma-integration-5.12.3.tar.xz";
+ sha256 = "0q9kgfsa530qkjari4zw6bxrk7127v6gpirs76phw9lphpqbvgww";
+ name = "plasma-integration-5.12.3.tar.xz";
};
};
plasma-nm = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/plasma-nm-5.12.2.tar.xz";
- sha256 = "0wlp0wqbcbnmclfvhii50sds1ij4la3wni9987xym7qrc8bxm43x";
- name = "plasma-nm-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/plasma-nm-5.12.3.tar.xz";
+ sha256 = "143xma5i5qpfzg727pixvjgwcczj6zi0jwyibd05qmpbcyy09c9w";
+ name = "plasma-nm-5.12.3.tar.xz";
};
};
plasma-pa = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/plasma-pa-5.12.2.tar.xz";
- sha256 = "119gcgx8rrihhmxzfp7wj3v8q4vwzk989w9qn5b2y72vyvllbln7";
- name = "plasma-pa-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/plasma-pa-5.12.3.tar.xz";
+ sha256 = "0jlx07isw63nw2dfvn4sbv8j0az8bw62j7wp2mhxnwn5g6afci2l";
+ name = "plasma-pa-5.12.3.tar.xz";
};
};
plasma-sdk = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/plasma-sdk-5.12.2.tar.xz";
- sha256 = "0as3718rkcal8va6w1ip2prsvrp6b218r33hmhdkdbbshnx40csv";
- name = "plasma-sdk-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/plasma-sdk-5.12.3.tar.xz";
+ sha256 = "0hla9vi4yp79fmv06w89974fxzsfxnxfad4iyhpqpsrp3g004qli";
+ name = "plasma-sdk-5.12.3.tar.xz";
};
};
plasma-tests = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/plasma-tests-5.12.2.tar.xz";
- sha256 = "1336kj277hrbgi5dx6z19dp8fgxhifnapd0jas4lq8z06gn6dh40";
- name = "plasma-tests-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/plasma-tests-5.12.3.tar.xz";
+ sha256 = "1025prmvwlx5id14243m14hmz626nbpzn98q25i1nagmj2whw4w7";
+ name = "plasma-tests-5.12.3.tar.xz";
};
};
plasma-vault = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/plasma-vault-5.12.2.tar.xz";
- sha256 = "1hkdaxlr00s00ax0xm2zmfk9pwl4nrs1x2dna248s6dd06cjmapk";
- name = "plasma-vault-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/plasma-vault-5.12.3.tar.xz";
+ sha256 = "0a9cqfvxjzcgka786s9arz3zahl2qpj6qkh5vdxpf6akvcffw70h";
+ name = "plasma-vault-5.12.3.tar.xz";
};
};
plasma-workspace = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/plasma-workspace-5.12.2.tar.xz";
- sha256 = "1v4xaviby76c833gx02s1bf0hk9smv4m2s8sp75yxirh2xv4azid";
- name = "plasma-workspace-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/plasma-workspace-5.12.3.tar.xz";
+ sha256 = "0br36qyd7w7cgd6fzw1iai06mfzyvsf94qyip008h68j92wznfcy";
+ name = "plasma-workspace-5.12.3.tar.xz";
};
};
plasma-workspace-wallpapers = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/plasma-workspace-wallpapers-5.12.2.tar.xz";
- sha256 = "1x6qi0cpr461vc7gn4fzz9dh9wfwz6hcgb8dsz82wdxpwssck7i7";
- name = "plasma-workspace-wallpapers-5.12.2.tar.xz";
+ 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";
};
};
plymouth-kcm = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/plymouth-kcm-5.12.2.tar.xz";
- sha256 = "11kaprbcsd7j1kamsr9m9c27rj1ry8gxp1m6r1ibf9agimsmdfcb";
- name = "plymouth-kcm-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/plymouth-kcm-5.12.3.tar.xz";
+ sha256 = "1zqmlmzrxmvm49mj33wj51q83j15rq8a6v3xmv7fr55gsfh9hmpk";
+ name = "plymouth-kcm-5.12.3.tar.xz";
};
};
polkit-kde-agent = {
- version = "1-5.12.2";
+ version = "1-5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/polkit-kde-agent-1-5.12.2.tar.xz";
- sha256 = "176wb8sh9r4f1ij604x52w4q5nbhmnqwxid3w107cqwpydnh0dm9";
- name = "polkit-kde-agent-1-5.12.2.tar.xz";
+ 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";
};
};
powerdevil = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/powerdevil-5.12.2.tar.xz";
- sha256 = "0b9m3jm0ar84b2ln1ml5lk26nryrrlis7kj46whzqicwpdi7dpxw";
- name = "powerdevil-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/powerdevil-5.12.3.tar.xz";
+ sha256 = "1xj6d4b3iam0xpv27506k11qyh9bwafq4vlwah6bla944cvza484";
+ name = "powerdevil-5.12.3.tar.xz";
};
};
sddm-kcm = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/sddm-kcm-5.12.2.tar.xz";
- sha256 = "0nh8kviqn43zh6kdqzfcqksp48k1brd8bg4kni2cbmzif6md3ay3";
- name = "sddm-kcm-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/sddm-kcm-5.12.3.tar.xz";
+ sha256 = "1fd3ski6pnz6lba2zwvwqnxrszsn5505gnxbs15wc7zk6avf2hp2";
+ name = "sddm-kcm-5.12.3.tar.xz";
};
};
systemsettings = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/systemsettings-5.12.2.tar.xz";
- sha256 = "06cfxydpcnzi5g6ipi7sgiswgrzhnksgyhsp56zgqdswbilanp4n";
- name = "systemsettings-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/systemsettings-5.12.3.tar.xz";
+ sha256 = "05l3yl27577567apmbiw884qkbrlgjzwz93s26va76apqn71vali";
+ name = "systemsettings-5.12.3.tar.xz";
};
};
user-manager = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/user-manager-5.12.2.tar.xz";
- sha256 = "047bssxfs8z1lhg25f263fq05w6m22mdk5i16ji5i11n26v8hdwa";
- name = "user-manager-5.12.2.tar.xz";
+ url = "${mirror}/stable/plasma/5.12.3/user-manager-5.12.3.tar.xz";
+ sha256 = "11glncc24qna9v6mjz7rgv18nrx90bhmfamlf07n3fziz9fmxvkh";
+ name = "user-manager-5.12.3.tar.xz";
};
};
xdg-desktop-portal-kde = {
- version = "5.12.2";
+ version = "5.12.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.12.2/xdg-desktop-portal-kde-5.12.2.tar.xz";
- sha256 = "1gr07p281icc2v7cv3n6rzi1c70ddkwiw12n9klk3sxprjxmc0pm";
- name = "xdg-desktop-portal-kde-5.12.2.tar.xz";
+ 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";
};
};
}
diff --git a/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix
index f35ca26584f..5317cf25d41 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, python, ... }:
+{ emscriptenVersion, stdenv, llvm, fetchFromGitHub, cmake, python, gtest, ... }:
let
- rev = "1.37.16";
+ rev = emscriptenVersion;
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in
stdenv.mkDerivation rec {
@@ -10,18 +10,18 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "kripken";
repo = "emscripten-fastcomp";
- sha256 = "0wj9sc0gciaiidcjv6wb0qn6ks06xds7q34351masc7qpvd217by";
+ sha256 = "04j698gmp686b5lricjakm5hyh2z2kh28m1ffkghmkyz4zkzmx98";
inherit rev;
};
srcFL = fetchFromGitHub {
owner = "kripken";
repo = "emscripten-fastcomp-clang";
- sha256 = "1akdgxzxhzjbhp4d14ajcrp9jrf39x004a726ly2gynqc185l4j7";
+ sha256 = "1ici51mmpgg80xk3y8f376nbbfak6rz27qdy98l8lxkrymklp5g5";
inherit rev;
};
- nativeBuildInputs = [ cmake python ];
+ nativeBuildInputs = [ cmake python gtest ];
preConfigure = ''
cp -Lr ${srcFL} tools/clang
chmod +w -R tools/clang
@@ -30,9 +30,10 @@ stdenv.mkDerivation rec {
"-DCMAKE_BUILD_TYPE=Release"
"-DLLVM_TARGETS_TO_BUILD='X86;JSBackend'"
"-DLLVM_INCLUDE_EXAMPLES=OFF"
- "-DLLVM_INCLUDE_TESTS=OFF"
- # "-DCLANG_INCLUDE_EXAMPLES=OFF"
- "-DCLANG_INCLUDE_TESTS=OFF"
+ "-DLLVM_INCLUDE_TESTS=ON"
+ #"-DLLVM_CONFIG=${llvm}/bin/llvm-config"
+ "-DLLVM_BUILD_TESTS=ON"
+ "-DCLANG_INCLUDE_TESTS=ON"
] ++ (stdenv.lib.optional stdenv.isLinux
# necessary for clang to find crtend.o
"-DGCC_INSTALL_PREFIX=${gcc}"
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index ae80ad6fc80..ac972c99a95 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler
-, jre, binaryen, enableWasm ? true
+{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, pkgs
+, jre, binaryen, enableWasm ? true , python2Packages, cmake
}:
let
- rev = "1.37.16";
+ rev = emscriptenVersion;
appdir = "share/emscripten";
in
@@ -13,10 +13,12 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "kripken";
repo = "emscripten";
- sha256 = "1qyhjx5zza01vnwmj6qzxbkagxknn4kzb6gw12fqw5q8pa8fy4zy";
+ sha256 = "02p0cp86vd1mydlpq544xbydggpnrq9dhbxx7h08j235frjm5cdc";
inherit rev;
};
+ buildInputs = [ nodejs cmake python ];
+
buildCommand = ''
mkdir -p $out/${appdir}
cp -r $src/* $out/${appdir}
@@ -38,9 +40,23 @@ stdenv.mkDerivation {
echo "COMPILER_ENGINE = NODE_JS" >> $out/${appdir}/config
echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/closure-compiler-v${closurecompiler.version}.jar'" >> $out/${appdir}/config
echo "JAVA = '${jre}/bin/java'" >> $out/${appdir}/config
+ # to make the test(s) below work
+ echo "SPIDERMONKEY_ENGINE = []" >> $out/${appdir}/config
''
+ stdenv.lib.optionalString enableWasm ''
echo "BINARYEN_ROOT = '${binaryen}'" >> $out/share/emscripten/config
+ ''
+ +
+ ''
+ echo "--------------- running test -----------------"
+ # quick hack to get the test working
+ HOME=$TMPDIR
+ cp $out/${appdir}/config $HOME/.emscripten
+ export PATH=$PATH:$out/bin
+
+ #export EMCC_DEBUG=2
+ ${python}/bin/python $src/tests/runner.py test_hello_world
+ echo "--------------- /running test -----------------"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix
index 16b8f1df595..332fab8e14a 100644
--- a/pkgs/development/em-modules/generic/default.nix
+++ b/pkgs/development/em-modules/generic/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, emscripten }:
+{ pkgs, lib, emscripten, python }:
{ buildInputs ? [], nativeBuildInputs ? []
@@ -11,8 +11,8 @@ pkgs.stdenv.mkDerivation (
{
name = "emscripten-${args.name}";
- buildInputs = [ emscripten ] ++ buildInputs;
- nativeBuildInputs = [ emscripten ] ++ nativeBuildInputs;
+ buildInputs = [ emscripten python ] ++ buildInputs;
+ nativeBuildInputs = [ emscripten python ] ++ nativeBuildInputs;
# fake conftest results with emscripten's python magic
EMCONFIGURE_JS=2;
@@ -38,9 +38,18 @@ pkgs.stdenv.mkDerivation (
runHook postBuild
'';
+ doCheck = true;
+
checkPhase = args.checkPhase or ''
runHook preCheck
+ echo "Please provide a test for your emscripten based library/tool, see libxml2 as an exmple on how to use emcc/node to verify your build"
+ echo ""
+ echo "In normal C 'unresolved symbols' would yield an error and a breake of execution. In contrast, in emscripten they are only a warning which is ok given that emscripten assumptions about shared libraries."
+ echo " -> https://github.com/kripken/emscripten/wiki/Linking"
+ echo "So just assume the dependencies were built using hydra, then YOU WILL NEVER see the warning and your code depending on a library will always fail!"
+ exit 1
+
runHook postCheck
'';
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 47768b948ff..6153c68a0dc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -463,6 +463,11 @@ self: super: {
# Test suite won't compile against tasty-hunit 0.9.x.
zlib = dontCheck super.zlib;
+ # Test suite won't compile against tasty-hunit 0.10.x.
+ binary-parser = dontCheck super.binary-parser;
+ bytestring-strict-builder = dontCheck super.bytestring-strict-builder;
+ bytestring-tree-builder = dontCheck super.bytestring-tree-builder;
+
# https://github.com/ndmitchell/shake/issues/206
# https://github.com/ndmitchell/shake/issues/267
shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; });
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index d858787f43c..03f0a1dd0a3 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -95,6 +95,15 @@ symlinkJoin {
makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}"
fi
done
+
+ # haddock was referring to the base ghc, https://github.com/NixOS/nixpkgs/issues/36976
+ if [[ -x "${ghc}/bin/haddock" ]]; then
+ rm -f $out/bin/haddock
+ makeWrapper ${ghc}/bin/haddock $out/bin/haddock \
+ --add-flags '"-B$NIX_${ghcCommandCaps}_LIBDIR"' \
+ --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
+ fi
+
'' + (lib.optionalString targetPlatform.isDarwin ''
# Work around a linker limit in macOS Sierra (see generic-builder.nix):
local packageConfDir="$out/lib/${ghc.name}/package.conf.d";
diff --git a/pkgs/development/idris-modules/array.nix b/pkgs/development/idris-modules/array.nix
new file mode 100644
index 00000000000..cab7ccbcf7a
--- /dev/null
+++ b/pkgs/development/idris-modules/array.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package {
+ name = "array";
+ version = "2016-10-14";
+
+ idrisDeps = [ prelude base ];
+
+ extraBuildInputs = [ idris ];
+
+ src = fetchFromGitHub {
+ owner = "idris-hackers";
+ repo = "idris-array";
+ rev = "eb5c034d3c65b5cf465bd0715e65859b8f69bf15";
+ sha256 = "148dnyd664vnxi04zjsyjbs1y51dq0zz98005q9c042k4jcfpfjh";
+ };
+
+ meta = {
+ description = "Primitive flat arrays containing Idris values";
+ homepage = https://github.com/idris-hackers/idris-array;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix
new file mode 100644
index 00000000000..fb43fbf209b
--- /dev/null
+++ b/pkgs/development/idris-modules/bi.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, pruviloj
+, lib
+, idris
+}:
+build-idris-package {
+ name = "bi";
+ version = "2018-01-17";
+
+ idrisDeps = [ prelude contrib pruviloj ];
+
+ src = fetchFromGitHub {
+ owner = "sbp";
+ repo = "idris-bi";
+ rev = "8ab40bc482ca948ac0f6ffb5b4c545a73688dd3a";
+ sha256 = "1lra945q2d6anwzjs94srprqj867lrz66rsns08p8828vg55fv97";
+ };
+
+ meta = {
+ description = "Idris Binary Integer Arithmetic, porting PArith, NArith, and ZArith from Coq";
+ homepage = https://github.com/sbp/idris-bi;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/bifunctors.nix b/pkgs/development/idris-modules/bifunctors.nix
new file mode 100644
index 00000000000..d8212fa3830
--- /dev/null
+++ b/pkgs/development/idris-modules/bifunctors.nix
@@ -0,0 +1,31 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package {
+ name = "bifunctors";
+ version = "2017-02-07";
+
+ idrisDeps = [ prelude base ];
+
+ src = fetchFromGitHub {
+ owner = "japesinator";
+ repo = "Idris-Bifunctors";
+ rev = "be7b8bde88331ad3af87e5c0a23fc0f3d52f3868";
+ sha256 = "0cfp58lhm2g0g1vrpb0mh71qb44n2yvg5sil9ndyf2sqd5ria6yq";
+ };
+
+ postUnpack = ''
+ rm source/test.ipkg
+ '';
+
+ meta = {
+ description = "A small bifunctor library for idris";
+ homepage = https://github.com/japesinator/Idris-Bifunctors;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/bytes.nix b/pkgs/development/idris-modules/bytes.nix
new file mode 100644
index 00000000000..2e5518c953c
--- /dev/null
+++ b/pkgs/development/idris-modules/bytes.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lib
+, idris
+}:
+
+build-idris-package {
+ name = "bytes";
+ version = "2018-02-10";
+
+ idrisDeps = [ prelude ];
+
+ extraBuildInputs = [ idris ];
+
+ src = fetchFromGitHub {
+ owner = "ziman";
+ repo = "idris-bytes";
+ rev = "c0ed9db526d4529780f9d7d2636a40faa07661a5";
+ sha256 = "1xyb7k0mrk5imjf5jr2gvqwvasbfy6j4lxvz99r9icfz7crz8dfp";
+ };
+
+ meta = {
+ description = "FFI-based byte buffers for Idris";
+ homepage = https://github.com/ziman/idris-bytes;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/canvas.nix b/pkgs/development/idris-modules/canvas.nix
new file mode 100644
index 00000000000..f29d59e5050
--- /dev/null
+++ b/pkgs/development/idris-modules/canvas.nix
@@ -0,0 +1,26 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lib
+, idris
+}:
+build-idris-package {
+ name = "canvas";
+ version = "2017-11-09";
+
+ idrisDeps = [ prelude ];
+
+ src = fetchFromGitHub {
+ owner = "JinWuZhao";
+ repo = "idriscanvas";
+ rev = "2957c78c0721ec3afaee9d64e051a8f8d9b6f426";
+ sha256 = "0jirkqciv3j1phpm2v6fmch40b5a01rmqdng16y8mihq1wb70ayy";
+ };
+
+ meta = {
+ description = "Idris FFI binding for html5 canvas 2d api";
+ homepage = https://github.com/JinWuZhao/idriscanvas;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix
new file mode 100644
index 00000000000..32be0f6a379
--- /dev/null
+++ b/pkgs/development/idris-modules/categories.nix
@@ -0,0 +1,27 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package {
+ name = "categories";
+ version = "2017-03-01";
+
+ idrisDeps = [ prelude base ];
+
+ src = fetchFromGitHub {
+ owner = "danilkolikov";
+ repo = "categories";
+ rev = "933fe418d154e10df39ddb09a74419cb4c4a57e8";
+ sha256 = "1dmpcv13zh7j4k6s2nlpf08gmpawaqaqkbqbg8zrgw253piwb0ci";
+ };
+
+ meta = {
+ description = "Category Theory";
+ homepage = https://github.com/danilkolikov/categories;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/coda.nix b/pkgs/development/idris-modules/coda.nix
new file mode 100644
index 00000000000..ed51bcfec6d
--- /dev/null
+++ b/pkgs/development/idris-modules/coda.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package {
+ name = "coda";
+ version = "2018-01-25";
+
+ idrisDeps = [ prelude base ];
+
+ src = fetchFromGitHub {
+ owner = "ostera";
+ repo = "idris-coda";
+ rev = "0d8b29b7b73aa1ea80bf216e5e6dea5e81156e32";
+ sha256 = "07wps3pyp4ph0vj3640x561gkjkbcdq1if9h6sjjb30924sbdxfg";
+ };
+
+ meta = {
+ description = "Some Idris libraries including nodejs bindings and ISO8601 Date and Time";
+ homepage = https://github.com/ostera/idris-coda;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/comonad.nix b/pkgs/development/idris-modules/comonad.nix
new file mode 100644
index 00000000000..5ecd6d9c585
--- /dev/null
+++ b/pkgs/development/idris-modules/comonad.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package {
+ name = "comonad";
+ version = "2018-02-26";
+
+ idrisDeps = [ prelude base ];
+
+ src = fetchFromGitHub {
+ owner = "vmchale";
+ repo = "comonad";
+ rev = "23282592d4506708bdff79bfe1770c5f7a4ccb92";
+ sha256 = "0iiknx6gj4wr9s59iz439c63h3887pilymxrc80v79lj1lsk03ac";
+ };
+
+ meta = {
+ description = "Comonads for Idris";
+ homepage = https://github.com/vmchale/comonad;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/composition.nix b/pkgs/development/idris-modules/composition.nix
new file mode 100644
index 00000000000..17dda31a5d1
--- /dev/null
+++ b/pkgs/development/idris-modules/composition.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, hezarfen
+, lib
+, idris
+}:
+build-idris-package {
+ name = "composition";
+ version = "2017-11-12";
+
+ idrisDeps = [ prelude hezarfen ];
+
+ src = fetchFromGitHub {
+ owner = "vmchale";
+ repo = "composition";
+ rev = "8f05e8db750793a9992b315dc0a2c327b837ec8b";
+ sha256 = "05424xzxx6f3ig0ravib15nr34nqvaq8spcj6b1512raqrvkkay8";
+ };
+
+ meta = {
+ description = "Composition extras for Idris";
+ homepage = https://github.com/vmchale/composition;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/config.nix b/pkgs/development/idris-modules/config.nix
new file mode 100644
index 00000000000..29cb828e061
--- /dev/null
+++ b/pkgs/development/idris-modules/config.nix
@@ -0,0 +1,31 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, containers
+, lightyear
+, test
+, lib
+, idris
+}:
+build-idris-package {
+ name = "config";
+ version = "2017-11-06";
+
+ idrisDeps = [ prelude effects containers lightyear test ];
+
+ src = fetchFromGitHub {
+ owner = "benclifford";
+ repo = "idris-config";
+ rev = "92f98652f5cb06a76c47809f16c661ec6cf11048";
+ sha256 = "1w2w2l4drvkf8mdzh3lwn6l5lnkbxlx9p22s7spw82n5s4wib6c9";
+ };
+
+ meta = {
+ description = "Parsers for various configuration files written in Idris.";
+ homepage = https://github.com/benclifford/idris-config;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/console.nix b/pkgs/development/idris-modules/console.nix
new file mode 100644
index 00000000000..27b85c97c68
--- /dev/null
+++ b/pkgs/development/idris-modules/console.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, idrisscript
+, hrtime
+, webgl
+, lib
+, idris
+}:
+build-idris-package {
+ name = "console";
+ version = "2017-04-20";
+
+ idrisDeps = [ prelude idrisscript hrtime webgl ];
+
+ src = fetchFromGitHub {
+ owner = "pierrebeaucamp";
+ repo = "idris-console";
+ rev = "14b6bd6bf6bd78dd3935e3de12e16f8ee41e29e4";
+ sha256 = "0cn4fwnf3sg6269pbfbhnmsvyaya4d8479n2hy039idxzzkxw0yb";
+ };
+
+ meta = {
+ description = "An Idris library to interact with the browser console";
+ homepage = https://github.com/pierrebeaucamp/idris-console;
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/containers.nix b/pkgs/development/idris-modules/containers.nix
new file mode 100644
index 00000000000..fe4e729d0e0
--- /dev/null
+++ b/pkgs/development/idris-modules/containers.nix
@@ -0,0 +1,34 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, test
+, lib
+, idris
+}:
+
+build-idris-package {
+ name = "containers";
+ version = "2017-09-10";
+
+ idrisDeps = [ prelude effects test ];
+
+ src = fetchFromGitHub {
+ owner = "jfdm";
+ repo = "idris-containers";
+ rev = "fb96aaa3f40faa432cd7a36d956dbc4fe9279234";
+ sha256 = "0vyjadd9sb8qcbzvzhnqwc8wa7ma770c10xhn96jsqsnzr81k52d";
+ };
+
+ postUnpack = ''
+ rm source/containers-travis.ipkg
+ '';
+
+ meta = {
+ description = "Various data structures for use in the Idris Language.";
+ homepage = https://github.com/jfdm/idris-containers;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/cube.nix b/pkgs/development/idris-modules/cube.nix
new file mode 100644
index 00000000000..ce46c4538b5
--- /dev/null
+++ b/pkgs/development/idris-modules/cube.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+
+build-idris-package {
+ name = "cube";
+ version = "2017-07-05";
+
+ idrisDeps = [ prelude base ];
+
+ src = fetchFromGitHub {
+ owner = "aatxe";
+ repo = "cube.idr";
+ rev = "edf66d82b3a363dc65c6f5416c9e24e746bad71e";
+ sha256 = "11k45j0b4qabj6zhwjvynyj56nmssf7d4fnkv66bd2w1pxnshzxg";
+ };
+
+ meta = {
+ description = "An implementation of the Lambda Cube in Idris";
+ homepage = https://github.com/aatxe/cube.idr;
+ license = lib.licenses.agpl3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/curses.nix b/pkgs/development/idris-modules/curses.nix
new file mode 100644
index 00000000000..71bd9023840
--- /dev/null
+++ b/pkgs/development/idris-modules/curses.nix
@@ -0,0 +1,36 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lib
+, idris
+, ncurses
+}:
+build-idris-package {
+ name = "curses";
+ version = "2017-10-12";
+
+ idrisDeps = [ prelude effects ];
+
+ extraBuildInputs = [ ncurses.out ncurses.dev ];
+
+ postUnpack = ''
+ sed -i 's/^libs = curses$/libs = ncurses/g' source/curses.ipkg
+ sed -i 's/\#include /#include \/g' source/src/cursesrun.h
+ '';
+
+ src = fetchFromGitHub {
+ owner = "JakobBruenker";
+ repo = "curses-idris";
+ rev = "ea4bbcfcf691f0dc731f2dfa676011809db084cb";
+ sha256 = "17q8hg5f61lk2kh3j4cwrwja282sihlcjdrx233z4237alp9w4g1";
+ };
+
+ meta = {
+ description = "libusb binding for idris and Effectful curses programming";
+ homepage = https://github.com/JakobBruenker/curses-idris;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/data.nix b/pkgs/development/idris-modules/data.nix
new file mode 100644
index 00000000000..3cb78eabe96
--- /dev/null
+++ b/pkgs/development/idris-modules/data.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package {
+ name = "data";
+ version = "2018-03-19";
+
+ idrisDeps = [ prelude contrib ];
+
+ src = fetchFromGitHub {
+ owner = "jdevuyst";
+ repo = "idris-data";
+ rev = "105b78ac13235edc596287367a675d7cd04ce5d5";
+ sha256 = "17wz4jddan39984qibx2x7nv2zkqznv0fpab20nrm4zgy17v77ii";
+ };
+
+ meta = {
+ description = "Functional data structures in Idris";
+ homepage = https://github.com/jdevuyst/idris-data;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 4309039f498..12fbc8dfd17 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -28,12 +28,15 @@
in
{
inherit idris-no-deps callPackage;
- # See #10450 about why we have to wrap the executable
+
+ # Idris wrapper with specified compiler and library paths, used to build packages
+
idris =
(pkgs.callPackage ./idris-wrapper.nix {})
idris-no-deps
{ path = [ pkgs.gcc ]; lib = [pkgs.gmp]; };
+ # Utilities for building packages
with-packages = callPackage ./with-packages.nix {} ;
@@ -41,19 +44,169 @@
build-idris-package = callPackage ./build-idris-package.nix {};
- # Libraries
+ # The set of libraries that comes with idris
- # A list of all of the libraries that come with idris
builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins_;
- httpclient = callPackage ./httpclient.nix {};
+ # Libraries
+
+ array = callPackage ./array.nix {};
+
+ bi = callPackage ./bi.nix {};
+
+ bifunctors = callPackage ./bifunctors.nix {};
+
+ bytes = callPackage ./bytes.nix {};
+
+ canvas = callPackage ./canvas.nix {};
+
+ categories = callPackage ./categories.nix {};
+
+ coda = callPackage ./coda.nix {};
+
+ config = callPackage ./config.nix {};
+
+ comonad = callPackage ./comonad.nix {};
+
+ composition = callPackage ./composition.nix {};
+
+ console = callPackage ./console.nix {};
+
+ containers = callPackage ./containers.nix {};
+
+ cube = callPackage ./cube.nix {};
+
+ curses = callPackage ./curses.nix {};
+
+ data = callPackage ./data.nix {};
+
+ derive = callPackage ./derive.nix {};
+
+ descncrunch = callPackage ./descncrunch.nix {};
+
+ dict = callPackage ./dict.nix {};
+
+ dom = callPackage ./dom.nix {};
+
+ electron = callPackage ./electron.nix {};
+
+ eternal = callPackage ./eternal.nix {};
+
+ farrp = callPackage ./farrp.nix {};
+
+ free = callPackage ./free.nix {};
+
+ fsm = callPackage ./fsm.nix {};
+
+ glfw = callPackage ./glfw.nix {};
+
+ graphviz = callPackage ./graphviz.nix {};
+
+ hamt = callPackage ./hamt.nix {};
+
+ html = callPackage ./html.nix {};
+
+ heyting-algebra = callPackage ./heyting-algebra.nix {};
+
+ hezarfen = callPackage ./hezarfen.nix {};
+
+ hrtime = callPackage ./hrtime.nix {};
+
+ http = callPackage ./http.nix {};
+
+ http4idris = callPackage ./http4idris.nix {};
+
+ iaia = callPackage ./iaia.nix {};
+
+ idrishighlighter = callPackage ./idrishighlighter.nix {};
+
+ idrisscript = callPackage ./idrisscript.nix {};
+
+ ipkgparser = callPackage ./ipkgparser.nix {};
+
+ jheiling-extras = callPackage ./jheiling-extras.nix {};
+
+ jheiling-js = callPackage ./jheiling-js.nix {};
+
+ js = callPackage ./js.nix {};
+
+ lens = callPackage ./lens.nix {};
lightyear = callPackage ./lightyear.nix {};
- wl-pprint = callPackage ./wl-pprint.nix {};
+ logic = callPackage ./logic.nix {};
+
+ mapping = callPackage ./mapping.nix {};
+
+ mhd = callPackage ./mhd.nix {};
+
+ pacman = callPackage ./pacman.nix {};
+
+ patricia = callPackage ./patricia.nix {};
+
+ permutations = callPackage ./permutations.nix {};
+
+ pfds = callPackage ./pfds.nix {};
+
+ pipes = callPackage ./pipes.nix {};
+
+ posix = callPackage ./posix.nix {};
+
+ protobuf = callPackage ./protobuf.nix {};
+
+ rationals = callPackage ./rationals.nix {};
+
+ recursion_schemes = callPackage ./recursion_schemes.nix {};
+
+ refined = callPackage ./refined.nix {};
+
+ sdl = callPackage ./sdl.nix {};
+
+ sdl2 = callPackage ./sdl2.nix {};
+
+ semidirect = callPackage ./semidirect.nix {};
+
+ setoids = callPackage ./setoids.nix {};
+
+ smproc = callPackage ./smproc.nix {};
+
+ snippets = callPackage ./snippets.nix {};
+
+ software_foundations = callPackage ./software_foundations.nix {};
specdris = callPackage ./specdris.nix {};
+ tap = callPackage ./tap.nix {};
+
+ test = callPackage ./test.nix {};
+
+ tlhydra = callPackage ./tlhydra.nix {};
+
+ tomladris = callPackage ./tomladris.nix {};
+
+ tp = callPackage ./tp.nix {};
+
+ tparsec = callPackage ./tparsec.nix {};
+
+ transducers = callPackage ./transducers.nix {};
+
+ trees = callPackage ./trees.nix {};
+
+ union_type = callPackage ./union_type.nix {};
+
+ vecspace = callPackage ./vecspace.nix {};
+
+ webgl = callPackage ./webgl.nix {};
+
+ wl-pprint = callPackage ./wl-pprint.nix {};
+
+ wyvern = callPackage ./wyvern.nix {};
+
+ xhr = callPackage ./xhr.nix {};
+
+ yaml = callPackage ./yaml.nix {};
+
+ yampa = callPackage ./yampa.nix {};
} // builtins_;
in fix' (extends overrides idrisPackages)
diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix
new file mode 100644
index 00000000000..6cc2ead71fc
--- /dev/null
+++ b/pkgs/development/idris-modules/derive.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, pruviloj
+, lib
+, idris
+}:
+build-idris-package {
+ name = "derive";
+ version = "2018-02-15";
+
+ idrisDeps = [ prelude contrib pruviloj ];
+
+ src = fetchFromGitHub {
+ owner = "davlum";
+ repo = "derive-all-the-instances";
+ rev = "2c8956807bd094ba33569227de921c6726401c42";
+ sha256 = "0l7263s04r52ql292vnnx2kngld6s1dipmaz5na7m82lj9p4x17y";
+ };
+
+ meta = {
+ description = "Type class deriving with elaboration reflection";
+ homepage = https://github.com/davlum/derive-all-the-instances;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/descncrunch.nix b/pkgs/development/idris-modules/descncrunch.nix
new file mode 100644
index 00000000000..736b25c9684
--- /dev/null
+++ b/pkgs/development/idris-modules/descncrunch.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, pruviloj
+, lib
+, idris
+}:
+build-idris-package {
+ name = "descncrunch";
+ version = "2017-11-15";
+
+ idrisDeps = [ prelude pruviloj ];
+
+ src = fetchFromGitHub {
+ owner = "ahmadsalim";
+ repo = "desc-n-crunch";
+ rev = "261d9718504b8f0572c4fe7ae407a0231779bcab";
+ sha256 = "09fh334aga1z1hbw79507rdv7qsh0mqzb89lvpznn7vzi9zkl8fx";
+ };
+
+ meta = {
+ description = "Descriptions, levitation, and reflecting the elaborator";
+ homepage = https://github.com/ahmadsalim/desc-n-crunch;
+ license = lib.licenses.gpl3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/dict.nix b/pkgs/development/idris-modules/dict.nix
new file mode 100644
index 00000000000..ea1cd5a9fe1
--- /dev/null
+++ b/pkgs/development/idris-modules/dict.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package {
+ name = "dict";
+ version = "2016-12-26";
+
+ idrisDeps = [ prelude contrib ];
+
+ src = fetchFromGitHub {
+ owner = "be5invis";
+ repo = "idris-dict";
+ rev = "dddc7c9f45e079b151ee03c9752b968ceeab9dab";
+ sha256 = "18riq40vapg884y92w10w51j4896ah984zm5hisfv1sm9qbgx8ii";
+ };
+
+ postUnpack = ''
+ sed -i 's/\"//g' source/dict.ipkg
+ '';
+
+ meta = {
+ description = "Dict k v in Idris";
+ homepage = https://github.com/be5invis/idris-dict;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/dom.nix b/pkgs/development/idris-modules/dom.nix
new file mode 100644
index 00000000000..0aee97f92e6
--- /dev/null
+++ b/pkgs/development/idris-modules/dom.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, idrisscript
+, html
+, xhr
+, lib
+, idris
+}:
+build-idris-package {
+ name = "dom";
+ version = "2017-04-22";
+
+ idrisDeps = [ prelude idrisscript html xhr ];
+
+ src = fetchFromGitHub {
+ owner = "pierrebeaucamp";
+ repo = "idris-dom";
+ rev = "6e5a2d143f62ef422358924ee7db6e8147cdc531";
+ sha256 = "16z9mykw2d9rjikn07kd6igb53jgaqi8zby4nc4n0gmplmhwdx4x";
+ };
+
+ meta = {
+ description = "Idris library to interact with the DOM";
+ homepage = https://github.com/pierrebeaucamp/idris-dom;
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/electron.nix b/pkgs/development/idris-modules/electron.nix
new file mode 100644
index 00000000000..7dabfd8f45c
--- /dev/null
+++ b/pkgs/development/idris-modules/electron.nix
@@ -0,0 +1,36 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, jheiling-extras
+, jheiling-js
+, lib
+, idris
+}:
+
+build-idris-package {
+ name = "electron";
+ version = "2016-03-07";
+
+ idrisDeps = [ prelude contrib jheiling-extras jheiling-js ];
+
+ src = fetchFromGitHub {
+ owner = "jheiling";
+ repo = "idris-electron";
+ rev = "f0e86f52b8e5a546a2bf714709b659c1c0b04395";
+ sha256 = "1rpa7yjvfpzl06h0qbk54jd2n52nmgpf7nq5aamcinqh7h5gbiwn";
+ };
+
+ postUnpack = ''
+ rm source/example_main.ipkg
+ rm source/example_view.ipkg
+ '';
+
+ meta = {
+ description = "Electron bindings for Idris";
+ homepage = https://github.com/jheiling/idris-electron;
+ license = lib.licenses.unlicense;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/eternal.nix b/pkgs/development/idris-modules/eternal.nix
new file mode 100644
index 00000000000..ddbc0d79b84
--- /dev/null
+++ b/pkgs/development/idris-modules/eternal.nix
@@ -0,0 +1,35 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lib
+, idris
+}:
+build-idris-package {
+ name = "eternal";
+ version = "2018-01-25";
+
+ idrisDeps = [ prelude effects ];
+
+ src = fetchFromGitHub {
+ owner = "Heather";
+ repo = "Control.Eternal.Idris";
+ rev = "7ead56ce6065b55104460ace945adbce38fb13eb";
+ sha256 = "0b4zys4mhl6r4rbpdxr7n2n20cdc0nkh4lm8n5v4wxkmjzna5cpd";
+ };
+
+ postUnpack = ''
+ printf 'makefile = Makefile\n' >> source/eternal.ipkg
+ printf 'objs = readProcess.o\n' >> source/eternal.ipkg
+ sed -i 's/\/usr\/local\/idris\/readProcess.h/readProcess.h/g' source/Control/Eternal/System/Process.idr
+ sed -i 's/\/usr\/local\/idris\/readProcess.o/readProcess.o/g' source/Control/Eternal/System/Process.idr
+ '';
+
+ meta = {
+ description = "Infix pipe operators and some Nat, Float, String conversions";
+ homepage = https://github.com/Heather/Control.Eternal.Idris;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/farrp.nix b/pkgs/development/idris-modules/farrp.nix
new file mode 100644
index 00000000000..2c88399eb3c
--- /dev/null
+++ b/pkgs/development/idris-modules/farrp.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lib
+, idris
+}:
+build-idris-package {
+ name = "farrp";
+ version = "2018-02-13";
+
+ idrisDeps = [ prelude effects ];
+
+ src = fetchFromGitHub {
+ owner = "lambda-11235";
+ repo = "FarRP";
+ rev = "d592957232968743f8862e49d5a8d52e13340444";
+ sha256 = "1zrf750d7x1cz7kkgcx4ipa87hkg10adwii4qqvz9vpjap7vh7h0";
+ };
+
+ meta = {
+ description = "Arrowized FRP library for Idris with static safety guarantees";
+ homepage = https://github.com/lambda-11235/FarRP;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/free.nix b/pkgs/development/idris-modules/free.nix
new file mode 100644
index 00000000000..cc0820d3c64
--- /dev/null
+++ b/pkgs/development/idris-modules/free.nix
@@ -0,0 +1,27 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lib
+, idris
+}:
+build-idris-package {
+ name = "free";
+ version = "2017-07-03";
+
+ idrisDeps = [ prelude ];
+
+ src = fetchFromGitHub {
+ owner = "idris-hackers";
+ repo = "idris-free";
+ rev = "919950fb6a9d97c139c2d102402fec094a99c397";
+ sha256 = "1n4daf1acjkd73an4m31yp9g616crjb7h5z02f1gj29wm3dbx5s7";
+ };
+
+ meta = {
+ description = "Free Monads and useful constructions to work with them";
+ homepage = https://github.com/idris-hackers/idris-free;
+ license = lib.licenses.bsd2;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/fsm.nix b/pkgs/development/idris-modules/fsm.nix
new file mode 100644
index 00000000000..24f57af5257
--- /dev/null
+++ b/pkgs/development/idris-modules/fsm.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package {
+ name = "fsm";
+ version = "2017-04-16";
+
+ idrisDeps = [ prelude base ];
+
+ src = fetchFromGitHub {
+ owner = "ctford";
+ repo = "flying-spaghetti-monster";
+ rev = "9253db1048d155b9d72dd5319f0a2072b574d406";
+ sha256 = "0n1kqpxysl3dji0zd8c47ir4144s0n3pb8i1mqp6ylma3r7rlg1l";
+ };
+
+ meta = {
+ description = "Comonads for Idris";
+ homepage = https://github.com/ctford/flying-spaghetti-monster;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/glfw.nix b/pkgs/development/idris-modules/glfw.nix
new file mode 100644
index 00000000000..041c18faedc
--- /dev/null
+++ b/pkgs/development/idris-modules/glfw.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lib
+, idris
+, pkgs
+}:
+
+build-idris-package {
+ name = "glfw";
+ version = "2016-12-05";
+
+ idrisDeps = [ prelude effects ];
+
+ extraBuildInputs = [ pkgs.glfw ];
+
+ src = fetchFromGitHub {
+ owner = "eckart";
+ repo = "glfw-idris";
+ rev = "10220a734b69f3b884683041a1a9c533800b663a";
+ sha256 = "045ylaj66g5m4syzhqxlaxmivy8y7jznkcf1y7w4awa4y5znyqqd";
+ };
+
+ meta = {
+ description = "GLFW bindings for Idris";
+ homepage = https://github.com/eckart/glfw-idris;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/graphviz.nix b/pkgs/development/idris-modules/graphviz.nix
new file mode 100644
index 00000000000..3ea20d3d906
--- /dev/null
+++ b/pkgs/development/idris-modules/graphviz.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitLab
+, prelude
+, lightyear
+, lib
+, idris
+}:
+build-idris-package {
+ name = "graphviz";
+ version = "2017-01-16";
+
+ idrisDeps = [ prelude lightyear ];
+
+ src = fetchFromGitLab {
+ owner = "mgttlinger";
+ repo = "idris-graphviz";
+ rev = "805da92ac888530134c3b4090fae0d025d86bb05";
+ sha256 = "12kzgjlwq6adflfc5zxpgjnaiszhiab6dcp878ysbz3zr2sihljx";
+ };
+
+ postUnpack = ''
+ sed -i "/^author /cauthor = Merlin Goettlinger" source/graphviz.ipkg
+ '';
+
+ meta = {
+ description = "Parser and library for graphviz dot files";
+ homepage = https://github.com/mgttlinger/idris-graphviz;
+ license = lib.licenses.gpl3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/hamt.nix b/pkgs/development/idris-modules/hamt.nix
new file mode 100644
index 00000000000..7a2d0d77c83
--- /dev/null
+++ b/pkgs/development/idris-modules/hamt.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, effects
+, lib
+, idris
+}:
+build-idris-package {
+ name = "idris-hamt";
+ version = "2016-11-15";
+
+ idrisDeps = [ prelude contrib effects ];
+
+ src = fetchFromGitHub {
+ owner = "bamboo";
+ repo = "idris-hamt";
+ rev = "e70f3eedddb5ccafea8e386762b8421ba63c495a";
+ sha256 = "0m2yjr20dxkfmn3nzc68l6vh0rdaw6b637yijwl4c83b5xiac1mi";
+ };
+
+ meta = {
+ description = "Idris Hash Array Mapped Trie";
+ homepage = https://github.com/bamboo/idris-hamt;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/heyting-algebra.nix b/pkgs/development/idris-modules/heyting-algebra.nix
new file mode 100644
index 00000000000..8a283eada8a
--- /dev/null
+++ b/pkgs/development/idris-modules/heyting-algebra.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package {
+ name = "heyting-algebra";
+ version = "2017-08-18";
+
+ idrisDeps = [ prelude contrib ];
+
+ src = fetchFromGitHub {
+ owner = "Risto-Stevcev";
+ repo = "idris-heyting-algebra";
+ rev = "2c814c48246a5e19bff66e64a753208c7d59d397";
+ sha256 = "199cvhxiimlhchvsc66zwn0dls78f9lamam256ad65mv4cjmxv40";
+ };
+
+ meta = {
+ description = "Interfaces for heyting algebras and verified bounded join and meet semilattices";
+ homepage = https://github.com/Risto-Stevcev/idris-heyting-algebra;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/hezarfen.nix b/pkgs/development/idris-modules/hezarfen.nix
new file mode 100644
index 00000000000..712508220a6
--- /dev/null
+++ b/pkgs/development/idris-modules/hezarfen.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package {
+ name = "hezarfen";
+ version = "2018-02-03";
+
+ idrisDeps = [ prelude base ];
+
+ src = fetchFromGitHub {
+ owner = "joom";
+ repo = "hezarfen";
+ rev = "079884d85619cd187ae67230480a1f37327f8d78";
+ sha256 = "0z4150gavpx64m3l0xbjjz9dcir7zij9hvd69k98zvhw7i27b1xp";
+ };
+
+ meta = {
+ description = "a theorem prover for intuitionistic propositional logic in Idris, with metaprogramming features";
+ homepage = https://github.com/joom/hezarfen;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/hrtime.nix b/pkgs/development/idris-modules/hrtime.nix
new file mode 100644
index 00000000000..ba4df28ab26
--- /dev/null
+++ b/pkgs/development/idris-modules/hrtime.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, idrisscript
+, lib
+, idris
+}:
+build-idris-package {
+ name = "hrtime";
+ version = "2017-04-16";
+
+ idrisDeps = [ prelude idrisscript ];
+
+ src = fetchFromGitHub {
+ owner = "pierrebeaucamp";
+ repo = "idris-hrtime";
+ rev = "e1f54ce74bde871010ae76d9afd42048cd2aae83";
+ sha256 = "0rmmpi1kp1h7ficmcxbxkny9lq9pjli2qhwy17vgbgx8fx60m8l0";
+ };
+
+ meta = {
+ description = "Idris library for high resolution time";
+ homepage = https://github.com/pierrebeaucamp/idris-hrtime;
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/html.nix b/pkgs/development/idris-modules/html.nix
new file mode 100644
index 00000000000..deec5b0eb6d
--- /dev/null
+++ b/pkgs/development/idris-modules/html.nix
@@ -0,0 +1,34 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, idrisscript
+, hrtime
+, webgl
+, lib
+, idris
+}:
+build-idris-package {
+ name = "html";
+ version = "2017-04-23";
+
+ idrisDeps = [ prelude idrisscript hrtime webgl ];
+
+ src = fetchFromGitHub {
+ owner = "pierrebeaucamp";
+ repo = "idris-html";
+ rev = "f59ecc560d7008ba26dda83f11319bb24ed6c508";
+ sha256 = "0r2clvkyld3y3r6smkfb7s47qnndikwds3bx9hphidbn41wjnh0i";
+ };
+
+ postUnpack = ''
+ sed -i "s/hrTime/hrtime/g" source/html.ipkg
+ '';
+
+ meta = {
+ description = "Idris library to interact with HTML";
+ homepage = https://github.com/pierrebeaucamp/idris-html;
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/http.nix b/pkgs/development/idris-modules/http.nix
new file mode 100644
index 00000000000..800a3a2eeb4
--- /dev/null
+++ b/pkgs/development/idris-modules/http.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lightyear
+, bytes
+, lib
+, idris
+}:
+build-idris-package {
+ name = "http";
+ version = "2018-02-25";
+
+ idrisDeps = [ prelude contrib lightyear bytes ];
+
+ src = fetchFromGitHub {
+ owner = "uwap";
+ repo = "idris-http";
+ rev = "dc4a31543f87c0bc44cbaa98192f0303cd8dd82e";
+ sha256 = "1abrwi5ikymff4g7a0g5wskycvhpnn895z1z1bz9r71ks554ypl8";
+ };
+
+ meta = {
+ description = "An HTTP library for idris";
+ homepage = https://github.com/uwap/idris-http;
+ license = lib.licenses.bsd2;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/http4idris.nix b/pkgs/development/idris-modules/http4idris.nix
new file mode 100644
index 00000000000..5b79644c3a0
--- /dev/null
+++ b/pkgs/development/idris-modules/http4idris.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+
+build-idris-package {
+ name = "http4idris";
+ version = "2018-01-16";
+
+ idrisDeps = [ prelude contrib ];
+
+ src = fetchFromGitHub {
+ owner = "A1kmm";
+ repo = "http4idris";
+ rev = "f44ffd2a15628869c7aadf241e3c9b1ee7b40941";
+ sha256 = "16bs7rxbsq7m7jm96zkqiq8hj68l907m8xgmjrcxzl158qvzhw1w";
+ };
+
+ meta = {
+ description = "An experimental HTTP framework for Idris";
+ homepage = https://github.com/A1kmm/http4idris;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/httpclient.nix b/pkgs/development/idris-modules/httpclient.nix
deleted file mode 100644
index 13c33d04da5..00000000000
--- a/pkgs/development/idris-modules/httpclient.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ curl
-, build-idris-package
-, fetchFromGitHub
-, lightyear
-, contrib
-, effects
-, prelude
-, base
-, lib
-, idris
-}:
-
-let
-in
-build-idris-package {
- name = "httpclient";
- version = "2016-12-20";
-
- src = fetchFromGitHub {
- owner = "justjoheinz";
- repo = "idris-httpclient";
- rev = "4a7296d572d7f7fde87d27da07d5c9566dc4ff14";
- sha256 = "0sy0q7gri9lwbqdmx9720pby3w1470w7wzn62bf2rir532219hhl";
- };
-
- idrisDeps = [ prelude base effects lightyear contrib ];
-
- extraBuildInputs = [ curl ];
-
- meta = {
- description = "HTTP Client for Idris";
- homepage = https://github.com/justjoheinz/idris-httpclient;
- inherit (idris.meta) platforms;
- broken = true;
- };
-}
diff --git a/pkgs/development/idris-modules/iaia.nix b/pkgs/development/idris-modules/iaia.nix
new file mode 100644
index 00000000000..5b4f450fdf7
--- /dev/null
+++ b/pkgs/development/idris-modules/iaia.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package {
+ name = "iaia";
+ version = "2017-11-10";
+
+ idrisDeps = [ prelude contrib ];
+
+ src = fetchFromGitHub {
+ owner = "sellout";
+ repo = "Iaia";
+ rev = "dce68d2b63a26dad7c94459773eae2d42686fa05";
+ sha256 = "0209fhv8x3sw6ijrwc8a85pch97z821ygaz78va3l274xam4l659";
+ };
+
+ meta = {
+ description = "Recursion scheme library for Idris";
+ homepage = https://github.com/sellout/Iaia;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/idrishighlighter.nix b/pkgs/development/idris-modules/idrishighlighter.nix
new file mode 100644
index 00000000000..f3d06216976
--- /dev/null
+++ b/pkgs/development/idris-modules/idrishighlighter.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lightyear
+, lib
+, idris
+}:
+build-idris-package {
+ name = "idrishighlighter";
+ version = "2018-02-22";
+
+ idrisDeps = [ prelude effects lightyear ];
+
+ src = fetchFromGitHub {
+ owner = "david-christiansen";
+ repo = "idris-code-highlighter";
+ rev = "708a29c7d1433adf7b0f69d1aec50e69b2915bba";
+ sha256 = "16ahzf2jzh7wzi4jjq94s5z9nzkgnj2962dy13s1crim53csjgw5";
+ };
+
+ meta = {
+ description = "Semantic highlighter for Idris code";
+ homepage = https://github.com/david-christiansen/idris-code-highlighter;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/idrisscript.nix b/pkgs/development/idris-modules/idrisscript.nix
new file mode 100644
index 00000000000..fd2f9e58218
--- /dev/null
+++ b/pkgs/development/idris-modules/idrisscript.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lib
+, idris
+}:
+
+build-idris-package {
+ name = "idrisscript";
+ version = "2017-07-01";
+
+ idrisDeps = [ prelude ];
+
+ src = fetchFromGitHub {
+ owner = "idris-hackers";
+ repo = "IdrisScript";
+ rev = "4bb7019182392f24d2246a3e616f829156c8f091";
+ sha256 = "074ignh2hqwq4ng5nk7dswga4lm7342w7h4bmx4n03ygrn7w89ff";
+ };
+
+ meta = {
+ description = "FFI Bindings to interact with the unsafe world of JavaScript";
+ homepage = https://github.com/idris-hackers/IdrisScript;
+ license = lib.licenses.bsd2;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/ipkgparser.nix b/pkgs/development/idris-modules/ipkgparser.nix
new file mode 100644
index 00000000000..cdc1d593c01
--- /dev/null
+++ b/pkgs/development/idris-modules/ipkgparser.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, effects
+, lightyear
+, lib
+, idris
+}:
+build-idris-package {
+ name = "ipkgparser";
+ version = "2017-11-14";
+
+ idrisDeps = [ prelude contrib effects lightyear ];
+
+ src = fetchFromGitHub {
+ owner = "emptyflash";
+ repo = "idris-ipkg-parser";
+ rev = "35cc2f54d4f3b3710f637d0a8c897bfbb32fe183";
+ sha256 = "0vn3pigqddfy7cld0386hxzdv2nkl8mdpsx97hvyvqzrdpz4wl2q";
+ };
+
+ meta = {
+ description = "Parser for Idris iPkg files written in Idris using Lightyear";
+ homepage = https://github.com/emptyflash/idris-ipkg-parser;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/jheiling-extras.nix b/pkgs/development/idris-modules/jheiling-extras.nix
new file mode 100644
index 00000000000..34981d28d3e
--- /dev/null
+++ b/pkgs/development/idris-modules/jheiling-extras.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+
+build-idris-package {
+ name = "extras";
+ version = "2018-03-06";
+
+ idrisDeps = [ prelude contrib ];
+
+ src = fetchFromGitHub {
+ owner = "jheiling";
+ repo = "idris-extras";
+ rev = "20e79087043ddb00301cdc3036964a2b1c5b1c5f";
+ sha256 = "0j34a7vawrkc7nkwwnv6lsjjdcr00d85csjw06nnbh8rj4vj5ps0";
+ };
+
+ meta = {
+ description = "Some useful functions for Idris";
+ homepage = https://github.com/jheiling/idris-extras;
+ license = lib.licenses.unlicense;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/jheiling-js.nix b/pkgs/development/idris-modules/jheiling-js.nix
new file mode 100644
index 00000000000..5139631b9d5
--- /dev/null
+++ b/pkgs/development/idris-modules/jheiling-js.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, jheiling-extras
+, lib
+, idris
+}:
+
+build-idris-package {
+ name = "jheiling-js";
+ version = "2016-03-09";
+
+ idrisDeps = [ prelude contrib jheiling-extras ];
+
+ src = fetchFromGitHub {
+ owner = "jheiling";
+ repo = "idris-js";
+ rev = "59763cd0c9715a9441931ae1077e501bb2ec6020";
+ sha256 = "1mvpxwszh56cfrf509qiadn7gp2l4syanhvdq6v1br0y03g8wk9v";
+ };
+
+ meta = {
+ description = "Js library for Idris";
+ homepage = https://github.com/jheiling/idris-js;
+ license = lib.licenses.unlicense;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/js.nix b/pkgs/development/idris-modules/js.nix
new file mode 100644
index 00000000000..0792a8c0f5d
--- /dev/null
+++ b/pkgs/development/idris-modules/js.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, pruviloj
+, lib
+, idris
+}:
+build-idris-package {
+ name = "js";
+ version = "2018-11-27";
+
+ idrisDeps = [ prelude contrib pruviloj ];
+
+ src = fetchFromGitHub {
+ owner = "rbarreiro";
+ repo = "idrisjs";
+ rev = "1ce91ecec69a7174c20bff927aeac3928a01ed3f";
+ sha256 = "13whhccb7yjq10hnngdc8bc9z9vvyir1wjkclpz006cr4cd266ca";
+ };
+
+ meta = {
+ description = "Js libraries for idris";
+ homepage = https://github.com/rbarreiro/idrisjs;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/lens.nix b/pkgs/development/idris-modules/lens.nix
new file mode 100644
index 00000000000..e97c7cfafda
--- /dev/null
+++ b/pkgs/development/idris-modules/lens.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, bifunctors
+, lib
+, idris
+}:
+
+build-idris-package {
+ name = "lens";
+ version = "2017-09-25";
+
+ idrisDeps = [ prelude bifunctors ];
+
+ src = fetchFromGitHub {
+ owner = "HuwCampbell";
+ repo = "idris-lens";
+ rev = "421aa76c19607693ac2f23003dc0fe82c1a3760a";
+ sha256 = "1q6lmhrwd1qg18s253sim4hg2a2wk5439p3izy1f9ygi6pv4a6mk";
+ };
+
+ meta = {
+ description = "van Laarhoven lenses for Idris";
+ homepage = https://github.com/HuwCampbell/idris-lens;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/lightyear.nix b/pkgs/development/idris-modules/lightyear.nix
index e217e76e2a7..6cedda0170f 100644
--- a/pkgs/development/idris-modules/lightyear.nix
+++ b/pkgs/development/idris-modules/lightyear.nix
@@ -7,12 +7,9 @@
, idris
}:
-let
- date = "2017-09-10";
-in
build-idris-package {
name = "lightyear";
- version = date;
+ version = "2017-09-10";
idrisDeps = [ prelude base effects ];
@@ -27,7 +24,7 @@ build-idris-package {
description = "Parser combinators for Idris";
homepage = https://github.com/ziman/lightyear;
license = lib.licenses.bsd2;
- maintainers = [ lib.maintainers.siddharthist ];
+ maintainers = with lib.maintainers; [ siddharthist brainrape ];
inherit (idris.meta) platforms;
};
}
diff --git a/pkgs/development/idris-modules/logic.nix b/pkgs/development/idris-modules/logic.nix
new file mode 100644
index 00000000000..342a84882cd
--- /dev/null
+++ b/pkgs/development/idris-modules/logic.nix
@@ -0,0 +1,31 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, bifunctors
+, lib
+, idris
+}:
+build-idris-package {
+ name = "logic";
+ version = "2016-12-02";
+
+ idrisDeps = [ prelude bifunctors ];
+
+ src = fetchFromGitHub {
+ owner = "yurrriq";
+ repo = "idris-logic";
+ rev = "e0bed57e17fde1237fe0358cb77b25f488a04d2f";
+ sha256 = "0kvn1p0v71vkwlchf20243c47jcfid44w5r0mx4dydijq9gylxfz";
+ };
+
+ # tests fail
+ doCheck = false;
+
+ meta = {
+ description = "Propositional logic tools, inspired by the Coq standard library";
+ homepage = https://github.com/yurrriq/idris-logic;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/mapping.nix b/pkgs/development/idris-modules/mapping.nix
new file mode 100644
index 00000000000..84429c88765
--- /dev/null
+++ b/pkgs/development/idris-modules/mapping.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lib
+, idris
+}:
+
+build-idris-package {
+ name = "mapping";
+ version = "2018-02-27";
+
+ idrisDeps = [ prelude ];
+
+ src = fetchFromGitHub {
+ owner = "zaoqi";
+ repo = "Mapping.idr";
+ rev = "4f226933d4491b8fd09f9d9a7b862c0cc646b936";
+ sha256 = "1skkb7jz2lv0xg4n5m0vd9xddg3x01459dwx1jxnpc7ifask4cda";
+ };
+
+ meta = {
+ description = "Idris mapping library";
+ homepage = https://github.com/zaoqi/Mapping.idr;
+ license = lib.licenses.agpl3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/mhd.nix b/pkgs/development/idris-modules/mhd.nix
new file mode 100644
index 00000000000..eae30886cd6
--- /dev/null
+++ b/pkgs/development/idris-modules/mhd.nix
@@ -0,0 +1,33 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, effects
+, libmicrohttpd
+, lib
+, idris
+}:
+
+build-idris-package {
+ name = "mhd";
+ version = "2016-04-22";
+
+ idrisDeps = [ prelude contrib effects ];
+
+ extraBuildInputs = [ libmicrohttpd ];
+
+ src = fetchFromGitHub {
+ owner = "colin-adams";
+ repo = "idris-libmicrohttpd";
+ rev = "a8808bc06fa292d4b3389f32cb00716e43122a46";
+ sha256 = "0wvp1qi3bn4hk52vsid6acfwvwbs58sggylbpjvkxzycsbhz4nx4";
+ };
+
+ meta = {
+ description = "A binding of the GNU libmicrohttpd library to the Idris C backend";
+ homepage = https://github.com/colin-adams/idris-libmicrohttpd;
+ license = lib.licenses.lgpl21;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/pacman.nix b/pkgs/development/idris-modules/pacman.nix
new file mode 100644
index 00000000000..3650a3990f2
--- /dev/null
+++ b/pkgs/development/idris-modules/pacman.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, sdl2
+, lib
+, idris
+}:
+build-idris-package {
+ name = "pacman";
+ version = "2017-11-10";
+
+ idrisDeps = [ prelude contrib sdl2 ];
+
+ src = fetchFromGitHub {
+ owner = "jdublu10";
+ repo = "pacman";
+ rev = "263ae58aeb5147e2af9cc76411970ccd90fa9121";
+ sha256 = "02m3ic2fk3a8j50xdpq70yx30hkxzjg6idsia482sm1nlkmxxin9";
+ };
+
+ postUnpack = ''
+ mv source/src/board.idr source/src/Board.idr
+ '';
+
+ meta = {
+ description = "Proof that Idris is pacman complete";
+ homepage = https://github.com/jdublu10/pacman;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/patricia.nix b/pkgs/development/idris-modules/patricia.nix
new file mode 100644
index 00000000000..e3c1cb82f28
--- /dev/null
+++ b/pkgs/development/idris-modules/patricia.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, specdris
+, lib
+, idris
+}:
+build-idris-package {
+ name = "patricia";
+ version = "2017-10-27";
+
+ idrisDeps = [ prelude specdris ];
+
+ src = fetchFromGitHub {
+ owner = "ChShersh";
+ repo = "idris-patricia";
+ rev = "24724e6d0564f2f813d0d0a58f5c5db9afe35313";
+ sha256 = "093q3qjmr93wv8pqwk0zfm3hzf14c235k9c9ip53rhg6yzcm0yqz";
+ };
+
+ postUnpack = ''
+ rm source/patricia-nix.ipkg
+ '';
+
+ meta = {
+ description = "Immutable map from integer keys to values based on patricia tree. Basically persistent array.";
+ homepage = https://github.com/ChShersh/idris-patricia;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/permutations.nix b/pkgs/development/idris-modules/permutations.nix
new file mode 100644
index 00000000000..af93f4af5e0
--- /dev/null
+++ b/pkgs/development/idris-modules/permutations.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package {
+ name = "permutations";
+ version = "2018-01-19";
+
+ idrisDeps = [ prelude base ];
+
+ src = fetchFromGitHub {
+ owner = "vmchale";
+ repo = "permutations";
+ rev = "f0de6bc721bb9d31e16f9168ded6eb6e34935881";
+ sha256 = "1dirzqy40fczbw7gp2jr51lzqsnq5vcx9z5l6194lcrq2vxgzv1s";
+ };
+
+ postUnpack = ''
+ rm source/test.ipkg
+ '';
+
+ meta = {
+ description = "Type-safe way of working with permutations in Idris";
+ homepage = https://github.com/vmchale/permutations;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/pfds.nix b/pkgs/development/idris-modules/pfds.nix
new file mode 100644
index 00000000000..8ab75b9ee50
--- /dev/null
+++ b/pkgs/development/idris-modules/pfds.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package {
+ name = "pfds";
+ version = "2017-09-25";
+
+ idrisDeps = [ prelude contrib ];
+
+ src = fetchFromGitHub {
+ owner = "timjb";
+ repo = "idris-pfds";
+ rev = "9ba39348adc45388eccf6463855f42b81333620a";
+ sha256 = "0jbrwdpzg5hgmkfk2kj5y8lgaynl79h48qdvkl1glypfh392w35f";
+ };
+
+ meta = {
+ description = "Purely functional data structures in Idris";
+ homepage = https://github.com/timjb/idris-pfds;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/pipes.nix b/pkgs/development/idris-modules/pipes.nix
new file mode 100644
index 00000000000..943d8e470f0
--- /dev/null
+++ b/pkgs/development/idris-modules/pipes.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package {
+ name = "pipes";
+ version = "2017-12-02";
+
+ idrisDeps = [ prelude base ];
+
+ src = fetchFromGitHub {
+ owner = "QuentinDuval";
+ repo = "IdrisPipes";
+ rev = "888abe405afce42015014899682c736028759d42";
+ sha256 = "1dxbqzg0qy7lkabmkj0qypywdjz5751g7h2ql8b2253dy3v0ndbs";
+ };
+
+ meta = {
+ description = "Composable and effectful production, transformation and consumption of streams of data";
+ homepage = https://github.com/QuentinDuval/IdrisPipes;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/posix.nix b/pkgs/development/idris-modules/posix.nix
new file mode 100644
index 00000000000..c6c44874b06
--- /dev/null
+++ b/pkgs/development/idris-modules/posix.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package {
+ name = "posix";
+ version = "2017-11-18";
+
+ idrisDeps = [ prelude base ];
+
+ src = fetchFromGitHub {
+ owner = "idris-hackers";
+ repo = "idris-posix";
+ rev = "1e4787bc4dfcf901f2e1858e5334a6bafa5d27c4";
+ sha256 = "14y51vn18v23k56gi3b33rjjwpf02qfb00w8cfy8qycrl8rbgsmb";
+ };
+
+ # tests need file permissions
+ doCheck = false;
+
+ meta = {
+ description = "System POSIX bindings for Idris.";
+ homepage = https://github.com/idris-hackers/idris-posix;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/protobuf.nix b/pkgs/development/idris-modules/protobuf.nix
new file mode 100644
index 00000000000..4b4c2694202
--- /dev/null
+++ b/pkgs/development/idris-modules/protobuf.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lightyear
+, lib
+, idris
+}:
+build-idris-package {
+ name = "protobuf";
+ version = "2017-08-12";
+
+ idrisDeps = [ prelude lightyear ];
+
+ src = fetchFromGitHub {
+ owner = "artagnon";
+ repo = "idris-protobuf";
+ rev = "c21212534639518453d16ae1b0f07d94464ff8eb";
+ sha256 = "0n5w7bdbxqca3b7hzg95md01mx4sfvl9fi82xjm0hzds33akmn05";
+ };
+
+ meta = {
+ description = "A partial implementation of Protocol Buffers in Idris";
+ homepage = https://github.com/artagnon/idris-protobuf;
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/rationals.nix b/pkgs/development/idris-modules/rationals.nix
new file mode 100644
index 00000000000..693d580fdd5
--- /dev/null
+++ b/pkgs/development/idris-modules/rationals.nix
@@ -0,0 +1,28 @@
+{ curl
+, build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package {
+ name = "rationals";
+ version = "2017-04-29";
+
+ idrisDeps = [ prelude contrib ];
+
+ src = fetchFromGitHub {
+ owner = "mcgordonite";
+ repo = "idris-binary-rationals";
+ rev = "0d7010b267662d89e76e2cc8b27fd95ecca009b8";
+ sha256 = "0fc93n4pyqyrjxrspnr3vjzc09m78ni1ardq1vx9g40vmvl0n49s";
+ };
+
+ meta = {
+ description = "An idris rational number type built from paths in the Stern Brocot tree";
+ homepage = https://github.com/mcgordonite/idris-binary-rationals;
+ inherit (idris.meta) platforms;
+ maintainers = [ lib.maintainers.brainrape ];
+ };
+}
diff --git a/pkgs/development/idris-modules/recursion_schemes.nix b/pkgs/development/idris-modules/recursion_schemes.nix
new file mode 100644
index 00000000000..06e99da3608
--- /dev/null
+++ b/pkgs/development/idris-modules/recursion_schemes.nix
@@ -0,0 +1,36 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, free
+, composition
+, comonad
+, bifunctors
+, hezarfen
+, lib
+, idris
+}:
+build-idris-package {
+ name = "recursion_schemes";
+ version = "2018-01-19";
+
+ idrisDeps = [ prelude free composition comonad bifunctors hezarfen ];
+
+ src = fetchFromGitHub {
+ owner = "vmchale";
+ repo = "recursion_schemes";
+ rev = "6bcbe0da561f461e7a05e29965a18ec9f87f8d82";
+ sha256 = "0rbx0yqa0fb7h7qfsvqvirc5q85z51rcwbivn6351jgn3a0inmhf";
+ };
+
+ postUnpack = ''
+ rm source/test.ipkg
+ '';
+
+ meta = {
+ description = "Recursion schemes for Idris";
+ homepage = https://github.com/vmchale/recursion_schemes;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/refined.nix b/pkgs/development/idris-modules/refined.nix
new file mode 100644
index 00000000000..bd8e37f2b7f
--- /dev/null
+++ b/pkgs/development/idris-modules/refined.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package {
+ name = "refined";
+ version = "2017-12-28";
+
+ idrisDeps = [ prelude base ];
+
+ src = fetchFromGitHub {
+ owner = "janschultecom";
+ repo = "idris-refined";
+ rev = "e21cdef16106a77b42d193806c1749ba6448a128";
+ sha256 = "1am7kfc51p2zlml954v8cl9xvx0g0f1caq7ni3z36xvsd7fh47yh";
+ };
+
+ postUnpack = ''
+ rm source/idris-refined-test.ipkg
+ '';
+
+ meta = {
+ description = "Port of Scala/Haskell Refined library to Idris";
+ homepage = https://github.com/janschultecom/idris-refined;
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/sdl.nix b/pkgs/development/idris-modules/sdl.nix
new file mode 100644
index 00000000000..181959dca06
--- /dev/null
+++ b/pkgs/development/idris-modules/sdl.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lib
+, idris
+, SDL
+, SDL_gfx
+}:
+
+build-idris-package {
+ name = "sdl";
+ version = "2017-03-24";
+
+ idrisDeps = [ prelude effects ];
+
+ extraBuildInputs = [ idris SDL SDL_gfx ];
+
+ src = fetchFromGitHub {
+ owner = "edwinb";
+ repo = "SDL-idris";
+ rev = "095ce70da7ea9f163b018b690105edf375f1befe";
+ sha256 = "0nryssnaqfq2pvz2mbl2kkx6mig310f9dpgrbcx788nxi0qzsig6";
+ };
+
+ meta = {
+ description = "SDL-idris framework for Idris";
+ homepage = https://github.com/edwinb/SDL-idris;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix
new file mode 100644
index 00000000000..46d4e9fb8dd
--- /dev/null
+++ b/pkgs/development/idris-modules/sdl2.nix
@@ -0,0 +1,33 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lib
+, idris
+, pkgconfig
+, SDL2
+, SDL2_gfx
+}:
+
+build-idris-package {
+ name = "sdl2";
+ version = "2018-01-19";
+
+ idrisDeps = [ prelude effects ];
+
+ extraBuildInputs = [ idris pkgconfig SDL2 SDL2_gfx ];
+
+ src = fetchFromGitHub {
+ owner = "steshaw";
+ repo = "idris-sdl2";
+ rev = "ebc36a0efb3e8086f2999120e7a8a8ac4952c6f6";
+ sha256 = "060k0i1pjilrc4pcz7v70hbipaw2crz14yxjlyjlhn6qm03131q0";
+ };
+
+ meta = {
+ description = "SDL2 binding for Idris";
+ homepage = https://github.com/steshaw/idris-sdl2;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/semidirect.nix b/pkgs/development/idris-modules/semidirect.nix
new file mode 100644
index 00000000000..d10a85eb4f4
--- /dev/null
+++ b/pkgs/development/idris-modules/semidirect.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, patricia
+, lib
+, idris
+}:
+build-idris-package {
+ name = "semidirect";
+ version = "2018-02-06";
+
+ idrisDeps = [ prelude contrib patricia ];
+
+ src = fetchFromGitHub {
+ owner = "clayrat";
+ repo = "idris-semidirect";
+ rev = "884c26c095784f8fd489c323d6673f2a8710a741";
+ sha256 = "0w36xkfxsqm6r91f0vs6qpmallrfwa09ql8i317xwm86nfk7akj9";
+ };
+
+ meta = {
+ description = "Semidirect products in Idris";
+ homepage = https://github.com/clayrat/idris-semidirect;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/setoids.nix b/pkgs/development/idris-modules/setoids.nix
new file mode 100644
index 00000000000..76bf127818c
--- /dev/null
+++ b/pkgs/development/idris-modules/setoids.nix
@@ -0,0 +1,26 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lib
+, idris
+}:
+build-idris-package {
+ name = "setoids";
+ version = "2017-03-13";
+
+ idrisDeps = [ prelude ];
+
+ src = fetchFromGitHub {
+ owner = "danilkolikov";
+ repo = "setoids";
+ rev = "a50cfc010cb4321cc9b7988c0a4f387d83d34839";
+ sha256 = "0q0h2qj9vylkm16h70l78l2p5xjkx4qmg2a2ixfl8vq8b1zm8gch";
+ };
+
+ meta = {
+ description = "Idris proofs for extensional equalities";
+ homepage = https://github.com/danilkolikov/setoids;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/smproc.nix b/pkgs/development/idris-modules/smproc.nix
new file mode 100644
index 00000000000..c751f27d1c9
--- /dev/null
+++ b/pkgs/development/idris-modules/smproc.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, contrib
+, lib
+, idris
+}:
+build-idris-package {
+ name = "smproc";
+ version = "2018-02-08";
+
+ idrisDeps = [ prelude base contrib ];
+
+ src = fetchFromGitHub {
+ owner = "jameshaydon";
+ repo = "smproc";
+ rev = "b292d6c94fe005bcd984b8e5134b6f99933aa0af";
+ sha256 = "02gqa2a32dwrvgz6pwsg8bniszbzwxlkzm53fq81sz3l9ja8ax1n";
+ };
+
+ meta = {
+ description = "Well-typed symmetric-monoidal category of concurrent processes";
+ homepage = https://github.com/jameshaydon/smproc;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/snippets.nix b/pkgs/development/idris-modules/snippets.nix
new file mode 100644
index 00000000000..9dc2dd3f8e2
--- /dev/null
+++ b/pkgs/development/idris-modules/snippets.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package {
+ name = "snippets";
+ version = "2018-03-17";
+
+ idrisDeps = [ prelude contrib ];
+
+ src = fetchFromGitHub {
+ owner = "palladin";
+ repo = "idris-snippets";
+ rev = "c26d6f5ffc1cc0456279f5ac74fec5af8c09025e";
+ sha256 = "1vwyzck6yan3wifsyj02ji9l6x9rs2r02aybm90gl676s2x4mhjn";
+ };
+
+ meta = {
+ description = "Collection of Idris snippets";
+ homepage = https://github.com/palladin/idris-snippets;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/software_foundations.nix b/pkgs/development/idris-modules/software_foundations.nix
new file mode 100644
index 00000000000..3d16e91e10f
--- /dev/null
+++ b/pkgs/development/idris-modules/software_foundations.nix
@@ -0,0 +1,27 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, pruviloj
+, lib
+, idris
+}:
+build-idris-package {
+ name = "software_foundations";
+ version = "2017-11-04";
+
+ idrisDeps = [ prelude pruviloj ];
+
+ src = fetchFromGitHub {
+ owner = "idris-hackers";
+ repo = "software-foundations";
+ rev = "eaa63d1a572c78e7ce68d27fd49ffdc01457e720";
+ sha256 = "1rkjm0x79n1r3ah041a5bik7sc3rvqs42a2c3g139hlg5xd028xf";
+ };
+
+ meta = {
+ description = "Code for Software Foundations in Idris";
+ homepage = https://github.com/idris-hackers/software-foundations;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/specdris.nix b/pkgs/development/idris-modules/specdris.nix
index e20af375237..b18d4a07d46 100644
--- a/pkgs/development/idris-modules/specdris.nix
+++ b/pkgs/development/idris-modules/specdris.nix
@@ -7,22 +7,19 @@
, idris
}:
-let
- date = "2017-11-11";
-in
build-idris-package {
name = "specdris";
- version = date;
+ version = "2018-01-23";
src = fetchgit {
url = "https://github.com/pheymann/specdris";
- rev = "88b80334b8e0b6601324e2410772d35022fc8eaa";
- sha256 = "4813c4be1d4c3dd1dad35964b085f83cf9fb44b16824257c72b468d4bafd0e4f";
+ rev = "625f88f5e118e53f30bcf5e5f3dcf48eb268ac21";
+ sha256 = "1gc717xf4i7z75aqazy5wqm7b1dqfyx5pprdypxz1h3980m67fsa";
};
idrisDeps = [ prelude base effects idris ];
- # The tests attribute is very strange as the tests are a different ipkg
+ # tests use a different ipkg and directory structure
doCheck = false;
meta = {
diff --git a/pkgs/development/idris-modules/tap.nix b/pkgs/development/idris-modules/tap.nix
new file mode 100644
index 00000000000..5f6eccd98cd
--- /dev/null
+++ b/pkgs/development/idris-modules/tap.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package {
+ name = "tap";
+ version = "2017-04-08";
+
+ idrisDeps = [ prelude contrib ];
+
+ src = fetchFromGitHub {
+ owner = "ostera";
+ repo = "tap-idris";
+ rev = "0d019333e1883c1d60e151af1acb02e2b531e72f";
+ sha256 = "0fhlmmivq9xv89r7plrnhmvay1j7bapz3wh7y8lygwvcrllh9zxs";
+ };
+
+ postUnpack = ''
+ rm source/Draft.ipkg
+ '';
+
+ meta = {
+ description = "A simple TAP producer and consumer/reporter for Idris";
+ homepage = https://github.com/ostera/tap-idris;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/test.nix b/pkgs/development/idris-modules/test.nix
new file mode 100644
index 00000000000..d0688c54a65
--- /dev/null
+++ b/pkgs/development/idris-modules/test.nix
@@ -0,0 +1,32 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, lib
+, idris
+}:
+
+build-idris-package {
+ name = "test";
+ version = "2017-03-30";
+
+ idrisDeps = [ prelude effects ];
+
+ src = fetchFromGitHub {
+ owner = "jfdm";
+ repo = "idris-testing";
+ rev = "604d56f77054931b21975198be669e22427b1f52";
+ sha256 = "1pmyhs3jx6wd0pzjd3igfxb9zjs8pqmk4ah352bxjrqdnhqwrl51";
+ };
+
+
+ doCheck = false;
+
+ meta = {
+ description = "Testing Utilities for Idris programs";
+ homepage = https://github.com/jfdm/idris-testing;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/tlhydra.nix b/pkgs/development/idris-modules/tlhydra.nix
new file mode 100644
index 00000000000..9106e485c5f
--- /dev/null
+++ b/pkgs/development/idris-modules/tlhydra.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, effects
+, contrib
+, lightyear
+, lib
+, idris
+}:
+
+build-idris-package {
+ name = "tlhydra";
+ version = "2017-13-26";
+
+ idrisDeps = [ prelude effects contrib lightyear ];
+
+ src = fetchFromGitHub {
+ owner = "Termina1";
+ repo = "tlhydra";
+ rev = "3fc9049447d9560fe16f4d36a2f2996494ac2b33";
+ sha256 = "1y3gcbc1ypv00vwa0w3v0n6ckf7gnz26xsfmgnidsaxzff3y0ymh";
+ };
+
+ meta = {
+ description = "Idris parser and serializer/deserealizer for TL language";
+ homepage = https://github.com/Termina1/tlhydra;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/tomladris.nix b/pkgs/development/idris-modules/tomladris.nix
new file mode 100644
index 00000000000..a5d99d19284
--- /dev/null
+++ b/pkgs/development/idris-modules/tomladris.nix
@@ -0,0 +1,30 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lightyear
+, lib
+, idris
+}:
+
+build-idris-package {
+ name = "tomladris";
+ version = "2017-11-14";
+
+ idrisDeps = [ prelude lightyear contrib ];
+
+ src = fetchFromGitHub {
+ owner = "emptyflash";
+ repo = "tomladris";
+ rev = "0fef663e20528c455f410f01124c8e3474a96606";
+ sha256 = "0a0fc0bsr356plgzsr5sr4qmqx4838998wjwmflz10qwsv1j3zsw";
+ };
+
+ meta = {
+ description = "TOML parser for Idris";
+ homepage = https://github.com/emptyflash/tomladris;
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ siddharthist brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/tp.nix b/pkgs/development/idris-modules/tp.nix
new file mode 100644
index 00000000000..db45f0408ab
--- /dev/null
+++ b/pkgs/development/idris-modules/tp.nix
@@ -0,0 +1,31 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package {
+ name = "tp";
+ version = "2017-08-15";
+
+ idrisDeps = [ prelude base ];
+
+ src = fetchFromGitHub {
+ owner = "superfunc";
+ repo = "tp";
+ rev = "ef59ccf355ae462bd4f55d596e6d03a9376b67b2";
+ sha256 = "1a924qvm1dqfg419x8n35w0sz74vyyqsynz5g393f82jsrrwci8z";
+ };
+
+ # tests fail with permission error
+ doCheck = false;
+
+ meta = {
+ description = "Strongly Typed Paths for Idris";
+ homepage = https://github.com/superfunc/tp;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix
new file mode 100644
index 00000000000..a2077fca20d
--- /dev/null
+++ b/pkgs/development/idris-modules/tparsec.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, lib
+, idris
+}:
+
+build-idris-package {
+ name = "tparsec";
+ version = "2017-12-12";
+
+ idrisDeps = [ prelude ];
+
+ src = fetchFromGitHub {
+ owner = "gallais";
+ repo = "idris-tparsec";
+ rev = "fb87d08f8f58c934f37d8324b43b0979abcf2183";
+ sha256 = "0362076bfs976gqki4b4pxblhnk4xglgx5v2aycjpxsxlpxh6cfd";
+ };
+
+ meta = {
+ description = "TParsec - Total Parser Combinators in Idris";
+ homepage = https://github.com/gallais/idris-tparsec;
+ license = lib.licenses.gpl3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/transducers.nix b/pkgs/development/idris-modules/transducers.nix
new file mode 100644
index 00000000000..d63a11a0234
--- /dev/null
+++ b/pkgs/development/idris-modules/transducers.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package {
+ name = "transducers";
+ version = "2017-07-28";
+
+ idrisDeps = [ prelude base ];
+
+ src = fetchFromGitHub {
+ owner = "QuentinDuval";
+ repo = "IdrisReducers";
+ rev = "2947ffa3559b642baeb3e43d7bb382e16bd073a8";
+ sha256 = "0wzbbp5n113mva99mqr119zwp5pgj4l6wq9033z4f0kbm2nhmcfr";
+ };
+
+ meta = {
+ description = "Composable algorithmic transformation";
+ homepage = https://github.com/QuentinDuval/IdrisReducers;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/trees.nix b/pkgs/development/idris-modules/trees.nix
new file mode 100644
index 00000000000..78ad70690b3
--- /dev/null
+++ b/pkgs/development/idris-modules/trees.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, bi
+, lib
+, idris
+}:
+build-idris-package {
+ name = "trees";
+ version = "2018-03-19";
+
+ idrisDeps = [ prelude contrib bi ];
+
+ src = fetchFromGitHub {
+ owner = "clayrat";
+ repo = "idris-trees";
+ rev = "dc17f9598bd78ec2b283d91b3c58617960d88c85";
+ sha256 = "1c3p69875qc4zdk28im9xz45zw46ajgcmxpqmig63y0z4v3gwxww";
+ };
+
+ meta = {
+ description = "Trees in Idris";
+ homepage = https://github.com/clayrat/idris-trees;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/union_type.nix b/pkgs/development/idris-modules/union_type.nix
new file mode 100644
index 00000000000..845bec3d84e
--- /dev/null
+++ b/pkgs/development/idris-modules/union_type.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package {
+ name = "union_type";
+ version = "2018-01-30";
+
+ idrisDeps = [ prelude base ];
+
+ src = fetchFromGitHub {
+ owner = "berewt";
+ repo = "UnionType";
+ rev = "f7693036237585fe324a815a96ad101d9659c689";
+ sha256 = "1ky0h03kja2y1fjg18j46akw03wi5ng80pghh2j3ib6hxlg1rbs7";
+ };
+
+ meta = {
+ description = "UnionType in Idris";
+ homepage = https://github.com/berewt/UnionType;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/vecspace.nix b/pkgs/development/idris-modules/vecspace.nix
new file mode 100644
index 00000000000..d2fa9e31ae3
--- /dev/null
+++ b/pkgs/development/idris-modules/vecspace.nix
@@ -0,0 +1,27 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lib
+, idris
+}:
+build-idris-package {
+ name = "vecspace";
+ version = "2018-01-12";
+
+ idrisDeps = [ prelude contrib ];
+
+ src = fetchFromGitHub {
+ owner = "clayrat";
+ repo = "idris-vecspace";
+ rev = "6830fa13232f25e9874b3f857b79508b5f82cb99";
+ sha256 = "1dwz69cmzblyh7lnyqq2gp0a042z7h02sh5q5wf4xb500vizwkq2";
+ };
+
+ meta = {
+ description = "Abstract vector spaces in Idris";
+ homepage = https://github.com/clayrat/idris-vecspace;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/webgl.nix b/pkgs/development/idris-modules/webgl.nix
new file mode 100644
index 00000000000..3793a812e57
--- /dev/null
+++ b/pkgs/development/idris-modules/webgl.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, idrisscript
+, lib
+, idris
+}:
+build-idris-package {
+ name = "webgl";
+ version = "2017-05-08";
+
+ idrisDeps = [ prelude idrisscript ];
+
+ src = fetchFromGitHub {
+ owner = "pierrebeaucamp";
+ repo = "idris-webgl";
+ rev = "1b4ee00a06b0bccfe33eea0fa8f068cdae690e9e";
+ sha256 = "097l2pj8p33d0n3ryb8y2vp0n5isnc8bkdnad3y6raa9z1xjn3d6";
+ };
+
+ meta = {
+ description = "Idris library to interact with WebGL";
+ homepage = https://github.com/pierrebeaucamp/idris-webgl;
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix
index 9ecf0591805..55a926d780d 100644
--- a/pkgs/development/idris-modules/wl-pprint.nix
+++ b/pkgs/development/idris-modules/wl-pprint.nix
@@ -16,10 +16,6 @@ build-idris-package {
sha256 = "0ifp76cqg340jkkzanx69vg76qivv53vh1lzv9zkp5f49prkwl5d";
};
- # The tests for this package fail. We should attempt to enable them when
- # updating this package again.
- doCheck = false;
-
idrisDeps = [ prelude base ];
meta = {
diff --git a/pkgs/development/idris-modules/wyvern.nix b/pkgs/development/idris-modules/wyvern.nix
new file mode 100644
index 00000000000..a1724476f6c
--- /dev/null
+++ b/pkgs/development/idris-modules/wyvern.nix
@@ -0,0 +1,33 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, effects
+, lib
+, idris
+}:
+build-idris-package {
+ name = "wyvern";
+ version = "2017-06-26";
+
+ idrisDeps = [ prelude contrib effects ];
+
+ src = fetchFromGitHub {
+ owner = "ericqweinstein";
+ repo = "wyvern";
+ rev = "b9e3e5747c5b23608c6ed5e2ccf43b86caa04292";
+ sha256 = "0zihf95w7i0903zy1mzn1ldn697nf57yl80nl32dpgji72h98kh2";
+ };
+
+ postUnpack = ''
+ sed -i "s/Wyvern.Core/Wyvern.Main/g" source/src/Wyvern.idr
+ '';
+
+ meta = {
+ description = "Little web server written in Idris";
+ homepage = https://github.com/ericqweinstein/wyvern;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/xhr.nix b/pkgs/development/idris-modules/xhr.nix
new file mode 100644
index 00000000000..15573cc9461
--- /dev/null
+++ b/pkgs/development/idris-modules/xhr.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, idrisscript
+, lib
+, idris
+}:
+build-idris-package {
+ name = "xhr";
+ version = "2017-04-22";
+
+ idrisDeps = [ prelude idrisscript ];
+
+ src = fetchFromGitHub {
+ owner = "pierrebeaucamp";
+ repo = "idris-xhr";
+ rev = "fb32a748ccdb9070de3f2d6048564e34c064b362";
+ sha256 = "0l07mnarvrb4xdw0b2xqgyxq4rljw1axz5mc9w4gmhvcrzxnyfnr";
+ };
+
+ meta = {
+ description = "Idris library to interact with xhr";
+ homepage = https://github.com/pierrebeaucamp/idris-xhr;
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/yaml.nix b/pkgs/development/idris-modules/yaml.nix
new file mode 100644
index 00000000000..ff935753ce9
--- /dev/null
+++ b/pkgs/development/idris-modules/yaml.nix
@@ -0,0 +1,29 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, contrib
+, lightyear
+, lib
+, idris
+}:
+build-idris-package {
+ name = "yaml";
+ version = "2018-01-25";
+
+ idrisDeps = [ prelude contrib lightyear ];
+
+ src = fetchFromGitHub {
+ owner = "Heather";
+ repo = "Idris.Yaml";
+ rev = "5afa51ffc839844862b8316faba3bafa15656db4";
+ sha256 = "1g4pi0swmg214kndj85hj50ccmckni7piprsxfdzdfhg87s0avw7";
+ };
+
+ meta = {
+ description = "Idris YAML lib";
+ homepage = https://github.com/Heather/Idris.Yaml;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/idris-modules/yampa.nix b/pkgs/development/idris-modules/yampa.nix
new file mode 100644
index 00000000000..661a55bfd74
--- /dev/null
+++ b/pkgs/development/idris-modules/yampa.nix
@@ -0,0 +1,27 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, bifunctors
+, lib
+, idris
+}:
+build-idris-package {
+ name = "yampa";
+ version = "2016-07-05";
+
+ idrisDeps = [ prelude bifunctors ];
+
+ src = fetchFromGitHub {
+ owner = "BartAdv";
+ repo = "idris-yampa";
+ rev = "2120dffb3ea0de906ba2b40080956c900457cf33";
+ sha256 = "0zp495zpbvsagdzrmg9iig652zbm34qc0gdr81x0viblwqxhicx6";
+ };
+
+ meta = {
+ description = "Idris implementation of Yampa FRP library as described in Reactive Programming through Dependent Types";
+ homepage = https://github.com/BartAdv/idris-yampa;
+ maintainers = [ lib.maintainers.brainrape ];
+ inherit (idris.meta) platforms;
+ };
+}
diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix
index c54a9d204cb..3cdc89fb3fd 100644
--- a/pkgs/development/interpreters/duktape/default.nix
+++ b/pkgs/development/interpreters/duktape/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
install -d $out/bin
install -m755 duk $out/bin/
install -d $out/lib
- install -m755 libduktape* $out/lib/
+ install -d $out/include
+ make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out
'';
enableParallelBuilding = true;
diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index 2f5ce0e7635..599126d2eff 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -1,6 +1,5 @@
{ stdenv, fetchurl, readline, gettext, ncurses }:
-with stdenv.lib;
stdenv.mkDerivation rec {
name = "gnu-apl-${version}";
version = "1.7";
@@ -13,9 +12,10 @@ stdenv.mkDerivation rec {
buildInputs = [ readline gettext ncurses ];
# Needed with GCC 7
- NIX_CFLAGS_COMPILE = "-Wno-error=int-in-bool-context";
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=int-in-bool-context"
+ + stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=null-dereference";
- patchPhase = optionalString stdenv.isDarwin ''
+ patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h"
'';
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
find $out/share/doc/support-files -name 'Makefile*' -delete
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Free interpreter for the APL programming language";
homepage = http://www.gnu.org/software/apl/;
license = licenses.gpl3Plus;
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 61f17a959bd..a934d6c3bcf 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -60,6 +60,8 @@ let
./properly-detect-curses.patch
+ ] ++ optionals (x11Support && stdenv.isDarwin) [
+ ./use-correct-tcl-tk-on-darwin.patch
] ++ optionals stdenv.isLinux [
# Disable the use of ldconfig in ctypes.util.find_library (since
diff --git a/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch
new file mode 100644
index 00000000000..b73f62b97ec
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch
@@ -0,0 +1,48 @@
+diff --git a/setup.py b/setup.py
+index 2779658..902d0eb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext):
+ # Rather than complicate the code below, detecting and building
+ # AquaTk is a separate method. Only one Tkinter will be built on
+ # Darwin - either AquaTk, if it is found, or X11 based Tk.
+- if (host_platform == 'darwin' and
+- self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
+- return
+
+ # Assume we haven't found any of the libraries or include files
+ # The versions with dots are used on Unix, and the versions without
+@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext):
+ if dir not in include_dirs:
+ include_dirs.append(dir)
+
+- # Check for various platform-specific directories
+- if host_platform == 'sunos5':
+- include_dirs.append('/usr/openwin/include')
+- added_lib_dirs.append('/usr/openwin/lib')
+- elif os.path.exists('/usr/X11R6/include'):
+- include_dirs.append('/usr/X11R6/include')
+- added_lib_dirs.append('/usr/X11R6/lib64')
+- added_lib_dirs.append('/usr/X11R6/lib')
+- elif os.path.exists('/usr/X11R5/include'):
+- include_dirs.append('/usr/X11R5/include')
+- added_lib_dirs.append('/usr/X11R5/lib')
+- else:
+- # Assume default location for X11
+- include_dirs.append('/usr/X11/include')
+- added_lib_dirs.append('/usr/X11/lib')
+-
+ # If Cygwin, then verify that X is installed before proceeding
+ if host_platform == 'cygwin':
+ x11_inc = find_file('X11/Xlib.h', [], include_dirs)
+@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext):
+ if host_platform in ['aix3', 'aix4']:
+ libs.append('ld')
+
+- # Finally, link with the X11 libraries (not appropriate on cygwin)
+- if host_platform != "cygwin":
+- libs.append('X11')
+-
+ ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
+ define_macros=[('WITH_APPINIT', 1)] + defs,
+ include_dirs = include_dirs,
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 4c0979ca0e3..d4391d873af 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -67,6 +67,8 @@ in stdenv.mkDerivation {
patches = [
./no-ldconfig.patch
./ld_library_path.patch
+ ] ++ optionals (x11Support && stdenv.isDarwin) [
+ ./use-correct-tcl-tk-on-darwin.patch
];
postPatch = ''
diff --git a/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch
new file mode 100644
index 00000000000..b73f62b97ec
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch
@@ -0,0 +1,48 @@
+diff --git a/setup.py b/setup.py
+index 2779658..902d0eb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext):
+ # Rather than complicate the code below, detecting and building
+ # AquaTk is a separate method. Only one Tkinter will be built on
+ # Darwin - either AquaTk, if it is found, or X11 based Tk.
+- if (host_platform == 'darwin' and
+- self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
+- return
+
+ # Assume we haven't found any of the libraries or include files
+ # The versions with dots are used on Unix, and the versions without
+@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext):
+ if dir not in include_dirs:
+ include_dirs.append(dir)
+
+- # Check for various platform-specific directories
+- if host_platform == 'sunos5':
+- include_dirs.append('/usr/openwin/include')
+- added_lib_dirs.append('/usr/openwin/lib')
+- elif os.path.exists('/usr/X11R6/include'):
+- include_dirs.append('/usr/X11R6/include')
+- added_lib_dirs.append('/usr/X11R6/lib64')
+- added_lib_dirs.append('/usr/X11R6/lib')
+- elif os.path.exists('/usr/X11R5/include'):
+- include_dirs.append('/usr/X11R5/include')
+- added_lib_dirs.append('/usr/X11R5/lib')
+- else:
+- # Assume default location for X11
+- include_dirs.append('/usr/X11/include')
+- added_lib_dirs.append('/usr/X11/lib')
+-
+ # If Cygwin, then verify that X is installed before proceeding
+ if host_platform == 'cygwin':
+ x11_inc = find_file('X11/Xlib.h', [], include_dirs)
+@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext):
+ if host_platform in ['aix3', 'aix4']:
+ libs.append('ld')
+
+- # Finally, link with the X11 libraries (not appropriate on cygwin)
+- if host_platform != "cygwin":
+- libs.append('X11')
+-
+ ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
+ define_macros=[('WITH_APPINIT', 1)] + defs,
+ include_dirs = include_dirs,
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index a8519a76a23..4f9e79c1d5f 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -67,6 +67,8 @@ in stdenv.mkDerivation {
patches = [
./no-ldconfig.patch
./ld_library_path.patch
+ ] ++ optionals (x11Support && stdenv.isDarwin) [
+ ./use-correct-tcl-tk-on-darwin.patch
];
postPatch = ''
diff --git a/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch
new file mode 100644
index 00000000000..b73f62b97ec
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch
@@ -0,0 +1,48 @@
+diff --git a/setup.py b/setup.py
+index 2779658..902d0eb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext):
+ # Rather than complicate the code below, detecting and building
+ # AquaTk is a separate method. Only one Tkinter will be built on
+ # Darwin - either AquaTk, if it is found, or X11 based Tk.
+- if (host_platform == 'darwin' and
+- self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
+- return
+
+ # Assume we haven't found any of the libraries or include files
+ # The versions with dots are used on Unix, and the versions without
+@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext):
+ if dir not in include_dirs:
+ include_dirs.append(dir)
+
+- # Check for various platform-specific directories
+- if host_platform == 'sunos5':
+- include_dirs.append('/usr/openwin/include')
+- added_lib_dirs.append('/usr/openwin/lib')
+- elif os.path.exists('/usr/X11R6/include'):
+- include_dirs.append('/usr/X11R6/include')
+- added_lib_dirs.append('/usr/X11R6/lib64')
+- added_lib_dirs.append('/usr/X11R6/lib')
+- elif os.path.exists('/usr/X11R5/include'):
+- include_dirs.append('/usr/X11R5/include')
+- added_lib_dirs.append('/usr/X11R5/lib')
+- else:
+- # Assume default location for X11
+- include_dirs.append('/usr/X11/include')
+- added_lib_dirs.append('/usr/X11/lib')
+-
+ # If Cygwin, then verify that X is installed before proceeding
+ if host_platform == 'cygwin':
+ x11_inc = find_file('X11/Xlib.h', [], include_dirs)
+@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext):
+ if host_platform in ['aix3', 'aix4']:
+ libs.append('ld')
+
+- # Finally, link with the X11 libraries (not appropriate on cygwin)
+- if host_platform != "cygwin":
+- libs.append('X11')
+-
+ ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
+ define_macros=[('WITH_APPINIT', 1)] + defs,
+ include_dirs = include_dirs,
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index fb58d0871ec..317a335b344 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -69,6 +69,8 @@ in stdenv.mkDerivation {
patches = [
./no-ldconfig.patch
+ ] ++ optionals (x11Support && stdenv.isDarwin) [
+ ./use-correct-tcl-tk-on-darwin.patch
];
postPatch = ''
diff --git a/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch
new file mode 100644
index 00000000000..b73f62b97ec
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch
@@ -0,0 +1,48 @@
+diff --git a/setup.py b/setup.py
+index 2779658..902d0eb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext):
+ # Rather than complicate the code below, detecting and building
+ # AquaTk is a separate method. Only one Tkinter will be built on
+ # Darwin - either AquaTk, if it is found, or X11 based Tk.
+- if (host_platform == 'darwin' and
+- self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
+- return
+
+ # Assume we haven't found any of the libraries or include files
+ # The versions with dots are used on Unix, and the versions without
+@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext):
+ if dir not in include_dirs:
+ include_dirs.append(dir)
+
+- # Check for various platform-specific directories
+- if host_platform == 'sunos5':
+- include_dirs.append('/usr/openwin/include')
+- added_lib_dirs.append('/usr/openwin/lib')
+- elif os.path.exists('/usr/X11R6/include'):
+- include_dirs.append('/usr/X11R6/include')
+- added_lib_dirs.append('/usr/X11R6/lib64')
+- added_lib_dirs.append('/usr/X11R6/lib')
+- elif os.path.exists('/usr/X11R5/include'):
+- include_dirs.append('/usr/X11R5/include')
+- added_lib_dirs.append('/usr/X11R5/lib')
+- else:
+- # Assume default location for X11
+- include_dirs.append('/usr/X11/include')
+- added_lib_dirs.append('/usr/X11/lib')
+-
+ # If Cygwin, then verify that X is installed before proceeding
+ if host_platform == 'cygwin':
+ x11_inc = find_file('X11/Xlib.h', [], include_dirs)
+@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext):
+ if host_platform in ['aix3', 'aix4']:
+ libs.append('ld')
+
+- # Finally, link with the X11 libraries (not appropriate on cygwin)
+- if host_platform != "cygwin":
+- libs.append('X11')
+-
+ ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
+ define_macros=[('WITH_APPINIT', 1)] + defs,
+ include_dirs = include_dirs,
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
new file mode 100644
index 00000000000..474eaa0e1dc
--- /dev/null
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev }:
+
+let
+ # workaround https://github.com/NixOS/nixpkgs/issues/37364
+ jdk-without-symlinks = if jdk == openjdk8 then zulu8 else jdk;
+in
+{
+ jogl_2_3_2 =
+ let
+ version = "2.3.2";
+
+ gluegen-src = fetchgit {
+ url = git://jogamp.org/srv/scm/gluegen.git;
+ rev = "v${version}";
+ sha256 = "00hybisjwqs88p24dds652bzrwbbmhn2dpx56kp4j6xpadkp33d0";
+ fetchSubmodules = true;
+ };
+ in stdenv.mkDerivation rec {
+ name = "jogl-${version}";
+
+ src = fetchgit {
+ url = http://jogamp.org/srv/scm/jogl.git;
+ rev = "v${version}";
+ sha256 = "0msi2gxiqm2yqwkmxqbh521xdrimw1fly20g890r357rcgj8fsn3";
+ fetchSubmodules = true;
+ };
+
+ buildInputs = [ jdk-without-symlinks ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
+
+ buildPhase = ''
+ cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen
+ chmod -R +w $NIX_BUILD_TOP/gluegen
+ ( cd ../gluegen/make
+ ant )
+
+ ( cd make
+
+ # force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers
+ # if arm/aarch64 support will be added, this block might be commented out on those platforms
+ # on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so
+ cp build-newt.xml build-newt.xml.old
+ fgrep -v 'if="setup.addNativeBroadcom"' build-newt.xml.old > build-newt.xml
+
+ ant )
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/java
+ cp $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-amd64}.jar $out/share/java/
+ cp $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar $out/share/java/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Java libraries for 3D Graphics, Multimedia and Processing";
+ homepage = http://jogamp.org/;
+ license = licenses.bsd3;
+ platforms = [ "x86_64-linux" ];
+ };
+ };
+}
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 534f31ad1f4..5e1c527eb8b 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -42,6 +42,9 @@ stdenv.mkDerivation rec {
sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
};
+ # make: *** No rule to make target 'build/*.lo', needed by 'build/libSDL.la'. Stop.
+ postPatch = "patchShebangs ./configure";
+
outputs = [ "out" "dev" ];
outputBin = "dev"; # sdl-config
diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index 230a7e64dff..d61315f7db8 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ace-${version}";
- version = "6.4.6";
+ version = "6.4.7";
src = fetchurl {
url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
- sha256 = "0xvdwk2505s615fgsy6g33ncxx70vszqspx0bg6lm8hfd3hb4qyj";
+ sha256 = "1zbncdxkkwnx4aphy0apnp7xn4aspxvq2h9bbjh33dpsy0j81afd";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 8d13a55887d..3e1edcdcfbf 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -15,13 +15,13 @@ let
else throw "Unsupported system!";
in stdenv.mkDerivation rec {
name = "aws-sdk-cpp-${version}";
- version = "1.4.10";
+ version = "1.4.15";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-sdk-cpp";
rev = version;
- sha256 = "0gw0ph6v2w4zqmixqfw5ab08c0r3d7iy2z1hll5pydlp5vwfmn7g";
+ sha256 = "10nk8zbrh2sgw7cp03g8yqylyi29bb99w8v6dbw97pnxf689m635";
};
# FIXME: might be nice to put different APIs in different outputs
diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix
index dedcb805327..ecf5fb1f02f 100644
--- a/pkgs/development/libraries/cfitsio/default.nix
+++ b/pkgs/development/libraries/cfitsio/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation {
- name = "cfitsio-3.43";
+ name = "cfitsio-3.430";
src = fetchurl {
url = "ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3430.tar.gz";
- sha256 = "1rw481bv5srfmldf1h8bqmyljjh0siqh87xh6rip67ms59ssxpn8";
+ sha256 = "07fghxh5fl8nqk3q0dh8rvc83npnm0hisxzcj16a6r7gj5pmp40l";
};
# Shared-only build
diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix
index 94652b12934..5d13fb09dcc 100644
--- a/pkgs/development/libraries/eigen/3.3.nix
+++ b/pkgs/development/libraries/eigen/3.3.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, cmake}:
let
- version = "3.3.3";
+ version = "3.3.4";
in
stdenv.mkDerivation {
name = "eigen-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
name = "eigen-${version}.tar.gz";
- sha256 = "0pz7k8kd9nydmsj2prjs67apixipl6pll3f0cjy0y3bvlazqr1wl";
+ sha256 = "1q85bgd6hnsgn0kq73wa4jwh4qdwklfg73pgqrz4zmxvzbqyi1j2";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index 306c5e756ec..81966f14a56 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -2,6 +2,8 @@
, libGL, libX11
}:
+with stdenv.lib;
+
stdenv.mkDerivation rec {
name = "epoxy-${version}";
version = "1.5.0";
@@ -18,17 +20,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ];
buildInputs = [ libGL libX11 ];
- preConfigure = stdenv.lib.optional stdenv.isDarwin ''
+ preConfigure = optionalString stdenv.isDarwin ''
substituteInPlace configure --replace build_glx=no build_glx=yes
substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1"
'';
# add libGL to rpath because libepoxy dlopen()s libEGL
- postFixup = ''
+ postFixup = optionalString stdenv.isLinux ''
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libGL ]}:$(patchelf --print-rpath $out/lib/libepoxy.so.0.0.0)" $out/lib/libepoxy.so.0.0.0
'';
- meta = with stdenv.lib; {
+ meta = {
description = "A library for handling OpenGL function pointer management";
homepage = https://github.com/anholt/libepoxy;
license = licenses.mit;
diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index 96f4af3226b..1f58fd698da 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }:
stdenv.mkDerivation rec {
- name = "exempi-2.4.4";
+ name = "exempi-2.4.5";
src = fetchurl {
url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2";
- sha256 = "1c1xxiw9lazdaz4zvrnvcy9pif9l1wib7zy91m48i7a4bnf9mmd2";
+ sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0";
};
configureFlags = [
diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix
index 31dad5e255a..0b4172cdc76 100644
--- a/pkgs/development/libraries/flite/default.nix
+++ b/pkgs/development/libraries/flite/default.nix
@@ -1,16 +1,21 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, alsaLib }:
stdenv.mkDerivation rec {
- name = "flite-2.0.0";
+ name = "flite-2.1.0";
- src = fetchurl {
- url = "http://www.festvox.org/flite/packed/flite-2.0/${name}-release.tar.bz2";
- sha256 = "04g4r83jh4cl0irc8bg7njngcah7749956v9s6sh552kzmh3i337";
+ src = fetchFromGitHub {
+ owner = "festvox";
+ repo = "flite";
+ rev = "d673f65b2c4a8cd3da7447079309a6dc4bcf1a5e";
+ sha256 = "1kx43jvdln370590gfjhxxz3chxfi6kq18504wmdpljib2l0grjq";
};
- patches = [ ./fix-rpath.patch ];
+ buildInputs = [ alsaLib ];
- configureFlags = [ "--enable-shared" ];
+ configureFlags = [
+ "--enable-shared"
+ "--with-audio=alsa"
+ ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/flite/fix-rpath.patch b/pkgs/development/libraries/flite/fix-rpath.patch
deleted file mode 100644
index be774147c3f..00000000000
--- a/pkgs/development/libraries/flite/fix-rpath.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -81 +80,1 @@ ifdef SHFLAGS
--flite_LIBS_flags += -Wl,-rpath $(LIBDIR)
-+flite_LIBS_flags += -Wl,-rpath,$(INSTALLLIBDIR)
diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
index d6767a4cbd3..3771880d360 100644
--- a/pkgs/development/libraries/freenect/default.nix
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -1,25 +1,29 @@
-{ stdenv, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU_combined, libXi, libXmu }:
+{ stdenv, lib, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU_combined, libXi, libXmu
+, GLUT, Cocoa
+ }:
stdenv.mkDerivation rec {
name = "freenect-${version}";
- version = "0.5.5";
+ version = "0.5.7";
src = fetchFromGitHub {
owner = "OpenKinect";
repo = "libfreenect";
rev = "v${version}";
- sha256 = "0qmbagfkxjgbwd2ajn7i5lkic9gx5y02bsnmqm7cjay99zfw9ifx";
+ sha256 = "0vnc7z2avckh4mccqq6alsd2z7xvsh3kaslc5b0gnfxw0j269gl6";
};
- buildInputs = [ libusb freeglut libGLU_combined libXi libXmu ];
+ buildInputs = [ libusb freeglut libGLU_combined libXi libXmu ]
+ ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ];
+
nativeBuildInputs = [ cmake pkgconfig ];
meta = {
description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS";
inherit version;
homepage = http://openkinect.org;
- license = with stdenv.lib.licenses; [ gpl2 asl20 ];
- maintainers = with stdenv.lib.maintainers; [ bennofs ];
- platforms = stdenv.lib.platforms.linux;
+ license = with lib.licenses; [ gpl2 asl20 ];
+ maintainers = with lib.maintainers; [ bennofs ];
+ platforms = with lib.platforms; linux ++ darwin ;
};
}
diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix
index 3abea7d2d8c..61409279ded 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/pkgs/development/libraries/grib-api/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec{
name = "grib-api-${version}";
- version = "1.24.0";
+ version = "1.26.0";
src = fetchurl {
url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz";
- sha256 = "1kbvyzaghbn1bqn97sslskmb6k3ki1dnr0g5abk5sb40n0y483bb";
+ sha256 = "00cmmj44bhdlzhqbvwb3bb4xks3bpva669m6g3g6ffjaqm25b90c";
};
preConfigure = ''
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index f33e52867c5..9f9166e43c9 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
stdenv.mkDerivation rec {
- version = "1.9.1";
+ version = "1.10.0";
name = "grpc-${version}";
src = fetchurl {
url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz";
- sha256 = "0h2w0dckxydngva9kl7dpilif8k9zi2ajnlanscr7s5kkza3dhps";
+ sha256 = "0wngrb44bpryrvrnx5y1ncrhi2097qla929wqjwvs0razbk3v9rr";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix
index e586b30393e..8beda8663c5 100644
--- a/pkgs/development/libraries/iniparser/default.nix
+++ b/pkgs/development/libraries/iniparser/default.nix
@@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
patches = ./no-usr.patch;
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace Makefile \
+ --replace -Wl,-soname= -Wl,-install_name,
+ '';
+
doCheck = true;
preCheck = "patchShebangs test/make-tests.sh";
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index a8b2e4b3420..6ff8a03175e 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
- version = "3.12.0.1317";
+ version = "3.13.3.1365";
name = "libdigidocpp-${version}";
src = fetchurl {
- url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.12.0.1317.orig.tar.xz";
- sha256 = "8059e1dbab99f062d070b9da0b1334b7226f1ab9badcd7fddea3100519d1f9a9";
+ url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.13.3.1365.orig.tar.xz";
+ sha256 = "1xmvjh5xzspm6ja8hz6bzblwly7yn2jni2m6kx8ny9g65zjrj2iw";
};
unpackPhase = ''
diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix
index fff760c5519..f90e741a57e 100644
--- a/pkgs/development/libraries/libftdi/default.nix
+++ b/pkgs/development/libraries/libftdi/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "libftdi-0.20";
-
+
src = fetchurl {
url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz";
sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii";
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
description = "A library to talk to FTDI chips using libusb";
homepage = https://www.intra2net.com/en/developer/libftdi/;
license = stdenv.lib.licenses.lgpl21;
- platforms = stdenv.lib.platforms.unix;
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix
index 0d014cb22a8..c1e6a1f7fb8 100644
--- a/pkgs/development/libraries/libstrophe/default.nix
+++ b/pkgs/development/libraries/libstrophe/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libstrophe-${version}";
- version = "0.9.1";
+ version = "0.9.2";
src = fetchFromGitHub {
owner = "strophe";
repo = "libstrophe";
rev = version;
- sha256 = "099iv13c03y1dsn2ngdhfx2cnax0aj2gfh00w55hlzpvmjm8dsml";
+ sha256 = "1milna92h8wzxax8ll362zvb70091nmfks5lmd105vk0478zraca";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix
index 8d3d2f4c60c..aab0da90d39 100644
--- a/pkgs/development/libraries/libsvm/default.nix
+++ b/pkgs/development/libraries/libsvm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libsvm-${version}";
- version = "3.20";
+ version = "3.22";
src = fetchurl {
url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz";
- sha256 = "1gj5v5zp1qnsnv0iwxq0ikhf8262d3s5dq6syr6yqkglps0284hg";
+ sha256 = "0zd7s19y5vb7agczl6456bn45cj1y64739sslaskw1qk7dywd0bd";
};
buildPhase = ''
diff --git a/pkgs/development/libraries/libvirt/build-on-bsd.patch b/pkgs/development/libraries/libvirt/build-on-bsd.patch
deleted file mode 100644
index 830f0f30ff9..00000000000
--- a/pkgs/development/libraries/libvirt/build-on-bsd.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur libvirt-1.3.0.orig/src/admin/admin_protocol.c libvirt-1.3.0/src/admin/admin_protocol.c
---- libvirt-1.3.0.orig/src/admin/admin_protocol.c 2015-12-02 16:17:07.000000000 +0100
-+++ libvirt-1.3.0/src/admin/admin_protocol.c 2016-01-04 17:57:10.043412857 +0100
-@@ -6,6 +6,25 @@
-
- #include "admin_protocol.h"
-
-+/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
-+ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
-+ */
-+#ifdef HAVE_XDR_U_INT64_T
-+# define xdr_uint64_t xdr_u_int64_t
-+#endif
-+#ifndef IXDR_PUT_INT32
-+# define IXDR_PUT_INT32 IXDR_PUT_LONG
-+#endif
-+#ifndef IXDR_GET_INT32
-+# define IXDR_GET_INT32 IXDR_GET_LONG
-+#endif
-+#ifndef IXDR_PUT_U_INT32
-+# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
-+#endif
-+#ifndef IXDR_GET_U_INT32
-+# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
-+#endif
-+
- bool_t
- xdr_admin_nonnull_string (XDR *xdrs, admin_nonnull_string *objp)
- {
-diff -Naur libvirt-1.3.0.orig/src/logging/log_protocol.c libvirt-1.3.0/src/logging/log_protocol.c
---- libvirt-1.3.0.orig/src/logging/log_protocol.c 2015-12-08 13:07:35.000000000 +0100
-+++ libvirt-1.3.0/src/logging/log_protocol.c 2016-01-04 17:56:50.673463563 +0100
-@@ -7,6 +7,25 @@
- #include "log_protocol.h"
- #include "internal.h"
-
-+/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
-+ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
-+ */
-+#ifdef HAVE_XDR_U_INT64_T
-+# define xdr_uint64_t xdr_u_int64_t
-+#endif
-+#ifndef IXDR_PUT_INT32
-+# define IXDR_PUT_INT32 IXDR_PUT_LONG
-+#endif
-+#ifndef IXDR_GET_INT32
-+# define IXDR_GET_INT32 IXDR_GET_LONG
-+#endif
-+#ifndef IXDR_PUT_U_INT32
-+# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
-+#endif
-+#ifndef IXDR_GET_U_INT32
-+# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
-+#endif
-+
- bool_t
- xdr_virLogManagerProtocolUUID (XDR *xdrs, virLogManagerProtocolUUID objp)
- {
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 2dbf80e71f7..7262ca541f0 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,30 +1,41 @@
-{ stdenv, fetchurl, fetchpatch
-, pkgconfig, makeWrapper
+{ stdenv, fetchurl, fetchgit
+, pkgconfig, makeWrapper, libtool, autoconf, automake
, coreutils, libxml2, gnutls, devicemapper, perl, python2, attr
, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
-, curl, libiconv, gmp, xen, zfs, parted
+, curl, libiconv, gmp, xen, zfs, parted, bridge-utils, dmidecode
}:
with stdenv.lib;
-# if you update, also bump or it will break
-stdenv.mkDerivation rec {
+# if you update, also bump and SysVirt in
+let
+ buildFromTarball = stdenv.isDarwin;
+in stdenv.mkDerivation rec {
name = "libvirt-${version}";
- version = "3.10.0";
+ version = "4.1.0";
- src = fetchurl {
- url = "http://libvirt.org/sources/${name}.tar.xz";
- sha256 = "03kb37iv3dvvdlslznlc0njvjpmq082lczmsslz5p4fcwb50kwfz";
- };
-
- patches = [ ./build-on-bsd.patch ];
+ src =
+ if buildFromTarball then
+ fetchurl {
+ url = "http://libvirt.org/sources/${name}.tar.xz";
+ sha256 = "0fb466mcma21hsxx3cckllbr9hhncpbwim5px1mr66iidy1a8bwa";
+ }
+ else
+ fetchgit {
+ url = git://libvirt.org/libvirt.git;
+ rev = "v${version}";
+ sha256 = "01021r7i71dw9w7ffp6ia8h70ns6bc0ps5np0hq9nipxs68finm6";
+ fetchSubmodules = true;
+ };
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [
libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
libxslt xhtml1 perlPackages.XMLXPath curl libpcap
+ ] ++ optionals (!buildFromTarball) [
+ libtool autoconf automake
] ++ optionals stdenv.isLinux [
libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs
libapparmor libcap_ng numactl attr parted
@@ -34,17 +45,16 @@ stdenv.mkDerivation rec {
libiconv gmp
];
- preConfigure = optionalString stdenv.isLinux ''
- PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd ]}:$PATH
- substituteInPlace configure \
- --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"'
+ preConfigure = ''
+ ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
+
+ PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ])}:$PATH
# the path to qemu-kvm will be stored in VM's .xml and .save files
# do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
substituteInPlace src/lxc/lxc_conf.c \
--replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
- '' + ''
- PATH=${dnsmasq}/bin:$PATH
+
patchShebangs . # fixes /usr/bin/python references
'';
@@ -78,18 +88,19 @@ stdenv.mkDerivation rec {
];
postInstall = ''
- sed -i 's/ON_SHUTDOWN=suspend/ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}/' $out/libexec/libvirt-guests.sh
substituteInPlace $out/libexec/libvirt-guests.sh \
- --replace "$out/bin" "${gettext}/bin" \
- --replace "lock/subsys" "lock"
- sed -e "/gettext\.sh/a \\\n# Added in nixpkgs:\ngettext() { \"${gettext}/bin/gettext\" \"\$@\"; }" \
- -i "$out/libexec/libvirt-guests.sh"
-
+ --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
+ --replace "$out/bin" '${gettext}/bin' \
+ --replace 'lock/subsys' 'lock' \
+ --replace 'gettext.sh' 'gettext.sh
+ # Added in nixpkgs:
+ gettext() { "${gettext}/bin/gettext" "$@"; }
+ '
'' + optionalString stdenv.isLinux ''
substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill
rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
wrapProgram $out/sbin/libvirtd \
- --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath [ iptables iproute pmutils numad numactl ]}
+ --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ]}
'';
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index f59237ee164..2f9bca5ed95 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -1,26 +1,16 @@
{ stdenv, fetchurl, libogg, pkgconfig, fetchpatch }:
stdenv.mkDerivation rec {
- name = "libvorbis-1.3.5";
+ name = "libvorbis-1.3.6";
src = fetchurl {
url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz";
- sha256 = "1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal";
+ sha256 = "05dlzjkdpv46zb837wysxqyn8l636x3dw8v8ymlrwz2fg1dbn05g";
};
outputs = [ "out" "dev" "doc" ];
patches = [
- (fetchpatch {
- url = "https://github.com/xiph/vorbis/commit/a79ec216cd119069c68b8f3542c6a425a74ab993.patch";
- sha256 = "0xhsa96n3dlh2l85bxpz4b9m78mfxfgi2ibhjp77110a0nvkjr6h";
- name = "CVE-2017-14633";
- })
- (fetchpatch {
- url = "https://github.com/xiph/vorbis/commit/c1c2831fc7306d5fbd7bc800324efd12b28d327f.patch";
- sha256 = "17lb86105im6fc0h0cx5sn94p004jsdbbs2vj1m9ll6z9yb4rxwc";
- name = "CVE-2017-14632";
- })
(fetchpatch {
url = "https://gitlab.xiph.org/xiph/vorbis/uploads/a68cf70fa10c8081a633f77b5c6576b7/0001-CVE-2017-14160-make-sure-we-don-t-overflow.patch";
sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x";
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index fa35f7546f5..3bc04f9ae3d 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libwebsockets-${version}";
- version = "2.4.1";
+ version = "2.4.2";
src = fetchFromGitHub {
owner = "warmcat";
repo = "libwebsockets";
rev = "v${version}";
- sha256 = "0d3xqdq3hpk5l9cg4dqkba6jm6620y6knqqywya703662spmj2xw";
+ sha256 = "0gbprzsi054f9gr31ihcf0cq7zfkybrmdp6894pmzb5hcv4wnh9i";
};
buildInputs = [ cmake openssl zlib libuv ];
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 5c23f3dfde9..8662b956ce2 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -2,6 +2,12 @@
let
+ # Fix aarch64 build, shouldn't be needed after 3.35
+ aarch64Patch = fetchurl {
+ url = https://hg.mozilla.org/projects/nss/raw-rev/74e679158d1b;
+ sha256 = "1lhs4h32mb2al3z461yylk227nid769di1pdjr7p0kqm2z1qm3jq";
+ };
+
nssPEM = fetchurl {
url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
@@ -23,6 +29,8 @@ in stdenv.mkDerivation rec {
prePatch = ''
xz -d < ${nssPEM} | patch -p1
+ '' + stdenv.lib.optionalString stdenv.isAarch64 ''
+ (cd nss && patch -p1 < ${aarch64Patch})
'';
patches =
diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix
index af01c23fe1a..fb119936703 100644
--- a/pkgs/development/libraries/opencollada/default.nix
+++ b/pkgs/development/libraries/opencollada/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre
+, darwin}:
stdenv.mkDerivation rec {
name = "opencollada-${version}";
@@ -13,16 +14,22 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ cmake ];
+ buildInputs = [ cmake ]
+ ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]);
propagatedBuildInputs = [ libxml2 pcre ];
enableParallelBuilding = true;
+ patchPhase = lib.optionalString stdenv.isDarwin ''
+ substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \
+ --replace math.h cmath
+ '';
+
meta = {
description = "A library for handling the COLLADA file format";
homepage = https://github.com/KhronosGroup/OpenCOLLADA/;
maintainers = [ stdenv.lib.maintainers.eelco ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index db9a5aeed21..3b0e60fca39 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, unzip }:
+{ stdenv, lib, fetchurl, cmake, unzip, boost }:
stdenv.mkDerivation rec {
name = "opencolorio-${version}";
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "out" "dev" ];
- buildInputs = [ cmake unzip ];
+ buildInputs = [ cmake unzip ] ++ lib.optional stdenv.isDarwin boost;
+
+ cmakeFlags = lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON";
postInstall = ''
rm $out/lib/*.a
@@ -23,6 +25,6 @@ stdenv.mkDerivation rec {
description = "A color management framework for visual effects and animation";
license = licenses.bsd3;
maintainers = [ maintainers.goibhniu ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix
index 690261438ab..f8cbc867b2b 100644
--- a/pkgs/development/libraries/openfst/default.nix
+++ b/pkgs/development/libraries/openfst/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "openfst";
- version = "1.6.3";
+ version = "1.6.6";
src = fetchurl {
url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz";
- sha256 = "5c28b6ccd017fc6ff94ebd0c73ed8ab37d48f563dab1c603856fb05bc9333d99";
+ sha256 = "1b13nzf9xh1iv0k8z7sdfs9ya2ykf0gzjiixpb1qn3bydck6ppdm";
};
meta = {
description = "Library for working with finite-state transducers";
diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index 2886ef2b6b0..62c093f310f 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU
, libGL, glew, ocl-icd, python3
, cudaSupport ? false, cudatoolkit
+, darwin
}:
stdenv.mkDerivation rec {
@@ -17,17 +18,21 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
buildInputs =
- [ cmake pkgconfig libGLU libGL ocl-icd python3
+ [ cmake pkgconfig libGLU libGL python3
# FIXME: these are not actually needed, but the configure script wants them.
glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor
xorg.libXinerama xorg.libXi
]
+ ++ lib.optional (!stdenv.isDarwin) ocl-icd
+ ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [OpenCL Cocoa CoreVideo IOKit AppKit AGL ])
++ lib.optional cudaSupport cudatoolkit;
cmakeFlags =
[ "-DNO_TUTORIALS=1"
"-DNO_REGRESSION=1"
"-DNO_EXAMPLES=1"
+ "-DNO_METAL=1" # don’t have metal in apple sdk
+ ] ++ lib.optionals (!stdenv.isDarwin) [
"-DGLEW_INCLUDE_DIR=${glew.dev}/include"
"-DGLEW_LIBRARY=${glew.dev}/lib"
] ++ lib.optionals cudaSupport [
@@ -42,7 +47,7 @@ stdenv.mkDerivation rec {
meta = {
description = "An Open-Source subdivision surface library";
homepage = http://graphics.pixar.com/opensubdiv;
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.eelco ];
license = lib.licenses.asl20;
};
diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
index ae232cd531f..d44bc78a533 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/pkgs/development/libraries/poco/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "poco-${version}";
- version = "1.8.1";
+ version = "1.9.0";
src = fetchurl {
url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz";
- sha256 = "1pg48kk0354vsc6j2wnrk893l5xcsr3bjmkgykd3harcnvfqs7l8";
+ sha256 = "11z1i0drbacs7c7d5virc3kz7wh79svd06iffh8j6giikl7vz1q3";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index f5c5a667418..d6bd90fa47d 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, unzip
+{ stdenv, lib, fetchurl, unzip
, qt4 ? null, qmake4Hook ? null
-, withQt5 ? false, qtbase ? null, qmake ? null
+, withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null
}:
stdenv.mkDerivation rec {
@@ -14,29 +14,25 @@ stdenv.mkDerivation rec {
sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi";
};
- buildInputs = if withQt5 then [ qtbase ] else [ qt4 ];
- nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]);
+ buildInputs = [ (if withQt5 then qtbase else qt4) ]
+ ++ lib.optional (withQt5 && stdenv.isDarwin) qtmacextras;
+ nativeBuildInputs = [ unzip ]
+ ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]);
enableParallelBuilding = true;
preConfigure = ''
cd Qt4Qt5
- ${if withQt5
- then ''
- sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \
- -e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \
- -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/translations," \
- -e "s,\$\$\\[QT_HOST_DATA\\]/mkspecs,$out/mkspecs," \
- -e "s,\$\$\\[QT_INSTALL_DATA\\]/mkspecs,$out/mkspecs," \
- -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share," \
- qscintilla.pro
- ''
- else ''
- sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \
- -e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \
- -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/share/qt/translations," \
- -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share/qt," \
- qscintilla.pro
+ sed -i qscintilla.pro \
+ -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \
+ -e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \
+ -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/translations," \
+ ${if withQt5 then ''
+ -e "s,\$\$\\[QT_HOST_DATA\\]/mkspecs,$out/mkspecs," \
+ -e "s,\$\$\\[QT_INSTALL_DATA\\]/mkspecs,$out/mkspecs," \
+ -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share,"
+ '' else ''
+ -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share/qt,"
''}
'';
diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix
index fba35421355..22d66b7e71d 100644
--- a/pkgs/development/libraries/speech-tools/default.nix
+++ b/pkgs/development/libraries/speech-tools/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, gawk, alsaLib, ncurses }:
stdenv.mkDerivation rec {
- name = "speech_tools-${version}";
- version = "2.1";
+ name = "speech_tools-${version}.0";
+ version = "2.5";
src = fetchurl {
url = "http://www.festvox.org/packed/festival/${version}/${name}-release.tar.gz";
- sha256 = "1s9bkfgdgyas8v2cr7x3dg0ck1xf9mn1q6a73gwy524sjb6nfqgz";
+ sha256 = "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4";
};
buildInputs = [ alsaLib ncurses ];
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
preConfigure = ''
sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . )
sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . )
+
+ # c99 makes isnan valid for float and double
+ substituteInPlace include/EST_math.h \
+ --replace '__isnanf(X)' 'isnan(X)'
'';
installPhase = ''
@@ -26,16 +30,17 @@ stdenv.mkDerivation rec {
done
'';
+ doCheck = true;
+
+ checkTarget = "test";
+
meta = with stdenv.lib; {
- broken = true;
description = "Text-to-speech engine";
- maintainers = with maintainers;
- [
- raskin
- ];
+ maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
license = licenses.free;
};
+
passthru = {
updateInfo = {
downloadPage = "http://www.festvox.org/packed/festival/";
diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix
index 5e08a61cd1b..5609f1d67d1 100644
--- a/pkgs/development/libraries/tremor/default.nix
+++ b/pkgs/development/libraries/tremor/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchsvn, autoreconfHook, pkgconfig, libogg }:
+{ stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }:
stdenv.mkDerivation rec {
- name = "tremor-svn-${src.rev}";
+ name = "tremor-unstable-2018-03-16";
- src = fetchsvn {
- url = http://svn.xiph.org/trunk/Tremor;
- rev = "17866";
- sha256 = "161411cbefa1527da7a8fc087e78d8e21d19143d3a6eb42fb281e5026aad7568";
+ src = fetchgit {
+ url = https://git.xiph.org/tremor.git;
+ rev = "562307a4a7082e24553f3d2c55dab397a17c4b4f";
+ sha256 = "0m07gq4zfgigsiz8b518xyb19v7qqp76qmp7lb262825vkqzl3zq";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix
new file mode 100644
index 00000000000..ba6e437ca3c
--- /dev/null
+++ b/pkgs/development/libraries/vo-amrwbenc/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, autoreconfHook }:
+
+let
+ version = "0.1.3";
+in
+stdenv.mkDerivation {
+ name = "vo-amrwbenc-${version}";
+ version = "0.1.3";
+ buildInputs = [ autoreconfHook ];
+ src = fetchurl {
+ url = "https://github.com/mstorsjo/vo-amrwbenc/archive/v${version}.tar.gz";
+ sha256 = "85c79997ba7ddb9c95b5ddbe9ea032e27595390f3cbd686ed46a69e485cc053c";
+ };
+
+ meta = {
+ homepage = "http://sourceforge.net/projects/opencore-amr/";
+ description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder";
+ license = "stdenv.lib.licenses.apache";
+ maintainers = [ stdenv.lib.maintainers.Esteth ];
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index a993a64a49a..b4e06d3c999 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -1,20 +1,19 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
stdenv.mkDerivation rec {
name = "gapi-ocaml-${version}";
- version = "0.3.4";
+ version = "0.3.6";
src = fetchFromGitHub {
owner = "astrada";
repo = "gapi-ocaml";
rev = "v${version}";
- sha256 = "07p6p108fyf9xz54jbcld40k3r9zyybxmr5i3rrkhgwm8gb6sbhv";
+ sha256 = "0qgsy51bhkpfgl5rdnjw4bqs5fbh2w4vwrfbl8y3lh1wrqmnwci4";
};
- buildInputs = [ ocaml findlib ocamlbuild ];
+ buildInputs = [ ocaml jbuilder findlib ];
propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ];
- configurePhase = "ocaml setup.ml -configure --prefix $out";
- buildPhase = "ocaml setup.ml -build";
- installPhase = "ocaml setup.ml -install";
+ installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
+
createFindlibDestdir = true;
meta = {
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index 0ad5d09d687..b789b133aaf 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "ocaml-libvirt-${version}";
- rev = "3169af3";
- version = "0.6.1.4-rev.${rev}"; # libguestfs-1.34 needs ocaml-libvirt newer than the latest release 0.6.1.4
+ rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897";
+ version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4
src = fetchgit {
url = "git://git.annexia.org/git/ocaml-libvirt.git";
rev = rev;
- sha256 = "0z8p6q6k42rdrvy248siq922m1yszny1hfklf6djynvk2viyqdbg";
+ sha256 = "0vxgx1n58fp4qmly6i5zxiacr7303127d6j78a295xin1p3a8xcw";
};
propagatedBuildInputs = [ libvirt ];
diff --git a/pkgs/development/python-modules/IPy/default.nix b/pkgs/development/python-modules/IPy/default.nix
new file mode 100644
index 00000000000..eacfe8dda5b
--- /dev/null
+++ b/pkgs/development/python-modules/IPy/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, nose }:
+
+buildPythonPackage rec {
+ pname = "IPy";
+ version = "0.83";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "61da5a532b159b387176f6eabf11946e7458b6df8fb8b91ff1d345ca7a6edab8";
+ };
+
+ checkInputs = [ nose ];
+
+ checkPhase = ''
+ nosetests -e fuzz
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Class and tools for handling of IPv4 and IPv6 addresses and networks";
+ homepage = "https://github.com/autocracy/python-ipy";
+ license = licenses.bsdOriginal;
+ maintainers = with maintainers; [ y0no ];
+ };
+}
diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix
new file mode 100644
index 00000000000..9d1905fe914
--- /dev/null
+++ b/pkgs/development/python-modules/ajpy/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+ pname = "ajpy";
+ version = "0.0.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "740e7daf728ba58dabaf4af2c4305262eb207a6e41791424a146a21396ceb9ad";
+ };
+
+ # ajpy doesn't have tests
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "AJP package crafting library";
+ homepage = "https://github.com/hypn0s/AJPy/";
+ license = licenses.lgpl2;
+ maintainers = with maintainers; [ y0no ];
+ };
+}
diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix
new file mode 100644
index 00000000000..e21b43c60e0
--- /dev/null
+++ b/pkgs/development/python-modules/allpairspy/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, six, pytest }:
+
+buildPythonPackage rec {
+ pname = "allpairspy";
+ version = "2.4.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "9fb7962ee523bd96c5098cd3c97ac1b8eb73021d3df9314657ee9de00f52e034";
+ };
+
+ propagatedBuildInputs = [ six ];
+
+ checkInputs = [ pytest ];
+
+ checkPhase = ''
+ py.test
+ '';
+
+ meta = with lib; {
+ description = "Pairwise test combinations generator";
+ homepage = https://github.com/thombashi/allpairspy;
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index e4ccb0c92d6..786564b92e0 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "bleach";
- version = "2.1.2";
+ version = "2.1.3";
src = fetchPypi {
inherit pname version;
- sha256 = "38fc8cbebea4e787d8db55d6f324820c7f74362b70db9142c1ac7920452d1a19";
+ sha256 = "eb7386f632349d10d9ce9d4a838b134d4731571851149f9cc2c05a9a837a9a44";
};
checkInputs = [ pytest pytestrunner ];
@@ -41,4 +41,4 @@ buildPythonPackage rec {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ prikhi ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix
new file mode 100644
index 00000000000..ed27464d1fe
--- /dev/null
+++ b/pkgs/development/python-modules/colander/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi
+, translationstring, iso8601 }:
+
+buildPythonPackage rec {
+ pname = "colander";
+ version = "1.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "e20e9acf190e5711cf96aa65a5405dac04b6e841028fc361d953a9923dbc4e72";
+ };
+
+ propagatedBuildInputs = [ translationstring iso8601 ];
+
+ meta = with lib; {
+ description = "A simple schema-based serialization and deserialization library";
+ homepage = https://docs.pylonsproject.org/projects/colander/en/latest/;
+ license = licenses.free; # http://repoze.org/LICENSE.txt
+ maintainers = with maintainers; [ garbas domenkozar ];
+ };
+}
diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix
new file mode 100644
index 00000000000..d6cd69f6c8a
--- /dev/null
+++ b/pkgs/development/python-modules/commonmark/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, future }:
+
+buildPythonPackage rec {
+ pname = "CommonMark";
+ version = "0.7.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "4dfbbd1dbc669a9b71a015032b2bbe5c4b019ca8b6ca410d89cf7020de46d2c0";
+ };
+
+ preCheck = ''
+ export LC_ALL="en_US.UTF-8"
+ '';
+
+ # UnicodeEncodeError on Python 2
+ doCheck = isPy3k;
+
+ checkInputs = [ glibcLocales ];
+ propagatedBuildInputs = [ future ];
+
+ meta = with lib; {
+ description = "Python parser for the CommonMark Markdown spec";
+ homepage = https://github.com/rolandshoemaker/CommonMark-py;
+ license = licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix
index 6a9e1240b86..8be1780aa99 100644
--- a/pkgs/development/python-modules/credstash/default.nix
+++ b/pkgs/development/python-modules/credstash/default.nix
@@ -1,15 +1,20 @@
-{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils }:
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils }:
buildPythonPackage rec {
- pname = "credstash";
+ pname = "credstash";
version = "1.14.0";
- name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "718b337f7a6fa001e014386071f05c59900525d0507009126d2fe8d75fe0761d";
};
+ patches = fetchpatch {
+ url = https://github.com/fugue/credstash/pull/178.patch;
+ sha256 = "15ih4h5v63g7qfmqdl4zca147wkcrx8vnsh4ns33001dipcfb5sc";
+ excludes = [ ".travis.yml" ];
+ };
+
propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ];
# No tests in archive
diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix
new file mode 100644
index 00000000000..e63c4107e09
--- /dev/null
+++ b/pkgs/development/python-modules/cx_oracle/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, oracle-instantclient }:
+
+buildPythonPackage rec {
+ pname = "cx_Oracle";
+ version = "6.1";
+
+ buildInputs = [
+ oracle-instantclient
+ ];
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "80545fc7acbdda917dd2b1604c938141256bdfed3ad464a44586c9c2f09c3004";
+ };
+
+ # Check need an Oracle database to run
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Python interface to Oracle";
+ homepage = "https://oracle.github.io/python-cx_Oracle";
+ license = licenses.bsdOriginal;
+ maintainers = with maintainers; [ y0no ];
+ };
+}
diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix
index 9d69c0389b6..32e9a08b741 100644
--- a/pkgs/development/python-modules/flake8-debugger/default.nix
+++ b/pkgs/development/python-modules/flake8-debugger/default.nix
@@ -1,15 +1,24 @@
-{ lib, fetchurl, buildPythonPackage, flake8, nose }:
+{ lib, fetchPypi, buildPythonPackage, flake8, pycodestyle, pytestrunner, pytest }:
buildPythonPackage rec {
pname = "flake8-debugger";
- name = "${pname}-${version}";
version = "3.1.0";
- src = fetchurl {
- url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz";
+
+ src = fetchPypi {
+ inherit pname version;
sha256 = "be4fb88de3ee8f6dd5053a2d347e2c0a2b54bab6733a2280bb20ebd3c4ca1d97";
};
- buildInputs = [ nose ];
- propagatedBuildInputs = [ flake8 ];
+
+ nativeBuildInputs = [ pytestrunner ];
+
+ propagatedBuildInputs = [ flake8 pycodestyle ];
+
+ checkInputs = [ pytest ];
+
+ # Tests not included in PyPI tarball
+ # FIXME: Remove when https://github.com/JBKahn/flake8-debugger/pull/15 is merged
+ doCheck = false;
+
meta = {
homepage = https://github.com/jbkahn/flake8-debugger;
description = "ipdb/pdb statement checker plugin for flake8";
diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix
new file mode 100644
index 00000000000..8bc54e9226c
--- /dev/null
+++ b/pkgs/development/python-modules/hvac/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, requests }:
+
+buildPythonPackage rec {
+ pname = "hvac";
+ version = "0.5.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "2c9308334301daee3b5c6d56a032ca2c81eeb97d2777b73d795e201e8d037687";
+ };
+
+ propagatedBuildInputs = [ requests ];
+
+ # Requires running a Vault server
+ doCheck = false;
+
+ meta = with lib; {
+ description = "HashiCorp Vault API client";
+ homepage = https://github.com/ianunruh/hvac;
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index 5dc33d2d93e..d120c38b02c 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, buildPythonPackage, fetchurl, python, pkgconfig, lxml, libvirt, nose }:
+{ stdenv, buildPythonPackage, fetchgit, python, pkgconfig, lxml, libvirt, nose }:
buildPythonPackage rec {
pname = "libvirt";
- version = "3.10.0";
+ version = "4.1.0";
- src = assert version == libvirt.version; fetchurl {
- url = "http://libvirt.org/sources/python/${pname}-python-${version}.tar.gz";
- sha256 = "1l0fgqjnx76pzkhq540x9sf5fgzlrn0dpay90j2m4iq8nkclcbpw";
+ src = assert version == libvirt.version; fetchgit {
+ url = git://libvirt.org/libvirt-python.git;
+ rev = "v${version}";
+ sha256 = "0z87y6qr0ypdxfanphxl7yanisd7a0b0bwhg97kii68mig5dlw9r";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/pkgs/development/python-modules/moinmoin/default.nix
index cedd45f2f22..6891dd2b627 100644
--- a/pkgs/development/python-modules/moinmoin/default.nix
+++ b/pkgs/development/python-modules/moinmoin/default.nix
@@ -1,13 +1,16 @@
-{ lib, buildPythonPackage, fetchurl, fetchpatch
+{ lib, buildPythonPackage, fetchurl, fetchpatch, isPy3k
, pytest, werkzeug, pygments
}:
buildPythonPackage rec {
- name = "moinmoin-${ver}";
- ver = "1.9.9";
+ name = "moinmoin";
+ version = "1.9.9";
+
+ # SyntaxError in setup.py
+ disabled = isPy3k;
src = fetchurl {
- url = "http://static.moinmo.in/files/moin-${ver}.tar.gz";
+ url = "http://static.moinmo.in/files/moin-${version}.tar.gz";
sha256 = "197ga41qghykmir80ik17f9hjpmixslv3zjgj7bj9qvs1dvdg5s3";
};
diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix
new file mode 100644
index 00000000000..0be0f892d73
--- /dev/null
+++ b/pkgs/development/python-modules/mysqlclient/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, libmysql }:
+
+buildPythonPackage rec {
+ pname = "mysqlclient";
+ version = "1.3.12";
+
+ buildInputs = [
+ libmysql
+ ];
+
+ # Tests need a MySQL database
+ doCheck = false;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "2d9ec33de39f4d9c64ad7322ede0521d85829ce36a76f9dd3d6ab76a9c8648e5";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Python interface to MySQL";
+ homepage = "https://github.com/PyMySQL/mysqlclient-python";
+ license = licenses.gpl1;
+ maintainers = with maintainers; [ y0no ];
+ };
+}
diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/neovim/default.nix
index c4b2a7e9cc8..646a8e7bb11 100644
--- a/pkgs/development/python-modules/neovim/default.nix
+++ b/pkgs/development/python-modules/neovim/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "neovim";
- version = "0.2.3";
+ version = "0.2.4";
src = fetchPypi {
inherit pname version;
- sha256 = "989d720dc7636aa4260aa7774fa79aa524f51515b262eb8d7e9ba4336f758a99";
+ sha256 = "0accfgyvihs08bwapgakx6w93p4vbrq2448n2z6gw88m2hja9jm3";
};
checkInputs = [ nose ];
diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix
index 105607fe375..b9b50d98ebf 100644
--- a/pkgs/development/python-modules/netdisco/default.nix
+++ b/pkgs/development/python-modules/netdisco/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "netdisco";
- version = "1.2.4";
+ version = "1.3.1";
disabled = !isPy3k;
@@ -11,13 +11,7 @@ buildPythonPackage rec {
owner = "home-assistant";
repo = pname;
rev = version;
- sha256 = "170s9py8rw07cfgwvv7mf69g8jjg32m2rgw8x3kbvjqlmrdijxmm";
- };
-
- # Allow newer zeroconf versions
- patches = fetchpatch {
- url = "${meta.homepage}/commit/78f83046a2a0d77527274c8be9c3fd75737c19d0.patch";
- sha256 = "098zkwqg9181vavw97yhi9rsdsf023gnapg4gkr1n0awz3f3l9nm";
+ sha256 = "082ihazpcmf7qh4671kgdr5kzglyj10gp9hyy52snh0c1rz468fd";
};
propagatedBuildInputs = [ requests zeroconf netifaces ];
diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index be5a798b6c6..d4e7de2872d 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, buildPythonPackage
, fetchPypi
, nose
@@ -48,7 +49,11 @@ buildPythonPackage rec {
checkPhase = ''
runHook preCheck
mkdir tmp
- HOME=tmp nosetests -v
+ HOME=tmp nosetests -v ${if (stdenv.isDarwin) then ''
+ --exclude test_delete \
+ --exclude test_checkpoints_follow_file
+ ''
+ else ""}
'';
meta = {
diff --git a/pkgs/development/python-modules/odo/default.nix b/pkgs/development/python-modules/odo/default.nix
index fc3747ac59a..f18420b676b 100644
--- a/pkgs/development/python-modules/odo/default.nix
+++ b/pkgs/development/python-modules/odo/default.nix
@@ -37,5 +37,8 @@ buildPythonPackage rec {
description = "Data migration utilities";
license = lib.licenses.bsdOriginal;
maintainers = with lib.maintainers; [ fridh ];
+ # incomaptible with Networkx 2
+ # see https://github.com/blaze/odo/pull/601
+ broken = true;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/ofxhome/default.nix b/pkgs/development/python-modules/ofxhome/default.nix
new file mode 100644
index 00000000000..3d412e1409c
--- /dev/null
+++ b/pkgs/development/python-modules/ofxhome/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, nose }:
+
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ version = "0.3.3";
+ pname = "ofxhome";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1rpyfqr2q9pnin47rjd4qapl8ngk1m9jx36iqckhdhr8s8gla445";
+ };
+
+ buildInputs = [ nose ];
+
+ # ImportError: No module named tests
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/captin411/ofxhome";
+ description = "ofxhome.com financial institution lookup REST client";
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix
new file mode 100644
index 00000000000..1271a46f047
--- /dev/null
+++ b/pkgs/development/python-modules/opentimestamps/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
+, bitcoinlib, GitPython, pysha3 }:
+
+buildPythonPackage rec {
+ name = "opentimestamps-${version}";
+ version = "0.2.1";
+ disabled = (!isPy3k);
+
+ src = fetchFromGitHub {
+ owner = "opentimestamps";
+ repo = "python-opentimestamps";
+ rev = "python-opentimestamps-v0.2.1";
+ sha256 = "1cilv1ls9mdqk8zriqfkz7xcl8i1ncm0f89n4c8k4s82kf5y56rm";
+ };
+
+ # Remove a failing test which expects the test source file to reside in the
+ # project's Git repo
+ patchPhase = ''
+ rm opentimestamps/tests/core/test_git.py
+ '';
+
+ propagatedBuildInputs = [ bitcoinlib GitPython pysha3 ];
+
+ meta = {
+ description = "Create and verify OpenTimestamps proofs";
+ homepage = https://github.com/opentimestamps/python-opentimestamps;
+ license = lib.licenses.lgpl3;
+ };
+}
diff --git a/pkgs/development/python-modules/patator/default.nix b/pkgs/development/python-modules/patator/default.nix
new file mode 100644
index 00000000000..46601c16755
--- /dev/null
+++ b/pkgs/development/python-modules/patator/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, buildPythonPackage, isPy3k, fetchPypi,
+ paramiko, pycurl, ajpy, pyopenssl, cx_oracle, mysqlclient,
+ psycopg2, pycrypto, dnspython, ipy, pysnmp, pyasn1 }:
+
+
+buildPythonPackage rec {
+ pname = "patator";
+ version = "0.7";
+ disabled = !(isPy3k);
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "335e432e6cc591437e316ba8c1da935484ca39fc79e595ccf60ccd9166e965f1";
+ };
+
+ propagatedBuildInputs = [
+ paramiko
+ pycurl
+ ajpy
+ pyopenssl
+ cx_oracle
+ mysqlclient
+ psycopg2
+ pycrypto
+ dnspython
+ ipy
+ pysnmp
+ pyasn1
+ ];
+
+ # No tests provided by patator
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "multi-purpose brute-forcer";
+ homepage = "https://github.com/lanjelot/patator";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ y0no ];
+ };
+}
diff --git a/pkgs/development/python-modules/paypalrestsdk/default.nix b/pkgs/development/python-modules/paypalrestsdk/default.nix
new file mode 100644
index 00000000000..dbc918e6c0d
--- /dev/null
+++ b/pkgs/development/python-modules/paypalrestsdk/default.nix
@@ -0,0 +1,20 @@
+{ buildPythonPackage, fetchPypi
+, requests, six, pyopenssl }:
+
+buildPythonPackage rec {
+ pname = "paypalrestsdk";
+ version = "1.13.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "238713208031e8981bf70b3350b3d7f85ed64d34e0f21e4c1184444a546fee7f";
+ };
+
+ propagatedBuildInputs = [ requests six pyopenssl ];
+
+ meta = {
+ homepage = https://developer.paypal.com/;
+ description = "Python APIs to create, process and manage payment";
+ license = "PayPal SDK License";
+ };
+}
diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix
new file mode 100644
index 00000000000..74c0f66b91e
--- /dev/null
+++ b/pkgs/development/python-modules/pushbullet/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi
+, requests, websocket_client, python_magic
+, pytest, mock }:
+
+buildPythonPackage rec {
+ pname = "pushbullet.py";
+ version = "0.11.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "aa9dc7bb46e083e3497d46241154f12944a8f540e29d150330ca94db0b453b8d";
+ };
+
+ propagatedBuildInputs = [ requests websocket_client python_magic ];
+
+ checkInputs = [ pytest mock ];
+
+ checkPhase = ''
+ PUSHBULLET_API_KEY="" py.test -k "not test_e2e and not test_auth"
+ '';
+
+ meta = with lib; {
+ description = "A simple python client for pushbullet.com";
+ homepage = https://github.com/randomchars/pushbullet.py;
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix
new file mode 100644
index 00000000000..f5d1a9568c3
--- /dev/null
+++ b/pkgs/development/python-modules/pushover/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, requests }:
+
+buildPythonPackage rec {
+ pname = "python-pushover";
+ version = "0.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0xlghiqd9rsgn7jdhc8v1xh3xspssihrw1vyy85gvjzxa1ah19sk";
+ };
+
+ propagatedBuildInputs = [ requests ];
+
+ # tests require network
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Bindings and command line utility for the Pushover notification service";
+ homepage = https://github.com/Thibauth/python-pushover;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyamf/default.nix b/pkgs/development/python-modules/pyamf/default.nix
index 59acacd5051..5ac6ef82964 100644
--- a/pkgs/development/python-modules/pyamf/default.nix
+++ b/pkgs/development/python-modules/pyamf/default.nix
@@ -1,10 +1,12 @@
-{ stdenv, fetchPypi, buildPythonPackage, defusedxml }:
+{ stdenv, fetchPypi, buildPythonPackage, isPy3k, defusedxml }:
buildPythonPackage rec {
- name = "${pname}-${version}";
pname = "PyAMF";
version = "0.8.0";
+ # according to setup.py
+ disabled = isPy3k;
+
src = fetchPypi {
inherit pname version;
sha256 = "1r3lp9gkph48g9lijby5rs5daa3lhxs204r14zw4kvp3hf4xcm84";
diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix
index e1d9158a4f7..27a9790dce0 100644
--- a/pkgs/development/python-modules/pycurl/default.nix
+++ b/pkgs/development/python-modules/pycurl/default.nix
@@ -24,7 +24,13 @@ buildPythonPackage rec {
checkInputs = [ bottle pytest nose flaky ];
checkPhase = ''
- py.test -k "not test_ssl_in_static_libs and not ssh_key_cb_test" tests
+ py.test -k "not ssh_key_cb_test \
+ and not test_libcurl_ssl_gnutls \
+ and not test_libcurl_ssl_nss \
+ and not test_libcurl_ssl_openssl \
+ and not test_libcurl_ssl_unrecognized \
+ and not test_request_with_verifypeer \
+ and not test_ssl_in_static_libs" tests
'';
preConfigure = ''
diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index 1191b09ec38..be6fb7c8bb6 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -14,6 +14,9 @@ buildPythonPackage rec {
sha256 = "1g181x2mrhxcaswr6vi2m7if97wv4rf2g2pny60334sciga8njfz";
};
+ # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126
+ doCheck = false;
+
meta = with stdenv.lib; {
description = "Python 3 Interface to interact with Homematic devices";
homepage = https://github.com/danielperna84/pyhomematic;
diff --git a/pkgs/development/python-modules/pysha3/default.nix b/pkgs/development/python-modules/pysha3/default.nix
new file mode 100644
index 00000000000..4df98623e11
--- /dev/null
+++ b/pkgs/development/python-modules/pysha3/default.nix
@@ -0,0 +1,19 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder }:
+
+buildPythonPackage rec {
+ pname = "pysha3";
+ version = "1.0.2";
+ name = "${pname}-${version}";
+ disabled = pythonOlder "2.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "17kkjapv6sr906ib0r5wpldmzw7scza08kv241r98vffy9rqx67y";
+ };
+
+ meta = {
+ description = "Backport of hashlib.sha3 for 2.7 to 3.5";
+ homepage = https://github.com/tiran/pysha3;
+ license = lib.licenses.psfl;
+ };
+}
diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index 41b42bb63ec..74ff0be3833 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -2,14 +2,13 @@
buildPythonPackage rec {
pname = "pyslurm";
- version = "20171102";
- name = pname + "-" + version;
+ version = "20170302";
src = fetchFromGitHub {
repo = "pyslurm";
owner = "PySlurm";
- rev = "a2acbc820da419e308c5817998d2abe78a7b75e6";
- sha256 = "1wmlx5fh1xzjyksvmq7i083hmyvs7id61ysk2d9hbmf8rza498as";
+ rev = "f5a756f199da404ec73cb7fcd7f04ec4d21ea3ff";
+ sha256 = "1xn321nc8i8zmngh537j6lnng1rhdp460qx4skvh9daz5h9nxznx";
};
buildInputs = [ cython slurm ];
diff --git a/pkgs/development/python-modules/python-ctags3/default.nix b/pkgs/development/python-modules/python-ctags3/default.nix
new file mode 100644
index 00000000000..ba29154df3a
--- /dev/null
+++ b/pkgs/development/python-modules/python-ctags3/default.nix
@@ -0,0 +1,17 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+ pname = "python-ctags3";
+ version = "1.2.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "62e1d48a8cd88756767f3f5e3f1b1a81bc84deeb736f0c9480a5b5d066f63c3e";
+ };
+
+ meta = with lib; {
+ description = "Ctags indexing python bindings";
+ homepage = https://github.com/jonashaag/python-ctags3;
+ license = licenses.lgpl3Plus;
+ };
+}
diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix
index af0b64fc340..d9982919493 100644
--- a/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/pkgs/development/python-modules/readme_renderer/default.nix
@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, pytest
+, CommonMark
, bleach
, docutils
, pygments
@@ -10,18 +11,17 @@
buildPythonPackage rec {
pname = "readme_renderer";
- version = "17.2";
- name = "${pname}-${version}";
+ version = "17.4";
src = fetchPypi {
inherit pname version;
- sha256 = "9deab442963a63a71ab494bf581b1c844473995a2357f4b3228a1df1c8cba8da";
+ sha256 = "82d68175feec897af2a38fe8590778f14c3be5324cc62e3ce5752a9b1e4b60ab";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [
- bleach docutils pygments six
+ CommonMark bleach docutils pygments six
];
checkPhase = ''
@@ -33,4 +33,4 @@ buildPythonPackage rec {
homepage = https://github.com/pypa/readme_renderer;
license = lib.licenses.asl20;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix
new file mode 100644
index 00000000000..4eb3a33926f
--- /dev/null
+++ b/pkgs/development/python-modules/requests-unixsocket/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi
+, pbr, requests
+, pytest, pytestpep8, waitress }:
+
+buildPythonPackage rec {
+ pname = "requests-unixsocket";
+ version = "0.1.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0k19knydh0fzd7w12lfy18arl1ndwa0zln33vsb37yv1iw9w06x9";
+ };
+
+ nativeBuildInputs = [ pbr ];
+ propagatedBuildInputs = [ requests ];
+
+ checkInputs = [ pytest pytestpep8 waitress ];
+ checkPhase = ''
+ py.test
+ '';
+
+ meta = with lib; {
+ description = "Use requests to talk HTTP via a UNIX domain socket";
+ homepage = https://github.com/msabramo/requests-unixsocket;
+ license = licenses.asl20;
+ maintainers = [ maintainers.catern ];
+ };
+}
diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix
index 72407131cb1..f29cafb7aee 100644
--- a/pkgs/development/python-modules/robomachine/default.nix
+++ b/pkgs/development/python-modules/robomachine/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, fetchurl, buildPythonPackage, pyparsing, argparse, robotframework }:
+{ stdenv, fetchPypi, buildPythonPackage, pyparsing, argparse, robotframework, allpairspy }:
buildPythonPackage rec {
- pname = "robomachine";
+ pname = "RoboMachine";
version = "0.8.0";
- name = pname + "-" + version;
- src = fetchurl {
- url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz";
+ src = fetchPypi {
+ inherit pname version;
sha256 = "242cfd9be0f7591138eaeba03c9c190f894ce045e1767ab7b90eca330259fc45";
};
- propagatedBuildInputs = [ pyparsing argparse robotframework ];
+ propagatedBuildInputs = [ pyparsing argparse robotframework allpairspy ];
# Remove Windows .bat files
postInstall = ''
diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix
index 6d32b056a0a..00bdcae1b9a 100644
--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@@ -21,8 +21,9 @@ buildPythonPackage rec {
LC_ALL="en_US.UTF-8";
# Disable doctests on OSX: https://github.com/scikit-learn/scikit-learn/issues/10213
+ # Disable doctests everywhere: https://github.com/NixOS/nixpkgs/issues/35436
checkPhase = ''
- HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests ${stdenv.lib.optionalString stdenv.isDarwin "--doctest-options=+SKIP"} $out/${python.sitePackages}/sklearn/
+ HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests --doctest-options=+SKIP $out/${python.sitePackages}/sklearn/
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix
new file mode 100644
index 00000000000..04031fcbc10
--- /dev/null
+++ b/pkgs/development/python-modules/svg-path/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+ pname = "svg.path";
+ version = "2.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "08kp03i4yiqdkz7a7l7d7kzszahmhigrml2502zi1ybndrh7ayxw";
+ };
+
+ meta = with stdenv.lib; {
+ description = "SVG path objects and parser";
+ homepage = https://github.com/regebro/svg.path;
+ license = licenses.mit;
+ maintainers = with maintainers; [ goibhniu ];
+ };
+}
diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix
new file mode 100644
index 00000000000..94261b10e3d
--- /dev/null
+++ b/pkgs/development/python-modules/thumbor/default.nix
@@ -0,0 +1,56 @@
+{ buildPythonPackage, stdenv, tornado, pycrypto, pycurl, pytz
+, pillow, derpconf, python_magic, pexif, libthumbor, opencv, webcolors
+, piexif, futures, statsd, thumborPexif, fetchPypi, fetchpatch, isPy3k, lib
+}:
+
+buildPythonPackage rec {
+ pname = "thumbor";
+ version = "6.4.2";
+
+ disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0y9mf78j80vjh4y0xvgnybc1wqfcwm5s19xhsfgkn12hh8pmh14d";
+ };
+
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/thumbor/thumbor/commit/4f2bc99451409e404f7fa0f3e4a3bdaea7b49869.patch";
+ sha256 = "0qqw1n1pfd8f8cn168718gzwf4b35j2j9ajyw643xpf92s0iq2cc";
+ })
+ ];
+
+ postPatch = ''
+ substituteInPlace "setup.py" \
+ --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''}
+ '';
+
+ propagatedBuildInputs = [
+ tornado
+ pycrypto
+ pycurl
+ pytz
+ pillow
+ derpconf
+ python_magic
+ pexif
+ libthumbor
+ opencv
+ webcolors
+ piexif
+ statsd
+ ] ++ lib.optionals (!isPy3k) [ futures thumborPexif ];
+
+ # disabled due to too many impure tests and issues with native modules in
+ # the pure testing environment. See https://github.com/NixOS/nixpkgs/pull/37147
+ # for further reference.
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A smart imaging service";
+ homepage = https://github.com/thumbor/thumbor/wiki;
+ license = licenses.mit;
+ maintainers = with maintainers; [ ma27 ];
+ };
+}
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index b4b2a4210d2..fcf06782e4d 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
});
+ postPatch = ''
+ substituteInPlace Utilities/cmlibarchive/CMakeLists.txt \
+ --replace '"-framework CoreServices"' '""'
+ '';
+
buildInputs = [ curl expat zlib bzip2 ]
++ optional useNcurses ncurses
++ optional useQt4 qt4;
@@ -76,7 +81,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.cmake.org/;
description = "Cross-Platform Makefile Generator";
- platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.linux;
+ platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ ];
};
}
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index 4a37ca011c2..2f4daa2edc8 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "icmake-${version}";
- version = "9.02.06";
+ version = "9.02.07";
src = fetchFromGitHub {
- sha256 = "1hs7fhqpkhlrjvjhfarf5bmxl8dw3r0immzdib27gwh3sfzgpx0b";
+ sha256 = "1q3rwri5s1sqm4h75bahkjnlym4bk2ygg4fb75yrniwnj8rhdp12";
rev = version;
repo = "icmake";
owner = "fbb-git";
diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix
index c888627cfce..3036ef23584 100644
--- a/pkgs/development/tools/build-managers/redo-sh/default.nix
+++ b/pkgs/development/tools/build-managers/redo-sh/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper }:
stdenv.mkDerivation rec {
- version = "1.2.6";
+ version = "2.0.3";
name = "redo-sh-${version}";
src = fetchurl {
url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz";
- sha256 = "1cwrk4v22rb9410rzyb4py4ncg01n6850l80s74bk3sflbw974wp";
+ sha256 = "1ycx3hik7vnlbwxacn1dzr48fwsn2ials0sg6k9l3gcyrha5wf1n";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index a28e4a32168..14c5eab8cd6 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -4,8 +4,8 @@ buildGoPackage rec {
name = "doctl-${version}";
version = "${major}.${minor}.${patch}";
major = "1";
- minor = "5";
- patch = "0";
+ minor = "7";
+ patch = "2";
goPackagePath = "github.com/digitalocean/doctl";
excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)'';
@@ -21,7 +21,7 @@ buildGoPackage rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
- sha256 = "0dk7l4b0ngqkwdlx8qgr99jzipyzazvkv7dybi75dnp725lwxkl2";
+ sha256 = "1nkyl5274mbdf4j60f2sj0kvvppcpccf7xws11c9vj9c3zxs7r97";
};
meta = {
diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix
index b6daade32e7..95c2a6a28a7 100644
--- a/pkgs/development/tools/documentation/mkdocs/default.nix
+++ b/pkgs/development/tools/documentation/mkdocs/default.nix
@@ -4,14 +4,14 @@ with python.pkgs;
buildPythonApplication rec {
pname = "mkdocs";
- version = "0.17.2";
+ version = "0.17.3";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "mkdocs";
repo = "mkdocs";
rev = version;
- sha256 = "0hpjs9qj0nr57a249yv8xvl61d3d2rrdfqxp1fm28z77l2xjj772";
+ sha256 = "15lv60gdc837zja5kn2rfp78kwyb1ckc43jg01zfzqra4qz7b6rw";
};
checkInputs = [
diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
index f11bb83a74a..4ca3bf5e074 100644
--- a/pkgs/development/tools/gnulib/default.nix
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -1,17 +1,16 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation {
- name = "gnulib-0.1-357-gffe6467";
-
- phases = ["unpackPhase" "installPhase"];
+ name = "gnulib-20180226";
src = fetchgit {
url = "http://git.savannah.gnu.org/r/gnulib.git";
- rev = "92b60e61666f008385d9b7f7443da17c7a44d1b1";
- sha256 = "0sa1dndvaxhw0zyc19al5cmpgzlwnnznjz89lw1b4vj3xn7avjnr";
+ rev = "0bec5d56c6938c2f28417bb5fd1c4b05ea2e7d28";
+ sha256 = "0sifr3bkmhyr5s6ljgfyr0fw6w49ajf11rlp1r797f3r3r6j9w4k";
};
installPhase = "mkdir -p $out; mv * $out/";
+ dontFixup = true;
meta = {
homepage = http://www.gnu.org/software/gnulib/;
diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix
index 19441c54017..fd9347a4007 100644
--- a/pkgs/development/tools/guile/guile-lint/default.nix
+++ b/pkgs/development/tools/guile/guile-lint/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
"exec guile" "exec ${guile}/bin/guile"
'';
- doCheck = true;
+ doCheck = !stdenv.isDarwin;
meta = with stdenv.lib; {
description = "Checks syntax and semantics in a Guile program or module";
diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix
index a35af00f449..61f211b9580 100644
--- a/pkgs/development/tools/imatix_gsl/default.nix
+++ b/pkgs/development/tools/imatix_gsl/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
buildInputs = [ pcre ];
+ CCNAME = "cc";
+
postPatch = "sed -e 's,/usr/bin/install,install,g' -i src/Makefile";
preBuild = "cd src";
installFlags = "DESTDIR=$(out)";
diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index bfb37fc5f03..c7cc0543976 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -1,28 +1,20 @@
-{ stdenv, fetchurl, jre }:
+{ stdenv, makeWrapper, fetchurl, jre }:
stdenv.mkDerivation rec {
name = "cfr-${version}";
- version = "0_101";
+ version = "0_125";
src = fetchurl {
- sha256 = "0zwl3whypdm2qrw3hwaqjnifkb4wcdn8fx9scrjkli54bhr6dqch";
url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
+ sha256 = "1ad9ddg79cybv8j8l3mm67znyw54z5i55x4m9n239fn26p1ndawa";
};
- buildInputs = [ jre ];
+ buildInputs = [ makeWrapper ];
- phases = [ "installPhase" ];
-
- installPhase = ''
- jar=$out/share/cfr/cfr_${version}.jar
-
- install -Dm644 ${src} $jar
-
- cat << EOF > cfr
- #!${stdenv.shell}
- exec ${jre}/bin/java -jar $jar "\''${@}"
- EOF
- install -Dm755 cfr $out/bin/cfr
+ buildCommand = ''
+ jar=$out/share/java/cfr_${version}.jar
+ install -Dm444 $src $jar
+ makeWrapper ${jre}/bin/java $out/bin/cfr --add-flags "-jar $jar"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix
index cdfa51d6f2b..a0434f2d0e7 100644
--- a/pkgs/development/tools/misc/opengrok/default.nix
+++ b/pkgs/development/tools/misc/opengrok/default.nix
@@ -2,9 +2,9 @@
stdenv.mkDerivation rec {
name = "opengrok-${version}";
- version = "0.12.5";
+ version = "1.0";
- # 0.12.5 is the latest distributed as a .tar.gz file.
+ # 1.0 is the latest distributed as a .tar.gz file.
# Newer are distribued as .zip so a source build is required.
# if builded from source
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# binary distribution
src = fetchurl {
url = https://github.com/OpenGrok/OpenGrok/files/213268/opengrok-0.12.1.5.tar.gz;
- sha256 = "c3ce079f6ed1526c475cb4b9a7aa901f75507318c93b436d6c14eba4098e4ead";
+ sha256 = "1bafiq4s9sqldinl6fy931rm0x8zj2magfdlbi3nqlnidsghgkn3";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix
index 0ad79005d91..0fa854f9b2a 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/data.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "usb-modeswitch-data-${version}";
- version = "20170205";
+ version = "20170806";
src = fetchurl {
url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
- sha256 = "1l9q4xk02zd0l50bqhyk906wbcs26ji7259q0f7qv3cj52fzvp72";
+ sha256 = "0b1wari3aza6qjggqd0hk2zsh93k1q8scgmwh6f8wr0flpr3whff";
};
inherit (usb-modeswitch) makeFlags;
diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix
deleted file mode 100644
index 5028ac9580c..00000000000
--- a/pkgs/development/tools/node-webkit/nw11.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ stdenv, fetchurl, buildEnv, makeWrapper
-, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig
-, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap
-, libnotify}:
-let
- bits = if stdenv.system == "x86_64-linux" then "x64"
- else "ia32";
-
- nwEnv = buildEnv {
- name = "node-webkit-env";
- paths = [
- xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf
- freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
- xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc
- xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap
- libnotify
- ];
-
- extraOutputsToInstall = [ "lib" "out" ];
- };
-
-in stdenv.mkDerivation rec {
- name = "node-webkit-${version}";
- version = "0.11.2";
-
- src = fetchurl {
- url = "http://dl.node-webkit.org/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz";
- sha256 = if bits == "x64" then
- "1iby0yrnbk9xfcsfz59f6g00l6rxiyxvq78shs0c145ky7lknq5q" else
- "1hk3c9z3kwmqaj87vc5k1a7fv8jhkyqw1wjmsl3q5i50w880h398";
- };
-
- installPhase = ''
- mkdir -p $out/share/node-webkit
- cp -R * $out/share/node-webkit
-
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot
-
- ln -s ${systemd.lib}/lib/libudev.so $out/share/node-webkit/libudev.so.0
-
- patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw
- patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot
-
- mkdir -p $out/bin
- ln -s $out/share/node-webkit/nw $out/bin
- ln -s $out/share/node-webkit/nwsnapshot $out/bin
- '';
-
- buildInputs = [ makeWrapper ];
-
- meta = with stdenv.lib; {
- description = "An app runtime based on Chromium and node.js";
- homepage = https://github.com/rogerwang/node-webkit;
- platforms = ["i686-linux" "x86_64-linux"];
- maintainers = [ maintainers.offline ];
- license = licenses.bsd3;
- };
-}
diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
new file mode 100644
index 00000000000..6a2995b2bbe
--- /dev/null
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -0,0 +1,87 @@
+{ stdenv, fetchurl, buildEnv, makeWrapper
+
+, xorg, alsaLib, dbus, glib, gtk2, gtk3, atk, pango, freetype, fontconfig
+, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap
+, libnotify
+, ffmpeg, libxcb, libXScrnSaver, cups
+, sqlite, udev
+}:
+let
+ bits = if stdenv.system == "x86_64-linux" then "x64"
+ else "ia32";
+
+ nwEnv = buildEnv {
+ name = "nwjs-env";
+ paths = [
+ xorg.libX11 xorg.libXrender glib /*gtk2*/ gtk3 atk pango cairo gdk_pixbuf
+ freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
+ xorg.libXext xorg.libXfixes nss nspr gconf expat dbus
+ xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr
+ xorg.libXScrnSaver cups
+ libcap libnotify
+ # libnw-specific (not chromium dependencies)
+ ffmpeg libxcb
+ # chromium runtime deps (dlopen’d)
+ sqlite udev
+ ];
+
+ extraOutputsToInstall = [ "lib" "out" ];
+ };
+
+in stdenv.mkDerivation rec {
+ name = "nwjs-${version}";
+ version = "0.23.6";
+
+ src = fetchurl {
+ url = "http://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
+ sha256 = if bits == "x64" then
+ "0ppyjspdvacarhdn4xd5i1pqgmf4z1bxnh1cry780489h25rcjgj" else
+ "0c0j73vnzhsry5rdx41d954a29jmjnvzli728cfbjybfr51zdybg";
+ };
+
+ phases = [ "unpackPhase" "installPhase" ];
+
+ # we have runtime deps like sqlite3 that should remain
+ dontPatchELF = true;
+
+ installPhase =
+ let ccPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
+ in ''
+ mkdir -p $out/share/nwjs
+ cp -R * $out/share/nwjs
+ find $out/share/nwjs
+
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw
+
+ ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0
+
+ libpath="$out/share/nwjs/lib/"
+ for f in "$libpath"/*.so; do
+ patchelf --set-rpath "${nwEnv}/lib:${ccPath}:$libpath" "$f"
+ done
+ patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${ccPath}:$libpath" $out/share/nwjs/nw
+ # check, whether all RPATHs are correct (all dependencies found)
+ checkfile=$(mktemp)
+ for f in "$libpath"/*.so "$out/share/nwjs/nw"; do
+ (echo "$f:";
+ ldd "$f" ) > "$checkfile"
+ done
+ if <"$checkfile" grep -e "not found"; then
+ cat "$checkfile"
+ exit 1
+ fi
+
+ mkdir -p $out/bin
+ ln -s $out/share/nwjs/nw $out/bin
+ '';
+
+ buildInputs = [ makeWrapper ];
+
+ meta = with stdenv.lib; {
+ description = "An app runtime based on Chromium and node.js";
+ homepage = http://nwjs.io/;
+ platforms = ["i686-linux" "x86_64-linux"];
+ maintainers = [ maintainers.offline ];
+ license = licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index 3caec9a75c1..fe32f7c2450 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -4,18 +4,18 @@ with lib;
stdenv.mkDerivation rec {
name = "sauce-connect-${version}";
- version = "4.4.8";
+ version = "4.4.12";
src = fetchurl (
if stdenv.system == "x86_64-linux" then {
url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz";
- sha256 = "1y6jmz0kdaz1fq9sirwxznzw52if6ypd0dp9mk7dkpipy0bx7pz6";
+ sha256 = "1yqvx64bgiq27hdhwkzgmzyib8pbjn1idpq6783srxq64asf6iyw";
} else if stdenv.system == "i686-linux" then {
url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz";
- sha256 = "13nd2g1z4nvc3fa30xr3jnkqcy3fv4751s7ws4l93p7x6nc4aw1n";
+ sha256 = "02kib56lv4lhwkj5r15484lvvbyjvf9ydi5vccsmxgsxrzmddnl6";
} else {
url = "https://saucelabs.com/downloads/sc-${version}-osx.zip";
- sha256 = "0f8kcx7qd6bqbd74y6n83lb52zban9k631qkv1vyddvs9pjsxmpg";
+ sha256 = "1gqsbw9f6nachk3c86knbqq417smqyf19mi63fmrfxrbxzy2fkv2";
}
);
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index d5671b974f5..39f26ed97cc 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -11,7 +11,7 @@ let
"x86_64-darwin" = {
system = "mac64";
- sha256 = "11xa31bxhrq0p7kd3j76dihp73abdbmbwdng5454m1wir6yj25f1";
+ sha256 = "11hs4mmlvxjaanq41h0dljj4sff0lfwk31svvdmzfg91idlikpsz";
};
};
diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix
index 3da932b6b17..b0dc2ba041a 100644
--- a/pkgs/development/web/kore/default.nix
+++ b/pkgs/development/web/kore/default.nix
@@ -20,8 +20,9 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
- # added to fix build w/gcc7
- NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isLinux [ "-Wno-error=pointer-compare" ];
+ # added to fix build w/gcc7 and clang5
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare"
+ + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option";
enableParallelBuilding = true;
diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 459c75ac290..62ab349afa8 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "gzdoom-${version}";
- version = "3.1.0";
+ version = "3.2.5";
src = fetchFromGitHub {
owner = "coelckers";
repo = "gzdoom";
rev = "g${version}";
- sha256 = "02287xvlk4a07ssm9y9h5vfsvdssshz13n5bbz13pfcani5d9flv";
+ sha256 = "1x4v3cv448wqx4cdhs28nxrv0lm2c2pd9i2hm92q9lg5yw8vv19q";
};
nativeBuildInputs = [ cmake makeWrapper ];
diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix
index d563a8265b5..7e31202754a 100644
--- a/pkgs/games/rocksndiamonds/default.nix
+++ b/pkgs/games/rocksndiamonds/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "${project}-${version}";
project = "rocksndiamonds";
- version = "4.0.1.1";
+ version = "4.0.1.3";
src = fetchurl {
url = "https://www.artsoft.org/RELEASES/unix/${project}/${name}.tar.gz";
- sha256 = "0f2m29m53sngg2kv4km91nxbr53rzhchbpqx5dzrv3p5hq1hp936";
+ sha256 = "0y8w96hav7k5qwpm6rvzn3g4czfpsc58dix3x98anqii9l6vwrdd";
};
desktopItem = makeDesktopItem {
diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix
index 8961dfdce3c..84984fcbb58 100644
--- a/pkgs/games/vassal/default.nix
+++ b/pkgs/games/vassal/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
- name = "VASSAL-3.2.15";
+ name = "VASSAL-3.2.17";
src = fetchurl {
url = "mirror://sourceforge/vassalengine/${name}-linux.tar.bz2";
- sha256 = "10ng571nxr5zc2nlviyrk5bci8my67kq3qvhfn9bifzkxmjlqmk9";
+ sha256 = "0nxskr46janxnb31c03zv61kr46vy98l7cwxha3vll81l4ij1sjb";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix
index 94fd23cd8cb..222275a2ba1 100644
--- a/pkgs/games/widelands/default.nix
+++ b/pkgs/games/widelands/default.nix
@@ -26,9 +26,8 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
- url = "https://launchpad.net/widelands/build${version}/build${version}/+download/"
- + "widelands-build${version}-src.tar.bz2";
- sha256 = "19h1gina7k1ai2mn2fd75lxm8iz8wrs6dz6dchdvg8i8d39gj4g5";
+ url = "http://launchpad.net/widelands/build${version}/build${version}/+download/widelands-build${version}-src-gcc7.tar.bz2";
+ sha256 = "0n2lb1c2dix32j90nir96zfqivn63izr1pmabjnhns3wbb7vhwzg";
};
preConfigure = ''
@@ -47,12 +46,12 @@ stdenv.mkDerivation rec {
];
prePatch = ''
- substituteInPlace ./debian/widelands.desktop --replace "/usr/share/games/widelands/data/" "$out/share/widelands/"
+ substituteInPlace ./debian/org.widelands.widelands.desktop --replace "/usr/share/games/widelands/data/" "$out/share/widelands/"
'';
postInstall = ''
mkdir -p "$out/share/applications/"
- cp -v "../debian/widelands.desktop" "$out/share/applications/"
+ cp -v "../debian/org.widelands.widelands.desktop" "$out/share/applications/"
'';
enableParallelBuilding = true;
diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
new file mode 100644
index 00000000000..b4fa3662675
--- /dev/null
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -0,0 +1,84 @@
+{ stdenv, fetchFromGitHub, buildPackages }:
+
+let
+ buildArmTrustedFirmware = { filesToInstall
+ , installDir ? "$out"
+ , platform
+ , extraMakeFlags ? []
+ , extraMeta ? {}
+ , ... } @ args:
+ stdenv.mkDerivation (rec {
+
+ name = "arm-trusted-firmware-${platform}-${version}";
+ version = "1.4";
+
+ src = fetchFromGitHub {
+ owner = "ARM-software";
+ repo = "arm-trusted-firmware";
+ rev = "b762fc7481c66b64eb98b6ff694d569e66253973";
+ sha256 = "15m10dfgqkgw6rmzgfg1xzp1si9d5jwzyrcb7cp3y9ckj6mvp3i3";
+ };
+
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+ makeFlags = [
+ "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+ "PLAT=${platform}"
+ ] ++ extraMakeFlags;
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p ${installDir}
+ cp ${stdenv.lib.concatStringsSep " " filesToInstall} ${installDir}
+
+ runHook postInstall
+ '';
+
+ hardeningDisable = [ "all" ];
+ dontStrip = true;
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/ARM-software/arm-trusted-firmware;
+ description = "A reference implementation of secure world software for ARMv8-A";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.lopsided98 ];
+ } // extraMeta;
+ } // builtins.removeAttrs args [ "extraMeta" ]);
+
+in rec {
+ inherit buildArmTrustedFirmware;
+
+ armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec {
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "apritzel";
+ repo = "arm-trusted-firmware";
+ # Branch: `allwinner`
+ rev = "91f2402d941036a0db092d5375d0535c270b9121";
+ sha256 = "0lbipkxb01w97r6ah8wdbwxir3013rp249fcqhlzh2gjwhp5l1ys";
+ };
+ platform = "sun50iw1p1";
+ extraMeta.platforms = ["aarch64-linux"];
+ filesToInstall = ["build/${platform}/release/bl31.bin"];
+ };
+
+ armTrustedFirmwareQemu = buildArmTrustedFirmware rec {
+ platform = "qemu";
+ extraMeta.platforms = ["aarch64-linux"];
+ filesToInstall = [
+ "build/${platform}/release/bl1.bin"
+ "build/${platform}/release/bl2.bin"
+ "build/${platform}/release/bl31.bin"
+ ];
+ };
+
+ armTrustedFirmwareRK3328 = buildArmTrustedFirmware rec {
+ extraMakeFlags = [ "bl31" ];
+ platform = "rk3328";
+ extraMeta.platforms = ["aarch64-linux"];
+ filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"];
+ };
+}
diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix
new file mode 100644
index 00000000000..36c8825d27a
--- /dev/null
+++ b/pkgs/misc/calaos/installer/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, qmake, qttools, qtbase }:
+
+stdenv.mkDerivation rec {
+ name = "calaos_installer-3.1";
+ version = "3.1";
+
+ src = fetchFromGitHub {
+ owner = "calaos";
+ repo = "calaos_installer";
+ rev = "v${version}";
+ sha256 = "0g8igj5sax5vjqzrpbil7i6329708lqqwvg5mwiqd0zzzha9sawd";
+ };
+
+ nativeBuildInputs = [ qmake qttools ];
+ buildInputs = [ qtbase ];
+
+ qmakeFlags = [ "REVISION=${version}" ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp -a calaos_installer $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Calaos Installer, a tool to create calaos configuration";
+ homepage = https://www.calaos.fr/;
+ license = licenses.gpl3Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ tiramiseb ];
+ };
+}
diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/misc/emulators/wine/builder-wow.sh
index cf6cc59a6da..1aad9fe20c7 100644
--- a/pkgs/misc/emulators/wine/builder-wow.sh
+++ b/pkgs/misc/emulators/wine/builder-wow.sh
@@ -26,7 +26,7 @@ buildPhase
# checkPhase
eval "$preInstall"
-cd $TMP/wine64 && make install
cd $TMP/wine-wow && make install
+cd $TMP/wine64 && make install
eval "$postInstall"
fixupPhase
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 1bfcea1057e..807bc48a642 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,30 +1,34 @@
-{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2
-, hostPlatform
+{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2, swig
+, armTrustedFirmwareAllwinner
+, hostPlatform, buildPackages
}:
let
- buildUBoot = { targetPlatforms
- , filesToInstall
+ # Various changes for 64-bit sunxi boards, (hopefully) destined for 2018.05
+ sunxiPatch = fetchpatch {
+ name = "sunxi.patch";
+ url = "https://github.com/u-boot/u-boot/compare/v2018.03...dezgeg:2018-03-sunxi.patch";
+ sha256 = "1pqn7c6c06hfygwpcgaraqvqxcjhz99j0rx5psfhj8igy0qvk2dq";
+ };
+
+ buildUBoot = { filesToInstall
, installDir ? "$out"
, defconfig
+ , extraPatches ? []
, extraMakeFlags ? []
, extraMeta ? {}
, ... } @ args:
stdenv.mkDerivation (rec {
name = "uboot-${defconfig}-${version}";
- version = "2017.11";
+ version = "2018.03";
src = fetchurl {
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
- sha256 = "01bcsah5imy6m3fbjwhqywxg0pfk5fl8ks9ylb7kv3zmrb9qy0ba";
+ sha256 = "1z9x635l5164c5hnf7qs19w7j3qghbkgs7rpn673dm898i9pfx3y";
};
patches = [
- (fetchpatch {
- url = https://github.com/dezgeg/u-boot/commit/cbsize-2017-11.patch;
- sha256 = "08rqsrj78aif8vaxlpwiwwv1jwf0diihbj0h88hc0mlp0kmyqxwm";
- })
(fetchpatch {
url = https://github.com/dezgeg/u-boot/commit/rpi-2017-11-patch1.patch;
sha256 = "067yq55vv1slv4xy346px7h329pi14abdn04chg6s1s6hmf6c1x9";
@@ -34,23 +38,35 @@ let
sha256 = "0bbw0q027xvzvdxxvpzjajg4rm30a8mb7z74b6ma9q0l7y7bi0c4";
})
(fetchpatch {
- url = https://github.com/dezgeg/u-boot/commit/pythonpath-2017-11.patch;
- sha256 = "162b2lglp307pzxsf9m7nnmzwxqd7xkwp5j85bm6bg1a38ngpl9v";
+ url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-03.patch;
+ sha256 = "1rhhlhrwhv7ic1n5i720jfh2cxwrkssrkvinllyjy3j9k9bpzcqd";
})
- ];
+ (fetchpatch {
+ url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch;
+ sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8";
+ })
+ ] ++ extraPatches;
postPatch = ''
patchShebangs tools
'';
- nativeBuildInputs = [ bc dtc openssl python2 ];
+ nativeBuildInputs = [ bc dtc openssl python2 swig ];
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
hardeningDisable = [ "all" ];
- makeFlags = [ "DTC=dtc" ] ++ extraMakeFlags;
+ makeFlags = [
+ "DTC=dtc"
+ "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+ ] ++ extraMakeFlags;
configurePhase = ''
+ runHook preConfigure
+
make ${defconfig}
+
+ runHook postConfigure
'';
installPhase = ''
@@ -65,21 +81,13 @@ let
enableParallelBuilding = true;
dontStrip = true;
- crossAttrs = {
- makeFlags = [
- "ARCH=${hostPlatform.platform.kernelArch}"
- "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
- ];
- };
-
meta = with stdenv.lib; {
homepage = http://www.denx.de/wiki/U-Boot/;
description = "Boot loader for embedded systems";
license = licenses.gpl2;
maintainers = [ maintainers.dezgeg ];
- platforms = targetPlatforms;
} // extraMeta;
- } // args);
+ } // removeAttrs args [ "extraMeta" ]);
in rec {
inherit buildUBoot;
@@ -87,11 +95,14 @@ in rec {
ubootTools = buildUBoot rec {
defconfig = "allnoconfig";
installDir = "$out/bin";
- buildFlags = "tools NO_SDL=1";
+ hardeningDisable = [];
dontStrip = false;
- targetPlatforms = stdenv.lib.platforms.linux;
+ extraMeta.platforms = stdenv.lib.platforms.linux;
# build tools/kwboot
- extraMakeFlags = [ "CONFIG_KIRKWOOD=y" ];
+ extraMakeFlags = [ "CONFIG_KIRKWOOD=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ];
+ postConfigure = ''
+ sed -i '/CONFIG_SYS_TEXT_BASE/c\CONFIG_SYS_TEXT_BASE=0x00000000' .config
+ '';
filesToInstall = [
"tools/dumpimage"
"tools/fdtgrep"
@@ -103,86 +114,125 @@ in rec {
ubootA20OlinuxinoLime = buildUBoot rec {
defconfig = "A20-OLinuXino-Lime_defconfig";
- targetPlatforms = ["armv7l-linux"];
+ extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
ubootBananaPi = buildUBoot rec {
defconfig = "Bananapi_defconfig";
- targetPlatforms = ["armv7l-linux"];
+ extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
ubootBeagleboneBlack = buildUBoot rec {
defconfig = "am335x_boneblack_defconfig";
- targetPlatforms = ["armv7l-linux"];
+ extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["MLO" "u-boot.img"];
};
# http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master
ubootClearfog = buildUBoot rec {
defconfig = "clearfog_defconfig";
- targetPlatforms = ["armv7l-linux"];
+ extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-spl.kwb"];
};
+ ubootGuruplug = buildUBoot rec {
+ defconfig = "guruplug_defconfig";
+ extraMeta.platforms = ["armv5tel-linux"];
+ filesToInstall = ["u-boot.bin"];
+ };
+
ubootJetsonTK1 = buildUBoot rec {
defconfig = "jetson-tk1_defconfig";
- targetPlatforms = ["armv7l-linux"];
+ extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
+ # tegra-uboot-flasher expects this exact directory layout, sigh...
+ postInstall = ''
+ mkdir -p $out/spl
+ cp spl/u-boot-spl $out/spl/
+ '';
};
ubootOdroidXU3 = buildUBoot rec {
defconfig = "odroid-xu3_defconfig";
- targetPlatforms = ["armv7l-linux"];
+ extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-dtb.bin"];
};
ubootOrangePiPc = buildUBoot rec {
defconfig = "orangepi_pc_defconfig";
- targetPlatforms = ["armv7l-linux"];
+ extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
ubootPcduino3Nano = buildUBoot rec {
defconfig = "Linksprite_pcDuino3_Nano_defconfig";
- targetPlatforms = ["armv7l-linux"];
+ extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
+ ubootPine64 = buildUBoot rec {
+ extraPatches = [sunxiPatch];
+ defconfig = "pine64_plus_defconfig";
+ extraMeta.platforms = ["aarch64-linux"];
+ BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+ filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+ };
+
+ ubootQemuAarch64 = buildUBoot rec {
+ defconfig = "qemu_arm64_defconfig";
+ extraMeta.platforms = ["aarch64-linux"];
+ filesToInstall = ["u-boot.bin"];
+ };
+
ubootQemuArm = buildUBoot rec {
defconfig = "qemu_arm_defconfig";
- targetPlatforms = ["armv7l-linux"];
+ extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.bin"];
};
ubootRaspberryPi = buildUBoot rec {
defconfig = "rpi_defconfig";
- targetPlatforms = ["armv6l-linux"];
+ extraMeta.platforms = ["armv6l-linux"];
filesToInstall = ["u-boot.bin"];
};
ubootRaspberryPi2 = buildUBoot rec {
defconfig = "rpi_2_defconfig";
- targetPlatforms = ["armv7l-linux"];
+ extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.bin"];
};
ubootRaspberryPi3_32bit = buildUBoot rec {
defconfig = "rpi_3_32b_defconfig";
- targetPlatforms = ["armv7l-linux"];
+ extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.bin"];
};
ubootRaspberryPi3_64bit = buildUBoot rec {
defconfig = "rpi_3_defconfig";
- targetPlatforms = ["aarch64-linux"];
+ extraMeta.platforms = ["aarch64-linux"];
filesToInstall = ["u-boot.bin"];
};
+ ubootSheevaplug = buildUBoot rec {
+ defconfig = "sheevaplug_defconfig";
+ extraMeta.platforms = ["armv5tel-linux"];
+ filesToInstall = ["u-boot.bin"];
+ };
+
+ ubootSopine = buildUBoot rec {
+ extraPatches = [sunxiPatch];
+ defconfig = "sopine_baseboard_defconfig";
+ extraMeta.platforms = ["aarch64-linux"];
+ BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+ filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+ };
+
ubootUtilite = buildUBoot rec {
defconfig = "cm_fx6_defconfig";
- targetPlatforms = ["armv7l-linux"];
+ extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot-with-nand-spl.imx"];
buildFlags = "u-boot-with-nand-spl.imx";
postConfigure = ''
@@ -196,7 +246,7 @@ in rec {
ubootWandboard = buildUBoot rec {
defconfig = "wandboard_defconfig";
- targetPlatforms = ["armv7l-linux"];
+ extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.img" "SPL"];
};
}
diff --git a/pkgs/misc/uboot/gas220.patch b/pkgs/misc/uboot/gas220.patch
deleted file mode 100644
index c5a91b0f3d0..00000000000
--- a/pkgs/misc/uboot/gas220.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch to allow assembling with binutils 2.20. It worked without this patch in 2.19.1
-diff --git a/board/mv_feroceon/USP/jump.S b/board/mv_feroceon/USP/jump.S
-index 4b6b9ee..58037fc 100644
---- a/board/mv_feroceon/USP/jump.S
-+++ b/board/mv_feroceon/USP/jump.S
-@@ -29,9 +29,11 @@ disclaimer.
- #include "sys/mvCpuIfRegs.h"
-
-
--jumpStart:
-
- .section ".reset_vector_sect",#alloc, #execinstr
-+
-+jumpStart:
-+
- #if defined(MV_88F6082) || defined(MV_88F6183) || defined(DB_88F5181_OLD) || defined(DB_FPGA) || \
- defined(MV88F6281) || defined(MV88F6192) || defined(MV88F6180) || defined(MV_88F6183L) || \
- defined(MV88F6190)
diff --git a/pkgs/misc/uboot/guruplug-file-systems.patch b/pkgs/misc/uboot/guruplug-file-systems.patch
deleted file mode 100644
index 30dc1994303..00000000000
--- a/pkgs/misc/uboot/guruplug-file-systems.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Add support for the various file systems as found in `sheevaplug.h'.
-As for the SheevaPlug, the increase in size means that the environment
-must be pushed further away.
-
-In addition, increase the malloc area size to allow compilation of UbiFS.
-
---- u-boot/include/configs/guruplug.h 1970-01-01 01:00:01.000000000 +0100
-+++ u-boot/include/configs/guruplug.h 2010-09-29 18:59:52.000000000 +0200
-@@ -123,8 +123,8 @@
- * it has to be rounded to sector size
- */
- #define CONFIG_ENV_SIZE 0x20000 /* 128k */
--#define CONFIG_ENV_ADDR 0x40000
--#define CONFIG_ENV_OFFSET 0x40000 /* env starts here */
-+#define CONFIG_ENV_ADDR 0x60000
-+#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */
-
- /*
- * Default environment variables
-@@ -145,7 +145,7 @@
- /*
- * Size of malloc() pool
- */
--#define CONFIG_SYS_MALLOC_LEN (1024 * 128) /* 128kB for malloc() */
-+#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* 1 MiB for malloc() */
- /* size in bytes reserved for initial data */
- #define CONFIG_SYS_GBL_DATA_SIZE 128
-
-@@ -195,4 +195,18 @@
-
- #define CONFIG_SYS_ALT_MEMTEST
-
-+/*
-+ * File system
-+ */
-+#define CONFIG_CMD_EXT2
-+#define CONFIG_CMD_FAT
-+#define CONFIG_CMD_JFFS2
-+#define CONFIG_CMD_UBI
-+#define CONFIG_CMD_UBIFS
-+#define CONFIG_RBTREE
-+#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-+#define CONFIG_MTD_PARTITIONS
-+#define CONFIG_CMD_MTDPARTS
-+#define CONFIG_LZO
-+
- #endif /* _CONFIG_GURUPLUG_H */
-
diff --git a/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch b/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
deleted file mode 100644
index 4f32dd89031..00000000000
--- a/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-The GuruPlug's microSD card reader is a USB mass storage device that
-has two logical units (LUNs), i.e., two "SCSI disks". This patch
-adds multi-LUN support to the USB MSD driver.
-
-See the thread at .
-
---- u-boot/common/usb_storage.c 1970-01-01 01:00:01.000000000 +0100
-+++ u-boot/common/usb_storage.c 2010-10-02 00:38:15.000000000 +0200
-@@ -204,6 +204,22 @@ int usb_stor_info(void)
- return 1;
- }
-
-+static unsigned int usb_get_max_lun(struct us_data *us)
-+{
-+ int len;
-+ unsigned char result;
-+ len = usb_control_msg(us->pusb_dev,
-+ usb_rcvctrlpipe(us->pusb_dev, 0),
-+ US_BBB_GET_MAX_LUN,
-+ USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
-+ 0, us->ifnum,
-+ &result, sizeof(result),
-+ USB_CNTL_TIMEOUT * 5);
-+ USB_STOR_PRINTF("Get Max LUN -> len = %i, result = %i\n",
-+ len, (int) result);
-+ return (len > 0) ? result : 0;
-+}
-+
- /*******************************************************************************
- * scan the usb and reports device info
- * to the user if mode = 1
-@@ -241,13 +257,21 @@ int usb_stor_scan(int mode)
- break; /* no more devices avaiable */
-
- if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) {
-- /* ok, it is a storage devices
-- * get info and fill it in
-- */
-- if (usb_stor_get_info(dev, &usb_stor[usb_max_devs],
-- &usb_dev_desc[usb_max_devs]) == 1)
-+ /* OK, it's a storage device. Iterate over its LUNs
-+ * and populate `usb_dev_desc'. */
-+ int lun, max_lun, start = usb_max_devs;
-+
-+ max_lun = usb_get_max_lun(&usb_stor[usb_max_devs]);
-+ for (lun = 0;
-+ lun <= max_lun && usb_max_devs < USB_MAX_STOR_DEV;
-+ lun++) {
-+ usb_dev_desc[usb_max_devs].lun = lun;
-+ if (usb_stor_get_info(dev, &usb_stor[start],
-+ &usb_dev_desc[usb_max_devs]) == 1) {
- usb_max_devs++;
- }
-+ }
-+ }
- /* if storage device */
- if (usb_max_devs == USB_MAX_STOR_DEV) {
- printf("max USB Storage Device reached: %d stopping\n",
-@@ -882,6 +906,7 @@ static int usb_inquiry(ccb *srb, struct
- do {
- memset(&srb->cmd[0], 0, 12);
- srb->cmd[0] = SCSI_INQUIRY;
-+ srb->cmd[1] = srb->lun << 5;
- srb->cmd[4] = 36;
- srb->datalen = 36;
- srb->cmdlen = 12;
-@@ -905,6 +930,7 @@ static int usb_request_sense(ccb *srb, s
- ptr = (char *)srb->pdata;
- memset(&srb->cmd[0], 0, 12);
- srb->cmd[0] = SCSI_REQ_SENSE;
-+ srb->cmd[1] = srb->lun << 5;
- srb->cmd[4] = 18;
- srb->datalen = 18;
- srb->pdata = &srb->sense_buf[0];
-@@ -924,6 +950,7 @@ static int usb_test_unit_ready(ccb *srb,
- do {
- memset(&srb->cmd[0], 0, 12);
- srb->cmd[0] = SCSI_TST_U_RDY;
-+ srb->cmd[1] = srb->lun << 5;
- srb->datalen = 0;
- srb->cmdlen = 12;
- if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
-@@ -943,6 +970,7 @@ static int usb_read_capacity(ccb *srb, s
- do {
- memset(&srb->cmd[0], 0, 12);
- srb->cmd[0] = SCSI_RD_CAPAC;
-+ srb->cmd[1] = srb->lun << 5;
- srb->datalen = 8;
- srb->cmdlen = 12;
- if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
-@@ -957,6 +985,7 @@ static int usb_read_10(ccb *srb, struct
- {
- memset(&srb->cmd[0], 0, 12);
- srb->cmd[0] = SCSI_READ10;
-+ srb->cmd[1] = srb->lun << 5;
- srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
- srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
- srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
-@@ -973,6 +1002,7 @@ static int usb_write_10(ccb *srb, struct
- {
- memset(&srb->cmd[0], 0, 12);
- srb->cmd[0] = SCSI_WRITE10;
-+ srb->cmd[1] = srb->lun << 5;
- srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
- srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
- srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix
deleted file mode 100644
index 9f24f1da86a..00000000000
--- a/pkgs/misc/uboot/guruplug.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{stdenv, fetchgit, unzip}:
-
-# Marvell's branch of U-Boot for the GuruPlug.
-
-let
- # Aug 2010 revision of the `testing' branch of Marvell's U-Boot repository.
- # See
- #
- # for details.
- rev = "f106056095049c2c748c2a2797e5353295240e04";
-in
-stdenv.mkDerivation {
- name = "uboot-guruplug-0.0-pre-${stdenv.lib.strings.substring 0 7 rev}";
-
- src = fetchgit {
- url = "git://git.denx.de/u-boot-marvell.git";
- sha256 = "18gwyj16vml7aja9cyan51jwfcysy4cs062z7wmgdc0l9bha6iw7";
- inherit rev;
- };
-
- patches =
- [ ./guruplug-file-systems.patch ./guruplug-usb-msd-multi-lun.patch ];
-
- enableParallelBuilding = true;
-
- # Remove the cross compiler prefix.
- configurePhase = ''
- make mrproper
- make guruplug_config
- sed -i /CROSS_COMPILE/d include/config.mk
- '';
-
- buildPhase = ''
- unset src
- if test -z "$crossConfig"; then
- make all u-boot.kwb
- else
- make all u-boot.kwb ARCH=arm CROSS_COMPILE=$crossConfig-
- fi
- '';
-
- nativeBuildInputs = [ unzip ];
-
- dontStrip = true;
-
- installPhase = ''
- mkdir -p $out
- cp -v u-boot u-boot.{kwb,map} $out
-
- mkdir -p $out/bin
- cp tools/{envcrc,mkimage} $out/bin
- '';
-
- meta = {
- platforms = [ "armv5tel-linux" ];
- };
-}
diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix
new file mode 100644
index 00000000000..623c6015534
--- /dev/null
+++ b/pkgs/misc/uboot/rock64.nix
@@ -0,0 +1,37 @@
+{ lib, buildUBoot, fetchFromGitHub, armTrustedFirmwareRK3328 }: let
+ rkbin = fetchFromGitHub {
+ owner = "ayufan-rock64";
+ repo = "rkbin";
+ rev = "d8b90685b3d93c358936babdd854f1018bc6d35e";
+ sha256 = "0wrh3xa968sdp0j9n692jnv3071ymab719zc56vllba0aaabiaxr";
+ };
+in buildUBoot rec {
+ name = "uboot-${defconfig}-${version}";
+ version = "2018.01";
+
+ src = fetchFromGitHub {
+ owner = "ayufan-rock64";
+ repo = "linux-u-boot";
+ rev = "19e31fac0dee3c4f6b2ea4371e4321f79db0f495";
+ sha256 = "1vmv7q9yafsc0zivd0qdfmf930dvhzkf4a3j6apxxgx9g10wgwrg";
+ };
+
+ extraMakeFlags = [ "BL31=${armTrustedFirmwareRK3328}/bl31.elf" "u-boot.itb" "all" ];
+
+ # So close to being blob free... But U-Boot TPL causes the kernel to hang
+ postBuild = ''
+ ./tools/mkimage -n rk3328 -T rksd -d ${rkbin}/rk33/rk3328_ddr_786MHz_v1.06.bin idbloader.img
+ cat spl/u-boot-spl.bin >> idbloader.img
+ dd if=u-boot.itb of=idbloader.img seek=448 conv=notrunc
+ '';
+
+ defconfig = "rock64-rk3328_defconfig";
+ filesToInstall = [ "spl/u-boot-spl.bin" "tpl/u-boot-tpl.bin" "u-boot.itb" "idbloader.img"];
+
+ extraMeta = with lib; {
+ maintainers = [ maintainers.lopsided98 ];
+ platforms = ["aarch64-linux"];
+ # Because of the TPL blob
+ license = licenses.unfreeRedistributableFirmware;
+ };
+}
diff --git a/pkgs/misc/uboot/sheevaplug.nix b/pkgs/misc/uboot/sheevaplug.nix
deleted file mode 100644
index 53d811d1a44..00000000000
--- a/pkgs/misc/uboot/sheevaplug.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{stdenv, fetchurl, unzip}:
-
-# We should enable this check once we have the cross target system information
-# assert stdenv.system == "armv5tel-linux" || crossConfig == "armv5tel-linux";
-
-# All this file is made for the Marvell Sheevaplug
-
-stdenv.mkDerivation {
- name = "uboot-sheevaplug-3.4.27";
-
- src = fetchurl {
- url = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.4.tar.bz2";
- sha256 = "19vp4rlikz7h72pqsjhgz7nmgjy4c6vabvxkw67wni70vy5ddy8s";
- };
-
- srcAddon = fetchurl {
- url = "http://www.plugcomputer.org/405/us/plug-basic/uboot/u-boot-3.4.27.zip";
- sha256 = "1wqxznpdb6d2kx58gral4q0mg5ddxyrv7az8c6v29nr3cd9yrfsg";
- };
-
- postUnpack = ''
- mv u-boot-1.1.4 u-boot-3.4.27
- unzip -o $srcAddon
- sourceRoot=u-boot-3.4.27
- '';
-
- patches = [ ./gas220.patch ];
-
- # Remove the cross compiler prefix, and add reiserfs support
- configurePhase = ''
- make mrproper
- make rd88f6281Sheevaplug_config NBOOT=1 LE=1
- sed -i /CROSS_COMPILE/d include/config.mk
- '';
-
- buildPhase = ''
- unset src
- if test -z "$crossConfig"; then
- make clean all
- else
- make clean all ARCH=arm CROSS_COMPILE=$crossConfig-
- fi
- '';
-
- nativeBuildInputs = [ unzip ];
-
- dontStrip = true;
-
- installPhase = ''
- mkdir -p $out
- cp u-boot-rd88f6281Sheevaplug_400db_nand.bin $out
- cp u-boot u-boot.map $out
-
- mkdir -p $out/bin
- cp tools/{envcrc,mkimage} $out/bin
- '';
-
- meta = {
- platforms = [ "armv5tel-linux" ];
- };
-}
diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix
index 0272eccd800..a3c09c3de99 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/default.nix
+++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix
@@ -30,9 +30,9 @@ let
in stdenv.mkDerivation rec {
- version = "17.10";
+ version = "17.40";
pname = "amdgpu-pro";
- build = "${version}-401251";
+ build = "${version}-492261";
libCompatDir = "/run/lib/${libArch}";
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url =
"https://www2.ati.com/drivers/linux/ubuntu/amdgpu-pro-${build}.tar.xz";
- sha256 = "004n0df8acjpjz72z3bjxb2a0b7qwln13jlknfn7xxqvhhwwy40a";
+ sha256 = "1c073lp9cq1rc2mddky2r0j2dv9dd167qj02visz37vwaxbm2r5h";
curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMD-Radeon-GPU-PRO-Linux-Beta-Driver%e2%80%93Release-Notes.aspx";
};
@@ -57,15 +57,14 @@ in stdenv.mkDerivation rec {
sourceRoot=.
'';
- modulePatches = [
- ./patches/0001-disable-firmware-copy.patch
- ./patches/0002-linux-4.9-fixes.patch
- ./patches/0003-Change-seq_printf-format-for-64-bit-context.patch
- ./patches/0004-fix-warnings-for-Werror.patch
- ];
+ modulePatches = optionals (!libsOnly) ([
+ ./patches/0001-fix-warnings-for-Werror.patch
+ ./patches/0002-fix-sketchy-int-ptr-warning.patch
+ ./patches/0003-disable-firmware-copy.patch
+ ]);
patchPhase = optionalString (!libsOnly) ''
- pushd usr/src/amdgpu-pro-${build}
+ pushd usr/src/amdgpu-${build}
for patch in $modulePatches
do
echo $patch
@@ -74,12 +73,18 @@ in stdenv.mkDerivation rec {
popd
'';
+ xreallocarray = ./xreallocarray.c;
+
preBuild = optionalString (!libsOnly) ''
- pushd usr/src/amdgpu-pro-${build}
+ pushd usr/src/amdgpu-${build}
makeFlags="$makeFlags M=$(pwd)"
patchShebangs pre-build.sh
./pre-build.sh ${kernel.version}
popd
+ pushd lib
+ $CC -fPIC -shared -o libhack-xreallocarray.so $xreallocarray
+ strip libhack-xreallocarray.so
+ popd
'';
modules = [
@@ -89,7 +94,7 @@ in stdenv.mkDerivation rec {
];
postBuild = optionalString (!libsOnly)
- (concatMapStrings (m: "xz usr/src/amdgpu-pro-${build}/${m}\n") modules);
+ (concatMapStrings (m: "xz usr/src/amdgpu-${build}/${m}\n") modules);
NIX_CFLAGS_COMPILE = "-Werror";
@@ -110,16 +115,17 @@ in stdenv.mkDerivation rec {
pushd usr
cp -r lib/${libArch}/* $out/lib
'' + optionalString (!libsOnly) ''
- cp -r src/amdgpu-pro-${build}/firmware $out/lib/firmware
+ cp -r src/amdgpu-${build}/firmware $out/lib/firmware
'' + ''
cp -r share $out/share
popd
pushd opt/amdgpu-pro
- '' + optionalString (!stdenv.is64bit) ''
+ '' + optionalString (!libsOnly && stdenv.is64bit) ''
cp -r bin $out/bin
'' + ''
cp -r include $out/include
+ cp -r share/* $out/share
cp -r lib/${libArch}/* $out/lib
'' + optionalString (!libsOnly) ''
mv lib/xorg $out/lib/xorg
@@ -128,12 +134,12 @@ in stdenv.mkDerivation rec {
'' + optionalString (!libsOnly)
(concatMapStrings (m:
- "install -Dm444 usr/src/amdgpu-pro-${build}/${m}.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/${m}.xz\n") modules)
+ "install -Dm444 usr/src/amdgpu-${build}/${m}.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/${m}.xz\n") modules)
+ ''
mv $out/etc/vulkan $out/share
interpreter="$(cat $NIX_CC/nix-support/dynamic-linker)"
libPath="$out/lib:$out/lib/gbm:$depLibPath"
- '' + optionalString (!stdenv.is64bit) ''
+ '' + optionalString (!libsOnly && stdenv.is64bit) ''
for prog in clinfo modetest vbltest kms-universal-planes kms-steal-crtc modeprint amdgpu_test kmstest proptest; do
patchelf --interpreter "$interpreter" --set-rpath "$libPath" "$out/bin/$prog"
done
@@ -147,10 +153,17 @@ in stdenv.mkDerivation rec {
for lib in `find "$out/lib/" -name '*.so*' -type f`; do
patchelf --set-rpath "$libPath" "$lib"
done
- for lib in libEGL.so.1 libGL.so.1.2 ${optionalString (!libsOnly) "xorg/modules/extensions/libglx.so"} dri/amdgpu_dri.so; do
+ for lib in libEGL.so.1 libGL.so.1.2 ${optionalString (!libsOnly) "xorg/modules/extensions/libglx.so"} dri/amdgpu_dri.so libamdocl${bitness}.so; do
perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib"
done
+ for lib in dri/amdgpu_dri.so libdrm_amdgpu.so.1.0.0 libgbm_amdgpu.so.1.0.0 libkms_amdgpu.so.1.0.0 libamdocl${bitness}.so; do
+ perl -pi -e 's:/opt/amdgpu-pro/:/run/amdgpu-pro/:g' "$out/lib/$lib"
+ done
substituteInPlace "$out/share/vulkan/icd.d/amd_icd${bitness}.json" --replace "/opt/amdgpu-pro/lib/${libArch}" "$out/lib"
+ '' + optionalString (!libsOnly) ''
+ for lib in drivers/modesetting_drv.so libglamoregl.so; do
+ patchelf --add-needed $out/lib/libhack-xreallocarray.so $out/lib/xorg/modules/$lib
+ done
'';
buildInputs = [
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
deleted file mode 100644
index 4733e0580af..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 704cef8638ffbdd8de9e57f28b43ea42c685ea87 Mon Sep 17 00:00:00 2001
-From: David McFarland
-Date: Sat, 28 Jan 2017 16:57:26 -0400
-Subject: [PATCH 1/4] disable firmware copy
-
----
- pre-build.sh | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/pre-build.sh b/pre-build.sh
-index 622ff13..e3cd009 100755
---- a/pre-build.sh
-+++ b/pre-build.sh
-@@ -35,8 +35,3 @@ find ttm -name '*.c' -exec grep EXPORT_SYMBOL {} + \
- | sort -u \
- | awk -F'[()]' '{print "#define "$2" amd"$2" //"$0}'\
- > include/rename_symbol.h
--
--FW_DIR="/lib/firmware/$KERNELVER"
--mkdir -p $FW_DIR
--cp -ar /usr/src/amdgpu-pro-17.10-401251/firmware/radeon $FW_DIR
--cp -ar /usr/src/amdgpu-pro-17.10-401251/firmware/amdgpu $FW_DIR
---
-2.12.2
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch
new file mode 100644
index 00000000000..ecde6401ac1
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch
@@ -0,0 +1,71 @@
+From 9167d76c435a7c1df7954f0fbe5cc6d083f8ed2f Mon Sep 17 00:00:00 2001
+From: David McFarland
+Date: Mon, 6 Feb 2017 22:13:49 -0400
+Subject: [PATCH 1/3] fix warnings for Werror
+
+---
+ amd/amdgpu/amdgpu_device.c | 4 ++--
+ amd/amdgpu/amdgpu_sa.c | 2 +-
+ amd/display/dc/bios/bios_parser2.c | 8 ++++----
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/amd/amdgpu/amdgpu_device.c b/amd/amdgpu/amdgpu_device.c
+index fc1c543..186e06d 100644
+--- a/amd/amdgpu/amdgpu_device.c
++++ b/amd/amdgpu/amdgpu_device.c
+@@ -3164,7 +3164,7 @@ void amdgpu_debugfs_cleanup(struct drm_minor *minor)
+ struct drm_info_node *node, *tmp;
+
+ if (!&minor->debugfs_root)
+- return 0;
++ return;
+
+ mutex_lock(&minor->debugfs_lock);
+ list_for_each_entry_safe(node, tmp,
+@@ -3175,7 +3175,7 @@ void amdgpu_debugfs_cleanup(struct drm_minor *minor)
+ }
+ mutex_unlock(&minor->debugfs_lock);
+
+- return 0;
++ return;
+ }
+ #endif
+
+diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
+index 7206b34..8b7123c 100644
+--- a/amd/amdgpu/amdgpu_sa.c
++++ b/amd/amdgpu/amdgpu_sa.c
+@@ -430,7 +430,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
+ if (i->fence)
+ #if defined(BUILD_AS_DKMS)
+ seq_printf(m, " protected by 0x%08x on context %d",
+- i->fence->seqno, i->fence->context);
++ i->fence->seqno, (int)i->fence->context);
+ #else
+ seq_printf(m, " protected by 0x%08x on context %llu",
+ i->fence->seqno, i->fence->context);
+diff --git a/amd/display/dc/bios/bios_parser2.c b/amd/display/dc/bios/bios_parser2.c
+index 86fce5a..99681c5 100644
+--- a/amd/display/dc/bios/bios_parser2.c
++++ b/amd/display/dc/bios/bios_parser2.c
+@@ -1326,13 +1326,13 @@ static enum bp_result get_embedded_panel_info_v2_1(
+ info->lcd_timing.misc_info.VERTICAL_CUT_OFF = 0;
+
+ info->lcd_timing.misc_info.H_REPLICATION_BY2 =
+- lvds->lcd_timing.miscinfo & ATOM_H_REPLICATIONBY2;
++ (lvds->lcd_timing.miscinfo & ATOM_H_REPLICATIONBY2) != 0;
+ info->lcd_timing.misc_info.V_REPLICATION_BY2 =
+- lvds->lcd_timing.miscinfo & ATOM_V_REPLICATIONBY2;
++ (lvds->lcd_timing.miscinfo & ATOM_V_REPLICATIONBY2) != 0;
+ info->lcd_timing.misc_info.COMPOSITE_SYNC =
+- lvds->lcd_timing.miscinfo & ATOM_COMPOSITESYNC;
++ (lvds->lcd_timing.miscinfo & ATOM_COMPOSITESYNC) != 0;
+ info->lcd_timing.misc_info.INTERLACE =
+- lvds->lcd_timing.miscinfo & ATOM_INTERLACE;
++ (lvds->lcd_timing.miscinfo & ATOM_INTERLACE) != 0;
+
+ /* not provided by VBIOS*/
+ info->lcd_timing.misc_info.DOUBLE_CLOCK = 0;
+--
+2.15.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch
new file mode 100644
index 00000000000..20f429757a5
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch
@@ -0,0 +1,25 @@
+From a07ee5dec35ca24a013a6638543ef5030b2bab40 Mon Sep 17 00:00:00 2001
+From: David McFarland
+Date: Tue, 9 Jan 2018 21:45:33 -0400
+Subject: [PATCH 2/3] fix sketchy int->ptr warning
+
+---
+ amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+index d0f091b..707815a 100644
+--- a/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
++++ b/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+@@ -236,7 +236,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
+ pbn = drm_dp_calc_pbn_mode(clock, bpp);
+
+ slots = drm_dp_find_vcpi_slots(mst_mgr, pbn);
+- ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, slots);
++ ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, &slots);
+
+ if (!ret)
+ return false;
+--
+2.15.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
deleted file mode 100644
index aa6cbcc118d..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0ead7017e1db18be971c24c891d4bdcc507deea7 Mon Sep 17 00:00:00 2001
-From: David McFarland
-Date: Sun, 29 Jan 2017 18:23:47 -0400
-Subject: [PATCH 2/4] linux-4.9 fixes
-
----
- amd/amdkcl/kcl_io.c | 2 ++
- amd/display/amdgpu_dm/amdgpu_dm_types.c | 8 ++++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/amd/amdkcl/kcl_io.c b/amd/amdkcl/kcl_io.c
-index d8f843f..9a1bd9b 100644
---- a/amd/amdkcl/kcl_io.c
-+++ b/amd/amdkcl/kcl_io.c
-@@ -31,4 +31,6 @@ void amdkcl_io_init(void)
- _kcl_io_free_memtype = amdkcl_fp_setup("io_free_memtype", NULL);
- }
- #endif
-+#else
-+void amdkcl_io_init(void) {}
- #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) */
-diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-index 34313a9..44a4a71 100644
---- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
-+++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-@@ -1720,6 +1720,10 @@ static int dm_plane_helper_prepare_fb(
- static int dm_plane_helper_prepare_fb(
- struct drm_plane *plane,
- const struct drm_plane_state *new_state)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+static int dm_plane_helper_prepare_fb(
-+ struct drm_plane *plane,
-+ struct drm_plane_state *new_state)
- #else
- static int dm_plane_helper_prepare_fb(
- struct drm_plane *plane,
-@@ -1766,6 +1770,10 @@ static void dm_plane_helper_cleanup_fb(
- static void dm_plane_helper_cleanup_fb(
- struct drm_plane *plane,
- const struct drm_plane_state *old_state)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+static void dm_plane_helper_cleanup_fb(
-+ struct drm_plane *plane,
-+ struct drm_plane_state *old_state)
- #else
- static void dm_plane_helper_cleanup_fb(
- struct drm_plane *plane,
---
-2.12.2
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
deleted file mode 100644
index 7a11c9bd4ef..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b6dd36dd90c5d88ae10b9dbc763d3bacb95ccddb Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest"
-Date: Sun, 25 Sep 2016 16:46:39 +0100
-Subject: [PATCH 3/4] Change seq_printf format for 64 bit context
-
----
- amd/amdgpu/amdgpu_sa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
-index 74932bf..db4119a 100644
---- a/amd/amdgpu/amdgpu_sa.c
-+++ b/amd/amdgpu/amdgpu_sa.c
-@@ -428,7 +428,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
- soffset, eoffset, eoffset - soffset);
-
- if (i->fence)
--#if defined(BUILD_AS_DKMS)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
- seq_printf(m, " protected by 0x%08x on context %d",
- i->fence->seqno, i->fence->context);
- #else
---
-2.12.2
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch
new file mode 100644
index 00000000000..0091c471680
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch
@@ -0,0 +1,25 @@
+From 7a3062acbbabdb29239bbc8c984e62589a88576e Mon Sep 17 00:00:00 2001
+From: David McFarland
+Date: Tue, 9 Jan 2018 21:49:55 -0400
+Subject: [PATCH 3/3] disable firmware copy
+
+---
+ pre-build.sh | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/pre-build.sh b/pre-build.sh
+index e7b8a32..bad8f25 100755
+--- a/pre-build.sh
++++ b/pre-build.sh
+@@ -38,8 +38,3 @@ find ttm -name '*.c' -exec grep EXPORT_SYMBOL {} + \
+ | sort -u \
+ | awk -F'[()]' '{print "#define "$2" amd"$2" //"$0}'\
+ >> include/rename_symbol.h
+-
+-FW_DIR="/lib/firmware/$KERNELVER"
+-mkdir -p $FW_DIR
+-cp -ar /usr/src/amdgpu-17.40-492261/firmware/radeon $FW_DIR
+-cp -ar /usr/src/amdgpu-17.40-492261/firmware/amdgpu $FW_DIR
+--
+2.15.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch
deleted file mode 100644
index cd360e18faa..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From dbf01d3934c52acaaa37f008859f69c5edf19ad5 Mon Sep 17 00:00:00 2001
-From: David McFarland
-Date: Mon, 6 Feb 2017 22:13:49 -0400
-Subject: [PATCH 4/4] fix warnings for Werror
-
----
- amd/amdgpu/amdgpu_ttm.c | 2 ++
- amd/display/amdgpu_dm/amdgpu_dm_types.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
-index 0e30389..890aafa 100644
---- a/amd/amdgpu/amdgpu_ttm.c
-+++ b/amd/amdgpu/amdgpu_ttm.c
-@@ -1083,6 +1083,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,
- return flags;
- }
-
-+#if 0
- static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo)
- {
- struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev);
-@@ -1132,6 +1133,7 @@ static struct list_head *amdgpu_ttm_swap_lru_tail(struct ttm_buffer_object *tbo)
-
- return res;
- }
-+#endif
-
- static bool amdgpu_ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
- const struct ttm_place *place)
-diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-index 44a4a71..ae7e707 100644
---- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
-+++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-@@ -932,7 +932,7 @@ static void decide_crtc_timing_for_drm_display_mode(
- }
-
- static struct dc_target *create_target_for_sink(
-- const struct amdgpu_connector *aconnector,
-+ struct amdgpu_connector *aconnector,
- const struct drm_display_mode *drm_mode,
- const struct dm_connector_state *dm_state)
- {
---
-2.12.2
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c b/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c
new file mode 100644
index 00000000000..ab47bacb822
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c
@@ -0,0 +1,5 @@
+#include
+
+void *xreallocarray(void *ptr, size_t nmemb, size_t size) {
+ return reallocarray(ptr, nmemb, size);
+}
diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix
index 8c207e4a47d..79e12dd0f43 100644
--- a/pkgs/os-specific/linux/autofs/default.nix
+++ b/pkgs/os-specific/linux/autofs/default.nix
@@ -2,14 +2,14 @@
, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }:
let
- version = "5.1.3";
+ version = "5.1.4";
name = "autofs-${version}";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz";
- sha256 = "1gxifa93104pxlmxrikhwciy5zdgk20m63siyhq1myym7vzfnvp9";
+ sha256 = "08hpphawzcdibwbhw0r3y7hnfczlazpp90sf3bz2imgza7p31klg";
};
preConfigure = ''
diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index c2bea009ab7..7b6dd6fba35 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "cifs-utils-${version}";
- version = "6.7";
+ version = "6.8";
src = fetchurl {
url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2";
- sha256 = "1ayghnkryy1n1zm5dyvyyr7n3807nsm6glfcbbki5c2a8w91dwmj";
+ sha256 = "0ygz3pagjpaj5ky11hzh4byyymb7fpmqiqkprn11zwj31h2zdlg7";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index ea9c3f937d0..e4c45a9440a 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -27,6 +27,7 @@
, wirelessSupport ? true , wirelesstools ? null
, nvidiaSupport ? false , libXNVCtrl ? null
+, pulseSupport ? false , libpulseaudio ? null
, curlSupport ? true , curl ? null
, rssSupport ? curlSupport
@@ -54,6 +55,7 @@ assert luaCairoSupport || luaImlib2Support
assert wirelessSupport -> wirelesstools != null;
assert nvidiaSupport -> libXNVCtrl != null;
+assert pulseSupport -> libpulseaudio != null;
assert curlSupport -> curl != null;
assert rssSupport -> curlSupport && libxml2 != null;
@@ -100,6 +102,7 @@ stdenv.mkDerivation rec {
++ optional rssSupport libxml2
++ optional weatherXoapSupport libxml2
++ optional nvidiaSupport libXNVCtrl
+ ++ optional pulseSupport libpulseaudio
;
cmakeFlags = []
@@ -119,6 +122,7 @@ stdenv.mkDerivation rec {
++ optional weatherXoapSupport "-DBUILD_WEATHER_XOAP=ON"
++ optional wirelessSupport "-DBUILD_WLAN=ON"
++ optional nvidiaSupport "-DBUILD_NVIDIA=ON"
+ ++ optional pulseSupport "-DBUILD_PULSEAUDIO=ON"
;
# `make -f src/CMakeFiles/conky.dir/build.make src/CMakeFiles/conky.dir/conky.cc.o`:
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index 6f2dc807fba..724242c588a 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "hwdata-${version}";
- version = "0.309";
+ version = "0.310";
src = fetchurl {
- url = "https://github.com/vcrhonek/hwdata/archive/v0.309.tar.gz";
- sha256 = "1njx4lhg7a0cawz82x535vk4mslmnfj7nmf8dbq8kgqxiqh6h2c7";
+ url = "https://github.com/vcrhonek/hwdata/archive/v0.310.tar.gz";
+ sha256 = "08mhwwc9g9cpfyxrwwviflkdk2jnqs6hc95iv4r5d59hqrj5kida";
};
preConfigure = "patchShebangs ./configure";
diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix
index c78a4eadfa4..68692019ca9 100644
--- a/pkgs/os-specific/linux/ipset/default.nix
+++ b/pkgs/os-specific/linux/ipset/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libmnl }:
stdenv.mkDerivation rec {
- name = "ipset-6.35";
+ name = "ipset-6.36";
src = fetchurl {
url = "http://ipset.netfilter.org/${name}.tar.bz2";
- sha256 = "1p7l1fj3lbv6rr24zxjiwq7jk1yvazk8db6yyni0qbprw49i01rp";
+ sha256 = "03fk40v0rbiv2b9ciy3zk8yix163803xvpmdlyvrfzbcvj84l8i2";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 3d950252e1c..adf9dbd818c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.27";
+ version = "4.14.28";
# branchVersion needs to be x.y
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1si8l3clpkyhwawrjxz6yzx7xl0v0k6dy1yf5qiwf1hsqx4s8489";
+ sha256 = "0byx2824ml2ck97p66gfipnasbn9zz6rhjps61n6gprg3ac5fd07";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix
index 933339f5818..5c4a452dd12 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.15.10";
+ version = "4.15.11";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "14i6028l1y8y88sw5cbfihzs3wp66vwy33g1598i0dkyf1sbw5cg";
+ sha256 = "0rjzlkp24ch58vx0xljrf6l33i8xv2mal0x821kwfqp551npdxfc";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 7980f7c212e..5994a081600 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.121";
+ version = "4.4.122";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0ad7djpbwapk126jddrnnq0a5a9mmhrr36qcnckc7388nml85a24";
+ sha256 = "1hxph2bn2wdamk1p5sxl2szgsk4aybb0245x1rvf85a6skhjqc7g";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index cb2650a5a68..3bcfa3912aa 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.87";
+ version = "4.9.88";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "05y9wjmshd3pr3ymfpx80hjv5973i6l3zk1mpww7wnnwd6pzdjbs";
+ sha256 = "094cxc86ajnsai1vwy76mmg7l3b9lvhk6mw6746lsr3fnzv1fkq7";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
index f59106746fe..cb0b9b10be1 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
@@ -3,9 +3,9 @@
with stdenv.lib;
let
- version = "4.15.10";
+ version = "4.15.11";
revision = "a";
- sha256 = "02plwrj6d7wzwf6w8q2cxspy2q58i3v46clm2vf8m9x6mm88jrzx";
+ sha256 = "09xyg3i2m5cv9cpl3pry579p40iphzsn1pif7046rvc7zfrjzl8d";
# modVersion needs to be x.y.z, will automatically add .0 if needed
modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 48aaeebc4d2..bcc1ec14561 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
buildLinux (args // rec {
- version = "4.16-rc5";
- modDirVersion = "4.16.0-rc5";
+ version = "4.16-rc6";
+ modDirVersion = "4.16.0-rc6";
extraMeta.branch = "4.16";
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
- sha256 = "0yfa0qrs6fwh88xgn252j7nc8q4x5qhf20dlax9hcnza0ai6nk3z";
+ sha256 = "0kwn1qj44pyb404qhwm4qr8mmfni8qfh1raf010d62i48n7pgv0d";
};
# Should the testing kernels ever be built on Hydra?
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index db6380bcf12..a6119e58d7c 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -33,16 +33,11 @@ let
in python.pkgs.buildPythonApplication rec {
pname = "appdaemon";
- version = "3.0.0b4";
+ version = "3.0.0";
src = python.pkgs.fetchPypi {
inherit pname version;
- sha256 = "0dfc37ecd8e1344001d4970d32813c581aba1385cf3b82c69f8b7df2eca6c019";
- };
-
- patches = fetchpatch {
- url = "${meta.homepage}/pull/252.patch";
- sha256 = "164qvgdibd2645yxm4n16bhnan13wrchfi70jp2ff806fwdg9mg0";
+ sha256 = "ed925d3cb25db2c3f57304a0bca8fd0d9072d7ffe347ac5fcf68c4a30b7f1721";
};
propagatedBuildInputs = with python.pkgs; [
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 5791aac0278..e2fc90a2296 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -234,7 +234,7 @@
"notify.message_bird" = ps: with ps; [ ];
"notify.pushbullet" = ps: with ps; [ pushbullet ];
"notify.pushetta" = ps: with ps; [ ];
- "notify.pushover" = ps: with ps; [ ];
+ "notify.pushover" = ps: with ps; [ python-pushover ];
"notify.rocketchat" = ps: with ps; [ ];
"notify.sendgrid" = ps: with ps; [ ];
"notify.simplepush" = ps: with ps; [ ];
diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix
index 50f94e4688c..080cbc89775 100644
--- a/pkgs/servers/mail/archiveopteryx/default.nix
+++ b/pkgs/servers/mail/archiveopteryx/default.nix
@@ -19,6 +19,13 @@ stdenv.mkDerivation rec {
sed -i 's:MANDIR = $(PREFIX)/man:MANDIR = '$out'/share/man:' ./Jamsettings
sed -i 's:READMEDIR = $(PREFIX):READMEDIR = '$out'/share/doc/archiveopteryx:' ./Jamsettings
'';
+
+ # fix build on gcc7
+ NIX_CFLAGS_COMPILE = [
+ "-Wno-error=builtin-declaration-mismatch"
+ "-Wno-error=implicit-fallthrough"
+ ];
+
buildPhase = ''jam "-j$NIX_BUILD_CORES" '';
installPhase = ''
jam install
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index f8b36e816e0..a5168ebd4df 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -25,11 +25,11 @@ in stdenv.mkDerivation rec {
name = "postfix-${version}";
- version = "3.2.5";
+ version = "3.3.0";
src = fetchurl {
url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
- sha256 = "0xpky04a5xnzbcizqj4y1gyxqjrzvpjlvk1g757wdrs678fq82vx";
+ sha256 = "0fggpbsc9jkrbaw9hy0zw9h32plmfvcv0x860pbih0g346byhhkr";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index d8352df3623..4c7d1649832 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,13 +26,13 @@ let
};
in pythonPackages.buildPythonApplication rec {
name = "matrix-synapse-${version}";
- version = "0.26.0";
+ version = "0.26.1";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
- sha256 = "1ggdnb4c8y835j9lxsglxry6fqy7d190s70rccjrc3rj0p5vwlyj";
+ sha256 = "1rm15qj743k376skjxyyfmzwajx3rb8z2inzc4309kl98jfw3cw0";
};
patches = [
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index f0c1a0fcec5..936e457eb33 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchFromGitHub, buildGoPackage }:
let
- version = "4.7.2";
+ version = "4.8.0";
goPackagePath = "github.com/mattermost/mattermost-server";
buildFlags = "-ldflags \"-X '${goPackagePath}/model.BuildNumber=nixpkgs-${version}'\"";
in
@@ -13,12 +13,12 @@ buildGoPackage rec {
owner = "mattermost";
repo = "mattermost-server";
rev = "v${version}";
- sha256 = "129rvmwf9c19jbdpiclysb870svs2fbhdybcal0jbmzgx2zr8qma";
+ sha256 = "16yf4p0n3klgh0zw2ikbahj9cy1wcxbwg86pld0yz63cfvfz5ns4";
};
webApp = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz";
- sha256 = "14gr7zzx77q862qccjcdwrzd6n8g2z8yngw8aa4g3q6hypsqi4v3";
+ sha256 = "0ykp9apsv2514bircgay0xi0jigiai65cnb8q77v1qxjzdyx8s75";
};
inherit goPackagePath;
diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
new file mode 100644
index 00000000000..90bd5b614dd
--- /dev/null
+++ b/pkgs/servers/metabase/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, makeWrapper, jre }:
+
+stdenv.mkDerivation rec {
+ name = "metabase-${version}";
+ version = "0.28.1";
+
+ jar = fetchurl {
+ url = "http://downloads.metabase.com/v${version}/metabase.jar";
+ sha256 = "1nv3y4pnvzd7lwyj14nmhr3k52qd8hilcjxvd7qr3hb7kzmjvbzk";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ unpackPhase = "true";
+
+ installPhase = ''
+ makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $jar"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "The easy, open source way for everyone in your company to ask questions and learn from data.";
+ homepage = https://metabase.com;
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ schneefux ];
+ };
+}
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index dbc24e55c20..61ff67ed993 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
buildGoPackage rec {
- version = "5.0.2";
+ version = "5.0.3";
name = "grafana-${version}";
goPackagePath = "github.com/grafana/grafana";
@@ -9,12 +9,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "0lwv6k8yp1jpp3ghizvrnnb5zpnsbkyd1i9ggy4gbs68mg8xzp19";
+ sha256 = "0508dvkanrfrvdnddjsaz8qm3qbgavznia5hqr8zx3qvq4789hj2";
};
srcStatic = fetchurl {
url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
- sha256 = "06qqi5v9s9ni4a380alsc3f53hvmmypqgm3cc25hl3ld5w3zdlkd";
+ sha256 = "0dzb93vx72sm6iri6c96k3a15zn8mp26pd2r78m6k3nhg8rsrqmm";
};
preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
diff --git a/pkgs/servers/monitoring/heapster/default.nix b/pkgs/servers/monitoring/heapster/default.nix
index db3c518c729..39c04857638 100644
--- a/pkgs/servers/monitoring/heapster/default.nix
+++ b/pkgs/servers/monitoring/heapster/default.nix
@@ -10,7 +10,7 @@ buildGoPackage rec {
inherit rev;
owner = "kubernetes";
repo = "heapster";
- sha256 = "057z9imgd2gvcbvahja3i26jzgm33dmfaxraakmcr4a2xfhj50hq";
+ sha256 = "1vg83207y7yigydnnhlvzs3s94vx02i56lqgs6a96c6i3mr3ydpb";
};
preBuild = ''
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 46c02c6bb95..86218a57284 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,42 +1,56 @@
{ stdenv, go, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
- name = "prometheus-${version}";
- version = "1.8.1";
- rev = "v${version}";
-
+let
goPackagePath = "github.com/prometheus/prometheus";
- src = fetchFromGitHub {
- inherit rev;
- owner = "prometheus";
- repo = "prometheus";
+ generic = { version, sha256, ... }@attrs:
+ let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in
+ buildGoPackage ({
+ name = "prometheus-${version}";
+
+ inherit goPackagePath;
+
+ src = fetchFromGitHub {
+ rev = "v${version}";
+ owner = "prometheus";
+ repo = "prometheus";
+ inherit sha256;
+ };
+
+ docheck = true;
+
+ buildFlagsArray = let t = "${goPackagePath}/version"; in ''
+ -ldflags=
+ -X ${t}.Version=${version}
+ -X ${t}.Revision=unknown
+ -X ${t}.Branch=unknown
+ -X ${t}.BuildUser=nix@nixpkgs
+ -X ${t}.BuildDate=unknown
+ -X ${t}.GoVersion=${stdenv.lib.getVersion go}
+ '';
+
+ preInstall = ''
+ mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
+ cp -a $src/documentation/* $bin/share/doc/prometheus
+ cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Service monitoring system and time series database";
+ homepage = https://prometheus.io;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ benley fpletz ];
+ platforms = platforms.unix;
+ };
+ } // attrs');
+in rec {
+ prometheus_1 = generic {
+ version = "1.8.1";
sha256 = "07xvpjhhxc0r73qfmkvf94zhv19zv76privw6blg35k5nxcnj7j4";
};
- docheck = true;
-
- buildFlagsArray = let t = "${goPackagePath}/version"; in ''
- -ldflags=
- -X ${t}.Version=${version}
- -X ${t}.Revision=unknown
- -X ${t}.Branch=unknown
- -X ${t}.BuildUser=nix@nixpkgs
- -X ${t}.BuildDate=unknown
- -X ${t}.GoVersion=${stdenv.lib.getVersion go}
- '';
-
- preInstall = ''
- mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
- cp -a $src/documentation/* $bin/share/doc/prometheus
- cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
- '';
-
- meta = with stdenv.lib; {
- description = "Service monitoring system and time series database";
- homepage = https://prometheus.io;
- license = licenses.asl20;
- maintainers = with maintainers; [ benley fpletz ];
- platforms = platforms.unix;
+ prometheus_2 = generic {
+ version = "2.1.0";
+ sha256 = "01pbqfp43qrqcgyidyg2lw9jnjdrv140vnmqmm49z0vhlkxkwlvw";
};
}
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index 65a95c021c4..e06aaa9faa4 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "telegraf-${version}";
- version = "1.5.1";
+ version = "1.5.3";
goPackagePath = "github.com/influxdata/telegraf";
diff --git a/pkgs/servers/monitoring/telegraf/deps-1.5.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.5.3.nix
similarity index 100%
rename from pkgs/servers/monitoring/telegraf/deps-1.5.1.nix
rename to pkgs/servers/monitoring/telegraf/deps-1.5.3.nix
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 2e423246c51..e6baf9e64d8 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name= "nextcloud-${version}";
- version = "13.0.0";
+ version = "13.0.1";
src = fetchurl {
url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
- sha256 = "38e6064432a2d1a044f219028d3fd46cb7a943a47e11eef346810bd289705aec";
+ sha256 = "048x3x6d11m75ghxjcjzm8amjm6ljirv6djbl53awwp9f5532hsp";
};
installPhase = ''
diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 14f422f9610..8815ca3e210 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "osrm-backend-${version}";
- version = "5.15.0";
+ version = "5.16.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "Project-OSRM";
repo = "osrm-backend";
- sha256 = "1vdy7j1k1brgd5jgvi5pm3flfw70v48d4rwfq404iiyipkjdy3kz";
+ sha256 = "14vf0av63zizz1knjzhj34hxadxwcza2zakhaj6si3kb8zhihmaf";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index 040a2ece303..e9d2fd07dc5 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "unifi-controller-${version}";
- version = "5.6.30";
+ version = "5.6.36";
src = fetchurl {
url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb";
- sha256 = "083bh29i7dpn0ajc6h584vhkybiavnln3xndpb670chfrbywxyj4";
+ sha256 = "075q7vm56fdsjwh72y2cb1pirl2pxdkvqnhvd3bf1c2n64mvp6bi";
};
buildInputs = [ dpkg ];
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 9efb4e4dfe5..85192b11c30 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -1,37 +1,53 @@
{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit
, python, pythonPackages, makeWrapper }:
-stdenv.mkDerivation rec {
- version = "5.2.1";
- name = "varnish-${version}";
+let
+ common = { version, sha256 }:
+ stdenv.mkDerivation rec {
+ name = "varnish-${version}";
- src = fetchurl {
- url = "http://varnish-cache.org/_downloads/${name}.tgz";
+ src = fetchurl {
+ url = "http://varnish-cache.org/_downloads/${name}.tgz";
+ inherit sha256;
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [
+ pcre libxslt groff ncurses readline python libedit
+ pythonPackages.docutils makeWrapper
+ ];
+
+ buildFlags = "localstatedir=/var/spool";
+
+ postInstall = ''
+ wrapProgram "$out/sbin/varnishd" --prefix PATH : "${stdenv.lib.makeBinPath [ stdenv.cc ]}"
+ '';
+
+ # https://github.com/varnishcache/varnish-cache/issues/1875
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fexcess-precision=standard";
+
+ outputs = [ "out" "dev" "man" ];
+
+ meta = with stdenv.lib; {
+ description = "Web application accelerator also known as a caching HTTP reverse proxy";
+ homepage = https://www.varnish-cache.org;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ garbas fpletz ];
+ platforms = platforms.unix;
+ };
+ };
+in
+{
+ varnish4 = common {
+ version = "4.1.9";
+ sha256 = "11zwyasz2fn9qxc87r175wb5ba7388sd79mlygjmqn3yv2m89n12";
+ };
+ varnish5 = common {
+ version = "5.2.1";
sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq";
};
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- pcre libxslt groff ncurses readline python libedit
- pythonPackages.docutils makeWrapper
- ];
-
- buildFlags = "localstatedir=/var/spool";
-
- postInstall = ''
- wrapProgram "$out/sbin/varnishd" --prefix PATH : "${stdenv.lib.makeBinPath [ stdenv.cc ]}"
- '';
-
- # https://github.com/varnishcache/varnish-cache/issues/1875
- NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fexcess-precision=standard";
-
- outputs = [ "out" "dev" "man" ];
-
- meta = with stdenv.lib; {
- description = "Web application accelerator also known as a caching HTTP reverse proxy";
- homepage = https://www.varnish-cache.org;
- license = licenses.bsd2;
- maintainers = with maintainers; [ garbas fpletz ];
- platforms = platforms.unix;
+ varnish6 = common {
+ version = "6.0.0";
+ sha256 = "1vhbdch33m6ig4ijy57zvrramhs9n7cba85wd8rizgxjjnf87cn7";
};
}
diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix
index 530ae504771..2ccb0419c04 100644
--- a/pkgs/servers/varnish/digest.nix
+++ b/pkgs/servers/varnish/digest.nix
@@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, libmhash, docutils }:
stdenv.mkDerivation rec {
- version = "1.0.1";
- name = "varnish-digest-${version}";
+ version = "1.0.2";
+ name = "${varnish.name}-digest-${version}";
src = fetchFromGitHub {
owner = "varnish";
repo = "libvmod-digest";
rev = "libvmod-digest-${version}";
- sha256 = "0v18bqbsblhajpx5qvczic3psijhx5l2p2qlw1dkd6zl33hhppy7";
+ sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx";
};
nativeBuildInputs = [ autoreconfHook pkgconfig docutils ];
buildInputs = [ varnish libmhash ];
postPatch = ''
- substituteInPlace autogen.sh --replace "-I \''${dataroot}/aclocal" ""
- substituteInPlace Makefile.am --replace "-I \''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" ""
+ substituteInPlace autogen.sh --replace "''${dataroot}/aclocal" "${varnish.dev}/share/aclocal"
+ substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal"
'';
configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix
new file mode 100644
index 00000000000..711bc1cf78f
--- /dev/null
+++ b/pkgs/servers/varnish/dynamic.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils }:
+
+stdenv.mkDerivation rec {
+ version = "0.3";
+ name = "${varnish.name}-dynamic-${version}";
+
+ src = fetchFromGitHub {
+ owner = "nigoroll";
+ repo = "libvmod-dynamic";
+ rev = "475be183fddbd727c3d2523f0518effa9aa881f8"; # 5.2 branch for Varnish-5.2 https://github.com/nigoroll/libvmod-dynamic/commits/5.2
+ sha256 = "12a42lbv0vf6fn3qnvngw893kmbd006f8pgab4ir7irc8855xjgf";
+ };
+
+ nativeBuildInputs = [ pkgconfig docutils autoreconfHook ];
+ buildInputs = [ varnish python ];
+ postPatch = ''
+ substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal"
+ '';
+ configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
+
+ meta = with stdenv.lib; {
+ description = "Dynamic director similar to the DNS director from Varnish 3";
+ homepage = https://github.com/nigoroll/libvmod-dynamic;
+ inherit (varnish.meta) license platforms maintainers;
+ };
+}
diff --git a/pkgs/servers/varnish/geoip.nix b/pkgs/servers/varnish/geoip.nix
index 7816b27b14f..d1790252065 100644
--- a/pkgs/servers/varnish/geoip.nix
+++ b/pkgs/servers/varnish/geoip.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.0.2";
- name = "varnish-geoip-${version}";
+ name = "${varnish.name}-geoip-${version}";
src = fetchFromGitHub {
owner = "varnish";
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index 8fdcf63e5b9..7775221d163 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -1,17 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, varnish, python, docutils, removeReferencesTo }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils, removeReferencesTo }:
stdenv.mkDerivation rec {
- version = "0.13.0";
- name = "varnish-modules-${version}";
+ version = "0.14.0";
+ name = "${varnish.name}-modules-${version}";
- src = fetchurl {
- url = "https://download.varnish-software.com/varnish-modules/varnish-modules-${version}.tar.gz";
- sha256 = "1nj52va7cp0swcv87zd3si80knpaa4a7na37cy9wkvgyvhf9k8mh";
+ src = fetchFromGitHub {
+ owner = "varnish";
+ repo = "varnish-modules";
+ rev = version;
+ sha256 = "17fkbr4i70qgdqsrx1x28ag20xkfyz1v3q3d3ywmv409aczqhm40";
};
- nativeBuildInputs = [ pkgconfig docutils removeReferencesTo ];
+ nativeBuildInputs = [ pkgconfig autoreconfHook docutils removeReferencesTo ];
buildInputs = [ varnish python ];
+ postPatch = ''
+ substituteInPlace bootstrap --replace "''${dataroot}/aclocal" "${varnish.dev}/share/aclocal"
+ substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal"
+ '';
+
postInstall = "find $out -type f -exec remove-references-to -t ${varnish.dev} '{}' +"; # varnish.dev captured only as __FILE__ in assert messages
meta = with stdenv.lib; {
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
new file mode 100644
index 00000000000..f468ac58e6c
--- /dev/null
+++ b/pkgs/servers/varnish/packages.nix
@@ -0,0 +1,22 @@
+{ callPackage, varnish4, varnish5, varnish6 }:
+
+{
+ varnish4Packages = {
+ varnish = varnish4;
+ digest = callPackage ./digest.nix { varnish = varnish4; };
+ rtstatus = callPackage ./rtstatus.nix { varnish = varnish4; }; # varnish4 only
+ modules = callPackage ./modules.nix { varnish = varnish4; }; # varnish4 and varnish5 only
+ geoip = callPackage ./geoip.nix { varnish = varnish4; }; # varnish4 and varnish5 only
+ };
+ varnish5Packages = {
+ varnish = varnish5;
+ digest = callPackage ./digest.nix { varnish = varnish5; };
+ dynamic = callPackage ./dynamic.nix { varnish = varnish5; }; # varnish5 only (upstream has a separate branch for varnish4)
+ modules = callPackage ./modules.nix { varnish = varnish5; }; # varnish4 and varnish5 only
+ geoip = callPackage ./geoip.nix { varnish = varnish5; }; # varnish4 and varnish5 only
+ };
+ varnish6Packages = {
+ varnish = varnish6;
+ digest = callPackage ./digest.nix { varnish = varnish6; };
+ };
+}
diff --git a/pkgs/servers/varnish/rtstatus.nix b/pkgs/servers/varnish/rtstatus.nix
index e92559f038d..99c0bb17659 100644
--- a/pkgs/servers/varnish/rtstatus.nix
+++ b/pkgs/servers/varnish/rtstatus.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.2.0";
- name = "varnish-rtstatus-${version}";
+ name = "${varnish.name}-rtstatus-${version}";
src = fetchurl {
url = "https://download.varnish-software.com/libvmod-rtstatus/libvmod-rtstatus-${version}.tar.gz";
@@ -17,6 +17,5 @@ stdenv.mkDerivation rec {
description = "Varnish realtime status page";
homepage = https://github.com/varnish/libvmod-rtstatus;
inherit (varnish.meta) license platforms maintainers;
- broken = true; # it has not ported to varnish 5.2 yet (5.1 is ok)
};
}
diff --git a/pkgs/servers/web-apps/klaus/default.nix b/pkgs/servers/web-apps/klaus/default.nix
new file mode 100644
index 00000000000..bb953ecc03a
--- /dev/null
+++ b/pkgs/servers/web-apps/klaus/default.nix
@@ -0,0 +1,40 @@
+{ lib, python, fetchFromGitHub }:
+
+python.pkgs.buildPythonApplication rec {
+ pname = "klaus";
+ version = "1.2.2";
+
+ src = fetchFromGitHub {
+ owner = "jonashaag";
+ repo = pname;
+ rev = version;
+ sha256 = "0hkl1ycyd5ccijmknr3yfp3ga43y01m7390xnibqqgaisfvcm9wp";
+ };
+
+ prePatch = ''
+ substituteInPlace runtests.sh \
+ --replace "mkdir -p \$builddir" "mkdir -p \$builddir && pwd"
+ '';
+
+ propagatedBuildInputs = with python.pkgs; [
+ six flask pygments dulwich httpauth humanize
+ ];
+
+ checkInputs = with python.pkgs; [
+ pytest requests python-ctags3
+ ] ++ lib.optional (!isPy3k) mock;
+
+ checkPhase = ''
+ ./runtests.sh
+ '';
+
+ # Needs to set up some git repos
+ doCheck = false;
+
+ meta = with lib; {
+ description = "The first Git web viewer that Just Works";
+ homepage = https://github.com/jonashaag/klaus;
+ license = licenses.isc;
+ maintainers = with maintainers; [ matthiasbeyer ];
+ };
+}
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 18189ba2e68..13fbf7b6791 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -429,8 +429,9 @@ in
xorgserver = with xorg; attrs_passed:
# exchange attrs if abiCompat is set
let
+ version = (builtins.parseDrvName attrs_passed.name).version;
attrs = with args;
- if (args.abiCompat == null) then attrs_passed
+ if (args.abiCompat == null || lib.hasPrefix args.abiCompat version) then attrs_passed
else if (args.abiCompat == "1.17") then {
name = "xorg-server-1.17.4";
builder = ./builder.sh;
@@ -452,7 +453,7 @@ in
buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
postPatch = "sed '1i#include ' -i include/os.h";
meta.platforms = stdenv.lib.platforms.unix;
- } else throw "unsupported xorg abiCompat: ${args.abiCompat}";
+ } else throw "unsupported xorg abiCompat ${args.abiCompat} for ${attrs_passed.name}";
in attrs //
(let
diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix
index 1c1b83d67b9..b5f600da8f7 100644
--- a/pkgs/shells/bash-completion/default.nix
+++ b/pkgs/shells/bash-completion/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "bash-completion-${version}";
- version = "2.7";
+ version = "2.8";
src = fetchurl {
url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz";
- sha256 = "07j484vb3k90f4989xh1g1x99g01akrp69p3dml4lza27wnqkfj1";
+ sha256 = "0kgmflrr1ga9wfk770vmakna3nj46ylb5ky9ipd0v2k9ymq5a7y0";
};
doCheck = true;
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index a1878dc0136..113b95f3ab0 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -1,11 +1,9 @@
# Checks derivation meta and attrs for problems (like brokenness,
# licenses, etc).
-{ lib, config, system, meta, derivationArg, mkDerivationArg }:
+{ lib, config, hostPlatform, meta }:
let
- attrs = mkDerivationArg; # TODO: probably get rid of passing this one
-
# See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426
# for why this defaults to false, but I (@copumpkin) want to default it to true soon.
shouldCheckMeta = config.checkMeta or false;
@@ -123,7 +121,7 @@ let
'';
- handleEvalIssue = { reason , errormsg ? "" }:
+ handleEvalIssue = attrs: { reason , errormsg ? "" }:
let
msg = ''
Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate.
@@ -146,7 +144,7 @@ let
license = either (listOf lib.types.attrs) (either lib.types.attrs str);
maintainers = listOf (attrsOf str);
priority = int;
- platforms = listOf str;
+ platforms = listOf (either str lib.systems.parsed.types.system);
hydraPlatforms = listOf str;
broken = bool;
@@ -175,6 +173,9 @@ let
else "key '${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]";
checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else [];
+ checkPlatform = attrs:
+ lib.any (lib.meta.platformMatch hostPlatform) attrs.meta.platforms;
+
# Check if a derivation is valid, that is whether it passes checks for
# e.g brokenness or license.
#
@@ -188,19 +189,21 @@ let
{ valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; }
else if !allowBroken && attrs.meta.broken or false then
{ valid = false; reason = "broken"; errormsg = "is marked as broken"; }
- else if !allowUnsupportedSystem && !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem system attrs.meta.platforms then
- { valid = false; reason = "broken"; errormsg = "is not supported on ‘${system}’"; }
+ else if !allowUnsupportedSystem && !allowBroken && attrs.meta.platforms or null != null && !(checkPlatform attrs) then
+ { valid = false; reason = "broken"; errormsg = "is not supported on ‘${hostPlatform.config}’"; }
else if !(hasAllowedInsecure attrs) then
{ valid = false; reason = "insecure"; errormsg = "is marked as insecure"; }
else let res = checkMeta (attrs.meta or {}); in if res != [] then
{ valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; }
else { valid = true; };
- validity = checkValidity attrs;
+ assertValidity = attrs: let
+ validity = checkValidity attrs;
+ in validity // {
+ # Throw an error if trying to evaluate an non-valid derivation
+ handled = if !validity.valid
+ then handleEvalIssue attrs (removeAttrs validity ["valid"])
+ else true;
+ };
-in validity // {
- # Throw an error if trying to evaluate an non-valid derivation
- handled = if !validity.valid
- then handleEvalIssue (removeAttrs validity ["valid"])
- else true;
-}
+in assertValidity
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index e8f78d7401f..46df958b839 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -204,12 +204,11 @@ rec {
});
validity = import ./check-meta.nix {
- inherit lib config meta derivationArg;
- mkDerivationArg = attrs;
+ inherit lib config meta;
# Nix itself uses the `system` field of a derivation to decide where
# to build it. This is a bit confusing for cross compilation.
- inherit (stdenv) system;
- };
+ inherit (stdenv) hostPlatform;
+ } attrs;
# The meta attribute is passed in the resulting attribute set,
# but it's not part of the actual derivation, i.e., it's not
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index a3aa7a0aa23..805e5c03816 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -12,11 +12,11 @@ let
inherit (python2Packages) python cython buildPythonApplication;
in buildPythonApplication rec {
name = "xpra-${version}";
- version = "2.1.3";
+ version = "2.2.4";
src = fetchurl {
url = "http://xpra.org/src/${name}.tar.xz";
- sha256 = "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm";
+ sha256 = "0v8yflvisk94bfj0zg4ggdfwrig0f3ss9kjnws3zflsr33cb2hxy";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/tools/admin/chkcrontab/default.nix
new file mode 100644
index 00000000000..a4b119f126a
--- /dev/null
+++ b/pkgs/tools/admin/chkcrontab/default.nix
@@ -0,0 +1,20 @@
+{ python, stdenv }:
+
+with python.pkgs;
+
+buildPythonApplication rec {
+ pname = "chkcrontab";
+ version = "1.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0gmxavjkjkvjysgf9cf5fcpk589gb75n1mn20iki82wifi1pk1jn";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A tool to detect crontab errors";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ ma27 ];
+ homepage = https://github.com/lyda/chkcrontab;
+ };
+}
diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix
new file mode 100644
index 00000000000..7583663ebf0
--- /dev/null
+++ b/pkgs/tools/archivers/unp/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, pkgs, lib, fetchurl, makeWrapper, perl, unrar, unzip, gzip, file, extraBackends ? [] }:
+
+stdenv.mkDerivation rec {
+ name = "unp-${version}";
+ version = "2.0-pre7";
+
+ runtime_bins = [ file unrar unzip gzip ] ++ extraBackends;
+ buildInputs = [ perl makeWrapper ] ++ runtime_bins;
+
+ src = fetchurl {
+ # url = "http://http.debian.net/debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2";
+ url = "mirror://debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2";
+ sha256 = "09w2sy7ivmylxf8blf0ywxicvb4pbl0xhrlbb3i9x9d56ll6ybbw";
+ name = "unp_2.0_pre7+nmu1.tar.bz2";
+ };
+
+ configurePhase = "true";
+ buildPhase = "true";
+ installPhase = ''
+ mkdir -p $out/bin
+ mkdir -p $out/share/man
+ cp unp $out/bin/
+ cp ucat $out/bin/
+ cp debian/unp.1 $out/share/man
+
+ wrapProgram $out/bin/unp \
+ --prefix PATH : ${lib.makeBinPath runtime_bins}
+ wrapProgram $out/bin/ucat \
+ --prefix PATH : ${lib.makeBinPath runtime_bins}
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Command line tool for unpacking archives easily";
+ homepage = https://packages.qa.debian.org/u/unp.html;
+ license = with licenses; [ gpl2 ];
+ maintainers = [ maintainers.timor ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index 3565d8cbeb2..ace54318665 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "btrbk-${version}";
- version = "0.26.0";
+ version = "0.26.1";
src = fetchurl {
url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz";
- sha256 = "1brnh5x3fd91j3v8rz3van08m9i0ym4lv4hqz274s86v1kx4k330";
+ sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp";
};
buildInputs = with perlPackages; [ asciidoc-full makeWrapper perl DateCalc ];
diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix
index 72403bd3dc0..b7ade4c5abc 100644
--- a/pkgs/tools/filesystems/archivemount/default.nix
+++ b/pkgs/tools/filesystems/archivemount/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, fuse, libarchive }:
let
- name = "archivemount-0.8.7";
+ name = "archivemount-0.8.9";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz";
- sha256 = "1diiw6pnlnrnikn6l5ld92dx59lhrxjlqms8885vwbynsjl5q127";
+ sha256 = "0v4si1ri6lhnq9q87gkx7fsh6lv6xz4bynknwndqncpvfp5cy1jg";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index 523028f5fb2..c2066f95ef5 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -1,7 +1,10 @@
-{ stdenv, fetchurl, python, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }:
+{ stdenv, fetchurl, python, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }:
with stdenv;
+let
+ avro-cpp=avro-cpp_llvm;
+in
let
common = import ./common.nix {
inherit stdenv bzip2 zlib autoconf automake cmake gnumake
@@ -13,13 +16,13 @@ in rec {
# irods: libs and server package
irods = stdenv.mkDerivation (common // rec {
- version = "4.2.1";
+ version = "4.2.2";
prefix = "irods";
name = "${prefix}-${version}";
src = fetchurl {
url = "https://github.com/irods/irods/releases/download/${version}/irods-${version}.tar.gz";
- sha256 = "07yj5g1mwra4sankhqx967mk4z28kc40rir5cb85x23ljql74abq";
+ sha256 = "0b89hs7sizwrs2ja7jl521byiwb58g297p0p7zg5frxmv4ig8dw7";
};
# Patches:
@@ -53,11 +56,11 @@ in rec {
# icommands (CLI) package, depends on the irods package
irods-icommands = stdenv.mkDerivation (common // rec {
- version = "4.2.1";
+ version = "4.2.2";
name = "irods-icommands-${version}";
src = fetchurl {
url = "http://github.com/irods/irods_client_icommands/archive/${version}.tar.gz";
- sha256 = "1kg07frv2rf32nf53a1nxscwzgr0rpgxvp5fkmh5439knby10fqw";
+ sha256 = "15zcxrx0q5c3rli3snd0b2q4i0hs3zzcrbpnibbhsip855qvs77h";
};
buildInputs = common.buildInputs ++ [ irods ];
diff --git a/pkgs/tools/filesystems/irods/irods_root_path.patch b/pkgs/tools/filesystems/irods/irods_root_path.patch
index c88169ac023..16b6ba08cbb 100644
--- a/pkgs/tools/filesystems/irods/irods_root_path.patch
+++ b/pkgs/tools/filesystems/irods/irods_root_path.patch
@@ -1,5 +1,6 @@
---- a/lib/core/src/irods_default_paths.cpp 2016-10-24 17:09:02.955889536 +0200
-+++ b/lib/core/src/irods_default_paths.cpp 2016-10-24 17:09:43.178722157 +0200
+diff -r -u irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp irods-4.2.0/lib/core/src/irods_default_paths.cpp
+--- irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp 2016-11-15 06:23:55.000000000 +0000
++++ irods-4.2.0/lib/core/src/irods_default_paths.cpp 2016-12-20 18:03:17.156883399 +0000
@@ -18,7 +18,7 @@
try {
boost::filesystem::path path{dl_info.dli_fname};
@@ -9,3 +10,62 @@
return path;
} catch(const boost::filesystem::filesystem_error& e) {
THROW(-1, e.what());
+@@ -27,8 +27,7 @@
+
+ boost::filesystem::path
+ get_irods_config_directory() {
+- boost::filesystem::path path{get_irods_root_directory()};
+- path.append("etc").append("irods");
++ boost::filesystem::path path("/etc/irods");
+ return path;
+ }
+
+diff -r -u irods-4.2.0.orig/scripts/irods/paths.py irods-4.2.0/scripts/irods/paths.py
+--- irods-4.2.0.orig/scripts/irods/paths.py 2016-11-15 06:23:55.000000000 +0000
++++ irods-4.2.0/scripts/irods/paths.py 2016-12-21 15:17:07.437864606 +0000
+@@ -10,7 +10,7 @@
+ return os.path.join(root_directory(), 'var', 'lib', 'irods')
+
+ def config_directory():
+- return os.path.join(root_directory(), 'etc', 'irods')
++ return os.path.join(os.path.abspath('/'), 'etc', 'irods')
+
+ def plugins_directory():
+ return os.path.join(root_directory(), 'usr', 'lib', 'irods', 'plugins')
+@@ -37,7 +37,7 @@
+
+ def version_path():
+ return os.path.join(
+- irods_directory(),
++ home_directory(),
+ 'VERSION.json')
+
+ def hosts_config_path():
+@@ -64,7 +64,7 @@
+
+ def log_directory():
+ return os.path.join(
+- irods_directory(),
++ home_directory(),
+ 'log')
+
+ def control_log_path():
+@@ -110,8 +110,7 @@
+ def server_bin_directory():
+ return os.path.join(
+ root_directory(),
+- 'usr',
+- 'sbin')
++ 'bin')
+
+ def server_executable():
+ return os.path.join(
+@@ -132,7 +131,7 @@
+ return os.path.join(config_directory(), 'service_account.config')
+
+ def genosauth_path():
+- return os.path.join(irods_directory(), 'clients', 'bin', 'genOSAuth')
++ return os.path.join(home_directory(), 'clients', 'bin', 'genOSAuth')
+
+ def irods_user_and_group_entries():
+ try:
diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix
new file mode 100644
index 00000000000..a062aa992be
--- /dev/null
+++ b/pkgs/tools/misc/opentimestamps-client/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonApplication, fetchFromGitHub, isPy3k
+, opentimestamps, GitPython, pysocks }:
+
+buildPythonApplication rec {
+ name = "opentimestamps-client-${version}";
+ version = "0.5.1";
+ disabled = (!isPy3k);
+
+ src = fetchFromGitHub {
+ owner = "opentimestamps";
+ repo = "opentimestamps-client";
+ rev = "opentimestamps-client-v0.5.1";
+ sha256 = "0s549xkb75r5wyvjlfmac8a1df6w0y55l98f492zsihdns1d6rzq";
+ };
+
+ propagatedBuildInputs = [ opentimestamps GitPython pysocks ];
+
+ meta = {
+ description = "Command-line tool to create and verify OpenTimestamps proofs";
+ homepage = https://github.com/opentimestamps/opentimestamps-client;
+ license = lib.licenses.lgpl3;
+ };
+}
diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix
index 07c14ac7626..42a94207be7 100644
--- a/pkgs/tools/misc/riemann-c-client/default.nix
+++ b/pkgs/tools/misc/riemann-c-client/default.nix
@@ -1,20 +1,22 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }:
stdenv.mkDerivation rec {
- pname = "riemann-c-client";
- version = "1.9.1";
- name = "${pname}-${version}";
+ name = "riemann-c-client-1.10.1";
src = fetchFromGitHub {
owner = "algernon";
repo = "riemann-c-client";
rev = "${name}";
- sha256 = "1j3wgf9xigsv6ckmv82gjj4wavi7xjn2zvj1f63fzbaa1rv7pf3s";
+ sha256 = "1pzyngvj9aq1w2185qpg6rxrjn406pnpy40bnh4c21fn4ql5kk9p";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ file protobufc ];
+ preBuild = ''
+ make lib/riemann/proto/riemann.pb-c.h
+ '';
+
meta = with stdenv.lib; {
homepage = https://github.com/algernon/riemann-c-client;
description = "A C client library for the Riemann monitoring system";
diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index 33a4ebd70b3..3932e06192e 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -4,11 +4,11 @@ with python.pkgs;
buildPythonApplication rec {
pname = "tmuxp";
- version = "1.3.5";
+ version = "1.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "bdbbbf5980d6ec21838396a46cd5b599787e8540782b8e2e3f20d2135560a5d3";
+ sha256 = "1ghi6w0cfgs94zlz304q37h3lga2jalfm0hqi3g2060zfdnb96n7";
};
postPatch = ''
diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix
index f05669a4e50..f1e85487d8f 100644
--- a/pkgs/tools/networking/altermime/default.nix
+++ b/pkgs/tools/networking/altermime/default.nix
@@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7";
};
- NIX_CFLAGS_COMPILE = "-Wno-error=format";
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=format"
+ "-Wno-error=format-truncation"
+ "-Wno-error=pointer-compare"
+ "-Wno-error=memset-elt-size"
+ ];
postPatch = ''
sed -i Makefile -e "s@/usr/local@$out@"
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 272900e0e5b..31fccbffa79 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "openvpn-${version}";
- version = "2.4.4";
+ version = "2.4.5";
src = fetchurl {
url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz";
- sha256 = "102an395nv8l7qfx3syydzhmd9xfbycd6gvwy0h2kjz8w67ipkcn";
+ sha256 = "17njq59hsraqyxrbhkrxr7dvx0p066s3pn8w1mi0yd9jldis7h23";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix
index 620584ab1df..6779d864ce2 100644
--- a/pkgs/tools/networking/uget/default.nix
+++ b/pkgs/tools/networking/uget/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "uget-${version}";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchurl {
url = "mirror://sourceforge/urlget/${name}.tar.gz";
- sha256 = "0rg2mr2cndxvnjib8zm5dp7y2hgbvnqkz2j2jmg0xlzfh9d34b2m";
+ sha256 = "0dlrjhnm1pg2vwmp7nl2xv1aia5hyirb3021rl46x859k63zap24";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix
new file mode 100644
index 00000000000..e898904c6d4
--- /dev/null
+++ b/pkgs/tools/networking/xnbd/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, jansson }:
+
+stdenv.mkDerivation rec {
+ name = "xnbd-0.4.0";
+
+ src = fetchurl {
+ url = "https://bitbucket.org/hirofuchi/xnbd/downloads/${name}.tgz";
+ sha256 = "00wkvsa0yaq4mabczcbfpj6rjvp02yahw8vdrq8hgb3wpm80x913";
+ };
+
+ sourceRoot = "${name}/trunk";
+
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+ buildInputs = [ glib jansson ];
+
+ # do not build docs, it is slow and it fails on Hydra
+ prePatch = ''
+ rm -rf doc
+ substituteInPlace configure.ac --replace "doc/Makefile" ""
+ substituteInPlace Makefile.am --replace "lib doc ." "lib ."
+ '';
+
+ meta = {
+ homepage = https://bitbucket.org/hirofuchi/xnbd;
+ description = "Yet another NBD (Network Block Device) server program";
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [ stdenv.lib.maintainers.volth ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix
index af1bb14d02a..c6d4a78e6b4 100644
--- a/pkgs/tools/security/browserpass/default.nix
+++ b/pkgs/tools/security/browserpass/default.nix
@@ -3,7 +3,7 @@
buildGoPackage rec {
name = "browserpass-${version}";
- version = "2.0.11";
+ version = "2.0.13";
goPackagePath = "github.com/dannyvankooten/browserpass";
@@ -13,7 +13,7 @@ buildGoPackage rec {
repo = "browserpass";
owner = "dannyvankooten";
rev = version;
- sha256 = "0d6rpkka27a57nv69yiw71jj3m6axdj5hygsz36dznnn8w76vvyv";
+ sha256 = "0pch0jddphgaaw208ddqjhnkiy5916n0kjxfza1cpc78fa8zw82l";
};
postInstall = ''
diff --git a/pkgs/tools/security/browserpass/deps.nix b/pkgs/tools/security/browserpass/deps.nix
index 763317aafc7..631463a69d1 100644
--- a/pkgs/tools/security/browserpass/deps.nix
+++ b/pkgs/tools/security/browserpass/deps.nix
@@ -18,6 +18,15 @@
sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449";
};
}
+ {
+ goPackagePath = "github.com/sahilm/fuzzy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sahilm/fuzzy";
+ rev = "a154b19bb758dcdd6ede58dc11ea53c2950527b2";
+ sha256 = "0jkw6474d5ik2fq2zznqxj4y3p42z47r7mbg856ln5wyara2sg0l";
+ };
+ }
{
goPackagePath = "rsc.io/qr";
fetch = {
diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix
index 911c1b12562..5d873885b1f 100644
--- a/pkgs/tools/security/hologram/default.nix
+++ b/pkgs/tools/security/hologram/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "hologram-${version}";
- version = "20170130-${stdenv.lib.strings.substring 0 7 rev}";
- rev = "d20d1c30379e7010e8f9c428a5b9e82f54d390e1";
+ name = "hologram-2018-03-19";
+ rev = "a7bab58642b530edb75b9cf6c1d834c85822ceac";
- src = fetchgit {
+ src = fetchFromGitHub {
+ owner = "AdRoll";
+ repo = "hologram";
inherit rev;
- url = "https://github.com/AdRoll/hologram";
- sha256 = "0dg5kfs16kf2gzhpmzsg83qzi2pxgnc9g81lw5zpa6fmzpa9kgsn";
+ sha256 = "00scryz8js6gbw8lp2y23qikbazz2dd992r97rqh0l1q4baa0ckn";
};
goPackagePath = "github.com/AdRoll/hologram";
diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix
index 1381f13fd3c..a8fb57b2fba 100644
--- a/pkgs/tools/system/acpica-tools/default.nix
+++ b/pkgs/tools/system/acpica-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "acpica-tools-${version}";
- version = "20180209";
+ version = "20180313";
src = fetchurl {
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
- sha256 = "1rpdfwa4vwnvyxdp9ygqjckmabc3s8kyg3jyq4n4f0rhr1zl4zy5";
+ sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm";
};
NIX_CFLAGS_COMPILE = "-O3";
diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/tools/system/bar/default.nix
new file mode 100644
index 00000000000..cd4770bf609
--- /dev/null
+++ b/pkgs/tools/system/bar/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "bar-1.11.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/clpbar/clpbar/bar-1.11.1/bar_1.11.1.tar.gz";
+ sha256 = "00v5cb6vzizyyhflgr62d3k8dqc0rg6wdgfyyk11c0s0r32mw3zs";
+ };
+
+ meta = {
+ description = "Console progress bar";
+ homepage = http://clpbar.sourceforge.net/;
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [ stdenv.lib.maintainers.rdnetto ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix
new file mode 100644
index 00000000000..b01b91452dc
--- /dev/null
+++ b/pkgs/tools/system/mq-cli/default.nix
@@ -0,0 +1,24 @@
+{ fetchFromGitHub, lib, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ name = "mq-cli-${version}";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "aprilabank";
+ repo = "mq-cli";
+ rev = "v${version}";
+ sha256 = "02z85waj5jc312biv2qhbgplsggxgjmfmyv9v8b1ky0iq1mpxjw7";
+ };
+
+ cargoSha256 = "0kpv52474bp3k2wmz8xykca8iz46dwnjmly2nivblnaap49w2zsz";
+
+ meta = with lib; {
+ description = "CLI tool to manage POSIX message queues";
+ homepage = "https://github.com/aprilabank/mq-cli";
+ license = licenses.mit;
+ maintainers = with maintainers; [ tazjin ];
+ platforms = platforms.linux;
+ repositories.git = git://github.com/aprilabank/mq-cli.git;
+ };
+}
diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix
index ba885555cde..b252b74a0bd 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchgit, pkgconfig, libuuid, openssl, libyaml, lzma }:
stdenv.mkDerivation rec {
- version = "20171023";
- checkout = "8122e0b8b13794";
+ version = "20180311";
+ checkout = "4c84e077858c809ee80a9a6f9b38185cf7dcded7";
name = "vboot_reference-${version}";
src = fetchgit {
url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference;
rev = "${checkout}";
- sha256 = "0qxm3qlvm2fgjrn9b3n8rdccw2f5pdi7z542m2hdfddflx7jz1w7";
+ sha256 = "1zja4ma6flch08h5j2l1hqnxmw2xwylidnddxxd5y2x05dai9ddj";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index 2af9baeb5c5..cffce8e3b88 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, python27Packages }:
python27Packages.buildPythonApplication rec {
- version = "2.22.0";
+ version = "2.23.0";
name = "fanficfare-${version}";
nameprefix = "";
src = fetchurl {
url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz";
- sha256 = "1gwr2qk0wff8f69w21ffj6cq8jklqd89vcdhhln6ii1h1kf8k031";
+ sha256 = "0589b5pg03rfv9x753cnbkz6pz508xs1n2lla3qfpagxc0pyg8i1";
};
propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ];
diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 6fcfd6fff85..2d18edeb44d 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "LanguageTool-${version}";
- version = "3.9";
+ version = "4.0";
src = fetchzip {
url = "https://www.languagetool.org/download/${name}.zip";
- sha256 = "0hqb4hbl7iryw1xk8q1i606azzgzdr17sy6xfr1zpas4r2pnvhfq";
+ sha256 = "0nfqn04fb5kvxvpsc6xbgj03rmqcsn8vy2xj0zazijhvbxaf0zfb";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
new file mode 100644
index 00000000000..057f1c48a1f
--- /dev/null
+++ b/pkgs/tools/text/vale/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "vale-${version}";
+ version = "0.10.1";
+ rev = "${version}";
+
+ goPackagePath = "github.com/ValeLint/vale";
+
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "ValeLint";
+ repo = "vale";
+ sha256 = "1iyc9mny3nb6j3allj3szkiygc2v3gi7l7syq9ifjrm1wknk8wrf";
+ };
+
+ goDeps = ./deps.nix;
+
+ meta = with stdenv.lib; {
+ inherit (src.meta) homepage;
+ description = "Vale is an open source linter for prose";
+ license = licenses.mit;
+ maintainers = [ maintainers.marsam ];
+ };
+}
diff --git a/pkgs/tools/text/vale/deps.nix b/pkgs/tools/text/vale/deps.nix
new file mode 100644
index 00000000000..7bf61f433ce
--- /dev/null
+++ b/pkgs/tools/text/vale/deps.nix
@@ -0,0 +1,275 @@
+
+ # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep)
+ [
+
+ {
+ goPackagePath = "github.com/ValeLint/gospell";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ValeLint/gospell";
+ rev = "90dfc71015dfebd3a7274f1ad2756c1dbf09e250";
+ sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/client9/gospell";
+ fetch = {
+ type = "git";
+ url = "https://github.com/client9/gospell";
+ rev = "90dfc71015dfebd3a7274f1ad2756c1dbf09e250";
+ sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "346938d642f2ec3594ed81d874461961cd0faa76";
+ sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/fatih/color";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fatih/color";
+ rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260";
+ sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/gobwas/glob";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gobwas/glob";
+ rev = "bea32b9cd2d6f55753d94a28e959b13f0244797a";
+ sha256 = "0dx0f293v1a0d8qi7ik5hdl26dapd8xm0hj9a9gc620vhj7khi9q";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/jdkato/prose";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jdkato/prose";
+ rev = "4d68d1b77f66e36b6897a79f59f434d558e5e0c2";
+ sha256 = "1g2wwj6azpcjy6j7pk4dqx868v3hrqwjg5d737p4441a55026prj";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/jdkato/regexp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jdkato/regexp";
+ rev = "38ab2f7842bf2a539528aa7d0014b37421b886e1";
+ sha256 = "11z21z2h2l8vlh4nwkcn7vbfdcmdjk9sc90kn8ji1923i3s7p3bw";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/mattn/go-colorable";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-colorable";
+ rev = "941b50ebc6efddf4c41c8e4537a5f68a4e686b24";
+ sha256 = "0dw492z5w0fzv1cxm3xx26n8qpqjaf2ybiwpmvimzyhv65n8nrf8";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "fc9e8d8ef48496124e79ae0df75490096eccf6fe";
+ sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/mattn/go-runewidth";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-runewidth";
+ rev = "9e777a8366cce605130a531d2cd6363d07ad7317";
+ sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/mitchellh/go-homedir";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/go-homedir";
+ rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
+ sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/mitchellh/mapstructure";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/mapstructure";
+ rev = "d0303fe809921458f417bcf828397a65db30a7e4";
+ sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/montanaflynn/stats";
+ fetch = {
+ type = "git";
+ url = "https://github.com/montanaflynn/stats";
+ rev = "eeaced052adbcfeea372c749c281099ed7fdaa38";
+ sha256 = "0kamcla633692n81w0j0d423ws3qdds97r2c0i193ypsh9xknpq9";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/olekukonko/tablewriter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/olekukonko/tablewriter";
+ rev = "be5337e7b39e64e5f91445ce7e721888dbab7387";
+ sha256 = "04zg261i4bq29bc460nyx9r2j70mj0sbxlprn87ylk8y5j2m1d1w";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "792786c7400a136282c1664665ae0a8db921c6c2";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/remeh/sizedwaitgroup";
+ fetch = {
+ type = "git";
+ url = "https://github.com/remeh/sizedwaitgroup";
+ rev = "4b44541c93591ee0e73747d6081e61bd8c58b5c7";
+ sha256 = "1kz7h8r09c95r3hc8bngznc4lrnkz2vm50lrl96cqxja0pw8jl92";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/russross/blackfriday";
+ fetch = {
+ type = "git";
+ url = "https://github.com/russross/blackfriday";
+ rev = "0b647d0506a698cca42caca173e55559b12a69f2";
+ sha256 = "1bv6mvnrqrcrp5d45l5p07q855sval8l3jzw1cf2dajkpcpysqln";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/shogo82148/go-shuffle";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shogo82148/go-shuffle";
+ rev = "4789c7c401f229b3ae1673acbccca451480660cd";
+ sha256 = "1gaii1h51df8vr28ww5np8nhvfcy4plv0nja9b9h0cmcxa3jf1lp";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shurcooL/sanitized_anchor_name";
+ rev = "541ff5ee47f1dddf6a5281af78307d921524bcb5";
+ sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0";
+ sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/urfave/cli";
+ fetch = {
+ type = "git";
+ url = "https://github.com/urfave/cli";
+ rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6";
+ sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
+ };
+ }
+
+ {
+ goPackagePath = "github.com/xrash/smetrics";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xrash/smetrics";
+ rev = "a3153f7040e90324c58c6287535e26a0ac5c1cc1";
+ sha256 = "1phq5y6mcg741spq7snc6xsky1ybc7fllh2444sfr3p41sjq9hg6";
+ };
+ }
+
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "ab5485076ff3407ad2d02db054635913f017b0ed";
+ sha256 = "10805rk5rfgc3ivx35r9qmnps8hy3k3m57g0j6mz10w96k8i7pk7";
+ };
+ }
+
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "14ac33bf8474b62c65cae263af2e4d3b543cc699";
+ sha256 = "1453l5v5kizq142fiq3bg5hka7b0yvnf9fsq8y2ayj4bc9h5vqf3";
+ };
+ }
+
+ {
+ goPackagePath = "gopkg.in/ini.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/ini.v1";
+ rev = "d3de07a94d22b4a0972deb4b96d790c2c0ce8333";
+ sha256 = "1lpwqhcfhaa6aighd2lpjfswbb6aw5d5bsmyr0vqaqg6g5kz0ikg";
+ };
+ }
+
+ {
+ goPackagePath = "gopkg.in/neurosnap/sentences.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/neurosnap/sentences.v1";
+ rev = "a7f18ead1433a139742a8b42ce7a059cfb484d60";
+ sha256 = "1b64xv5anfbnq6354jaygxapwgkdhbszzi604b96sm682brwl0p7";
+ };
+ }
+
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b";
+ sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44";
+ };
+ }
+
+]
\ No newline at end of file
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 9df89a8072a..d5da10b5cd4 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -37,6 +37,9 @@
# backends
, enableDeckjsBackend ? false
, enableOdfBackend ? false
+
+# java is problematic on some platforms, where it is unfree
+, enableJava ? true
}:
assert enableStandardFeatures ->
@@ -55,7 +58,7 @@ assert enableStandardFeatures ->
docbook_xml_dtd_45 != null &&
docbook5_xsl != null &&
docbook_xsl != null &&
- fop != null &&
+ (fop != null || !enableJava) &&
# TODO: Package this:
# epubcheck != null &&
gnused != null &&
@@ -63,7 +66,7 @@ assert enableStandardFeatures ->
# filters
assert enableExtraPlugins || enableDitaaFilter || enableMscgenFilter || enableDiagFilter || enableQrcodeFilter || enableAafigureFilter -> unzip != null;
-assert enableExtraPlugins || enableDitaaFilter -> jre != null;
+assert (enableExtraPlugins && enableJava) || enableDitaaFilter -> jre != null;
assert enableExtraPlugins || enableMscgenFilter -> mscgen != null;
assert enableExtraPlugins || enableDiagFilter -> blockdiag != null && seqdiag != null && actdiag != null && nwdiag != null;
assert enableExtraPlugins || enableMatplotlibFilter -> matplotlib != null && numpy != null;
@@ -73,7 +76,7 @@ assert enableExtraPlugins || enableDeckjsBackend || enableOdfBackend -> unzip !=
let
- _enableDitaaFilter = enableExtraPlugins || enableDitaaFilter;
+ _enableDitaaFilter = (enableExtraPlugins && enableJava) || enableDitaaFilter;
_enableMscgenFilter = enableExtraPlugins || enableMscgenFilter;
_enableDiagFilter = enableExtraPlugins || enableDiagFilter;
_enableQrcodeFilter = enableExtraPlugins || enableQrcodeFilter;
@@ -239,7 +242,7 @@ stdenv.mkDerivation rec {
-e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \
-e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
-e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
- -e "s|^FOP =.*|FOP = '${fop}/bin/fop'|" \
+ ${optionalString enableJava ''-e "s|^FOP =.*|FOP = '${fop}/bin/fop'|"''} \
-e "s|^W3M =.*|W3M = '${w3m}/bin/w3m'|" \
-e "s|^LYNX =.*|LYNX = '${lynx}/bin/lynx'|" \
-e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \
diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix
new file mode 100644
index 00000000000..2b7a6f3ffb4
--- /dev/null
+++ b/pkgs/tools/typesetting/mmark/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "mmark-${version}";
+ version = "1.3.6";
+ rev = "v${version}";
+
+ goPackagePath = "github.com/miekg/mmark";
+
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "miekg";
+ repo = "mmark";
+ sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m";
+ };
+
+ goDeps = ./deps.nix;
+
+ meta = {
+ description = "A powerful markdown processor in Go geared towards the IETF";
+ homepage = https://github.com/miekg/mmark;
+ license = with stdenv.lib.licenses; bsd2;
+ maintainers = with stdenv.lib.maintainers; [ yrashk ];
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/tools/typesetting/mmark/deps.nix b/pkgs/tools/typesetting/mmark/deps.nix
new file mode 100644
index 00000000000..47f964c6a47
--- /dev/null
+++ b/pkgs/tools/typesetting/mmark/deps.nix
@@ -0,0 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+ {
+ goPackagePath = "github.com/BurntSushi/toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/toml";
+ rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
+ sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
+ };
+ }
+]
diff --git a/pkgs/tools/typesetting/xml2rfc/default.nix b/pkgs/tools/typesetting/xml2rfc/default.nix
new file mode 100644
index 00000000000..d1f01ccd867
--- /dev/null
+++ b/pkgs/tools/typesetting/xml2rfc/default.nix
@@ -0,0 +1,24 @@
+{ python, stdenv }:
+
+with python.pkgs;
+
+buildPythonPackage rec {
+ pname = "xml2rfc";
+ version = "2.9.6";
+
+ buildInputs = [ intervaltree lxml requests pyflakes ];
+ propagatedBuildInputs = [ intervaltree lxml requests six ];
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1wr161lx6f1b3fq14ddr3y4jl0myrcmqs1s3fzsighvlmqfdihj7";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "https://xml2rfc.tools.ietf.org/";
+ license = licenses.bsdOriginal;
+ description = "Xml2rfc generates RFCs and IETF drafts from document source in XML according to the dtd in RFC2629.";
+ maintainers = [ maintainers.yrashk ];
+ };
+
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fff5f3606e9..07627daad5c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -36,7 +36,6 @@ mapAliases (rec {
asciidocFull = asciidoc-full; # added 2014-06-22
at_spi2_atk = at-spi2-atk; # added 2018-02-25
at_spi2_core = at-spi2-core; # added 2018-02-25
- bar = lemonbar; # added 2015-01-16
bar-xft = lemonbar-xft; # added 2015-01-16
bashCompletion = bash-completion; # Added 2016-09-28
bridge_utils = bridge-utils; # added 2015-02-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d1661e57b4..54e2bc796a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -613,6 +613,8 @@ with pkgs;
container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { };
+ chkcrontab = callPackage ../tools/admin/chkcrontab { };
+
djmount = callPackage ../tools/filesystems/djmount { };
dgsh = callPackage ../shells/dgsh { };
@@ -765,6 +767,8 @@ with pkgs;
backup = callPackage ../tools/backup/backup { };
+ bar = callPackage ../tools/system/bar {};
+
base16-builder = callPackage ../misc/base16-builder { };
basex = callPackage ../tools/text/xml/basex { };
@@ -1276,6 +1280,8 @@ with pkgs;
kisslicer = callPackage ../tools/misc/kisslicer { };
+ klaus = callPackage ../servers/web-apps/klaus { };
+
lcdproc = callPackage ../servers/monitoring/lcdproc { };
languagetool = callPackage ../tools/text/languagetool { };
@@ -1300,6 +1306,8 @@ with pkgs;
meson = callPackage ../development/tools/build-managers/meson { };
+ metabase = callPackage ../servers/metabase { };
+
mp3blaster = callPackage ../applications/audio/mp3blaster { };
mp3fs = callPackage ../tools/filesystems/mp3fs { };
@@ -1310,6 +1318,8 @@ with pkgs;
mpdris2 = callPackage ../tools/audio/mpdris2 { };
+ mq-cli = callPackage ../tools/system/mq-cli { };
+
nfdump = callPackage ../tools/networking/nfdump { };
noteshrink = callPackage ../tools/misc/noteshrink { };
@@ -2075,6 +2085,8 @@ with pkgs;
buildEmscriptenPackage = callPackage ../development/em-modules/generic { };
+ emscriptenVersion = "1.37.36";
+
emscripten = callPackage ../development/compilers/emscripten { };
emscriptenfastcompPackages = callPackage ../development/compilers/emscripten-fastcomp { };
@@ -2919,6 +2931,7 @@ with pkgs;
stdenv = llvmPackages_38.libcxxStdenv;
libcxx = llvmPackages_38.libcxx;
boost = boost160.override { inherit stdenv; };
+ avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; };
})
irods
irods-icommands;
@@ -3147,6 +3160,8 @@ with pkgs;
kronometer = libsForQt5.callPackage ../tools/misc/kronometer { };
+ elisa = libsForQt5.callPackage ../applications/audio/elisa { };
+
kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };
@@ -3750,6 +3765,7 @@ with pkgs;
nawk = callPackage ../tools/text/nawk { };
nbd = callPackage ../tools/networking/nbd { };
+ xnbd = callPackage ../tools/networking/xnbd { };
inherit (callPackages ../development/libraries/science/math/nccl { })
nccl_cudatoolkit8
@@ -4349,6 +4365,8 @@ with pkgs;
profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { };
+ projectlibre = callPackage ../applications/misc/projectlibre { };
+
projectm = callPackage ../applications/audio/projectm { };
proot = callPackage ../tools/system/proot { };
@@ -5014,7 +5032,7 @@ with pkgs;
extraFonts = true;
};
- texmaker = callPackage ../applications/editors/texmaker { };
+ texmaker = libsForQt5.callPackage ../applications/editors/texmaker { };
texstudio = callPackage ../applications/editors/texstudio { };
@@ -5258,6 +5276,8 @@ with pkgs;
vncrec = callPackage ../tools/video/vncrec { };
+ vo-amrwbenc = callPackage ../development/libraries/vo-amrwbenc { };
+
vobcopy = callPackage ../tools/cd-dvd/vobcopy { };
vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { };
@@ -5442,6 +5462,8 @@ with pkgs;
unarj = callPackage ../tools/archivers/unarj { };
+ unp = callPackage ../tools/archivers/unp { };
+
unshield = callPackage ../tools/archivers/unshield { };
unzip = callPackage ../tools/archivers/unzip { };
@@ -5465,11 +5487,15 @@ with pkgs;
inherit (gnome3) libgee;
};
- varnish = callPackage ../servers/varnish { };
- varnish-modules = callPackage ../servers/varnish/modules.nix { };
- varnish-digest = callPackage ../servers/varnish/digest.nix { };
- varnish-geoip = callPackage ../servers/varnish/geoip.nix { };
- varnish-rtstatus = callPackage ../servers/varnish/rtstatus.nix { };
+ inherit (callPackages ../servers/varnish { })
+ varnish4 varnish5 varnish6;
+ inherit (callPackages ../servers/varnish/packages.nix { })
+ varnish4Packages
+ varnish5Packages
+ varnish6Packages;
+
+ varnishPackages = varnish5Packages;
+ varnish = varnishPackages.varnish;
venus = callPackage ../tools/misc/venus {
python = python27;
@@ -7944,20 +7970,15 @@ with pkgs;
nexus = callPackage ../development/tools/repository-managers/nexus { };
- node_webkit = node_webkit_0_9;
+ nwjs = callPackage ../development/tools/nwjs {
+ gconf = pkgs.gnome2.GConf;
+ };
+ # only kept for nixui, see https://github.com/matejc/nixui/issues/27
nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix {
gconf = pkgs.gnome2.GConf;
};
- node_webkit_0_11 = callPackage ../development/tools/node-webkit/nw11.nix {
- gconf = pkgs.gnome2.GConf;
- };
-
- node_webkit_0_9 = callPackage ../development/tools/node-webkit/nw9.nix {
- gconf = pkgs.gnome2.GConf;
- };
-
noweb = callPackage ../development/tools/literate-programming/noweb { };
nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; };
@@ -8780,7 +8801,9 @@ with pkgs;
freeglut = callPackage ../development/libraries/freeglut { };
- freenect = callPackage ../development/libraries/freenect { };
+ freenect = callPackage ../development/libraries/freenect {
+ inherit (darwin.apple_sdk.frameworks) Cocoa GLUT;
+ };
freetype = callPackage ../development/libraries/freetype { };
@@ -11366,7 +11389,8 @@ with pkgs;
speechd = callPackage ../development/libraries/speechd { };
- speech_tools = callPackage ../development/libraries/speech-tools {};
+ speech-tools = callPackage ../development/libraries/speech-tools {};
+ speech_tools = speech-tools;
speex = callPackage ../development/libraries/speex {
fftw = fftwFloat;
@@ -11620,6 +11644,8 @@ with pkgs;
libva = libva-full; # needs libva-{x11,glx}
};
+ vale = callPackage ../tools/text/vale { };
+
vamp = callPackage ../development/libraries/audio/vamp { };
vc = callPackage ../development/libraries/vc { };
@@ -12581,8 +12607,13 @@ with pkgs;
postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
+ inherit (callPackage ../servers/monitoring/prometheus {})
+ prometheus_1
+ prometheus_2
+ ;
+
prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
- prometheus = callPackage ../servers/monitoring/prometheus { };
+ prometheus = prometheus_1;
prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { };
prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };
@@ -12862,6 +12893,13 @@ with pkgs;
alsaOss = callPackage ../os-specific/linux/alsa-oss { };
alsaTools = callPackage ../os-specific/linux/alsa-tools { };
+ inherit (callPackage ../misc/arm-trusted-firmware {})
+ buildArmTrustedFirmware
+ armTrustedFirmwareAllwinner
+ armTrustedFirmwareQemu
+ armTrustedFirmwareRK3328
+ ;
+
microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { };
microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { };
@@ -12918,6 +12956,7 @@ with pkgs;
conky = callPackage ../os-specific/linux/conky ({
lua = lua5_1; # conky can use 5.2, but toluapp can not
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
+ pulseSupport = config.pulseaudio or false;
} // config.conky or {});
conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { };
@@ -13849,25 +13888,28 @@ with pkgs;
ubootBananaPi
ubootBeagleboneBlack
ubootClearfog
+ ubootGuruplug
ubootJetsonTK1
ubootOdroidXU3
ubootOrangePiPc
ubootPcduino3Nano
+ ubootPine64
+ ubootQemuAarch64
ubootQemuArm
ubootRaspberryPi
ubootRaspberryPi2
ubootRaspberryPi3_32bit
ubootRaspberryPi3_64bit
+ ubootSheevaplug
+ ubootSopine
ubootUtilite
ubootWandboard
;
# Non-upstream U-Boots:
- ubootSheevaplug = callPackage ../misc/uboot/sheevaplug.nix { };
-
ubootNanonote = callPackage ../misc/uboot/nanonote.nix { };
- ubootGuruplug = callPackage ../misc/uboot/guruplug.nix { };
+ ubootRock64 = callPackage ../misc/uboot/rock64.nix { };
uclibc = callPackage ../os-specific/linux/uclibc { };
@@ -14848,7 +14890,9 @@ with pkgs;
centerim = callPackage ../applications/networking/instant-messengers/centerim { };
- cgit = callPackage ../applications/version-management/git-and-tools/cgit { };
+ cgit = callPackage ../applications/version-management/git-and-tools/cgit {
+ inherit (python3Packages) python wrapPython pygments markdown;
+ };
cgminer = callPackage ../applications/misc/cgminer {
amdappsdk = amdappsdk28;
@@ -15807,6 +15851,8 @@ with pkgs;
quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { };
+ rhvoice = callPackage ../applications/audio/rhvoice { };
+
svox = callPackage ../applications/audio/svox { };
gkrellm = callPackage ../applications/misc/gkrellm {
@@ -16032,7 +16078,9 @@ with pkgs;
ifenslave = callPackage ../os-specific/linux/ifenslave { };
- ii = callPackage ../applications/networking/irc/ii { };
+ ii = callPackage ../applications/networking/irc/ii {
+ stdenv = gccStdenv;
+ };
ike = callPackage ../applications/networking/ike { };
@@ -16923,6 +16971,8 @@ with pkgs;
openscad = callPackage ../applications/graphics/openscad {};
+ opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {};
+
opentx = callPackage ../applications/misc/opentx { };
opera = callPackage ../applications/networking/browsers/opera {};
@@ -17729,9 +17779,8 @@ with pkgs;
taskserver = callPackage ../servers/misc/taskserver { };
- tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
- inherit (pythonPackages) gyp;
- };
+ tdesktopPackages = callPackage ../applications/networking/instant-messengers/telegram/tdesktop { };
+ tdesktop = tdesktopPackages.stable;
telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { };
@@ -17990,9 +18039,7 @@ with pkgs;
virt-viewer = callPackage ../applications/virtualization/virt-viewer { };
- virt-top = callPackage ../applications/virtualization/virt-top {
- ocamlPackages = ocamlPackages_4_01_0;
- };
+ virt-top = callPackage ../applications/virtualization/virt-top { };
virt-what = callPackage ../applications/virtualization/virt-what { };
@@ -18195,8 +18242,8 @@ with pkgs;
worker = callPackage ../applications/misc/worker { };
workrave = callPackage ../applications/misc/workrave {
- inherit (gnome2) GConf gconfmm;
inherit (python27Packages) cheetah;
+ inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;
};
worldengine-cli = python3Packages.worldengine;
@@ -18556,8 +18603,6 @@ with pkgs;
useMupdf = config.zathura.useMupdf or true;
};
- zed = callPackage ../applications/editors/zed { };
-
zeroc_ice = callPackage ../development/libraries/zeroc-ice {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -19361,6 +19406,7 @@ with pkgs;
no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { };
remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { };
taskwhisperer = callPackage ../desktops/gnome-3/extensions/taskwhisperer { };
+ timepp = callPackage ../desktops/gnome-3/extensions/timepp { };
topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { };
};
@@ -19525,7 +19571,9 @@ with pkgs;
});
samtools = callPackage ../applications/science/biology/samtools/default.nix { };
- samtools_0_1_19 = callPackage ../applications/science/biology/samtools/samtools_0_1_19.nix { };
+ samtools_0_1_19 = callPackage ../applications/science/biology/samtools/samtools_0_1_19.nix {
+ stdenv = gccStdenv;
+ };
snpeff = callPackage ../applications/science/biology/snpeff/default.nix { };
@@ -19577,6 +19625,8 @@ with pkgs;
liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
+ nasc = callPackage ../applications/science/math/nasc { };
+
openblas = callPackage ../development/libraries/science/math/openblas { };
# A version of OpenBLAS using 32-bit integers on all platforms for compatibility with
@@ -19809,7 +19859,9 @@ with pkgs;
saw-tools = callPackage ../applications/science/logic/saw-tools {};
- spass = callPackage ../applications/science/logic/spass {};
+ spass = callPackage ../applications/science/logic/spass {
+ stdenv = gccStdenv;
+ };
statverif = callPackage ../applications/science/logic/statverif { };
@@ -20107,6 +20159,8 @@ with pkgs;
brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper {};
+ calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {};
+
cups = callPackage ../misc/cups {
libusb = libusb1;
};
@@ -20986,4 +21040,8 @@ with pkgs;
simplehttp2server = callPackage ../servers/simplehttp2server { };
diceware = callPackage ../tools/security/diceware { };
+
+ xml2rfc = callPackage ../tools/typesetting/xml2rfc { };
+
+ mmark = callPackage ../tools/typesetting/mmark { };
}
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 99863eb76a8..fbad836bc1b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -385,9 +385,9 @@ let
in
lib.makeScope newScope (self:
{}
+ // melpaStablePackages self
// melpaPackages self
// elpaPackages self
- // melpaStablePackages self
// orgPackages self
// packagesFun self
)
diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix
index 7e63041867d..5b5b32b89da 100644
--- a/pkgs/top-level/emscripten-packages.nix
+++ b/pkgs/top-level/emscripten-packages.nix
@@ -1,49 +1,92 @@
{ pkgs }:
+with pkgs;
+
# emscripten toolchain abstraction for nix
# https://github.com/NixOS/nixpkgs/pull/16208
-with pkgs; rec {
- json_c = pkgs.json_c.override {
- stdenv = emscriptenStdenv;
- };
+rec {
+ json_c = (pkgs.json_c.override {
+ stdenv = pkgs.emscriptenStdenv;
+ }).overrideDerivation
+ (old: {
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ propagatedBuildInputs = [ zlib ];
+ buildInputs = old.buildInputs ++ [ automake autoconf ];
+ configurePhase = ''
+ HOME=$TMPDIR
+ emconfigure ./configure --prefix=$out
+ '';
+ checkPhase = ''
+ echo "================= testing json_c using node ================="
+
+ echo "Compiling a custom test"
+ set -x
+ emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 tests/test1.c \
+ `pkg-config zlib --cflags` \
+ `pkg-config zlib --libs` \
+ -I . \
+ .libs/libjson-c.so \
+ -o ./test1.js
+
+ echo "Using node to execute the test which basically outputs an error on stderr which we grep for"
+ ${pkgs.nodejs}/bin/node ./test1.js
+
+ set +x
+ if [ $? -ne 0 ]; then
+ echo "test1.js execution failed -> unit test failed, please fix"
+ exit 1;
+ else
+ echo "test1.js execution seems to work! very good."
+ fi
+ echo "================= /testing json_c using node ================="
+ '';
+ });
libxml2 = (pkgs.libxml2.override {
stdenv = emscriptenStdenv;
pythonSupport = false;
}).overrideDerivation
(old: {
- nativeBuildInputs = old.nativeBuildInputs ++ [ autoreconfHook pkgconfig ];
- buildInputs = old.buildInputs ++ [ zlib nodejs ];
+ propagatedBuildInputs = [ zlib ];
+ buildInputs = old.buildInputs ++ [ pkgconfig ];
+
# just override it with nothing so it does not fail
autoreconfPhase = "echo autoreconfPhase not used...";
+ configurePhase = ''
+ HOME=$TMPDIR
+ emconfigure ./configure --prefix=$out --without-python
+ '';
checkPhase = ''
- echo "================= testing xmllint using node ================="
+ echo "================= testing libxml2 using node ================="
+
+ echo "Compiling a custom test"
+ set -x
emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 xmllint.o \
./.libs/libxml2.a `pkg-config zlib --cflags` `pkg-config zlib --libs` -o ./xmllint.test.js \
--embed-file ./test/xmlid/id_err1.xml
- # test/xmlid/id_err2.xml:3: validity error : xml:id : attribute type should be ID
- #
- # ^
- node ./xmllint.test.js --noout test/xmlid/id_err1.xml 2>&1 | grep 0bar
+
+ echo "Using node to execute the test which basically outputs an error on stderr which we grep for"
+ ${pkgs.nodejs}/bin/node ./xmllint.test.js --noout test/xmlid/id_err1.xml 2>&1 | grep 0bar
+
+ set +x
if [ $? -ne 0 ]; then
echo "xmllint unit test failed, please fix this package"
exit 1;
else
echo "since there is no stupid text containing 'foo xml:id' it seems to work! very good."
fi
- echo "================= /testing xmllint using node ================="
+ echo "================= /testing libxml2 using node ================="
'';
});
- xmlmirror = buildEmscriptenPackage rec {
+ xmlmirror = pkgs.buildEmscriptenPackage rec {
name = "xmlmirror";
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ autoconf automake libtool gnumake libxml2 nodejs
- python openjdk json_c zlib ];
+ buildInputs = [ pkgconfig autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ];
+ nativeBuildInputs = [ pkgconfig zlib ];
- src = fetchgit {
+ src = pkgs.fetchgit {
url = "https://gitlab.com/odfplugfest/xmlmirror.git";
rev = "4fd7e86f7c9526b8f4c1733e5c8b45175860a8fd";
sha256 = "1jasdqnbdnb83wbcnyrp32f36w3xwhwp0wq8lwwmhqagxrij1r4b";
@@ -51,6 +94,14 @@ with pkgs; rec {
configurePhase = ''
rm -f fastXmlLint.js*
+ # a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728
+ # https://gitlab.com/odfplugfest/xmlmirror/issues/8
+ sed -e "s/TOTAL_MEMORY=234217728/TOTAL_MEMORY=268435456/g" -i Makefile.emEnv
+ # https://github.com/kripken/emscripten/issues/6344
+ # https://gitlab.com/odfplugfest/xmlmirror/issues/9
+ sed -e "s/\$(JSONC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(LIBXML20_LDFLAGS)/\$(JSONC_LDFLAGS) \$(LIBXML20_LDFLAGS) \$(ZLIB_LDFLAGS) /g" -i Makefile.emEnv
+ # https://gitlab.com/odfplugfest/xmlmirror/issues/11
+ sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv
'';
buildPhase = ''
@@ -75,25 +126,58 @@ with pkgs; rec {
cp *.rng $out/share
cp README.md $doc/share/${name}
'';
-
- postInstall = ''
+ checkPhase = ''
+
'';
};
zlib = (pkgs.zlib.override {
- stdenv = emscriptenStdenv;
+ stdenv = pkgs.emscriptenStdenv;
}).overrideDerivation
- (old: {
+ (old: rec {
+ buildInputs = old.buildInputs ++ [ pkgconfig ];
+ # we need to reset this setting!
+ NIX_CFLAGS_COMPILE="";
configurePhase = ''
# FIXME: Some tests require writing at $HOME
HOME=$TMPDIR
runHook preConfigure
- emconfigure ./configure --prefix=$out
+ #export EMCC_DEBUG=2
+ emconfigure ./configure --prefix=$out --shared
runHook postConfigure
'';
- postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ dontStrip = true;
+ outputs = [ "out" ];
+ buildPhase = ''
+ emmake make
+ '';
+ installPhase = ''
+ emmake make install
+ '';
+ checkPhase = ''
+ echo "================= testing zlib using node ================="
+
+ echo "Compiling a custom test"
+ set -x
+ emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \
+ libz.so.${old.version} -I . -o example.js
+
+ echo "Using node to execute the test"
+ ${pkgs.nodejs}/bin/node ./example.js
+
+ set +x
+ if [ $? -ne 0 ]; then
+ echo "test failed for some reason"
+ exit 1;
+ else
+ echo "it seems to work! very good."
+ fi
+ echo "================= /testing zlib using node ================="
+ '';
+
+ postPatch = pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin ''
substituteInPlace configure \
--replace '/usr/bin/libtool' 'ar' \
--replace 'AR="libtool"' 'AR="ar"' \
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 0df0b5a51c9..77cd5b0eba5 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -61,6 +61,9 @@ in {
junit_3_8_2
junit_4_12;
+ inherit (callPackage ../development/java-modules/jogl { })
+ jogl_2_3_2;
+
inherit (callPackage ../development/java-modules/log4j { inherit fetchMaven; })
log4j_1_2_12;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5f3e725c0ad..688af3e28e7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2349,6 +2349,21 @@ let self = _self // overrides; _self = with self; {
};
};
+ ConfigIniFiles = buildPerlPackage rec {
+ name = "Config-IniFiles-2.94";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+ sha256 = "d6d38a416da79de874c5f1825221f22e972ad500b6527d190cc6e9ebc45194b4";
+ };
+ buildInputs = [ ModuleBuild perl ];
+ propagatedBuildInputs = [ IOstringy ];
+ meta = {
+ description = "A module for reading .ini-style configuration files";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.limeytexan ];
+ };
+ };
+
ConfigMerge = buildPerlPackage {
name = "Config-Merge-1.04";
src = fetchurl {
@@ -11275,6 +11290,20 @@ let self = _self // overrides; _self = with self; {
};
};
+ PkgConfig = buildPerlPackage rec {
+ name = "PkgConfig-0.19026";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz";
+ sha256 = "5cb6e934d29dd93e04c2fa779f4b7e51361edaf56957b47a232017a4bb7e922c";
+ };
+ meta = {
+ homepage = https://metacpan.org/pod/PkgConfig;
+ description = "Pure-Perl Core-Only replacement for pkg-config";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.limeytexan ];
+ };
+ };
+
Plack = buildPerlPackage rec {
name = "Plack-1.0039";
src = fetchurl {
@@ -13202,10 +13231,12 @@ let self = _self // overrides; _self = with self; {
};
SysVirt = buildPerlPackage rec {
- name = "Sys-Virt-1.2.19";
- src = fetchurl {
- url = "mirror://cpan/authors/id/D/DA/DANBERR/${name}.tar.gz";
- sha256 = "18v8x0514in0zpvq1rv78hmvhpij1xjh5xn0wa6wmg2swky54sp4";
+ version = "4.1.0";
+ name = "Sys-Virt-${version}";
+ src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
+ url = git://libvirt.org/libvirt-perl.git;
+ rev = "v${version}";
+ sha256 = "0m0snv6gqh97nh1c31qvbm4sdzp49vixn7w3r69h6a5r71sn78x4";
};
propagatedBuildInputs = [XMLXPath];
nativeBuildInputs = [ pkgs.pkgconfig ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d5ca8609858..5c49b6bc0c8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -452,10 +452,14 @@ in {
aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };
+ ajpy = callPackage ../development/python-modules/ajpy { };
+
alabaster = callPackage ../development/python-modules/alabaster {};
alembic = callPackage ../development/python-modules/alembic {};
+ allpairspy = callPackage ../development/python-modules/allpairspy { };
+
ansicolors = callPackage ../development/python-modules/ansicolors {};
aniso8601 = callPackage ../development/python-modules/aniso8601 {};
@@ -1431,6 +1435,8 @@ in {
cx_Freeze = callPackage ../development/python-modules/cx_freeze {};
+ cx_oracle = callPackage ../development/python-modules/cx_oracle {};
+
cvxopt = buildPythonPackage rec {
name = "${pname}-${version}";
pname = "cvxopt";
@@ -1461,6 +1467,8 @@ in {
inherit (pkgs.dlib) name src nativeBuildInputs meta;
buildInputs = pkgs.dlib.buildInputs ++ [ self.boost ];
+
+ checkInputs = with self; [ pytest ];
};
datadog = buildPythonPackage rec {
@@ -2349,36 +2357,15 @@ in {
colorlover = callPackage ../development/python-modules/colorlover { };
- CommonMark = buildPythonPackage rec {
- name = "CommonMark-${version}";
- version = "0.6.3";
+ CommonMark = callPackage ../development/python-modules/commonmark { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/C/CommonMark/${name}.tar.gz";
- sha256 = "ee5a88f23678794592efe3fc11033f17fc77b3296a85f5e1d5b715f8e110a773";
- };
-
- LC_ALL="en_US.UTF-8";
-
- doCheck = false;
-
- buildInputs = with self; [ flake8 pkgs.glibcLocales ];
- propagatedBuildInputs = with self; [ future ];
-
- meta = {
- description = "Python parser for the CommonMark Markdown spec";
- homepage = https://github.com/rolandshoemaker/CommonMark-py;
- license = licenses.bsd3;
- };
- };
-
- CommonMark_54 = self.CommonMark.override rec {
- name = "CommonMark-0.5.4";
- src = pkgs.fetchurl {
- url = "mirror://pypi/C/CommonMark/${name}.tar.gz";
+ CommonMark_54 = self.CommonMark.overridePythonAttrs (oldAttrs: rec {
+ version = "0.5.4";
+ src = oldAttrs.src.override {
+ inherit version;
sha256 = "34d73ec8085923c023930dfc0bcd1c4286e28a2a82de094bb72fabcc0281cbe5";
};
- };
+ });
coilmq = buildPythonPackage (rec {
@@ -2405,21 +2392,7 @@ in {
});
- colander = buildPythonPackage rec {
- name = "colander-1.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/c/colander/${name}.tar.gz";
- sha256 = "7389413266b9e680c9529c16d56284edf87e0d5de557948e75f41d65683c23b3";
- };
-
- propagatedBuildInputs = with self; [ self.translationstring self.iso8601 ];
-
- meta = {
- maintainers = with maintainers; [ garbas domenkozar ];
- platforms = platforms.all;
- };
- };
+ colander = callPackage ../development/python-modules/colander { };
# Backported version of the ConfigParser library of Python 3.3
configparser = if isPy3k then null else buildPythonPackage rec {
@@ -3581,6 +3554,8 @@ in {
};
});
+ requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {};
+
howdoi = buildPythonPackage (rec {
name = "howdoi-${version}";
version = "1.1.7";
@@ -6115,6 +6090,8 @@ in {
};
};
+ python-ctags3 = callPackage ../development/python-modules/python-ctags3 { };
+
junos-eznc = callPackage ../development/python-modules/junos-eznc {};
raven = callPackage ../development/python-modules/raven { };
@@ -6371,22 +6348,7 @@ in {
};
- svg-path = buildPythonPackage rec {
- name = "svg.path-${version}";
- version = "2.0b1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/s/svg.path/${name}.zip";
- sha256 = "038x4wqkbvcs71x6n6kzr4kn99csyv8v4gqzssr8pqylqpxi56bm";
- };
-
- meta = {
- description = "SVG path objects and parser";
- homepage = https://github.com/regebro/svg.path;
- license = licenses.cc0;
- maintainers = with maintainers; [ goibhniu ];
- };
- };
+ svg-path = callPackage ../development/python-modules/svg-path { };
regex = callPackage ../development/python-modules/regex { };
@@ -8397,17 +8359,7 @@ in {
};
};
- hvac = buildPythonPackage rec {
- name = "hvac-${version}";
- version = "0.2.15";
-
- src = pkgs.fetchurl {
- url = "https://pypi.python.org/packages/11/ba/6101780891b9d55f6174fa78b47d462c8c1f0cde34072b45fc39f7f8a77c/hvac-0.2.15.tar.gz";
- sha256 = "0qxa4g1ij1bj27mbp8l54lcr7d5krkb2rayisc6shkpf2b51ip4c";
- };
-
- propagatedBuildInputs = with self; [ requests ];
- };
+ hvac = callPackage ../development/python-modules/hvac { };
hypothesis = callPackage ../development/python-modules/hypothesis { };
@@ -8676,24 +8628,7 @@ in {
};
};
-
- ipy = buildPythonPackage rec {
- version = "0.74";
- name = "ipy-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/I/IPy/IPy-${version}.tar.gz";
- sha256 = "5d6abb870c25f946c45c35cf50e66155598660f2765b35cb12e36ed5223c2b89";
- };
-
- # error: invalid command 'test'
- doCheck = false;
-
- meta = {
- description = "Class and tools for handling of IPv4 and IPv6 addresses and networks";
- homepage = https://pypi.python.org/pypi/IPy;
- };
- };
+ ipy = callPackage ../development/python-modules/IPy { };
ipykernel = callPackage ../development/python-modules/ipykernel { };
@@ -8960,27 +8895,6 @@ in {
keyutils = callPackage ../development/python-modules/keyutils { };
- klaus = buildPythonPackage rec {
- version = "0.9.1";
- name = "klaus-${version}";
-
- src = pkgs.fetchurl {
- url = "https://github.com/jonashaag/klaus/archive/${version}.tar.gz";
- sha256 = "0k3v3p56hq8alm083grrp98znxkz1zqx0pczm2lah8qddbyrdkgm";
- };
-
- propagatedBuildInputs = with self;
- [ humanize httpauth dulwich pygments flask six ];
-
- meta = {
- description = "The first Git web viewer that Just Works";
- homepage = "https://github.com/jonashaag/klaus";
- #license = licenses.mit; # I'm not sure about the license
- maintainers = with maintainers; [ matthiasbeyer ];
- platforms = platforms.linux; # Can only test linux
- };
- };
-
klein = buildPythonPackage rec {
name = "klein-15.3.1";
src = pkgs.fetchurl {
@@ -10196,6 +10110,8 @@ in {
mygpoclient = callPackage ../development/python-modules/mygpoclient { };
+ mysqlclient = callPackage ../development/python-modules/mysqlclient { };
+
mwclient = buildPythonPackage rec {
version = "0.8.3";
pname = "mwclient";
@@ -11141,6 +11057,8 @@ in {
openpyxl = callPackage ../development/python-modules/openpyxl { };
+ opentimestamps = callPackage ../development/python-modules/opentimestamps { };
+
ordereddict = buildPythonPackage rec {
name = "ordereddict-${version}";
version = "1.1";
@@ -11861,6 +11779,8 @@ in {
};
};
+ patator = callPackage ../development/python-modules/patator { };
+
pathlib = buildPythonPackage rec {
name = "pathlib-${version}";
version = "1.0.1";
@@ -11886,22 +11806,7 @@ in {
pathpy = callPackage ../development/python-modules/path.py { };
- paypalrestsdk = buildPythonPackage rec {
- name = "paypalrestsdk-0.7.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/paypalrestsdk/${name}.tar.gz";
- sha256 = "117kfipzfahf9ysv414bh1mmm5cc9ck5zb6rhpslx1f8gk3frvd6";
- };
-
- propagatedBuildInputs = with self; [ httplib2 ];
-
- meta = {
- homepage = https://developer.paypal.com/;
- description = "Python APIs to create, process and manage payment";
- license = "PayPal SDK License";
- };
- };
+ paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { };
pbr = callPackage ../development/python-modules/pbr { };
@@ -12409,7 +12314,6 @@ in {
py = callPackage ../development/python-modules/py { };
-
pyacoustid = buildPythonPackage rec {
name = "pyacoustid-1.1.0";
@@ -12519,6 +12423,8 @@ in {
};
};
+ python-pushover = callPackage ../development/python-modules/pushover {};
+
mongodict = buildPythonPackage rec {
name = "mongodict-${version}";
version = "0.3.1";
@@ -12990,6 +12896,8 @@ in {
pyrr = callPackage ../development/python-modules/pyrr { };
+ pysha3 = callPackage ../development/python-modules/pysha3 { };
+
pyshp = callPackage ../development/python-modules/pyshp { };
pysmbc = callPackage ../development/python-modules/pysmbc { };
@@ -13914,23 +13822,6 @@ in {
};
};
- pysphere = buildPythonPackage rec {
- name = "pysphere-0.1.8";
-
- src = pkgs.fetchurl {
- url = "http://pysphere.googlecode.com/files/${name}.zip";
- sha256 = "b3f9ba1f67afb17ac41725b01737cd42e8a39d9e745282dd9b692ae631af0add";
- };
-
- disabled = isPy3k;
-
- meta = {
- homepage = "https://code.google.com/p/pysphere/";
- license = "BSD";
- description = "Python API for interaction with the VMWare vSphere";
- };
- };
-
pysqlite = buildPythonPackage rec {
name = "pysqlite-2.8.3";
@@ -16485,15 +16376,14 @@ in {
# Move the tkinter module
mkdir -p $out/${py.sitePackages}
mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/
+ '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
# Update the rpath to point to python without x11Support
old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*)
new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" )
patchelf --set-rpath $new_rpath $out/${py.sitePackages}/_tkinter*
'';
- meta = py.meta // {
- platforms = platforms.linux;
- };
+ meta = py.meta;
};
tlslite = buildPythonPackage rec {
@@ -18726,17 +18616,7 @@ EOF
};
};
- pushbullet = buildPythonPackage rec {
- name = "pushbullet.py-${version}";
- version = "0.10.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pushbullet.py/pushbullet.py-0.10.0.tar.gz";
- sha256 = "537d3132e1dbc91e31ade4cccf4c7def6f9d48e904a67f341d35b8a54a9be74d";
- };
-
- propagatedBuildInputs = with self; [requests websocket_client python_magic ];
- };
+ pushbullet = callPackage ../development/python-modules/pushbullet { };
power = buildPythonPackage rec {
name = "power-1.4";
@@ -19010,51 +18890,7 @@ EOF
};
- thumbor = buildPythonPackage rec {
- name = "thumbor-${version}";
- version = "6.3.2";
-
- disabled = ! isPy27;
-
- buildInputs = with self; [ statsd nose ];
-
- propagatedBuildInputs = with self; [
- tornado
- pycrypto
- pycurl
- pytz
- pillow
- derpconf
- python_magic
- # thumborPexif
- pexif
- libthumbor
- opencv
- ] ++ optionals (!isPy3k) [ futures ];
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/t/thumbor/${name}.tar.gz";
- sha256 = "0787245x4yci34cdfc9xaxhds0lv60476qgp132pwa78hrpc9m31";
- };
-
- patches = [
- (pkgs.fetchurl {
- url = "https://github.com/thumbor/thumbor/commit/376f688a8a0b82e50388c885d9d733572f2eb3e6.patch";
- sha256 = "1j2434yqb6pz61d65dsy8w6lvyzvh5ksizadi5hgjzfw6s46v6yn";
- })
- ];
-
- prePatch = ''
- substituteInPlace setup.py \
- --replace '"argparse",' ""
- '';
-
- meta = {
- description = "A smart imaging service";
- homepage = https://github.com/globocom/thumbor/wiki;
- license = licenses.mit;
- };
- };
+ thumbor = callPackage ../development/python-modules/thumbor { };
thumborPexif = self.buildPythonPackage rec {
name = "thumbor-pexif-0.14";
@@ -19174,24 +19010,7 @@ EOF
ofxclient = callPackage ../development/python-modules/ofxclient {};
- ofxhome = buildPythonPackage rec {
- name = "ofxhome-0.3.1";
- src = pkgs.fetchurl {
- url = "mirror://pypi/o/ofxhome/${name}.tar.gz";
- sha256 = "0000db437fd1a8c7c65cea5d88ce9d3b54642a1f4844dde04f860e29330ac68d";
- };
-
- buildInputs = with self; [ nose ];
-
- # ImportError: No module named tests
- doCheck = false;
-
- meta = {
- homepage = "https://github.com/captin411/ofxhome";
- description = "ofxhome.com financial institution lookup REST client";
- license = licenses.mit;
- };
- };
+ ofxhome = callPackage ../development/python-modules/ofxhome { };
ofxparse = buildPythonPackage rec {
name = "ofxparse-0.14";
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index ef99dbd619e..0d15d817a66 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -88,7 +88,7 @@ in
f (["buildPackages"] ++ path) { inherit system crossSystem; }
);
- testEqual = path: systems: forTheseSystems systems (testEqualOne path);
+ testEqual = path: systems: forMatchingSystems systems (testEqualOne path);
mapTestEqual = lib.mapAttrsRecursive testEqual;
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 3e842f8b556..623c9d9cb00 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -48,33 +48,56 @@ rec {
pkgs_x86_64_cygwin = allPackages { system = "x86_64-cygwin"; };
+ # Given a list of 'meta.platforms'-style patterns, return the sublist of
+ # `supportedSystems` containing systems that matches at least one of the given
+ # patterns.
+ #
+ # This is written in a funny way so that we only elaborate the systems once.
+ supportedMatches = let
+ supportedPlatforms = map
+ (system: lib.systems.elaborate { inherit system; })
+ supportedSystems;
+ in metaPatterns: let
+ anyMatch = platform:
+ lib.any (lib.meta.platformMatch platform) metaPatterns;
+ matchingPlatforms = lib.filter anyMatch supportedPlatforms;
+ in map ({ system, ...}: system) matchingPlatforms;
+
+
assertTrue = bool:
if bool
then pkgs.runCommand "evaluated-to-true" {} "touch $out"
else pkgs.runCommand "evaluated-to-false" {} "false";
+
/* The working or failing mails for cross builds will be sent only to
the following maintainers, as most package maintainers will not be
interested in the result of cross building a package. */
crossMaintainers = [ maintainers.viric ];
+
+ # Generate attributes for all supported systems.
forAllSystems = genAttrs supportedSystems;
- forTheseSystems = systems: f:
- genAttrs (filter (x: elem x supportedSystems) systems) f;
+
+
+ # Generate attributes for all sytems matching at least one of the given
+ # patterns
+ forMatchingSystems = metaPatterns: genAttrs (supportedMatches metaPatterns);
+
/* Build a package on the given set of platforms. The function `f'
is called for each supported platform with Nixpkgs for that
platform as an argument . We return an attribute set containing
a derivation for each supported platform, i.e. ‘{ x86_64-linux =
f pkgs_x86_64_linux; i686-linux = f pkgs_i686_linux; ... }’. */
- testOn = systems: f: forTheseSystems systems
+ testOn = metaPatterns: f: forMatchingSystems metaPatterns
(system: hydraJob' (f (pkgsFor system)));
/* Similar to the testOn function, but with an additional
'crossSystem' parameter for allPackages, defining the target
platform for cross builds. */
- testOnCross = crossSystem: systems: f: forTheseSystems systems
+ testOnCross = crossSystem: metaPatterns: f: forMatchingSystems metaPatterns
(system: hydraJob' (f (allPackages { inherit system crossSystem; })));
@@ -82,14 +105,14 @@ rec {
map each leaf node to `testOn [platforms...] (pkgs:
pkgs.)'. */
mapTestOn = mapAttrsRecursive
- (path: systems: testOn systems (pkgs: getAttrFromPath path pkgs));
+ (path: metaPatterns: testOn metaPatterns (pkgs: getAttrFromPath path pkgs));
/* Similar to the testOn function, but with an additional 'crossSystem'
* parameter for allPackages, defining the target platform for cross builds,
* and triggering the build of the host derivation (cross built - crossDrv). */
mapTestOnCross = crossSystem: mapAttrsRecursive
- (path: systems: testOnCross crossSystem systems
+ (path: metaPatterns: testOnCross crossSystem metaPatterns
(pkgs: addMetaAttrs { maintainers = crossMaintainers; } (getAttrFromPath path pkgs)));
@@ -98,7 +121,8 @@ rec {
packagePlatforms = mapAttrs (name: value:
let res = builtins.tryEval (
if isDerivation value then
- value.meta.hydraPlatforms or (value.meta.platforms or [ "x86_64-linux" ])
+ value.meta.hydraPlatforms
+ or (supportedMatches (value.meta.platforms or [ "x86_64-linux" ]))
else if value.recurseForDerivations or false || value.recurseForRelease or false then
packagePlatforms value
else